Merge branch 'master' into test-corba-is-nil

3452 files changed, 28453 insertions, 40913 deletions

diff --git a/.github/workflows/face.yml b/.github/workflows/face.yml
new file mode 100644
index 00000000000..6248c205db1
--- /dev/null
+++ b/.github/workflows/face.yml
@@ -0,0 +1,78 @@
+name: face
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * SUN'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-18.04
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      TAO_ROOT: ${{ github.workspace }}/TAO
+      MPC_ROOT: ${{ github.workspace }}/MPC
+      CC: ${{ matrix.CC }}
+      CXX: ${{ matrix.CXX }}
+    steps:
+    - name: checkout ACE/TAO
+      uses: actions/checkout@v2
+    - name: checkout MPC
+      uses: actions/checkout@v2
+      with:
+        repository: DOCGroup/MPC
+        path: ${{ env.MPC_ROOT }}
+    - name: Add Repo
+      run: |
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+        sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
+      if: matrix.Repo != ''
+    - name: Add packages
+      run: |
+        sudo apt-get --yes update
+        sudo apt-get --yes install ${{ matrix.PackageDeps }}
+    - name: create $ACE_ROOT/ace/config.h
+      run: |
+        '#define ACE_FACE_SAFETY_BASE' > ${env:ACE_ROOT}/ace/config.h
+        '#include "ace/config-linux.h"' >> ${env:ACE_ROOT}/ace/config.h
+      shell: pwsh
+    - name: add optional optional macros
+      run: |
+        '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+      if: matrix.optional_macros != ''
+    - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
+      run: |
+        '${{ matrix.platform_file }}' >>  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+    - name: add optional optional feature
+      run: |
+        '${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      if: matrix.optional_feature != ''
+      shell: pwsh
+    - name: Run mwc.pl on $(ACE_ROOT)/ace/ace.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/ace/ace.mwc -workers 4
+      shell: pwsh
+    - name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/tests/tests.mwc -workers 4
+      shell: pwsh
+    - name: Build ace project
+      run: |
+        make -j 6 -C ${env:ACE_ROOT}/ace
+      shell: pwsh
+    - name: Build ACE/tests project
+      run: |
+        make -j 6 -C ${env:ACE_ROOT}/tests
+      shell: pwsh
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index e95d3d50182..3d122e1baf3 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -4,7 +4,7 @@ on:
   push:
   pull_request:
   schedule:
-    - cron: '0 7 * * SUN'
+    - cron: '0 1 * * SUN'
 
 jobs:
   build:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d1bca0dcc75..29e70582968 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -4,7 +4,7 @@ on:
   push:
   pull_request:
   schedule:
-    - cron: '0 7 * * SUN'
+    - cron: '0 1 * * SUN'
 
 jobs:
   build:
@@ -40,7 +40,7 @@ jobs:
             CXX: g++-10
             PackageDeps: g++-10
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-20.04
+            os: ubuntu-18.04
           - CC: clang-5.0
             CXX: clang++-5.0
             PackageDeps: clang-5.0
@@ -73,8 +73,52 @@ jobs:
             Repo: llvm-toolchain-$(lsb_release -cs)-10
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
             os: ubuntu-20.04
+          - CC: clang-11
+            CXX: clang++-11
+            PackageDeps: clang-11
+            Repo: llvm-toolchain-$(lsb_release -cs)-11
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
+            os: ubuntu-20.04
+          - feature: CORBA/e micro
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-18.04
+            optional_feature: corba_e_micro=1
+            optional_macros: corba_e_micro=1
+          - feature: CORBA/e compact
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-18.04
+            optional_feature: corba_e_compact=1
+            optional_macros: corba_e_compact=1
+          - feature: ACE for TAO
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-20.04
+            optional_feature: ace_for_tao=1
+            optional_macros: ace_for_tao=1
+          - feature: wchar
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-20.04
+            optional_feature: uses_wchar=1
+            optional_macros: inline=0
+          - feature: CodeQL
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-20.04
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }} ${{ matrix.CXX }}
+    name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
     env:
       ACE_ROOT: ${{ github.workspace }}/ACE
       TAO_ROOT: ${{ github.workspace }}/TAO
@@ -88,7 +132,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: DOCGroup/MPC
-        path: MPC
+        path: ${{ env.MPC_ROOT }}
     - name: Add Repo
       run: |
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
@@ -107,6 +151,14 @@ jobs:
         'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
         'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
         'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+    - name: add optional optional macros
+      run: |
+        '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+      if: matrix.optional_macros != ''
+    - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
+      run: |
         '${{ matrix.platform_file }}' >>  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
       shell: pwsh
     - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
@@ -116,6 +168,16 @@ jobs:
         'ssl=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
         'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
       shell: pwsh
+    - name: add optional optional feature
+      run: |
+        '${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      if: matrix.optional_feature != ''
+      shell: pwsh
+    - name: initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: cpp
+      if: matrix.feature == 'CodeQL'
     - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
       run: |
         perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
@@ -132,3 +194,6 @@ jobs:
       run: |
         make -j 6 -C ${env:ACE_ROOT}/tests
       shell: pwsh
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
+      if: matrix.feature == 'CodeQL'
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index 4783557d2ad..c6420a4b2a0 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -4,16 +4,16 @@ on:
   push:
   pull_request:
   schedule:
-    - cron: '0 7 * * SUN'
+    - cron: '0 1 * * SUN'
 
 jobs:
   build:
     strategy:
       matrix:
-        cxxstd: ["03", "11"]
+        cxxstd: ["11"]
+        os: [macos-10.15, macos-11.0]
         include:
-          - os: macos-10.15
-            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
+          - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
     runs-on: ${{ matrix.os }}
     name: "${{ matrix.os }}-C++${{ matrix.cxxstd }}"
     env:
@@ -27,15 +27,14 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: DOCGroup/MPC
-        path: MPC
+        path: ${{ env.MPC_ROOT }}
     - name: create $ACE_ROOT/ace/config.h
       run: |
         '#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h
       shell: pwsh
-    - name: Add c++11 to platform_macros.GNU
-      if: matrix.cxxstd == 11
+    - name: Add c++${{ matrix.cxxstd }} platform_macros.GNU
       run: |
-        'c++11=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+        'c++${{ matrix.cxxstd }}=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
       shell: pwsh
     - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
       run: |
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 00000000000..69237e4678b
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,207 @@
+name: windows
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * SUN'
+
+jobs:
+  msvc:
+    strategy:
+      matrix:
+        include:
+          - name: VS2017WChar
+            vmimage: windows-2016
+            mpctype: vs2017
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: 'openssl xerces-c[xmlch-wchar]'
+            OptionalFeatures: uses_wchar=1
+          - name: VS2017Debug64
+            vmimage: windows-2016
+            mpctype: vs2017
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2017Release64
+            vmimage: windows-2016
+            mpctype: vs2017
+            BuildPlatform: x64
+            BuildConfiguration: Release
+            vcpkgarch: x64-windows
+            vcpkglibdir: lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2019WChar
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: 'openssl xerces-c[xmlch-wchar]'
+            OptionalFeatures: uses_wchar=1
+          - name: VS2019Debug64
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2019Release64
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: x64
+            BuildConfiguration: Release
+            vcpkgarch: x64-windows
+            vcpkglibdir: lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2019Debug32
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: Win32
+            BuildConfiguration: Debug
+            vcpkgarch: x86-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2019Release32
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: Win32
+            BuildConfiguration: Release
+            vcpkgarch: x86-windows
+            vcpkglibdir: lib
+            vcpkgpackages: openssl xerces-c
+    runs-on: ${{ matrix.vmimage }}
+    name: ${{ matrix.name }}
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      TAO_ROOT: ${{ github.workspace }}/TAO
+      MPC_ROOT: ${{ github.workspace }}/MPC
+      VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+      XERCESC_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
+      XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
+      SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
+      SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
+    steps:
+    - name: checkout ACE/TAO
+      uses: actions/checkout@v2
+    - name: checkout MPC
+      uses: actions/checkout@v2
+      with:
+        repository: DOCGroup/MPC
+        path: ${{ env.MPC_ROOT }}
+    - name: Install vcpkg
+      uses: lukka/run-vcpkg@v6
+      with:
+        vcpkgGitCommitId: 0bf3923f9fab4001c00f0f429682a0853b5749e0
+        vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }}
+        vcpkgTriplet: ${{ matrix.vcpkgarch }}
+        appendedCacheKey: ${{ matrix.name }}
+    - name: create $ACE_ROOT/ace/config.h
+      run: |
+        '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h
+      shell: pwsh
+    - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+      run: |
+        echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "xerces3=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "openssl11=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      shell: pwsh
+    - name: Add optional features ${{ matrix.OptionalFeatures }}
+      run: |
+        echo "${{ matrix.OptionalFeatures }}" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      shell: pwsh
+      if: matrix.OptionalFeatures != ''
+    - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
+      shell: pwsh
+    - name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4
+      shell: pwsh
+    - name: Setup msbuild
+      uses: microsoft/setup-msbuild@v1
+    - name: Build solution TAO/TAO_ACE.sln
+      run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln
+    - name: Build solution ACE/tests/tests.sln
+      run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ACE/tests/tests.sln
+  mingw:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        compiler: [gcc]
+        msystem: [MINGW64]
+        include:
+          - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
+    name: ${{ matrix.msystem }}-${{ matrix.compiler }}
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      TAO_ROOT: ${{ github.workspace }}/TAO
+      MPC_ROOT: ${{ github.workspace }}/MPC
+    steps:
+    - name: checkout ACE/TAO
+      uses: actions/checkout@v2
+    - name: checkout MPC
+      uses: actions/checkout@v2
+      with:
+        repository: DOCGroup/MPC
+        path: ${{ env.MPC_ROOT }}
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        install: make
+    - run: pacman --noconfirm -S mingw-w64-x86_64-${{ matrix.compiler }}
+      shell: msys2 {0}
+    - run: ${{ matrix.compiler }} --version
+      shell: msys2 {0}
+    - name: create $ACE_ROOT/ace/config.h
+      run: |
+        '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h
+      shell: pwsh
+    - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+      run: |
+        echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      shell: pwsh
+    - name: Add optional features ${{ matrix.OptionalFeatures }}
+      run: |
+        echo "${{ matrix.OptionalFeatures }}" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      shell: pwsh
+      if: matrix.OptionalFeatures != ''
+    - name: add optional optional macros
+      run: |
+        '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+      if: matrix.optional_macros != ''
+    - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
+      run: |
+        '${{ matrix.platform_file }}' >>  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+    - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
+      shell: pwsh
+    - name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/tests/tests.mwc -workers 4
+      shell: pwsh
+    - name: Build TAO_ACE project
+      run: |
+        export ACE_ROOT=`cygpath -u $ACE_ROOT`
+        export TAO_ROOT=`cygpath -u $TAO_ROOT`
+        make -j 6 -C $TAO_ROOT
+      shell: msys2 {0}
+    - name: Build ACE/tests project
+      run: |
+        export ACE_ROOT=`cygpath -u $ACE_ROOT`
+        export TAO_ROOT=`cygpath -u $TAO_ROOT`
+        make -j 6 -C $ACE_ROOT/tests
+      shell: msys2 {0}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 536f8d02bcc..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-dist: bionic
-group: travis_latest
-language: cpp
-os:
-  - linux
-
-compiler:
-  - gcc
-
-env:
-  matrix:
-    - CORBAEMICRO=1 ACEFORTAO=0 TAO=1
-    - CORBAECOMPACT=1 ACEFORTAO=0 TAO=1
-    - ACEFORTAO=1 TAO=1
-    - USES_WCHAR=1 TAO=1
-    - ACETESTS=1 FACE=1 ACE=1 TAO=0
-  global:
-    - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE
-    - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO
-    - MPC_ROOT=$TRAVIS_BUILD_DIR/MPC
-    - LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH
-    - COMPILER=g++-8
-
-addons:
-  apt:
-    packages:
-      - libssl-dev
-      - libxerces-c-dev
-      - g++-8
-
-before_install:
-  - git clone --depth 1 git://github.com/DOCGroup/MPC.git
-
-branches:
-  only:
-    - master
-
-before_script:
-  - export
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "#include \"ace/config-macosx.h\"" >> $ACE_ROOT/ace/config.h; fi
-  - echo -e "workspace {\n" >> $TRAVIS_BUILD_DIR/travis.mwc
-  - if [ "$TAO" == "1" ]; then echo -e "\$(TAO_ROOT)/TAO_ACE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi
-  - if [ "$ACE" == "1" ]; then echo -e "\$(ACE_ROOT)/ace/ace.mwc\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi
-  - if [ "$ACETESTS" == "1" ]; then echo -e "\$(ACE_ROOT)/tests\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi
-  - echo -e "}\n" >> $TRAVIS_BUILD_DIR/travis.mwc
-  - if [ "$FACE" == "1" ]; then echo -e "#define ACE_FACE_SAFETY_BASE" >> $ACE_ROOT/ace/config.h; fi
-  - if [ "$CORBAEMICRO" == "1" ]; then echo -e "corba_e_micro=1" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
-  - if [ "$CORBAEMICRO" == "1" ]; then echo -e "corba_e_micro=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
-  - if [ "$CORBAECOMPACT" == "1" ]; then echo -e "corba_e_compact=1" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
-  - if [ "$CORBAECOMPACT" == "1" ]; then echo -e "corba_e_compact=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
-  - if [ "$ACEFORTAO" == "1" ]; then echo -e "ace_for_tao=1" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
-  - if [ "$ACEFORTAO" == "1" ]; then echo -e "ace_for_tao=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
-  - if [ "$USES_WCHAR" == "1" ]; then echo -e "uses_wchar=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
-  - if [ "$VERSIONED" == "1" ]; then echo -e "versioned_namespace=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
-  - echo -e "inline=0\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
-  - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst
-  - if [ "$CXX" == "g++" ]; then echo -e "c++11=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-      if [ "$CXX" == "g++" ]; then
-        echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU;
-      else
-        echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU;
-      fi
-    fi
-  - cat $TRAVIS_BUILD_DIR/travis.mwc
-  - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-  - cat $ACE_ROOT/ace/config.h
-  - cat $ACE_ROOT/include/makeinclude/platform_macros.GNU
-  - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
-
-script:
-  - perl $ACE_ROOT/bin/mwc.pl -type gnuace -workers 2 travis.mwc
-  - make -j 6
-  - perl $ACE_ROOT/bin/auto_run_tests.pl -l $TAO_ROOT/bin/travis-ci.lst
-
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index c05056712f4..13bcad42f95 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -466,7 +466,7 @@ State Perl</a> or <a href="http://strawberryperl.com">Strawberry Perl</a></p>
 Microsoft Visual Studio</a></h3>
 
 <p>ACE contains project files for
-Visual Studio 2015 (vc14), Visual Studio 2017 (vc141), and Visual Studio 2019 (vc142).
+Visual Studio 2017 (vc141), and Visual Studio 2019 (vc142).
 Visual Studio 2015/2017/2019 use different file formats but the same file
 suffixes (<code>.sln</code> and <code>.vcproj</code>). To support both
 environments, ACE supplies files with different names for the different
@@ -483,11 +483,6 @@ a <code>.vcproj</code> suffix.</p>
   </tr>
 </thead><tbody>
   <tr>
-    <th>Visual Studio 2015</th>
-    <td><i>name</i><code>_vc14</code>
-    </td>
-  </tr>
-  <tr>
     <th>Visual Studio 2017</th>
     <td><i>name</i><code>_vs2017</code>
     </td>
@@ -2697,7 +2692,7 @@ perl bin/mwc.pl  -type vc71 -relative ACE_ROOT=C:/ace/ACE_wrappers -relative TAO
 If you use the GNU GCC g++ compiler please note the following:
 
 <ul>
-  </p></li><li>ACE/TAO needs g++ 2.95.x or better. Older versions are not usable anymore<p>
+  </p></li><li>ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore<p>
 
   </p></li><li>Make sure to update your gcc <code>config.status</code>
       file.  This file is produced when installing gcc; it specifies
@@ -2830,11 +2825,11 @@ core ACE and TAO libraries and executables is the following:
 
 <pre><code>
 C:> cd %TAO_ROOT%
-C:> %ACE_ROOT%\bin\mwc.pl -type vc71 TAO_ACE.mwc
+C:> %ACE_ROOT%\bin\mwc.pl -type vs2019 TAO_ACE.mwc
 </pre></code>
 
 <p>
-Replace vc71 with whatever project type you want to use.  On Linux and
+Replace vs2019 with whatever project type you want to use.  On Linux and
 other UNIX platform use the gnuace type:
 </p>
 
diff --git a/ACE/ACEXML/common/Attributes.h b/ACE/ACEXML/common/Attributes.h
index 9d171838fd0..71482c30654 100644
--- a/ACE/ACEXML/common/Attributes.h
+++ b/ACE/ACEXML/common/Attributes.h
@@ -57,7 +57,7 @@ class ACEXML_Export ACEXML_Attributes
 public:
 
   /// Destructor.
-  virtual ~ACEXML_Attributes (void);
+  virtual ~ACEXML_Attributes ();
 
   /**
    * Look up the index of an attribute by XML 1.0 qualified name.
@@ -73,7 +73,7 @@ public:
   /**
    * Return the number of attributes in the list.
    */
-  virtual size_t getLength (void) = 0;
+  virtual size_t getLength () = 0;
 
   /**
    * Look up an attribute's local name by index.
diff --git a/ACE/ACEXML/common/CharStream.h b/ACE/ACEXML/common/CharStream.h
index 0f7a08c831b..555c04b204a 100644
--- a/ACE/ACEXML/common/CharStream.h
+++ b/ACE/ACEXML/common/CharStream.h
@@ -33,18 +33,18 @@ public:
   /**
    * Virtual destructor, must have.
    */
-  virtual ~ACEXML_CharStream (void) = 0;
+  virtual ~ACEXML_CharStream () = 0;
 
   /**
    * Returns the available ACEXML_Char in the buffer.  -1
    * if the object is not initialized properly.
    */
-  virtual int available (void) = 0;
+  virtual int available () = 0;
 
   /**
    * Close this stream and release all resources used by it.
    */
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /**
    * Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -61,22 +61,22 @@ public:
    * Peek the next ACEXML_Char in the CharStream.  Return the
    * character if succeess, -1 if EOS is reached.
    */
-  virtual int peek (void) = 0;
+  virtual int peek () = 0;
 
   /**
    *  Resets the pointer to the beginning of the stream.
    */
-  virtual void rewind (void) = 0;
+  virtual void rewind () = 0;
 
   /*
    * Get the character encoding for a byte stream or URI.
    */
-  virtual const ACEXML_Char *getEncoding (void)  = 0;
+  virtual const ACEXML_Char *getEncoding ()  = 0;
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void) = 0;
+  virtual const ACEXML_Char* getSystemId () = 0;
 
 };
 
diff --git a/ACE/ACEXML/common/ContentHandler.h b/ACE/ACEXML/common/ContentHandler.h
index 89669818d0c..f5e88c150e0 100644
--- a/ACE/ACEXML/common/ContentHandler.h
+++ b/ACE/ACEXML/common/ContentHandler.h
@@ -43,7 +43,7 @@ class ACEXML_Export ACEXML_ContentHandler
 {
 public:
 
-  virtual ~ACEXML_ContentHandler (void);
+  virtual ~ACEXML_ContentHandler ();
 
   /**
    * Receive notification of character data.
@@ -55,7 +55,7 @@ public:
   /**
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void) = 0;
+  virtual void endDocument () = 0;
 
   /**
    * Receive notification of the end of an element.
@@ -95,7 +95,7 @@ public:
   /**
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void) = 0;
+  virtual void startDocument () = 0;
 
   /**
    * Receive notification of the beginning of an element.
diff --git a/ACE/ACEXML/common/DTDHandler.h b/ACE/ACEXML/common/DTDHandler.h
index cd17dd8d543..52f701ccb02 100644
--- a/ACE/ACEXML/common/DTDHandler.h
+++ b/ACE/ACEXML/common/DTDHandler.h
@@ -49,7 +49,7 @@ class ACEXML_Export ACEXML_DTDHandler
 {
 public:
 
-  virtual ~ACEXML_DTDHandler (void);
+  virtual ~ACEXML_DTDHandler ();
 
   /**
    * Receive notification of a notation declaration event.
diff --git a/ACE/ACEXML/common/DefaultHandler.h b/ACE/ACEXML/common/DefaultHandler.h
index f02d01c3e07..7107a5158c7 100644
--- a/ACE/ACEXML/common/DefaultHandler.h
+++ b/ACE/ACEXML/common/DefaultHandler.h
@@ -50,12 +50,12 @@ public:
   /**
    * Default constructor.
    */
-  ACEXML_DefaultHandler (void);
+  ACEXML_DefaultHandler ();
 
   /**
    * destructor.
    */
-  virtual ~ACEXML_DefaultHandler (void);
+  virtual ~ACEXML_DefaultHandler ();
 
   // Methods inherit from ACEXML_ContentHandler.
 
@@ -69,7 +69,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void);
+  virtual void endDocument ();
 
   /*
    * Receive notification of the end of an element.
@@ -109,7 +109,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void);
+  virtual void startDocument ();
 
   /*
    * Receive notification of the beginning of an element.
diff --git a/ACE/ACEXML/common/Element_Def_Builder.h b/ACE/ACEXML/common/Element_Def_Builder.h
index 5750a4e5adc..0ca25c94e6c 100644
--- a/ACE/ACEXML/common/Element_Def_Builder.h
+++ b/ACE/ACEXML/common/Element_Def_Builder.h
@@ -60,24 +60,21 @@ public:
    */
   virtual int setElementName (const ACEXML_Char *namespaceURI,
                               const ACEXML_Char *localName,
-                              const ACEXML_Char *qName)
-        = 0;
+                              const ACEXML_Char *qName) = 0;
 
   /**
    * Define the content type of the element.
    *
    * @retval 0 if valid, -1 otherwise.
    */
-  virtual int setContentType (CONTENT_TYPE type)
-        = 0;
+  virtual int setContentType (CONTENT_TYPE type) = 0;
 
   /**
    * Insert one more element into Mixed definition.
    */
   virtual int insertMixedElement (const ACEXML_Char *namespaceURI,
                                   const ACEXML_Char *localName,
-                                  const ACEXML_Char *qName)
-        = 0;
+                                  const ACEXML_Char *qName) = 0;
 
   /**
    * Start a new group of children.
@@ -116,8 +113,7 @@ public:
    */
   virtual int insertElement  (const ACEXML_Char *namespaceURI,
                               const ACEXML_Char *localName,
-                              const ACEXML_Char *qName)
-        = 0;
+                              const ACEXML_Char *qName) = 0;
 
   /**
    * Dump the content of the attribute definition.
diff --git a/ACE/ACEXML/common/EntityResolver.h b/ACE/ACEXML/common/EntityResolver.h
index 7ab61eb451a..b2b143c34e3 100644
--- a/ACE/ACEXML/common/EntityResolver.h
+++ b/ACE/ACEXML/common/EntityResolver.h
@@ -42,7 +42,7 @@ class ACEXML_Export ACEXML_EntityResolver
 {
 public:
 
-  virtual ~ACEXML_EntityResolver (void);
+  virtual ~ACEXML_EntityResolver ();
 
   /**
    * Allow the application to resolve external entities.
diff --git a/ACE/ACEXML/common/ErrorHandler.h b/ACE/ACEXML/common/ErrorHandler.h
index 50706cfca77..72c8fb4a1a8 100644
--- a/ACE/ACEXML/common/ErrorHandler.h
+++ b/ACE/ACEXML/common/ErrorHandler.h
@@ -45,7 +45,7 @@ class ACEXML_Export ACEXML_ErrorHandler
 {
 public:
 
-  virtual ~ACEXML_ErrorHandler (void);
+  virtual ~ACEXML_ErrorHandler ();
 
   /**
    * Receive notification of a recoverable error.
diff --git a/ACE/ACEXML/common/Exception.h b/ACE/ACEXML/common/Exception.h
index 6e7005b9fbf..8520b2cfc2f 100644
--- a/ACE/ACEXML/common/Exception.h
+++ b/ACE/ACEXML/common/Exception.h
@@ -36,29 +36,29 @@ class ACEXML_Export ACEXML_Exception
 public:
 
   /// Destructor.
-  virtual ~ACEXML_Exception (void);
+  virtual ~ACEXML_Exception ();
 
   /// Throw the exception.
-  virtual void _raise (void) = 0;
+  virtual void _raise () = 0;
 
   /// Static narrow operation.
   static ACEXML_Exception* _downcast (ACEXML_Exception* ex);
 
   /// Return the exception type.  (for safe downcast.)
-  virtual const ACEXML_Char *id (void) const ;
+  virtual const ACEXML_Char *id () const ;
 
   /// Dynamically create a copy of this exception.
-  virtual ACEXML_Exception *duplicate (void) const = 0;
+  virtual ACEXML_Exception *duplicate () const = 0;
 
   /// Check whether this is an exception of type specified by <name>.
   virtual int is_a (const ACEXML_Char *name);
 
   /// Print out exception using ACE_DEBUG.
-  virtual void print (void) const = 0;
+  virtual void print () const = 0;
 
 protected:
   /// Default constructor.
-  ACEXML_Exception (void);
+  ACEXML_Exception ();
 
   /// All exceptions have names.  This name is used to identify the
   /// type of an exception.
diff --git a/ACE/ACEXML/common/Exception.inl b/ACE/ACEXML/common/Exception.inl
index 515546bc4c7..f1d086757d4 100644
--- a/ACE/ACEXML/common/Exception.inl
+++ b/ACE/ACEXML/common/Exception.inl
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_Exception::id (void) const
+ACEXML_Exception::id () const
 {
   return ACEXML_Exception::exception_name_;
 }
diff --git a/ACE/ACEXML/common/FileCharStream.h b/ACE/ACEXML/common/FileCharStream.h
index 74d140c585e..bb2f0ec5e2c 100644
--- a/ACE/ACEXML/common/FileCharStream.h
+++ b/ACE/ACEXML/common/FileCharStream.h
@@ -30,10 +30,10 @@ class ACEXML_Export ACEXML_FileCharStream : public ACEXML_CharStream
 {
 public:
   /// Default constructor.
-  ACEXML_FileCharStream (void);
+  ACEXML_FileCharStream ();
 
   /// Destructor
-  virtual ~ACEXML_FileCharStream (void);
+  virtual ~ACEXML_FileCharStream ();
 
   /// Open a file.
   int open (const ACEXML_Char *name);
@@ -48,12 +48,12 @@ public:
    * Returns the available ACEXML_Char in the buffer.  -1
    * if the object is not initialized properly.
    */
-  virtual int available (void);
+  virtual int available ();
 
   /**
    * Close this stream and release all resources used by it.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -70,29 +70,29 @@ public:
   /**
    *  Determine the encoding of the file.
    */
-  virtual int determine_encoding (void);
+  virtual int determine_encoding ();
 
 
   /**
    * Peek the next ACEXML_Char in the CharStream.  Return the
    * character if success, -1 if EOF is reached.
    */
-  virtual int peek (void);
+  virtual int peek ();
 
   /**
    *  Resets the file pointer to the beginning of the stream.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
   /*
    * Get the character encoding for the file.
    */
-  virtual const ACEXML_Char *getEncoding (void);
+  virtual const ACEXML_Char *getEncoding ();
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void);
+  virtual const ACEXML_Char* getSystemId ();
 
 private:
 
diff --git a/ACE/ACEXML/common/InputSource.h b/ACE/ACEXML/common/InputSource.h
index 4642ec70aa1..d95303e6755 100644
--- a/ACE/ACEXML/common/InputSource.h
+++ b/ACE/ACEXML/common/InputSource.h
@@ -55,7 +55,7 @@ public:
   /**
    * Default constructor.
    */
-  ACEXML_InputSource (void);
+  ACEXML_InputSource ();
 
 
   /**
@@ -73,27 +73,27 @@ public:
   /**
    * Default destructor.
    */
-  virtual ~ACEXML_InputSource (void);
+  virtual ~ACEXML_InputSource ();
 
   /**
    * Get the ACEXML_Char stream for this input source.
    */
-  virtual ACEXML_CharStream *getCharStream (void) const;
+  virtual ACEXML_CharStream *getCharStream () const;
 
   /**
    * Get the character encoding for a byte stream or URI.
    */
-  virtual const ACEXML_Char *getEncoding (void) const;
+  virtual const ACEXML_Char *getEncoding () const;
 
   /**
    * Get the public identifier for this input source.
    */
-  virtual const ACEXML_Char *getPublicId (void) const;
+  virtual const ACEXML_Char *getPublicId () const;
 
   /**
    * Get the system identifier for this input source.
    */
-  virtual const ACEXML_Char *getSystemId (void) const;
+  virtual const ACEXML_Char *getSystemId () const;
 
   /**
    * Set the ACEXML_Char stream for this input source.
diff --git a/ACE/ACEXML/common/Locator.h b/ACE/ACEXML/common/Locator.h
index c4282454657..14f27aefb99 100644
--- a/ACE/ACEXML/common/Locator.h
+++ b/ACE/ACEXML/common/Locator.h
@@ -43,27 +43,27 @@ class ACEXML_Export ACEXML_Locator
 {
 public:
 
-  virtual ~ACEXML_Locator (void);
+  virtual ~ACEXML_Locator ();
 
   /*
    * Return the column number where the current document event ends.
    */
-  virtual int getColumnNumber (void) const = 0;
+  virtual int getColumnNumber () const = 0;
 
   /*
    * Return the line number where the current document event ends.
    */
-  virtual int getLineNumber (void) const = 0;
+  virtual int getLineNumber () const = 0;
 
   /*
    * Return the public identifier for the current document event.
    */
-  virtual const ACEXML_Char *getPublicId (void) const = 0;
+  virtual const ACEXML_Char *getPublicId () const = 0;
 
   /*
    * Return the system identifier for the current document event.
    */
-  virtual const ACEXML_Char *getSystemId (void) const = 0;
+  virtual const ACEXML_Char *getSystemId () const = 0;
 };
 
 
diff --git a/ACE/ACEXML/common/LocatorImpl.h b/ACE/ACEXML/common/LocatorImpl.h
index b927ebc7fcc..4a118122b7c 100644
--- a/ACE/ACEXML/common/LocatorImpl.h
+++ b/ACE/ACEXML/common/LocatorImpl.h
@@ -65,7 +65,7 @@ public:
   /*
    * Default constructor.
    */
-  ACEXML_LocatorImpl (void);
+  ACEXML_LocatorImpl ();
 
   /**
    * Construct a locator with systemId and publicId
@@ -84,27 +84,27 @@ public:
   /*
    * Destructor.
    */
-  virtual ~ACEXML_LocatorImpl (void);
+  virtual ~ACEXML_LocatorImpl ();
 
   /*
    * Return the column number where the current document event ends.
    */
-  virtual int getColumnNumber (void) const;
+  virtual int getColumnNumber () const;
 
   /*
    * Return the line number where the current document event ends.
    */
-  virtual int getLineNumber (void) const;
+  virtual int getLineNumber () const;
 
   /*
    * Return the public identifier for the current document event.
    */
-  virtual const ACEXML_Char *getPublicId (void) const;
+  virtual const ACEXML_Char *getPublicId () const;
 
   /*
    * Return the system identifier for the current document event.
    */
-  virtual const ACEXML_Char *getSystemId (void) const;
+  virtual const ACEXML_Char *getSystemId () const;
 
   /*
    * Set the column number of this locator.
@@ -142,7 +142,7 @@ public:
    * tying the life of the Locator with the parser is not appropriate. The
    * parser calls this method as soon as issuing an endDocument() call.
    */
-  void reset (void);
+  void reset ();
 
 private:
   ACEXML_Char *publicId_;
diff --git a/ACE/ACEXML/common/LocatorImpl.inl b/ACE/ACEXML/common/LocatorImpl.inl
index 1b4c6bc0d33..6802b38eea8 100644
--- a/ACE/ACEXML/common/LocatorImpl.inl
+++ b/ACE/ACEXML/common/LocatorImpl.inl
@@ -15,13 +15,13 @@ ACEXML_LocatorImpl::setLineNumber (int ln)
 }
 
 ACEXML_INLINE int
-ACEXML_LocatorImpl::getColumnNumber (void) const
+ACEXML_LocatorImpl::getColumnNumber () const
 {
   return this->columnNumber_;
 }
 
 ACEXML_INLINE int
-ACEXML_LocatorImpl::getLineNumber (void) const
+ACEXML_LocatorImpl::getLineNumber () const
 {
   return this->lineNumber_;
 }
@@ -41,13 +41,13 @@ ACEXML_LocatorImpl::setSystemId (const ACEXML_Char *id)
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_LocatorImpl::getPublicId (void) const
+ACEXML_LocatorImpl::getPublicId () const
 {
   return this->publicId_;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_LocatorImpl::getSystemId (void) const
+ACEXML_LocatorImpl::getSystemId () const
 {
   return this->systemId_;
 }
diff --git a/ACE/ACEXML/common/NamespaceSupport.h b/ACE/ACEXML/common/NamespaceSupport.h
index fdef9fa0786..7ddf776214d 100644
--- a/ACE/ACEXML/common/NamespaceSupport.h
+++ b/ACE/ACEXML/common/NamespaceSupport.h
@@ -60,16 +60,16 @@ class ACEXML_Export ACEXML_Namespace_Context_Stack
 {
 public:
   /// Default constructor.
-  ACEXML_Namespace_Context_Stack (void);
+  ACEXML_Namespace_Context_Stack ();
 
   /// Destructor.
-  ~ACEXML_Namespace_Context_Stack (void);
+  ~ACEXML_Namespace_Context_Stack ();
 
   /// Push the old namespace before entering into a new namespace scope.
   int push (ACEXML_NS_CONTEXT * old);
 
   /// Pop the old namespace when exiting a namespace scope.
-  ACEXML_NS_CONTEXT *pop (void);
+  ACEXML_NS_CONTEXT *pop ();
 
 private:
   /// Internal stack structure to hold namespace context.
@@ -126,17 +126,17 @@ public:
   /**
    * Default constructor.
    */
-  ACEXML_NamespaceSupport (void);
+  ACEXML_NamespaceSupport ();
 
   /**
    * Default destructor.
    */
-  ~ACEXML_NamespaceSupport (void);
+  ~ACEXML_NamespaceSupport ();
 
   /**
    *  Initialize the namespace support object
    */
-  int init(void);
+  int init();
 
   /**
    * XMLNS default prefix and URI strings.
@@ -185,7 +185,7 @@ public:
   /**
    * Revert to the previous namespace context.
    */
-  int popContext (void);
+  int popContext ();
 
   /**
    * Process a raw XML 1.0 name.
@@ -205,13 +205,13 @@ public:
    * Start a new Namespace context.  Prefixes defined in previous
    * context are copied over to the new context.
    */
-  int pushContext (void);
+  int pushContext ();
 
   /**
    * Reset this Namespace support object for reuse.
    *
    */
-  int reset (void);
+  int reset ();
 
 private:
   /**
diff --git a/ACE/ACEXML/common/SAXExceptions.h b/ACE/ACEXML/common/SAXExceptions.h
index c47594e846b..60db0a865a8 100644
--- a/ACE/ACEXML/common/SAXExceptions.h
+++ b/ACE/ACEXML/common/SAXExceptions.h
@@ -31,7 +31,7 @@ class ACEXML_Export ACEXML_SAXException : public ACEXML_Exception
 {
 public:
   /// Default constructor.
-  ACEXML_SAXException (void);
+  ACEXML_SAXException ();
 
   /// Constructor initializing the exception message.
   ACEXML_SAXException (const ACEXML_Char *msg);
@@ -43,25 +43,25 @@ public:
   ACEXML_SAXException (const ACEXML_SAXException &ex);
 
   /// Destructor.
-  virtual ~ACEXML_SAXException (void);
+  virtual ~ACEXML_SAXException ();
 
   /// Throw the exception.
-  virtual void _raise (void);
+  virtual void _raise ();
 
   /// Static narrow operation.
   static ACEXML_SAXException* _downcast (ACEXML_Exception* ex);
 
   /// Return the name of the exception.
-  virtual const ACEXML_Char *id (void) const;
+  virtual const ACEXML_Char *id () const;
 
   /// Return the extra message accompanying the exception.
-  const ACEXML_Char *message (void) const;
+  const ACEXML_Char *message () const;
 
-  virtual ACEXML_Exception *duplicate (void) const;
+  virtual ACEXML_Exception *duplicate () const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void) const;
+  virtual void print () const;
 
 protected:
   static const ACEXML_Char * exception_name_;
@@ -80,7 +80,7 @@ class ACEXML_Export ACEXML_SAXNotSupportedException
 {
 public:
   /// Default constructor.
-  ACEXML_SAXNotSupportedException (void);
+  ACEXML_SAXNotSupportedException ();
 
   /// Copy constructor.
   ACEXML_SAXNotSupportedException (const ACEXML_SAXNotSupportedException &ex);
@@ -92,21 +92,21 @@ public:
   ACEXML_SAXNotSupportedException (const ACEXML_Char* msg);
 
   /// Destructor.
-  virtual ~ACEXML_SAXNotSupportedException (void);
+  virtual ~ACEXML_SAXNotSupportedException ();
 
   /// Throw the exception.
-  virtual void _raise (void);
+  virtual void _raise ();
 
   /// Static narrow operation.
   static ACEXML_SAXNotSupportedException* _downcast (ACEXML_Exception* ex);
 
-  virtual const ACEXML_Char *id (void) const;
+  virtual const ACEXML_Char *id () const;
 
-  virtual ACEXML_Exception *duplicate (void) const;
+  virtual ACEXML_Exception *duplicate () const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void) const;
+  virtual void print () const;
 
 protected:
   static const ACEXML_Char exception_name_[];
@@ -122,7 +122,7 @@ class ACEXML_Export ACEXML_SAXNotRecognizedException
 {
 public:
   /// Default constructor.
-  ACEXML_SAXNotRecognizedException (void);
+  ACEXML_SAXNotRecognizedException ();
 
   /// Constructor with an initializing exception message.
   ACEXML_SAXNotRecognizedException (const ACEXML_Char *msg);
@@ -134,21 +134,21 @@ public:
   ACEXML_SAXNotRecognizedException& operator= (const ACEXML_SAXNotRecognizedException &ex);
 
   /// Destructor.
-  virtual ~ACEXML_SAXNotRecognizedException (void);
+  virtual ~ACEXML_SAXNotRecognizedException ();
 
   /// Throw the exception.
-  virtual void _raise (void);
+  virtual void _raise ();
 
   /// Static narrow operation.
   static ACEXML_SAXNotRecognizedException* _downcast (ACEXML_Exception* ex);
 
-  virtual const ACEXML_Char *id (void) const;
+  virtual const ACEXML_Char *id () const;
 
-  virtual ACEXML_Exception *duplicate (void) const;
+  virtual ACEXML_Exception *duplicate () const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void) const;
+  virtual void print () const;
 
 protected:
   static const ACEXML_Char exception_name_[];
@@ -164,7 +164,7 @@ class ACEXML_Export ACEXML_SAXParseException
 {
 public:
   /// Default constructor.
-  ACEXML_SAXParseException (void);
+  ACEXML_SAXParseException ();
 
   /// Constructor with an initializing exception message.
   ACEXML_SAXParseException (const ACEXML_Char *msg);
@@ -176,21 +176,21 @@ public:
   ACEXML_SAXParseException& operator= (const ACEXML_SAXParseException &ex);
 
   /// Destructor.
-  virtual ~ACEXML_SAXParseException (void);
+  virtual ~ACEXML_SAXParseException ();
 
   /// Throw the exception.
-  virtual void _raise (void);
+  virtual void _raise ();
 
   /// Static narrow operation.
   static ACEXML_SAXParseException* _downcast (ACEXML_Exception* ex);
 
-  virtual const ACEXML_Char *id (void) const;
+  virtual const ACEXML_Char *id () const;
 
-  virtual ACEXML_Exception *duplicate (void) const;
+  virtual ACEXML_Exception *duplicate () const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void) const;
+  virtual void print () const;
 
 protected:
   static const ACEXML_Char exception_name_[];
diff --git a/ACE/ACEXML/common/SAXExceptions.inl b/ACE/ACEXML/common/SAXExceptions.inl
index 798d6b0d2ae..404af3198a2 100644
--- a/ACE/ACEXML/common/SAXExceptions.inl
+++ b/ACE/ACEXML/common/SAXExceptions.inl
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXException::message (void) const
+ACEXML_SAXException::message () const
 {
   return (this->message_ == 0 ?
           ACEXML_Exception::null_ :
@@ -9,49 +9,49 @@ ACEXML_SAXException::message (void) const
 }
 
 ACEXML_INLINE void
-ACEXML_SAXException::_raise (void)
+ACEXML_SAXException::_raise ()
 {
   throw *this;
 }
 
 ACEXML_INLINE void
-ACEXML_SAXNotSupportedException::_raise (void)
+ACEXML_SAXNotSupportedException::_raise ()
 {
   throw *this;
 }
 
 ACEXML_INLINE void
-ACEXML_SAXNotRecognizedException::_raise (void)
+ACEXML_SAXNotRecognizedException::_raise ()
 {
   throw *this;
 }
 
 ACEXML_INLINE void
-ACEXML_SAXParseException::_raise (void)
+ACEXML_SAXParseException::_raise ()
 {
   throw *this;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXException::id (void) const
+ACEXML_SAXException::id () const
 {
   return ACEXML_SAXException::exception_name_;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXNotSupportedException::id (void) const
+ACEXML_SAXNotSupportedException::id () const
 {
   return ACEXML_SAXNotSupportedException::exception_name_;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXNotRecognizedException::id (void) const
+ACEXML_SAXNotRecognizedException::id () const
 {
   return ACEXML_SAXNotRecognizedException::exception_name_;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXParseException::id (void) const
+ACEXML_SAXParseException::id () const
 {
   return ACEXML_SAXParseException::exception_name_;
 }
diff --git a/ACE/ACEXML/common/XMLReader.h b/ACE/ACEXML/common/XMLReader.h
index 7f35d3cc156..a335291fc3e 100644
--- a/ACE/ACEXML/common/XMLReader.h
+++ b/ACE/ACEXML/common/XMLReader.h
@@ -41,27 +41,27 @@ class ACEXML_Export ACEXML_XMLReader
 {
 public:
 
-  virtual ~ACEXML_XMLReader (void);
+  virtual ~ACEXML_XMLReader ();
 
   /**
    * Return the current content handler.
    */
-  virtual ACEXML_ContentHandler *getContentHandler (void) const = 0;
+  virtual ACEXML_ContentHandler *getContentHandler () const = 0;
 
   /**
    * Return the current DTD handler.
    */
-  virtual ACEXML_DTDHandler *getDTDHandler (void) const = 0;
+  virtual ACEXML_DTDHandler *getDTDHandler () const = 0;
 
   /**
    * Return the current entity resolver.
    */
-  virtual ACEXML_EntityResolver *getEntityResolver (void) const = 0;
+  virtual ACEXML_EntityResolver *getEntityResolver () const = 0;
 
   /**
    * Return the current error handler.
    */
-  virtual ACEXML_ErrorHandler *getErrorHandler (void) const = 0;
+  virtual ACEXML_ErrorHandler *getErrorHandler () const = 0;
 
   /**
    * Look up the value of a feature.  This method allows
diff --git a/ACE/ACEXML/examples/SAXPrint/main.cpp b/ACE/ACEXML/examples/SAXPrint/main.cpp
index ea61c506050..6a5cdee2504 100644
--- a/ACE/ACEXML/examples/SAXPrint/main.cpp
+++ b/ACE/ACEXML/examples/SAXPrint/main.cpp
@@ -144,7 +144,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ACE_NEW_RETURN (handler,
                     ACEXML_SAXPrint_Handler (name),
                     -1);
-  auto_ptr<ACEXML_DefaultHandler> cleanup_handler (handler);
+
+  std::unique_ptr<ACEXML_DefaultHandler> cleanup_handler (handler);
 
   ACEXML_Parser parser;
   ACEXML_InputSource input (stm);
diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.h b/ACE/ACEXML/parser/parser/Entity_Manager.h
index a6da00bf8a5..f4a65b13f2b 100644
--- a/ACE/ACEXML/parser/parser/Entity_Manager.h
+++ b/ACE/ACEXML/parser/parser/Entity_Manager.h
@@ -61,10 +61,10 @@ class ACEXML_PARSER_Export ACEXML_Entity_Manager
 {
 public:
   /// Default constructor.
-  ACEXML_Entity_Manager (void);
+  ACEXML_Entity_Manager ();
 
   /// Destructor.
-  ~ACEXML_Entity_Manager (void);
+  ~ACEXML_Entity_Manager ();
 
   /// Add a new entity declaration.
   int add_entity (const ACEXML_Char *ref, const ACEXML_Char *value);
@@ -78,10 +78,10 @@ public:
                       ACEXML_Char*& publicId);
 
   /// Number of items in the Entity Manager
-  size_t size(void) const;
+  size_t size() const;
 
   /// Reset the state
-  int reset (void);
+  int reset ();
 
 private:
   ACEXML_ENTITIES_MANAGER* entities_;
diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.inl b/ACE/ACEXML/parser/parser/Entity_Manager.inl
index 9deab95fcc6..cdf3fb42164 100644
--- a/ACE/ACEXML/parser/parser/Entity_Manager.inl
+++ b/ACE/ACEXML/parser/parser/Entity_Manager.inl
@@ -47,7 +47,7 @@ ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char* ref,
 }
 
 ACEXML_INLINE int
-ACEXML_Entity_Manager::reset (void)
+ACEXML_Entity_Manager::reset ()
 {
   delete this->entities_;
   this->entities_ = 0;
@@ -56,7 +56,7 @@ ACEXML_Entity_Manager::reset (void)
 
 
 ACEXML_INLINE size_t
-ACEXML_Entity_Manager::size (void) const
+ACEXML_Entity_Manager::size () const
 {
   if (!this->entities_)
     return 0;
diff --git a/ACE/ACEXML/parser/parser/Parser.h b/ACE/ACEXML/parser/parser/Parser.h
index 64a330c3273..49a728be1b0 100644
--- a/ACE/ACEXML/parser/parser/Parser.h
+++ b/ACE/ACEXML/parser/parser/Parser.h
@@ -43,10 +43,10 @@ class ACEXML_PARSER_Export ACEXML_Parser : public ACEXML_XMLReader
 {
 public:
   /// Default constructor.
-  ACEXML_Parser (void);
+  ACEXML_Parser ();
 
   /// Destructor.
-  virtual ~ACEXML_Parser (void);
+  virtual ~ACEXML_Parser ();
 
   /**
    *  Initialize the parser state.
@@ -58,22 +58,22 @@ public:
    /**
    * Return the current content handler.
    */
-  virtual ACEXML_ContentHandler *getContentHandler (void) const;
+  virtual ACEXML_ContentHandler *getContentHandler () const;
 
   /*
    * Return the current DTD handler.
    */
-  virtual ACEXML_DTDHandler *getDTDHandler (void) const;
+  virtual ACEXML_DTDHandler *getDTDHandler () const;
 
   /*
    * Return the current entity resolver.
    */
-  virtual ACEXML_EntityResolver *getEntityResolver (void) const;
+  virtual ACEXML_EntityResolver *getEntityResolver () const;
 
   /*
    * Return the current error handler.
    */
-  virtual ACEXML_ErrorHandler *getErrorHandler (void) const;
+  virtual ACEXML_ErrorHandler *getErrorHandler () const;
 
   /**
    * Look up the value of a feature.  This method allows
@@ -136,30 +136,30 @@ protected:
   /**
    * Parse XML Prolog.
    */
-  void parse_xml_prolog (void);
+  void parse_xml_prolog ();
 
   /**
    * Parse VersionInfo declaration.
    *
    */
-  void parse_version_info (void);
+  void parse_version_info ();
 
   /**
    *  Parse a EncodingDecl declaration.
    *
    */
-  void parse_encoding_decl (void);
+  void parse_encoding_decl ();
 
   /**
    *  Parse a XMLDecl declaration.
    *
    */
-  void parse_xml_decl (void);
+  void parse_xml_decl ();
 
   /**
    *  Parse a TextDecl declaration.
    */
-  int parse_text_decl (void);
+  int parse_text_decl ();
 
   /**
    * Parse a PI statement.  The first character encountered
@@ -167,13 +167,13 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_processing_instruction (void);
+  int parse_processing_instruction ();
 
   /**
    * Parse the DOCTYPE declaration.  The first character encountered
    * should always be  'D' in doctype prefix: "@<@!DOCTYPE".
    */
-  int parse_doctypedecl (void);
+  int parse_doctypedecl ();
 
   /**
    * Parse an XML element.  The first character encountered should
@@ -218,7 +218,7 @@ protected:
    *
    * @retval  A pointer to name of reference, 0 otherwise.
    */
-  ACEXML_Char* parse_reference_name (void);
+  ACEXML_Char* parse_reference_name ();
 
   /**
    * Parse a CDATA section.  The first character should always be the first
@@ -227,19 +227,19 @@ protected:
    * @retval 0 on success.
    * @retval -1 if fail.
    */
-  int parse_cdata (void);
+  int parse_cdata ();
 
   /**
    * Parse a "markupdecl" section, this includes both "markupdecl" and
    * "DeclSep" sections in XML specification
    */
-  int parse_internal_dtd (void);
+  int parse_internal_dtd ();
 
   /**
    *  Skip over a comment. The first character encountered should always be
    *  the first '-' in the comment prefix "@<@!--".
    */
-  int parse_comment (void);
+  int parse_comment ();
 
   /**
    * Parse an "ELEMENT" decl.  The first character this method
@@ -248,7 +248,7 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_element_decl (void);
+  int parse_element_decl ();
 
   /**
    * Parse an "ENTITY" decl.  The first character this method expects
@@ -256,7 +256,7 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_entity_decl (void);
+  int parse_entity_decl ();
 
   /**
    * Parse an "ATTLIST" decl.  Thse first character this method
@@ -265,13 +265,13 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_attlist_decl (void);
+  int parse_attlist_decl ();
 
   /**
    * Parse a AttType declaration.
    *
    */
-  int parse_atttype (void);
+  int parse_atttype ();
 
   /**
    *Parse a "NOTATION" decl.  The first character this method
@@ -280,7 +280,7 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_notation_decl (void);
+  int parse_notation_decl ();
 
   /**
    * Parse an ExternalID or a reference to PUBLIC ExternalID.
@@ -308,50 +308,50 @@ protected:
    *  Parse an external DTD.
    *
    */
-  int parse_external_dtd (void);
+  int parse_external_dtd ();
 
   /**
    *  Parse an external subset. This does the actual parsing of an external
    *  subset and is called by @sa parse_external_dtd.
    *
    */
-  int parse_external_subset (void);
+  int parse_external_subset ();
 
   /**
    *  Parse a markupDecl section.
    *
    */
-  int parse_markup_decl (void);
+  int parse_markup_decl ();
 
   /**
    *  Parse a conditionalSect declaration.
    *
    */
-  int parse_conditional_section (void);
+  int parse_conditional_section ();
 
   /**
    *  Parse a includeSect declaration.
    *
    */
-  int parse_includesect (void);
+  int parse_includesect ();
 
   /**
    *
    *  Parse a ignoreSect declaration.
    */
-  int parse_ignoresect (void);
+  int parse_ignoresect ();
 
   /**
    * Parse a PEReference.
    *
    */
-  int parse_PE_reference (void);
+  int parse_PE_reference ();
 
   /**
    *  Parse a Reference.
    *
    */
-  int parse_entity_reference (void);
+  int parse_entity_reference ();
 
   /**
    *  Parse an entityValue.
@@ -363,7 +363,7 @@ protected:
    *  Parse a DefaultDecl specification.
    *
    */
-  int parse_defaultdecl (void);
+  int parse_defaultdecl ();
 
 
   /**
@@ -374,7 +374,7 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_children_definition (void);
+  int parse_children_definition ();
 
   /**
    * Parse a @c cp non-terminal.  @c cp can either be a @c seq or a @c choice.
@@ -443,7 +443,7 @@ protected:
    *             if successful.
    *  @retval 0 otherwise.
    */
-  ACEXML_Char* parse_attname (void);
+  ACEXML_Char* parse_attname ();
 
   /**
    *  Parse an attribute value.
@@ -458,7 +458,7 @@ protected:
    *
    *  @return 0 if attribute type was read successfully, -1 otherwise.
    */
-  int parse_tokenized_type (void);
+  int parse_tokenized_type ();
 
   /**
    *  Parse a SystemLiteral.
@@ -554,10 +554,10 @@ protected:
   int isPubidChar (const ACEXML_Char c) const;
 
   /// Get a character.
-  virtual ACEXML_Char get (void);
+  virtual ACEXML_Char get ();
 
   /// Peek a character.
-  virtual ACEXML_Char peek (void);
+  virtual ACEXML_Char peek ();
 
 private:
 
@@ -571,7 +571,7 @@ private:
    *
    * @sa skip_whitespace_count
    */
-  ACEXML_Char skip_whitespace (void);
+  ACEXML_Char skip_whitespace ();
 
   /**
    * Skip any whitespaces encountered until the first non-whitespace
@@ -594,7 +594,7 @@ private:
    *
    * @retval 0 when succeeds, -1 if no equal sign is found.
    */
-  int skip_equal (void);
+  int skip_equal ();
 
   /**
    * Get a quoted string.  Quoted strings are used to specify
@@ -683,13 +683,13 @@ private:
    *
    * @retval Number of whitespace characters skipped.
    */
-  int check_for_PE_reference (void);
+  int check_for_PE_reference ();
 
   /**
    *  Reset the parser state.
    *
    */
-  void reset (void);
+  void reset ();
 
   /**
    * Very trivial, non-conformant normalization of a systemid.
diff --git a/ACE/ACEXML/parser/parser/Parser.inl b/ACE/ACEXML/parser/parser/Parser.inl
index 57b1a77d2c5..8ec7eb0fe52 100644
--- a/ACE/ACEXML/parser/parser/Parser.inl
+++ b/ACE/ACEXML/parser/parser/Parser.inl
@@ -7,25 +7,25 @@
 //=============================================================================
 
 ACEXML_INLINE ACEXML_ContentHandler *
-ACEXML_Parser::getContentHandler (void) const
+ACEXML_Parser::getContentHandler () const
 {
   return this->content_handler_;
 }
 
 ACEXML_INLINE ACEXML_DTDHandler *
-ACEXML_Parser::getDTDHandler (void) const
+ACEXML_Parser::getDTDHandler () const
 {
   return this->dtd_handler_;
 }
 
 ACEXML_INLINE ACEXML_EntityResolver *
-ACEXML_Parser::getEntityResolver (void) const
+ACEXML_Parser::getEntityResolver () const
 {
   return this->entity_resolver_;
 }
 
 ACEXML_INLINE ACEXML_ErrorHandler *
-ACEXML_Parser::getErrorHandler (void) const
+ACEXML_Parser::getErrorHandler () const
 {
   return this->error_handler_;
 }
@@ -171,7 +171,7 @@ ACEXML_Parser::is_whitespace (const ACEXML_Char c) const
 }
 
 ACEXML_INLINE ACEXML_Char
-ACEXML_Parser::skip_whitespace (void)
+ACEXML_Parser::skip_whitespace ()
 {
   ACEXML_Char ch = this->get();
   while (this->is_whitespace (ch))
@@ -193,7 +193,7 @@ ACEXML_Parser::skip_whitespace_count (ACEXML_Char *peeky)
 }
 
 ACEXML_INLINE int
-ACEXML_Parser::skip_equal (void)
+ACEXML_Parser::skip_equal ()
 {
   if (this->skip_whitespace() != '=')
     return -1;
@@ -203,7 +203,7 @@ ACEXML_Parser::skip_equal (void)
 }
 
 ACEXML_INLINE ACEXML_Char
-ACEXML_Parser::get (void)
+ACEXML_Parser::get ()
 {
   ACEXML_Char ch = 0;
   const ACEXML_InputSource* ip = this->current_->getInputSource();
@@ -231,7 +231,7 @@ ACEXML_Parser::get (void)
 }
 
 ACEXML_INLINE ACEXML_Char
-ACEXML_Parser::peek (void)
+ACEXML_Parser::peek ()
 {
   // Using an extra level of indirection so we can
   // manage document location in the future.
diff --git a/ACE/ACEXML/parser/parser/ParserContext.h b/ACE/ACEXML/parser/parser/ParserContext.h
index 0ac64628d1d..9264273940b 100644
--- a/ACE/ACEXML/parser/parser/ParserContext.h
+++ b/ACE/ACEXML/parser/parser/ParserContext.h
@@ -44,13 +44,13 @@ public:
   /// Reset the parser context. This does not free up the memory. Only sets
   /// it to zero. Meant to be called after a context is pushed on to a
   /// stack.
-  void reset (void);
+  void reset ();
 
   /// Get the underlying input source.
-  virtual ACEXML_InputSource* getInputSource(void);
+  virtual ACEXML_InputSource* getInputSource();
 
   /// Get the underlying locator.
-  virtual ACEXML_LocatorImpl* getLocator(void);
+  virtual ACEXML_LocatorImpl* getLocator();
 
   /// Set the underlying input source.
   virtual void setInputSource(ACEXML_InputSource* ip);
diff --git a/ACE/ACEXML/parser/parser/ParserContext.inl b/ACE/ACEXML/parser/parser/ParserContext.inl
index e2921519cbe..31bae2cd47a 100644
--- a/ACE/ACEXML/parser/parser/ParserContext.inl
+++ b/ACE/ACEXML/parser/parser/ParserContext.inl
@@ -43,13 +43,13 @@ ACEXML_Parser_Context::operator= (const ACEXML_Parser_Context& src)
 
 
 ACEXML_INLINE ACEXML_InputSource*
-ACEXML_Parser_Context::getInputSource (void)
+ACEXML_Parser_Context::getInputSource ()
 {
   return this->instream_;
 }
 
 ACEXML_INLINE ACEXML_LocatorImpl*
-ACEXML_Parser_Context::getLocator (void)
+ACEXML_Parser_Context::getLocator ()
 {
   return this->locator_;
 }
@@ -67,7 +67,7 @@ ACEXML_Parser_Context::setLocator (ACEXML_LocatorImpl* locator)
 }
 
 ACEXML_INLINE void
-ACEXML_Parser_Context::reset (void)
+ACEXML_Parser_Context::reset ()
 {
   this->instream_ = 0;
   this->locator_ = 0;
diff --git a/ACE/ChangeLogs/ACE-6_5_12 b/ACE/ChangeLogs/ACE-6_5_12
new file mode 100644
index 00000000000..0e64eebeff6
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_12
@@ -0,0 +1,701 @@
+commit 7449152aa7f626f93fc495b68b747d94b7331731
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Oct 25 09:48:17 2020 +0100
+
+    Extend news file with changes as part of issue #1271
+    
+        * ACE/NEWS:
+
+commit 83dc09aacce718c0844ba721053298f21bc8e160
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Oct 24 10:39:48 2020 +0200
+
+    Updated news file for x.5.12
+    
+        * ACE/NEWS:
+
+commit 350d4011d2eddbe4429d0048b8dfda4e293be23c
+Merge: 46f29e2e07d 22532739d89
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Oct 22 08:40:45 2020 -0500
+
+    Merge pull request #1268 from mitza-oci/android
+    
+    Updates for Windows-hosted Android NDK cross-compile
+
+commit 46f29e2e07d210e6804786b1863b087aee05a540
+Merge: 886935f09b8 935fcd2d827
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Oct 22 11:02:54 2020 +0200
+
+    Merge pull request #1261 from jwillemsen/jwi-cle
+    
+    Removed changelog editor, we don't maintain manual changelogs anymore…
+
+commit 886935f09b885b90391c29d1be85d286af15222c
+Merge: c4559d9048a 17c1db72fef
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Oct 22 10:42:19 2020 +0200
+
+    Merge pull request #1262 from jwillemsen/jwi-guidelines
+    
+    Fixed some typos and removed some references/support for subversion as version control
+
+commit 22532739d89cd5ad3883c6b04ad289db54cf5e41
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Oct 21 12:52:41 2020 -0500
+
+    Updates for Windows-hosted Android NDK cross-compile
+
+commit 935fcd2d82761dd605211a1ac0556a17f0188b17
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 14 14:43:45 2020 +0200
+
+    Removed changelog editor, we don't maintain manual changelogs anymore and the tool hasn't bee updated for git at all
+
+commit 17c1db72fef43b50d4454ed4bb6df1a85781501f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 14 14:35:02 2020 +0200
+
+    Updated comment
+
+commit a428372d1b0a1516853947c554e33f6223cba7e8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 14 14:34:46 2020 +0200
+
+    Updated comment
+
+commit afd4cc54d7c5bab54cf4ac76e3cf0feb9f704108
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 14 14:34:23 2020 +0200
+
+    Removed check for non svn files
+
+commit d09cdd5a2c7a5c0c83f58c7954dcab4036c33ebd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 14 14:31:50 2020 +0200
+
+    Removed special handling for subversion files
+
+commit 3ab2a7fc9753f0686bf4f0c887f1eb3d22b1e7f6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 14 14:30:52 2020 +0200
+
+    Removed check_for_changelog_errors, we don't maintain changelogs anymore
+
+commit 50f221e13831d2fd0a3a09b671d649cac28f980a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 14 14:30:19 2020 +0200
+
+    Fixed typos in comments
+
+commit a32f0645e56f07afdbd86c6230537edc9ef8858a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 14 14:29:57 2020 +0200
+
+    Removed reference to svn
+
+commit 4b16e80fdac9e3c74774b03f405b4d2383d0aa90
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Oct 12 17:08:01 2020 +0200
+
+    Fixed typos
+    
+        * ACE/ace/Copy_Disabled.h:
+        * ACE/ace/DLL_Manager.h:
+        * ACE/ace/Date_Time.h:
+
+commit 42c12b3727d091e29bcf74886343a75023c43a2e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Oct 12 17:02:27 2020 +0200
+
+    Layout and typo changes
+    
+        * ACE/ace/PI_Malloc.h:
+
+commit c942cf5318f7599584cccedaf2f6c3ababd49708
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Oct 12 16:48:29 2020 +0200
+
+    Removed c++0x and c++1y, added c++20
+
+commit 30dc9807c9d6c752e0bc0d528ae2e7c57c53f716
+Merge: d25bf627beb a5bb8cb886e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 6 13:05:15 2020 +0200
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit d25bf627bebf25507b2f4c7e3023ec2c1bd0ed7b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 6 13:05:07 2020 +0200
+
+    Use https
+    
+        * ACE/docs/ACE-bug-process.html:
+        * ACE/docs/usage-bugzilla.html:
+        * ACE/html/Stats/img.html:
+        * TAO/docs/TAO-metrics.html:
+        * TAO/docs/releasenotes/index.html:
+
+commit 80472e4cf63bea10b0b3a1dd45f1b8d6a05cc57f
+Merge: 01c51074185 ae13700f764
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Oct 5 13:54:24 2020 +0200
+
+    Merge pull request #1248 from jwillemsen/jwi-doxygenup2
+    
+    Upgrade to latest doxygen
+
+commit ae13700f76493361f0c82ac49d87567f9ac18cf9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Oct 5 12:10:20 2020 +0200
+
+    Upgrade to latest doxygen
+    
+        * ACE/etc/ace.doxygen:
+        * ACE/etc/ace_inet.doxygen:
+        * ACE/etc/ace_qos.doxygen:
+        * ACE/etc/ace_rmcast.doxygen:
+        * ACE/etc/ace_ssl.doxygen:
+        * ACE/etc/acexml.doxygen:
+        * TAO/etc/tao.doxygen:
+        * TAO/etc/tao_anytypecode.doxygen:
+        * TAO/etc/tao_av.doxygen:
+        * TAO/etc/tao_compression.doxygen:
+        * TAO/etc/tao_cosevent.doxygen:
+        * TAO/etc/tao_cosnaming.doxygen:
+        * TAO/etc/tao_cosnotification.doxygen:
+        * TAO/etc/tao_costime.doxygen:
+        * TAO/etc/tao_costrader.doxygen:
+        * TAO/etc/tao_dynamicany.doxygen:
+        * TAO/etc/tao_dynamicinterface.doxygen:
+        * TAO/etc/tao_esf.doxygen:
+        * TAO/etc/tao_ifr.doxygen:
+        * TAO/etc/tao_implrepo.doxygen:
+        * TAO/etc/tao_iormanip.doxygen:
+        * TAO/etc/tao_iortable.doxygen:
+        * TAO/etc/tao_pi.doxygen:
+        * TAO/etc/tao_pi_server.doxygen:
+        * TAO/etc/tao_portablegroup.doxygen:
+        * TAO/etc/tao_portableserver.doxygen:
+        * TAO/etc/tao_rtcorba.doxygen:
+        * TAO/etc/tao_rtevent.doxygen:
+        * TAO/etc/tao_rtportableserver.doxygen:
+        * TAO/etc/tao_security.doxygen:
+        * TAO/etc/tao_smartproxies.doxygen:
+        * TAO/etc/tao_ssliop.doxygen:
+        * TAO/etc/tao_strategies.doxygen:
+        * TAO/etc/tao_transportcurrent.doxygen:
+        * TAO/etc/tao_ziop.doxygen:
+
+commit d80f32e641d3431e39268d66f7718042611754c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Oct 4 10:24:41 2020 +0200
+
+    Add link for conda-forge update
+    
+        * ACE/docs/bczar/bczar.html:
+
+commit f458a1ace77661e39f55575a153d0c34160e218e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Oct 3 10:24:37 2020 +0200
+
+    Give an eror when we can't detect the MacOSX version instead of silently including no real config file
+    
+        * ACE/ace/config-macosx.h:
+
+commit 7d1e5116b673b3655837e0ce549e7781702d309c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Oct 2 16:45:22 2020 +0200
+
+    Perl shebang portability changes
+    
+        * ACE/bin/PerlACE/ConfigList.pm:
+        * ACE/bin/PerlACE/MSProject.pm:
+        * ACE/bin/PerlACE/Process.pm:
+        * ACE/bin/PerlACE/ProcessAndroid.pm:
+        * ACE/bin/PerlACE/ProcessLVRT.pm:
+        * ACE/bin/PerlACE/ProcessVX.pm:
+        * ACE/bin/PerlACE/ProcessVX_Unix.pm:
+        * ACE/bin/PerlACE/ProcessVX_Win32.pm:
+        * ACE/bin/PerlACE/ProcessWinCE.pm:
+        * ACE/bin/PerlACE/ProcessWinCE_Unix.pm:
+        * ACE/bin/PerlACE/Process_Unix.pm:
+        * ACE/bin/PerlACE/Process_VMS.pm:
+        * ACE/bin/PerlACE/Process_Win32.pm:
+        * ACE/bin/PerlACE/Run_Test.pm:
+        * ACE/bin/PerlACE/TestTarget.pm:
+        * ACE/bin/PerlACE/TestTarget_Android.pm:
+        * ACE/bin/PerlACE/TestTarget_LVRT.pm:
+        * ACE/bin/PerlACE/TestTarget_VxWorks.pm:
+        * ACE/bin/PerlACE/TestTarget_WinCE.pm:
+        * ACE/bin/Uniqueid.pm:
+
+commit 39b6bf47cedf362390469a2cd7aadf123adc8033
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Oct 2 16:25:40 2020 +0200
+
+    Use #!/usr/bin/env perl as perl shebang for portability, see https://stackoverflow.com/questions/10376206/what-is-the-preferred-bash-shebang and https://github.com/conda-forge/staged-recipes/pull/12698
+    
+        * ACE/bin/depgen.pl:
+        * ACE/bin/generate_export_file.pl:
+        * ACE/bin/mpc.pl:
+        * ACE/bin/mwc.pl:
+        * ACE/bin/split-cpp.pl:
+        * ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl:
+        * ACE/examples/IPC_SAP/SSL_SAP/summarize.pl:
+
+commit 44a6cb570564dd58e71eedb1fc1975df048fcbf9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 22 08:33:59 2020 +0200
+
+    Zap empty lines
+    
+        * ACE/ace/SPIPE_Addr.cpp:
+
+commit 6f78b0285ec9a20ccc8c626ff99e5df711a25e18
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 18 08:46:41 2020 +0200
+
+    Remove usage of narrow_from_decl/narrow_from_scope and replace them with dynamic_cast
+
+commit 0ca9c019335cde957877214b6ffb4328de4ca198
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 13:49:45 2020 +0200
+
+    Doxygen change
+    
+        * ACE/ace/SOCK_Dgram_Mcast.h:
+
+commit ab728e5de3864251bc10d399aa3dab686706e75c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 11:13:20 2020 +0200
+
+    Removed empty lines
+    
+        * ACE/examples/Reactor/Ntalker/README:
+
+commit 1359caf0cc52564e3480de85d1b87811425f02c9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 11:13:06 2020 +0200
+
+    Doxygen changes
+    
+        * ACE/ace/Log_Category.h:
+
+commit 14d3e012d5632d4932f1a5045241b934a0956e33
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 2 15:47:24 2020 +0200
+
+    Removed setting of cidl, not used anymore for ACE/TAO
+    
+        * ACE/rpmbuild/ace-tao.spec:
+
+commit aabdac304b8b9c20617e95b1b3bf890f34c3c011
+Merge: 2667ee25fd5 29f2ebd6e7b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 2 12:14:10 2020 +0200
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit 2667ee25fd5de951201fe27171f1168cdaa5224b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 2 12:14:05 2020 +0200
+
+    Layout changes
+    
+        * ACE/ace/Init_ACE.cpp:
+        * ACE/ace/Service_Config.h:
+
+commit 29f2ebd6e7ba98e76722cedc4ff1ae95fcdce16d
+Merge: 38f7c05997f 46923db6e60
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 1 15:48:51 2020 +0200
+
+    Merge pull request #1230 from jwillemsen/jwi-noxscdynamictypes
+    
+    No need for adding XSC_ROOT/MPC to dynamic_types
+
+commit 35d57553c13c79ff64d9eebad1d5486e293861fc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 1 14:24:27 2020 +0200
+
+    Layout and docu changes
+    
+        * ACE/ace/Service_Config.h:
+        * ACE/ace/Service_Gestalt.h:
+
+commit 46923db6e60d8970b4b502ee903f2bb48b3f59eb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 31 12:17:16 2020 +0200
+
+    No need for adding XSC_ROOT/MPC to dynamic_types
+    
+        * ACE/bin/MakeProjectCreator/config/MPC.cfg:
+
+commit a886e56c56209c11b35ebf7c89834ecb9e837882
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 27 08:25:31 2020 +0200
+
+    Revert "Use unspecified_bool_type instead of bool."
+
+commit e816643abb2682e5a53a33e61e276183289dba8d
+Merge: 80a604ead86 38143a3c197
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 27 08:14:17 2020 +0200
+
+    Merge pull request #1226 from sudipm-mukherjee/sudip/hurd
+    
+    Fix build for Debian hurd
+
+commit 38143a3c1975fbc8a35db00a5b15d12f8bfbe5a1
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Date:   Wed Aug 26 20:28:21 2020 +0100
+
+    Fix build for Debian hurd
+    
+    Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+
+commit 0c2d1a119120df3e6f615c82cbb23d39e9763dfa
+Merge: ffdd6735537 e4e843a66e9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 20:29:11 2020 +0200
+
+    Merge branch 'thr-mgr-join-leak-deadlock' of git://github.com/likema/ACE_TAO into likema-thr-mgr-join-leak-deadlock
+
+commit ffdd6735537f4c5a69fdf75a658d12d55108d7cd
+Merge: dac841ab982 75f62ae3902
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 20:28:49 2020 +0200
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit dac841ab98249ba3984f7cae975115d0f3ad236e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 16:15:22 2020 +0200
+
+    Indent change in class docu
+    
+        * ACE/ace/Log_Msg_Callback.h:
+
+commit 6fdc79c928bc388be70ccf9f1e371648cdf70ef3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 15:54:32 2020 +0200
+
+    Layout changes
+    
+        * ACE/ace/Intrusive_Auto_Ptr.inl:
+
+commit 3f027144ea3b868d7dbf75231b993c410a2156fb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 15:53:29 2020 +0200
+
+    Layout changes and removed commented out operation
+    
+        * ACE/ace/Intrusive_Auto_Ptr.h:
+
+commit 182f6c2a6453a8e4c84bd64a234194d7b42ea07f
+Merge: 8b02c0495ec 7e7902f9ffa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 15:53:08 2020 +0200
+
+    Merge branch 'unspecified-bool-type' of git://github.com/likema/ACE_TAO into likema-unspecified-bool-type
+
+commit b4840dd0504121a633774fae167c59c85103a5f9
+Merge: 2f35a199f9d 37280f99664
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 08:22:47 2020 +0200
+
+    Merge pull request #1216 from jwillemsen/jwi-linuxfeaturestravis
+    
+    Migrate several custom travis configurations to github actions
+
+commit e39f3d46ca6b992428cae3f9629de1d77225d452
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Wed Aug 26 02:02:33 2020 +0800
+
+    Fix building DLL_Manager.cpp on AIX
+
+commit 5be4b01d123bebfc355cef1ec83e2b5d041b6ac8
+Merge: 9b8aa251557 939549d98ba
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Aug 25 13:26:57 2020 +0200
+
+    Merge pull request #1219 from likema/fix-select-reactor-hash-map
+    
+    Fix redefined ACE_SELECT_REACTOR_BASE_USES_HASH_MAP warning.
+
+commit 9277daf0bc51db1eda1fd6b347ddf11bc2e20a7f
+Merge: 8d1155019cf dfbada54e38
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 24 20:06:46 2020 +0200
+
+    Merge pull request #1218 from jwillemsen/master
+    
+    Fixed documentation typos
+
+commit 939549d98ba657b60b122875918e66fc9fd907d6
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Tue Aug 25 01:17:38 2020 +0800
+
+    Fix redefined ACE_SELECT_REACTOR_BASE_USES_HASH_MAP warning.
+    
+    If ACE_SELECT_REACTOR_BASE_USES_HASH_MAP is defined by ace/config.h, GCC
+    would warn redefinition.
+
+commit dfbada54e389168c27e9c5748ba16787225c4727
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 24 17:31:10 2020 +0200
+
+    Doxygen changes
+    
+        * ACE/ace/NT_Service.h:
+
+commit c3c16c78dfec71183de20d1ec95e3cda0aeee557
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 24 17:29:22 2020 +0200
+
+    Fixed typo
+    
+        * ACE/ace/Obstack_T.h:
+        * TAO/docs/releasenotes/trader.html:
+        * TAO/orbsvcs/tests/Property/client.cpp:
+        * TAO/orbsvcs/tests/Simple_Naming/README:
+
+commit c1d01ce02ae81bc47e88fdaa46c8aa0b67bed81e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 24 17:02:00 2020 +0200
+
+    UNIX_Addr_Test should also be excluded for ACE_FOR_TAO
+    
+        * ACE/tests/run_test.lst:
+        * ACE/tests/tests.mpc:
+
+commit e6d828ed165644465a6499a17105f01586f7f3d4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 24 16:31:18 2020 +0200
+
+    Bug_4189_Regression_Test needs to be excluded for ace_for_tao
+    
+        * ACE/tests/Bug_4189_Regression_Test.cpp:
+        * ACE/tests/run_test.lst:
+        * ACE/tests/tests.mpc:
+
+commit a293b62dab742818572a514251dad14abafcd502
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 24 15:54:59 2020 +0200
+
+    Layout changes
+    
+        * ACE/ace/Cleanup.h:
+        * ACE/ace/Object_Manager_Base.h:
+
+commit 8d1155019cf86f95cc49c77c7329dace810142a3
+Merge: 026e77fdfb4 fd49219a28f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 21 19:41:20 2020 +0200
+
+    Merge pull request #1210 from jwillemsen/jwi-noreturn
+    
+    Mark also ACE_OS::exit with ACE_GCC_NO_RETURN
+
+commit 7bc0aecc3d80e8d105be68f329ede4a8c3a3fc6e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 21 11:16:06 2020 +0200
+
+    With C++11 make use of std::unique_ptr
+    
+        * ACE/examples/APG/Naming/Name_Binding.h:
+        * ACE/examples/APG/Reactor/HAStatus.cpp:
+
+commit d5f4d848c1318e544f2f1f82f6d82e4a1361ec64
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 21 11:02:14 2020 +0200
+
+    Make use of C++11 std::unique_ptr
+    
+        * ACE/ACEXML/examples/SAXPrint/main.cpp:
+        * ACE/tests/Bug_2540_Regression_Test.cpp:
+        * ACE/tests/Bug_2820_Regression_Test.cpp:
+        * ACE/tests/DLL_Test.cpp:
+
+commit fd49219a28f14136731f809f8fb959bc2022f912
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 21 10:32:13 2020 +0200
+
+    Const change
+    
+        * ACE/tests/NonBlocking_Conn_Test.h:
+
+commit 888e4cf4a074e7dd0ef7f0f6e0adb5fa9675a817
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 21 10:32:05 2020 +0200
+
+    Layout change
+    
+        * ACE/ace/OS_NS_stdlib.inl:
+
+commit b272800c49f5b929962e38c0a8628e6fec167412
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 21 10:31:51 2020 +0200
+
+    Mark also exit with ACE_GCC_NO_RETURN
+    
+        * ACE/ace/OS_NS_stdlib.h:
+
+commit 53ac0545ce37c867745c618a29eb6f82b538fc8a
+Merge: 57ecd9fd721 c61b0db31cd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 18:29:29 2020 +0200
+
+    Merge pull request #1209 from jwillemsen/jwi-doxygen2
+    
+    Upgrade doxygen files to latest doxygen version
+
+commit 57ecd9fd7216a7fbdd09c54b5ff32a2b03dc0fa6
+Merge: c199c1aa62b 3932af0ee97
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu Aug 20 10:27:26 2020 -0500
+
+    Merge pull request #1206 from iguessthislldo/igtd/no-return
+    
+    Create ACE_GCC_NO_RETURN, Add to ACE_OS::_exit
+
+commit c199c1aa62b82c917fde05ee91589a6ff9222c91
+Merge: ab97ecf8087 bbe905207b9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 17:12:04 2020 +0200
+
+    Merge pull request #1208 from jwillemsen/master
+    
+    Various layout/const/doxygen/bool minor changes
+
+commit c61b0db31cda9725e27e512b8a847651fb7708d0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 16:06:33 2020 +0200
+
+    Upgrade doxygen files to latest doxygen version
+
+commit fefa0d5f1850d0f1e633c4182702698ce64f6eb8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 14:41:22 2020 +0200
+
+    Layout and true/false changes
+    
+        * ACE/ace/INET_Addr.cpp:
+        * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * TAO/tao/DynamicInterface/DII_Arguments.cpp:
+        * TAO/tao/DynamicInterface/Server_Request.cpp:
+
+commit 78bb4ae0df5461dcfd5303a02c63fc2fb8fd82d2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 14:13:07 2020 +0200
+
+    Const and layout changes
+    
+        * ACE/ace/Acceptor.cpp:
+        * ACE/ace/Connector.cpp:
+        * ACE/ace/FILE_IO.h:
+        * ACE/ace/Hashable.h:
+        * ACE/ace/INET_Addr.cpp:
+        * ACE/ace/IOStream_T.h:
+        * ACE/ace/IO_SAP.h:
+        * ACE/ace/IPC_SAP.h:
+        * ACE/ace/If_Then_Else.h:
+        * ACE/ace/Local_Memory_Pool.h:
+
+commit 3932af0ee97a2c713fb6e0bbea6c3c317fe7e19f
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Aug 19 17:00:34 2020 -0500
+
+    Create ACE_GCC_NO_RETURN, Add to ACE_OS::_exit
+    
+    To fix fallthrough warning in ACE.cpp. Also added to ACE_OS::abort.
+
+commit e0d4c3e0147452a79a786088be1fec7365435b82
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 19 13:43:00 2020 +0200
+
+    Const changes
+    
+        * ACE/ace/Connector.cpp:
+
+commit ece08cd0ab22e71841e70cf8aeea5f52eeccefad
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 19 12:09:43 2020 +0200
+
+    Removed empty lines
+    
+        * ACE/ace/Unbounded_Set.h:
+        * ACE/ace/Unbounded_Set_Ex.h:
+
+commit 00fa9dccdc506736f651c4076d74d6f821f54762
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 17 11:21:49 2020 +0200
+
+    Remove Visual Studio 2015 as IDE for which we ship generated solutions as part of the release
+    
+        * ACE/docs/Download.html:
+
+commit fcdeaf9ba2ff504e3d3f4ac2f9c06657d498b39f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 17 11:05:51 2020 +0200
+
+    Add missing changelogs
+
+commit 8f8ccba316c69953e1f1263f734e707a98c72581
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 17 11:04:51 2020 +0200
+
+    Prepare for next release and always create a changelog
+    
+        * ACE/bin/copy-local-script.sh:
+        * ACE/bin/make_release.py:
+
+commit dbbd86832258985b5cf9533d85738e38df37ee66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 17 10:14:35 2020 +0200
+
+    Make ACE 6.5.11 and TAO 2.5.11 public available and prepare for next release
+    
+        * 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:
+
+commit 7ed14884f80170cd5d19c586a5be53b6c89b36ce
+Merge: 951879f18dc 11fa72370c0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 17 10:10:23 2020 +0200
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit 951879f18dc071dda270bd3177e289ef1cd97436
+Merge: 35b185f0431 1ec10d1f7b5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 17 09:59:52 2020 +0200
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit 35b185f043170e07dc9ec1c06f818dfb385b1082
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 14 15:27:47 2020 +0200
+
+    Add ace directory as we do with all ace includes
+    
+        * ACE/ace/config-windows.h:
+
+commit e4e843a66e9388138dfcb64328637221d264b6a0
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Sat Mar 9 02:09:32 2019 +0800
+
+    Fix ACE_Thread_Manager::join memory leak and deadlock.
+
+commit 7e7902f9ffa652f78540870170c492a67816b731
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Wed Nov 13 20:20:47 2019 +0800
+
+    Use unspecified_bool_type instead of bool.
diff --git a/ACE/ChangeLogs/ChangeLog-2002a b/ACE/ChangeLogs/ChangeLog-2002a
index 870ec350d6e..09579337439 100644
--- a/ACE/ChangeLogs/ChangeLog-2002a
+++ b/ACE/ChangeLogs/ChangeLog-2002a
@@ -16,7 +16,7 @@ Sat Jul 06 19:32:40 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 	  created problems in builds where inlining was diabled. Please
 	  see 
 
-	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1240 for
+	  http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1240 for
 	  more details. Thanks to Marina Spivak <marina@atdesk.com> for
 	  reporting this.
 
@@ -576,12 +576,12 @@ Wed Jun 19 14:25:52 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* ace/TP_Reactor.cpp (handle_socket_events): Couple of small
 	  fixes. The fixes are for
 
-	  1. Bug http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1231
+	  1. Bug http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1231
 	  and it is self-explanatory
 
 	  2. The find () operation after dispatch was not holding the lock
 	  and chances of race are high. This is documented as #2 in
-  	  bug http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1233
+  	  bug http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1233
 
 	  Added some comments in the code explaining what is going
 	  on. Thanks to Carlos for identifying the problem.
@@ -7157,7 +7157,7 @@ Fri Feb 22 08:07:12 2002  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * ace/Makefile.bor: Added String_Base.cpp and Atomic_op.cpp to the
           list of files that must be installed when doing a make install.
-          Thanks to Cyrille Chépélov <cyrille@softek.fr> for reporting that
+          Thanks to Cyrille Ch�p�lov <cyrille@softek.fr> for reporting that
           these files missed.
 
 Thu Feb 21 16:33:11 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
diff --git a/ACE/ChangeLogs/ChangeLog-2002b b/ACE/ChangeLogs/ChangeLog-2002b
index c13db37e19f..4b069015f5c 100644
--- a/ACE/ChangeLogs/ChangeLog-2002b
+++ b/ACE/ChangeLogs/ChangeLog-2002b
@@ -1441,7 +1441,7 @@ Wed Nov 27 22:38:15 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 
         * ace/Connector.h:
         * ace/Connector.cpp: Fix for BUG 1361. Please see
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1361 for
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1361 for
           more details on the problem.
 
           The fix is based on the assumption that ACE_Connector need not
@@ -1942,7 +1942,7 @@ Wed Nov 13 16:52:04 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
 Tue Nov 12 14:12:59 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
         This is a hackish fix for BUG 1361. Please see
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1361
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1361
         for details of this problem
 
         * ace/TP_Reactor.cpp (handle_socket_events): A hack to prevent
@@ -4493,7 +4493,7 @@ Wed Sep 11 13:03:48 2002  Carlos O'Ryan  <coryan@atdesk.com>
           Check the suspend mask before completely forgetting about a
           handle, otherwise things do not work correctly with TP_Reactors
           and multiply-registered handlers.  This fixes:
-            http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1306
+            http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1306
 
 Tue Sep 10 17:46:51 2002  Steve Huston  <shuston@riverace.com>
 
@@ -4531,14 +4531,14 @@ Tue Sep 10 12:32:33 2002  Carlos O'Ryan  <coryan@atdesk.com>
         * ace/Connector.cpp:
           Be more informative in error messages, at least report in what
           library, class and function was the error detected.  This fixes:
-            http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1304
+            http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1304
 
 Tue Sep 10 12:28:41 2002  Carlos O'Ryan  <coryan@atdesk.com>
 
         * ace/Connector.cpp:
           Be more paranoid about using AST's returned from cleanup_AST()
           and always check the return value of that function.  This fixes:
-            http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1303
+            http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1303
 
 Mon Sep  9 16:44:00 2002  Balachandran Natarajan  <bala@isis-server.vuse.vanderbilt.edu>
 
@@ -7061,7 +7061,7 @@ Sat Jul 06 19:32:40 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
           created problems in builds where inlining was diabled. Please
           see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1240 for
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1240 for
           more details. Thanks to Marina Spivak <marina@atdesk.com> for
           reporting this.
 
diff --git a/ACE/ChangeLogs/ChangeLog-2003c b/ACE/ChangeLogs/ChangeLog-2003c
index bbd6f2714d6..ef4238bb076 100644
--- a/ACE/ChangeLogs/ChangeLog-2003c
+++ b/ACE/ChangeLogs/ChangeLog-2003c
@@ -642,7 +642,7 @@ Wed Jan  7 18:37:13 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
         * ace/Makefile.bor:
           Added special rule to install the os_include directory and its
           subdirectories. Thanks to Chris Kohlhoff for coming up with the
-          solution and to Cyrille Chépélov <cyrille@softek.fr> for reporting
+          solution and to Cyrille Ch�p�lov <cyrille@softek.fr> for reporting
           this. This fixes [BUGID 1669].
 
 Wed Jan  7 12:13:12 2004  Chad Elliott  <elliott_c@ociweb.com>
@@ -2277,7 +2277,7 @@ Fri Dec 19 22:34:42 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Fix for [BUGID 1688]. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1688
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1688
 
           for more details. Thanks to Gary Maxey <gary.maxey@hp.com> for
           the patch.
@@ -8467,7 +8467,7 @@ Sun Oct 12 17:20:40 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
         * ace/Select_Reactor_Base.cpp: Fix for [BUG 1268]. Please refer to
           bugzilla database at
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1268
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1268
 
           for more details on the source of the problem and the solution
           for the same. Thanks to Carlos O'Ryan for providing patches.
@@ -8542,7 +8542,7 @@ Sat Oct 11 17:39:09 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
           <sbetterm@erggroup.com> for reporting the problem and suggesting
           a solution.  Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1605
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1605
 
           for a description of the problem.
 
@@ -11887,7 +11887,7 @@ Fri Jul 18 17:58:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Fri Jul 18 10:36:51 2003  Krishnakumar B  <kitty@nospam.invalid.domain>
 
-        * THANKS: Added Dieter Knüppel <dknueppel@datus.com> to the
+        * THANKS: Added Dieter Kn�ppel <dknueppel@datus.com> to the
           contributors list.
 
 Thu Jul 17 15:02:56 UTC 2003  Don Hinton  <dhinton@dresystems.com>
diff --git a/ACE/ChangeLogs/ChangeLog-2004a b/ACE/ChangeLogs/ChangeLog-2004a
index 0c4668dfbb2..a2370f335a3 100644
--- a/ACE/ChangeLogs/ChangeLog-2004a
+++ b/ACE/ChangeLogs/ChangeLog-2004a
@@ -2286,7 +2286,7 @@ Mon Jun 14 08:28:24 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
           should point to
 
-          http://deuce.doc.wustl.edu/bugzilla/index.cgi
+          http://bugzilla.dre.vanderbilt.edu/index.cgi
 
           Thanks to Patrick Bennett <Patrick.Bennett@inin.com> for
           reporting this.
@@ -9596,7 +9596,7 @@ Thu Jan 22 06:47:48 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Fix for BUGID 1719. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1719
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1719
 
           for details.
 
diff --git a/ACE/ChangeLogs/ChangeLog-2004b b/ACE/ChangeLogs/ChangeLog-2004b
index fe54044d243..cfefe34c4a3 100644
--- a/ACE/ChangeLogs/ChangeLog-2004b
+++ b/ACE/ChangeLogs/ChangeLog-2004b
@@ -772,7 +772,7 @@ Tue Dec  7 17:48:21 2004  Steve Huston  <shuston@riverace.com>
           Steven Patrick <spo@ngls.net> for reporting this problem.
 
           Fixes Bugzilla #2002
-          (http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2002)
+          (http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2002)
 
 Tue Dec  7 13:10:08 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -4670,7 +4670,7 @@ Sun Sep 19 20:36:43 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Fix for BUG 1924. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1924
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1924
 
           for details. Thanks to Paul <paul at reeder dot cs> for the
           patch.
@@ -6669,7 +6669,7 @@ Fri Aug 20 15:20:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
         Fixes for Bug 1890. Please see
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1890
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1890
 
         for details of this bug. What follows are the individual changes.
 
@@ -7881,7 +7881,7 @@ Wed Aug  4 16:33:14 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Fix for Bug 1893. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1893
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1893
 
           for details. Thanks to Alan L Batongbacal <alanlb at vt dot edu>
           for the patch.
diff --git a/ACE/ChangeLogs/ChangeLog-2007b b/ACE/ChangeLogs/ChangeLog-2007b
index 2e96e779dc8..17546b96405 100644
--- a/ACE/ChangeLogs/ChangeLog-2007b
+++ b/ACE/ChangeLogs/ChangeLog-2007b
@@ -2800,7 +2800,7 @@ Fri May 11 14:45:43 UTC 2007  Steve Huston  <shuston@riverace.com>
           with Johnny, the Bugzilla entry is now labeled an enhancement and
           this test is disabled until the necessary enhancement is made. For
           more info, please see:
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2368
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2368
 
 Fri May 11 10:20:00 UTC 2007  Simon Massey  <sma@prismtech.com>
 
diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.cpp b/ACE/Kokyu/Default_Dispatcher_Impl.cpp
index 29d6ef1a9be..c5f067fb878 100644
--- a/ACE/Kokyu/Default_Dispatcher_Impl.cpp
+++ b/ACE/Kokyu/Default_Dispatcher_Impl.cpp
@@ -1,5 +1,8 @@
 #include "Default_Dispatcher_Impl.h"
+
 #include "ace/Sched_Params.h"
+#include <utility>
+#include <memory>
 
 #if ! defined (__ACE_INLINE__)
 #include "Default_Dispatcher_Impl.inl"
@@ -50,8 +53,8 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs)
                       Dispatcher_Task (*config,
                                        ACE_Thread_Manager::instance()),
                       -1);
-      auto_ptr<Dispatcher_Task> tmp_task_auto_ptr (task);
-      tasks_[i++] = tmp_task_auto_ptr;
+      std::unique_ptr<Dispatcher_Task> tmp_task_auto_ptr (task);
+      tasks_[i++] = std::move(tmp_task_auto_ptr);
       //I couldn't use reset because MSVC6 auto_ptr does not have reset method.
       //So in configurations where the auto_ptr maps to the std::auto_ptr instead
       //of ACE auto_ptr, this would be a problem.
diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.h b/ACE/Kokyu/Default_Dispatcher_Impl.h
index 9d9c4c3f6bf..350c88d179d 100644
--- a/ACE/Kokyu/Default_Dispatcher_Impl.h
+++ b/ACE/Kokyu/Default_Dispatcher_Impl.h
@@ -19,11 +19,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Auto_Ptr.h"
 #include "kokyu_export.h"
 #include "Kokyu_defs.h"
 #include "Dispatcher_Impl.h"
 #include "Dispatcher_Task.h"
+#include <memory>
 
 namespace Kokyu
 {
@@ -48,7 +48,7 @@ namespace Kokyu
     Dispatcher_Task* find_task_with_preemption_prio (Priority_t);
 
   private:
-    typedef auto_ptr<Dispatcher_Task> Dispatcher_Task_Auto_Ptr;
+    typedef std::unique_ptr<Dispatcher_Task> Dispatcher_Task_Auto_Ptr;
     ACE_Auto_Array_Ptr<Dispatcher_Task_Auto_Ptr> tasks_;
     int ntasks_;
     ConfigInfoSet curr_config_info_;
diff --git a/ACE/Kokyu/Dispatcher_Task.cpp b/ACE/Kokyu/Dispatcher_Task.cpp
index 07857091e60..b128dcab6bf 100644
--- a/ACE/Kokyu/Dispatcher_Task.cpp
+++ b/ACE/Kokyu/Dispatcher_Task.cpp
@@ -66,7 +66,7 @@ Dispatcher_Task::initialize ()
 }
 
 int
-Dispatcher_Task::svc (void)
+Dispatcher_Task::svc ()
 {
   int done = 0;
 
diff --git a/ACE/Kokyu/Dispatcher_Task.h b/ACE/Kokyu/Dispatcher_Task.h
index d565be94f5d..ca602ca2be7 100644
--- a/ACE/Kokyu/Dispatcher_Task.h
+++ b/ACE/Kokyu/Dispatcher_Task.h
@@ -69,7 +69,7 @@ public:
            const QoSDescriptor& qos_info);
 
   /// Process the events in the queue.
-  int svc (void);
+  int svc ();
 
   const ConfigInfo& get_curr_config_info() const;
   Priority_t preemption_priority() const;
diff --git a/ACE/Kokyu/Kokyu.cpp b/ACE/Kokyu/Kokyu.cpp
index 5c1f4fe9d17..1f89b5f712b 100644
--- a/ACE/Kokyu/Kokyu.cpp
+++ b/ACE/Kokyu/Kokyu.cpp
@@ -1,5 +1,7 @@
 #include "Kokyu.h"
 
+#include <utility>
+
 #include "Default_Dispatcher_Impl.h"
 
 #if ! defined (__ACE_INLINE__)
@@ -26,8 +28,8 @@ int Dispatcher::activate ()
 
 void Dispatcher::implementation (Dispatcher_Impl* impl)
 {
-  auto_ptr<Dispatcher_Impl> tmp_impl (impl);
-  dispatcher_impl_ = tmp_impl;
+  std::unique_ptr<Dispatcher_Impl> tmp_impl (impl);
+  dispatcher_impl_ = std::move(tmp_impl);
 
   //I couldn't use reset because MSVC++ auto_ptr does not have reset method.
   //So in configurations where the auto_ptr maps to the std::auto_ptr instead
diff --git a/ACE/Kokyu/Kokyu.h b/ACE/Kokyu/Kokyu.h
index 086f95eb67b..bbf444a4a7d 100644
--- a/ACE/Kokyu/Kokyu.h
+++ b/ACE/Kokyu/Kokyu.h
@@ -17,6 +17,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include <utility>
+#include <memory>
 #include "kokyu_export.h"
 #include "Kokyu_defs.h"
 
@@ -74,10 +76,10 @@ namespace Kokyu
   private:
     /// Auto ptr to the implementation. Implementation will be created on the
     /// heap and deleted automatically when the dispatcher object is destructed.
-    auto_ptr<Dispatcher_Impl> dispatcher_impl_;
+    std::unique_ptr<Dispatcher_Impl> dispatcher_impl_;
   };
 
-  typedef auto_ptr<Dispatcher> Dispatcher_Auto_Ptr;
+  typedef std::unique_ptr<Dispatcher> Dispatcher_Auto_Ptr;
 
   /**
    * @class Dispatcher_Factory
diff --git a/ACE/Kokyu/Kokyu_defs.cpp b/ACE/Kokyu/Kokyu_defs.cpp
index afda89b8016..e474da88d0b 100644
--- a/ACE/Kokyu/Kokyu_defs.cpp
+++ b/ACE/Kokyu/Kokyu_defs.cpp
@@ -6,7 +6,7 @@
 
 namespace Kokyu
 {
-   Dispatch_Command::~Dispatch_Command (void)
+   Dispatch_Command::~Dispatch_Command ()
    {
    }
 
diff --git a/ACE/Kokyu/Kokyu_defs.h b/ACE/Kokyu/Kokyu_defs.h
index e0942a97845..409991c9670 100644
--- a/ACE/Kokyu/Kokyu_defs.h
+++ b/ACE/Kokyu/Kokyu_defs.h
@@ -134,12 +134,12 @@ namespace Kokyu
 
       int can_be_deleted () const;
 
-      void destroy (void);
+      void destroy ();
     protected:
       /// Destructor
       // only inheritance is possible and object should be on heap,
       // since object could be handed over to a different thread.
-      virtual ~Dispatch_Command (void);
+      virtual ~Dispatch_Command ();
 
     private:
       int dont_delete_;
diff --git a/ACE/Kokyu/Kokyu_defs.inl b/ACE/Kokyu/Kokyu_defs.inl
index 13da3c1d0c0..a6639c429ec 100644
--- a/ACE/Kokyu/Kokyu_defs.inl
+++ b/ACE/Kokyu/Kokyu_defs.inl
@@ -44,13 +44,13 @@ Dispatch_Command::Dispatch_Command (int dont_delete,
 }
 
 ACE_INLINE
-int Dispatch_Command::can_be_deleted (void) const
+int Dispatch_Command::can_be_deleted () const
 {
   return !dont_delete_;
 }
 
 ACE_INLINE
-void Dispatch_Command::destroy (void)
+void Dispatch_Command::destroy ()
 {
   if (allocator_)
   {
diff --git a/ACE/Kokyu/Kokyu_dsrt.cpp b/ACE/Kokyu/Kokyu_dsrt.cpp
index 604e3c57d48..5832b22dd03 100644
--- a/ACE/Kokyu/Kokyu_dsrt.cpp
+++ b/ACE/Kokyu/Kokyu_dsrt.cpp
@@ -15,8 +15,8 @@ template <class DSRT_Scheduler_Traits>
 void
 DSRT_Dispatcher<DSRT_Scheduler_Traits>::implementation (DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>* impl)
 {
-  auto_ptr<DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> > tmp_impl (impl);
-  dispatcher_impl_ = tmp_impl;
+  std::unique_ptr<DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> > tmp_impl (impl);
+  dispatcher_impl_ = std::move(tmp_impl);
 }
 
 template <class DSRT_Scheduler_Traits>
diff --git a/ACE/Kokyu/Kokyu_dsrt.h b/ACE/Kokyu/Kokyu_dsrt.h
index 0c00c1f346c..11f24ec1eac 100644
--- a/ACE/Kokyu/Kokyu_dsrt.h
+++ b/ACE/Kokyu/Kokyu_dsrt.h
@@ -12,6 +12,7 @@
 
 #include "kokyu_export.h"
 #include "Kokyu_defs.h"
+#include <memory>
 
 namespace Kokyu
 {
@@ -67,7 +68,7 @@ namespace Kokyu
   private:
     /// Auto ptr to the implementation. Implementation will be created on the
     /// heap and deleted automatically when the dispatcher object is destructed.
-    auto_ptr<DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> > dispatcher_impl_;
+    std::unique_ptr<DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> > dispatcher_impl_;
   };
 
 
@@ -85,7 +86,7 @@ namespace Kokyu
   class DSRT_Dispatcher_Factory : private ACE_Copy_Disabled
     {
     public:
-      typedef auto_ptr<DSRT_Dispatcher<DSRT_Scheduler_Traits> > DSRT_Dispatcher_Auto_Ptr;
+      typedef std::unique_ptr<DSRT_Dispatcher<DSRT_Scheduler_Traits> > DSRT_Dispatcher_Auto_Ptr;
 
       /**
        * Create a dispatcher for dynamic dispatching of threads.
diff --git a/ACE/Kokyu/tests/EDF/test.cpp b/ACE/Kokyu/tests/EDF/test.cpp
index 32a0860ee36..46fa980f0fd 100644
--- a/ACE/Kokyu/tests/EDF/test.cpp
+++ b/ACE/Kokyu/tests/EDF/test.cpp
@@ -1,5 +1,3 @@
-#include "ace/Auto_Ptr.h"
-
 #include "Kokyu.h"
 #include "ace/Task.h"
 #include "ace/Sched_Params.h"
@@ -7,6 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_sys_time.h"
+#include <memory>
 
 ACE_CString sched_policy_str = "fifo";
 
@@ -88,7 +87,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR** argv)
   ACE_DEBUG ((LM_DEBUG, "before create_dispatcher\n" ));
 
   attrs.config_info_set_ = config_info;
-  auto_ptr<Kokyu::Dispatcher>
+  std::unique_ptr<Kokyu::Dispatcher>
     disp (Kokyu::Dispatcher_Factory::create_dispatcher (attrs));
 
   ACE_ASSERT (disp.get() != 0);
diff --git a/ACE/Kokyu/tests/FIFO/README b/ACE/Kokyu/tests/FIFO/README
index c3d271caaf8..55438c99683 100644
--- a/ACE/Kokyu/tests/FIFO/README
+++ b/ACE/Kokyu/tests/FIFO/README
@@ -1,5 +1,3 @@
-
-
 This example is a very simple example, showing how to use the Kokyu
 dispatcher to dispatch command objects in a FIFO manner. The test
 configures the Kokyu dispatcher with 3 FIFO lanes, each having a
diff --git a/ACE/Kokyu/tests/FIFO/test.cpp b/ACE/Kokyu/tests/FIFO/test.cpp
index d9a86aeb225..b0e5dd5f7a2 100644
--- a/ACE/Kokyu/tests/FIFO/test.cpp
+++ b/ACE/Kokyu/tests/FIFO/test.cpp
@@ -1,10 +1,9 @@
-#include "ace/Auto_Ptr.h"
-
 #include "Kokyu.h"
 #include "ace/Task.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_strings.h"
+#include <memory>
 
 ACE_CString sched_policy_str = "fifo";
 
@@ -98,7 +97,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR** argv)
   attrs.config_info_set_ = config_info;
 
   ACE_DEBUG ((LM_DEBUG, "before create_dispatcher\n" ));
-  auto_ptr<Kokyu::Dispatcher>
+  std::unique_ptr<Kokyu::Dispatcher>
     disp (Kokyu::Dispatcher_Factory::create_dispatcher (attrs));
 
   ACE_ASSERT (disp.get() != 0);
diff --git a/ACE/NEWS b/ACE/NEWS
index 3a9893a6841..caa0c3fd18b 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,3 +1,36 @@
+USER VISIBLE CHANGES BETWEEN ACE-6.5.12 and ACE-7.0.0
+=====================================================
+
+. C++11 is now a mandatory compiler feature which is
+  required for ACE
+
+. When valgrind is enabled we don't disable dlclose anymore,
+  this reduces the amount of leaks reported related to dlclose.
+  When you unload your shared libraries before the end of your program
+  you can use `--keep-debuginfo=yes` as valgrind options as alternative
+  or you can disable dlclose yourself by adding
+  `#define ACE_LACKS_DLCLOSE` to your ace/config.h file
+
+. Removed `ACE_OS::readdir_r`. `readdir_r` was marked as depracated in glibc
+  and FreeBSD libc. Also removed `ACE_Dirent::read (ACE_DIRENT *, ACE_DIRENT **)`
+  which used it. `ACE_LACKS_READDIR_R` will now always be defined.
+
+USER VISIBLE CHANGES BETWEEN ACE-6.5.11 and ACE-6.5.12
+======================================================
+
+. Fixed some C++11 warnings
+
+. Fixed compile problem on AIX
+
+. Removed c++0x and c++1y as GNU make variables, use c++11 and c++14 as
+  alternatives
+
+. Moved all CI builds to github actions
+
+. Added ACE_GCC_NO_RETURN to fix fall through warnings
+
+. Fix ACE_Thread_Manager::join memory leak and potential deadlock
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.10 and ACE-6.5.11
 ======================================================
 
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index ad33046dd0e..ec2169becd6 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.5.11
+    ACE VERSION: 6.5.12
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt
index 6df66dc8918..ed10f670b0f 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.11, released Mon Aug 17 10:04:17 CEST 2020
+This is ACE version 6.5.12, released Tue Oct 27 12:46:14 CET 2020
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp
index 0ff5080d688..7a1b38b2bf0 100644
--- a/ACE/ace/ACE.cpp
+++ b/ACE/ace/ACE.cpp
@@ -91,31 +91,31 @@ ACE::out_of_handles (int error)
 }
 
 u_int
-ACE::major_version (void)
+ACE::major_version ()
 {
   return ACE_MAJOR_VERSION;
 }
 
 u_int
-ACE::minor_version (void)
+ACE::minor_version ()
 {
   return ACE_MINOR_VERSION;
 }
 
 u_int
-ACE::beta_version (void)
+ACE::beta_version ()
 {
   return ACE_BETA_VERSION;
 }
 
 u_int
-ACE::micro_version (void)
+ACE::micro_version ()
 {
   return ACE_MICRO_VERSION;
 }
 
 const ACE_TCHAR *
-ACE::compiler_name (void)
+ACE::compiler_name ()
 {
 #ifdef ACE_CC_NAME
   return ACE_CC_NAME;
@@ -125,7 +125,7 @@ ACE::compiler_name (void)
 }
 
 u_int
-ACE::compiler_major_version (void)
+ACE::compiler_major_version ()
 {
 #ifdef ACE_CC_MAJOR_VERSION
   return ACE_CC_MAJOR_VERSION;
@@ -135,7 +135,7 @@ ACE::compiler_major_version (void)
 }
 
 u_int
-ACE::compiler_minor_version (void)
+ACE::compiler_minor_version ()
 {
 #ifdef ACE_CC_MINOR_VERSION
   return ACE_CC_MINOR_VERSION;
@@ -145,7 +145,7 @@ ACE::compiler_minor_version (void)
 }
 
 u_int
-ACE::compiler_beta_version (void)
+ACE::compiler_beta_version ()
 {
 #ifdef ACE_CC_BETA_VERSION
   return ACE_CC_BETA_VERSION;
@@ -162,7 +162,7 @@ ACE::nibble2hex (u_int n)
 }
 
 bool
-ACE::debug (void)
+ACE::debug ()
 {
   //FUZZ: disable check_for_ace_log_categories
   static const char *debug = ACE_OS::getenv ("ACE_DEBUG");
@@ -2819,7 +2819,7 @@ ACE::fork (const ACE_TCHAR *program_name,
 }
 
 int
-ACE::max_handles (void)
+ACE::max_handles ()
 {
   ACE_TRACE ("ACE::max_handles");
 #if defined (RLIMIT_NOFILE) && !defined (ACE_LACKS_RLIMIT)
diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h
index d10dc6710d1..b705e092d95 100644
--- a/ACE/ace/ACE.h
+++ b/ACE/ace/ACE.h
@@ -55,31 +55,31 @@ namespace ACE
 {
   // = ACE version information.
   /// e.g., the "6" in ACE 6.3.4
-  extern ACE_Export u_int major_version (void);
+  extern ACE_Export u_int major_version ();
 
   /// e.g., the "3" in ACE 6.3.4
-  extern ACE_Export u_int minor_version (void);
+  extern ACE_Export u_int minor_version ();
 
   /// e.g., the "4" in ACE 6.3.4
   /// Returns 0 for "stable" (non-micro) releases.
-  extern ACE_Export u_int micro_version (void);
+  extern ACE_Export u_int micro_version ();
 
   /// e.g., the "4" in ACE 6.3.4
   /// Returns 0 for "stable" (non-micro) releases.
-  extern ACE_Export u_int beta_version (void);
+  extern ACE_Export u_int beta_version ();
 
   // = C++ compiler version information.
   /// E.g., the "SunPro C++" in SunPro C++ 4.32.0
-  extern ACE_Export const ACE_TCHAR * compiler_name (void);
+  extern ACE_Export const ACE_TCHAR * compiler_name ();
 
   /// E.g., the "4" in SunPro C++ 4.32.0
-  extern ACE_Export u_int compiler_major_version (void);
+  extern ACE_Export u_int compiler_major_version ();
 
   /// E.g., the "32" in SunPro C++ 4.32.0
-  extern ACE_Export u_int compiler_minor_version (void);
+  extern ACE_Export u_int compiler_minor_version ();
 
   /// E.g., the "0" in SunPro C++ 4.32.0
-  extern ACE_Export u_int compiler_beta_version (void);
+  extern ACE_Export u_int compiler_beta_version ();
 
   /// Check if error indicates the process being out of handles (file
   /// descriptors).
@@ -388,7 +388,7 @@ namespace ACE
    * this process.  This maximum may be extended using
    * @c ACE::set_handle_limit.
    */
-  extern ACE_Export int max_handles (void);
+  extern ACE_Export int max_handles ();
 
   // = String functions
   /**
@@ -680,7 +680,7 @@ namespace ACE
   ACE_NAMESPACE_INLINE_FUNCTION u_char hex2byte (ACE_TCHAR c);
 
   // = Set/get the debug level.
-  extern ACE_Export bool debug (void);
+  extern ACE_Export bool debug ();
   extern ACE_Export void debug (bool onoff);
 
   /// Wrapper facade for @c select that uses @c ACE_Handle_Sets.
diff --git a/ACE/ace/ARGV.cpp b/ACE/ace/ARGV.cpp
index 18790043ef4..d7af2f8457c 100644
--- a/ACE/ace/ARGV.cpp
+++ b/ACE/ace/ARGV.cpp
@@ -18,7 +18,7 @@ ACE_ALLOC_HOOK_DEFINE_Tt (ACE_ARGV_T)
 
 template <typename CHAR_TYPE>
 void
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const
+ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_ARGV_Queue_Entry_T::dump");
@@ -32,7 +32,7 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const
 
 template <typename CHAR_TYPE>
 void
-ACE_ARGV_T<CHAR_TYPE>::dump (void) const
+ACE_ARGV_T<CHAR_TYPE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_ARGV_T::dump");
@@ -61,7 +61,7 @@ ACE_ARGV_T<CHAR_TYPE>::dump (void) const
 
 template <typename CHAR_TYPE>
 int
-ACE_ARGV_T<CHAR_TYPE>::string_to_argv (void)
+ACE_ARGV_T<CHAR_TYPE>::string_to_argv ()
 {
   ACE_TRACE ("ACE_ARGV_T::string_to_argv");
 
@@ -303,7 +303,7 @@ ACE_ARGV_T<CHAR_TYPE>::add (CHAR_TYPE *argv[], bool quote_args)
 // Free up argv_ and buf_
 
 template <typename CHAR_TYPE>
-ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T (void)
+ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T ()
 {
   ACE_TRACE ("ACE_ARGV_T::~ACE_ARGV_T");
 
@@ -331,7 +331,7 @@ ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T (void)
 
 template <typename CHAR_TYPE>
 int
-ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue (void)
+ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue ()
 {
   ACE_TRACE ("ACE_ARGV_T::create_buf_from_queue");
 
diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h
index a0edd1c78d5..30513946040 100644
--- a/ACE/ace/ARGV.h
+++ b/ACE/ace/ARGV.h
@@ -35,7 +35,7 @@ class ACE_ARGV_Queue_Entry_T
 {
 public:
   /// Initialize a ACE_ARGV_Queue_Entry_T.
-  ACE_ARGV_Queue_Entry_T (void);
+  ACE_ARGV_Queue_Entry_T ();
 
   /**
    * Initialize a ACE_ARGV_Queue_Entry_T.
@@ -55,18 +55,16 @@ public:
    */
   ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_Entry_T<CHAR_TYPE> &entry);
 
-#if defined (ACE_HAS_CPP11)
   ACE_ARGV_Queue_Entry_T (ACE_ARGV_Queue_Entry_T&&) = default;
   ACE_ARGV_Queue_Entry_T &operator = (const ACE_ARGV_Queue_Entry_T &) = default;
   ACE_ARGV_Queue_Entry_T &operator = (ACE_ARGV_Queue_Entry_T &&)  = default;
-#endif /* ACE_HAS_CPP11 */
 
   /// We need this destructor to keep some compilers from complaining.
   /// It's just a no-op, however.
-  ~ACE_ARGV_Queue_Entry_T (void);
+  ~ACE_ARGV_Queue_Entry_T ();
 
   /// Dump the state of this object.
-  void dump (void) const;
+  void dump () const;
 
   // Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -196,7 +194,7 @@ public:
   explicit ACE_ARGV_T (bool substitute_env_args = true);
 
   /// Destructor.
-  ~ACE_ARGV_T (void);
+  ~ACE_ARGV_T ();
 
   /** @name Accessor methods
    *
@@ -218,22 +216,22 @@ public:
    * maintained internally to this class. Do not change or delete either the
    * pointers or the memory to which they refer.
    */
-  CHAR_TYPE **argv (void);
+  CHAR_TYPE **argv ();
 
   /// Returns the current number of arguments.
-  int argc (void) const;
+  int argc () const;
 
   /**
    * Returns a single string form of the current arguments. The returned
    * pointer refers to memory maintained internally to this class. Do not
    * change or delete it.
    */
-  const CHAR_TYPE *buf (void);
+  const CHAR_TYPE *buf ();
 
   //@}
 
   /// Dump the state of this object.
-  void dump (void) const;
+  void dump () const;
 
   // Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -278,17 +276,16 @@ public:
   int add (CHAR_TYPE *argv[], bool quote_args = false);
 
 private:
-  /// Copy constructor not implemented.
-  ACE_UNIMPLEMENTED_FUNC (ACE_ARGV_T (const ACE_ARGV_T<CHAR_TYPE>&))
-
-  /// Assignment operator not implemented.
-  ACE_UNIMPLEMENTED_FUNC (ACE_ARGV_T operator= (const ACE_ARGV_T<CHAR_TYPE>&))
+  ACE_ARGV_T (const ACE_ARGV_T<CHAR_TYPE>&) = delete;
+  ACE_ARGV_T operator= (const ACE_ARGV_T<CHAR_TYPE>&) = delete;
+  ACE_ARGV_T (ACE_ARGV_T<CHAR_TYPE>&&) = delete;
+  ACE_ARGV_T operator= (ACE_ARGV_T<CHAR_TYPE>&&) = delete;
 
   /// Creates buf_ from the queue of added args, deletes previous buf_.
-  int create_buf_from_queue (void);
+  int create_buf_from_queue ();
 
   /// Converts buf_ into the CHAR_TYPE *argv[] format.
-  int string_to_argv (void);
+  int string_to_argv ();
 
   /// Replace args with environment variable values?
   bool substitute_env_args_;
diff --git a/ACE/ace/ARGV.inl b/ACE/ace/ARGV.inl
index cd538e9ec5c..43dfa8cf770 100644
--- a/ACE/ace/ARGV.inl
+++ b/ACE/ace/ARGV.inl
@@ -5,7 +5,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename CHAR_TYPE> ACE_INLINE
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (void)
+ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T ()
   : arg_(0),
     quote_arg_(false)
 {
@@ -30,7 +30,7 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_
 }
 
 template <typename CHAR_TYPE> ACE_INLINE
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T (void)
+ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T ()
 {
   // No-op just to keep some compilers happy...
 }
@@ -38,7 +38,7 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T (void)
 // Return the number of args
 template <typename CHAR_TYPE>
 ACE_INLINE int
-ACE_ARGV_T<CHAR_TYPE>::argc (void) const
+ACE_ARGV_T<CHAR_TYPE>::argc () const
 {
   ACE_TRACE ("ACE_ARGV_T::argc");
  // Try to create the argv_ if it isn't there
@@ -51,7 +51,7 @@ ACE_ARGV_T<CHAR_TYPE>::argc (void) const
 // Return the arguments in a space-separated string
 template <typename CHAR_TYPE>
 ACE_INLINE const CHAR_TYPE *
-ACE_ARGV_T<CHAR_TYPE>::buf (void)
+ACE_ARGV_T<CHAR_TYPE>::buf ()
 {
   ACE_TRACE ("ACE_ARGV_T::buf");
 
@@ -65,7 +65,7 @@ ACE_ARGV_T<CHAR_TYPE>::buf (void)
 
 template <typename CHAR_TYPE>
 ACE_INLINE CHAR_TYPE **
-ACE_ARGV_T<CHAR_TYPE>::argv (void)
+ACE_ARGV_T<CHAR_TYPE>::argv ()
 {
   ACE_TRACE ("ACE_ARGV_T::argv");
 
diff --git a/ACE/ace/ATM_Acceptor.h b/ACE/ace/ATM_Acceptor.h
index 0b42907fa68..788b63c4e81 100644
--- a/ACE/ace/ATM_Acceptor.h
+++ b/ACE/ace/ATM_Acceptor.h
@@ -97,7 +97,7 @@ public:
   typedef ACE_ATM_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/ATM_Addr.h b/ACE/ace/ATM_Addr.h
index b42143a1983..def7f35878c 100644
--- a/ACE/ace/ATM_Addr.h
+++ b/ACE/ace/ATM_Addr.h
@@ -165,7 +165,7 @@ public:
   bool operator != (const ACE_ATM_Addr &SAP) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/ATM_Connector.h b/ACE/ace/ATM_Connector.h
index 1f05adfaef4..56040a40788 100644
--- a/ACE/ace/ATM_Connector.h
+++ b/ACE/ace/ATM_Connector.h
@@ -140,7 +140,7 @@ public:
   typedef ACE_ATM_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/ATM_Params.h b/ACE/ace/ATM_Params.h
index 34db5024865..0981a528e08 100644
--- a/ACE/ace/ATM_Params.h
+++ b/ACE/ace/ATM_Params.h
@@ -158,7 +158,7 @@ public:
   void set_oflag (int);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/ATM_QoS.h b/ACE/ace/ATM_QoS.h
index 1417a5d0ff9..42c037a03d9 100644
--- a/ACE/ace/ATM_QoS.h
+++ b/ACE/ace/ATM_QoS.h
@@ -84,7 +84,7 @@ public:
   ATM_QoS get_qos (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/ATM_Stream.h b/ACE/ace/ATM_Stream.h
index 2e840a8dcde..300d0563e7a 100644
--- a/ACE/ace/ATM_Stream.h
+++ b/ACE/ace/ATM_Stream.h
@@ -82,7 +82,7 @@ public:
   typedef ACE_ATM_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Abstract_Timer_Queue.h b/ACE/ace/Abstract_Timer_Queue.h
index 7dbbf7b4b9e..cd17f28d0ef 100644
--- a/ACE/ace/Abstract_Timer_Queue.h
+++ b/ACE/ace/Abstract_Timer_Queue.h
@@ -38,14 +38,14 @@ class ACE_Abstract_Timer_Queue
 {
 public:
   /// Destructor
-  virtual ~ACE_Abstract_Timer_Queue (void) = 0;
+  virtual ~ACE_Abstract_Timer_Queue () = 0;
 
   /// True if queue is empty, else false.
-  virtual bool is_empty (void) const = 0;
+  virtual bool is_empty () const = 0;
 
   /// Returns the time of the earlier node in the Timer_Queue.  Must
   /// be called on a non-empty queue.
-  virtual const ACE_Time_Value &earliest_time (void) const = 0;
+  virtual const ACE_Time_Value &earliest_time () const = 0;
 
   /**
    * Schedule @a type that will expire at @a future_time, which is
@@ -110,7 +110,7 @@ public:
    *
    *  Returns the number of timers canceled.
    */
-  virtual int expire (void) = 0;
+  virtual int expire () = 0;
 
   /**
    * A couple of classes using Timer_Queues need to dispatch a single
@@ -160,21 +160,21 @@ public:
   /**
    * Close timer queue. Cancels all timers.
    */
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /**
    * Returns the current time of day.  This method allows different
    * implementations of the timer queue to use special high resolution
    * timers.
    */
-  virtual ACE_Time_Value gettimeofday (void) = 0;
+  virtual ACE_Time_Value gettimeofday () = 0;
 
   /**
    * Allows applications to control how the timer queue gets the time
    * of day.
    * @deprecated Use TIME_POLICY support instead. See Timer_Queue_T.h
    */
-  virtual void gettimeofday (ACE_Time_Value (*gettimeofday)(void)) = 0;
+  virtual void gettimeofday (ACE_Time_Value (*gettimeofday)()) = 0;
 
   /// Determine the next event to timeout.  Returns @a max if there are
   /// no pending timers or if all pending timers are longer than max.
@@ -204,16 +204,16 @@ public:
   typedef ACE_Timer_Queue_Iterator_T<TYPE> ITERATOR;
 
   /// Returns a pointer to this ACE_Timer_Queue's iterator.
-  virtual ITERATOR & iter (void) = 0;
+  virtual ITERATOR & iter () = 0;
 
   /// Removes the earliest node from the queue and returns it
-  virtual ACE_Timer_Node_T<TYPE> *remove_first (void) = 0;
+  virtual ACE_Timer_Node_T<TYPE> *remove_first () = 0;
 
   /// Reads the earliest node from the queue and returns it.
-  virtual ACE_Timer_Node_T<TYPE> *get_first (void) = 0;
+  virtual ACE_Timer_Node_T<TYPE> *get_first () = 0;
 
   /// Dump the state of a object.
-  virtual void dump (void) const = 0;
+  virtual void dump () const = 0;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp
index 6b0f8fdc222..6206c824595 100644
--- a/ACE/ace/Acceptor.cpp
+++ b/ACE/ace/Acceptor.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Acceptor)
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump");
@@ -37,7 +37,7 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () const
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR &
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor () const
 {
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor");
   return const_cast<PEER_ACCEPTOR &> (this->peer_acceptor_);
@@ -46,7 +46,7 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const
 // Returns ACE_HANDLE of the underlying Acceptor_Strategy.
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle () const
 {
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle");
   return this->peer_acceptor_.get_handle ();
@@ -136,14 +136,14 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor (void)
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor ()
 {
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor");
   this->handle_close ();
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini ()
 {
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini");
   return ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close ();
@@ -186,14 +186,14 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void)
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend ()
 {
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend");
   return this->reactor ()->suspend_handler (this);
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume ()
 {
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume");
   return this->reactor ()->resume_handler (this);
@@ -203,14 +203,14 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
 // <reactor>.
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close (void)
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close ()
 {
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close");
   return this->handle_close ();
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error (void)
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error ()
 {
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error");
   return 0;
@@ -450,7 +450,7 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input (ACE_HANDLE listener)
 ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Strategy_Acceptor)
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void)
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend ()
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend");
 
@@ -462,7 +462,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void)
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume ()
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume");
 
@@ -474,7 +474,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void
-ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump");
@@ -499,7 +499,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR &
-ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor () const
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor");
   return this->accept_strategy_->acceptor ();
@@ -515,7 +515,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () c
 // Returns ACE_HANDLE of the underlying Acceptor_Strategy.
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE
-ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle () const
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle");
   return this->accept_strategy_->get_handle ();
@@ -798,7 +798,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
-ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor (void)
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor ()
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor");
   ACE_OS::free ((void *) this->service_name_);
@@ -850,7 +850,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini ()
 {
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini");
   return this->ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close ();
@@ -859,7 +859,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
 ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Oneshot_Acceptor)
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump");
@@ -900,7 +900,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor (void)
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor ()
   : svc_handler_ (0),
     restart_ (false),
     concurrency_strategy_ (0),
@@ -928,14 +928,14 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor (void)
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor ()
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor");
   this->handle_close ();
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close (void)
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close ()
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close");
   return this->handle_close ();
@@ -989,7 +989,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_timeout
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel (void)
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel ()
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel");
   return this->reactor () && this->reactor ()->cancel_timer (this);
@@ -1101,7 +1101,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept
   // 0) in this case...
 
   ACE_Time_Value *timeout;
-  int use_reactor = synch_options[ACE_Synch_Options::USE_REACTOR];
+  int const use_reactor = synch_options[ACE_Synch_Options::USE_REACTOR];
 
   if (use_reactor)
     timeout = (ACE_Time_Value *) &ACE_Time_Value::zero;
@@ -1179,7 +1179,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init (int, ACE_TCHAR *[])
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini ()
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini");
   return this->handle_close ();
@@ -1213,14 +1213,14 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void)
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend ()
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend");
   return this->reactor () && this->reactor ()->suspend_handler (this);
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume ()
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume");
   return this->reactor () && this->reactor ()->resume_handler (this);
@@ -1229,14 +1229,14 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
 // Returns ACE_HANDLE of the underlying peer_acceptor.
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle () const
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle");
   return this->peer_acceptor_.get_handle ();
 }
 
 template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR &
-ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor () const
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor");
   return (PEER_ACCEPTOR &) this->peer_acceptor_;
diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h
index da7834cc9e8..ba2c14cf431 100644
--- a/ACE/ace/Acceptor.h
+++ b/ACE/ace/Acceptor.h
@@ -151,26 +151,26 @@ public:
                     int reuse_addr = 1);
 
   /// Close down the Acceptor's resources.
-  virtual ~ACE_Acceptor (void);
+  virtual ~ACE_Acceptor ();
 
   /// Return the underlying PEER_ACCEPTOR object.
   virtual operator PEER_ACCEPTOR &() const;
 
   /// Return the underlying PEER_ACCEPTOR object.
-  virtual PEER_ACCEPTOR &acceptor (void) const;
+  virtual PEER_ACCEPTOR &acceptor () const;
 
   /// Returns the listening acceptor's {ACE_HANDLE}.
-  virtual ACE_HANDLE get_handle (void) const;
+  virtual ACE_HANDLE get_handle () const;
 
   /// Close down the Acceptor
-  virtual int close (void);
+  virtual int close ();
 
   /// In the event that an accept fails, this method will be called and
   /// the return value will be returned from handle_input().
-  virtual int handle_accept_error (void);
+  virtual int handle_accept_error ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -225,7 +225,7 @@ protected:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Calls {handle_close}.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Default version returns address info in {buf}.
   virtual int info (ACE_TCHAR **buf, size_t) const;
@@ -233,10 +233,10 @@ protected:
 public:
   // = Service management hooks.
   /// This method calls {Reactor::suspend}.
-  virtual int suspend (void);
+  virtual int suspend ();
 
   /// This method calls {Reactor::resume}.
-  virtual int resume (void);
+  virtual int resume ();
 
 protected:
   /// Concrete factory for accepting connections from clients...
@@ -378,19 +378,19 @@ public:
                     int reuse_addr = 1);
 
   /// Close down the Strategy_Acceptor's resources.
-  virtual ~ACE_Strategy_Acceptor (void);
+  virtual ~ACE_Strategy_Acceptor ();
 
   /// Return the underlying PEER_ACCEPTOR object.
   virtual operator PEER_ACCEPTOR &() const;
 
   /// Return the underlying PEER_ACCEPTOR object.
-  virtual PEER_ACCEPTOR &acceptor (void) const;
+  virtual PEER_ACCEPTOR &acceptor () const;
 
   /// Returns the listening acceptor's {ACE_HANDLE}.
-  virtual ACE_HANDLE get_handle (void) const;
+  virtual ACE_HANDLE get_handle () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -399,16 +399,16 @@ public:
 
   /// This method delegates to the {Scheduling_Strategy}'s {suspend}
   /// method.
-  virtual int suspend (void);
+  virtual int suspend ();
 
   /// This method delegates to the {Scheduling_Strategy}'s {resume}
   /// method.
-  virtual int resume (void);
+  virtual int resume ();
 
 protected:
 
   /// Calls {handle_close} when dynamically unlinked.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Default version returns address info in {buf}.
   virtual int info (ACE_TCHAR **buf, size_t) const;
@@ -543,7 +543,7 @@ public:
   typedef typename SVC_HANDLER::stream_type stream_type;
 
   /// Constructor.
-  ACE_Oneshot_Acceptor (void);
+  ACE_Oneshot_Acceptor ();
 
   /**
    * Initialize the appropriate strategies for concurrency and then
@@ -570,7 +570,7 @@ public:
             ACE_Concurrency_Strategy<SVC_HANDLER> * = 0);
 
   /// Close down the {Oneshot_Acceptor}.
-  virtual ~ACE_Oneshot_Acceptor (void);
+  virtual ~ACE_Oneshot_Acceptor ();
 
   // = Explicit factory operation.
   /// Create a {SVC_HANDLER}, accept the connection into the
@@ -582,19 +582,19 @@ public:
                       bool reset_new_handle = false);
 
   /// Cancel a oneshot acceptor that was started asynchronously.
-  virtual int cancel (void);
+  virtual int cancel ();
 
   /// Return the underlying {PEER_ACCEPTOR} object.
   virtual operator PEER_ACCEPTOR &() const;
 
   /// Return the underlying {PEER_ACCEPTOR} object.
-  virtual PEER_ACCEPTOR &acceptor (void) const;
+  virtual PEER_ACCEPTOR &acceptor () const;
 
   /// Close down the {Oneshot_Acceptor}.
-  virtual int close (void);
+  virtual int close ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -620,7 +620,7 @@ protected:
 
   // = Demultiplexing hooks.
   /// Returns the listening acceptor's {ACE_HANDLE}.
-  virtual ACE_HANDLE get_handle (void) const;
+  virtual ACE_HANDLE get_handle () const;
 
   /// Perform termination activities when {this} is removed from the
   /// {reactor}.
@@ -642,7 +642,7 @@ protected:
 
   /// Default version does no work and returns -1.  Must be overloaded
   /// by application developer to do anything meaningful.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Default version returns address info in {buf}.
   virtual int info (ACE_TCHAR **, size_t) const;
@@ -650,11 +650,11 @@ protected:
   // = Service management hooks.
   /// Default version does no work and returns -1.  Must be overloaded
   /// by application developer to do anything meaningful.
-  virtual int suspend (void);
+  virtual int suspend ();
 
   /// Default version does no work and returns -1.  Must be overloaded
   /// by application developer to do anything meaningful.
-  virtual int resume (void);
+  virtual int resume ();
 
 private:
   /**
diff --git a/ACE/ace/Activation_Queue.cpp b/ACE/ace/Activation_Queue.cpp
index 61683993cbc..628ae2e7a8e 100644
--- a/ACE/ace/Activation_Queue.cpp
+++ b/ACE/ace/Activation_Queue.cpp
@@ -14,7 +14,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE (ACE_Activation_Queue)
 
 void
-ACE_Activation_Queue::dump (void) const
+ACE_Activation_Queue::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -74,7 +74,7 @@ ACE_Activation_Queue::queue (ACE_Message_Queue<ACE_SYNCH> *q)
   queue_ = q;
 }
 
-ACE_Activation_Queue::~ACE_Activation_Queue (void)
+ACE_Activation_Queue::~ACE_Activation_Queue ()
 {
   if (this->delete_queue_)
     delete this->queue_;
diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h
index 2dbc37ab001..aa8c4b8ef10 100644
--- a/ACE/ace/Activation_Queue.h
+++ b/ACE/ace/Activation_Queue.h
@@ -127,7 +127,7 @@ public:
   int is_full (void) const;
 
   /// Dump the state of an request.
-  void dump (void) const;
+  void dump () const;
 
   /// Get a pointer to the underlying queue.
   ACE_Message_Queue<ACE_SYNCH> *queue (void) const;
@@ -153,8 +153,10 @@ private:
   /// Allocation strategy of the message blocks.
   ACE_Allocator *data_block_allocator_;
 
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Activation_Queue &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Activation_Queue (const ACE_Activation_Queue &))
+  void operator= (const ACE_Activation_Queue &) = delete;
+  ACE_Activation_Queue (const ACE_Activation_Queue &) = delete;
+  void operator= (ACE_Activation_Queue &&) = delete;
+  ACE_Activation_Queue (ACE_Activation_Queue &&) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Active_Map_Manager.h b/ACE/ace/Active_Map_Manager.h
index 3bf29130bf6..109d690dadb 100644
--- a/ACE/ace/Active_Map_Manager.h
+++ b/ACE/ace/Active_Map_Manager.h
@@ -36,7 +36,7 @@ class ACE_Export ACE_Active_Map_Manager_Key
 {
 public:
   /// Default constructor.
-  ACE_Active_Map_Manager_Key (void);
+  ACE_Active_Map_Manager_Key ();
 
   /**
    * Constructor given the @a slot_index and @a slot_generation number.
@@ -47,19 +47,19 @@ public:
                               ACE_UINT32 slot_generation);
 
   /// Get the slot_index.
-  ACE_UINT32 slot_index (void) const;
+  ACE_UINT32 slot_index () const;
 
   /// Set the slot_index.
   void slot_index (ACE_UINT32 i);
 
   /// Get the slot_generation number.
-  ACE_UINT32 slot_generation (void) const;
+  ACE_UINT32 slot_generation () const;
 
   /// Set the slot_generation number.
   void slot_generation (ACE_UINT32 g);
 
   /// Size required to store information about active key.
-  static size_t size (void);
+  static size_t size ();
 
   /// Recover state of active key from @a data.  User must make sure
   /// that @a data encoded using the encode() method.
@@ -77,7 +77,7 @@ public:
   // friends, they are not.
 
   /// Increment the slot_generation number.
-  void increment_slot_generation_count (void);
+  void increment_slot_generation_count ();
 
 private:
   /**
diff --git a/ACE/ace/Active_Map_Manager.inl b/ACE/ace/Active_Map_Manager.inl
index 2fc8c13e5d9..6abb8c62079 100644
--- a/ACE/ace/Active_Map_Manager.inl
+++ b/ACE/ace/Active_Map_Manager.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (void)
+ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key ()
 {
   // If you change ~0, please change ACE_Map_Manager::free_list_id()
   // accordingly.
@@ -21,13 +21,13 @@ ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (ACE_UINT32 slot_index,
 }
 
 ACE_INLINE ACE_UINT32
-ACE_Active_Map_Manager_Key::slot_index (void) const
+ACE_Active_Map_Manager_Key::slot_index () const
 {
   return this->key_data_.slot_index_;
 }
 
 ACE_INLINE ACE_UINT32
-ACE_Active_Map_Manager_Key::slot_generation (void) const
+ACE_Active_Map_Manager_Key::slot_generation () const
 {
   return this->key_data_.slot_generation_;
 }
@@ -59,14 +59,14 @@ ACE_Active_Map_Manager_Key::slot_generation (ACE_UINT32 g)
 }
 
 ACE_INLINE void
-ACE_Active_Map_Manager_Key::increment_slot_generation_count (void)
+ACE_Active_Map_Manager_Key::increment_slot_generation_count ()
 {
   ++this->key_data_.slot_generation_;
 }
 
 /* static */
 ACE_INLINE size_t
-ACE_Active_Map_Manager_Key::size (void)
+ACE_Active_Map_Manager_Key::size ()
 {
   return sizeof (ACE_UINT32) + sizeof (ACE_UINT32);
 }
diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h
index 472ea71911b..ee4e7783e8d 100644
--- a/ACE/ace/Active_Map_Manager_T.h
+++ b/ACE/ace/Active_Map_Manager_T.h
@@ -58,7 +58,7 @@ public:
 
   /// Close down a Active_Map_Manager and release dynamically
   /// allocated resources.
-  ~ACE_Active_Map_Manager (void);
+  ~ACE_Active_Map_Manager ();
 
   /// Initialize a Active_Map_Manager with size @a length.
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
@@ -66,7 +66,7 @@ public:
 
   /// Close down a Active_Map_Manager and release dynamically
   /// allocated resources.
-  int close (void);
+  int close ();
 
   /// Add @a value to the map, and the corresponding key produced by the
   /// Active_Map_Manager is returned through @a key.
@@ -153,26 +153,26 @@ public:
               T *&internal_value);
 
   /// Return the current size of the map.
-  size_t current_size (void) const;
+  size_t current_size () const;
 
   /// Return the total size of the map.
-  size_t total_size (void) const;
+  size_t total_size () const;
 
   /// Returns a key that cannot be found in the map.
-  static const ACE_Active_Map_Manager_Key npos (void);
+  static const ACE_Active_Map_Manager_Key npos ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> begin (void);
-  ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> end (void);
+  ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> begin ();
+  ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> end ();
 
   /// Return reverse iterator.
-  ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> rbegin (void);
-  ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> rend (void);
+  ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> rbegin ();
+  ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> rend ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Active_Map_Manager_T.inl b/ACE/ace/Active_Map_Manager_T.inl
index c8a6caf9b52..5e7cec0d0ff 100644
--- a/ACE/ace/Active_Map_Manager_T.inl
+++ b/ACE/ace/Active_Map_Manager_T.inl
@@ -237,7 +237,7 @@ ACE_Active_Map_Manager<T>::ACE_Active_Map_Manager (size_t size,
 }
 
 template <class T> ACE_INLINE
-ACE_Active_Map_Manager<T>::~ACE_Active_Map_Manager (void)
+ACE_Active_Map_Manager<T>::~ACE_Active_Map_Manager ()
 {
 }
 
@@ -249,32 +249,32 @@ ACE_Active_Map_Manager<T>::open (size_t length,
 }
 
 template <class T> ACE_INLINE int
-ACE_Active_Map_Manager<T>::close (void)
+ACE_Active_Map_Manager<T>::close ()
 {
   return ACE_AMM_BASE::close ();
 }
 
 template <class T> ACE_INLINE size_t
-ACE_Active_Map_Manager<T>::current_size (void) const
+ACE_Active_Map_Manager<T>::current_size () const
 {
   return ACE_AMM_BASE::current_size ();
 }
 
 template <class T> ACE_INLINE size_t
-ACE_Active_Map_Manager<T>::total_size (void) const
+ACE_Active_Map_Manager<T>::total_size () const
 {
   return ACE_AMM_BASE::total_size ();
 }
 
 /* static */
 template <class T> ACE_INLINE const ACE_Active_Map_Manager_Key
-ACE_Active_Map_Manager<T>::npos (void)
+ACE_Active_Map_Manager<T>::npos ()
 {
   return ACE_Active_Map_Manager_Key (~0, ~0);
 }
 
 template <class T> ACE_INLINE void
-ACE_Active_Map_Manager<T>::dump (void) const
+ACE_Active_Map_Manager<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_AMM_BASE::dump ();
@@ -282,25 +282,25 @@ ACE_Active_Map_Manager<T>::dump (void) const
 }
 
 template <class T> ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
-ACE_Active_Map_Manager<T>::begin (void)
+ACE_Active_Map_Manager<T>::begin ()
 {
   return ACE_AMM_BASE::begin ();
 }
 
 template <class T> ACE_INLINE ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
-ACE_Active_Map_Manager<T>::end (void)
+ACE_Active_Map_Manager<T>::end ()
 {
   return ACE_AMM_BASE::end ();
 }
 
 template <class T> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
-ACE_Active_Map_Manager<T>::rbegin (void)
+ACE_Active_Map_Manager<T>::rbegin ()
 {
   return ACE_AMM_BASE::rbegin ();
 }
 
 template <class T> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
-ACE_Active_Map_Manager<T>::rend (void)
+ACE_Active_Map_Manager<T>::rend ()
 {
   return ACE_AMM_BASE::rend ();
 }
diff --git a/ACE/ace/Addr.cpp b/ACE/ace/Addr.cpp
index 85f3523cf48..b1685851c49 100644
--- a/ACE/ace/Addr.cpp
+++ b/ACE/ace/Addr.cpp
@@ -28,12 +28,12 @@ ACE_Addr::ACE_Addr (int type, int size) :
 {
 }
 
-ACE_Addr::~ACE_Addr (void)
+ACE_Addr::~ACE_Addr ()
 {
 }
 
 void *
-ACE_Addr::get_addr (void) const
+ACE_Addr::get_addr () const
 {
   return 0;
 }
@@ -53,7 +53,7 @@ ACE_Addr::base_set (int type, int size)
 }
 
 void
-ACE_Addr::dump (void) const
+ACE_Addr::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Addr::dump");
diff --git a/ACE/ace/Addr.h b/ACE/ace/Addr.h
index e7760cd2f33..bfdea64446d 100644
--- a/ACE/ace/Addr.h
+++ b/ACE/ace/Addr.h
@@ -34,12 +34,12 @@ public:
   ACE_Addr (int type = -1, int size = -1);
 
   /// Destructor.
-  virtual ~ACE_Addr (void);
+  virtual ~ACE_Addr ();
 
   // = Get/set the size of the address.
 
   /// Return the size of the address.
-  int get_size (void) const;
+  int get_size () const;
 
   /// Sets the size of the address.
   void set_size (int size);
@@ -47,13 +47,13 @@ public:
   // = Get/set the type of the address.
 
   /// Get the type of the address.
-  int get_type (void) const;
+  int get_type () const;
 
   /// Set the type of the address.
   void set_type (int type);
 
   /// Return a pointer to the address.
-  virtual void *get_addr (void) const;
+  virtual void *get_addr () const;
 
   /// Set a pointer to the address.
   virtual void set_addr (const void *, int len);
@@ -73,10 +73,10 @@ public:
 
   /// Returns a hash value.  This should be overwritten by a subclass
   /// that can produce a better hash value.
-  virtual unsigned long hash (void) const;
+  virtual unsigned long hash () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Addr.inl b/ACE/ace/Addr.inl
index ad6f03e216a..1df00e9ab41 100644
--- a/ACE/ace/Addr.inl
+++ b/ACE/ace/Addr.inl
@@ -19,7 +19,7 @@ ACE_Addr::operator != (const ACE_Addr &sap) const
 
 /// Return the size of the address.
 ACE_INLINE int
-ACE_Addr::get_size (void) const
+ACE_Addr::get_size () const
 {
   return this->addr_size_;
 }
@@ -33,7 +33,7 @@ ACE_Addr::set_size (int size)
 
 /// Return the type of the address.
 ACE_INLINE int
-ACE_Addr::get_type (void) const
+ACE_Addr::get_type () const
 {
   return this->addr_type_;
 }
@@ -46,7 +46,7 @@ ACE_Addr::set_type (int type)
 }
 
 ACE_INLINE unsigned long
-ACE_Addr::hash (void) const
+ACE_Addr::hash () const
 {
   return 0;
 }
diff --git a/ACE/ace/Arg_Shifter.cpp b/ACE/ace/Arg_Shifter.cpp
index 29eace272bd..ef51e154d22 100644
--- a/ACE/ace/Arg_Shifter.cpp
+++ b/ACE/ace/Arg_Shifter.cpp
@@ -44,7 +44,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::ACE_Arg_Shifter_T (int& argc,
 
 template <typename CHAR_TYPE>
 void
-ACE_Arg_Shifter_T<CHAR_TYPE>::init (void)
+ACE_Arg_Shifter_T<CHAR_TYPE>::init ()
 {
   // If not provided with one, allocate a temporary array.
   if (this->temp_ == 0)
@@ -74,7 +74,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::init (void)
 }
 
 template <typename CHAR_TYPE>
-ACE_Arg_Shifter_T<CHAR_TYPE>::~ACE_Arg_Shifter_T (void)
+ACE_Arg_Shifter_T<CHAR_TYPE>::~ACE_Arg_Shifter_T ()
 {
   // Delete the temporary vector.
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -87,7 +87,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::~ACE_Arg_Shifter_T (void)
 
 template <typename CHAR_TYPE>
 const CHAR_TYPE *
-ACE_Arg_Shifter_T<CHAR_TYPE>::get_current (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::get_current () const
 {
   const CHAR_TYPE * retval = 0;
 
@@ -190,14 +190,14 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::ignore_arg (int number)
 
 template <typename CHAR_TYPE>
 int
-ACE_Arg_Shifter_T<CHAR_TYPE>::is_anything_left (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::is_anything_left () const
 {
   return this->total_size_ - this->current_index_;
 }
 
 template <typename CHAR_TYPE>
 int
-ACE_Arg_Shifter_T<CHAR_TYPE>::is_option_next (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::is_option_next () const
 {
   return this->is_anything_left () &&
     this->temp_[this->current_index_][0] == '-';
@@ -205,7 +205,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::is_option_next (void) const
 
 template <typename CHAR_TYPE>
 int
-ACE_Arg_Shifter_T<CHAR_TYPE>::is_parameter_next (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::is_parameter_next () const
 {
   return this->is_anything_left ()
     && this->temp_[this->current_index_][0] != '-';
@@ -213,7 +213,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::is_parameter_next (void) const
 
 template <typename CHAR_TYPE>
 int
-ACE_Arg_Shifter_T<CHAR_TYPE>::num_ignored_args (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::num_ignored_args () const
 {
   return this->front_;
 }
diff --git a/ACE/ace/Arg_Shifter.h b/ACE/ace/Arg_Shifter.h
index 29a6b345113..ec1817e692f 100644
--- a/ACE/ace/Arg_Shifter.h
+++ b/ACE/ace/Arg_Shifter.h
@@ -85,10 +85,10 @@ public:
                      CHAR_TYPE **temp = 0);
 
   /// Destructor.
-  ~ACE_Arg_Shifter_T (void);
+  ~ACE_Arg_Shifter_T ();
 
   /// Get the current head of the vector.
-  const CHAR_TYPE *get_current (void) const;
+  const CHAR_TYPE *get_current () const;
 
   /**
    * If the @a flag matches the current_arg of arg shifter
@@ -172,18 +172,18 @@ public:
   int ignore_arg (int number = 1);
 
   /// Returns the number of args left to see in the vector.
-  int is_anything_left (void) const;
+  int is_anything_left () const;
 
   /// Returns 1 if there's a next item in the vector and it begins with
   /// '-'.
-  int is_option_next (void) const;
+  int is_option_next () const;
 
   /// Returns 1 if there's a next item in the vector and it doesn't
   /// begin with '-'.
-  int is_parameter_next (void) const;
+  int is_parameter_next () const;
 
   /// Returns the number of irrelevant args seen.
-  int num_ignored_args (void) const;
+  int num_ignored_args () const;
 
 private:
   /// Copy Constructor should not be used.
@@ -193,7 +193,7 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Arg_Shifter_T operator= (const ACE_Arg_Shifter_T<CHAR_TYPE> &))
 
   /// Refactor the constructor logic.
-  void init (void);
+  void init ();
 
   /// The size of the argument vector.
   int &argc_;
diff --git a/ACE/ace/Argv_Type_Converter.cpp b/ACE/ace/Argv_Type_Converter.cpp
index 4c8e4fbb93a..ddf9531f10a 100644
--- a/ACE/ace/Argv_Type_Converter.cpp
+++ b/ACE/ace/Argv_Type_Converter.cpp
@@ -47,7 +47,7 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, char **argv)
 }
 #endif  // ACE_USES_WCHAR
 
-ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void)
+ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter ()
 {
 #if defined (ACE_USES_WCHAR)
   // selectively delete the 'copy' of argv
diff --git a/ACE/ace/Argv_Type_Converter.h b/ACE/ace/Argv_Type_Converter.h
index c2a73f2c1eb..f752633de56 100644
--- a/ACE/ace/Argv_Type_Converter.h
+++ b/ACE/ace/Argv_Type_Converter.h
@@ -43,16 +43,16 @@ public:
   ACE_Argv_Type_Converter (int &argc, wchar_t** argv);
 #endif  // ACE_USES_WCHAR
 
-  ~ACE_Argv_Type_Converter (void);
+  ~ACE_Argv_Type_Converter ();
 
   /// Returns the pointer of converted command line.
-  ACE_TCHAR** get_TCHAR_argv (void);
+  ACE_TCHAR** get_TCHAR_argv ();
 
   /// Returns the pointer of ASCII (char) command line.
-  char** get_ASCII_argv (void);
+  char** get_ASCII_argv ();
 
   /// Returns the number of sub parameters (argc).
-  int& get_argc (void);
+  int& get_argc ();
 
 private:
   /// Copy Constructor should not be used.
diff --git a/ACE/ace/Argv_Type_Converter.inl b/ACE/ace/Argv_Type_Converter.inl
index 8c7bc89ca89..c79688cd723 100644
--- a/ACE/ace/Argv_Type_Converter.inl
+++ b/ACE/ace/Argv_Type_Converter.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_TCHAR**
-ACE_Argv_Type_Converter::get_TCHAR_argv (void)
+ACE_Argv_Type_Converter::get_TCHAR_argv ()
 {
 #if defined (ACE_USES_WCHAR)
   if (this->char_passed_)
@@ -18,7 +18,7 @@ ACE_Argv_Type_Converter::get_TCHAR_argv (void)
 }
 
 ACE_INLINE char**
-ACE_Argv_Type_Converter::get_ASCII_argv (void)
+ACE_Argv_Type_Converter::get_ASCII_argv ()
 {
 #if defined (ACE_USES_WCHAR)
   if (this->wchar_passed_)
@@ -33,7 +33,7 @@ ACE_Argv_Type_Converter::get_ASCII_argv (void)
 }
 
 ACE_INLINE int&
-ACE_Argv_Type_Converter::get_argc (void)
+ACE_Argv_Type_Converter::get_argc ()
 {
   return this->saved_argc_;
 }
diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h
index 15ffe77c361..d5ed71e47df 100644
--- a/ACE/ace/Array_Base.h
+++ b/ACE/ace/Array_Base.h
@@ -85,7 +85,7 @@ public:
   void operator= (ACE_Array_Base<T> const & s);
 
   /// Clean up the array (e.g., delete dynamically allocated memory).
-  ~ACE_Array_Base (void);
+  ~ACE_Array_Base ();
 
   // = Set/get methods.
 
@@ -110,7 +110,7 @@ public:
   int get (T & item, size_type slot) const;
 
   /// Returns the <cur_size_> of the array.
-  size_type size (void) const;
+  size_type size () const;
 
   /**
    * Changes the size of the array to match @a new_size.
@@ -120,7 +120,7 @@ public:
   int size (size_type new_size);
 
   /// Returns the <max_size_> of the array.
-  size_type max_size (void) const;
+  size_type max_size () const;
 
   /**
    * Changes the size of the array to match @a new_size.
@@ -136,10 +136,10 @@ public:
    * Forward iterator accessors.
    */
   //@{
-  iterator begin (void);
-  iterator end   (void);
-  const_iterator begin (void) const;
-  const_iterator end   (void) const;
+  iterator begin ();
+  iterator end   ();
+  const_iterator begin () const;
+  const_iterator end   () const;
   //@}
 
   /**
@@ -148,10 +148,10 @@ public:
    * Reverse iterator accessors.
    */
   //@{
-  reverse_iterator rbegin (void);
-  reverse_iterator rend   (void);
-  const_reverse_iterator rbegin (void) const;
-  const_reverse_iterator rend   (void) const;
+  reverse_iterator rbegin ();
+  reverse_iterator rend   ();
+  const_reverse_iterator rbegin () const;
+  const_reverse_iterator rend   () const;
   //@}
 
   /// Swap the contents of this array with the given @a array in
@@ -212,13 +212,13 @@ public:
 
   /// Move forward by one element in the Array.  Returns 0 when all the
   /// items in the Array have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Array_Base.inl b/ACE/ace/Array_Base.inl
index ccd367f2d98..5a5cef338ff 100644
--- a/ACE/ace/Array_Base.inl
+++ b/ACE/ace/Array_Base.inl
@@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Clean up the array (e.g., delete dynamically allocated memory).
 template <class T> ACE_INLINE
-ACE_Array_Base<T>::~ACE_Array_Base (void)
+ACE_Array_Base<T>::~ACE_Array_Base ()
 {
   ACE_DES_ARRAY_FREE (this->array_,
                       this->max_size_,
@@ -13,68 +13,68 @@ ACE_Array_Base<T>::~ACE_Array_Base (void)
 
 template <class T>
 ACE_INLINE typename ACE_Array_Base<T>::iterator
-ACE_Array_Base<T>::begin (void)
+ACE_Array_Base<T>::begin ()
 {
   return this->array_;
 }
 
 template <class T>
 ACE_INLINE typename ACE_Array_Base<T>::iterator
-ACE_Array_Base<T>::end (void)
+ACE_Array_Base<T>::end ()
 {
   return this->array_ + this->cur_size_;
 }
 
 template <class T>
 ACE_INLINE typename ACE_Array_Base<T>::const_iterator
-ACE_Array_Base<T>::begin (void) const
+ACE_Array_Base<T>::begin () const
 {
   return this->array_;
 }
 
 template <class T>
 ACE_INLINE typename ACE_Array_Base<T>::const_iterator
-ACE_Array_Base<T>::end (void) const
+ACE_Array_Base<T>::end () const
 {
   return this->array_ + this->cur_size_;
 }
 
 template <class T>
 ACE_INLINE typename ACE_Array_Base<T>::reverse_iterator
-ACE_Array_Base<T>::rbegin (void)
+ACE_Array_Base<T>::rbegin ()
 {
   return reverse_iterator (this->end ());
 }
 
 template <class T>
 ACE_INLINE typename ACE_Array_Base<T>::reverse_iterator
-ACE_Array_Base<T>::rend (void)
+ACE_Array_Base<T>::rend ()
 {
   return reverse_iterator (this->begin ());
 }
 
 template <class T>
 ACE_INLINE typename ACE_Array_Base<T>::const_reverse_iterator
-ACE_Array_Base<T>::rbegin (void) const
+ACE_Array_Base<T>::rbegin () const
 {
   return const_reverse_iterator (this->end ());
 }
 
 template <class T>
 ACE_INLINE typename ACE_Array_Base<T>::const_reverse_iterator
-ACE_Array_Base<T>::rend (void) const
+ACE_Array_Base<T>::rend () const
 {
   return const_reverse_iterator (this->begin ());
 }
 
 template <class T> ACE_INLINE typename ACE_Array_Base<T>::size_type
-ACE_Array_Base<T>::size (void) const
+ACE_Array_Base<T>::size () const
 {
   return this->cur_size_;
 }
 
 template <class T> ACE_INLINE typename ACE_Array_Base<T>::size_type
-ACE_Array_Base<T>::max_size (void) const
+ACE_Array_Base<T>::max_size () const
 {
   return this->max_size_;
 }
@@ -100,7 +100,7 @@ ACE_Array_Base<T>::operator[] (typename ACE_Array_Base<T>::size_type index) cons
 // ****************************************************************
 
 template <class T> ACE_INLINE void
-ACE_Array_Iterator<T>::dump (void) const
+ACE_Array_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Array_Iterator<T>::dump");
@@ -116,7 +116,7 @@ ACE_Array_Iterator<T>::ACE_Array_Iterator (ACE_Array_Base<T> &a)
 }
 
 template <class T> ACE_INLINE int
-ACE_Array_Iterator<T>::advance (void)
+ACE_Array_Iterator<T>::advance ()
 {
   // ACE_TRACE ("ACE_Array_Iterator<T>::advance");
 
@@ -133,7 +133,7 @@ ACE_Array_Iterator<T>::advance (void)
 }
 
 template <class T> ACE_INLINE int
-ACE_Array_Iterator<T>::done (void) const
+ACE_Array_Iterator<T>::done () const
 {
   ACE_TRACE ("ACE_Array_Iterator<T>::done");
 
diff --git a/ACE/ace/Array_Map.cpp b/ACE/ace/Array_Map.cpp
index 4917c51e42f..9a62b7275bf 100644
--- a/ACE/ace/Array_Map.cpp
+++ b/ACE/ace/Array_Map.cpp
@@ -41,7 +41,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::ACE_Array_Map (
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::~ACE_Array_Map (void)
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::~ACE_Array_Map ()
 {
   for (size_t idx = 0; idx != capacity_; ++idx)
   {
@@ -162,7 +162,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::erase (
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 void
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::clear (void)
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::clear ()
 {
   this->size_ = 0;  // No need to deallocate array nor destroy elements.
 }
diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h
index 5fd040069ee..4feefe97066 100644
--- a/ACE/ace/Array_Map.h
+++ b/ACE/ace/Array_Map.h
@@ -125,7 +125,7 @@ public:
   ACE_Array_Map & operator= (ACE_Array_Map const & map);
 
   /// Destructor.
-  ~ACE_Array_Map (void);
+  ~ACE_Array_Map ();
 
   /**
    * @name Forward Iterator Accessors
@@ -133,10 +133,10 @@ public:
    * Forward iterator accessors.
    */
   //@{
-  iterator begin (void);
-  iterator end   (void);
-  const_iterator begin (void) const;
-  const_iterator end   (void) const;
+  iterator begin ();
+  iterator end   ();
+  const_iterator begin () const;
+  const_iterator end   () const;
   //@}
 
   /**
@@ -145,30 +145,30 @@ public:
    * Reverse iterator accessors.
    */
   //@{
-  reverse_iterator rbegin (void);
-  reverse_iterator rend   (void);
-  const_reverse_iterator rbegin (void) const;
-  const_reverse_iterator rend   (void) const;
+  reverse_iterator rbegin ();
+  reverse_iterator rend   ();
+  const_reverse_iterator rbegin () const;
+  const_reverse_iterator rend   () const;
   //@}
 
   /// Return current size of map.
   /**
    * @return The number of elements in the map.
    */
-  size_type size (void) const;
+  size_type size () const;
 
   /// Maximum number of elements the map can hold.
-  size_type max_size (void) const;
+  size_type max_size () const;
 
   /// Return @c true if the map is empty, else @c false.
-  bool is_empty (void) const;  // ACE style
+  bool is_empty () const;  // ACE style
 
   /**
    * Return @c true if the map is empty, else @c false.  We recommend
    * using @c is_empty() instead since it's more consistent with the
    * ACE container naming conventions.
    */
-  bool empty (void) const;  // STL style
+  bool empty () const;  // STL style
 
   /// Swap the contents of this map with the given @a map in an
   /// exception-safe manner.
@@ -208,7 +208,7 @@ public:
   /**
    * @note This a constant time (O(1)) operation.
    */
-  void clear (void);
+  void clear ();
 
   /**
    * @name Search Operations
diff --git a/ACE/ace/Array_Map.inl b/ACE/ace/Array_Map.inl
index 32e7848c02d..d9c8978332f 100644
--- a/ACE/ace/Array_Map.inl
+++ b/ACE/ace/Array_Map.inl
@@ -26,77 +26,77 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::operator= (
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::iterator
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::begin (void)
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::begin ()
 {
   return this->nodes_;
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::iterator
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::end (void)
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::end ()
 {
   return this->nodes_ + this->size_;
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::const_iterator
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::begin (void) const
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::begin () const
 {
   return this->nodes_;
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::const_iterator
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::end (void) const
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::end () const
 {
   return this->nodes_ + this->size_;
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::reverse_iterator
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::rbegin (void)
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::rbegin ()
 {
   return reverse_iterator (this->end ());
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::reverse_iterator
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::rend (void)
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::rend ()
 {
   return reverse_iterator (this->begin ());
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::const_reverse_iterator
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::rbegin (void) const
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::rbegin () const
 {
   return const_reverse_iterator (this->end ());
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::const_reverse_iterator
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::rend (void) const
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::rend () const
 {
   return const_reverse_iterator (this->begin ());
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::size_type
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::size (void) const
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::size () const
 {
   return this->size_;
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::size_type
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::max_size (void) const
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::max_size () const
 {
   return size_type (-1) / sizeof (value_type);
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE bool
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::is_empty (void) const
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::is_empty () const
 {
   return this->size_ == 0;
 }
@@ -105,7 +105,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::is_empty (void) const
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
 ACE_INLINE bool
-ACE_Array_Map<Key, Value, EqualTo, Alloc>::empty (void) const
+ACE_Array_Map<Key, Value, EqualTo, Alloc>::empty () const
 {
   return this->is_empty ();
 }
diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp
index f50cdc33d31..64637f49a6b 100644
--- a/ACE/ace/Asynch_IO.cpp
+++ b/ACE/ace/Asynch_IO.cpp
@@ -13,61 +13,61 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 size_t
-ACE_Asynch_Result::bytes_transferred (void) const
+ACE_Asynch_Result::bytes_transferred () const
 {
   return this->implementation ()->bytes_transferred ();
 }
 
 const void *
-ACE_Asynch_Result::act (void) const
+ACE_Asynch_Result::act () const
 {
   return this->implementation ()->act ();
 }
 
 int
-ACE_Asynch_Result::success (void) const
+ACE_Asynch_Result::success () const
 {
   return this->implementation ()->success ();
 }
 
 const void *
-ACE_Asynch_Result::completion_key (void) const
+ACE_Asynch_Result::completion_key () const
 {
   return this->implementation ()->completion_key ();
 }
 
 unsigned long
-ACE_Asynch_Result::error (void) const
+ACE_Asynch_Result::error () const
 {
   return this->implementation ()->error ();
 }
 
 ACE_HANDLE
-ACE_Asynch_Result::event (void) const
+ACE_Asynch_Result::event () const
 {
   return this->implementation ()->event ();
 }
 
 unsigned long
-ACE_Asynch_Result::offset (void) const
+ACE_Asynch_Result::offset () const
 {
   return this->implementation ()->offset ();
 }
 
 unsigned long
-ACE_Asynch_Result::offset_high (void) const
+ACE_Asynch_Result::offset_high () const
 {
   return this->implementation ()->offset_high ();
 }
 
 int
-ACE_Asynch_Result::priority (void) const
+ACE_Asynch_Result::priority () const
 {
   return this->implementation ()->priority ();
 }
 
 int
-ACE_Asynch_Result::signal_number (void) const
+ACE_Asynch_Result::signal_number () const
 {
   return this->implementation ()->signal_number ();
 }
@@ -77,13 +77,13 @@ ACE_Asynch_Result::ACE_Asynch_Result (ACE_Asynch_Result_Impl *implementation)
 {
 }
 
-ACE_Asynch_Result::~ACE_Asynch_Result (void)
+ACE_Asynch_Result::~ACE_Asynch_Result ()
 {
   // Proactor deletes the implementation when the <complete> finishes.
 }
 
 ACE_Asynch_Result_Impl *
-ACE_Asynch_Result::implementation (void) const
+ACE_Asynch_Result::implementation () const
 {
   return this->implementation_;
 }
@@ -103,7 +103,7 @@ ACE_Asynch_Operation::open (ACE_Handler &handler,
 }
 
 int
-ACE_Asynch_Operation::cancel (void)
+ACE_Asynch_Operation::cancel ()
 {
   if (0 == this->implementation ())
     {
@@ -114,7 +114,7 @@ ACE_Asynch_Operation::cancel (void)
 }
 
 ACE_Proactor *
-ACE_Asynch_Operation::proactor (void) const
+ACE_Asynch_Operation::proactor () const
 {
   if (0 == this->implementation ())
     {
@@ -124,11 +124,11 @@ ACE_Asynch_Operation::proactor (void) const
   return this->implementation ()->proactor ();
 }
 
-ACE_Asynch_Operation::ACE_Asynch_Operation (void)
+ACE_Asynch_Operation::ACE_Asynch_Operation ()
 {
 }
 
-ACE_Asynch_Operation::~ACE_Asynch_Operation (void)
+ACE_Asynch_Operation::~ACE_Asynch_Operation ()
 {
 }
 
@@ -149,12 +149,12 @@ ACE_Asynch_Operation::get_proactor (ACE_Proactor *user_proactor,
 
 // ************************************************************
 
-ACE_Asynch_Read_Stream::ACE_Asynch_Read_Stream (void)
+ACE_Asynch_Read_Stream::ACE_Asynch_Read_Stream ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Read_Stream::~ACE_Asynch_Read_Stream (void)
+ACE_Asynch_Read_Stream::~ACE_Asynch_Read_Stream ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -222,7 +222,7 @@ ACE_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
 #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Read_Stream::implementation (void) const
+ACE_Asynch_Read_Stream::implementation () const
 {
   return this->implementation_;
 }
@@ -230,19 +230,19 @@ ACE_Asynch_Read_Stream::implementation (void) const
 // ************************************************************
 
 size_t
-ACE_Asynch_Read_Stream::Result::bytes_to_read (void) const
+ACE_Asynch_Read_Stream::Result::bytes_to_read () const
 {
   return this->implementation ()->bytes_to_read ();
 }
 
 ACE_Message_Block &
-ACE_Asynch_Read_Stream::Result::message_block (void) const
+ACE_Asynch_Read_Stream::Result::message_block () const
 {
   return this->implementation ()->message_block ();
 }
 
 ACE_HANDLE
-ACE_Asynch_Read_Stream::Result::handle (void) const
+ACE_Asynch_Read_Stream::Result::handle () const
 {
   return this->implementation ()->handle ();
 }
@@ -253,26 +253,26 @@ ACE_Asynch_Read_Stream::Result::Result (ACE_Asynch_Read_Stream_Result_Impl *impl
 {
 }
 
-ACE_Asynch_Read_Stream::Result::~Result (void)
+ACE_Asynch_Read_Stream::Result::~Result ()
 {
   // Proactor will delete the implementation after <complete> is
   // finished.
 }
 
 ACE_Asynch_Read_Stream_Result_Impl *
-ACE_Asynch_Read_Stream::Result::implementation (void) const
+ACE_Asynch_Read_Stream::Result::implementation () const
 {
   return this->implementation_;
 }
 
 // ***************************************************
 
-ACE_Asynch_Write_Stream::ACE_Asynch_Write_Stream (void)
+ACE_Asynch_Write_Stream::ACE_Asynch_Write_Stream ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Write_Stream::~ACE_Asynch_Write_Stream (void)
+ACE_Asynch_Write_Stream::~ACE_Asynch_Write_Stream ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -340,7 +340,7 @@ ACE_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
 #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Write_Stream::implementation (void) const
+ACE_Asynch_Write_Stream::implementation () const
 {
   return this->implementation_;
 }
@@ -348,19 +348,19 @@ ACE_Asynch_Write_Stream::implementation (void) const
 // ************************************************************
 
 size_t
-ACE_Asynch_Write_Stream::Result::bytes_to_write (void) const
+ACE_Asynch_Write_Stream::Result::bytes_to_write () const
 {
   return this->implementation ()->bytes_to_write ();
 }
 
 ACE_Message_Block &
-ACE_Asynch_Write_Stream::Result::message_block (void) const
+ACE_Asynch_Write_Stream::Result::message_block () const
 {
   return this->implementation ()->message_block ();
 }
 
 ACE_HANDLE
-ACE_Asynch_Write_Stream::Result::handle (void) const
+ACE_Asynch_Write_Stream::Result::handle () const
 {
   return this->implementation ()->handle ();
 }
@@ -371,26 +371,26 @@ ACE_Asynch_Write_Stream::Result::Result (ACE_Asynch_Write_Stream_Result_Impl *im
 {
 }
 
-ACE_Asynch_Write_Stream::Result::~Result (void)
+ACE_Asynch_Write_Stream::Result::~Result ()
 {
   // Proactor will delte the implementation when the <complete> call
   // finishes.
 }
 
 ACE_Asynch_Write_Stream_Result_Impl *
-ACE_Asynch_Write_Stream::Result::implementation (void) const
+ACE_Asynch_Write_Stream::Result::implementation () const
 {
   return this->implementation_;
 }
 
 // ************************************************************
 
-ACE_Asynch_Read_File::ACE_Asynch_Read_File (void)
+ACE_Asynch_Read_File::ACE_Asynch_Read_File ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Read_File::~ACE_Asynch_Read_File (void)
+ACE_Asynch_Read_File::~ACE_Asynch_Read_File ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -466,7 +466,7 @@ ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block,
 #endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Read_File::implementation (void) const
+ACE_Asynch_Read_File::implementation () const
 {
   return this->implementation_;
 }
@@ -479,26 +479,26 @@ ACE_Asynch_Read_File::Result::Result (ACE_Asynch_Read_File_Result_Impl *implemen
 {
 }
 
-ACE_Asynch_Read_File::Result::~Result (void)
+ACE_Asynch_Read_File::Result::~Result ()
 {
   // Proactor will delete the implementation when <complete> call
   // completes.
 }
 
 ACE_Asynch_Read_File_Result_Impl *
-ACE_Asynch_Read_File::Result::implementation (void) const
+ACE_Asynch_Read_File::Result::implementation () const
 {
   return this->implementation_;
 }
 
 // ************************************************************
 
-ACE_Asynch_Write_File::ACE_Asynch_Write_File (void)
+ACE_Asynch_Write_File::ACE_Asynch_Write_File ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Write_File::~ACE_Asynch_Write_File (void)
+ACE_Asynch_Write_File::~ACE_Asynch_Write_File ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -574,7 +574,7 @@ ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block,
 #endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Write_File::implementation (void) const
+ACE_Asynch_Write_File::implementation () const
 {
   return this->implementation_;
 }
@@ -587,26 +587,26 @@ ACE_Asynch_Write_File::Result::Result (ACE_Asynch_Write_File_Result_Impl *implem
 {
 }
 
-ACE_Asynch_Write_File::Result::~Result (void)
+ACE_Asynch_Write_File::Result::~Result ()
 {
   // Proactor will delete the implementation when the <complete> call
   // completes.
 }
 
 ACE_Asynch_Write_File_Result_Impl *
-ACE_Asynch_Write_File::Result::implementation (void) const
+ACE_Asynch_Write_File::Result::implementation () const
 {
   return this->implementation_;
 }
 
 // *********************************************************************
 
-ACE_Asynch_Accept::ACE_Asynch_Accept (void)
+ACE_Asynch_Accept::ACE_Asynch_Accept ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Accept::~ACE_Asynch_Accept (void)
+ACE_Asynch_Accept::~ACE_Asynch_Accept ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -657,7 +657,7 @@ ACE_Asynch_Accept::accept (ACE_Message_Block &message_block,
 }
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Accept::implementation (void)  const
+ACE_Asynch_Accept::implementation ()  const
 {
   return this->implementation_;
 }
@@ -665,25 +665,25 @@ ACE_Asynch_Accept::implementation (void)  const
 // ************************************************************
 
 size_t
-ACE_Asynch_Accept::Result::bytes_to_read (void) const
+ACE_Asynch_Accept::Result::bytes_to_read () const
 {
   return this->implementation ()->bytes_to_read ();
 }
 
 ACE_Message_Block &
-ACE_Asynch_Accept::Result::message_block (void) const
+ACE_Asynch_Accept::Result::message_block () const
 {
   return this->implementation ()->message_block ();
 }
 
 ACE_HANDLE
-ACE_Asynch_Accept::Result::listen_handle (void) const
+ACE_Asynch_Accept::Result::listen_handle () const
 {
   return this->implementation ()->listen_handle ();
 }
 
 ACE_HANDLE
-ACE_Asynch_Accept::Result::accept_handle (void) const
+ACE_Asynch_Accept::Result::accept_handle () const
 {
   return this->implementation ()->accept_handle ();
 }
@@ -694,14 +694,14 @@ ACE_Asynch_Accept::Result::Result (ACE_Asynch_Accept_Result_Impl *implementation
 {
 }
 
-ACE_Asynch_Accept::Result::~Result (void)
+ACE_Asynch_Accept::Result::~Result ()
 {
   // Proactor will delete the implementation when the <complete> call
   // completes.
 }
 
 ACE_Asynch_Accept_Result_Impl *
-ACE_Asynch_Accept::Result::implementation (void) const
+ACE_Asynch_Accept::Result::implementation () const
 {
   return this->implementation_;
 }
@@ -710,12 +710,12 @@ ACE_Asynch_Accept::Result::implementation (void) const
 
 // *********************************************************************
 
-ACE_Asynch_Connect::ACE_Asynch_Connect (void)
+ACE_Asynch_Connect::ACE_Asynch_Connect ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Connect::~ACE_Asynch_Connect (void)
+ACE_Asynch_Connect::~ACE_Asynch_Connect ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -766,7 +766,7 @@ ACE_Asynch_Connect::connect (ACE_HANDLE connect_handle,
 }
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Connect::implementation (void)  const
+ACE_Asynch_Connect::implementation ()  const
 {
   return this->implementation_;
 }
@@ -779,33 +779,33 @@ ACE_Asynch_Connect::Result::Result (ACE_Asynch_Connect_Result_Impl *implementati
 {
 }
 
-ACE_Asynch_Connect::Result::~Result (void)
+ACE_Asynch_Connect::Result::~Result ()
 {
   // Proactor will delete the implementation when the <complete> call
   // completes.
 }
 
 ACE_HANDLE
-ACE_Asynch_Connect::Result::connect_handle (void) const
+ACE_Asynch_Connect::Result::connect_handle () const
 {
   return this->implementation ()->connect_handle ();
 }
 
 
 ACE_Asynch_Connect_Result_Impl *
-ACE_Asynch_Connect::Result::implementation (void) const
+ACE_Asynch_Connect::Result::implementation () const
 {
   return this->implementation_;
 }
 
 // ************************************************************
 
-ACE_Asynch_Transmit_File::ACE_Asynch_Transmit_File (void)
+ACE_Asynch_Transmit_File::ACE_Asynch_Transmit_File ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Transmit_File::~ACE_Asynch_Transmit_File (void)
+ACE_Asynch_Transmit_File::~ACE_Asynch_Transmit_File ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -862,7 +862,7 @@ ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
 }
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Transmit_File::implementation (void) const
+ACE_Asynch_Transmit_File::implementation () const
 {
   return this->implementation_;
 }
@@ -870,37 +870,37 @@ ACE_Asynch_Transmit_File::implementation (void) const
 // ****************************************************************************
 
 ACE_HANDLE
-ACE_Asynch_Transmit_File::Result::socket (void) const
+ACE_Asynch_Transmit_File::Result::socket () const
 {
   return this->implementation ()->socket ();
 }
 
 ACE_HANDLE
-ACE_Asynch_Transmit_File::Result::file (void) const
+ACE_Asynch_Transmit_File::Result::file () const
 {
   return this->implementation ()->file ();
 }
 
 ACE_Asynch_Transmit_File::Header_And_Trailer *
-ACE_Asynch_Transmit_File::Result::header_and_trailer (void) const
+ACE_Asynch_Transmit_File::Result::header_and_trailer () const
 {
   return this->implementation ()->header_and_trailer ();
 }
 
 size_t
-ACE_Asynch_Transmit_File::Result::bytes_to_write (void) const
+ACE_Asynch_Transmit_File::Result::bytes_to_write () const
 {
   return this->implementation ()->bytes_to_write ();
 }
 
 size_t
-ACE_Asynch_Transmit_File::Result::bytes_per_send (void) const
+ACE_Asynch_Transmit_File::Result::bytes_per_send () const
 {
   return this->implementation ()->bytes_per_send ();
 }
 
 unsigned long
-ACE_Asynch_Transmit_File::Result::flags (void) const
+ACE_Asynch_Transmit_File::Result::flags () const
 {
   return this->implementation ()->flags ();
 }
@@ -911,12 +911,12 @@ ACE_Asynch_Transmit_File::Result::Result (ACE_Asynch_Transmit_File_Result_Impl *
 {
 }
 
-ACE_Asynch_Transmit_File::Result::~Result (void)
+ACE_Asynch_Transmit_File::Result::~Result ()
 {
 }
 
 ACE_Asynch_Transmit_File_Result_Impl *
-ACE_Asynch_Transmit_File::Result::implementation (void) const
+ACE_Asynch_Transmit_File::Result::implementation () const
 {
   return this->implementation_;
 }
@@ -934,7 +934,7 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::Header_And_Trailer (ACE_Message_Bl
 {
 }
 
-ACE_Asynch_Transmit_File::Header_And_Trailer::~Header_And_Trailer (void)
+ACE_Asynch_Transmit_File::Header_And_Trailer::~Header_And_Trailer ()
 {
 }
 
@@ -951,7 +951,7 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::header_and_trailer (ACE_Message_Bl
 }
 
 ACE_Message_Block *
-ACE_Asynch_Transmit_File::Header_And_Trailer::header (void) const
+ACE_Asynch_Transmit_File::Header_And_Trailer::header () const
 {
   return this->header_;
 }
@@ -963,7 +963,7 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::header (ACE_Message_Block *message
 }
 
 size_t
-ACE_Asynch_Transmit_File::Header_And_Trailer::header_bytes (void) const
+ACE_Asynch_Transmit_File::Header_And_Trailer::header_bytes () const
 {
   return this->header_bytes_;
 }
@@ -975,7 +975,7 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::header_bytes (size_t bytes)
 }
 
 ACE_Message_Block *
-ACE_Asynch_Transmit_File::Header_And_Trailer::trailer (void) const
+ACE_Asynch_Transmit_File::Header_And_Trailer::trailer () const
 {
   return this->trailer_;
 }
@@ -987,7 +987,7 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::trailer (ACE_Message_Block *messag
 }
 
 size_t
-ACE_Asynch_Transmit_File::Header_And_Trailer::trailer_bytes (void) const
+ACE_Asynch_Transmit_File::Header_And_Trailer::trailer_bytes () const
 {
   return this->trailer_bytes_;
 }
@@ -999,7 +999,7 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::trailer_bytes (size_t bytes)
 }
 
 ACE_LPTRANSMIT_FILE_BUFFERS
-ACE_Asynch_Transmit_File::Header_And_Trailer::transmit_buffers (void)
+ACE_Asynch_Transmit_File::Header_And_Trailer::transmit_buffers ()
 {
   // If both are zero, return zero
   if (this->header_ == 0 && this->trailer_ == 0)
@@ -1051,7 +1051,7 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::transmit_buffers (void)
 
 // *********************************************************************
 
-ACE_Handler::ACE_Handler (void)
+ACE_Handler::ACE_Handler ()
   : proactor_ (0), handle_ (ACE_INVALID_HANDLE)
 {
   ACE_Handler::Proxy *p;
@@ -1067,7 +1067,7 @@ ACE_Handler::ACE_Handler (ACE_Proactor *d)
   this->proxy_.reset (p);
 }
 
-ACE_Handler::~ACE_Handler (void)
+ACE_Handler::~ACE_Handler ()
 {
   ACE_Handler::Proxy *p = this->proxy_.get ();
   if (p)
@@ -1126,12 +1126,12 @@ ACE_Handler::handle_time_out (const ACE_Time_Value & /* tv */,
 }
 
 void
-ACE_Handler::handle_wakeup (void)
+ACE_Handler::handle_wakeup ()
 {
 }
 
 ACE_Proactor *
-ACE_Handler::proactor (void)
+ACE_Handler::proactor ()
 {
   return this->proactor_;
 }
@@ -1143,7 +1143,7 @@ ACE_Handler::proactor (ACE_Proactor *p)
 }
 
 ACE_HANDLE
-ACE_Handler::handle (void) const
+ACE_Handler::handle () const
 {
   return this->handle_;
 }
@@ -1155,18 +1155,18 @@ ACE_Handler::handle (ACE_HANDLE h)
 }
 
 ACE_Refcounted_Auto_Ptr<ACE_Handler::Proxy, ACE_SYNCH_MUTEX> &
-ACE_Handler::proxy (void)
+ACE_Handler::proxy ()
 {
   return this->proxy_;
 }
 
 // ************************************************************
 
-ACE_Service_Handler::ACE_Service_Handler (void)
+ACE_Service_Handler::ACE_Service_Handler ()
 {
 }
 
-ACE_Service_Handler::~ACE_Service_Handler (void)
+ACE_Service_Handler::~ACE_Service_Handler ()
 {
 }
 
@@ -1190,12 +1190,12 @@ ACE_Service_Handler::open (ACE_HANDLE,
 
 // ************************************************************
 
-ACE_Asynch_Read_Dgram::ACE_Asynch_Read_Dgram (void)
+ACE_Asynch_Read_Dgram::ACE_Asynch_Read_Dgram ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Read_Dgram::~ACE_Asynch_Read_Dgram (void)
+ACE_Asynch_Read_Dgram::~ACE_Asynch_Read_Dgram ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -1246,7 +1246,7 @@ ACE_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
 }
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Read_Dgram::implementation (void) const
+ACE_Asynch_Read_Dgram::implementation () const
 {
   return this->implementation_;
 }
@@ -1260,25 +1260,25 @@ ACE_Asynch_Read_Dgram::Result::remote_address (ACE_Addr& addr) const
 }
 
 ACE_Message_Block*
-ACE_Asynch_Read_Dgram::Result::message_block (void) const
+ACE_Asynch_Read_Dgram::Result::message_block () const
 {
   return this->implementation ()->message_block ();
 }
 
 int
-ACE_Asynch_Read_Dgram::Result::flags (void) const
+ACE_Asynch_Read_Dgram::Result::flags () const
 {
   return this->implementation ()->flags ();
 }
 
 size_t
-ACE_Asynch_Read_Dgram::Result::bytes_to_read (void) const
+ACE_Asynch_Read_Dgram::Result::bytes_to_read () const
 {
   return this->implementation ()->bytes_to_read ();
 }
 
 ACE_HANDLE
-ACE_Asynch_Read_Dgram::Result::handle (void) const
+ACE_Asynch_Read_Dgram::Result::handle () const
 {
   return this->implementation ()->handle();
 }
@@ -1289,12 +1289,12 @@ ACE_Asynch_Read_Dgram::Result::Result (ACE_Asynch_Read_Dgram_Result_Impl *implem
 {
 }
 
-ACE_Asynch_Read_Dgram::Result::~Result (void)
+ACE_Asynch_Read_Dgram::Result::~Result ()
 {
 }
 
 ACE_Asynch_Read_Dgram_Result_Impl *
-ACE_Asynch_Read_Dgram::Result::implementation (void) const
+ACE_Asynch_Read_Dgram::Result::implementation () const
 {
   return this->implementation_;
 }
@@ -1302,12 +1302,12 @@ ACE_Asynch_Read_Dgram::Result::implementation (void) const
 // ************************************************************
 
 
-ACE_Asynch_Write_Dgram::ACE_Asynch_Write_Dgram (void)
+ACE_Asynch_Write_Dgram::ACE_Asynch_Write_Dgram ()
   : implementation_ (0)
 {
 }
 
-ACE_Asynch_Write_Dgram::~ACE_Asynch_Write_Dgram (void)
+ACE_Asynch_Write_Dgram::~ACE_Asynch_Write_Dgram ()
 {
   // Delete the implementation.
   delete this->implementation_;
@@ -1358,7 +1358,7 @@ ACE_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
 }
 
 ACE_Asynch_Operation_Impl *
-ACE_Asynch_Write_Dgram::implementation (void) const
+ACE_Asynch_Write_Dgram::implementation () const
 {
   return this->implementation_;
 }
@@ -1366,7 +1366,7 @@ ACE_Asynch_Write_Dgram::implementation (void) const
 // ************************************************************
 
 size_t
-ACE_Asynch_Write_Dgram::Result::bytes_to_write (void) const
+ACE_Asynch_Write_Dgram::Result::bytes_to_write () const
 {
   return this->implementation ()->bytes_to_write ();
 }
@@ -1378,19 +1378,19 @@ ACE_Asynch_Write_Dgram::Result::message_block () const
 }
 
 int
-ACE_Asynch_Write_Dgram::Result::flags (void) const
+ACE_Asynch_Write_Dgram::Result::flags () const
 {
   return this->implementation ()->flags ();
 }
 
 ACE_HANDLE
-ACE_Asynch_Write_Dgram::Result::handle (void) const
+ACE_Asynch_Write_Dgram::Result::handle () const
 {
   return this->implementation ()->handle ();
 }
 
 ACE_Asynch_Write_Dgram_Result_Impl *
-ACE_Asynch_Write_Dgram::Result::implementation (void) const
+ACE_Asynch_Write_Dgram::Result::implementation () const
 {
   return this->implementation_;
 }
@@ -1401,7 +1401,7 @@ ACE_Asynch_Write_Dgram::Result::Result (ACE_Asynch_Write_Dgram_Result_Impl *impl
 {
 }
 
-ACE_Asynch_Write_Dgram::Result::~Result (void)
+ACE_Asynch_Write_Dgram::Result::~Result ()
 {
 }
 
diff --git a/ACE/ace/Asynch_IO_Impl.cpp b/ACE/ace/Asynch_IO_Impl.cpp
index 1f25a1ee7b9..209f11dac35 100644
--- a/ACE/ace/Asynch_IO_Impl.cpp
+++ b/ACE/ace/Asynch_IO_Impl.cpp
@@ -10,103 +10,103 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Asynch_Result_Impl::~ACE_Asynch_Result_Impl (void)
+ACE_Asynch_Result_Impl::~ACE_Asynch_Result_Impl ()
 {
 }
 
-ACE_Asynch_Operation_Impl::~ACE_Asynch_Operation_Impl (void)
+ACE_Asynch_Operation_Impl::~ACE_Asynch_Operation_Impl ()
 {
 }
 
-ACE_Asynch_Read_Stream_Impl::~ACE_Asynch_Read_Stream_Impl (void)
+ACE_Asynch_Read_Stream_Impl::~ACE_Asynch_Read_Stream_Impl ()
 {
 }
 
-ACE_Asynch_Read_Stream_Result_Impl::~ACE_Asynch_Read_Stream_Result_Impl (void)
+ACE_Asynch_Read_Stream_Result_Impl::~ACE_Asynch_Read_Stream_Result_Impl ()
 {
 }
 
-ACE_Asynch_Write_Stream_Impl::~ACE_Asynch_Write_Stream_Impl (void)
+ACE_Asynch_Write_Stream_Impl::~ACE_Asynch_Write_Stream_Impl ()
 {
 }
 
-ACE_Asynch_Write_Stream_Result_Impl::~ACE_Asynch_Write_Stream_Result_Impl (void)
+ACE_Asynch_Write_Stream_Result_Impl::~ACE_Asynch_Write_Stream_Result_Impl ()
 {
 }
 
-ACE_Asynch_Read_File_Impl::~ACE_Asynch_Read_File_Impl (void)
+ACE_Asynch_Read_File_Impl::~ACE_Asynch_Read_File_Impl ()
 {
 }
 
-ACE_Asynch_Write_File_Impl::~ACE_Asynch_Write_File_Impl (void)
+ACE_Asynch_Write_File_Impl::~ACE_Asynch_Write_File_Impl ()
 {
 }
 
-ACE_Asynch_Read_File_Result_Impl::~ACE_Asynch_Read_File_Result_Impl (void)
+ACE_Asynch_Read_File_Result_Impl::~ACE_Asynch_Read_File_Result_Impl ()
 {
 }
 
-ACE_Asynch_Write_File_Result_Impl::~ACE_Asynch_Write_File_Result_Impl (void)
+ACE_Asynch_Write_File_Result_Impl::~ACE_Asynch_Write_File_Result_Impl ()
 {
 }
 
-ACE_Asynch_Accept_Result_Impl::~ACE_Asynch_Accept_Result_Impl (void)
+ACE_Asynch_Accept_Result_Impl::~ACE_Asynch_Accept_Result_Impl ()
 {
 }
 
-ACE_Asynch_Connect_Result_Impl::~ACE_Asynch_Connect_Result_Impl (void)
+ACE_Asynch_Connect_Result_Impl::~ACE_Asynch_Connect_Result_Impl ()
 {
 }
 
-ACE_Asynch_Accept_Impl::~ACE_Asynch_Accept_Impl (void)
+ACE_Asynch_Accept_Impl::~ACE_Asynch_Accept_Impl ()
 {
 }
 
-ACE_Asynch_Connect_Impl::~ACE_Asynch_Connect_Impl (void)
+ACE_Asynch_Connect_Impl::~ACE_Asynch_Connect_Impl ()
 {
 }
 
-ACE_Asynch_Transmit_File_Impl::~ACE_Asynch_Transmit_File_Impl (void)
+ACE_Asynch_Transmit_File_Impl::~ACE_Asynch_Transmit_File_Impl ()
 {
 }
 
-ACE_Asynch_Transmit_File_Result_Impl::~ACE_Asynch_Transmit_File_Result_Impl (void)
+ACE_Asynch_Transmit_File_Result_Impl::~ACE_Asynch_Transmit_File_Result_Impl ()
 {
 }
 
-ACE_Asynch_Read_Dgram_Impl::~ACE_Asynch_Read_Dgram_Impl (void)
+ACE_Asynch_Read_Dgram_Impl::~ACE_Asynch_Read_Dgram_Impl ()
 {
 }
 
-ACE_Asynch_Read_Dgram_Impl::ACE_Asynch_Read_Dgram_Impl (void)
+ACE_Asynch_Read_Dgram_Impl::ACE_Asynch_Read_Dgram_Impl ()
 {
 }
 
-ACE_Asynch_Write_Dgram_Impl::~ACE_Asynch_Write_Dgram_Impl (void)
+ACE_Asynch_Write_Dgram_Impl::~ACE_Asynch_Write_Dgram_Impl ()
 {
 }
 
-ACE_Asynch_Write_Dgram_Impl::ACE_Asynch_Write_Dgram_Impl (void)
+ACE_Asynch_Write_Dgram_Impl::ACE_Asynch_Write_Dgram_Impl ()
 {
 }
 
 //***********************************************
 
-ACE_Asynch_Read_Dgram_Result_Impl::~ACE_Asynch_Read_Dgram_Result_Impl (void)
+ACE_Asynch_Read_Dgram_Result_Impl::~ACE_Asynch_Read_Dgram_Result_Impl ()
 {
 }
 
-ACE_Asynch_Read_Dgram_Result_Impl::ACE_Asynch_Read_Dgram_Result_Impl (void)
+ACE_Asynch_Read_Dgram_Result_Impl::ACE_Asynch_Read_Dgram_Result_Impl ()
 {
 }
 
 //***********************************************
 
-ACE_Asynch_Write_Dgram_Result_Impl::~ACE_Asynch_Write_Dgram_Result_Impl (void)
+ACE_Asynch_Write_Dgram_Result_Impl::~ACE_Asynch_Write_Dgram_Result_Impl ()
 {
 }
 
-ACE_Asynch_Write_Dgram_Result_Impl::ACE_Asynch_Write_Dgram_Result_Impl (void)
+ACE_Asynch_Write_Dgram_Result_Impl::ACE_Asynch_Write_Dgram_Result_Impl ()
 {
 }
 
diff --git a/ACE/ace/Asynch_Pseudo_Task.cpp b/ACE/ace/Asynch_Pseudo_Task.cpp
index 0b6a14b60e5..72dff50ab0f 100644
--- a/ACE/ace/Asynch_Pseudo_Task.cpp
+++ b/ACE/ace/Asynch_Pseudo_Task.cpp
@@ -17,7 +17,7 @@ ACE_Asynch_Pseudo_Task::~ACE_Asynch_Pseudo_Task ()
 }
 
 int
-ACE_Asynch_Pseudo_Task::start (void)
+ACE_Asynch_Pseudo_Task::start ()
 {
   if (this->reactor_.initialized () == 0)
     ACELIB_ERROR_RETURN ((LM_ERROR,
@@ -29,7 +29,7 @@ ACE_Asynch_Pseudo_Task::start (void)
 }
 
 int
-ACE_Asynch_Pseudo_Task::stop (void)
+ACE_Asynch_Pseudo_Task::stop ()
 {
   if (this->thr_count () == 0)  // already stopped
     return 0;
@@ -43,7 +43,7 @@ ACE_Asynch_Pseudo_Task::stop (void)
 }
 
 int
-ACE_Asynch_Pseudo_Task::svc (void)
+ACE_Asynch_Pseudo_Task::svc ()
 {
 #if !defined (ACE_WIN32)
 
diff --git a/ACE/ace/Asynch_Pseudo_Task.h b/ACE/ace/Asynch_Pseudo_Task.h
index 4337361fe44..804b9edab0c 100644
--- a/ACE/ace/Asynch_Pseudo_Task.h
+++ b/ACE/ace/Asynch_Pseudo_Task.h
@@ -25,13 +25,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-/*
- * Specialization hook to replace the Reactor with the
- * concrete Reactor implementation, e.g., select_st,
- * select_mt etc.
- */
-//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class ACE_Asynch_Pseudo_Task
  */
diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h
index b9b179c007a..19033b89860 100644
--- a/ACE/ace/Atomic_Op.h
+++ b/ACE/ace/Atomic_Op.h
@@ -129,7 +129,7 @@ public:
   long value (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Explicitly return @c value_ (by reference).
   volatile long &value_i (void);
@@ -227,7 +227,7 @@ public:
   unsigned long value (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Explicitly return @c value_ (by reference).
   volatile unsigned long &value_i (void);
@@ -265,7 +265,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, int>
 : public ACE_Atomic_Op_GCC<int>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (int c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, int> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, int> &operator= (int rhs);
@@ -276,7 +276,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>
 : public ACE_Atomic_Op_GCC<unsigned int>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (unsigned int c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> &operator= (unsigned int rhs);
@@ -289,7 +289,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long>
 : public ACE_Atomic_Op_GCC<long>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (long c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, long> &operator= (long rhs);
@@ -300,7 +300,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>
 : public ACE_Atomic_Op_GCC<unsigned long>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (unsigned long c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &operator= (unsigned long rhs);
@@ -313,7 +313,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long long>
 : public ACE_Atomic_Op_GCC<long long>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (long long c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long long> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, long long> &operator= (long long rhs);
@@ -324,7 +324,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>
 : public ACE_Atomic_Op_GCC<unsigned long long>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (unsigned long long c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &operator= (unsigned long long rhs);
@@ -337,7 +337,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, short>
 : public ACE_Atomic_Op_GCC<short>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (short c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, short> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, short> &operator= (short rhs);
@@ -348,7 +348,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>
 : public ACE_Atomic_Op_GCC<unsigned short>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (unsigned short c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &operator= (unsigned short rhs);
@@ -361,7 +361,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, bool>
 : public ACE_Atomic_Op_GCC<bool>
 {
 public:
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
   ACE_Atomic_Op (bool c);
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, bool> &c);
   ACE_Atomic_Op<ACE_Thread_Mutex, bool> &operator= (bool rhs);
diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl
index 2f9ec57bac2..318339d0363 100644
--- a/ACE/ace/Atomic_Op.inl
+++ b/ACE/ace/Atomic_Op.inl
@@ -419,7 +419,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::value_i (void)
 #if defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1)
 
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, int>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, int>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<int> ()
 {
 }
@@ -446,7 +446,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, int>::operator= (int rhs)
 
 
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<unsigned int>()
 {
 }
@@ -472,7 +472,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::operator= (unsigned int rhs)
 }
 
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<long>()
 {
 }
@@ -498,7 +498,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (long rhs)
 }
 
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<unsigned long> ()
 {
 }
@@ -526,7 +526,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= (unsigned long rhs)
 // The long long intrinsics are not available on PPC
 #if !defined (__powerpc__)
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, long long>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, long long>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<long long>()
 {
 }
@@ -552,7 +552,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long long>::operator= (long long rhs)
 }
 
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<unsigned long  long> ()
 {
 }
@@ -580,7 +580,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::operator= (unsigned long lo
 
 #if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2)
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, short>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, short>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<short>()
 {
 }
@@ -606,7 +606,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, short>::operator= (short rhs)
 }
 
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<unsigned short> ()
 {
 }
@@ -634,7 +634,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::operator= (unsigned short rhs)
 
 #if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_1)
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, bool>::ACE_Atomic_Op (void) :
+ACE_Atomic_Op<ACE_Thread_Mutex, bool>::ACE_Atomic_Op () :
   ACE_Atomic_Op_GCC<bool> ()
 {
 }
diff --git a/ACE/ace/Atomic_Op_GCC_T.cpp b/ACE/ace/Atomic_Op_GCC_T.cpp
index 3e7e7cada05..8e263daa877 100644
--- a/ACE/ace/Atomic_Op_GCC_T.cpp
+++ b/ACE/ace/Atomic_Op_GCC_T.cpp
@@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 void
-ACE_Atomic_Op_GCC<T>::dump (void) const
+ACE_Atomic_Op_GCC<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h
index 38485af3bac..13d363163ea 100644
--- a/ACE/ace/Atomic_Op_GCC_T.h
+++ b/ACE/ace/Atomic_Op_GCC_T.h
@@ -37,7 +37,7 @@ class ACE_Export ACE_Atomic_Op_GCC
 {
 public:
   /// Atomically pre-increment @c value_.
-  T operator++ (void);
+  T operator++ ();
 
   /// Atomically post-increment @c value_.
   T operator++ (int);
@@ -46,7 +46,7 @@ public:
   T operator+= (T rhs);
 
   /// Atomically pre-decrement @c value_.
-  T operator-- (void);
+  T operator-- ();
 
   /// Atomically post-decrement @c value_.
   T operator-- (int);
@@ -76,13 +76,13 @@ public:
   T exchange (T newval);
 
   /// Explicitly return @c value_.
-  T value (void) const;
+  T value () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Explicitly return @c value_ (by reference).
-  volatile T &value_i (void);
+  volatile T &value_i ();
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -95,7 +95,7 @@ protected:
   ACE_Atomic_Op_GCC<T> &operator= (const ACE_Atomic_Op_GCC<T> &rhs);
 
   /// Initialize @c value_ to 0.
-  ACE_Atomic_Op_GCC (void);
+  ACE_Atomic_Op_GCC ();
 
   /// Initialize @c value_ to c.
   ACE_Atomic_Op_GCC (T c);
@@ -107,7 +107,7 @@ private:
   // This function cannot be supported by this template specialization.
   // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   // template instead.
-  ACE_Thread_Mutex &mutex (void);
+  ACE_Thread_Mutex &mutex ();
 
 private:
   /// Current object decorated by the atomic op.
diff --git a/ACE/ace/Atomic_Op_GCC_T.inl b/ACE/ace/Atomic_Op_GCC_T.inl
index 90f7c4839c2..b102d422395 100644
--- a/ACE/ace/Atomic_Op_GCC_T.inl
+++ b/ACE/ace/Atomic_Op_GCC_T.inl
@@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 ACE_INLINE
-ACE_Atomic_Op_GCC<T>::ACE_Atomic_Op_GCC (void)
+ACE_Atomic_Op_GCC<T>::ACE_Atomic_Op_GCC ()
   : value_ (0)
 {
 }
@@ -27,7 +27,7 @@ ACE_Atomic_Op_GCC<T>::ACE_Atomic_Op_GCC (
 
 template <typename T>
 ACE_INLINE T
-ACE_Atomic_Op_GCC<T>::operator++ (void)
+ACE_Atomic_Op_GCC<T>::operator++ ()
 {
   return __sync_add_and_fetch (&this->value_, 1);
 }
@@ -41,7 +41,7 @@ ACE_Atomic_Op_GCC<T>::operator++ (int)
 
 template <typename T>
 ACE_INLINE T
-ACE_Atomic_Op_GCC<T>::operator-- (void)
+ACE_Atomic_Op_GCC<T>::operator-- ()
 {
   return __sync_sub_and_fetch (&this->value_, 1);
 }
@@ -135,14 +135,14 @@ ACE_Atomic_Op_GCC<T>::exchange (T newval)
 
 template <typename T>
 ACE_INLINE T
-ACE_Atomic_Op_GCC<T>::value (void) const
+ACE_Atomic_Op_GCC<T>::value () const
 {
   return this->value_;
 }
 
 template <typename T>
 ACE_INLINE volatile T &
-ACE_Atomic_Op_GCC<T>::value_i (void)
+ACE_Atomic_Op_GCC<T>::value_i ()
 {
   return this->value_;
 }
diff --git a/ACE/ace/Atomic_Op_T.cpp b/ACE/ace/Atomic_Op_T.cpp
index d925d6e4623..f0a53fa4778 100644
--- a/ACE/ace/Atomic_Op_T.cpp
+++ b/ACE/ace/Atomic_Op_T.cpp
@@ -26,7 +26,7 @@ ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Atomic_Op)
 
 // *************************************************
 template <class ACE_LOCK, class TYPE> ACE_LOCK &
-ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex (void)
+ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex ()
 {
   // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex");
   return this->mutex_;
@@ -34,7 +34,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex (void)
 
 template <class ACE_LOCK, class TYPE>
 void
-ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump (void) const
+ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump");
@@ -65,7 +65,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::ACE_Atomic_Op_Ex (
 // ****************************************************************
 
 template <class ACE_LOCK, class TYPE>
-ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (void)
+ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op ()
   : impl_ (this->own_mutex_)
 {
   // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op");
diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h
index c3d936c1fe9..599ae7075b6 100644
--- a/ACE/ace/Atomic_Op_T.h
+++ b/ACE/ace/Atomic_Op_T.h
@@ -155,7 +155,7 @@ public:
   // = Accessors.
 
   /// Atomically pre-increment @c value_.
-  TYPE operator++ (void);
+  TYPE operator++ ();
 
   /// Atomically post-increment @c value_.
   TYPE operator++ (int);
@@ -164,7 +164,7 @@ public:
   TYPE operator+= (arg_type rhs);
 
   /// Atomically pre-decrement @c value_.
-  TYPE operator-- (void);
+  TYPE operator-- ();
 
   /// Atomically post-decrement @c value_.
   TYPE operator-- (int);
@@ -201,10 +201,10 @@ public:
   TYPE exchange (TYPE newval);
 
   /// Explicitly return @c value_.
-  TYPE value (void) const;
+  TYPE value () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -220,7 +220,7 @@ public:
    *
    * @note The right name would be lock_, but HP/C++ will choke on that!
    */
-  ACE_LOCK & mutex (void);
+  ACE_LOCK & mutex ();
 
   /**
    * Explicitly return @c value_ (by reference).  This gives the user
@@ -228,7 +228,7 @@ public:
    * will usually be used in conjunction with explicit access to the
    * lock.  Use with care ;-)
    */
-  TYPE & value_i (void);
+  TYPE & value_i ();
 
 private:
   /// Type of synchronization mechanism.
@@ -259,7 +259,7 @@ public:
   typedef typename ACE_Type_Traits<TYPE>::parameter_type arg_type;
 
   /// Initialize @c value_ to 0.
-  ACE_Atomic_Op (void);
+  ACE_Atomic_Op ();
 
   /// Initialize @c value_ to c.
   ACE_Atomic_Op (arg_type c);
@@ -275,7 +275,7 @@ public:
     ACE_Atomic_Op<ACE_LOCK, TYPE> const & rhs);
 
   /// Atomically pre-increment @c value_.
-  TYPE operator++ (void);
+  TYPE operator++ ();
 
   /// Atomically post-increment @c value_.
   TYPE operator++ (int);
@@ -284,7 +284,7 @@ public:
   TYPE operator+= (arg_type rhs);
 
   /// Atomically pre-decrement @c value_.
-  TYPE operator-- (void);
+  TYPE operator-- ();
 
   /// Atomically post-decrement @c value_.
   TYPE operator-- (int);
@@ -314,10 +314,10 @@ public:
   TYPE exchange (TYPE newval);
 
   /// Explicitly return @c value_.
-  TYPE value (void) const;
+  TYPE value () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -328,7 +328,7 @@ public:
    * will usually be used in conjunction with explicit access to the
    * lock.  Use with care ;-)
    */
-  TYPE & value_i (void);
+  TYPE & value_i ();
 
 private:
   /// Type of synchronization mechanism.
diff --git a/ACE/ace/Atomic_Op_T.inl b/ACE/ace/Atomic_Op_T.inl
index 1b1eb988f94..641f6bd36c5 100644
--- a/ACE/ace/Atomic_Op_T.inl
+++ b/ACE/ace/Atomic_Op_T.inl
@@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE
-ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator++ (void)
+ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator++ ()
 {
   // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator++");
   ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_);
@@ -30,7 +30,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator+= (
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE
-ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator-- (void)
+ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator-- ()
 {
   // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator--");
   ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_);
@@ -161,7 +161,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::exchange (TYPE newval)
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE
-ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value (void) const
+ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value () const
 {
   // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value");
   ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_);
@@ -170,7 +170,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value (void) const
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE &
-ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value_i (void)
+ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value_i ()
 {
   // Explicitly return <value_> (by reference).  This gives the user
   // full, unrestricted access to the underlying value.  This method
@@ -223,7 +223,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE
-ACE_Atomic_Op<ACE_LOCK, TYPE>::operator++ (void)
+ACE_Atomic_Op<ACE_LOCK, TYPE>::operator++ ()
 {
   return ++this->impl_;
 }
@@ -245,7 +245,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator+= (
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE
-ACE_Atomic_Op<ACE_LOCK, TYPE>::operator-- (void)
+ACE_Atomic_Op<ACE_LOCK, TYPE>::operator-- ()
 {
   return --this->impl_;
 }
@@ -322,14 +322,14 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::exchange (TYPE newval)
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE
-ACE_Atomic_Op<ACE_LOCK, TYPE>::value (void) const
+ACE_Atomic_Op<ACE_LOCK, TYPE>::value () const
 {
   return this->impl_.value ();
 }
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE void
-ACE_Atomic_Op<ACE_LOCK, TYPE>::dump (void) const
+ACE_Atomic_Op<ACE_LOCK, TYPE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->impl_.dump ();
@@ -338,7 +338,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::dump (void) const
 }
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE &
-ACE_Atomic_Op<ACE_LOCK, TYPE>::value_i (void)
+ACE_Atomic_Op<ACE_LOCK, TYPE>::value_i ()
 {
   return this->impl_.value_i ();
 }
diff --git a/ACE/ace/Auto_Event.cpp b/ACE/ace/Auto_Event.cpp
index c95c0e855c3..52024445aa6 100644
--- a/ACE/ace/Auto_Event.cpp
+++ b/ACE/ace/Auto_Event.cpp
@@ -44,7 +44,7 @@ ACE_Auto_Event_T<TIME_POLICY>::ACE_Auto_Event_T (
 
 template <class TIME_POLICY>
 void
-ACE_Auto_Event_T<TIME_POLICY>::dump (void) const
+ACE_Auto_Event_T<TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_Event_T<TIME_POLICY>::dump ();
diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h
index f01882c62c1..d57fd71e718 100644
--- a/ACE/ace/Auto_Event.h
+++ b/ACE/ace/Auto_Event.h
@@ -53,10 +53,10 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  virtual ~ACE_Auto_Event_T (void);
+  virtual ~ACE_Auto_Event_T ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks
   ACE_ALLOC_HOOK_DECLARE;
@@ -87,7 +87,7 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  virtual ~ACE_Auto_Event (void)
+  virtual ~ACE_Auto_Event ()
   {
   }
 };
diff --git a/ACE/ace/Auto_Event.inl b/ACE/ace/Auto_Event.inl
index 919c048d3ce..a8add6194f6 100644
--- a/ACE/ace/Auto_Event.inl
+++ b/ACE/ace/Auto_Event.inl
@@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TIME_POLICY>
 ACE_INLINE
-ACE_Auto_Event_T<TIME_POLICY>::~ACE_Auto_Event_T (void)
+ACE_Auto_Event_T<TIME_POLICY>::~ACE_Auto_Event_T ()
 {
 }
 
diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h
index d8e02834433..6dcb530eb6d 100644
--- a/ACE/ace/Auto_IncDec_T.h
+++ b/ACE/ace/Auto_IncDec_T.h
@@ -46,7 +46,7 @@ public:
   ~ACE_Auto_IncDec (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h
index 9f8af214a31..21365a540d8 100644
--- a/ACE/ace/Auto_Ptr.h
+++ b/ACE/ace/Auto_Ptr.h
@@ -48,16 +48,16 @@ public:
 
   ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> & ap);
   ACE_Auto_Basic_Ptr<X> &operator= (ACE_Auto_Basic_Ptr<X> & rhs);
-  ~ACE_Auto_Basic_Ptr (void);
+  ~ACE_Auto_Basic_Ptr ();
 
   // = Accessor methods.
   X &operator *() const;
-  X *get (void) const;
-  X *release (void);
+  X *get () const;
+  X *release ();
   void reset (X * p = 0);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -132,17 +132,17 @@ public:
 
   ACE_Auto_Basic_Array_Ptr (ACE_Auto_Basic_Array_Ptr<X> & ap);
   ACE_Auto_Basic_Array_Ptr<X> &operator= (ACE_Auto_Basic_Array_Ptr<X> & rhs);
-  ~ACE_Auto_Basic_Array_Ptr (void);
+  ~ACE_Auto_Basic_Array_Ptr ();
 
   // = Accessor methods.
   X & operator* () const;
   X & operator[] (int i) const;
-  X * get (void) const;
-  X * release (void);
+  X * get () const;
+  X * release ();
   void reset (X * p = 0);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Auto_Ptr.inl b/ACE/ace/Auto_Ptr.inl
index 1cc93536e42..06b035f7f98 100644
--- a/ACE/ace/Auto_Ptr.inl
+++ b/ACE/ace/Auto_Ptr.inl
@@ -8,7 +8,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class X> ACE_INLINE void
-ACE_Auto_Basic_Ptr<X>::dump (void) const
+ACE_Auto_Basic_Ptr<X>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::dump");
@@ -16,7 +16,7 @@ ACE_Auto_Basic_Ptr<X>::dump (void) const
 }
 
 template<class X> ACE_INLINE void
-ACE_Auto_Basic_Array_Ptr<X>::dump (void) const
+ACE_Auto_Basic_Array_Ptr<X>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::dump");
@@ -31,14 +31,14 @@ ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> &rhs)
 }
 
 template<class X> ACE_INLINE X *
-ACE_Auto_Basic_Ptr<X>::get (void) const
+ACE_Auto_Basic_Ptr<X>::get () const
 {
   ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::get");
   return this->p_;
 }
 
 template<class X> ACE_INLINE X *
-ACE_Auto_Basic_Ptr<X>::release (void)
+ACE_Auto_Basic_Ptr<X>::release ()
 {
   ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::release");
   X *old = this->p_;
@@ -67,7 +67,7 @@ ACE_Auto_Basic_Ptr<X>::operator= (ACE_Auto_Basic_Ptr<X> &rhs)
 }
 
 template<class X> ACE_INLINE
-ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr (void)
+ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr ()
 {
   ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr");
   delete this->get ();
@@ -101,14 +101,14 @@ ACE_Auto_Ptr<X>::operator-> () const
 }
 
 template<class X> ACE_INLINE X *
-ACE_Auto_Basic_Array_Ptr<X>::get (void) const
+ACE_Auto_Basic_Array_Ptr<X>::get () const
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::get");
   return this->p_;
 }
 
 template<class X> ACE_INLINE X *
-ACE_Auto_Basic_Array_Ptr<X>::release (void)
+ACE_Auto_Basic_Array_Ptr<X>::release ()
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::release");
   X *old = this->p_;
@@ -149,7 +149,7 @@ ACE_Auto_Basic_Array_Ptr<X>::operator= (ACE_Auto_Basic_Array_Ptr<X> &rhs)
 }
 
 template<class X> ACE_INLINE
-ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr (void)
+ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr ()
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr");
 #if defined (ACE_HAS_ALLOC_HOOKS)
diff --git a/ACE/ace/Barrier.cpp b/ACE/ace/Barrier.cpp
index 9eb70678533..430ff115476 100644
--- a/ACE/ace/Barrier.cpp
+++ b/ACE/ace/Barrier.cpp
@@ -22,7 +22,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Sub_Barrier)
 
 void
-ACE_Sub_Barrier::dump (void) const
+ACE_Sub_Barrier::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Sub_Barrier::dump");
@@ -47,7 +47,7 @@ ACE_Sub_Barrier::ACE_Sub_Barrier (unsigned int count,
 ACE_ALLOC_HOOK_DEFINE(ACE_Barrier)
 
 void
-ACE_Barrier::dump (void) const
+ACE_Barrier::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Barrier::dump");
@@ -77,7 +77,7 @@ ACE_Barrier::ACE_Barrier (unsigned int count,
 }
 
 int
-ACE_Barrier::wait (void)
+ACE_Barrier::wait ()
 {
   ACE_TRACE ("ACE_Barrier::wait");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
@@ -126,7 +126,7 @@ ACE_Barrier::wait (void)
 }
 
 int
-ACE_Barrier::shutdown (void)
+ACE_Barrier::shutdown ()
 {
   ACE_TRACE ("ACE_Barrier::shutdown");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
@@ -161,7 +161,7 @@ ACE_Thread_Barrier::ACE_Thread_Barrier (unsigned int count,
 }
 
 void
-ACE_Thread_Barrier::dump (void) const
+ACE_Thread_Barrier::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Barrier::dump");
diff --git a/ACE/ace/Barrier.h b/ACE/ace/Barrier.h
index d6efaf2b890..58cba3f2610 100644
--- a/ACE/ace/Barrier.h
+++ b/ACE/ace/Barrier.h
@@ -59,7 +59,7 @@ struct ACE_Export ACE_Sub_Barrier
                    const ACE_TCHAR *name = 0,
                    void *arg = 0);
 
-  ~ACE_Sub_Barrier (void);
+  ~ACE_Sub_Barrier ();
 
   /// True if this generation of the barrier is done.
   ACE_Condition_Thread_Mutex barrier_finished_;
@@ -68,7 +68,7 @@ struct ACE_Export ACE_Sub_Barrier
   int running_threads_;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -100,7 +100,7 @@ public:
                void *arg = 0);
 
   /// Default destructor.
-  ~ACE_Barrier (void);
+  ~ACE_Barrier ();
 
   /// Block the caller until all @c count threads have called @c wait and
   /// then allow all the caller threads to continue in parallel.
@@ -108,7 +108,7 @@ public:
   /// @retval 0 after successfully waiting for all threads to wait.
   /// @retval -1 if an error occurs or the barrier is shut
   /// down (@sa shutdown ()).
-  int wait (void);
+  int wait ();
 
   /// Shut the barrier down, aborting the wait of all waiting threads.
   /// Any threads waiting on the barrier when it is shut down will return with
@@ -117,10 +117,10 @@ public:
   /// @retval 0 for success, -1 if already shut down.
   ///
   /// @since ACE beta 5.4.9.
-  int shutdown (void);
+  int shutdown ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -169,10 +169,10 @@ public:
   ACE_Thread_Barrier (unsigned int count, const ACE_TCHAR *name = 0);
 
   /// Default destructor.
-  ~ACE_Thread_Barrier (void);
+  ~ACE_Thread_Barrier ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Barrier.inl b/ACE/ace/Barrier.inl
index f742deeb6e2..62cac458393 100644
--- a/ACE/ace/Barrier.inl
+++ b/ACE/ace/Barrier.inl
@@ -2,17 +2,17 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Sub_Barrier::~ACE_Sub_Barrier (void)
+ACE_Sub_Barrier::~ACE_Sub_Barrier ()
 {
 }
 
 ACE_INLINE
-ACE_Barrier::~ACE_Barrier (void)
+ACE_Barrier::~ACE_Barrier ()
 {
 }
 
 ACE_INLINE
-ACE_Thread_Barrier::~ACE_Thread_Barrier (void)
+ACE_Thread_Barrier::~ACE_Thread_Barrier ()
 {
 }
 
diff --git a/ACE/ace/Base_Thread_Adapter.cpp b/ACE/ace/Base_Thread_Adapter.cpp
index f965bac12af..b3a1f7bcd76 100644
--- a/ACE/ace/Base_Thread_Adapter.cpp
+++ b/ACE/ace/Base_Thread_Adapter.cpp
@@ -51,12 +51,12 @@ ACE_Base_Thread_Adapter::ACE_Base_Thread_Adapter (
 #endif // ACE_USES_GPROF
 }
 
-ACE_Base_Thread_Adapter::~ACE_Base_Thread_Adapter (void)
+ACE_Base_Thread_Adapter::~ACE_Base_Thread_Adapter ()
 {
 }
 
 void
-ACE_Base_Thread_Adapter::inherit_log_msg (void)
+ACE_Base_Thread_Adapter::inherit_log_msg ()
 {
   if (ACE_Base_Thread_Adapter::inherit_log_msg_hook_ != 0)
     (*ACE_Base_Thread_Adapter::inherit_log_msg_hook_)(
@@ -70,7 +70,7 @@ ACE_Base_Thread_Adapter::inherit_log_msg (void)
 }
 
 void
-ACE_Base_Thread_Adapter::close_log_msg (void)
+ACE_Base_Thread_Adapter::close_log_msg ()
 {
   if (ACE_Base_Thread_Adapter::close_log_msg_hook_ != 0)
     (*ACE_Base_Thread_Adapter::close_log_msg_hook_) ();
@@ -83,12 +83,12 @@ ACE_Base_Thread_Adapter::sync_log_msg (const ACE_TCHAR *prg)
     (*ACE_Base_Thread_Adapter::sync_log_msg_hook_) (prg);
 }
 
-ACE_OS_Thread_Descriptor::~ACE_OS_Thread_Descriptor (void)
+ACE_OS_Thread_Descriptor::~ACE_OS_Thread_Descriptor ()
 {
 }
 
 ACE_OS_Thread_Descriptor *
-ACE_Base_Thread_Adapter::thr_desc_log_msg (void)
+ACE_Base_Thread_Adapter::thr_desc_log_msg ()
 {
   if (ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_ != 0)
     return (*ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_) ();
diff --git a/ACE/ace/Base_Thread_Adapter.h b/ACE/ace/Base_Thread_Adapter.h
index e98df29a228..5680ec8d86c 100644
--- a/ACE/ace/Base_Thread_Adapter.h
+++ b/ACE/ace/Base_Thread_Adapter.h
@@ -49,9 +49,9 @@ class ACE_Export ACE_OS_Thread_Descriptor
 {
 public:
   /// Get the thread creation flags.
-  long flags (void) const;
+  long flags () const;
 
-  virtual ~ACE_OS_Thread_Descriptor (void);
+  virtual ~ACE_OS_Thread_Descriptor ();
 
 protected:
   /// For use by ACE_Thread_Descriptor.
@@ -87,14 +87,14 @@ class ACE_Service_Gestalt;
 class ACE_Export ACE_Base_Thread_Adapter
 {
 public:
-  virtual ~ACE_Base_Thread_Adapter (void);
+  virtual ~ACE_Base_Thread_Adapter ();
 
   /// Virtual method invoked by the thread entry point.
-  virtual ACE_THR_FUNC_RETURN invoke (void) = 0;
+  virtual ACE_THR_FUNC_RETURN invoke () = 0;
 
   /// Accessor for the C entry point function to the OS thread creation
   /// routine.
-  ACE_THR_C_FUNC entry_point (void);
+  ACE_THR_C_FUNC entry_point ();
 
 #ifdef ACE_USES_GPROF
   /// Accessor to the itimer_
@@ -103,13 +103,13 @@ public:
 #endif // ACE_USES_PROF
 
   /// Invoke the close_log_msg_hook, if it is present
-  static void close_log_msg (void);
+  static void close_log_msg ();
 
   /// Invoke the sync_log_msg_hook, if it is present
   static void sync_log_msg (const ACE_TCHAR *prog_name);
 
   /// Invoke the thr_desc_log_msg_hook, if it is present
-  static ACE_OS_Thread_Descriptor *thr_desc_log_msg (void);
+  static ACE_OS_Thread_Descriptor *thr_desc_log_msg ();
 
 protected:
   /// Constructor.
@@ -125,7 +125,7 @@ protected:
                       );
   /// Inherit the logging features if the parent thread has an
   /// ACE_Log_Msg.
-  void inherit_log_msg (void);
+  void inherit_log_msg ();
 
 private:
   /// The hooks to inherit and cleanup the Log_Msg attributes
diff --git a/ACE/ace/Base_Thread_Adapter.inl b/ACE/ace/Base_Thread_Adapter.inl
index febce6f49c6..f2ea0636e59 100644
--- a/ACE/ace/Base_Thread_Adapter.inl
+++ b/ACE/ace/Base_Thread_Adapter.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE long
-ACE_OS_Thread_Descriptor::flags (void) const
+ACE_OS_Thread_Descriptor::flags () const
 {
   return flags_;
 }
@@ -29,7 +29,7 @@ ACE_Base_Thread_Adapter::set_log_msg_hooks (
 }
 
 ACE_INLINE ACE_THR_C_FUNC
-ACE_Base_Thread_Adapter::entry_point (void)
+ACE_Base_Thread_Adapter::entry_point ()
 {
   return this->entry_point_;
 }
diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp
index 6ec16f555ca..3dd1a4e3e54 100644
--- a/ACE/ace/Based_Pointer_Repository.cpp
+++ b/ACE/ace/Based_Pointer_Repository.cpp
@@ -24,9 +24,9 @@ class ACE_Based_Pointer_Repository_Rep
 {
 public:
   // Useful typedefs.
-  typedef ACE_Map_Manager <void *, size_t, ACE_Null_Mutex> MAP_MANAGER;
-  typedef ACE_Map_Iterator <void *, size_t, ACE_Null_Mutex> MAP_ITERATOR;
-  typedef ACE_Map_Entry <void *, size_t> MAP_ENTRY;
+  using MAP_MANAGER = ACE_Map_Manager<void *, size_t, ACE_Null_Mutex>;
+  using MAP_ITERATOR = ACE_Map_Iterator<void *, size_t, ACE_Null_Mutex>;
+  using MAP_ENTRY = ACE_Map_Entry<void *, size_t>;
 
   /// Keeps track of the mapping between addresses and their associated
   /// values.
@@ -40,14 +40,14 @@ public:
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Based_Pointer_Repository_Rep);
 
-ACE_Based_Pointer_Repository::ACE_Based_Pointer_Repository (void)
+ACE_Based_Pointer_Repository::ACE_Based_Pointer_Repository ()
 {
   ACE_TRACE ("ACE_Based_Pointer_Repository::ACE_Based_Pointer_Repository");
   ACE_NEW (this->rep_,
            ACE_Based_Pointer_Repository_Rep);
 }
 
-ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository (void)
+ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository ()
 {
   ACE_TRACE ("ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository");
   delete this->rep_;
diff --git a/ACE/ace/Based_Pointer_T.h b/ACE/ace/Based_Pointer_T.h
index 71432eb1e60..3834f465517 100644
--- a/ACE/ace/Based_Pointer_T.h
+++ b/ACE/ace/Based_Pointer_T.h
@@ -134,7 +134,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Dump the state of the object.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   ptrdiff_t target_;
diff --git a/ACE/ace/Basic_Stats.h b/ACE/ace/Basic_Stats.h
index 4cc4bd2d63b..39f54e0c73d 100644
--- a/ACE/ace/Basic_Stats.h
+++ b/ACE/ace/Basic_Stats.h
@@ -40,10 +40,10 @@ public:
    * The number of samples is pre-allocated, and cannot changes once
    * the class is initialized.
    */
-  ACE_Basic_Stats (void);
+  ACE_Basic_Stats ();
 
   /// The number of samples received so far
-  ACE_UINT32 samples_count (void) const;
+  ACE_UINT32 samples_count () const;
 
   /// Record one sample.
   void sample (ACE_UINT64 value);
diff --git a/ACE/ace/Basic_Stats.inl b/ACE/ace/Basic_Stats.inl
index 185478ab7f8..4e34469e76e 100644
--- a/ACE/ace/Basic_Stats.inl
+++ b/ACE/ace/Basic_Stats.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Basic_Stats::ACE_Basic_Stats (void)
+ACE_Basic_Stats::ACE_Basic_Stats ()
   : samples_count_ (0)
   , min_ (0)
   , min_at_ (0)
@@ -13,7 +13,7 @@ ACE_Basic_Stats::ACE_Basic_Stats (void)
 }
 
 ACE_INLINE ACE_UINT32
-ACE_Basic_Stats::samples_count (void) const
+ACE_Basic_Stats::samples_count () const
 {
   return this->samples_count_;
 }
diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index 67916f8dc06..7fec1b2f188 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -70,17 +70,6 @@
 #  include <inttypes.h>
 # endif
 
-# if defined (ACE_HAS_CPP11)
-#  define ACE_HAS_INT8_T
-#  define ACE_HAS_UINT8_T
-#  define ACE_HAS_INT16_T
-#  define ACE_HAS_UINT16_T
-#  define ACE_HAS_INT32_T
-#  define ACE_HAS_UINT32_T
-#  define ACE_HAS_INT64_T
-#  define ACE_HAS_UINT64_T
-# endif /* ACE_HAS_CPP11 */
-
 #ifdef ACE_LACKS_INTPTR_T
 # include "ace/If_Then_Else.h"
 
@@ -95,7 +84,6 @@
 // i.e. determining the type at compile-time rather than at
 // preprocessing-time, will work for all platforms, and does not
 // depend on ACE developer-defined configuration parameters.
-
 typedef ACE::If_Then_Else<
   (sizeof (void*) == sizeof (signed int)),
   signed int,
@@ -212,115 +200,23 @@ typedef ACE::If_Then_Else<
 #   endif
 # endif /* !defined (ACE_SIZEOF_LONG_LONG) */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// The sizes of the commonly implemented types are now known.  Set up
-// typedefs for whatever we can.  Some of these are needed for certain
-// cases of ACE_UINT64, so do them before the 64-bit stuff.
-
-#if defined (ACE_HAS_INT8_T)
-  typedef int8_t                ACE_INT8;
-#elif defined (ACE_INT8_TYPE)
-  typedef ACE_INT8_TYPE         ACE_INT8;
-#elif !defined (ACE_LACKS_SIGNED_CHAR)
-  typedef signed char           ACE_INT8;
-#else
-  typedef char                  ACE_INT8;
-#endif /* defined (ACE_INT8_TYPE) */
-
-#if defined (ACE_HAS_UINT8_T)
-  typedef uint8_t               ACE_UINT8;
-#elif defined (ACE_UINT8_TYPE)
-  typedef ACE_UINT8_TYPE        ACE_UINT8;
-#else
-  typedef unsigned char         ACE_UINT8;
-#endif /* defined (ACE_UINT8_TYPE) */
-
-#if defined (ACE_HAS_INT16_T)
-  typedef int16_t               ACE_INT16;
-#elif defined (ACE_INT16_TYPE)
-  typedef ACE_INT16_TYPE        ACE_INT16;
-#elif ACE_SIZEOF_SHORT == 2
-  typedef short                 ACE_INT16;
-#elif ACE_SIZEOF_INT == 2
-  typedef int                   ACE_INT16;
-#else
-# error Have to add to the ACE_INT16 type setting
-#endif  /* defined (ACE_INT16_TYPE) */
-
-#if defined (ACE_HAS_UINT16_T)
-  typedef uint16_t              ACE_UINT16;
-#elif defined (ACE_UINT16_TYPE)
-  typedef ACE_UINT16_TYPE       ACE_UINT16;
-#elif ACE_SIZEOF_SHORT == 2
-  typedef unsigned short        ACE_UINT16;
-#elif ACE_SIZEOF_INT == 2
-  typedef unsigned int          ACE_UINT16;
-#else
-# error Have to add to the ACE_UINT16 type setting
-#endif /* defined (ACE_UINT16_TYPE) */
-
-#if defined (ACE_HAS_INT32_T)
-  typedef int32_t               ACE_INT32;
-#elif defined (ACE_INT32_TYPE)
-  typedef ACE_INT32_TYPE        ACE_INT32;
-#elif ACE_SIZEOF_INT == 4
-  typedef int                   ACE_INT32;
-#elif ACE_SIZEOF_LONG == 4
-  typedef long                  ACE_INT32;
-#else
-# error Have to add to the ACE_INT32 type setting
-#endif /* defined (ACE_INT32_TYPE) */
-
-#if defined (ACE_HAS_UINT32_T)
-  typedef uint32_t              ACE_UINT32;
-#elif defined (ACE_UINT32_TYPE)
-  typedef ACE_UINT32_TYPE       ACE_UINT32;
-#elif ACE_SIZEOF_INT == 4
-  typedef unsigned int          ACE_UINT32;
-#elif ACE_SIZEOF_LONG == 4
-  typedef unsigned long         ACE_UINT32;
-#else
-# error Have to add to the ACE_UINT32 type setting
-#endif /* defined (ACE_UINT32_TYPE) */
-
-#if defined (ACE_HAS_INT64_T)
-  typedef int64_t               ACE_INT64;
-#elif defined (ACE_INT64_TYPE)
-  typedef ACE_INT64_TYPE        ACE_INT64;
-#elif ACE_SIZEOF_LONG == 8
-  typedef long                  ACE_INT64;
-#elif ACE_SIZEOF_LONG_LONG == 8
-# ifdef __GNUC__
-  // Silence g++ "-pedantic" warnings regarding use of "long long"
-  // type.
-  __extension__
-# endif  /* __GNUC__ */
-  typedef long long             ACE_INT64;
-#endif /* defined (ACE_INT64_TYPE) */
-
-#if defined (ACE_HAS_UINT64_T)
-  typedef uint64_t              ACE_UINT64;
-#elif defined (ACE_UINT64_TYPE)
-  typedef ACE_UINT64_TYPE       ACE_UINT64;
-#elif ACE_SIZEOF_LONG == 8
-  typedef unsigned long         ACE_UINT64;
-#elif ACE_SIZEOF_LONG_LONG == 8
-# ifdef __GNUC__
-  // Silence g++ "-pedantic" warnings regarding use of "long long"
-  // type.
-  __extension__
-# endif  /* __GNUC__ */
-  typedef unsigned long long    ACE_UINT64;
-#endif /* defined (ACE_UINT64_TYPE) */
+// The sizes of the commonly implemented types are known.
+typedef int8_t   ACE_INT8;
+typedef uint8_t  ACE_UINT8;
+typedef int16_t  ACE_INT16;
+typedef uint16_t ACE_UINT16;
+typedef int32_t  ACE_INT32;
+typedef uint32_t ACE_UINT32;
+typedef int64_t  ACE_INT64;
+typedef uint64_t ACE_UINT64;
 
 /// Define a generic byte for use in codecs
 typedef unsigned char ACE_Byte;
 
 // Define a pseudo wide character type when wchar is not supported so we
 // can support basic wide character string operations.
-
 #if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
 #  define ACE_WINT_T wint_t
 #  define ACE_WCHAR_T wchar_t
diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h
index 6626b97b3f4..ab39bc10623 100644
--- a/ACE/ace/Bound_Ptr.h
+++ b/ACE/ace/Bound_Ptr.h
@@ -20,10 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_HAS_CPP11)
-# include "ace/Auto_Ptr.h"
-#endif /* !ACE_HAS_CPP11 */
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -43,11 +39,11 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   ACE_Bound_Ptr_Counter (long init_obj_ref_count = 0);
-  ~ACE_Bound_Ptr_Counter (void);
+  ~ACE_Bound_Ptr_Counter ();
 
   /// Create a ACE_Bound_Ptr_Counter<ACE_LOCK> and initialize the
   /// reference count to indicate ownership by a strong pointer.
-  static ACE_Bound_Ptr_Counter<ACE_LOCK> *create_strong (void);
+  static ACE_Bound_Ptr_Counter<ACE_LOCK> *create_strong ();
 
   /// Increase both the object and counter reference counts and return
   /// the new object reference count. A return value of -1 indicates
@@ -61,7 +57,7 @@ public:
 
   /// Create a ACE_Bound_Ptr_Counter<ACE_LOCK> and initialize the
   /// reference count to indicate no ownership.
-  static ACE_Bound_Ptr_Counter<ACE_LOCK> *create_weak (void);
+  static ACE_Bound_Ptr_Counter<ACE_LOCK> *create_weak ();
 
   /// Increase the counter reference count and return argument.
   static void attach_weak (ACE_Bound_Ptr_Counter<ACE_LOCK> *counter);
@@ -114,12 +110,6 @@ public:
   /// object \<p\> immediately.
   explicit ACE_Strong_Bound_Ptr (X *p = 0);
 
-#if !defined (ACE_HAS_CPP11)
-  /// Constructor that initializes an ACE_Strong_Bound_Ptr by stealing
-  /// ownership of an object from an auto_ptr.
-  explicit ACE_Strong_Bound_Ptr (auto_ptr<X> p);
-#endif /* !ACE_HAS_CPP11 */
-
   /// Copy constructor binds @c this and @a r to the same object.
   ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r);
 
@@ -140,7 +130,7 @@ public:
   }
 
   /// Destructor.
-  ~ACE_Strong_Bound_Ptr (void);
+  ~ACE_Strong_Bound_Ptr ();
 
   /// Assignment operator that binds @c this and @a r to the same object.
   void operator = (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r);
@@ -204,28 +194,21 @@ public:
   bool operator != (X *p) const;
 
   /// Redirection operator
-  X *operator-> (void) const;
+  X *operator-> () const;
 
   /// Dereference operator
-  X &operator * (void) const;
+  X &operator * () const;
 
   /// Get the pointer value.
-  X *get (void) const;
+  X *get () const;
 
   /// Resets the ACE_Strong_Bound_Ptr to refer to a different
   /// underlying object.
   void reset (X *p = 0);
 
-#if !defined (ACE_HAS_CPP11)
-  /// Resets the ACE_Strong_Bound_Ptr to refer to a different
-  /// underlying object, ownership of which is stolen from the
-  /// auto_ptr.
-  void reset (auto_ptr<X> p);
-#endif /* !ACE_HAS_CPP11 */
-
   /// Allows us to check for NULL on all ACE_Strong_Bound_Ptr
   /// objects.
-  bool null (void) const;
+  bool null () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -279,7 +262,7 @@ public:
   ACE_Weak_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r);
 
   /// Destructor.
-  ~ACE_Weak_Bound_Ptr (void);
+  ~ACE_Weak_Bound_Ptr ();
 
   /// Assignment operator that binds @c this and @a r to the same object.
   void operator = (const ACE_Weak_Bound_Ptr<X, ACE_LOCK> &r);
@@ -325,17 +308,17 @@ public:
    * certain of the lifetimes of the object, and do not want to incur
    * the locking overhead, then use the unsafe_get method instead.
    */
-  ACE_Strong_Bound_Ptr<X, ACE_LOCK> operator-> (void) const;
+  ACE_Strong_Bound_Ptr<X, ACE_LOCK> operator-> () const;
 
   /// Obtain a strong pointer corresponding to this weak pointer. This
   /// function is useful to create a temporary strong pointer for
   /// conversion to a reference.
-  ACE_Strong_Bound_Ptr<X, ACE_LOCK> strong (void) const;
+  ACE_Strong_Bound_Ptr<X, ACE_LOCK> strong () const;
 
   /// Get the pointer value. Warning: this does not affect the
   /// reference count of the underlying object, so it may disappear on
   /// you while you are using it if you are not careful.
-  X *unsafe_get (void) const;
+  X *unsafe_get () const;
 
   /// Resets the ACE_Weak_Bound_Ptr to refer to a different underlying
   /// object.
@@ -348,7 +331,7 @@ public:
    * reference counting mechanism such as those used by COM or CORBA
    * servants.
    */
-  long add_ref (void);
+  long add_ref ();
 
   /// Decrement the reference count on the underlying object, which is deleted
   /// if the count has reached zero.
@@ -358,10 +341,10 @@ public:
    * reference counting mechanism such as those used by COM or CORBA
    * servants.
    */
-  long remove_ref (void);
+  long remove_ref ();
 
   /// Allows us to check for NULL on all ACE_Weak_Bound_Ptr objects.
-  bool null (void) const;
+  bool null () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl
index 826c9aa9898..c5699e84030 100644
--- a/ACE/ace/Bound_Ptr.inl
+++ b/ACE/ace/Bound_Ptr.inl
@@ -17,7 +17,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::internal_create (long init_obj_ref_count)
 }
 
 template <class ACE_LOCK> inline ACE_Bound_Ptr_Counter<ACE_LOCK> *
-ACE_Bound_Ptr_Counter<ACE_LOCK>::create_strong (void)
+ACE_Bound_Ptr_Counter<ACE_LOCK>::create_strong ()
 {
   // Set initial object reference count to 1.
   ACE_Bound_Ptr_Counter<ACE_LOCK> *temp = internal_create (1);
@@ -77,7 +77,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::detach_strong (ACE_Bound_Ptr_Counter<ACE_LOCK>*
 }
 
 template <class ACE_LOCK> inline ACE_Bound_Ptr_Counter<ACE_LOCK> *
-ACE_Bound_Ptr_Counter<ACE_LOCK>::create_weak (void)
+ACE_Bound_Ptr_Counter<ACE_LOCK>::create_weak ()
 {
   // Set initial object reference count to 0.
 
@@ -135,7 +135,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::ACE_Bound_Ptr_Counter (long init_obj_ref_count)
 }
 
 template <class ACE_LOCK> inline
-ACE_Bound_Ptr_Counter<ACE_LOCK>::~ACE_Bound_Ptr_Counter (void)
+ACE_Bound_Ptr_Counter<ACE_LOCK>::~ACE_Bound_Ptr_Counter ()
 {
 }
 
@@ -146,15 +146,6 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (X *p)
 {
 }
 
-#if !defined (ACE_HAS_CPP11)
-template <class X, class ACE_LOCK> inline
-ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (auto_ptr<X> p)
-  : counter_ (COUNTER::create_strong ()),
-    ptr_ (p.release())
-{
-}
-#endif /* !ACE_HAS_CPP11 */
-
 template <class X, class ACE_LOCK> inline
 ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r)
   : counter_ (r.counter_),
@@ -180,7 +171,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (const ACE_Weak_Bound_Pt
 }
 
 template <class X, class ACE_LOCK> inline
-ACE_Strong_Bound_Ptr<X, ACE_LOCK>::~ACE_Strong_Bound_Ptr (void)
+ACE_Strong_Bound_Ptr<X, ACE_LOCK>::~ACE_Strong_Bound_Ptr ()
 {
   if (COUNTER::detach_strong (this->counter_) == 0)
     delete this->ptr_;
@@ -269,7 +260,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator!= (X *p) const
 }
 
 template <class X, class ACE_LOCK> inline X *
-ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator-> (void) const
+ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator-> () const
 {
   return this->ptr_;
 }
@@ -281,13 +272,13 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator *() const
 }
 
 template <class X, class ACE_LOCK> inline X*
-ACE_Strong_Bound_Ptr<X, ACE_LOCK>::get (void) const
+ACE_Strong_Bound_Ptr<X, ACE_LOCK>::get () const
 {
   return this->ptr_;
 }
 
 template <class X, class ACE_LOCK> inline bool
-ACE_Strong_Bound_Ptr<X, ACE_LOCK>::null (void) const
+ACE_Strong_Bound_Ptr<X, ACE_LOCK>::null () const
 {
   return this->ptr_ == 0;
 }
@@ -303,19 +294,6 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (X *p)
     delete old_ptr;
 }
 
-#if !defined (ACE_HAS_CPP11)
-template<class X, class ACE_LOCK> inline void
-ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (auto_ptr<X> p)
-{
-  COUNTER *old_counter = this->counter_;
-  X_t *old_ptr = this->ptr_;
-  this->counter_ = COUNTER::create_strong ();
-  this->ptr_ = p.release ();
-  if (COUNTER::detach_strong (old_counter) == 0)
-    delete old_ptr;
-}
-#endif /* !ACE_HAS_CPP11 */
-
 template <class X, class ACE_LOCK> inline
 ACE_Weak_Bound_Ptr<X, ACE_LOCK>::ACE_Weak_Bound_Ptr (X *p)
   : counter_ (COUNTER::create_weak ()),
@@ -340,7 +318,7 @@ ACE_Weak_Bound_Ptr<X, ACE_LOCK>::ACE_Weak_Bound_Ptr (const ACE_Strong_Bound_Ptr<
 }
 
 template <class X, class ACE_LOCK> inline
-ACE_Weak_Bound_Ptr<X, ACE_LOCK>::~ACE_Weak_Bound_Ptr (void)
+ACE_Weak_Bound_Ptr<X, ACE_LOCK>::~ACE_Weak_Bound_Ptr ()
 {
   COUNTER::detach_weak (this->counter_);
 }
@@ -434,19 +412,19 @@ ACE_Weak_Bound_Ptr<X, ACE_LOCK>::operator!= (X *p) const
 }
 
 template <class X, class ACE_LOCK> inline ACE_Strong_Bound_Ptr<X, ACE_LOCK>
-ACE_Weak_Bound_Ptr<X, ACE_LOCK>::operator-> (void) const
+ACE_Weak_Bound_Ptr<X, ACE_LOCK>::operator-> () const
 {
   return ACE_Strong_Bound_Ptr<X, ACE_LOCK> (*this);
 }
 
 template <class X, class ACE_LOCK> inline ACE_Strong_Bound_Ptr<X, ACE_LOCK>
-ACE_Weak_Bound_Ptr<X, ACE_LOCK>::strong (void) const
+ACE_Weak_Bound_Ptr<X, ACE_LOCK>::strong () const
 {
   return ACE_Strong_Bound_Ptr<X, ACE_LOCK> (*this);
 }
 
 template <class X, class ACE_LOCK> inline X*
-ACE_Weak_Bound_Ptr<X, ACE_LOCK>::unsafe_get (void) const
+ACE_Weak_Bound_Ptr<X, ACE_LOCK>::unsafe_get () const
 {
   // We do not check if the object has been deleted, since this operation
   // is defined to be unsafe!
@@ -454,7 +432,7 @@ ACE_Weak_Bound_Ptr<X, ACE_LOCK>::unsafe_get (void) const
 }
 
 template <class X, class ACE_LOCK> inline bool
-ACE_Weak_Bound_Ptr<X, ACE_LOCK>::null (void) const
+ACE_Weak_Bound_Ptr<X, ACE_LOCK>::null () const
 {
   // A weak pointer must behave as though it is automatically set to null
   // if the underlying object has been deleted.
diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp
index b87380ee507..05312ecfd61 100644
--- a/ACE/ace/CDR_Base.cpp
+++ b/ACE/ace/CDR_Base.cpp
@@ -819,7 +819,7 @@ ACE_CDR::Fixed ACE_CDR::Fixed::from_floating (LongDouble val)
 #elif defined NONNATIVE_LONGDOUBLE
   typedef LongDouble::NativeImpl BigFloat;
 #else
-  typedef LongDouble BigFloat;
+  using BigFloat = LongDouble;
 #endif
 
   Fixed f;
diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h
index a8b49e5a0a1..815f0e009ee 100644
--- a/ACE/ace/CDR_Base.h
+++ b/ACE/ace/CDR_Base.h
@@ -397,10 +397,15 @@ public:
          };
 
          class Iterator
-           : public std::iterator<std::bidirectional_iterator_tag, Proxy>
-           , private IteratorBase
+           : private IteratorBase
          {
          public:
+           typedef std::bidirectional_iterator_tag iterator_category;
+           typedef Proxy value_type;
+           typedef std::ptrdiff_t difference_type;
+           typedef Proxy* pointer;
+           typedef Proxy& reference;
+
            explicit Iterator (Fixed *outer, int digit = 0);
            Proxy operator* ();
            Iterator &operator+= (std::ptrdiff_t n);
@@ -415,10 +420,15 @@ public:
          };
 
          class ConstIterator
-           : public std::iterator<std::bidirectional_iterator_tag, Octet>
-           , private IteratorBase
+           : public IteratorBase
          {
          public:
+           typedef std::bidirectional_iterator_tag iterator_category;
+           typedef Octet value_type;
+           typedef std::ptrdiff_t difference_type;
+           typedef Octet* pointer;
+           typedef Octet& reference;
+
            explicit ConstIterator (const Fixed *outer, int digit = 0);
            Octet operator* ();
            ConstIterator &operator+= (std::ptrdiff_t n);
diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h
index c535924f1a0..4590230a336 100644
--- a/ACE/ace/CDR_Size.h
+++ b/ACE/ace/CDR_Size.h
@@ -125,9 +125,10 @@ public:
                size_t align);
 
 private:
-  /// disallow copying...
-  ACE_SizeCDR (const ACE_SizeCDR& rhs);
-  ACE_SizeCDR& operator= (const ACE_SizeCDR& rhs);
+  ACE_SizeCDR (const ACE_SizeCDR&) = delete;
+  ACE_SizeCDR& operator= (const ACE_SizeCDR&) = delete;
+  ACE_SizeCDR (ACE_SizeCDR&&) = delete;
+  ACE_SizeCDR& operator= (ACE_SizeCDR&&) = delete;
 
   ACE_CDR::Boolean write_1 (const ACE_CDR::Octet *x);
   ACE_CDR::Boolean write_2 (const ACE_CDR::UShort *x);
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index 32654aeddf8..f669788370f 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -687,7 +687,7 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
 }
 
 char *
-ACE_OutputCDR::write_long_placeholder (void)
+ACE_OutputCDR::write_long_placeholder ()
 {
   char *buf = 0;
   if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0)
@@ -698,7 +698,7 @@ ACE_OutputCDR::write_long_placeholder (void)
 }
 
 char *
-ACE_OutputCDR::write_short_placeholder (void)
+ACE_OutputCDR::write_short_placeholder ()
 {
   char *buf = 0;
   if (this->adjust (ACE_CDR::SHORT_SIZE, buf) == 0)
@@ -709,7 +709,7 @@ ACE_OutputCDR::write_short_placeholder (void)
 }
 
 char *
-ACE_OutputCDR::write_boolean_placeholder (void)
+ACE_OutputCDR::write_boolean_placeholder ()
 {
   char *buf = 0;
   if (this->adjust (ACE_CDR::OCTET_SIZE, buf) == 0)
@@ -720,7 +720,7 @@ ACE_OutputCDR::write_boolean_placeholder (void)
 }
 
 char *
-ACE_OutputCDR::write_char_placeholder (void)
+ACE_OutputCDR::write_char_placeholder ()
 {
   char *buf = 0;
   if (this->adjust (ACE_CDR::OCTET_SIZE, buf) == 0)
@@ -731,7 +731,7 @@ ACE_OutputCDR::write_char_placeholder (void)
 }
 
 char *
-ACE_OutputCDR::write_octet_placeholder (void)
+ACE_OutputCDR::write_octet_placeholder ()
 {
   char *buf = 0;
   if (this->adjust (ACE_CDR::OCTET_SIZE, buf) == 0)
@@ -742,7 +742,7 @@ ACE_OutputCDR::write_octet_placeholder (void)
 }
 
 char *
-ACE_OutputCDR::write_longlong_placeholder (void)
+ACE_OutputCDR::write_longlong_placeholder ()
 {
   char *buf = 0;
   if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
@@ -753,7 +753,7 @@ ACE_OutputCDR::write_longlong_placeholder (void)
 }
 
 char *
-ACE_OutputCDR::write_float_placeholder (void)
+ACE_OutputCDR::write_float_placeholder ()
 {
   char *buf = 0;
   if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0)
@@ -764,7 +764,7 @@ ACE_OutputCDR::write_float_placeholder (void)
 }
 
 char *
-ACE_OutputCDR::write_double_placeholder (void)
+ACE_OutputCDR::write_double_placeholder ()
 {
   char *buf = 0;
   if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
@@ -984,7 +984,7 @@ ACE_OutputCDR::replace (ACE_CDR::Double x, char* loc)
 }
 
 int
-ACE_OutputCDR::consolidate (void)
+ACE_OutputCDR::consolidate ()
 {
   // Optimize by only doing something if we need to
   if (this->current_ != &this->start_)
@@ -1377,7 +1377,7 @@ ACE_InputCDR::ACE_InputCDR (const ACE_OutputCDR& rhs,
 }
 
 ACE_CDR::Boolean
-ACE_InputCDR::skip_wchar (void)
+ACE_InputCDR::skip_wchar ()
 {
   if (static_cast<ACE_CDR::Short> (major_version_) == 1
       && static_cast<ACE_CDR::Short> (minor_version_) == 2)
@@ -1689,7 +1689,6 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_string (std::string& x)
 {
-#if defined (ACE_HAS_CPP11)
   // @@ This is a slight violation of "Optimize for the common case",
   // i.e. normally the translator will be 0, but OTOH the code is
   // smaller and should be better for the cache ;-) ;-)
@@ -1727,20 +1726,12 @@ ACE_InputCDR::read_string (std::string& x)
   this->good_bit_ = false;
   x.clear ();
   return false;
-#else
-  ACE_CDR::Char *buf = 0;
-  ACE_CDR::Boolean const marshal_flag = this->read_string (buf);
-  x.assign (buf);
-  ACE::strdelete (buf);
-  return marshal_flag;
-#endif
 }
 
 #if !defined(ACE_LACKS_STD_WSTRING)
 ACE_CDR::Boolean
 ACE_InputCDR::read_wstring (std::wstring& x)
 {
-#if defined (ACE_HAS_CPP11)
   // @@ This is a slight violation of "Optimize for the common case",
   // i.e. normally the translator will be 0, but OTOH the code is
   // smaller and should be better for the cache ;-) ;-)
@@ -1814,13 +1805,6 @@ ACE_InputCDR::read_wstring (std::wstring& x)
   this->good_bit_ = false;
   x.clear ();
   return false;
-#else
-  ACE_CDR::WChar *buf = 0;
-  ACE_CDR::Boolean const marshal_flag = this->read_wstring (buf);
-  x.assign (buf);
-  ACE::strdelete (buf);
-  return marshal_flag;
-#endif
 }
 #endif
 
@@ -2034,7 +2018,7 @@ ACE_InputCDR::read_16 (ACE_CDR::LongDouble *x)
 }
 
 ACE_CDR::Boolean
-ACE_InputCDR::skip_string (void)
+ACE_InputCDR::skip_string ()
 {
   ACE_CDR::ULong len = 0;
   if (this->read_ulong (len))
@@ -2060,7 +2044,7 @@ ACE_InputCDR::skip_string (void)
 }
 
 ACE_CDR::Boolean
-ACE_InputCDR::skip_wstring (void)
+ACE_InputCDR::skip_wstring ()
 {
   ACE_CDR::ULong len = 0;
   ACE_CDR::Boolean continue_skipping = read_ulong (len);
@@ -2313,7 +2297,7 @@ ACE_InputCDR::clone_from (ACE_InputCDR &cdr)
 }
 
 ACE_Message_Block*
-ACE_InputCDR::steal_contents (void)
+ACE_InputCDR::steal_contents ()
 {
   ACE_Message_Block* block = this->start_.clone ();
   this->start_.data_block (block->data_block ()->clone ());
@@ -2332,7 +2316,7 @@ ACE_InputCDR::steal_contents (void)
 }
 
 void
-ACE_InputCDR::reset_contents (void)
+ACE_InputCDR::reset_contents ()
 {
   this->start_.data_block (this->start_.data_block ()->clone_nocopy ());
 
@@ -2363,7 +2347,7 @@ ACE_InputCDR::unregister_monitor (void)
 
 // --------------------------------------------------------------
 
-ACE_Char_Codeset_Translator::~ACE_Char_Codeset_Translator (void)
+ACE_Char_Codeset_Translator::~ACE_Char_Codeset_Translator ()
 {
 }
 
@@ -2380,7 +2364,7 @@ ACE_Char_Codeset_Translator::read_string (ACE_InputCDR &cdr,
 
 // --------------------------------------------------------------
 
-ACE_WChar_Codeset_Translator::~ACE_WChar_Codeset_Translator (void)
+ACE_WChar_Codeset_Translator::~ACE_WChar_Codeset_Translator ()
 {
 }
 
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 4ce2402a5fb..3a16dbeb7bf 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -165,7 +165,7 @@ public:
                  ACE_CDR::Octet giop_minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /// destructor
-  ~ACE_OutputCDR (void);
+  ~ACE_OutputCDR ();
 
   /**
    * Disambiguate overload when inserting booleans, octets, chars, and
@@ -338,14 +338,14 @@ public:
    * @retval Pointer to the placeholder; 0 if there is not enough space
    *         in the stream and memory could not be allocated.
    */
-  char* write_long_placeholder (void);
-  char* write_short_placeholder (void);
-  char* write_boolean_placeholder (void);
-  char* write_char_placeholder (void);
-  char* write_longlong_placeholder (void);
-  char* write_octet_placeholder (void);
-  char* write_float_placeholder (void);
-  char* write_double_placeholder (void);
+  char* write_long_placeholder ();
+  char* write_short_placeholder ();
+  char* write_boolean_placeholder ();
+  char* write_char_placeholder ();
+  char* write_longlong_placeholder ();
+  char* write_octet_placeholder ();
+  char* write_float_placeholder ();
+  char* write_double_placeholder ();
 
   /**
    * Writes a new value into a specific location. This is commonly
@@ -403,26 +403,26 @@ public:
   /**
    * @note The only expected error is to run out of memory.
    */
-  bool good_bit (void) const;
+  bool good_bit () const;
 
   /// Reuse the CDR stream to write on the old buffer.
-  void reset (void);
+  void reset ();
 
   /// Add the length of each message block in the chain.
-  size_t total_length (void) const;
+  size_t total_length () const;
 
   /**
    * Return the start of the message block chain for this CDR stream.
    * @note The complete CDR stream is represented by a chain of
    * message blocks.
    */
-  const ACE_Message_Block *begin (void) const;
+  const ACE_Message_Block *begin () const;
 
   /// Return the last message in the chain that is is use.
-  const ACE_Message_Block *end (void) const;
+  const ACE_Message_Block *end () const;
 
   /// Return the <current_> message block in chain.
-  const ACE_Message_Block *current (void) const;
+  const ACE_Message_Block *current () const;
 
   /// Replace the message block chain with a single message block.
   /**
@@ -431,21 +431,21 @@ public:
    *
    * @note The only expected error is to run out of memory.
    */
-  int consolidate (void);
+  int consolidate ();
 
   /**
    * Access the underlying buffer (read only).  @note This
    * method only returns a pointer to the first block in the
    * chain.
    */
-  const char *buffer (void) const;
+  const char *buffer () const;
 
   /**
    * Return the size of first message block in the block chain. @note This
    * method only returns information about the first block in the
    * chain.
    */
-  size_t length (void) const;
+  size_t length () const;
 
   /**
    * Utility function to allow the user more flexibility.
@@ -456,8 +456,8 @@ public:
   int align_write_ptr (size_t alignment);
 
   /// Access the codeset translators. They can be null!
-  ACE_Char_Codeset_Translator *char_translator (void) const;
-  ACE_WChar_Codeset_Translator *wchar_translator (void) const;
+  ACE_Char_Codeset_Translator *char_translator () const;
+  ACE_WChar_Codeset_Translator *wchar_translator () const;
 
   /// Set the char codeset translator.
   void char_translator (ACE_Char_Codeset_Translator *);
@@ -469,14 +469,14 @@ public:
   static void wchar_maxbytes (size_t max_bytes);
 
   /// access the serialized size of wchars.
-  static size_t wchar_maxbytes (void);
+  static size_t wchar_maxbytes ();
 
   /**
    * Return alignment of the wr_ptr(), with respect to the start of
    * the CDR stream.  This is not the same as the alignment of
    * current->wr_ptr()!
    */
-  size_t current_alignment (void) const;
+  size_t current_alignment () const;
 
   void current_alignment (size_t current_alignment);
 
@@ -499,11 +499,11 @@ public:
   /// and false otherwise. For example, it would be true if either
   /// ACE_ENABLE_SWAP_ON_WRITE is defined or a specific byte order was
   /// specified for this stream.
-  bool do_byte_swap (void) const;
+  bool do_byte_swap () const;
 
   /// Returns the byte order this stream is marshaling data in. Will be one
   /// of the values in ACE_CDR::Byte_Order.
-  int byte_order (void) const;
+  int byte_order () const;
 
   /// For use by a gateway, which creates the output stream for the
   /// reply to the client in its native byte order, but which must
@@ -528,9 +528,10 @@ private:
   // that the provide location locates.
   ACE_Message_Block* find (char* loc);
 
-  /// disallow copying...
-  ACE_OutputCDR (const ACE_OutputCDR& rhs);
-  ACE_OutputCDR& operator= (const ACE_OutputCDR& rhs);
+  ACE_OutputCDR (const ACE_OutputCDR&) = delete;
+  ACE_OutputCDR& operator= (const ACE_OutputCDR&) = delete;
+  ACE_OutputCDR (ACE_OutputCDR&&) = delete;
+  ACE_OutputCDR& operator= (ACE_OutputCDR&&) = delete;
 
   ACE_CDR::Boolean write_1 (const ACE_CDR::Octet *x);
   ACE_CDR::Boolean write_2 (const ACE_CDR::UShort *x);
@@ -760,7 +761,7 @@ public:
   ACE_InputCDR (Transfer_Contents rhs);
 
   /// Destructor
-  virtual ~ACE_InputCDR (void);
+  virtual ~ACE_InputCDR ();
 
   /// Disambiguate overloading when extracting octets, chars,
   /// booleans, and bounded strings
@@ -904,20 +905,20 @@ public:
    * Return @c false on failure and @c true on success.
    */
   //@{ @name Skip elements
-  ACE_CDR::Boolean skip_boolean (void);
-  ACE_CDR::Boolean skip_char (void);
-  ACE_CDR::Boolean skip_wchar (void);
-  ACE_CDR::Boolean skip_octet (void);
-  ACE_CDR::Boolean skip_short (void);
-  ACE_CDR::Boolean skip_ushort (void);
-  ACE_CDR::Boolean skip_long (void);
-  ACE_CDR::Boolean skip_ulong (void);
-  ACE_CDR::Boolean skip_longlong (void);
-  ACE_CDR::Boolean skip_ulonglong (void);
-  ACE_CDR::Boolean skip_float (void);
-  ACE_CDR::Boolean skip_double (void);
-  ACE_CDR::Boolean skip_longdouble (void);
-  ACE_CDR::Boolean skip_fixed (void);
+  ACE_CDR::Boolean skip_boolean ();
+  ACE_CDR::Boolean skip_char ();
+  ACE_CDR::Boolean skip_wchar ();
+  ACE_CDR::Boolean skip_octet ();
+  ACE_CDR::Boolean skip_short ();
+  ACE_CDR::Boolean skip_ushort ();
+  ACE_CDR::Boolean skip_long ();
+  ACE_CDR::Boolean skip_ulong ();
+  ACE_CDR::Boolean skip_longlong ();
+  ACE_CDR::Boolean skip_ulonglong ();
+  ACE_CDR::Boolean skip_float ();
+  ACE_CDR::Boolean skip_double ();
+  ACE_CDR::Boolean skip_longdouble ();
+  ACE_CDR::Boolean skip_fixed ();
   //@}
 
   /**
@@ -925,8 +926,8 @@ public:
    * useful in parsing a TypeCode.
    * @return @c false on failure and @c true on success.
    */
-  ACE_CDR::Boolean skip_wstring (void);
-  ACE_CDR::Boolean skip_string (void);
+  ACE_CDR::Boolean skip_wstring ();
+  ACE_CDR::Boolean skip_string ();
 
   /// Skip @a n bytes in the CDR stream.
   /**
@@ -935,7 +936,7 @@ public:
   ACE_CDR::Boolean skip_bytes (size_t n);
 
   /// returns @c false if a problem has been detected.
-  bool good_bit (void) const;
+  bool good_bit () const;
 
   /**
    * @return The start of the message block chain for this CDR
@@ -944,7 +945,7 @@ public:
    * @note In the current implementation the chain has length 1, but
    *       we are planning to change that.
    */
-  const ACE_Message_Block* start (void) const;
+  const ACE_Message_Block* start () const;
 
   // = The following functions are useful to read the contents of the
   //   CDR stream from a socket or file.
@@ -969,7 +970,7 @@ public:
               int byte_order);
 
   /// Steal the contents from the current CDR.
-  ACE_Message_Block *steal_contents (void);
+  ACE_Message_Block *steal_contents ();
 
   /// Steal the contents of @a cdr and make a shallow copy into this
   /// stream.
@@ -993,16 +994,16 @@ public:
 
   /// Re-initialize the CDR stream, forgetting about the old contents
   /// of the stream and allocating a new buffer (from the allocators).
-  void reset_contents (void);
+  void reset_contents ();
 
   /// Returns the current position for the @c rd_ptr.
-  char* rd_ptr (void);
+  char* rd_ptr ();
 
   /// Returns the current position for the @c wr_ptr.
-  char* wr_ptr (void);
+  char* wr_ptr ();
 
   /// Return how many bytes are left in the stream.
-  size_t length (void) const;
+  size_t length () const;
 
   /**
    * Utility function to allow the user more flexibility.
@@ -1015,15 +1016,15 @@ public:
 
   /// If @c true then this stream is writing in non-native byte order.
   /// This is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined.
-  bool do_byte_swap (void) const;
+  bool do_byte_swap () const;
 
   /// If @c do_byte_swap() returns @c false, this returns
   /// ACE_CDR_BYTE_ORDER else it returns !ACE_CDR_BYTE_ORDER.
-  int byte_order (void) const;
+  int byte_order () const;
 
   /// Access the codeset translators. They can be nil!
-  ACE_Char_Codeset_Translator *char_translator (void) const;
-  ACE_WChar_Codeset_Translator *wchar_translator (void) const;
+  ACE_Char_Codeset_Translator *char_translator () const;
+  ACE_WChar_Codeset_Translator *wchar_translator () const;
 
   /// Set the codeset translators.
   void char_translator (ACE_Char_Codeset_Translator *);
@@ -1125,7 +1126,7 @@ private:
   void rd_ptr (size_t offset);
 
   /// Points to the continuation field of the current message block.
-  char* end (void);
+  char* end ();
 };
 
 // ****************************************************************
diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl
index fe25108da85..3ee06d67ef4 100644
--- a/ACE/ace/CDR_Stream.inl
+++ b/ACE/ace/CDR_Stream.inl
@@ -170,7 +170,7 @@ ACE_InputCDR::Transfer_Contents::Transfer_Contents (ACE_InputCDR &rhs)
 // ****************************************************************
 
 ACE_INLINE
-ACE_OutputCDR::~ACE_OutputCDR (void)
+ACE_OutputCDR::~ACE_OutputCDR ()
 {
   if (this->start_.cont () != 0)
     {
@@ -186,7 +186,7 @@ ACE_OutputCDR::~ACE_OutputCDR (void)
 }
 
 ACE_INLINE void
-ACE_OutputCDR::reset (void)
+ACE_OutputCDR::reset ()
 {
   this->current_ = &this->start_;
   this->current_is_writable_ = true;
@@ -492,7 +492,7 @@ ACE_OutputCDR::write_longdouble_array (const ACE_CDR::LongDouble* x,
 }
 
 ACE_INLINE bool
-ACE_OutputCDR::good_bit (void) const
+ACE_OutputCDR::good_bit () const
 {
   return this->good_bit_;
 }
@@ -557,49 +557,49 @@ ACE_OutputCDR::get_version (ACE_CDR::Octet &major, ACE_CDR::Octet &minor)
 
 
 ACE_INLINE const ACE_Message_Block*
-ACE_OutputCDR::begin (void) const
+ACE_OutputCDR::begin () const
 {
   return &this->start_;
 }
 
 ACE_INLINE const ACE_Message_Block*
-ACE_OutputCDR::end (void) const
+ACE_OutputCDR::end () const
 {
   return this->current_->cont ();
 }
 
 ACE_INLINE const ACE_Message_Block*
-ACE_OutputCDR::current (void) const
+ACE_OutputCDR::current () const
 {
   return this->current_;
 }
 
 ACE_INLINE size_t
-ACE_OutputCDR::total_length (void) const
+ACE_OutputCDR::total_length () const
 {
   return ACE_CDR::total_length (this->begin (), this->end ());
 }
 
 ACE_INLINE const char*
-ACE_OutputCDR::buffer (void) const
+ACE_OutputCDR::buffer () const
 {
   return this->start_.rd_ptr ();
 }
 
 ACE_INLINE size_t
-ACE_OutputCDR::length (void) const
+ACE_OutputCDR::length () const
 {
   return this->start_.length ();
 }
 
 ACE_INLINE bool
-ACE_OutputCDR::do_byte_swap (void) const
+ACE_OutputCDR::do_byte_swap () const
 {
   return this->do_byte_swap_;
 }
 
 ACE_INLINE int
-ACE_OutputCDR::byte_order (void) const
+ACE_OutputCDR::byte_order () const
 {
   if (this->do_byte_swap ())
     return !ACE_CDR_BYTE_ORDER;
@@ -614,7 +614,7 @@ ACE_OutputCDR::reset_byte_order (int byte_order)
 }
 
 ACE_INLINE size_t
-ACE_OutputCDR::current_alignment (void) const
+ACE_OutputCDR::current_alignment () const
 {
 #if !defined (ACE_LACKS_CDR_ALIGNMENT)
   return this->current_alignment_;
@@ -649,13 +649,13 @@ ACE_OutputCDR::align_write_ptr (size_t alignment)
 }
 
 ACE_INLINE ACE_Char_Codeset_Translator *
-ACE_OutputCDR::char_translator (void) const
+ACE_OutputCDR::char_translator () const
 {
   return this->char_translator_;
 }
 
 ACE_INLINE ACE_WChar_Codeset_Translator *
-ACE_OutputCDR::wchar_translator (void) const
+ACE_OutputCDR::wchar_translator () const
 {
   return this->wchar_translator_;
 }
@@ -675,7 +675,7 @@ ACE_OutputCDR::wchar_translator (ACE_WChar_Codeset_Translator * wctran)
 // ****************************************************************
 
 ACE_INLINE
-ACE_InputCDR::~ACE_InputCDR (void)
+ACE_InputCDR::~ACE_InputCDR ()
 {
 #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1)
   this->monitor_->remove_ref ();
@@ -792,7 +792,7 @@ ACE_InputCDR::read_fixed (ACE_CDR::Fixed &x)
 }
 
 ACE_INLINE size_t
-ACE_InputCDR::length (void) const
+ACE_InputCDR::length () const
 {
   return this->start_.length ();
 }
@@ -1022,84 +1022,84 @@ ACE_InputCDR::read_longdouble_array (ACE_CDR::LongDouble* x,
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_octet (void)
+ACE_InputCDR::skip_octet ()
 {
   ACE_CDR::Octet x;
   return this->read_1 (&x);
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_char (void)
+ACE_InputCDR::skip_char ()
 {
   return this->skip_octet ();  // sizeof (Char) == sizeof (Octet)
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_boolean (void)
+ACE_InputCDR::skip_boolean ()
 {
   return this->skip_octet () && this->good_bit_;
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_ushort (void)
+ACE_InputCDR::skip_ushort ()
 {
   ACE_CDR::UShort x;
   return this->read_2 (&x);
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_short (void)
+ACE_InputCDR::skip_short ()
 {
   return this->skip_ushort ();
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_ulong (void)
+ACE_InputCDR::skip_ulong ()
 {
   ACE_CDR::ULong x;
   return this->read_4 (&x);
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_long (void)
+ACE_InputCDR::skip_long ()
 {
   return this->skip_ulong ();  // sizeof (Long) == sizeof (ULong)
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_ulonglong (void)
+ACE_InputCDR::skip_ulonglong ()
 {
   ACE_CDR::ULongLong x;
   return this->read_8 (&x);
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_longlong (void)
+ACE_InputCDR::skip_longlong ()
 {
   return this->skip_ulonglong ();  // sizeof (LongLong) == sizeof (ULongLong)
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_float (void)
+ACE_InputCDR::skip_float ()
 {
   return this->skip_ulong ();  // sizeof(Float) == sizeof (ULong)
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_double (void)
+ACE_InputCDR::skip_double ()
 {
   return this->skip_ulonglong ();  // sizeof(Double) == sizeof (ULongLong)
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_longdouble (void)
+ACE_InputCDR::skip_longdouble ()
 {
   ACE_CDR::LongDouble x;
   return this->read_16 (&x);
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_fixed (void)
+ACE_InputCDR::skip_fixed ()
 {
   for (int i = 0; i < 16; ++i)
     {
@@ -1114,7 +1114,7 @@ ACE_InputCDR::skip_fixed (void)
 }
 
 ACE_INLINE char*
-ACE_InputCDR::end (void)
+ACE_InputCDR::end ()
 {
   return this->start_.end ();
 }
@@ -1126,13 +1126,13 @@ ACE_InputCDR::rd_ptr (size_t offset)
 }
 
 ACE_INLINE char*
-ACE_InputCDR::rd_ptr (void)
+ACE_InputCDR::rd_ptr ()
 {
   return this->start_.rd_ptr ();
 }
 
 ACE_INLINE char*
-ACE_InputCDR::wr_ptr (void)
+ACE_InputCDR::wr_ptr ()
 {
   return this->start_.wr_ptr ();
 }
@@ -1170,13 +1170,13 @@ ACE_InputCDR::adjust (size_t size,
 }
 
 ACE_INLINE const ACE_Message_Block*
-ACE_InputCDR::start (void) const
+ACE_InputCDR::start () const
 {
   return &this->start_;
 }
 
 ACE_INLINE bool
-ACE_InputCDR::good_bit (void) const
+ACE_InputCDR::good_bit () const
 {
   return this->good_bit_;
 }
@@ -1277,7 +1277,7 @@ operator<< (ACE_OutputCDR &os, const ACE_CDR::WChar *x)
 ACE_INLINE ACE_CDR::Boolean
 operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_string x)
 {
-  ACE_CDR::ULong len =
+  ACE_CDR::ULong const len =
       static_cast<ACE_CDR::ULong> (x.val_.size ());
 
   os.write_string (len, x.val_.c_str ());
@@ -1289,7 +1289,7 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_string x)
 ACE_INLINE ACE_CDR::Boolean
 operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_wstring x)
 {
-  ACE_CDR::ULong len =
+  ACE_CDR::ULong const len =
       static_cast<ACE_CDR::ULong> (x.val_.size ());
 
   os.write_wstring (len, x.val_.c_str ());
@@ -1675,13 +1675,13 @@ ACE_InputCDR::reset_byte_order (int byte_order)
 }
 
 ACE_INLINE bool
-ACE_InputCDR::do_byte_swap (void) const
+ACE_InputCDR::do_byte_swap () const
 {
   return this->do_byte_swap_;
 }
 
 ACE_INLINE int
-ACE_InputCDR::byte_order (void) const
+ACE_InputCDR::byte_order () const
 {
   return this->do_byte_swap () ? !ACE_CDR_BYTE_ORDER : ACE_CDR_BYTE_ORDER;
 }
@@ -1721,13 +1721,13 @@ ACE_InputCDR::get_version (ACE_CDR::Octet &major, ACE_CDR::Octet &minor)
 }
 
 ACE_INLINE ACE_Char_Codeset_Translator *
-ACE_InputCDR::char_translator (void) const
+ACE_InputCDR::char_translator () const
 {
   return this->char_translator_;
 }
 
 ACE_INLINE ACE_WChar_Codeset_Translator *
-ACE_InputCDR::wchar_translator (void) const
+ACE_InputCDR::wchar_translator () const
 {
   return this->wchar_translator_;
 }
diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h
index da181cb0ed2..ee88bd4bdc5 100644
--- a/ACE/ace/Cache_Map_Manager_T.h
+++ b/ACE/ace/Cache_Map_Manager_T.h
@@ -196,7 +196,7 @@ public:
   size_t total_size (void) const;
 
   /// Dumps the state of the object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iterator factory functions.
 
@@ -295,7 +295,7 @@ public:
   IMPLEMENTATION &iterator_implementation (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -368,7 +368,7 @@ public:
   REVERSE_IMPLEMENTATION &iterator_implementation (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h
index 243d10c6a38..e7206290811 100644
--- a/ACE/ace/Caching_Strategies_T.h
+++ b/ACE/ace/Caching_Strategies_T.h
@@ -158,7 +158,7 @@ public:
   CACHING_UTILITY &caching_utility (void);
 
   /// Dumps the state of the object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -254,7 +254,7 @@ public:
   CACHING_UTILITY &caching_utility (void);
 
   /// Dumps the state of the object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -353,7 +353,7 @@ public:
   CACHING_UTILITY &caching_utility (void);
 
   /// Dumps the state of the object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -444,7 +444,7 @@ public:
   CACHING_UTILITY &caching_utility (void);
 
   /// Dumps the state of the object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -521,7 +521,7 @@ public:
   CACHING_UTILITY &caching_utility (void);
 
   /// Dumps the state of the object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Capabilities.cpp b/ACE/ace/Capabilities.cpp
index 9ffceda2a91..43cd9c95ee8 100644
--- a/ACE/ace/Capabilities.cpp
+++ b/ACE/ace/Capabilities.cpp
@@ -13,16 +13,16 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_CapEntry::~ACE_CapEntry (void)
+ACE_CapEntry::~ACE_CapEntry ()
 {
 }
 
-ACE_Capabilities::ACE_Capabilities (void)
+ACE_Capabilities::ACE_Capabilities ()
   : caps_ ()
 {
 }
 
-ACE_Capabilities::~ACE_Capabilities (void)
+ACE_Capabilities::~ACE_Capabilities ()
 {
   this->resetcaps ();
 }
@@ -96,7 +96,7 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, int &cap)
 }
 
 void
-ACE_Capabilities::resetcaps (void)
+ACE_Capabilities::resetcaps ()
 {
   for (CAPABILITIES_MAP::ITERATOR iter (this->caps_);
        !iter.done ();
diff --git a/ACE/ace/Cleanup.cpp b/ACE/ace/Cleanup.cpp
index 0e162c8cf3b..46b3c7e7582 100644
--- a/ACE/ace/Cleanup.cpp
+++ b/ACE/ace/Cleanup.cpp
@@ -20,7 +20,7 @@ ACE_Cleanup::cleanup (void *)
   delete this;
 }
 
-ACE_Cleanup::~ACE_Cleanup (void)
+ACE_Cleanup::~ACE_Cleanup ()
 {
 }
 
@@ -34,7 +34,7 @@ ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *object, void *param)
 
 /*****************************************************************************/
 
-ACE_Cleanup_Info_Node::ACE_Cleanup_Info_Node (void)
+ACE_Cleanup_Info_Node::ACE_Cleanup_Info_Node ()
   : object_ (0),
     cleanup_hook_ (0),
     param_ (0),
@@ -53,7 +53,7 @@ ACE_Cleanup_Info_Node::ACE_Cleanup_Info_Node (void *object,
 {
 }
 
-ACE_Cleanup_Info_Node::~ACE_Cleanup_Info_Node (void)
+ACE_Cleanup_Info_Node::~ACE_Cleanup_Info_Node ()
 {
   if (this->name_)
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -82,11 +82,11 @@ ACE_Cleanup_Info_Node::operator!= (const ACE_Cleanup_Info_Node &o) const
 
 /*****************************************************************************/
 
-ACE_OS_Exit_Info::ACE_OS_Exit_Info (void)
+ACE_OS_Exit_Info::ACE_OS_Exit_Info ()
 {
 }
 
-ACE_OS_Exit_Info::~ACE_OS_Exit_Info (void)
+ACE_OS_Exit_Info::~ACE_OS_Exit_Info ()
 {
 }
 
@@ -153,7 +153,7 @@ ACE_OS_Exit_Info::remove (void *object)
 
 
 void
-ACE_OS_Exit_Info::call_hooks (void)
+ACE_OS_Exit_Info::call_hooks ()
 {
   // Call all registered cleanup hooks, in reverse order of
   // registration.
diff --git a/ACE/ace/Cleanup.h b/ACE/ace/Cleanup.h
index 86044c85c2b..7f839901d1f 100644
--- a/ACE/ace/Cleanup.h
+++ b/ACE/ace/Cleanup.h
@@ -46,10 +46,10 @@ class ACE_Export ACE_Cleanup
 {
 public:
   /// No-op constructor.
-  ACE_Cleanup (void);
+  ACE_Cleanup ();
 
   /// Destructor.
-  virtual ~ACE_Cleanup (void);
+  virtual ~ACE_Cleanup ();
 
   /// Cleanup method that, by default, simply deletes itself.
   virtual void cleanup (void *param = 0);
@@ -69,12 +69,12 @@ void ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *, void *param = 0);
 class ACE_Cleanup_Info_Node : public ACE_Intrusive_List_Node<ACE_Cleanup_Info_Node>
 {
 public:
-  ACE_Cleanup_Info_Node (void);
+  ACE_Cleanup_Info_Node ();
   ACE_Cleanup_Info_Node (void *object,
                          ACE_CLEANUP_FUNC cleanup_hook,
                          void *param,
                          const char *name);
-  ~ACE_Cleanup_Info_Node (void);
+  ~ACE_Cleanup_Info_Node ();
 
   /// Equality operator.
   bool operator== (const ACE_Cleanup_Info_Node &o) const;
@@ -82,11 +82,11 @@ public:
   /// Inequality operator.
   bool operator!= (const ACE_Cleanup_Info_Node &o) const;
 
-  void* object(void);
+  void* object();
 
-  ACE_CLEANUP_FUNC cleanup_hook (void);
+  ACE_CLEANUP_FUNC cleanup_hook ();
 
-  void *param (void);
+  void *param ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
@@ -119,10 +119,10 @@ class ACE_Export ACE_OS_Exit_Info
 {
 public:
   /// Default constructor.
-  ACE_OS_Exit_Info (void);
+  ACE_OS_Exit_Info ();
 
   /// Destructor.
-  ~ACE_OS_Exit_Info (void);
+  ~ACE_OS_Exit_Info ();
 
   /// Use to register a cleanup hook.
   int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param, const char* name = 0);
@@ -146,7 +146,6 @@ private:
   ACE_Cleanup_Info_Node_List registered_objects_;
 };
 
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 # if defined (ACE_HAS_INLINED_OSCALLS)
diff --git a/ACE/ace/Cleanup.inl b/ACE/ace/Cleanup.inl
index fdae3412f65..44b8ce91d22 100644
--- a/ACE/ace/Cleanup.inl
+++ b/ACE/ace/Cleanup.inl
@@ -2,24 +2,24 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Cleanup::ACE_Cleanup (void)
+ACE_Cleanup::ACE_Cleanup ()
 {
 }
 
 ACE_INLINE void*
-ACE_Cleanup_Info_Node::object(void)
+ACE_Cleanup_Info_Node::object()
 {
   return this->object_;
 }
 
 ACE_INLINE ACE_CLEANUP_FUNC
-ACE_Cleanup_Info_Node::cleanup_hook (void)
+ACE_Cleanup_Info_Node::cleanup_hook ()
 {
   return this->cleanup_hook_;
 }
 
 ACE_INLINE void *
-ACE_Cleanup_Info_Node::param (void)
+ACE_Cleanup_Info_Node::param ()
 {
   return this->param_;
 }
diff --git a/ACE/ace/Codeset_IBM1047.cpp b/ACE/ace/Codeset_IBM1047.cpp
index edfd2bab4df..014a833ec1f 100644
--- a/ACE/ace/Codeset_IBM1047.cpp
+++ b/ACE/ace/Codeset_IBM1047.cpp
@@ -123,7 +123,6 @@ ACE_CDR::Boolean
 ACE_IBM1047_ISO8859::read_string (ACE_InputCDR& in,
                                   std::string & x)
 {
-#if defined (ACE_HAS_CPP11)
   ACE_CDR::ULong len;
 
   in.read_ulong (len);
@@ -150,9 +149,6 @@ ACE_IBM1047_ISO8859::read_string (ACE_InputCDR& in,
 
   x.clear ();
   return false;
-#else
-  return this->ACE_Char_Codeset_Translator::read_string (in, x);
-#endif
 }
 
 ACE_CDR::Boolean
@@ -276,7 +272,6 @@ ACE_CDR::Boolean
 ACE_ISO8859_IBM1047::read_string (ACE_InputCDR& in,
                                   std::string & x)
 {
-#if defined (ACE_HAS_CPP11)
   ACE_CDR::ULong len;
 
   in.read_ulong (len);
@@ -303,9 +298,6 @@ ACE_ISO8859_IBM1047::read_string (ACE_InputCDR& in,
 
   x.clear ();
   return false;
-#else
-  return this->ACE_Char_Codeset_Translator::read_string (in, x);
-#endif
 }
 
 ACE_CDR::Boolean
diff --git a/ACE/ace/Codeset_Registry.h b/ACE/ace/Codeset_Registry.h
index 8fc9944c829..6774984d3b3 100644
--- a/ACE/ace/Codeset_Registry.h
+++ b/ACE/ace/Codeset_Registry.h
@@ -6,7 +6,7 @@
  * ACE wrapper around access functions for the OSF's DCE codeset registry
  * access functions
  *
- * For environments that intrinsicly support the DCE defined access functions,
+ * For environments that intrinsically support the DCE defined access functions,
  * the methods in this class are simply wrappers. On other platforms, emulation
  * is provided. The motivation for this class is to support interoperability
  * via translators and the CDR streams, primarily in TAO, but this capability
diff --git a/ACE/ace/Condition_Attributes.h b/ACE/ace/Condition_Attributes.h
index 06b2676d8ae..b678536da34 100644
--- a/ACE/ace/Condition_Attributes.h
+++ b/ACE/ace/Condition_Attributes.h
@@ -31,10 +31,10 @@ public:
   ACE_Condition_Attributes (int type = ACE_DEFAULT_SYNCH_TYPE);
 
   /// Destructor
-  ~ACE_Condition_Attributes (void);
+  ~ACE_Condition_Attributes ();
 
   /// Accessor for retrieving the current attributes
-  const ACE_condattr_t& attributes (void) const;
+  const ACE_condattr_t& attributes () const;
 
 protected:
   /// The attributes
@@ -56,7 +56,7 @@ public:
   {}
 
   /// Destructor
-  ~ACE_Condition_Attributes_T (void) {}
+  ~ACE_Condition_Attributes_T () {}
 
 private:
   // = Prevent assignment and initialization.
@@ -75,7 +75,7 @@ public:
   ACE_Condition_Attributes_T (int type = ACE_DEFAULT_SYNCH_TYPE);
 
   /// Destructor
-  ~ACE_Condition_Attributes_T (void);
+  ~ACE_Condition_Attributes_T ();
 
 private:
   // = Prevent assignment and initialization.
diff --git a/ACE/ace/Condition_Attributes.inl b/ACE/ace/Condition_Attributes.inl
index f63106ad4e0..4fb4f788b3e 100644
--- a/ACE/ace/Condition_Attributes.inl
+++ b/ACE/ace/Condition_Attributes.inl
@@ -8,14 +8,14 @@ ACE_Condition_Attributes::ACE_Condition_Attributes (int type)
 }
 
 ACE_INLINE
-ACE_Condition_Attributes::~ACE_Condition_Attributes (void)
+ACE_Condition_Attributes::~ACE_Condition_Attributes ()
 {
   ACE_OS::condattr_destroy (this->attributes_);
 }
 
 ACE_INLINE
 const ACE_condattr_t&
-ACE_Condition_Attributes::attributes (void) const
+ACE_Condition_Attributes::attributes () const
 {
   return this->attributes_;
 }
@@ -30,7 +30,7 @@ ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::ACE_Condition_Attributes_
 }
 
 ACE_INLINE
-ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::~ACE_Condition_Attributes_T (void)
+ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::~ACE_Condition_Attributes_T ()
 {
 }
 
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
index e7a23dfe756..73e60ef7d20 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -17,13 +17,13 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void)
+ACE_Condition<ACE_Recursive_Thread_Mutex>::remove ()
 {
   return ACE_OS::cond_destroy (&this->cond_);
 }
 
 void
-ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
+ACE_Condition<ACE_Recursive_Thread_Mutex>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition<MUTEX>::dump");
@@ -37,7 +37,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Condition<ACE_Recursive_Thread_Mutex>::~ACE_Condition (void)
+ACE_Condition<ACE_Recursive_Thread_Mutex>::~ACE_Condition ()
 {
   this->remove ();
 }
@@ -109,19 +109,19 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (ACE_Recursive_Thread_Mutex &mut
 }
 
 int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::signal (void)
+ACE_Condition<ACE_Recursive_Thread_Mutex>::signal ()
 {
   return ACE_OS::cond_signal (&this->cond_);
 }
 
 int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast (void)
+ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast ()
 {
   return ACE_OS::cond_broadcast (&this->cond_);
 }
 
 ACE_Recursive_Thread_Mutex &
-ACE_Condition<ACE_Recursive_Thread_Mutex>::mutex (void)
+ACE_Condition<ACE_Recursive_Thread_Mutex>::mutex ()
 {
   return this->mutex_;
 }
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h
index f53ab12ebfd..816f08c7f2c 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.h
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.h
@@ -46,14 +46,14 @@ public:
                  const ACE_Condition_Attributes &attributes);
 
   /// Implicitly destroy the condition variable.
-  ~ACE_Condition (void);
+  ~ACE_Condition ();
 
   /**
    * Explicitly destroy the condition variable.  Note that only one
    * thread should call this method since it doesn't protect against
    * race conditions.
    */
-  int remove (void);
+  int remove ();
 
   /**
    * Block on condition, or until absolute time-of-day has passed.  If
@@ -75,16 +75,16 @@ public:
             const ACE_Time_Value *abstime = 0);
 
   /// Signal one waiting thread.
-  int signal (void);
+  int signal ();
 
   /// Signal *all* waiting threads.
-  int broadcast (void);
+  int broadcast ();
 
   /// Returns a reference to the underlying mutex;
-  ACE_Recursive_Thread_Mutex &mutex (void);
+  ACE_Recursive_Thread_Mutex &mutex ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 private:
   // = Prevent assignment and copying.
diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp
index 7f6b16737f0..3c16a20201f 100644
--- a/ACE/ace/Condition_T.cpp
+++ b/ACE/ace/Condition_T.cpp
@@ -25,7 +25,7 @@ ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Condition)
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Thread_Condition)
 
 template <class MUTEX> void
-ACE_Condition<MUTEX>::dump (void) const
+ACE_Condition<MUTEX>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition<MUTEX>::dump");
@@ -46,7 +46,7 @@ ACE_Thread_Condition<MUTEX>::ACE_Thread_Condition (MUTEX &m,
 }
 
 template <class MUTEX> void
-ACE_Thread_Condition<MUTEX>::dump (void) const
+ACE_Thread_Condition<MUTEX>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Condition<MUTEX>::dump");
@@ -91,7 +91,7 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m,
 }
 
 template <class MUTEX>
-ACE_Condition<MUTEX>::~ACE_Condition (void)
+ACE_Condition<MUTEX>::~ACE_Condition ()
 {
   // ACE_TRACE ("ACE_Condition<MUTEX>::~ACE_Condition");
 
@@ -102,7 +102,7 @@ ACE_Condition<MUTEX>::~ACE_Condition (void)
 }
 
 template <class MUTEX> int
-ACE_Condition<MUTEX>::wait (void)
+ACE_Condition<MUTEX>::wait ()
 {
   // ACE_TRACE ("ACE_Condition<MUTEX>::wait");
   return ACE_OS::cond_wait (&this->cond_,
diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h
index d87d96b2dc5..0f709e4814e 100644
--- a/ACE/ace/Condition_T.h
+++ b/ACE/ace/Condition_T.h
@@ -63,7 +63,7 @@ public:
                  void *arg = 0);
 
   /// Implicitly destroy the condition variable.
-  ~ACE_Condition (void);
+  ~ACE_Condition ();
 
   // = Lock accessors.
   /**
@@ -75,7 +75,7 @@ public:
   int wait (const ACE_Time_Value *abstime);
 
   /// Block on condition.
-  int wait (void);
+  int wait ();
 
   /**
    * Block on condition or until absolute time-of-day has passed.  If
@@ -88,20 +88,20 @@ public:
   int wait (MUTEX &mutex, const ACE_Time_Value *abstime = 0);
 
   /// Signal one waiting thread.
-  int signal (void);
+  int signal ();
 
   /// Signal *all* waiting threads.
-  int broadcast (void);
+  int broadcast ();
 
   // = Utility methods.
   /// Explicitly destroy the condition variable.
-  int remove (void);
+  int remove ();
 
   /// Returns a reference to the underlying mutex_;
-  MUTEX &mutex (void);
+  MUTEX &mutex ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -143,7 +143,7 @@ public:
   ACE_Thread_Condition (MUTEX &m, const ACE_TCHAR *name = 0, void *arg = 0);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Condition_T.inl b/ACE/ace/Condition_T.inl
index dc426622988..c919464b1ad 100644
--- a/ACE/ace/Condition_T.inl
+++ b/ACE/ace/Condition_T.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class MUTEX> ACE_INLINE int
-ACE_Condition<MUTEX>::remove (void)
+ACE_Condition<MUTEX>::remove ()
 {
   // ACE_TRACE ("ACE_Condition<MUTEX>::remove");
 
@@ -25,21 +25,21 @@ ACE_Condition<MUTEX>::remove (void)
 }
 
 template<class MUTEX> ACE_INLINE MUTEX &
-ACE_Condition<MUTEX>::mutex (void)
+ACE_Condition<MUTEX>::mutex ()
 {
   // ACE_TRACE ("ACE_Condition<MUTEX>::mutex");
   return this->mutex_;
 }
 
 template <class MUTEX> ACE_INLINE int
-ACE_Condition<MUTEX>::signal (void)
+ACE_Condition<MUTEX>::signal ()
 {
 // ACE_TRACE ("ACE_Condition<MUTEX>::signal");
   return ACE_OS::cond_signal (&this->cond_);
 }
 
 template <class MUTEX> ACE_INLINE int
-ACE_Condition<MUTEX>::broadcast (void)
+ACE_Condition<MUTEX>::broadcast ()
 {
 // ACE_TRACE ("ACE_Condition<MUTEX>::broadcast");
   return ACE_OS::cond_broadcast (&this->cond_);
diff --git a/ACE/ace/Condition_Thread_Mutex.cpp b/ACE/ace/Condition_Thread_Mutex.cpp
index 7e9c505d498..fbc64708bdc 100644
--- a/ACE/ace/Condition_Thread_Mutex.cpp
+++ b/ACE/ace/Condition_Thread_Mutex.cpp
@@ -22,7 +22,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Condition<ACE_Thread_Mutex>)
 
 void
-ACE_Condition<ACE_Thread_Mutex>::dump (void) const
+ACE_Condition<ACE_Thread_Mutex>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::dump");
@@ -69,7 +69,7 @@ ACE_Condition<ACE_Thread_Mutex>::ACE_Condition (ACE_Thread_Mutex &m,
                 ACE_TEXT ("ACE_Condition<ACE_Thread_Mutex>::ACE_Condition<ACE_Thread_Mutex>")));
 }
 
-ACE_Condition<ACE_Thread_Mutex>::~ACE_Condition (void)
+ACE_Condition<ACE_Thread_Mutex>::~ACE_Condition ()
 {
 // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::~ACE_Condition<ACE_Thread_Mutex>");
   this->remove ();
@@ -80,7 +80,7 @@ ACE_Condition<ACE_Thread_Mutex>::~ACE_Condition (void)
 // <abstime> using the <cond_timedwait> function.
 
 int
-ACE_Condition<ACE_Thread_Mutex>::wait (void)
+ACE_Condition<ACE_Thread_Mutex>::wait ()
 {
 // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::wait");
   return ACE_OS::cond_wait (&this->cond_, &this->mutex_.lock ());
@@ -104,14 +104,14 @@ ACE_Condition<ACE_Thread_Mutex>::wait (const ACE_Time_Value *abstime)
 }
 
 int
-ACE_Condition<ACE_Thread_Mutex>::signal (void)
+ACE_Condition<ACE_Thread_Mutex>::signal ()
 {
 // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::signal");
   return ACE_OS::cond_signal (&this->cond_);
 }
 
 int
-ACE_Condition<ACE_Thread_Mutex>::broadcast (void)
+ACE_Condition<ACE_Thread_Mutex>::broadcast ()
 {
 // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::broadcast");
   return ACE_OS::cond_broadcast (&this->cond_);
diff --git a/ACE/ace/Condition_Thread_Mutex.h b/ACE/ace/Condition_Thread_Mutex.h
index 898e683fab6..855adcba377 100644
--- a/ACE/ace/Condition_Thread_Mutex.h
+++ b/ACE/ace/Condition_Thread_Mutex.h
@@ -65,14 +65,14 @@ public:
                  void *arg = 0);
 
   /// Implicitly destroy the condition variable.
-  ~ACE_Condition (void);
+  ~ACE_Condition ();
 
   /**
    * Explicitly destroy the condition variable.  Note that only one
    * thread should call this method since it doesn't protect against
    * race conditions.
    */
-  int remove (void);
+  int remove ();
 
   /**
    * Block on condition, or until absolute time-of-day has passed.  If
@@ -83,7 +83,7 @@ public:
   int wait (const ACE_Time_Value *abstime);
 
   /// Block on condition.
-  int wait (void);
+  int wait ();
 
   /**
    * Block on condition or until absolute time-of-day has passed.  If
@@ -96,16 +96,16 @@ public:
   int wait (ACE_Thread_Mutex &mutex, const ACE_Time_Value *abstime = 0);
 
   /// Signal one waiting thread.
-  int signal (void);
+  int signal ();
 
   /// Signal *all* waiting threads.
-  int broadcast (void);
+  int broadcast ();
 
   /// Returns a reference to the underlying mutex;
-  ACE_Thread_Mutex &mutex (void);
+  ACE_Thread_Mutex &mutex ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Condition_Thread_Mutex.inl b/ACE/ace/Condition_Thread_Mutex.inl
index 5db2808d1a3..614d9f0eb87 100644
--- a/ACE/ace/Condition_Thread_Mutex.inl
+++ b/ACE/ace/Condition_Thread_Mutex.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
-ACE_Condition<ACE_Thread_Mutex>::remove (void)
+ACE_Condition<ACE_Thread_Mutex>::remove ()
 {
 // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::remove");
 
@@ -29,7 +29,7 @@ ACE_Condition<ACE_Thread_Mutex>::remove (void)
 }
 
 ACE_INLINE ACE_Thread_Mutex &
-ACE_Condition<ACE_Thread_Mutex>::mutex (void)
+ACE_Condition<ACE_Thread_Mutex>::mutex ()
 {
 // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::mutex");
   return this->mutex_;
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
index 10b0ad2b05b..9242671776b 100644
--- a/ACE/ace/Configuration.cpp
+++ b/ACE/ace/Configuration.cpp
@@ -19,36 +19,36 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Section_Key_Internal::ACE_Section_Key_Internal (void)
+ACE_Section_Key_Internal::ACE_Section_Key_Internal ()
   : ref_count_ (0)
 {
 }
 
-ACE_Section_Key_Internal::~ACE_Section_Key_Internal (void)
+ACE_Section_Key_Internal::~ACE_Section_Key_Internal ()
 {
 }
 
 int
-ACE_Section_Key_Internal::add_ref (void)
+ACE_Section_Key_Internal::add_ref ()
 {
   ++ref_count_;
   return 0;
 }
 
 int
-ACE_Section_Key_Internal::dec_ref (void)
+ACE_Section_Key_Internal::dec_ref ()
 {
   if (!--ref_count_)
     delete this;
   return 0;
 }
 
-ACE_Configuration_Section_Key::ACE_Configuration_Section_Key (void)
+ACE_Configuration_Section_Key::ACE_Configuration_Section_Key ()
   : key_ (0)
 {
 }
 
-ACE_Configuration_Section_Key::~ACE_Configuration_Section_Key (void)
+ACE_Configuration_Section_Key::~ACE_Configuration_Section_Key ()
 {
   if (key_)
     key_->dec_ref ();
@@ -88,12 +88,12 @@ ACE_Configuration_Section_Key::operator= (const ACE_Configuration_Section_Key& r
 
 ACE_TCHAR ACE_Configuration::NULL_String_ = '\0';
 
-ACE_Configuration::ACE_Configuration (void)
+ACE_Configuration::ACE_Configuration ()
   : root_ ()
 {
 }
 
-ACE_Configuration::~ACE_Configuration (void)
+ACE_Configuration::~ACE_Configuration ()
 {
 }
 
@@ -178,7 +178,7 @@ ACE_Configuration::validate_value_name (const ACE_TCHAR* name)
 }
 
 const ACE_Configuration_Section_Key&
-ACE_Configuration::root_section (void) const
+ACE_Configuration::root_section () const
 {
   return root_;
 }
@@ -1056,7 +1056,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey,
 
 ///////////////////////////////////////////////////////////////
 
-ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId (void)
+ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId ()
   : type_ (ACE_Configuration::INVALID),
     length_ (0)
 {
@@ -1091,7 +1091,7 @@ ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId (const ACE_Configur
 {
 }
 
-ACE_Configuration_Value_IntId::~ACE_Configuration_Value_IntId (void)
+ACE_Configuration_Value_IntId::~ACE_Configuration_Value_IntId ()
 {
 }
 
@@ -1115,7 +1115,7 @@ ACE_Configuration_Value_IntId::free (ACE_Allocator *alloc)
   // Do nothing in other cases...
 }
 
-ACE_Configuration_ExtId::ACE_Configuration_ExtId (void)
+ACE_Configuration_ExtId::ACE_Configuration_ExtId ()
   : name_ (0)
 {
 }
@@ -1130,7 +1130,7 @@ ACE_Configuration_ExtId::ACE_Configuration_ExtId (const ACE_Configuration_ExtId&
 {
 }
 
-ACE_Configuration_ExtId::~ACE_Configuration_ExtId (void)
+ACE_Configuration_ExtId::~ACE_Configuration_ExtId ()
 {
 }
 
@@ -1155,7 +1155,7 @@ ACE_Configuration_ExtId::operator!= (const ACE_Configuration_ExtId& rhs) const
 }
 
 u_long
-ACE_Configuration_ExtId::hash (void) const
+ACE_Configuration_ExtId::hash () const
 {
   ACE_TString temp (name_, 0, false);
   return temp.hash ();
@@ -1169,7 +1169,7 @@ ACE_Configuration_ExtId::free (ACE_Allocator *alloc)
 
 ///////////////////////////////////////////////////////////////////////
 
-ACE_Configuration_Section_IntId::ACE_Configuration_Section_IntId (void)
+ACE_Configuration_Section_IntId::ACE_Configuration_Section_IntId ()
   : value_hash_map_ (0),
     section_hash_map_ (0)
 {
@@ -1233,7 +1233,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Configuration_Section_Key_Heap)
 
 //////////////////////////////////////////////////////////////////////////////
 
-ACE_Configuration_Heap::ACE_Configuration_Heap (void)
+ACE_Configuration_Heap::ACE_Configuration_Heap ()
   : allocator_ (0),
     index_ (0),
     default_map_size_ (0)
@@ -1244,7 +1244,7 @@ ACE_Configuration_Heap::ACE_Configuration_Heap (void)
   root_ = ACE_Configuration_Section_Key (temp);
 }
 
-ACE_Configuration_Heap::~ACE_Configuration_Heap (void)
+ACE_Configuration_Heap::~ACE_Configuration_Heap ()
 {
   if (allocator_)
     allocator_->sync ();
@@ -1314,7 +1314,7 @@ ACE_Configuration_Heap::open (const ACE_TCHAR* file_name,
 }
 
 int
-ACE_Configuration_Heap::create_index (void)
+ACE_Configuration_Heap::create_index ()
 {
   void *section_index = 0;
 
diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp
index 3b91d3226ad..a9f416cc6ec 100644
--- a/ACE/ace/Configuration_Import_Export.cpp
+++ b/ACE/ace/Configuration_Import_Export.cpp
@@ -11,7 +11,7 @@ ACE_Config_ImpExp_Base::ACE_Config_ImpExp_Base (ACE_Configuration& config)
 {
 }
 
-ACE_Config_ImpExp_Base::~ACE_Config_ImpExp_Base (void)
+ACE_Config_ImpExp_Base::~ACE_Config_ImpExp_Base ()
 {
 }
 
@@ -20,7 +20,7 @@ ACE_Registry_ImpExp::ACE_Registry_ImpExp (ACE_Configuration& config)
 {
 }
 
-ACE_Registry_ImpExp::~ACE_Registry_ImpExp (void)
+ACE_Registry_ImpExp::~ACE_Registry_ImpExp ()
 {
 }
 
@@ -468,7 +468,7 @@ ACE_Ini_ImpExp::ACE_Ini_ImpExp (ACE_Configuration& config)
 {
 }
 
-ACE_Ini_ImpExp::~ACE_Ini_ImpExp (void)
+ACE_Ini_ImpExp::~ACE_Ini_ImpExp ()
 {
 }
 
diff --git a/ACE/ace/Connection_Recycling_Strategy.cpp b/ACE/ace/Connection_Recycling_Strategy.cpp
index b5619a67491..19ea7fa7357 100644
--- a/ACE/ace/Connection_Recycling_Strategy.cpp
+++ b/ACE/ace/Connection_Recycling_Strategy.cpp
@@ -2,11 +2,11 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy (void)
+ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy ()
 {
 }
 
-ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void)
+ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy ()
 {
 }
 
diff --git a/ACE/ace/Connection_Recycling_Strategy.h b/ACE/ace/Connection_Recycling_Strategy.h
index 763c7e548c1..4b3f1238be2 100644
--- a/ACE/ace/Connection_Recycling_Strategy.h
+++ b/ACE/ace/Connection_Recycling_Strategy.h
@@ -27,10 +27,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Connection_Recycling_Strategy
 {
 public:
-  ACE_Connection_Recycling_Strategy (void);
+  ACE_Connection_Recycling_Strategy ();
 
   /// Virtual Destructor
-  virtual ~ACE_Connection_Recycling_Strategy (void);
+  virtual ~ACE_Connection_Recycling_Strategy ();
 
   /// Remove from cache.
   virtual int purge (const void *recycling_act) = 0;
diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp
index 2464a0a2a6e..5c2bd164acc 100644
--- a/ACE/ace/Connector.cpp
+++ b/ACE/ace/Connector.cpp
@@ -338,8 +338,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::open (ACE_Reactor *r, int flags)
 }
 
 template <typename SVC_HANDLER, typename PEER_CONNECTOR>
-ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Connector (ACE_Reactor *r,
-                                                                 int flags)
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Connector (ACE_Reactor *r, int flags)
 {
   ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Connector");
   (void) this->open (r, flags);
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index 85ee6894fc5..b342fe1180f 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -116,7 +116,7 @@ public:
   virtual int resume_handler (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -276,7 +276,7 @@ public:
   virtual ACE_Reactor *reactor (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Containers.h b/ACE/ace/Containers.h
index 4d671ca9808..8ba4c3c84a6 100644
--- a/ACE/ace/Containers.h
+++ b/ACE/ace/Containers.h
@@ -53,7 +53,7 @@ public:
   ACE_DLList_Node *prev_;
 
 protected:
-  ACE_DLList_Node (void);
+  ACE_DLList_Node ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Containers.inl b/ACE/ace/Containers.inl
index cd7507d403b..ed3e183a370 100644
--- a/ACE/ace/Containers.inl
+++ b/ACE/ace/Containers.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_DLList_Node::ACE_DLList_Node (void)
+ACE_DLList_Node::ACE_DLList_Node ()
   : item_ (0),
     next_ (0),
     prev_ (0)
diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp
index 4fa39569b46..2c69a6b0c6e 100644
--- a/ACE/ace/Containers_T.cpp
+++ b/ACE/ace/Containers_T.cpp
@@ -20,7 +20,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Bounded_Stack)
 
 template <class T> void
-ACE_Bounded_Stack<T>::dump (void) const
+ACE_Bounded_Stack<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Bounded_Stack<T>::dump");
@@ -73,7 +73,7 @@ ACE_Bounded_Stack<T>::operator= (const ACE_Bounded_Stack<T> &s)
 }
 
 template<class T>
-ACE_Bounded_Stack<T>::~ACE_Bounded_Stack (void)
+ACE_Bounded_Stack<T>::~ACE_Bounded_Stack ()
 {
   ACE_TRACE ("ACE_Bounded_Stack<T>::~ACE_Bounded_Stack");
   delete [] this->stack_;
@@ -84,7 +84,7 @@ ACE_Bounded_Stack<T>::~ACE_Bounded_Stack (void)
 ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Stack)
 
 template <class T, size_t ACE_SIZE> void
-ACE_Fixed_Stack<T, ACE_SIZE>::dump (void) const
+ACE_Fixed_Stack<T, ACE_SIZE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::dump");
@@ -92,7 +92,7 @@ ACE_Fixed_Stack<T, ACE_SIZE>::dump (void) const
 }
 
 template<class T, size_t ACE_SIZE>
-ACE_Fixed_Stack<T, ACE_SIZE>::ACE_Fixed_Stack (void)
+ACE_Fixed_Stack<T, ACE_SIZE>::ACE_Fixed_Stack ()
   : size_ (ACE_SIZE),
     top_ (0)
 {
@@ -124,7 +124,7 @@ ACE_Fixed_Stack<T, ACE_SIZE>::operator= (const ACE_Fixed_Stack<T, ACE_SIZE> &s)
 }
 
 template<class T, size_t ACE_SIZE>
-ACE_Fixed_Stack<T, ACE_SIZE>::~ACE_Fixed_Stack (void)
+ACE_Fixed_Stack<T, ACE_SIZE>::~ACE_Fixed_Stack ()
 {
   ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::~ACE_Fixed_Stack");
 }
@@ -134,7 +134,7 @@ ACE_Fixed_Stack<T, ACE_SIZE>::~ACE_Fixed_Stack (void)
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Unbounded_Stack)
 
 template <class T> void
-ACE_Unbounded_Stack<T>::dump (void) const
+ACE_Unbounded_Stack<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   //  ACE_TRACE ("ACE_Unbounded_Stack<T>::dump");
@@ -158,7 +158,7 @@ ACE_Unbounded_Stack<T>::ACE_Unbounded_Stack (ACE_Allocator *alloc)
 }
 
 template<class T> void
-ACE_Unbounded_Stack<T>::delete_all_nodes (void)
+ACE_Unbounded_Stack<T>::delete_all_nodes ()
 {
   //  ACE_TRACE ("ACE_Unbounded_Stack<T>::delete_all_nodes");
 
@@ -229,7 +229,7 @@ ACE_Unbounded_Stack<T>::operator= (const ACE_Unbounded_Stack<T> &s)
 }
 
 template<class T>
-ACE_Unbounded_Stack<T>::~ACE_Unbounded_Stack (void)
+ACE_Unbounded_Stack<T>::~ACE_Unbounded_Stack ()
 {
   //  ACE_TRACE ("ACE_Unbounded_Stack<T>::~ACE_Unbounded_Stack");
 
@@ -356,7 +356,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::ACE_Double_Linked_List_Iterator_Base (c
 
 
 template <class T> T *
-ACE_Double_Linked_List_Iterator_Base<T>::next (void) const
+ACE_Double_Linked_List_Iterator_Base<T>::next () const
 {
   return this->not_done ();
 }
@@ -370,13 +370,13 @@ ACE_Double_Linked_List_Iterator_Base<T>::next (T *&ptr) const
 
 
 template <class T> int
-ACE_Double_Linked_List_Iterator_Base<T>::done (void) const
+ACE_Double_Linked_List_Iterator_Base<T>::done () const
 {
   return this->not_done () ? 0 : 1;
 }
 
 template <class T> T &
-ACE_Double_Linked_List_Iterator_Base<T>::operator* (void) const
+ACE_Double_Linked_List_Iterator_Base<T>::operator* () const
 {
   return *(this->not_done ());
 }
@@ -391,21 +391,21 @@ ACE_Double_Linked_List_Iterator_Base<T>::reset (ACE_Double_Linked_List<T> &dll)
 }
 
  template <class T> int
-ACE_Double_Linked_List_Iterator_Base<T>::go_head (void)
+ACE_Double_Linked_List_Iterator_Base<T>::go_head ()
 {
   this->current_ = static_cast<T*> (dllist_->head_->next_);
   return this->current_ ? 1 : 0;
 }
 
 template <class T> int
-ACE_Double_Linked_List_Iterator_Base<T>::go_tail (void)
+ACE_Double_Linked_List_Iterator_Base<T>::go_tail ()
 {
   this->current_ = static_cast<T*> (dllist_->head_->prev_);
   return this->current_ ? 1 : 0;
 }
 
 template <class T> T *
-ACE_Double_Linked_List_Iterator_Base<T>::not_done (void) const
+ACE_Double_Linked_List_Iterator_Base<T>::not_done () const
 {
   if (this->current_ != this->dllist_->head_)
     return this->current_;
@@ -414,7 +414,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::not_done (void) const
 }
 
 template <class T> T *
-ACE_Double_Linked_List_Iterator_Base<T>::do_advance (void)
+ACE_Double_Linked_List_Iterator_Base<T>::do_advance ()
 {
   if (this->not_done ())
     {
@@ -426,7 +426,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::do_advance (void)
 }
 
 template <class T> T *
-ACE_Double_Linked_List_Iterator_Base<T>::do_retreat (void)
+ACE_Double_Linked_List_Iterator_Base<T>::do_retreat ()
 {
   if (this->not_done ())
     {
@@ -438,7 +438,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::do_retreat (void)
 }
 
 template <class T> void
-ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const
+ACE_Double_Linked_List_Iterator_Base<T>::dump_i () const
 {
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("current_ = %x"), this->current_));
@@ -467,13 +467,13 @@ ACE_Double_Linked_List_Iterator<T>::reset (ACE_Double_Linked_List<T> &dll)
 }
 
 template <class T> int
-ACE_Double_Linked_List_Iterator<T>::first (void)
+ACE_Double_Linked_List_Iterator<T>::first ()
 {
   return this->go_head ();
 }
 
 template <class T> int
-ACE_Double_Linked_List_Iterator<T>::advance (void)
+ACE_Double_Linked_List_Iterator<T>::advance ()
 {
   return this->do_advance () ? 1 : 0;
 }
@@ -497,7 +497,7 @@ ACE_Double_Linked_List_Iterator<T>::advance_and_remove (bool dont_remove)
 }
 
 template <class T> void
-ACE_Double_Linked_List_Iterator<T>::dump (void) const
+ACE_Double_Linked_List_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->dump_i ();
@@ -508,7 +508,7 @@ ACE_Double_Linked_List_Iterator<T>::dump (void) const
 
 template <class T>
 ACE_Double_Linked_List_Iterator<T> &
-ACE_Double_Linked_List_Iterator<T>::operator++ (void)
+ACE_Double_Linked_List_Iterator<T>::operator++ ()
 {
   this->do_advance ();
   return *this;
@@ -531,7 +531,7 @@ ACE_Double_Linked_List_Iterator<T>::operator++ (int)
 
 template <class T>
 ACE_Double_Linked_List_Iterator<T> &
-ACE_Double_Linked_List_Iterator<T>::operator-- (void)
+ACE_Double_Linked_List_Iterator<T>::operator-- ()
 {
   this->do_retreat ();
   return *this;
@@ -572,13 +572,13 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::reset (ACE_Double_Linked_List<T> &dl
 }
 
 template <class T> int
-ACE_Double_Linked_List_Reverse_Iterator<T>::first (void)
+ACE_Double_Linked_List_Reverse_Iterator<T>::first ()
 {
   return this->go_tail ();
 }
 
 template <class T> int
-ACE_Double_Linked_List_Reverse_Iterator<T>::advance (void)
+ACE_Double_Linked_List_Reverse_Iterator<T>::advance ()
 {
   return this->do_retreat () ? 1 : 0;
 }
@@ -604,7 +604,7 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::advance_and_remove (bool dont_remove
 }
 
 template <class T> void
-ACE_Double_Linked_List_Reverse_Iterator<T>::dump (void) const
+ACE_Double_Linked_List_Reverse_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->dump_i ();
@@ -615,7 +615,7 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::dump (void) const
 
 template <class T>
 ACE_Double_Linked_List_Reverse_Iterator<T> &
-ACE_Double_Linked_List_Reverse_Iterator<T>::operator++ (void)
+ACE_Double_Linked_List_Reverse_Iterator<T>::operator++ ()
 {
   this->do_retreat ();
   return *this;
@@ -638,7 +638,7 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::operator++ (int)
 
 template <class T>
 ACE_Double_Linked_List_Reverse_Iterator<T> &
-ACE_Double_Linked_List_Reverse_Iterator<T>::operator-- (void)
+ACE_Double_Linked_List_Reverse_Iterator<T>::operator-- ()
 {
   this->do_advance ();
   return *this;
@@ -698,7 +698,7 @@ ACE_Double_Linked_List<T>::operator= (const ACE_Double_Linked_List<T> &cx)
 }
 
 template <class T>
-ACE_Double_Linked_List<T>::~ACE_Double_Linked_List (void)
+ACE_Double_Linked_List<T>::~ACE_Double_Linked_List ()
 {
   this->delete_nodes ();
 
@@ -710,13 +710,13 @@ ACE_Double_Linked_List<T>::~ACE_Double_Linked_List (void)
 }
 
 template <class T> int
-ACE_Double_Linked_List<T>::is_empty (void) const
+ACE_Double_Linked_List<T>::is_empty () const
 {
   return this->size () ? 0 : 1;
 }
 
 template <class T> int
-ACE_Double_Linked_List<T>::is_full (void) const
+ACE_Double_Linked_List<T>::is_full () const
 {
   return 0;                     // We have no bound.
 }
@@ -737,7 +737,7 @@ ACE_Double_Linked_List<T>::insert_head (T *new_item)
 }
 
 template <class T> T *
-ACE_Double_Linked_List<T>::delete_head (void)
+ACE_Double_Linked_List<T>::delete_head ()
 {
   if (this->is_empty ())
     return 0;
@@ -749,7 +749,7 @@ ACE_Double_Linked_List<T>::delete_head (void)
 }
 
 template <class T> T *
-ACE_Double_Linked_List<T>::delete_tail (void)
+ACE_Double_Linked_List<T>::delete_tail ()
 {
   if (this->is_empty ())
     return 0;
@@ -761,7 +761,7 @@ ACE_Double_Linked_List<T>::delete_tail (void)
 }
 
 template <class T> void
-ACE_Double_Linked_List<T>::reset (void)
+ACE_Double_Linked_List<T>::reset ()
 {
   this->delete_nodes ();
 }
@@ -781,13 +781,13 @@ ACE_Double_Linked_List<T>::get (T *&item, size_t slot)
 }
 
 template <class T> size_t
-ACE_Double_Linked_List<T>::size (void) const
+ACE_Double_Linked_List<T>::size () const
 {
   return this->size_;
 }
 
 template <class T> void
-ACE_Double_Linked_List<T>::dump (void) const
+ACE_Double_Linked_List<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // Dump the state of an object.
@@ -801,7 +801,7 @@ ACE_Double_Linked_List<T>::remove (T *n)
 }
 
 template <class T> void
-ACE_Double_Linked_List<T>::delete_nodes (void)
+ACE_Double_Linked_List<T>::delete_nodes ()
 {
   while (! this->is_empty ())
     {
@@ -829,7 +829,7 @@ ACE_Double_Linked_List<T>::copy_nodes (const ACE_Double_Linked_List<T> &c)
 }
 
 template <class T> void
-ACE_Double_Linked_List<T>::init_head (void)
+ACE_Double_Linked_List<T>::init_head ()
 {
   this->head_->next_ = this->head_;
   this->head_->prev_ = this->head_;
@@ -875,14 +875,14 @@ ACE_Double_Linked_List<T>::remove_element (T *item)
 ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Set)
 
 template <class T, size_t ACE_SIZE> size_t
-ACE_Fixed_Set<T, ACE_SIZE>::size (void) const
+ACE_Fixed_Set<T, ACE_SIZE>::size () const
 {
   ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::size");
   return this->cur_size_;
 }
 
 template <class T, size_t ACE_SIZE> void
-ACE_Fixed_Set<T, ACE_SIZE>::dump (void) const
+ACE_Fixed_Set<T, ACE_SIZE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::dump");
@@ -890,7 +890,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::dump (void) const
 }
 
 template <class T, size_t ACE_SIZE>
-ACE_Fixed_Set<T, ACE_SIZE>::~ACE_Fixed_Set (void)
+ACE_Fixed_Set<T, ACE_SIZE>::~ACE_Fixed_Set ()
 {
   ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::~ACE_Fixed_Set");
   this->cur_size_ = 0;
@@ -923,7 +923,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::operator= (const ACE_Fixed_Set<T, ACE_SIZE> &fs)
 }
 
 template <class T, size_t ACE_SIZE>
-ACE_Fixed_Set<T, ACE_SIZE>::ACE_Fixed_Set (void)
+ACE_Fixed_Set<T, ACE_SIZE>::ACE_Fixed_Set ()
   : cur_size_ (0),
     max_size_ (ACE_SIZE)
 {
@@ -1014,7 +1014,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::remove (const T &item)
 ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Set_Iterator_Base)
 
 template <class T, size_t ACE_SIZE> void
-ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::dump_i (void) const
+ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::dump_i () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::dump_i");
@@ -1032,7 +1032,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::ACE_Fixed_Set_Iterator_Base (ACE_Fixed
 }
 
 template <class T, size_t ACE_SIZE> int
-ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance (void)
+ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance ()
 {
   ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance");
 
@@ -1054,7 +1054,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance (void)
 }
 
 template <class T, size_t ACE_SIZE> int
-ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::first (void)
+ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::first ()
 {
   ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::first");
 
@@ -1064,7 +1064,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::first (void)
 }
 
 template <class T, size_t ACE_SIZE> int
-ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::done (void) const
+ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::done () const
 {
   ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::done");
 
@@ -1095,7 +1095,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::next_i (T *&item)
 ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Set_Iterator)
 
 template <class T, size_t ACE_SIZE> void
-ACE_Fixed_Set_Iterator<T, ACE_SIZE>::dump (void) const
+ACE_Fixed_Set_Iterator<T, ACE_SIZE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->dump_i ();
@@ -1133,7 +1133,7 @@ ACE_Fixed_Set_Iterator<T, ACE_SIZE>::remove (T *&item)
 }
 
 template <class T, size_t ACE_SIZE> T&
-ACE_Fixed_Set_Iterator<T, ACE_SIZE>::operator* (void)
+ACE_Fixed_Set_Iterator<T, ACE_SIZE>::operator* ()
 {
   T *retv = 0;
 
@@ -1149,7 +1149,7 @@ ACE_Fixed_Set_Iterator<T, ACE_SIZE>::operator* (void)
 ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Set_Const_Iterator)
 
 template <class T, size_t ACE_SIZE> void
-ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::dump (void) const
+ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->dump_i ();
@@ -1172,7 +1172,7 @@ ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::next (const T *&item)
 }
 
 template <class T, size_t ACE_SIZE> const T&
-ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::operator* (void) const
+ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::operator* () const
 {
   const T *retv = 0;
 
@@ -1188,7 +1188,7 @@ ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::operator* (void) const
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Bounded_Set)
 
 template <class T> void
-ACE_Bounded_Set<T>::dump (void) const
+ACE_Bounded_Set<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Bounded_Set<T>::dump");
@@ -1196,14 +1196,14 @@ ACE_Bounded_Set<T>::dump (void) const
 }
 
 template <class T>
-ACE_Bounded_Set<T>::~ACE_Bounded_Set (void)
+ACE_Bounded_Set<T>::~ACE_Bounded_Set ()
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::~ACE_Bounded_Set");
   delete [] this->search_structure_;
 }
 
 template <class T>
-ACE_Bounded_Set<T>::ACE_Bounded_Set (void)
+ACE_Bounded_Set<T>::ACE_Bounded_Set ()
   : cur_size_ (0),
     max_size_ (static_cast<size_t> (ACE_Bounded_Set<T>::DEFAULT_SIZE))
 {
@@ -1217,7 +1217,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (void)
 }
 
 template <class T> size_t
-ACE_Bounded_Set<T>::size (void) const
+ACE_Bounded_Set<T>::size () const
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::size");
   return this->cur_size_;
@@ -1352,7 +1352,7 @@ ACE_Bounded_Set<T>::remove (const T &item)
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Bounded_Set_Iterator)
 
   template <class T> void
-ACE_Bounded_Set_Iterator<T>::dump (void) const
+ACE_Bounded_Set_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::dump");
@@ -1369,7 +1369,7 @@ ACE_Bounded_Set_Iterator<T>::ACE_Bounded_Set_Iterator (ACE_Bounded_Set<T> &s)
 }
 
 template <class T> int
-ACE_Bounded_Set_Iterator<T>::advance (void)
+ACE_Bounded_Set_Iterator<T>::advance ()
 {
   ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::advance");
 
@@ -1383,7 +1383,7 @@ ACE_Bounded_Set_Iterator<T>::advance (void)
 }
 
 template <class T> int
-ACE_Bounded_Set_Iterator<T>::first (void)
+ACE_Bounded_Set_Iterator<T>::first ()
 {
   ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::first");
 
@@ -1392,7 +1392,7 @@ ACE_Bounded_Set_Iterator<T>::first (void)
 }
 
 template <class T> int
-ACE_Bounded_Set_Iterator<T>::done (void) const
+ACE_Bounded_Set_Iterator<T>::done () const
 {
   ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::done");
 
@@ -1422,14 +1422,14 @@ ACE_DNode<T>::ACE_DNode (const T &i, ACE_DNode<T> *n, ACE_DNode<T> *p)
 }
 
 template <class T>
-ACE_DNode<T>::~ACE_DNode (void)
+ACE_DNode<T>::~ACE_DNode ()
 {
 }
 
 // ****************************************************************
 
 template <class T> void
-ACE_Unbounded_Stack_Iterator<T>::dump (void) const
+ACE_Unbounded_Stack_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::dump");
@@ -1445,7 +1445,7 @@ ACE_Unbounded_Stack_Iterator<T>::ACE_Unbounded_Stack_Iterator (ACE_Unbounded_Sta
 }
 
 template <class T> int
-ACE_Unbounded_Stack_Iterator<T>::advance (void)
+ACE_Unbounded_Stack_Iterator<T>::advance ()
 {
   // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::advance");
   this->current_ = this->current_->next_;
@@ -1453,7 +1453,7 @@ ACE_Unbounded_Stack_Iterator<T>::advance (void)
 }
 
 template <class T> int
-ACE_Unbounded_Stack_Iterator<T>::first (void)
+ACE_Unbounded_Stack_Iterator<T>::first ()
 {
   // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::first");
   this->current_ = this->stack_.head_->next_;
@@ -1461,7 +1461,7 @@ ACE_Unbounded_Stack_Iterator<T>::first (void)
 }
 
 template <class T> int
-ACE_Unbounded_Stack_Iterator<T>::done (void) const
+ACE_Unbounded_Stack_Iterator<T>::done () const
 {
   ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::done");
 
@@ -1513,7 +1513,7 @@ ACE_Ordered_MultiSet<T>::ACE_Ordered_MultiSet (const ACE_Ordered_MultiSet<T> &us
 }
 
 template <class T>
-ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet (void)
+ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet ()
 {
   // ACE_TRACE ("ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet");
 
@@ -1606,7 +1606,7 @@ ACE_Ordered_MultiSet<T>::find (const T &item,
 
 
 template <class T> void
-ACE_Ordered_MultiSet<T>::reset (void)
+ACE_Ordered_MultiSet<T>::reset ()
 {
   ACE_TRACE ("reset");
 
@@ -1614,7 +1614,7 @@ ACE_Ordered_MultiSet<T>::reset (void)
 }
 
 template <class T> void
-ACE_Ordered_MultiSet<T>::dump (void) const
+ACE_Ordered_MultiSet<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   //  ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump");
@@ -1769,7 +1769,7 @@ ACE_Ordered_MultiSet<T>::copy_nodes (const ACE_Ordered_MultiSet<T> &us)
 }
 
 template <class T> void
-ACE_Ordered_MultiSet<T>::delete_nodes (void)
+ACE_Ordered_MultiSet<T>::delete_nodes ()
 {
   // iterate through list, deleting nodes
   for (ACE_DNode<T> *curr = this->head_;
@@ -1813,7 +1813,7 @@ ACE_Ordered_MultiSet_Iterator<T>::next (T *&item) const
 }
 
 template <class T> T&
-ACE_Ordered_MultiSet_Iterator<T>::operator* (void)
+ACE_Ordered_MultiSet_Iterator<T>::operator* ()
 {
   //ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::operator*");
   T *retv = 0;
@@ -1849,7 +1849,7 @@ ACE_DLList<T>::insert_head (T *new_item)
 }
 
 template <class T> T *
-ACE_DLList<T>::delete_head (void)
+ACE_DLList<T>::delete_head ()
 {
   ACE_DLList_Node *temp1 = ACE_DLList_Base::delete_head ();
   T *temp2 = (T *) (temp1 ? temp1->item_ : 0);
@@ -1861,7 +1861,7 @@ ACE_DLList<T>::delete_head (void)
 }
 
 template <class T> T *
-ACE_DLList<T>::delete_tail (void)
+ACE_DLList<T>::delete_tail ()
 {
   ACE_DLList_Node *temp1 = ACE_DLList_Base::delete_tail ();
   T *temp2 = (T *) (temp1 ? temp1->item_ : 0);
diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h
index 90a967b6f6b..5cbbca05813 100644
--- a/ACE/ace/Containers_T.h
+++ b/ACE/ace/Containers_T.h
@@ -103,7 +103,7 @@ public:
   /**
    * Deallocate the memory used by the Bounded_Stack.
    */
-  ~ACE_Bounded_Stack (void);
+  ~ACE_Bounded_Stack ();
 
   // = Classic Stack operations.
 
@@ -137,22 +137,22 @@ public:
   /**
    * Performs constant time check to determine if the stack is empty.
    */
-  int is_empty (void) const;
+  int is_empty () const;
 
   /// Returns 1 if the container is full, otherwise returns 0.
   /**
    * Performs constant time check to determine if the stack is at capacity.
    */
-  int is_full (void) const;
+  int is_full () const;
 
   /// The number of items in the stack.
   /**
    * Return the number of items currently in the stack.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -210,7 +210,7 @@ public:
   /**
    * Initialize an empty stack.
    */
-  ACE_Fixed_Stack (void);
+  ACE_Fixed_Stack ();
 
   /// The copy constructor (performs initialization).
   /**
@@ -228,7 +228,7 @@ public:
   /**
    * Destroy the stack.
    */
-  ~ACE_Fixed_Stack (void);
+  ~ACE_Fixed_Stack ();
 
   // = Classic Stack operations.
 
@@ -262,22 +262,22 @@ public:
   /**
    * Performs constant time check to see if stack is empty.
    */
-  int is_empty (void) const;
+  int is_empty () const;
 
   /// Returns 1 if the container is full, otherwise returns 0.
   /**
    * Performs constant time check to see if stack is full.
    */
-  int is_full (void) const;
+  int is_full () const;
 
   /// The number of items in the stack.
   /**
    * Constant time access to the current size of the stack.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -311,7 +311,7 @@ class ACE_DNode
 
 public:
   /// This isn't necessary, but it keeps some compilers happy.
-  ~ACE_DNode (void);
+  ~ACE_DNode ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -399,7 +399,7 @@ public:
   /**
    * Destroy the underlying list for the stack.
    */
-  ~ACE_Unbounded_Stack (void);
+  ~ACE_Unbounded_Stack ();
 
   // = Classic Stack operations.
 
@@ -434,13 +434,13 @@ public:
   /**
    * Constant time check to see if the stack is empty.
    */
-  int is_empty (void) const;
+  int is_empty () const;
 
   /// Returns 1 if the container is full, otherwise returns 0.
   /**
    * Always resturns 0 since the stack is unbounded.
    */
-  int is_full (void) const;
+  int is_full () const;
 
   // = Auxiliary methods (not strictly part of the Stack ADT).
 
@@ -469,17 +469,17 @@ public:
   /**
    * Constant time access to the current stack size.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
   /// Delete all the nodes in the stack.
-  void delete_all_nodes (void);
+  void delete_all_nodes ();
 
   /// Copy all nodes from {s} to {this}.
   void copy_all_nodes (const ACE_Unbounded_Stack<T> &s);
@@ -514,17 +514,17 @@ public:
 
   /// Move forward by one element in the Stack.  Returns 0 when all the
   /// items in the Stack have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the Stack.  Returns 0 if the
   /// Stack is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -560,14 +560,14 @@ public:
    * @deprecated Return the address of next (current) unvisited item in
    * the list. 0 if there is no more element available.
    */
-  T *next (void) const;
+  T *next () const;
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// STL-like iterator dereference operator: returns a reference
   /// to the node underneath the iterator.
-  T & operator* (void) const ;
+  T & operator* () const ;
 
   /**
    * Retasks the iterator to iterate over a new
@@ -598,11 +598,11 @@ protected:
    * @note the head of the ACE_DLList is actually a null entry, so the
    * first element is actually the 2n'd entry
    */
-  int go_head (void);
+  int go_head ();
 
   /// Move to the last element of the list. Returns 0 if the list is
   /// empty, else 1.
-  int go_tail (void);
+  int go_tail ();
 
   /**
    * Check if we reach the end of the list.  Can also be used to get
@@ -610,18 +610,18 @@ protected:
    * current item if there are still elements left , 0 if we run out
    * of element.
    */
-  T *not_done (void) const ;
+  T *not_done () const ;
 
   /// Advance to the next element in the list.  Return the address of the
   /// next element if there are more, 0 otherwise.
-  T *do_advance (void);
+  T *do_advance ();
 
   /// Retreat to the previous element in the list.  Return the address
   /// of the previous element if there are more, 0 otherwise.
-  T *do_retreat (void);
+  T *do_retreat ();
 
   /// Dump the state of an object.
-  void dump_i (void) const;
+  void dump_i () const;
 
   /// Remember where we are.
   T *current_;
@@ -661,11 +661,11 @@ public:
 
   /// Move to the first element in the list.  Returns 0 if the
   /// list is empty, else 1.
-  int first (void);
+  int first ();
 
   /// 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 ();
 
   /**
    * Advance the iterator while removing the original item from the
@@ -678,19 +678,19 @@ public:
   // = STL-style iteration methods
 
   /// Prefix advance.
-  ACE_Double_Linked_List_Iterator<T> & operator++ (void);
+  ACE_Double_Linked_List_Iterator<T> & operator++ ();
 
   /// Postfix advance.
   ACE_Double_Linked_List_Iterator<T> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Double_Linked_List_Iterator<T> & operator-- (void);
+  ACE_Double_Linked_List_Iterator<T> & operator-- ();
 
   /// Postfix reverse.
   ACE_Double_Linked_List_Iterator<T> operator-- (int);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -729,11 +729,11 @@ public:
 
   /// Move to the first element in the list.  Returns 0 if the
   /// list is empty, else 1.
-  int first (void);
+  int first ();
 
   /// 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 ();
 
   /**
    * Advance the iterator while removing the original item from the
@@ -746,19 +746,19 @@ public:
   // = STL-style iteration methods
 
   /// Prefix advance.
-  ACE_Double_Linked_List_Reverse_Iterator<T> & operator++ (void);
+  ACE_Double_Linked_List_Reverse_Iterator<T> & operator++ ();
 
   /// Postfix advance.
   ACE_Double_Linked_List_Reverse_Iterator<T> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Double_Linked_List_Reverse_Iterator<T> & operator-- (void);
+  ACE_Double_Linked_List_Reverse_Iterator<T> & operator-- ();
 
   /// Postfix reverse.
   ACE_Double_Linked_List_Reverse_Iterator<T> operator-- (int);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -846,7 +846,7 @@ public:
   /**
    * Clean up the memory allocated for the nodes of the list.
    */
-  ~ACE_Double_Linked_List (void);
+  ~ACE_Double_Linked_List ();
 
   // = Check boundary conditions.
 
@@ -854,13 +854,13 @@ public:
   /**
    * Performs constant time check to determine if the list is empty.
    */
-  int is_empty (void) const;
+  int is_empty () const;
 
   /// The list is unbounded, so this always returns 0.
   /**
    * Since the list is unbounded, the method simply returns 0.
    */
-  int is_full (void) const;
+  int is_full () const;
 
   // = Classic queue operations.
 
@@ -884,7 +884,7 @@ public:
    * internal node's address on success, 0 if the queue was empty.
    * This method will *not* free the internal node.
    */
-  T* delete_head (void);
+  T* delete_head ();
 
   /// Removes the tail of the list and returns a pointer to that item.
   /**
@@ -892,7 +892,7 @@ public:
    * internal nodes's address on success, 0 if the queue was
    * empty. This method will *not* free the internal node.
    */
-  T *delete_tail (void);
+  T *delete_tail ();
 
   // = Additional utility methods.
 
@@ -902,7 +902,7 @@ public:
    * Notice that since no one is interested in the items within,
    * This operation will delete all items.
    */
-  void reset (void);
+  void reset ();
 
   /// Get the {slot}th element in the set.  Returns -1 if the element
   /// isn't in the range {0..{size} - 1}, else 0.
@@ -916,10 +916,10 @@ public:
   /**
    * Constant time call to return the current size of the list.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Use DNode address directly.
   /**
@@ -935,7 +935,7 @@ protected:
   /**
    * Removes and deallocates memory for all of the list nodes.
    */
-  void delete_nodes (void);
+  void delete_nodes ();
 
   /// Copy nodes from {rhs} into this list.
   /**
@@ -948,7 +948,7 @@ protected:
   /**
    * Initialize the head pointer so that the list has a dummy node.
    */
-  void init_head (void);
+  void init_head ();
 
   ///Constant time insert a new item into the list structure.
   /**
@@ -1052,7 +1052,7 @@ public:
    * @return Pointer to previously inserted item; 0 if the list is empty,
    *         an error occurred, or the original pointer inserted was 0.
    */
-  T *delete_head (void);
+  T *delete_head ();
 
   /**
    * Removes the item at the tail of the list and returns its pointer.
@@ -1060,7 +1060,7 @@ public:
    * @return Pointer to previously inserted item; 0 if the list is empty,
    *         an error occurred, or the original pointer inserted was 0.
    */
-  T *delete_tail (void);
+  T *delete_tail ();
   //@}
 
   /**
@@ -1076,7 +1076,7 @@ public:
   int get (T *&item, size_t slot = 0);
 
   /// Delegates to ACE_Double_Linked_List.
-  void dump (void) const;
+  void dump () const;
 
   /// Delegates to ACE_Double_Linked_List.
   int remove (ACE_DLList_Node *n);
@@ -1107,7 +1107,7 @@ public:
           delete *p;
       @endcode
    */
-  ~ACE_DLList (void);
+  ~ACE_DLList ();
 };
 
 /**
@@ -1142,7 +1142,7 @@ public:
   // = Iteration methods.
   /// 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 ();
 
   /// Pass back the {next_item} that hasn't been seen in the list.
   /// Returns 0 when all items have been seen, else 1.
@@ -1153,7 +1153,7 @@ public:
    * whereas the Double_Linked_List version of next returns the node, this next
    * returns the contents of the node
    */
-  T *next (void) const;
+  T *next () const;
 
   /**
    * Removes the current item (i.e., {next}) from the list.
@@ -1161,10 +1161,10 @@ public:
    * directly (defined in its base class) and you will need to
    * release the element returned by it.
    */
-  int remove (void);
+  int remove ();
 
   /// Delegates to ACE_Double_Linked_List_Iterator.
-  void dump (void) const;
+  void dump () const;
 
 private:
   ACE_DLList<T> *list_;
@@ -1202,23 +1202,23 @@ public:
   // = Iteration methods.
   /// 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 ();
 
   /// Pass back the {next_item} that hasn't been seen in the list.
   /// Returns 0 when all items have been seen, else 1.
   int next (T *&);
 
   /// @deprecated Delegates to ACE_Double_Linked_List_Iterator.
-  T *next (void) const;
+  T *next () const;
 
   /// Removes the current item (i.e., {next}) from the list.
   /// Note that DLList iterators do not support {advance_and_remove}
   /// directly (defined in its base class) and you will need to
   /// release the element returned by it.
-  int remove (void);
+  int remove ();
 
   /// Delegates to ACE_Double_Linked_List_Iterator.
-  void dump (void) const;
+  void dump () const;
 
 private:
   ACE_DLList<T> *list_;
@@ -1245,14 +1245,14 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the set.  Returns 0 if the
   /// set is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1270,7 +1270,7 @@ protected:
   size_t iterated_items_;
 
   /// Dump the state of an object.
-  void dump_i (void) const;
+  void dump_i () const;
 
   /// Pass back the {next_item} that hasn't been seen in the Set.
   /// Returns 0 when all items have been seen, else 1.
@@ -1298,7 +1298,7 @@ public:
   int next (T *&next_item);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Remove the item where the itearetor is located at.
   /// Returns 1 if it removes a item, else 0.
@@ -1307,7 +1307,7 @@ public:
 
   /// STL-like iterator dereference operator: returns a reference
   /// to the node underneath the iterator.
-  T & operator* (void);
+  T & operator* ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1333,11 +1333,11 @@ public:
   int next (const T *&next_item);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// STL-like iterator dereference operator: returns a reference
   /// to the node underneath the iterator.
-  const T & operator* (void) const ;
+  const T & operator* () const ;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1391,7 +1391,7 @@ public:
   /**
    * Creates an empy set
    */
-  ACE_Fixed_Set (void);
+  ACE_Fixed_Set ();
 
   /// Copy constructor.
   /**
@@ -1409,7 +1409,7 @@ public:
   /**
    * Destroys a set.
    */
-  ~ACE_Fixed_Set (void);
+  ~ACE_Fixed_Set ();
 
   // = Check boundary conditions.
 
@@ -1417,13 +1417,13 @@ public:
   /**
    * Performs constant time check to determine if a set is empty.
    */
-  int is_empty (void) const;
+  int is_empty () const;
 
   /// Returns 1 if the container is full, otherwise returns 0.
   /**
    * Performs a constant time check to see if the set is full.
    */
-  int is_full (void) const;
+  int is_full () const;
 
   // = Classic unordered set operations.
 
@@ -1453,10 +1453,10 @@ public:
   /**
    * Returns the current size of the set.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1505,17 +1505,17 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the set.  Returns 0 if the
   /// set is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1584,7 +1584,7 @@ public:
    * The default constructor initializes the Bounded_Set to a maximum size
    * specified by the DEFAULT_SIZE.
    */
-  ACE_Bounded_Set (void);
+  ACE_Bounded_Set ();
 
   /// Construct a Bounded_Set with the provided sizeB.
   /**
@@ -1612,7 +1612,7 @@ public:
    * Clean up the underlying dynamically allocated memory that is used by
    * the Bounded_Set.
    */
-  ~ACE_Bounded_Set (void);
+  ~ACE_Bounded_Set ();
 
   // = Check boundary conditions.
 
@@ -1621,14 +1621,14 @@ public:
    * A constant time check is performed to determine if the Bounded_Set is
    * empty.
    */
-  int is_empty (void) const;
+  int is_empty () const;
 
   /// Returns 1 if the container is full, otherwise returns 0.
   /**
    * Performs a constant time check to determine if the Bounded_Set is at
    * capacity.
    */
-  int is_full (void) const;
+  int is_full () const;
 
   // = Classic unordered set operations.
 
@@ -1661,10 +1661,10 @@ public:
   /**
    * Returns a size_t representing the current size of the set.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1713,28 +1713,28 @@ public:
 
   /// Repositions the iterator at the first item in the ordered multiset
   /// Returns 0 if the list is empty else 1.
-  int first (void);
+  int first ();
 
   /// Repositions the iterator at the last item in the ordered multiset
   /// Returns 0 if the list is empty else 1.
-  int last (void);
+  int last ();
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move backward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int retreat (void);
+  int retreat ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Returns a reference to the internal element {this} is pointing to.
-  T& operator* (void);
+  T& operator* ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1808,7 +1808,7 @@ public:
   /**
    * Delete the nodes of the set.
    */
-  ~ACE_Ordered_MultiSet (void);
+  ~ACE_Ordered_MultiSet ();
 
   /// Assignment operator.
   /**
@@ -1822,13 +1822,13 @@ public:
   /**
    * Constant time check to determine if the set is empty.
    */
-  int is_empty (void) const;
+  int is_empty () const;
 
   /// Size of the set.
   /**
    * Constant time check to determine the size of the set.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   // = Classic unordered set operations.
 
@@ -1868,10 +1868,10 @@ public:
   /**
    * Delete the nodes inside the set.
    */
-  void reset (void);
+  void reset ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1900,7 +1900,7 @@ private:
               ACE_DNode<T> *&new_position) const;
 
   /// Delete all the nodes in the Set.
-  void delete_nodes (void);
+  void delete_nodes ();
 
   /// Copy nodes into this set.
   void copy_nodes (const ACE_Ordered_MultiSet<T> &);
diff --git a/ACE/ace/Containers_T.inl b/ACE/ace/Containers_T.inl
index adc0f42cd23..9ef0b04df29 100644
--- a/ACE/ace/Containers_T.inl
+++ b/ACE/ace/Containers_T.inl
@@ -2,14 +2,14 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T> ACE_INLINE int
-ACE_Bounded_Stack<T>::is_empty (void) const
+ACE_Bounded_Stack<T>::is_empty () const
 {
   ACE_TRACE ("ACE_Bounded_Stack<T>::is_empty");
   return this->top_ == 0;
 }
 
 template <class T> ACE_INLINE int
-ACE_Bounded_Stack<T>::is_full (void) const
+ACE_Bounded_Stack<T>::is_full () const
 {
   ACE_TRACE ("ACE_Bounded_Stack<T>::is_full");
   return this->top_ >= this->size_;
@@ -55,7 +55,7 @@ ACE_Bounded_Stack<T>::top (T &item) const
 }
 
 template <class T> ACE_INLINE size_t
-ACE_Bounded_Stack<T>::size (void) const
+ACE_Bounded_Stack<T>::size () const
 {
   return this->size_;
 }
@@ -63,14 +63,14 @@ ACE_Bounded_Stack<T>::size (void) const
 //----------------------------------------
 
 template <class T, size_t ACE_SIZE> ACE_INLINE int
-ACE_Fixed_Stack<T, ACE_SIZE>::is_empty (void) const
+ACE_Fixed_Stack<T, ACE_SIZE>::is_empty () const
 {
   ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::is_empty");
   return this->top_ == 0;
 }
 
 template <class T, size_t ACE_SIZE> ACE_INLINE int
-ACE_Fixed_Stack<T, ACE_SIZE>::is_full (void) const
+ACE_Fixed_Stack<T, ACE_SIZE>::is_full () const
 {
   ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::is_full");
   return this->top_ >= this->size_;
@@ -116,13 +116,13 @@ ACE_Fixed_Stack<T, ACE_SIZE>::top (T &item) const
 }
 
 template <class T, size_t ACE_SIZE> ACE_INLINE size_t
-ACE_Fixed_Stack<T, ACE_SIZE>::size (void) const
+ACE_Fixed_Stack<T, ACE_SIZE>::size () const
 {
   return this->size_;
 }
 
 template <class T> ACE_INLINE int
-ACE_Unbounded_Stack<T>::is_empty (void) const
+ACE_Unbounded_Stack<T>::is_empty () const
 {
   //  ACE_TRACE ("ACE_Unbounded_Stack<T>::is_empty");
   return this->head_ == this->head_->next_;
@@ -142,14 +142,14 @@ ACE_Unbounded_Stack<T>::top (T &item) const
 }
 
 template <class T> ACE_INLINE int
-ACE_Unbounded_Stack<T>::is_full (void) const
+ACE_Unbounded_Stack<T>::is_full () const
 {
   ACE_TRACE ("ACE_Unbounded_Stack<T>::is_full");
   return 0; // ???
 }
 
 template <class T> ACE_INLINE size_t
-ACE_Unbounded_Stack<T>::size (void) const
+ACE_Unbounded_Stack<T>::size () const
 {
   return this->cur_size_;
 }
@@ -160,14 +160,14 @@ ACE_Unbounded_Stack<T>::size (void) const
 // ---
 
 template <class T, size_t ACE_SIZE> ACE_INLINE int
-ACE_Fixed_Set<T, ACE_SIZE>::is_empty (void) const
+ACE_Fixed_Set<T, ACE_SIZE>::is_empty () const
 {
   ACE_TRACE ("ACE_Fixed_Set<T>::is_empty");
   return this->cur_size_ == 0;
 }
 
 template <class T, size_t ACE_SIZE> ACE_INLINE int
-ACE_Fixed_Set<T, ACE_SIZE>::is_full (void) const
+ACE_Fixed_Set<T, ACE_SIZE>::is_full () const
 {
   ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::is_full");
   return this->cur_size_ == this->max_size_;
@@ -176,14 +176,14 @@ ACE_Fixed_Set<T, ACE_SIZE>::is_full (void) const
 // ---
 
 template <class T> ACE_INLINE int
-ACE_Bounded_Set<T>::is_empty (void) const
+ACE_Bounded_Set<T>::is_empty () const
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::is_empty");
   return this->cur_size_ == 0;
 }
 
 template <class T> ACE_INLINE int
-ACE_Bounded_Set<T>::is_full (void) const
+ACE_Bounded_Set<T>::is_full () const
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::is_full");
   return this->cur_size_ == this->max_size_;
@@ -192,7 +192,7 @@ ACE_Bounded_Set<T>::is_full (void) const
 // --
 
 template <class T> ACE_INLINE int
-ACE_Ordered_MultiSet_Iterator<T>::first (void)
+ACE_Ordered_MultiSet_Iterator<T>::first ()
 {
   ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::first");
   current_ = set_.head_;
@@ -201,7 +201,7 @@ ACE_Ordered_MultiSet_Iterator<T>::first (void)
 }
 
 template <class T> ACE_INLINE int
-ACE_Ordered_MultiSet_Iterator<T>::last (void)
+ACE_Ordered_MultiSet_Iterator<T>::last ()
 {
   ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::last");
   current_ = set_.tail_;
@@ -210,7 +210,7 @@ ACE_Ordered_MultiSet_Iterator<T>::last (void)
 }
 
 template <class T> ACE_INLINE int
-ACE_Ordered_MultiSet_Iterator<T>::advance (void)
+ACE_Ordered_MultiSet_Iterator<T>::advance ()
 {
   ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::advance");
 
@@ -220,7 +220,7 @@ ACE_Ordered_MultiSet_Iterator<T>::advance (void)
 }
 
 template <class T> ACE_INLINE int
-ACE_Ordered_MultiSet_Iterator<T>::retreat (void)
+ACE_Ordered_MultiSet_Iterator<T>::retreat ()
 {
   ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::retreat");
 
@@ -230,7 +230,7 @@ ACE_Ordered_MultiSet_Iterator<T>::retreat (void)
 }
 
 template <class T> ACE_INLINE int
-ACE_Ordered_MultiSet_Iterator<T>::done (void) const
+ACE_Ordered_MultiSet_Iterator<T>::done () const
 {
   ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::done");
 
@@ -238,7 +238,7 @@ ACE_Ordered_MultiSet_Iterator<T>::done (void) const
 }
 
 template <class T> ACE_INLINE void
-ACE_Ordered_MultiSet_Iterator<T>::dump (void) const
+ACE_Ordered_MultiSet_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::dump");
@@ -250,14 +250,14 @@ ACE_Ordered_MultiSet_Iterator<T>::dump (void) const
 // --
 
 template <class T> ACE_INLINE int
-ACE_Ordered_MultiSet<T>::is_empty (void) const
+ACE_Ordered_MultiSet<T>::is_empty () const
 {
   ACE_TRACE ("ACE_Ordered_MultiSet<T>::is_empty");
   return this->cur_size_ > 0 ? 0 : 1;
 }
 
 template <class T> ACE_INLINE size_t
-ACE_Ordered_MultiSet<T>::size (void) const
+ACE_Ordered_MultiSet<T>::size () const
 {
 // ACE_TRACE ("ACE_Ordered_MultiSet<T>::size");
   return this->cur_size_;
@@ -329,7 +329,7 @@ ACE_DLList<T>::get (T *&item, size_t index)
 }
 
 template <class T> ACE_INLINE void
-ACE_DLList<T>::dump (void) const
+ACE_DLList<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_DLList_Base::dump ();
@@ -359,13 +359,13 @@ ACE_DLList<T>::ACE_DLList (const ACE_DLList<T> &l)
 }
 
 template <class T> ACE_INLINE
-ACE_DLList<T>::~ACE_DLList (void)
+ACE_DLList<T>::~ACE_DLList ()
 {
   while (this->delete_head ()) ;
 }
 
 template <class T> ACE_INLINE int
-ACE_DLList_Iterator<T>::remove (void)
+ACE_DLList_Iterator<T>::remove ()
 {
   ACE_DLList_Node *temp = this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next ();
   this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::advance ();
@@ -397,20 +397,20 @@ ACE_DLList_Iterator<T>::next (T *&ptr)
 }
 
 template <class T> ACE_INLINE T *
-ACE_DLList_Iterator<T>::next (void) const
+ACE_DLList_Iterator<T>::next () const
 {
   ACE_DLList_Node *temp = ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next ();
   return (T *) (temp ? temp->item_ : 0);
 }
 
 template <class T> ACE_INLINE int
-ACE_DLList_Iterator<T>::advance (void)
+ACE_DLList_Iterator<T>::advance ()
 {
   return this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::advance ();
 }
 
 template <class T> ACE_INLINE void
-ACE_DLList_Iterator<T>::dump (void) const
+ACE_DLList_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::dump ();
@@ -419,7 +419,7 @@ ACE_DLList_Iterator<T>::dump (void) const
 
 
 template <class T> ACE_INLINE int
-ACE_DLList_Reverse_Iterator<T>::remove (void)
+ACE_DLList_Reverse_Iterator<T>::remove ()
 {
   ACE_DLList_Node *temp = ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::next ();
   this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance ();
@@ -441,7 +441,7 @@ ACE_DLList_Reverse_Iterator<T>::reset (ACE_DLList<T> &l)
 }
 
 template <class T> ACE_INLINE int
-ACE_DLList_Reverse_Iterator<T>::advance (void)
+ACE_DLList_Reverse_Iterator<T>::advance ()
 {
   return ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance ();
 }
@@ -458,7 +458,7 @@ ACE_DLList_Reverse_Iterator<T>::next (T *&ptr)
 }
 
 template <class T> ACE_INLINE T *
-ACE_DLList_Reverse_Iterator<T>::next (void) const
+ACE_DLList_Reverse_Iterator<T>::next () const
 {
   ACE_DLList_Node *temp = ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::next ();
   return (T *) (temp ? temp->item_ : 0);
@@ -466,7 +466,7 @@ ACE_DLList_Reverse_Iterator<T>::next (void) const
 
 
 template <class T> ACE_INLINE void
-ACE_DLList_Reverse_Iterator<T>::dump (void) const
+ACE_DLList_Reverse_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::dump ();
diff --git a/ACE/ace/Copy_Disabled.cpp b/ACE/ace/Copy_Disabled.cpp
index 59c6ba7af97..57fdb0df0f8 100644
--- a/ACE/ace/Copy_Disabled.cpp
+++ b/ACE/ace/Copy_Disabled.cpp
@@ -8,7 +8,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Copy_Disabled::ACE_Copy_Disabled (void)
+ACE_Copy_Disabled::ACE_Copy_Disabled ()
 {
 }
 
diff --git a/ACE/ace/Copy_Disabled.h b/ACE/ace/Copy_Disabled.h
index 0617bd874c7..264dec106cb 100644
--- a/ACE/ace/Copy_Disabled.h
+++ b/ACE/ace/Copy_Disabled.h
@@ -32,7 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * This is often done by making the copy constructor and assignment
  * operators private, effectively disallowing copying by clients of
  * the class (including derived classes).  If the copy constructor and
- * assingment operators are left unimplemented then the class itself
+ * assignment operators are left unimplemented then the class itself
  * cannot make any copies of its instances, because it would result in
  * link errors.
  *
@@ -47,11 +47,13 @@ class ACE_Export ACE_Copy_Disabled
 {
 public:
   /// Default constructor
-  ACE_Copy_Disabled (void);
+  ACE_Copy_Disabled ();
 
 private:
-  ACE_Copy_Disabled (const ACE_Copy_Disabled &);
-  ACE_Copy_Disabled &operator= (const ACE_Copy_Disabled &);
+  ACE_Copy_Disabled (const ACE_Copy_Disabled &) = delete;
+  ACE_Copy_Disabled (ACE_Copy_Disabled &&) = delete;
+  ACE_Copy_Disabled &operator= (const ACE_Copy_Disabled &) = delete;
+  ACE_Copy_Disabled &operator= (ACE_Copy_Disabled &&) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Countdown_Time_T.cpp b/ACE/ace/Countdown_Time_T.cpp
index 8a38c4de119..1327ccb4b09 100644
--- a/ACE/ace/Countdown_Time_T.cpp
+++ b/ACE/ace/Countdown_Time_T.cpp
@@ -21,13 +21,13 @@ ACE_Countdown_Time_T<TIME_POLICY>::ACE_Countdown_Time_T (ACE_Time_Value *max_wai
 }
 
 template <typename TIME_POLICY> ACE_INLINE
-ACE_Countdown_Time_T<TIME_POLICY>::~ACE_Countdown_Time_T (void)
+ACE_Countdown_Time_T<TIME_POLICY>::~ACE_Countdown_Time_T ()
 {
   this->stop ();
 }
 
 template <typename TIME_POLICY> ACE_INLINE void
-ACE_Countdown_Time_T<TIME_POLICY>::start (void)
+ACE_Countdown_Time_T<TIME_POLICY>::start ()
 {
   if (this->max_wait_time_ != 0)
     {
@@ -38,7 +38,7 @@ ACE_Countdown_Time_T<TIME_POLICY>::start (void)
 }
 
 template <typename TIME_POLICY> ACE_INLINE void
-ACE_Countdown_Time_T<TIME_POLICY>::stop (void)
+ACE_Countdown_Time_T<TIME_POLICY>::stop ()
 {
   if (this->max_wait_time_ != 0 && !this->stopped_)
     {
diff --git a/ACE/ace/Countdown_Time_T.h b/ACE/ace/Countdown_Time_T.h
index 12aab657bf1..d3817db8c44 100644
--- a/ACE/ace/Countdown_Time_T.h
+++ b/ACE/ace/Countdown_Time_T.h
@@ -44,21 +44,21 @@ public:
 
   /// Destructor, makes sure the max_wait_time that got passed as pointer
   /// to the constructor is updated with the time elapsed.
-  ~ACE_Countdown_Time_T (void);
+  ~ACE_Countdown_Time_T ();
 
   /// Cache the current time and enter a start state.
-  void start (void);
+  void start ();
 
   /// Subtract the elapsed time from max_wait_time_ and enter a stopped
   /// state.
-  void stop (void);
+  void stop ();
 
   /// Calls stop and then start.  max_wait_time_ is modified by the
   /// call to stop.
-  void update (void);
+  void update ();
 
   /// Returns true if we've already been stopped, else false.
-  bool stopped (void) const;
+  bool stopped () const;
 
   /// Allows applications to control how the timer queue gets the time
   /// of day.
diff --git a/ACE/ace/Countdown_Time_T.inl b/ACE/ace/Countdown_Time_T.inl
index 319729d9c37..dce20d05642 100644
--- a/ACE/ace/Countdown_Time_T.inl
+++ b/ACE/ace/Countdown_Time_T.inl
@@ -2,13 +2,13 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename TIME_POLICY> ACE_INLINE bool
-ACE_Countdown_Time_T<TIME_POLICY>::stopped (void) const
+ACE_Countdown_Time_T<TIME_POLICY>::stopped () const
 {
   return stopped_;
 }
 
 template <typename TIME_POLICY> ACE_INLINE void
-ACE_Countdown_Time_T<TIME_POLICY>::update (void)
+ACE_Countdown_Time_T<TIME_POLICY>::update ()
 {
   this->stop ();
   this->start ();
diff --git a/ACE/ace/DEV.cpp b/ACE/ace/DEV.cpp
index 08a7e581f59..ca87efd7056 100644
--- a/ACE/ace/DEV.cpp
+++ b/ACE/ace/DEV.cpp
@@ -17,7 +17,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV)
 
 void
-ACE_DEV::dump (void) const
+ACE_DEV::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV::dump");
@@ -26,7 +26,7 @@ ACE_DEV::dump (void) const
 
 // This is the do-nothing constructor.
 
-ACE_DEV::ACE_DEV (void)
+ACE_DEV::ACE_DEV ()
 {
   ACE_TRACE ("ACE_DEV::ACE_DEV");
 }
@@ -34,7 +34,7 @@ ACE_DEV::ACE_DEV (void)
 // Close the device
 
 int
-ACE_DEV::close (void)
+ACE_DEV::close ()
 {
   ACE_TRACE ("ACE_DEV::close");
   int result = ACE_OS::close (this->get_handle ());
diff --git a/ACE/ace/DEV.h b/ACE/ace/DEV.h
index c74c23429ce..c7940ff8dc5 100644
--- a/ACE/ace/DEV.h
+++ b/ACE/ace/DEV.h
@@ -36,7 +36,7 @@ public:
   int close (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/DEV_Addr.cpp b/ACE/ace/DEV_Addr.cpp
index c5c2cc3bc53..90cedc0076b 100644
--- a/ACE/ace/DEV_Addr.cpp
+++ b/ACE/ace/DEV_Addr.cpp
@@ -27,7 +27,7 @@ ACE_DEV_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
 // Return a pointer to the address.
 
 void *
-ACE_DEV_Addr::get_addr (void) const
+ACE_DEV_Addr::get_addr () const
 {
   ACE_TRACE ("ACE_DEV_Addr::get_addr");
 
@@ -35,7 +35,7 @@ ACE_DEV_Addr::get_addr (void) const
 }
 
 void
-ACE_DEV_Addr::dump (void) const
+ACE_DEV_Addr::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV_Addr::dump");
@@ -48,7 +48,7 @@ ACE_DEV_Addr::dump (void) const
 
 // Do nothing constructor.
 
-ACE_DEV_Addr::ACE_DEV_Addr (void)
+ACE_DEV_Addr::ACE_DEV_Addr ()
   : ACE_Addr (AF_DEV, sizeof this->devname_)
 {
   ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr");
diff --git a/ACE/ace/DEV_Addr.h b/ACE/ace/DEV_Addr.h
index ed17c0bfc69..8a024d45a89 100644
--- a/ACE/ace/DEV_Addr.h
+++ b/ACE/ace/DEV_Addr.h
@@ -65,7 +65,7 @@ public:
   const ACE_TCHAR *get_path_name (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/DEV_Connector.cpp b/ACE/ace/DEV_Connector.cpp
index 159e5ecee19..ecbe0a702c7 100644
--- a/ACE/ace/DEV_Connector.cpp
+++ b/ACE/ace/DEV_Connector.cpp
@@ -14,14 +14,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector)
 
 void
-ACE_DEV_Connector::dump (void) const
+ACE_DEV_Connector::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV_Connector::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_DEV_Connector::ACE_DEV_Connector (void)
+ACE_DEV_Connector::ACE_DEV_Connector ()
 {
   ACE_TRACE ("ACE_DEV_Connector::ACE_DEV_Connector");
 }
diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h
index 5916ba8f149..6363cba6e15 100644
--- a/ACE/ace/DEV_Connector.h
+++ b/ACE/ace/DEV_Connector.h
@@ -87,7 +87,7 @@ public:
   bool reset_new_handle (ACE_HANDLE handle);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/DEV_IO.cpp b/ACE/ace/DEV_IO.cpp
index f1dcda42978..87394d9dc1b 100644
--- a/ACE/ace/DEV_IO.cpp
+++ b/ACE/ace/DEV_IO.cpp
@@ -38,7 +38,7 @@ ACE_DEV_IO::get_remote_addr (ACE_DEV_Addr &addr) const
 }
 
 void
-ACE_DEV_IO::dump (void) const
+ACE_DEV_IO::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV_IO::dump");
@@ -51,7 +51,7 @@ ACE_DEV_IO::dump (void) const
 
 // Simple-minded do nothing constructor.
 
-ACE_DEV_IO::ACE_DEV_IO (void)
+ACE_DEV_IO::ACE_DEV_IO ()
 {
   ACE_TRACE ("ACE_DEV_IO::ACE_DEV_IO");
 }
diff --git a/ACE/ace/DEV_IO.h b/ACE/ace/DEV_IO.h
index 9a97c011f51..8188daf4ea4 100644
--- a/ACE/ace/DEV_IO.h
+++ b/ACE/ace/DEV_IO.h
@@ -151,7 +151,7 @@ public:
   ssize_t recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = The following two methods are no-ops to keep the
   // ACE_Connector happy.
diff --git a/ACE/ace/DLL.cpp b/ACE/ace/DLL.cpp
index 998a52a8827..27a0e83d40d 100644
--- a/ACE/ace/DLL.cpp
+++ b/ACE/ace/DLL.cpp
@@ -91,7 +91,7 @@ ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name,
 // the close_handle_on_destruction value specified which is stored in
 // close_handle_on_destruction_.
 
-ACE_DLL::~ACE_DLL (void)
+ACE_DLL::~ACE_DLL ()
 {
   ACE_TRACE ("ACE_DLL::~ACE_DLL");
 
@@ -211,7 +211,7 @@ ACE_DLL::symbol (const ACE_TCHAR *sym_name, int ignore_errors)
 // shared object is now disassociated form the current process.
 
 int
-ACE_DLL::close (void)
+ACE_DLL::close ()
 {
   ACE_TRACE ("ACE_DLL::close");
 
@@ -239,7 +239,7 @@ ACE_DLL::close (void)
 // This method is used return the last error of a library operation.
 
 ACE_TCHAR *
-ACE_DLL::error (void) const
+ACE_DLL::error () const
 {
   ACE_TRACE ("ACE_DLL::error");
   if (this->error_)
diff --git a/ACE/ace/DLL.h b/ACE/ace/DLL.h
index c646964855f..0ca0b5a806e 100644
--- a/ACE/ace/DLL.h
+++ b/ACE/ace/DLL.h
@@ -131,14 +131,14 @@ public:
             bool close_handle_on_destruction = true);
 
   /// Call to close the DLL object.
-  int close (void);
+  int close ();
 
   /**
    * Called when the DLL object is destroyed -- invokes close() if the
    * @a close_handle_on_destruction flag was set to non-zero in the
    * constructor or open() method.
    */
-  ~ACE_DLL (void);
+  ~ACE_DLL ();
 
   /**
    * Look up a named symbol in the DLL. DLL must be successfully opened
@@ -155,7 +155,7 @@ public:
   /// Returns a pointer to a string explaining that an error occurred.  You
   /// will need to consult the error log for the actual error string
   /// returned by the OS.
-  ACE_TCHAR *error (void) const;
+  ACE_TCHAR *error () const;
 
   /**
    * Return the handle to the caller.  If @a become_owner is true then
diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 8151097896e..d3cbb6e7321 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -17,7 +17,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 sig_atomic_t ACE_DLL_Handle::open_called_ = 0;
 
-ACE_DLL_Handle::ACE_DLL_Handle (void)
+ACE_DLL_Handle::ACE_DLL_Handle ()
   : refcount_ (0),
     dll_name_ (0),
     handle_ (ACE_SHLIB_INVALID_HANDLE)
@@ -25,7 +25,7 @@ ACE_DLL_Handle::ACE_DLL_Handle (void)
   ACE_TRACE ("ACE_DLL_Handle::ACE_DLL_Handle");
 }
 
-ACE_DLL_Handle::~ACE_DLL_Handle (void)
+ACE_DLL_Handle::~ACE_DLL_Handle ()
 {
   ACE_TRACE ("ACE_DLL_Handle::~ACE_DLL_Handle");
   this->close (1);
@@ -39,7 +39,7 @@ ACE_DLL_Handle::~ACE_DLL_Handle (void)
 ACE_ALLOC_HOOK_DEFINE(ACE_DLL_Handle)
 
 const ACE_TCHAR  *
-ACE_DLL_Handle::dll_name (void) const
+ACE_DLL_Handle::dll_name () const
 {
   ACE_TRACE ("ACE_DLL_Handle::dll_name");
   return this->dll_name_;
@@ -157,7 +157,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
                     }
                   open_mode |= RTLD_MEMBER;
 
-                  if (this->open_i (aix_pathname, open_mode))
+                  if (this->open_i (aix_pathname, open_mode, errors))
                     break;
                 }
 #endif /* AIX */
@@ -263,7 +263,7 @@ ACE_DLL_Handle::close (int unload)
 }
 
 sig_atomic_t
-ACE_DLL_Handle::refcount (void) const
+ACE_DLL_Handle::refcount () const
 {
   return this->refcount_;
 }
@@ -518,7 +518,7 @@ ACE_DLL_Manager::instance (int size)
 }
 
 void
-ACE_DLL_Manager::close_singleton (void)
+ACE_DLL_Manager::close_singleton ()
 {
   ACE_TRACE ("ACE_DLL_Manager::close_singleton");
 
@@ -543,7 +543,7 @@ ACE_DLL_Manager::ACE_DLL_Manager (int size)
                 ACE_TEXT ("handle_vector_.\n")));
 }
 
-ACE_DLL_Manager::~ACE_DLL_Manager (void)
+ACE_DLL_Manager::~ACE_DLL_Manager ()
 {
   ACE_TRACE ("ACE_DLL_Manager::~ACE_DLL_Manager");
 
@@ -629,7 +629,7 @@ ACE_DLL_Manager::close_dll (const ACE_TCHAR *dll_name)
 }
 
 u_long
-ACE_DLL_Manager::unload_policy (void) const
+ACE_DLL_Manager::unload_policy () const
 {
   ACE_TRACE ("ACE_DLL_Manager::unload_policy");
   return this->unload_policy_;
@@ -686,7 +686,7 @@ ACE_DLL_Manager::open (int size)
 }
 
 int
-ACE_DLL_Manager::close (void)
+ACE_DLL_Manager::close ()
 {
   ACE_TRACE ("ACE_DLL_Manager::close");
 
@@ -754,7 +754,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
           else
             {
               // Declare the type of the symbol:
-              typedef int (*dll_unload_policy)(void);
+              using dll_unload_policy = int (*)();
 
               void * const unload_policy_ptr =
                 dll_handle->symbol (ACE_TEXT ("_get_dll_unload_policy"), 1);
diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h
index 3a98d2200be..64612470e80 100644
--- a/ACE/ace/DLL_Manager.h
+++ b/ACE/ace/DLL_Manager.h
@@ -121,7 +121,7 @@ public:
 
   /// If @a symbol_name is in the symbol table of the DLL a pointer to
   /// the @a symbol_name is returned.  Otherwise, returns 0.  Set the
-  /// ignore_errors flag to supress logging errors if symbol_name isn't
+  /// @a ignore_errors flag to suppress logging errors if @a symbol_name isn't
   /// found.  This is nice if you just want to probe a dll to see what's
   /// available, since missing functions in that case aren't really errors.
   void *symbol (const ACE_TCHAR *symbol_name, bool ignore_errors = false);
@@ -147,7 +147,7 @@ private:
 
   /// Builds array of DLL names to try to dlopen, based on platform
   /// and configured DLL prefixes/suffixes.
-  /// Returns the array of names to try in try_names.
+  /// Returns the array of names to try in @a try_names.
   void get_dll_names (const ACE_TCHAR *dll_name,
                       ACE_Array<ACE_TString> &try_names);
 
@@ -170,9 +170,10 @@ private:
    */
   bool open_i (const ACE_TCHAR *dll_name, int open_mode, ERROR_STACK* errors);
 
-  /// Disallow copying and assignment since we don't handle them.
-  ACE_DLL_Handle (const ACE_DLL_Handle &);
-  void operator= (const ACE_DLL_Handle &);
+  ACE_DLL_Handle (const ACE_DLL_Handle &) = delete;
+  void operator= (const ACE_DLL_Handle &) = delete;
+  ACE_DLL_Handle (ACE_DLL_Handle &&) = delete;
+  void operator= (ACE_DLL_Handle &&) = delete;
 
 private:
   /// Keep track of how many ACE_DLL objects have a reference to this
@@ -288,9 +289,10 @@ private:
   /// Close the singleton instance.
   static void close_singleton (void);
 
-  /// Disallow copying and assignment since we don't handle these.
-  ACE_DLL_Manager (const ACE_DLL_Manager &);
-  void operator= (const ACE_DLL_Manager &);
+  ACE_DLL_Manager (const ACE_DLL_Manager &) = delete;
+  void operator= (const ACE_DLL_Manager &) = delete;
+  ACE_DLL_Manager (ACE_DLL_Manager &&) = delete;
+  void operator= (ACE_DLL_Manager &&) = delete;
 
 private:
   /// Vector containing all loaded handle objects.
diff --git a/ACE/ace/Date_Time.h b/ACE/ace/Date_Time.h
index aba5d04487b..4c3484a727e 100644
--- a/ACE/ace/Date_Time.h
+++ b/ACE/ace/Date_Time.h
@@ -36,7 +36,7 @@ public:
   /// Constructor initializes with the given ACE_Time_Value
   explicit ACE_Date_Time (const ACE_Time_Value& timevalue);
 
-  /// Constructor with init values, no check for validy
+  /// Constructor with init values, no check for validity
   /// Set/get portions of ACE_Date_Time, no check for validity.
   ACE_Date_Time (long day,
                  long month = 0,
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 55cb4d4d5a3..7dcc9f995ce 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -46,7 +46,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Dev_Poll_Reactor)
 ACE_ALLOC_HOOK_DEFINE(ACE_Dev_Poll_Reactor::Event_Tuple)
 ACE_ALLOC_HOOK_DEFINE(ACE_Dev_Poll_Reactor_Notify)
 
-ACE_Dev_Poll_Reactor_Notify::ACE_Dev_Poll_Reactor_Notify (void)
+ACE_Dev_Poll_Reactor_Notify::ACE_Dev_Poll_Reactor_Notify ()
   : dp_reactor_ (0)
   , notification_pipe_ ()
   , max_notify_iterations_ (-1)
@@ -111,7 +111,7 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r,
 }
 
 int
-ACE_Dev_Poll_Reactor_Notify::close (void)
+ACE_Dev_Poll_Reactor_Notify::close ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::close");
 
@@ -292,7 +292,7 @@ ACE_Dev_Poll_Reactor_Notify::handle_input (ACE_HANDLE /*handle*/)
 }
 
 ACE_HANDLE
-ACE_Dev_Poll_Reactor_Notify::notify_handle (void)
+ACE_Dev_Poll_Reactor_Notify::notify_handle ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::notify_handle");
 
@@ -364,7 +364,7 @@ ACE_Dev_Poll_Reactor_Notify::max_notify_iterations (int iterations)
 }
 
 int
-ACE_Dev_Poll_Reactor_Notify::max_notify_iterations (void)
+ACE_Dev_Poll_Reactor_Notify::max_notify_iterations ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::max_notify_iterations");
 
@@ -390,7 +390,7 @@ ACE_Dev_Poll_Reactor_Notify::purge_pending_notifications (
 }
 
 void
-ACE_Dev_Poll_Reactor_Notify::dump (void) const
+ACE_Dev_Poll_Reactor_Notify::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::dump");
@@ -415,7 +415,7 @@ ACE_Dev_Poll_Reactor_Notify::dequeue_one (ACE_Notification_Buffer &nb)
 
 // -----------------------------------------------------------------
 
-ACE_Dev_Poll_Reactor::Handler_Repository::Handler_Repository (void)
+ACE_Dev_Poll_Reactor::Handler_Repository::Handler_Repository ()
   : size_ (0),
     max_size_ (0),
     handlers_ (0)
@@ -469,7 +469,7 @@ ACE_Dev_Poll_Reactor::Handler_Repository::open (size_t size)
 }
 
 int
-ACE_Dev_Poll_Reactor::Handler_Repository::unbind_all (void)
+ACE_Dev_Poll_Reactor::Handler_Repository::unbind_all ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::unbind_all");
 
@@ -495,7 +495,7 @@ ACE_Dev_Poll_Reactor::Handler_Repository::unbind_all (void)
 }
 
 int
-ACE_Dev_Poll_Reactor::Handler_Repository::close (void)
+ACE_Dev_Poll_Reactor::Handler_Repository::close ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::close");
 
@@ -663,7 +663,7 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size,
                 ACE_TEXT ("failed inside ACE_Dev_Poll_Reactor::CTOR")));
 }
 
-ACE_Dev_Poll_Reactor::~ACE_Dev_Poll_Reactor (void)
+ACE_Dev_Poll_Reactor::~ACE_Dev_Poll_Reactor ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::~ACE_Dev_Poll_Reactor");
 
@@ -818,13 +818,13 @@ ACE_Dev_Poll_Reactor::timer_queue (ACE_Timer_Queue *tq)
 }
 
 ACE_Timer_Queue *
-ACE_Dev_Poll_Reactor::timer_queue (void) const
+ACE_Dev_Poll_Reactor::timer_queue () const
 {
   return this->timer_queue_;
 }
 
 int
-ACE_Dev_Poll_Reactor::close (void)
+ACE_Dev_Poll_Reactor::close ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::close");
 
@@ -1081,7 +1081,7 @@ ACE_Dev_Poll_Reactor::dispatch (Token_Guard &guard)
 int
 ACE_Dev_Poll_Reactor::dispatch_timer_handler (Token_Guard &guard)
 {
-  typedef ACE_Member_Function_Command<Token_Guard> Guard_Release;
+  using Guard_Release = ACE_Member_Function_Command<Token_Guard>;
 
   Guard_Release release(guard, &Token_Guard::release_token);
   return this->timer_queue_->expire_single(release);
@@ -1381,7 +1381,7 @@ ACE_Dev_Poll_Reactor::alertable_handle_events (ACE_Time_Value &max_wait_time)
 }
 
 int
-ACE_Dev_Poll_Reactor::deactivated (void)
+ACE_Dev_Poll_Reactor::deactivated ()
 {
   return this->deactivated_;
 }
@@ -1747,7 +1747,7 @@ ACE_Dev_Poll_Reactor::suspend_handler (const ACE_Handle_Set &handles)
 }
 
 int
-ACE_Dev_Poll_Reactor::suspend_handlers (void)
+ACE_Dev_Poll_Reactor::suspend_handlers ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handlers");
 
@@ -1858,7 +1858,7 @@ ACE_Dev_Poll_Reactor::resume_handler (const ACE_Handle_Set &handles)
 }
 
 int
-ACE_Dev_Poll_Reactor::resume_handlers (void)
+ACE_Dev_Poll_Reactor::resume_handlers ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handlers");
 
@@ -1932,7 +1932,7 @@ ACE_Dev_Poll_Reactor::resume_handler_i (ACE_HANDLE handle)
 }
 
 int
-ACE_Dev_Poll_Reactor::resumable_handler (void)
+ACE_Dev_Poll_Reactor::resumable_handler ()
 {
   // @@ Is this correct?
 
@@ -1940,7 +1940,7 @@ ACE_Dev_Poll_Reactor::resumable_handler (void)
 }
 
 bool
-ACE_Dev_Poll_Reactor::uses_event_associations (void)
+ACE_Dev_Poll_Reactor::uses_event_associations ()
 {
   // Since the Dev_Poll_Reactor does not do any event associations,
   // this method always return false.
@@ -2078,7 +2078,7 @@ ACE_Dev_Poll_Reactor::max_notify_iterations (int iterations)
 }
 
 int
-ACE_Dev_Poll_Reactor::max_notify_iterations (void)
+ACE_Dev_Poll_Reactor::max_notify_iterations ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::max_notify_iterations");
 
@@ -2156,7 +2156,7 @@ ACE_Dev_Poll_Reactor::handler (int signum,
 }
 
 bool
-ACE_Dev_Poll_Reactor::initialized (void)
+ACE_Dev_Poll_Reactor::initialized ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::initialized");
 
@@ -2166,13 +2166,13 @@ ACE_Dev_Poll_Reactor::initialized (void)
 }
 
 size_t
-ACE_Dev_Poll_Reactor::size (void) const
+ACE_Dev_Poll_Reactor::size () const
 {
   return this->handler_rep_.size ();
 }
 
 ACE_Lock &
-ACE_Dev_Poll_Reactor::lock (void)
+ACE_Dev_Poll_Reactor::lock ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::lock");
 
@@ -2180,7 +2180,7 @@ ACE_Dev_Poll_Reactor::lock (void)
 }
 
 void
-ACE_Dev_Poll_Reactor::wakeup_all_threads (void)
+ACE_Dev_Poll_Reactor::wakeup_all_threads ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::wakeup_all_threads");
 
@@ -2215,7 +2215,7 @@ ACE_Dev_Poll_Reactor::owner (ACE_thread_t * /* owner */)
 }
 
 bool
-ACE_Dev_Poll_Reactor::restart (void)
+ACE_Dev_Poll_Reactor::restart ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::restart");
 
@@ -2243,7 +2243,7 @@ ACE_Dev_Poll_Reactor::requeue_position (int)
 }
 
 int
-ACE_Dev_Poll_Reactor::requeue_position (void)
+ACE_Dev_Poll_Reactor::requeue_position ()
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::requeue_position");
 
@@ -2432,7 +2432,7 @@ ACE_Dev_Poll_Reactor::ready_ops (ACE_HANDLE /* handle */,
 }
 
 void
-ACE_Dev_Poll_Reactor::dump (void) const
+ACE_Dev_Poll_Reactor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dev_Poll_Reactor::dump");
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index ed8640a30da..886ec3c78b3 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -154,7 +154,7 @@ public:
     ACE_Reactor_Mask    = ACE_Event_Handler::ALL_EVENTS_MASK);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Method called by ACE_Dev_Poll_Reactor to obtain one notification.
   /// THIS METHOD MUST BE CALLED WITH THE REACTOR TOKEN HELD!
@@ -380,7 +380,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
     size_t max_size (void) const;
 
     /// Dump the state of an object.
-    void dump (void) const;
+    void dump () const;
 
     /// Declare the dynamic allocation hooks.
     ACE_ALLOC_HOOK_DECLARE;
@@ -907,7 +907,7 @@ public:
   //@}
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Dirent.h b/ACE/ace/Dirent.h
index 1981a32127e..02551013d07 100644
--- a/ACE/ace/Dirent.h
+++ b/ACE/ace/Dirent.h
@@ -34,7 +34,7 @@ class ACE_Export ACE_Dirent
 {
 public:
   /// Default constructor.
-  ACE_Dirent (void);
+  ACE_Dirent ();
 
   /// Constructor calls @c opendir()
   explicit ACE_Dirent (const ACE_TCHAR *dirname);
@@ -44,10 +44,10 @@ public:
   int open (const ACE_TCHAR *filename);
 
   /// Destructor calls @c closedir().
-  ~ACE_Dirent (void);
+  ~ACE_Dirent ();
 
   /// Closes the directory stream and frees the ACE_DIR structure.
-  void close (void);
+  void close ();
 
   // = Iterator methods.
   /**
@@ -67,20 +67,12 @@ public:
    * update the st_atime field of the directory each time the
    * directory is actually read.
    */
-  ACE_DIRENT *read (void);
-
-  /**
-   * Has the equivalent functionality as @c read() except that an
-   * @a entry and @a result buffer must be supplied by the caller to
-   * store the result.
-   */
-  int read (struct ACE_DIRENT *entry,
-            struct ACE_DIRENT **result);
+  ACE_DIRENT *read ();
 
   // = Manipulators.
   /// Returns the current location associated with the directory
   /// stream.
-  long tell (void);
+  long tell ();
 
   /**
    * Sets the position of the next @c read() operation on the
@@ -102,7 +94,7 @@ public:
    * the current state of the corresponding directory, as a call to
    * @c opendir() would.
    */
-  void rewind (void);
+  void rewind ();
 
 private:
   /// Pointer to the directory stream.
diff --git a/ACE/ace/Dirent.inl b/ACE/ace/Dirent.inl
index 3e420f1cc71..163954c712f 100644
--- a/ACE/ace/Dirent.inl
+++ b/ACE/ace/Dirent.inl
@@ -24,7 +24,7 @@ ACE_Dirent::open (const ACE_TCHAR *dirname)
 }
 
 ACE_INLINE
-ACE_Dirent::ACE_Dirent (void)
+ACE_Dirent::ACE_Dirent ()
   : dirp_ (0)
 {
 }
@@ -40,29 +40,20 @@ ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname)
 }
 
 ACE_INLINE
-ACE_Dirent::~ACE_Dirent (void)
+ACE_Dirent::~ACE_Dirent ()
 {
   if (this->dirp_ != 0)
     ACE_OS::closedir (this->dirp_);
 }
 
 ACE_INLINE ACE_DIRENT *
-ACE_Dirent::read (void)
+ACE_Dirent::read ()
 {
   return this->dirp_ ? ACE_OS::readdir (this->dirp_) : 0;
 }
 
-ACE_INLINE int
-ACE_Dirent::read (struct ACE_DIRENT *entry,
-                  struct ACE_DIRENT **result)
-{
-  return this->dirp_
-         ? ACE_OS::readdir_r (this->dirp_, entry, result)
-         : 0;
-}
-
 ACE_INLINE void
-ACE_Dirent::close (void)
+ACE_Dirent::close ()
 {
   if (this->dirp_ != 0)
     {
@@ -74,7 +65,7 @@ ACE_Dirent::close (void)
 }
 
 ACE_INLINE void
-ACE_Dirent::rewind (void)
+ACE_Dirent::rewind ()
 {
   if (this->dirp_)
     ACE_OS::rewinddir (this->dirp_);
@@ -88,7 +79,7 @@ ACE_Dirent::seek (long loc)
 }
 
 ACE_INLINE long
-ACE_Dirent::tell (void)
+ACE_Dirent::tell ()
 {
   return this->dirp_ ? ACE_OS::telldir (this->dirp_) : 0;
 }
diff --git a/ACE/ace/Dirent_Selector.cpp b/ACE/ace/Dirent_Selector.cpp
index f16d1da685e..5d7279fde9e 100644
--- a/ACE/ace/Dirent_Selector.cpp
+++ b/ACE/ace/Dirent_Selector.cpp
@@ -15,13 +15,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Construction/Destruction
 
-ACE_Dirent_Selector::ACE_Dirent_Selector (void)
+ACE_Dirent_Selector::ACE_Dirent_Selector ()
   : namelist_ (0),
     n_ (0)
 {
 }
 
-ACE_Dirent_Selector::~ACE_Dirent_Selector (void)
+ACE_Dirent_Selector::~ACE_Dirent_Selector ()
 {
   // Free up any allocated resources.
   this->close();
@@ -37,7 +37,7 @@ ACE_Dirent_Selector::open (const ACE_TCHAR *dir,
 }
 
 int
-ACE_Dirent_Selector::close (void)
+ACE_Dirent_Selector::close ()
 {
   for (--n_; n_ >= 0; --n_)
     {
diff --git a/ACE/ace/Dump.cpp b/ACE/ace/Dump.cpp
index 576417e8150..ba98ae19075 100644
--- a/ACE/ace/Dump.cpp
+++ b/ACE/ace/Dump.cpp
@@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Implementations (very simple for now...)
 
-ACE_Dumpable::~ACE_Dumpable (void)
+ACE_Dumpable::~ACE_Dumpable ()
 {
   ACE_TRACE ("ACE_Dumpable::~ACE_Dumpable");
 }
@@ -47,7 +47,7 @@ ACE_Dumpable_Ptr::operator= (const ACE_Dumpable *dumper) const
     }
 }
 
-ACE_ODB::ACE_ODB (void)
+ACE_ODB::ACE_ODB ()
   // Let the Tuple default constructor initialize object_table_
   : current_size_ (0)
 {
@@ -57,7 +57,7 @@ ACE_ODB::ACE_ODB (void)
 ACE_ALLOC_HOOK_DEFINE(ACE_ODB)
 
 ACE_ODB *
-ACE_ODB::instance (void)
+ACE_ODB::instance ()
 {
   ACE_TRACE ("ACE_ODB::instance");
 
@@ -78,7 +78,7 @@ ACE_ODB::instance (void)
 }
 
 void
-ACE_ODB::dump_objects (void)
+ACE_ODB::dump_objects ()
 {
   ACE_TRACE ("ACE_ODB::dump_objects");
   for (int i = 0; i < this->current_size_; i++)
diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h
index d20fae85074..b9200fbc1b9 100644
--- a/ACE/ace/Dump_T.h
+++ b/ACE/ace/Dump_T.h
@@ -43,7 +43,7 @@ public:
 
   /// Concrete dump method (simply delegates to the dump() method of
   /// <class Concrete>).
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Delegate to methods in the Concrete class.
   Concrete *operator->() const;
diff --git a/ACE/ace/Dynamic.cpp b/ACE/ace/Dynamic.cpp
index 469d67e4029..0fce1544182 100644
--- a/ACE/ace/Dynamic.cpp
+++ b/ACE/ace/Dynamic.cpp
@@ -8,11 +8,9 @@
 #include "ace/Dynamic.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Dynamic::ACE_Dynamic (void)
+ACE_Dynamic::ACE_Dynamic ()
   : is_dynamic_ (false)
 {
   ACE_TRACE ("ACE_Dynamic::ACE_Dynamic");
@@ -21,7 +19,7 @@ ACE_Dynamic::ACE_Dynamic (void)
 ACE_ALLOC_HOOK_DEFINE(ACE_Dynamic)
 
 /* static */ ACE_Dynamic *
-ACE_Dynamic::instance (void)
+ACE_Dynamic::instance ()
 {
   return ACE_TSS_Singleton<ACE_Dynamic, ACE_SYNCH_NULL_MUTEX>::instance ();
 }
diff --git a/ACE/ace/Dynamic.h b/ACE/ace/Dynamic.h
index 202d000dc3f..17c16e58a90 100644
--- a/ACE/ace/Dynamic.h
+++ b/ACE/ace/Dynamic.h
@@ -33,25 +33,25 @@ class ACE_Export ACE_Dynamic
 {
 public:
   /// Constructor.
-  ACE_Dynamic (void);
+  ACE_Dynamic ();
 
   /// Destructor.
-  ~ACE_Dynamic (void);
+  ~ACE_Dynamic ();
 
   /**
    * Sets a flag that indicates that the object was dynamically
    * created. This method is usually called in operator new and then
    * checked and reset in the constructor.
    */
-  void set (void);
+  void set ();
 
   /// @c true if we were allocated dynamically, else @c false.
-  bool is_dynamic (void);
+  bool is_dynamic ();
 
   /// Resets state flag.
-  void reset (void);
+  void reset ();
 
-  static ACE_Dynamic *instance (void);
+  static ACE_Dynamic *instance ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ace/Dynamic.inl b/ACE/ace/Dynamic.inl
index 795f33d2ec3..c1c44f59692 100644
--- a/ACE/ace/Dynamic.inl
+++ b/ACE/ace/Dynamic.inl
@@ -2,27 +2,27 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Dynamic::~ACE_Dynamic (void)
+ACE_Dynamic::~ACE_Dynamic ()
 {
   // ACE_TRACE ("ACE_Dynamic::~ACE_Dynamic");
 }
 
 ACE_INLINE void
-ACE_Dynamic::set (void)
+ACE_Dynamic::set ()
 {
   // ACE_TRACE ("ACE_Dynamic::set");
   this->is_dynamic_ = true;
 }
 
 ACE_INLINE bool
-ACE_Dynamic::is_dynamic (void)
+ACE_Dynamic::is_dynamic ()
 {
   // ACE_TRACE ("ACE_Dynamic::is_dynamic");
   return this->is_dynamic_;
 }
 
 ACE_INLINE void
-ACE_Dynamic::reset (void)
+ACE_Dynamic::reset ()
 {
   // ACE_TRACE ("ACE_Dynamic::reset");
   this->is_dynamic_ = false;
diff --git a/ACE/ace/Dynamic_Message_Strategy.cpp b/ACE/ace/Dynamic_Message_Strategy.cpp
index 35802fdbff2..600e9afc60a 100644
--- a/ACE/ace/Dynamic_Message_Strategy.cpp
+++ b/ACE/ace/Dynamic_Message_Strategy.cpp
@@ -29,7 +29,7 @@ ACE_Dynamic_Message_Strategy::ACE_Dynamic_Message_Strategy (unsigned long static
 
 // dtor
 
-ACE_Dynamic_Message_Strategy::~ACE_Dynamic_Message_Strategy (void)
+ACE_Dynamic_Message_Strategy::~ACE_Dynamic_Message_Strategy ()
 {
 }
 
@@ -82,7 +82,7 @@ ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
 // Dump the state of the strategy.
 
 void
-ACE_Dynamic_Message_Strategy::dump (void) const
+ACE_Dynamic_Message_Strategy::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Message_Strategy::dump");
@@ -123,7 +123,7 @@ ACE_Deadline_Message_Strategy::ACE_Deadline_Message_Strategy (unsigned long stat
 {
 }
 
-ACE_Deadline_Message_Strategy::~ACE_Deadline_Message_Strategy (void)
+ACE_Deadline_Message_Strategy::~ACE_Deadline_Message_Strategy ()
 {
 }
 
@@ -138,7 +138,7 @@ ACE_Deadline_Message_Strategy::convert_priority (ACE_Time_Value & priority,
   // dynamic priority conversion function based on time to deadline
 
 void
-ACE_Deadline_Message_Strategy::dump (void) const
+ACE_Deadline_Message_Strategy::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Deadline_Message_Strategy::dump");
@@ -165,7 +165,7 @@ ACE_Laxity_Message_Strategy::ACE_Laxity_Message_Strategy (unsigned long static_b
 {
 }
 
-ACE_Laxity_Message_Strategy::~ACE_Laxity_Message_Strategy (void)
+ACE_Laxity_Message_Strategy::~ACE_Laxity_Message_Strategy ()
 {
 }
 
@@ -181,7 +181,7 @@ ACE_Laxity_Message_Strategy::convert_priority (ACE_Time_Value & priority,
   // dynamic priority conversion function based on laxity
 
 void
-ACE_Laxity_Message_Strategy::dump (void) const
+ACE_Laxity_Message_Strategy::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Laxity_Message_Strategy::dump");
diff --git a/ACE/ace/Dynamic_Message_Strategy.h b/ACE/ace/Dynamic_Message_Strategy.h
index 5d24157caf1..0602030a64a 100644
--- a/ACE/ace/Dynamic_Message_Strategy.h
+++ b/ACE/ace/Dynamic_Message_Strategy.h
@@ -68,38 +68,38 @@ public:
                                 unsigned long dynamic_priority_offset);
 
   /// Virtual destructor.
-  virtual ~ACE_Dynamic_Message_Strategy (void);
+  virtual ~ACE_Dynamic_Message_Strategy ();
 
   /// Updates the message's priority and returns its priority status.
   Priority_Status priority_status (ACE_Message_Block &mb,
                                    const ACE_Time_Value &tv);
 
   /// Get static bit field mask.
-  unsigned long static_bit_field_mask (void) const;
+  unsigned long static_bit_field_mask () const;
 
   /// Set static bit field mask.
   void static_bit_field_mask (unsigned long);
 
   /// Get left shift value to make room for static bit field.
-  unsigned long static_bit_field_shift (void) const;
+  unsigned long static_bit_field_shift () const;
 
   /// Set left shift value to make room for static bit field.
   void static_bit_field_shift (unsigned long);
 
   /// Get maximum supported priority value.
-  unsigned long dynamic_priority_max (void) const;
+  unsigned long dynamic_priority_max () const;
 
   /// Set maximum supported priority value.
   void dynamic_priority_max (unsigned long);
 
   /// Get offset to boundary between signed range and unsigned range.
-  unsigned long dynamic_priority_offset (void) const;
+  unsigned long dynamic_priority_offset () const;
 
   /// Set offset to boundary between signed range and unsigned range.
   void dynamic_priority_offset (unsigned long);
 
   /// Dump the state of the strategy.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
 protected:
   /// Hook method for dynamic priority conversion.
@@ -156,14 +156,14 @@ public:
                                  unsigned long dynamic_priority_offset = 0x200000UL); // 2^(22-1)
 
   /// Virtual destructor.
-  virtual ~ACE_Deadline_Message_Strategy (void);
+  virtual ~ACE_Deadline_Message_Strategy ();
 
   /// Dynamic priority conversion function based on time to deadline.
   virtual void convert_priority (ACE_Time_Value &priority,
                                  const ACE_Message_Block &mb);
 
   /// Dump the state of the strategy.
-  virtual void dump (void) const;
+  virtual void dump () const;
 };
 
 /**
@@ -191,14 +191,14 @@ public:
                                unsigned long dynamic_priority_offset = 0x200000UL); // 2^(22-1)
 
   /// virtual dtor.
-  virtual ~ACE_Laxity_Message_Strategy (void);
+  virtual ~ACE_Laxity_Message_Strategy ();
 
   /// Dynamic priority conversion function based on laxity.
   virtual void convert_priority (ACE_Time_Value &priority,
                                  const ACE_Message_Block &mb);
 
   /// Dump the state of the strategy.
-  virtual void dump (void) const;
+  virtual void dump () const;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Dynamic_Message_Strategy.inl b/ACE/ace/Dynamic_Message_Strategy.inl
index 675e0f1e491..443c43962a6 100644
--- a/ACE/ace/Dynamic_Message_Strategy.inl
+++ b/ACE/ace/Dynamic_Message_Strategy.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE unsigned long
-ACE_Dynamic_Message_Strategy::static_bit_field_mask (void) const
+ACE_Dynamic_Message_Strategy::static_bit_field_mask () const
 {
   return static_bit_field_mask_;
 }
@@ -16,7 +16,7 @@ ACE_Dynamic_Message_Strategy::static_bit_field_mask (unsigned long ul)
   // set static bit field mask
 
 ACE_INLINE unsigned long
-ACE_Dynamic_Message_Strategy::static_bit_field_shift (void) const
+ACE_Dynamic_Message_Strategy::static_bit_field_shift () const
 {
   return static_bit_field_shift_;
 }
@@ -30,7 +30,7 @@ ACE_Dynamic_Message_Strategy::static_bit_field_shift (unsigned long ul)
   // set left shift value to make room for static bit field
 
 ACE_INLINE unsigned long
-ACE_Dynamic_Message_Strategy::dynamic_priority_max (void) const
+ACE_Dynamic_Message_Strategy::dynamic_priority_max () const
 {
   return dynamic_priority_max_;
 }
@@ -49,7 +49,7 @@ ACE_Dynamic_Message_Strategy::dynamic_priority_max (unsigned long ul)
   // set maximum supported priority value
 
 ACE_INLINE unsigned long
-ACE_Dynamic_Message_Strategy::dynamic_priority_offset (void) const
+ACE_Dynamic_Message_Strategy::dynamic_priority_offset () const
 {
   return dynamic_priority_offset_;
 }
diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp
index d38f1a5cd9f..e0912b1df58 100644
--- a/ACE/ace/Dynamic_Service_Base.cpp
+++ b/ACE/ace/Dynamic_Service_Base.cpp
@@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
 void
-ACE_Dynamic_Service_Base::dump (void) const
+ACE_Dynamic_Service_Base::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Service_Base::dump");
diff --git a/ACE/ace/Dynamic_Service_Base.h b/ACE/ace/Dynamic_Service_Base.h
index 3d46492031b..308290e5fdd 100644
--- a/ACE/ace/Dynamic_Service_Base.h
+++ b/ACE/ace/Dynamic_Service_Base.h
@@ -37,7 +37,7 @@ class ACE_Export ACE_Dynamic_Service_Base
 {
 public:
   /// Dump the current static of the object
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// Perform the default repo search, but optionally skip searching the global
@@ -49,8 +49,8 @@ protected:
                          bool no_global = false);
 
   /// No need to create, or assign instances of this class
-  ACE_Dynamic_Service_Base (void);
-  ~ACE_Dynamic_Service_Base (void);
+  ACE_Dynamic_Service_Base ();
+  ~ACE_Dynamic_Service_Base ();
   const ACE_Dynamic_Service_Base& operator= (const ACE_Dynamic_Service_Base&);
 
 private:
diff --git a/ACE/ace/Dynamic_Service_Dependency.cpp b/ACE/ace/Dynamic_Service_Dependency.cpp
index 0a7e9e03d74..c94e7df35fe 100644
--- a/ACE/ace/Dynamic_Service_Dependency.cpp
+++ b/ACE/ace/Dynamic_Service_Dependency.cpp
@@ -18,7 +18,7 @@ ACE_Dynamic_Service_Dependency::ACE_Dynamic_Service_Dependency (const ACE_Servic
 }
 
 
-ACE_Dynamic_Service_Dependency::~ACE_Dynamic_Service_Dependency (void)
+ACE_Dynamic_Service_Dependency::~ACE_Dynamic_Service_Dependency ()
 {
   if (ACE::debug ())
     ACELIB_DEBUG ((LM_DEBUG,
diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h
index 2c97e27c657..1e4ddf7aac7 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.h
+++ b/ACE/ace/ETCL/ETCL_Constraint.h
@@ -34,8 +34,8 @@ class ACE_ETCL_Export ETCL_Constraint
 {
 public:
   /// Constructor and destructor
-  ETCL_Constraint (void);
-  virtual ~ETCL_Constraint (void);
+  ETCL_Constraint ();
+  virtual ~ETCL_Constraint ();
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -59,7 +59,7 @@ class ACE_ETCL_Export ETCL_Literal_Constraint
   : public ETCL_Constraint
 {
 public:
-  ETCL_Literal_Constraint (void);
+  ETCL_Literal_Constraint ();
 
   // = Constructors for each of the various types of literals.
   explicit ETCL_Literal_Constraint (ACE_CDR::ULong uinteger);
@@ -72,22 +72,22 @@ public:
   ETCL_Literal_Constraint (const ETCL_Literal_Constraint& lit);
 
   /// Destructor.
-  virtual ~ETCL_Literal_Constraint(void);
+  virtual ~ETCL_Literal_Constraint();
 
   /// Visitor accept method.
   virtual int accept (ETCL_Constraint_Visitor* visitor);
 
-  Literal_Type expr_type (void) const;
+  Literal_Type expr_type () const;
 
   /// Assignment operator.
   void operator= (const ETCL_Literal_Constraint& co);
 
   // Conversion routines.
-  operator ACE_CDR::Boolean (void) const;
-  operator ACE_CDR::ULong (void) const;
-  operator ACE_CDR::Long (void) const;
-  operator ACE_CDR::Double (void) const;
-  operator const char* (void) const;
+  operator ACE_CDR::Boolean () const;
+  operator ACE_CDR::ULong () const;
+  operator ACE_CDR::Long () const;
+  operator ACE_CDR::Double () const;
+  operator const char* () const;
 
   // Return the type represented by this MysteryOperand.
 
@@ -127,7 +127,7 @@ public:
 
   // Unary minus.
   ETCL_Literal_Constraint
-  operator- (void);
+  operator- ();
 
   /// Ensure both operands are of the same simple numeric type.
   virtual Literal_Type
@@ -159,7 +159,7 @@ public:
   ETCL_Identifier (const char *value);
 
   /// Get the value
-  const char *value (void) const;
+  const char *value () const;
 
   // = The Constraint methods.
   int accept (ETCL_Constraint_Visitor *visitor);
@@ -177,11 +177,11 @@ public:
   ETCL_Union_Value (int sign,
                     ETCL_Constraint *integer);
   explicit ETCL_Union_Value (ETCL_Constraint *string = 0);
-  virtual ~ETCL_Union_Value (void);
+  virtual ~ETCL_Union_Value ();
 
-  int sign (void) const;
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Literal_Constraint *string (void) const;
+  int sign () const;
+  ETCL_Literal_Constraint *integer () const;
+  ETCL_Literal_Constraint *string () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -196,10 +196,10 @@ class ACE_ETCL_Export ETCL_Union_Pos : public ETCL_Constraint
 public:
   ETCL_Union_Pos (ETCL_Constraint *union_value = 0,
                   ETCL_Constraint *component = 0);
-  virtual ~ETCL_Union_Pos (void);
+  virtual ~ETCL_Union_Pos ();
 
-  ETCL_Union_Value *union_value (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Union_Value *union_value () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -213,10 +213,10 @@ class ACE_ETCL_Export ETCL_Component_Pos : public ETCL_Constraint
 public:
   ETCL_Component_Pos (ETCL_Constraint *integer = 0,
                       ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Pos (void);
+  virtual ~ETCL_Component_Pos ();
 
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Literal_Constraint *integer () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -230,10 +230,10 @@ class ACE_ETCL_Export ETCL_Component_Assoc : public ETCL_Constraint
 public:
   ETCL_Component_Assoc (ETCL_Constraint *identifier = 0,
                         ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Assoc (void);
+  virtual ~ETCL_Component_Assoc ();
 
-  ETCL_Identifier *identifier (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Identifier *identifier () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -247,10 +247,10 @@ class ACE_ETCL_Export ETCL_Component_Array : public ETCL_Constraint
 public:
   ETCL_Component_Array (ETCL_Constraint *integer = 0,
                         ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Array (void);
+  virtual ~ETCL_Component_Array ();
 
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Literal_Constraint *integer () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -262,11 +262,11 @@ private:
 class ACE_ETCL_Export ETCL_Special : public ETCL_Constraint
 {
 public:
-  ETCL_Special (void);
+  ETCL_Special ();
   ETCL_Special (int type);
-  virtual ~ETCL_Special (void);
+  virtual ~ETCL_Special ();
 
-  int type (void) const;
+  int type () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -279,10 +279,10 @@ class ACE_ETCL_Export ETCL_Component : public ETCL_Constraint
 public:
   ETCL_Component (ETCL_Constraint *identifier = 0,
                   ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component (void);
+  virtual ~ETCL_Component ();
 
-  ETCL_Identifier *identifier (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Identifier *identifier () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -295,9 +295,9 @@ class ACE_ETCL_Export ETCL_Dot : public ETCL_Constraint
 {
 public:
   explicit ETCL_Dot (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Dot (void);
+  virtual ~ETCL_Dot ();
 
-  ETCL_Constraint *component (void) const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -309,9 +309,9 @@ class ACE_ETCL_Export ETCL_Eval : public ETCL_Constraint
 {
 public:
   explicit ETCL_Eval (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Eval (void);
+  virtual ~ETCL_Eval ();
 
-  ETCL_Constraint *component (void) const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -323,9 +323,9 @@ class ACE_ETCL_Export ETCL_Default : public ETCL_Constraint
 {
 public:
   explicit ETCL_Default (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Default (void);
+  virtual ~ETCL_Default ();
 
-  ETCL_Constraint *component (void) const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -337,9 +337,9 @@ class ACE_ETCL_Export ETCL_Exist : public ETCL_Constraint
 {
 public:
   explicit ETCL_Exist (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Exist (void);
+  virtual ~ETCL_Exist ();
 
-  ETCL_Constraint *component (void) const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -352,10 +352,10 @@ class ACE_ETCL_Export ETCL_Unary_Expr : public ETCL_Constraint
 public:
   ETCL_Unary_Expr (int type,
                    ETCL_Constraint *subexpr);
-  virtual ~ETCL_Unary_Expr (void);
+  virtual ~ETCL_Unary_Expr ();
 
-  int type (void) const;
-  ETCL_Constraint *subexpr (void) const;
+  int type () const;
+  ETCL_Constraint *subexpr () const;
 
   int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -370,11 +370,11 @@ public:
   ETCL_Binary_Expr (int type,
                     ETCL_Constraint *lhs,
                     ETCL_Constraint *rhs);
-  virtual ~ETCL_Binary_Expr (void);
+  virtual ~ETCL_Binary_Expr ();
 
-  int type (void) const;
-  ETCL_Constraint *rhs (void) const;
-  ETCL_Constraint *lhs (void) const;
+  int type () const;
+  ETCL_Constraint *rhs () const;
+  ETCL_Constraint *lhs () const;
 
   int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -387,13 +387,13 @@ private:
 class ACE_ETCL_Export ETCL_Preference : public ETCL_Constraint
 {
 public:
-  ETCL_Preference (void);
+  ETCL_Preference ();
   ETCL_Preference (int type,
                    ETCL_Constraint *subexpr = 0);
-  virtual ~ETCL_Preference (void);
+  virtual ~ETCL_Preference ();
 
-  int type (void) const;
-  ETCL_Constraint *subexpr (void) const;
+  int type () const;
+  ETCL_Constraint *subexpr () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl
index 2ee32f420c6..b10fd67cd31 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.inl
+++ b/ACE/ace/ETCL/ETCL_Constraint.inl
@@ -2,7 +2,7 @@
 // ****************************************************************
 
 ACE_INLINE
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (void)
+ETCL_Literal_Constraint::ETCL_Literal_Constraint ()
   : type_ (ACE_ETCL_UNKNOWN)
 {
 }
@@ -16,7 +16,7 @@ ETCL_Identifier::ETCL_Identifier (const char *value)
 }
 
 ACE_INLINE const char *
-ETCL_Identifier::value (void) const
+ETCL_Identifier::value () const
 {
   return this->string_.c_str ();
 }
@@ -44,19 +44,19 @@ ETCL_Union_Value::ETCL_Union_Value (ETCL_Constraint *string)
 }
 
 ACE_INLINE int
-ETCL_Union_Value::sign (void) const
+ETCL_Union_Value::sign () const
 {
   return this->sign_;
 }
 
 ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Union_Value::integer (void) const
+ETCL_Union_Value::integer () const
 {
   return this->integer_;
 }
 
 ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Union_Value::string (void) const
+ETCL_Union_Value::string () const
 {
   return this->string_;
 }
@@ -73,13 +73,13 @@ ETCL_Union_Pos::ETCL_Union_Pos (ETCL_Constraint *union_value,
 }
 
 ACE_INLINE ETCL_Union_Value *
-ETCL_Union_Pos::union_value (void) const
+ETCL_Union_Pos::union_value () const
 {
   return this->union_value_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Union_Pos::component (void) const
+ETCL_Union_Pos::component () const
 {
   return this->component_;
 }
@@ -97,13 +97,13 @@ ETCL_Component_Pos::ETCL_Component_Pos (
 }
 
 ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Component_Pos::integer (void) const
+ETCL_Component_Pos::integer () const
 {
   return this->integer_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Component_Pos::component (void) const
+ETCL_Component_Pos::component () const
 {
   return this->component_;
 }
@@ -121,13 +121,13 @@ ETCL_Component_Assoc::ETCL_Component_Assoc (
 }
 
 ACE_INLINE ETCL_Identifier *
-ETCL_Component_Assoc::identifier (void) const
+ETCL_Component_Assoc::identifier () const
 {
   return this->identifier_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Component_Assoc::component (void) const
+ETCL_Component_Assoc::component () const
 {
   return this->component_;
 }
@@ -145,13 +145,13 @@ ETCL_Component_Array::ETCL_Component_Array (
 }
 
 ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Component_Array::integer (void) const
+ETCL_Component_Array::integer () const
 {
   return this->integer_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Component_Array::component (void) const
+ETCL_Component_Array::component () const
 {
   return this->component_;
 }
@@ -159,7 +159,7 @@ ETCL_Component_Array::component (void) const
 // ****************************************************************
 
 ACE_INLINE
-ETCL_Special::ETCL_Special (void)
+ETCL_Special::ETCL_Special ()
   : type_ (0)
 {}
 
@@ -169,7 +169,7 @@ ETCL_Special::ETCL_Special (int type)
 {}
 
 ACE_INLINE int
-ETCL_Special::type (void) const
+ETCL_Special::type () const
 {
   return this->type_;
 }
@@ -186,13 +186,13 @@ ETCL_Component::ETCL_Component (ETCL_Constraint *identifier,
 }
 
 ACE_INLINE ETCL_Identifier *
-ETCL_Component::identifier (void) const
+ETCL_Component::identifier () const
 {
   return this->identifier_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Component::component (void) const
+ETCL_Component::component () const
 {
   return this->component_;
 }
@@ -206,7 +206,7 @@ ETCL_Dot::ETCL_Dot (ETCL_Constraint *component)
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Dot::component (void) const
+ETCL_Dot::component () const
 {
   return this->component_;
 }
@@ -220,7 +220,7 @@ ETCL_Eval::ETCL_Eval (ETCL_Constraint *component)
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Eval::component (void) const
+ETCL_Eval::component () const
 {
   return this->component_;
 }
@@ -234,7 +234,7 @@ ETCL_Default::ETCL_Default (ETCL_Constraint *component)
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Default::component (void) const
+ETCL_Default::component () const
 {
   return this->component_;
 }
@@ -248,7 +248,7 @@ ETCL_Exist::ETCL_Exist (ETCL_Constraint *component)
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Exist::component (void) const
+ETCL_Exist::component () const
 {
   return this->component_;
 }
@@ -263,13 +263,13 @@ ETCL_Unary_Expr::ETCL_Unary_Expr (int type,
 {}
 
 ACE_INLINE int
-ETCL_Unary_Expr::type (void) const
+ETCL_Unary_Expr::type () const
 {
   return this->type_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Unary_Expr::subexpr (void) const
+ETCL_Unary_Expr::subexpr () const
 {
   return this->subexpr_;
 }
@@ -286,19 +286,19 @@ ETCL_Binary_Expr::ETCL_Binary_Expr (int type,
 {}
 
 ACE_INLINE int
-ETCL_Binary_Expr::type (void) const
+ETCL_Binary_Expr::type () const
 {
   return this->type_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Binary_Expr::rhs (void) const
+ETCL_Binary_Expr::rhs () const
 {
   return this->rhs_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Binary_Expr::lhs (void) const
+ETCL_Binary_Expr::lhs () const
 {
   return this->lhs_;
 }
@@ -306,7 +306,7 @@ ETCL_Binary_Expr::lhs (void) const
 // ****************************************************************
 
 ACE_INLINE
-ETCL_Preference::ETCL_Preference (void)
+ETCL_Preference::ETCL_Preference ()
   : type_ (0),
     subexpr_ (0)
 {}
@@ -319,13 +319,13 @@ ETCL_Preference::ETCL_Preference (int type,
 {}
 
 ACE_INLINE int
-ETCL_Preference::type (void) const
+ETCL_Preference::type () const
 {
   return this->type_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Preference::subexpr (void) const
+ETCL_Preference::subexpr () const
 {
   return this->subexpr_;
 }
diff --git a/ACE/ace/ETCL/ETCL_Interpreter.h b/ACE/ace/ETCL/ETCL_Interpreter.h
index 517ffb239f2..b5f57b570ab 100644
--- a/ACE/ace/ETCL/ETCL_Interpreter.h
+++ b/ACE/ace/ETCL/ETCL_Interpreter.h
@@ -44,10 +44,10 @@ class ETCL_Parser_Export ETCL_Interpreter
 {
 protected:
   /// Constructor.
-  ETCL_Interpreter (void);
+  ETCL_Interpreter ();
 
   /// Destructor.
-  virtual ~ETCL_Interpreter (void);
+  virtual ~ETCL_Interpreter ();
 
   /// Using the Yacc generated parser, construct an expression tree
   /// representing @a constraints from the tokens returned by it.
@@ -65,9 +65,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
diff --git a/ACE/ace/Env_Value_T.h b/ACE/ace/Env_Value_T.h
index 4e268d3f933..6e97e3602d7 100644
--- a/ACE/ace/Env_Value_T.h
+++ b/ACE/ace/Env_Value_T.h
@@ -44,26 +44,26 @@ public:
    * variable name or a default value.  Before being useful it must
    * open()'d.
    */
-  ACE_Env_Value (void);
+  ACE_Env_Value ();
 
   /// Constructor that calls open().
   ACE_Env_Value (const ACE_TCHAR *varname, const T &vardefault);
 
   /// Destroy the value.
-  ~ACE_Env_Value (void);
+  ~ACE_Env_Value ();
 
   /// Returns the value as type T.
-  operator T (void);
+  operator T ();
 
   /// The constructor, read @a varname from the environment, using
   /// @a defval as its value if it is not defined.
   void open (const ACE_TCHAR *varname, const T &defval);
 
   /// Returns the name of the variable being tracked.
-  const ACE_TCHAR *varname (void) const;
+  const ACE_TCHAR *varname () const;
 
 private:
-  void fetch_value (void);
+  void fetch_value ();
 
   const ACE_TCHAR *varname_;
   T value_;
diff --git a/ACE/ace/Env_Value_T.inl b/ACE/ace/Env_Value_T.inl
index 1fc1b863f03..f016e5c5f68 100644
--- a/ACE/ace/Env_Value_T.inl
+++ b/ACE/ace/Env_Value_T.inl
@@ -1,13 +1,13 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T> ACE_INLINE
-ACE_Env_Value<T>::operator T (void)
+ACE_Env_Value<T>::operator T ()
 {
   return value_;
 }
 
 template <class T> ACE_INLINE
-ACE_Env_Value<T>::ACE_Env_Value (void)
+ACE_Env_Value<T>::ACE_Env_Value ()
   : varname_ (0)
 {
 }
@@ -31,7 +31,7 @@ ACE_Env_Value<T>::open (const ACE_TCHAR *varname,
 }
 
 template <class T> ACE_INLINE void
-ACE_Env_Value<T>::fetch_value (void)
+ACE_Env_Value<T>::fetch_value ()
 {
 #if defined (ACE_WIN32)
   const ACE_TCHAR *env = ACE_OS::getenv (this->varname_);
@@ -45,13 +45,13 @@ ACE_Env_Value<T>::fetch_value (void)
 }
 
 template <class T> ACE_INLINE const ACE_TCHAR*
-ACE_Env_Value<T>::varname (void) const
+ACE_Env_Value<T>::varname () const
 {
   return this->varname_;
 }
 
 template <class T> ACE_INLINE
-ACE_Env_Value<T>::~ACE_Env_Value (void)
+ACE_Env_Value<T>::~ACE_Env_Value ()
 {
 }
 
diff --git a/ACE/ace/Event.cpp b/ACE/ace/Event.cpp
index 20fe0730644..01918ec80e1 100644
--- a/ACE/ace/Event.cpp
+++ b/ACE/ace/Event.cpp
@@ -38,7 +38,7 @@ ACE_Event_T<TIME_POLICY>::ACE_Event_T (int manual_reset,
 }
 
 template <class TIME_POLICY>
-ACE_Event_T<TIME_POLICY>::~ACE_Event_T (void)
+ACE_Event_T<TIME_POLICY>::~ACE_Event_T ()
 {
 }
 
diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h
index e8c9db91faf..d0ebcb0c160 100644
--- a/ACE/ace/Event.h
+++ b/ACE/ace/Event.h
@@ -49,11 +49,11 @@ public:
                LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Implicitly destroy the event variable.
-  virtual ~ACE_Event_T (void);
+  virtual ~ACE_Event_T ();
 
   /// Get the current time of day according to the queue's TIME_POLICY.
   /// Allows users to initialize timeout values using correct time policy.
-  ACE_Time_Value_T<TIME_POLICY> gettimeofday (void) const;
+  ACE_Time_Value_T<TIME_POLICY> gettimeofday () const;
 
   /// Allows applications to control how the event gets the time
   /// of day.
diff --git a/ACE/ace/Event.inl b/ACE/ace/Event.inl
index b8a688be71d..b369cd29649 100644
--- a/ACE/ace/Event.inl
+++ b/ACE/ace/Event.inl
@@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TIME_POLICY>
 ACE_Time_Value_T<TIME_POLICY>
-ACE_Event_T<TIME_POLICY>::gettimeofday (void) const
+ACE_Event_T<TIME_POLICY>::gettimeofday () const
 {
   return this->time_policy_ ();
 }
diff --git a/ACE/ace/Event_Base.cpp b/ACE/ace/Event_Base.cpp
index 3ec4ea02be9..31e2249acf8 100644
--- a/ACE/ace/Event_Base.cpp
+++ b/ACE/ace/Event_Base.cpp
@@ -18,13 +18,13 @@ ACE_Event_Base::ACE_Event_Base ()
 {
 }
 
-ACE_Event_Base::~ACE_Event_Base (void)
+ACE_Event_Base::~ACE_Event_Base ()
 {
   this->remove ();
 }
 
 int
-ACE_Event_Base::remove (void)
+ACE_Event_Base::remove ()
 {
   int result = 0;
   if (!this->removed_)
@@ -36,7 +36,7 @@ ACE_Event_Base::remove (void)
 }
 
 int
-ACE_Event_Base::wait (void)
+ACE_Event_Base::wait ()
 {
   return ACE_OS::event_wait (&this->handle_);
 }
@@ -50,25 +50,25 @@ ACE_Event_Base::wait (const ACE_Time_Value *abstime, int use_absolute_time)
 }
 
 int
-ACE_Event_Base::signal (void)
+ACE_Event_Base::signal ()
 {
   return ACE_OS::event_signal (&this->handle_);
 }
 
 int
-ACE_Event_Base::pulse (void)
+ACE_Event_Base::pulse ()
 {
   return ACE_OS::event_pulse (&this->handle_);
 }
 
 int
-ACE_Event_Base::reset (void)
+ACE_Event_Base::reset ()
 {
   return ACE_OS::event_reset (&this->handle_);
 }
 
 void
-ACE_Event_Base::dump (void) const
+ACE_Event_Base::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
diff --git a/ACE/ace/Event_Base.h b/ACE/ace/Event_Base.h
index a158c5e67fe..aaef456772b 100644
--- a/ACE/ace/Event_Base.h
+++ b/ACE/ace/Event_Base.h
@@ -40,17 +40,17 @@ class ACE_Export ACE_Event_Base
 {
 public:
   /// Implicitly destroy the event variable.
-  virtual ~ACE_Event_Base (void);
+  virtual ~ACE_Event_Base ();
 
   /**
    * Explicitly destroy the event variable.  Note that only one thread
    * should call this method since it doesn't protect against race
    * conditions.
    */
-  int remove (void);
+  int remove ();
 
   /// Underlying handle to event.
-  ACE_event_t handle (void) const;
+  ACE_event_t handle () const;
 
   /**
    * Set the underlying handle to event. Note that this method assumes
@@ -70,7 +70,7 @@ public:
    *    sleep till the event becomes signaled
    *    event resets wait() completes.
    */
-  int wait (void);
+  int wait ();
 
   /// Same as wait() above, but this one can be timed
   /// @a abstime is absolute time-of-day if if @a use_absolute_time
@@ -87,7 +87,7 @@ public:
    *    if thread(s) are waiting, wake up one waiting thread and
    *    reset event
    */
-  int signal (void);
+  int signal ();
 
   /**
    * if MANUAL reset
@@ -97,13 +97,13 @@ public:
    *    wakeup one waiting thread (if present) and
    *    reset event
    */
-  int pulse (void);
+  int pulse ();
 
   /// Set to nonsignaled state.
-  int reset (void);
+  int reset ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Event_Base.inl b/ACE/ace/Event_Base.inl
index fa8cf909e27..dc38a38f45c 100644
--- a/ACE/ace/Event_Base.inl
+++ b/ACE/ace/Event_Base.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_event_t
-ACE_Event_Base::handle (void) const
+ACE_Event_Base::handle () const
 {
   return this->handle_;
 }
diff --git a/ACE/ace/Event_Handler.cpp b/ACE/ace/Event_Handler.cpp
index 6a44bf58eea..4b016b0b1bc 100644
--- a/ACE/ace/Event_Handler.cpp
+++ b/ACE/ace/Event_Handler.cpp
@@ -6,10 +6,6 @@
 /* Need to see if ACE_HAS_BUILTIN_ATOMIC_OP defined */
 #include "ace/Atomic_Op.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Event_Handler.inl"
-#endif /* __ACE_INLINE__ */
-
 #include <algorithm>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -26,14 +22,14 @@ ACE_Event_Handler::ACE_Event_Handler (ACE_Reactor *r,
   // ACE_TRACE ("ACE_Event_Handler::ACE_Event_Handler");
 }
 
-ACE_Event_Handler::~ACE_Event_Handler (void)
+ACE_Event_Handler::~ACE_Event_Handler ()
 {
   // ACE_TRACE ("ACE_Event_Handler::~ACE_Event_Handler");
 }
 
 // Gets the file descriptor associated with this I/O device.
 ACE_HANDLE
-ACE_Event_Handler::get_handle (void) const
+ACE_Event_Handler::get_handle () const
 {
   ACE_TRACE ("ACE_Event_Handler::get_handle");
   return ACE_INVALID_HANDLE;
@@ -48,7 +44,7 @@ ACE_Event_Handler::set_handle (ACE_HANDLE)
 
 // Gets the priority of this handler.
 int
-ACE_Event_Handler::priority (void) const
+ACE_Event_Handler::priority () const
 {
   ACE_TRACE ("ACE_Event_Handler::priority");
   return this->priority_;
@@ -120,7 +116,7 @@ ACE_Event_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 }
 
 int
-ACE_Event_Handler::resume_handler (void)
+ACE_Event_Handler::resume_handler ()
 {
   ACE_TRACE ("ACE_Event_Handler::resume_handler");
 
@@ -151,21 +147,21 @@ ACE_Event_Handler::reactor (ACE_Reactor *reactor)
 }
 
 ACE_Reactor *
-ACE_Event_Handler::reactor (void) const
+ACE_Event_Handler::reactor () const
 {
   ACE_TRACE ("ACE_Event_Handler::reactor");
   return this->reactor_;
 }
 
 ACE_Reactor_Timer_Interface *
-ACE_Event_Handler::reactor_timer_interface (void) const
+ACE_Event_Handler::reactor_timer_interface () const
 {
   ACE_TRACE ("ACE_Event_Handler::reactor_timer_interface");
   return this->reactor_;
 }
 
 ACE_Event_Handler::Reference_Count
-ACE_Event_Handler::add_reference (void)
+ACE_Event_Handler::add_reference ()
 {
   bool const reference_counting_required =
     this->reference_counting_policy ().value () ==
@@ -178,7 +174,7 @@ ACE_Event_Handler::add_reference (void)
 }
 
 ACE_Event_Handler::Reference_Count
-ACE_Event_Handler::remove_reference (void)
+ACE_Event_Handler::remove_reference ()
 {
   bool const reference_counting_required =
     this->reference_counting_policy ().value () ==
@@ -186,8 +182,7 @@ ACE_Event_Handler::remove_reference (void)
 
   if (reference_counting_required)
     {
-      Reference_Count result =
-        --this->reference_count_;
+      Reference_Count const result = --this->reference_count_;
 
       if (result == 0)
         delete this;
@@ -200,7 +195,7 @@ ACE_Event_Handler::remove_reference (void)
     }
 }
 
-ACE_Event_Handler::Policy::~Policy (void)
+ACE_Event_Handler::Policy::~Policy ()
 {
 }
 
@@ -210,7 +205,7 @@ ACE_Event_Handler::Reference_Counting_Policy::Reference_Counting_Policy (Referen
 }
 
 ACE_Event_Handler::Reference_Counting_Policy::Value
-ACE_Event_Handler::Reference_Counting_Policy::value (void) const
+ACE_Event_Handler::Reference_Counting_Policy::value () const
 {
   return this->value_;
 }
@@ -222,7 +217,7 @@ ACE_Event_Handler::Reference_Counting_Policy::value (ACE_Event_Handler::Referenc
 }
 
 ACE_Event_Handler::Reference_Counting_Policy &
-ACE_Event_Handler::reference_counting_policy (void)
+ACE_Event_Handler::reference_counting_policy ()
 {
   return this->reference_counting_policy_;
 }
@@ -282,7 +277,7 @@ ACE_Event_Handler::remove_stdin_handler (ACE_Reactor *reactor,
 
 // ---------------------------------------------------------------------
 
-ACE_Event_Handler_var::ACE_Event_Handler_var (void)
+ACE_Event_Handler_var::ACE_Event_Handler_var ()
   : ptr_ (0)
 {
 }
@@ -301,7 +296,7 @@ ACE_Event_Handler_var::ACE_Event_Handler_var (const ACE_Event_Handler_var &b)
     }
 }
 
-ACE_Event_Handler_var::~ACE_Event_Handler_var (void)
+ACE_Event_Handler_var::~ACE_Event_Handler_var ()
 {
   if (this->ptr_ != 0)
     {
@@ -338,13 +333,13 @@ ACE_Event_Handler_var::operator->() const
 }
 
 ACE_Event_Handler *
-ACE_Event_Handler_var::handler (void) const
+ACE_Event_Handler_var::handler () const
 {
   return this->ptr_;
 }
 
 ACE_Event_Handler *
-ACE_Event_Handler_var::release (void)
+ACE_Event_Handler_var::release ()
 {
   ACE_Event_Handler * const old = this->ptr_;
   this->ptr_ = 0;
@@ -357,29 +352,27 @@ ACE_Event_Handler_var::reset (ACE_Event_Handler *p)
   *this = p;
 }
 
-#if defined (ACE_HAS_CPP11)
 ACE_Event_Handler_var::operator bool() const
 {
-  return this->ptr_ == nullptr ? false : true;
+  return this->ptr_ != nullptr;
 }
 
 bool
 ACE_Event_Handler_var::operator ==(std::nullptr_t) const
 {
-  return this->ptr_ == nullptr ? true : false;
+  return this->ptr_ == nullptr;
 }
 
 bool
 ACE_Event_Handler_var::operator !=(std::nullptr_t) const
 {
-  return this->ptr_ == nullptr ? false : true;
+  return this->ptr_ != nullptr;
 
 }
-#endif /* ACE_HAS_CPP11 */
 
 // ---------------------------------------------------------------------
 
-ACE_Notification_Buffer::ACE_Notification_Buffer (void)
+ACE_Notification_Buffer::ACE_Notification_Buffer ()
   : eh_ (0),
     mask_ (ACE_Event_Handler::NULL_MASK)
 {
diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h
index caf5068a04d..ae23e7e82a4 100644
--- a/ACE/ace/Event_Handler.h
+++ b/ACE/ace/Event_Handler.h
@@ -19,9 +19,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/os_include/os_signal.h"
-#include "ace/Atomic_Op.h"
 #include "ace/OS_NS_Thread.h"
-#include "ace/Synch_Traits.h"
+#include <atomic>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -84,10 +83,10 @@ public:
   };
 
   /// Destructor is virtual to enable proper cleanup.
-  virtual ~ACE_Event_Handler (void);
+  virtual ~ACE_Event_Handler ();
 
   /// Get the I/O handle.
-  virtual ACE_HANDLE get_handle (void) const;
+  virtual ACE_HANDLE get_handle () const;
 
   /// Set the I/O handle.
   virtual void set_handle (ACE_HANDLE);
@@ -97,7 +96,7 @@ public:
   /// Get the priority of the Event_Handler.
   /// @note Priorities run from MIN_PRIORITY (which is the "lowest priority")
   /// to MAX_PRIORITY (which is the "highest priority").
-  virtual int priority (void) const;
+  virtual int priority () const;
 
   /// Set the priority of the Event_Handler.
   virtual void priority (int priority);
@@ -157,7 +156,7 @@ public:
    * @note This method has an affect only when used with the
    * ACE_Dev_Poll_Reactor (and then, only on Linux) or the ACE_TP_Reactor.
    */
-  virtual int resume_handler (void);
+  virtual int resume_handler ();
 
   virtual int handle_qos (ACE_HANDLE = ACE_INVALID_HANDLE);
   virtual int handle_group_qos (ACE_HANDLE = ACE_INVALID_HANDLE);
@@ -167,10 +166,10 @@ public:
   virtual void reactor (ACE_Reactor *reactor);
 
   /// Get the event demultiplexors.
-  virtual ACE_Reactor *reactor (void) const;
+  virtual ACE_Reactor *reactor () const;
 
   /// Get only the reactor's timer related interface.
-  virtual ACE_Reactor_Timer_Interface *reactor_timer_interface (void) const;
+  virtual ACE_Reactor_Timer_Interface *reactor_timer_interface () const;
 
   /**
    * Used to read from non-socket ACE_HANDLEs in our own thread to
@@ -209,7 +208,7 @@ public:
    *
    * @return Current reference count.
    */
-  virtual Reference_Count add_reference (void);
+  virtual Reference_Count add_reference ();
 
   /// Decrement reference count on the handler.
   /**
@@ -220,7 +219,7 @@ public:
    *
    * @return Current reference count.
    */
-  virtual Reference_Count remove_reference (void);
+  virtual Reference_Count remove_reference ();
 
   /**
    * @class Policy
@@ -233,7 +232,7 @@ public:
   public:
 
     /// Virtual destructor.
-    virtual ~Policy (void);
+    virtual ~Policy ();
   };
 
   /**
@@ -255,7 +254,6 @@ public:
     friend class ACE_Event_Handler;
 
   public:
-
     enum Value
       {
         /// Perform reference counting.
@@ -265,13 +263,12 @@ public:
       };
 
     /// Current Reference_Counting_Policy.
-    Value value (void) const;
+    Value value () const;
 
     /// Update Reference_Counting_Policy.
     void value (Value value);
 
   private:
-
     /// Private constructor.
     Reference_Counting_Policy (Value value);
 
@@ -280,7 +277,7 @@ public:
    };
 
   /// Current Reference_Counting_Policy.
-  Reference_Counting_Policy &reference_counting_policy (void);
+  Reference_Counting_Policy &reference_counting_policy ();
 
 protected:
   /// Force ACE_Event_Handler to be an abstract base class.
@@ -288,13 +285,12 @@ protected:
                      int priority = ACE_Event_Handler::LO_PRIORITY);
 
   /// Typedef for implementation of reference counting.
-  typedef ACE_Atomic_Op<ACE_SYNCH_MUTEX, Reference_Count> Atomic_Reference_Count;
+  typedef std::atomic<Reference_Count> Atomic_Reference_Count;
 
   /// Reference count.
   Atomic_Reference_Count reference_count_;
 
 private:
-
   /// Priority of this Event_Handler.
   int priority_;
 
@@ -317,7 +313,7 @@ class ACE_Export ACE_Event_Handler_var
 {
 public:
   /// Default constructor.
-  ACE_Event_Handler_var (void);
+  ACE_Event_Handler_var ();
 
   /// Construct with a handler.
   ACE_Event_Handler_var (ACE_Event_Handler *p);
@@ -326,7 +322,7 @@ public:
   ACE_Event_Handler_var (const ACE_Event_Handler_var &b);
 
   /// Destructor.
-  ~ACE_Event_Handler_var (void);
+  ~ACE_Event_Handler_var ();
 
   /// Assignment to a handler.
   ACE_Event_Handler_var &operator= (ACE_Event_Handler *p);
@@ -338,31 +334,26 @@ public:
   ACE_Event_Handler *operator-> () const;
 
   /// Access the handler.
-  ACE_Event_Handler *handler (void) const;
+  ACE_Event_Handler *handler () const;
 
   /// Release the handler.
-  ACE_Event_Handler *release (void);
+  ACE_Event_Handler *release ();
 
   /// Reset the handler.
   void reset (ACE_Event_Handler *p = 0);
 
-#if defined (ACE_HAS_CPP11)
   /// Bool operator to check if the ACE_Event_Handler_var has a value
   explicit operator bool() const;
   /// Equality operator to compare with nullptr_t
   bool operator ==(std::nullptr_t) const;
   /// Not equal operator to compare with nullptr_t
   bool operator !=(std::nullptr_t) const;
-#endif
 
 private:
-
   /// Handler.
   ACE_Event_Handler *ptr_;
 };
 
-#if defined ACE_HAS_CPP11
-
 /// Define that we can use in user code to check if this
 /// helper factory method is there
 #define ACE_HAS_ACE_MAKE_EVENT_HANDLER
@@ -389,8 +380,6 @@ namespace ACE
   }
 }
 
-#endif
-
 /**
  * @class ACE_Notification_Buffer
  *
@@ -400,13 +389,13 @@ namespace ACE
 class ACE_Export ACE_Notification_Buffer
 {
 public:
-  ACE_Notification_Buffer (void);
+  ACE_Notification_Buffer ();
 
   ACE_Notification_Buffer (ACE_Event_Handler *eh,
                            ACE_Reactor_Mask mask);
 
   /// Default destructor.
-  ~ACE_Notification_Buffer (void);
+  ~ACE_Notification_Buffer () = default;
 
   /// Pointer to the Event_Handler that will be dispatched
   /// by the main event loop.
@@ -418,9 +407,5 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__ACE_INLINE__)
-#include "ace/Event_Handler.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_EVENT_HANDLER_H */
diff --git a/ACE/ace/Event_Handler.inl b/ACE/ace/Event_Handler.inl
deleted file mode 100644
index 4ad5d2d26b2..00000000000
--- a/ACE/ace/Event_Handler.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- C++ -*-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-ACE_Notification_Buffer::~ACE_Notification_Buffer (void)
-{
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp
index f361e5aaeb4..8da1d1e8560 100644
--- a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp
+++ b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp
@@ -11,13 +11,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Event_Handler_Handle_Timeout_Upcall)
 
 ACE_Event_Handler_Handle_Timeout_Upcall::
-ACE_Event_Handler_Handle_Timeout_Upcall (void) :
+ACE_Event_Handler_Handle_Timeout_Upcall () :
   requires_reference_counting_ (0)
 {
 }
 
 ACE_Event_Handler_Handle_Timeout_Upcall::
-~ACE_Event_Handler_Handle_Timeout_Upcall (void)
+~ACE_Event_Handler_Handle_Timeout_Upcall ()
 {
 }
 
diff --git a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
index da0d57c7e4e..715cacb2c27 100644
--- a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
+++ b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
@@ -32,10 +32,10 @@ class ACE_Export ACE_Event_Handler_Handle_Timeout_Upcall
 {
 public:
   /// Constructor.
-  ACE_Event_Handler_Handle_Timeout_Upcall (void);
+  ACE_Event_Handler_Handle_Timeout_Upcall ();
 
   /// Destructor.
-  ~ACE_Event_Handler_Handle_Timeout_Upcall (void);
+  ~ACE_Event_Handler_Handle_Timeout_Upcall ();
 
   /// This method is called when a timer is registered.
   int registration (ACE_Timer_Queue &timer_queue,
diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h
index 97948094785..e4a1c6bbe96 100644
--- a/ACE/ace/Event_Handler_T.h
+++ b/ACE/ace/Event_Handler_T.h
@@ -135,7 +135,7 @@ public:
   void sig_handler (SIG_HANDLER);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FIFO.cpp b/ACE/ace/FIFO.cpp
index e598bb63689..3fa295e8d2d 100644
--- a/ACE/ace/FIFO.cpp
+++ b/ACE/ace/FIFO.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO)
 
 void
-ACE_FIFO::dump (void) const
+ACE_FIFO::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO::dump");
@@ -55,13 +55,13 @@ ACE_FIFO::ACE_FIFO (const ACE_TCHAR *fifo_name,
     ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO")));
 }
 
-ACE_FIFO::ACE_FIFO (void)
+ACE_FIFO::ACE_FIFO ()
 {
 //  ACE_TRACE ("ACE_FIFO::ACE_FIFO");
 }
 
 int
-ACE_FIFO::close (void)
+ACE_FIFO::close ()
 {
   ACE_TRACE ("ACE_FIFO::close");
   int result = 0;
diff --git a/ACE/ace/FIFO.h b/ACE/ace/FIFO.h
index 2c66ab10f03..efbbf8c1403 100644
--- a/ACE/ace/FIFO.h
+++ b/ACE/ace/FIFO.h
@@ -62,7 +62,7 @@ public:
   int get_local_addr (const ACE_TCHAR *&rendezvous) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FIFO_Recv.cpp b/ACE/ace/FIFO_Recv.cpp
index bb5568d5631..c7569baa29a 100644
--- a/ACE/ace/FIFO_Recv.cpp
+++ b/ACE/ace/FIFO_Recv.cpp
@@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv)
 
 void
-ACE_FIFO_Recv::dump (void) const
+ACE_FIFO_Recv::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Recv::dump");
@@ -28,7 +28,7 @@ ACE_FIFO_Recv::dump (void) const
 }
 
 int
-ACE_FIFO_Recv::close (void)
+ACE_FIFO_Recv::close ()
 {
   ACE_TRACE ("ACE_FIFO_Recv::close");
   int result = ACE_FIFO::close ();
@@ -63,7 +63,7 @@ ACE_FIFO_Recv::open (const ACE_TCHAR *fifo_name,
     return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0;
 }
 
-ACE_FIFO_Recv::ACE_FIFO_Recv (void)
+ACE_FIFO_Recv::ACE_FIFO_Recv ()
   : aux_handle_ (ACE_INVALID_HANDLE)
 {
   ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv");
diff --git a/ACE/ace/FIFO_Recv.h b/ACE/ace/FIFO_Recv.h
index bf3c9a8d2ec..163b5e372d0 100644
--- a/ACE/ace/FIFO_Recv.h
+++ b/ACE/ace/FIFO_Recv.h
@@ -73,7 +73,7 @@ public:
   ssize_t recv_n (void *buf, size_t len);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FIFO_Recv_Msg.cpp b/ACE/ace/FIFO_Recv_Msg.cpp
index 494f098ac38..03e96c16903 100644
--- a/ACE/ace/FIFO_Recv_Msg.cpp
+++ b/ACE/ace/FIFO_Recv_Msg.cpp
@@ -14,7 +14,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv_Msg)
 
 void
-ACE_FIFO_Recv_Msg::dump (void) const
+ACE_FIFO_Recv_Msg::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Recv_Msg::dump");
@@ -42,7 +42,7 @@ ACE_FIFO_Recv_Msg::open (const ACE_TCHAR *fifo_name,
                               sa);
 }
 
-ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (void)
+ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg ()
 {
   ACE_TRACE ("ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg");
 }
diff --git a/ACE/ace/FIFO_Recv_Msg.h b/ACE/ace/FIFO_Recv_Msg.h
index 803702ebcd9..0cb09174c31 100644
--- a/ACE/ace/FIFO_Recv_Msg.h
+++ b/ACE/ace/FIFO_Recv_Msg.h
@@ -119,7 +119,7 @@ public:
 #endif /* ACE_HAS_STREAM_PIPES */
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FIFO_Send.cpp b/ACE/ace/FIFO_Send.cpp
index 0c37b917ecc..3c37bd53410 100644
--- a/ACE/ace/FIFO_Send.cpp
+++ b/ACE/ace/FIFO_Send.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send)
 
 void
-ACE_FIFO_Send::dump (void) const
+ACE_FIFO_Send::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Send::dump");
@@ -23,7 +23,7 @@ ACE_FIFO_Send::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_FIFO_Send::ACE_FIFO_Send (void)
+ACE_FIFO_Send::ACE_FIFO_Send ()
 {
 //  ACE_TRACE ("ACE_FIFO_Send::ACE_FIFO_Send");
 }
diff --git a/ACE/ace/FIFO_Send.h b/ACE/ace/FIFO_Send.h
index 4c885df4be8..01aa7d52836 100644
--- a/ACE/ace/FIFO_Send.h
+++ b/ACE/ace/FIFO_Send.h
@@ -61,7 +61,7 @@ public:
   ssize_t send_n (const void *buf, size_t len);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FIFO_Send_Msg.cpp b/ACE/ace/FIFO_Send_Msg.cpp
index 756a570f28e..d97e0fc3b01 100644
--- a/ACE/ace/FIFO_Send_Msg.cpp
+++ b/ACE/ace/FIFO_Send_Msg.cpp
@@ -17,7 +17,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg)
 
 void
-ACE_FIFO_Send_Msg::dump (void) const
+ACE_FIFO_Send_Msg::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Send_Msg::dump");
@@ -53,7 +53,7 @@ ACE_FIFO_Send_Msg::send (const ACE_Str_Buf &send_msg)
 #endif /* ACE_HAS_STREAM_PIPES */
 }
 
-ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (void)
+ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg ()
 {
 //  ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg");
 }
diff --git a/ACE/ace/FIFO_Send_Msg.h b/ACE/ace/FIFO_Send_Msg.h
index 0e15c0e2e91..62b6810f845 100644
--- a/ACE/ace/FIFO_Send_Msg.h
+++ b/ACE/ace/FIFO_Send_Msg.h
@@ -72,7 +72,7 @@ public:
 #endif /* ACE_HAS_STREAM_PIPES */
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FILE.cpp b/ACE/ace/FILE.cpp
index f7be0af718c..94df37e49a1 100644
--- a/ACE/ace/FILE.cpp
+++ b/ACE/ace/FILE.cpp
@@ -21,7 +21,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE)
 
 void
-ACE_FILE::dump (void) const
+ACE_FILE::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE::dump");
@@ -31,7 +31,7 @@ ACE_FILE::dump (void) const
 
 // This is the do-nothing constructor.
 
-ACE_FILE::ACE_FILE (void)
+ACE_FILE::ACE_FILE ()
 {
   ACE_TRACE ("ACE_FILE::ACE_FILE");
 }
@@ -39,7 +39,7 @@ ACE_FILE::ACE_FILE (void)
 // Close the file
 
 int
-ACE_FILE::close (void)
+ACE_FILE::close ()
 {
   ACE_TRACE ("ACE_FILE::close");
   int result = 0;
@@ -92,7 +92,7 @@ ACE_FILE::seek (ACE_OFF_T offset, int startpos)
 }
 
 ACE_OFF_T
-ACE_FILE::tell (void)
+ACE_FILE::tell ()
 {
   ACE_TRACE ("ACE_FILE::tell");
   return ACE_OS::lseek (this->get_handle (), 0, SEEK_CUR);
@@ -130,7 +130,7 @@ ACE_FILE::get_remote_addr (ACE_Addr &addr) const
 }
 
 int
-ACE_FILE::remove (void)
+ACE_FILE::remove ()
 {
   ACE_TRACE ("ACE_FILE::remove");
 
@@ -139,7 +139,7 @@ ACE_FILE::remove (void)
 }
 
 int
-ACE_FILE::unlink (void)
+ACE_FILE::unlink ()
 {
   ACE_TRACE ("ACE_FILE::unlink");
 
diff --git a/ACE/ace/FILE.h b/ACE/ace/FILE.h
index e128eda3a0d..0396afad974 100644
--- a/ACE/ace/FILE.h
+++ b/ACE/ace/FILE.h
@@ -50,14 +50,14 @@ class ACE_Export ACE_FILE : public ACE_IO_SAP
 public:
   /// Close the ACE_FILE handle without removing the ACE_FILE from
   /// the file system.
-  int close (void);
+  int close ();
 
   /// Close and remove the ACE_FILE from the file system.
-  int remove (void);
+  int remove ();
 
   /// Remove the ACE_FILE from the file system without closing the
   /// ACE_FILE handle.
-  int unlink (void);
+  int unlink ();
 
   /// Get information on this ACE_FILE.
   int get_info (ACE_FILE_Info *finfo);
@@ -83,7 +83,7 @@ public:
                   int whence = SEEK_CUR);
 
   /// Return an offset for the file handle.
-  ACE_OFF_T tell (void);
+  ACE_OFF_T tell ();
 
   /**
    * Disable signal @a signum
@@ -100,7 +100,7 @@ public:
   int get_remote_addr (ACE_Addr &) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -108,7 +108,7 @@ public:
 protected:
   /// Ensure that this class is only created by the
   /// ACE_FILE_Connector.
-  ACE_FILE (void);
+  ACE_FILE ();
 
   /// File we are "connected" with...
   ACE_FILE_Addr addr_;
diff --git a/ACE/ace/FILE_Addr.cpp b/ACE/ace/FILE_Addr.cpp
index 9d043f5fcfd..624d888d96e 100644
--- a/ACE/ace/FILE_Addr.cpp
+++ b/ACE/ace/FILE_Addr.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Addr)
 
-ACE_FILE_Addr::ACE_FILE_Addr (void)
+ACE_FILE_Addr::ACE_FILE_Addr ()
   : ACE_Addr (AF_FILE, sizeof this->filename_ / sizeof (ACE_TCHAR))
 {
   this->filename_[0] = '\0';
@@ -110,13 +110,13 @@ ACE_FILE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
 // Return the address.
 
 void *
-ACE_FILE_Addr::get_addr (void) const
+ACE_FILE_Addr::get_addr () const
 {
   return (void *)&this->filename_;
 }
 
 void
-ACE_FILE_Addr::dump (void) const
+ACE_FILE_Addr::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_Addr::dump");
diff --git a/ACE/ace/FILE_Addr.h b/ACE/ace/FILE_Addr.h
index 79c14d4cbce..bb14decca74 100644
--- a/ACE/ace/FILE_Addr.h
+++ b/ACE/ace/FILE_Addr.h
@@ -32,7 +32,7 @@ class ACE_Export ACE_FILE_Addr : public ACE_Addr
 {
 public:
   /// Default constructor.
-  ACE_FILE_Addr (void);
+  ACE_FILE_Addr ();
 
   /// Copy constructor.
   ACE_FILE_Addr (const ACE_FILE_Addr &sa);
@@ -51,7 +51,7 @@ public:
   ACE_FILE_Addr &operator= (const ACE_FILE_Addr &);
 
   /// Return a pointer to the address.
-  virtual void *get_addr (void) const;
+  virtual void *get_addr () const;
 
   /// Transform the current address into string format.
   virtual int addr_to_string (ACE_TCHAR *addr, size_t) const;
@@ -63,10 +63,10 @@ public:
   bool operator != (const ACE_FILE_Addr &SAP) const;
 
   /// Return the path name used for the rendezvous point.
-  const ACE_TCHAR *get_path_name (void) const;
+  const ACE_TCHAR *get_path_name () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FILE_Addr.inl b/ACE/ace/FILE_Addr.inl
index c873ba8b08b..828ef066669 100644
--- a/ACE/ace/FILE_Addr.inl
+++ b/ACE/ace/FILE_Addr.inl
@@ -23,7 +23,7 @@ ACE_FILE_Addr::operator != (const ACE_FILE_Addr &sap) const
 // Return the path name used for the rendezvous point.
 
 ACE_INLINE const ACE_TCHAR *
-ACE_FILE_Addr::get_path_name (void) const
+ACE_FILE_Addr::get_path_name () const
 {
   return this->filename_;
 }
diff --git a/ACE/ace/FILE_Connector.cpp b/ACE/ace/FILE_Connector.cpp
index 5ff46dec592..b49f8dcfff7 100644
--- a/ACE/ace/FILE_Connector.cpp
+++ b/ACE/ace/FILE_Connector.cpp
@@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Connector)
 
 void
-ACE_FILE_Connector::dump (void) const
+ACE_FILE_Connector::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_Connector::dump");
@@ -27,7 +27,7 @@ ACE_FILE_Connector::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_FILE_Connector::ACE_FILE_Connector (void)
+ACE_FILE_Connector::ACE_FILE_Connector ()
 {
   ACE_TRACE ("ACE_FILE_Connector::ACE_FILE_Connector");
 }
diff --git a/ACE/ace/FILE_Connector.h b/ACE/ace/FILE_Connector.h
index 76e78156070..22dd23f48dd 100644
--- a/ACE/ace/FILE_Connector.h
+++ b/ACE/ace/FILE_Connector.h
@@ -38,7 +38,7 @@ class ACE_Export ACE_FILE_Connector
 {
 public:
   /// Default constructor.
-  ACE_FILE_Connector (void);
+  ACE_FILE_Connector ();
 
   /**
    * Actively ``connect'' and produce a @a new_io ACE_FILE_IO object
@@ -90,7 +90,7 @@ public:
   bool reset_new_handle (ACE_HANDLE handle);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FILE_IO.cpp b/ACE/ace/FILE_IO.cpp
index 1a999c83e83..315779568b5 100644
--- a/ACE/ace/FILE_IO.cpp
+++ b/ACE/ace/FILE_IO.cpp
@@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO)
 
 void
-ACE_FILE_IO::dump (void) const
+ACE_FILE_IO::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_IO::dump");
@@ -32,7 +32,7 @@ ACE_FILE_IO::dump (void) const
 
 // Simple-minded do nothing constructor.
 
-ACE_FILE_IO::ACE_FILE_IO (void)
+ACE_FILE_IO::ACE_FILE_IO ()
 {
   ACE_TRACE ("ACE_FILE_IO::ACE_FILE_IO");
 }
diff --git a/ACE/ace/FILE_IO.h b/ACE/ace/FILE_IO.h
index bc0bfc71222..f53b02dbf5f 100644
--- a/ACE/ace/FILE_IO.h
+++ b/ACE/ace/FILE_IO.h
@@ -45,7 +45,7 @@ public:
   friend class ACE_FILE_Connector;
 
   /// Default constructor.
-  ACE_FILE_IO (void);
+  ACE_FILE_IO ();
 
   /// send upto @a n bytes in @a buf.
   ssize_t send (const void *buf, size_t n) const;
@@ -98,7 +98,7 @@ public:
   ssize_t recv (iovec iov[], int n) const;
 
   /**
-   * Send N char *ptrs and int lengths.  Note that the char *'s
+   * Send @a n char *ptrs and int lengths.  Note that the char *'s
    * precede the ints (basically, an varargs version of writev).  The
    * count N is the *total* number of trailing arguments, *not* a
    * couple of the number of tuple pairs!
@@ -148,7 +148,7 @@ public:
                    int n) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/File_Lock.cpp b/ACE/ace/File_Lock.cpp
index f5e421acb25..aae97dd8afc 100644
--- a/ACE/ace/File_Lock.cpp
+++ b/ACE/ace/File_Lock.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock)
 
 void
-ACE_File_Lock::dump (void) const
+ACE_File_Lock::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_File_Lock::dump");
@@ -64,7 +64,7 @@ ACE_File_Lock::open (const ACE_TCHAR *name,
   return ACE_OS::flock_init (&this->lock_, flags, name, perms);
 }
 
-ACE_File_Lock::~ACE_File_Lock (void)
+ACE_File_Lock::~ACE_File_Lock ()
 {
 // ACE_TRACE ("ACE_File_Lock::~ACE_File_Lock");
   this->remove (this->unlink_in_destructor_);
diff --git a/ACE/ace/File_Lock.h b/ACE/ace/File_Lock.h
index d71e42c0019..45ea9b14bde 100644
--- a/ACE/ace/File_Lock.h
+++ b/ACE/ace/File_Lock.h
@@ -132,7 +132,7 @@ public:
   void set_handle (ACE_HANDLE);
 
   /// Dump state of the object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Filecache.cpp b/ACE/ace/Filecache.cpp
index 6916367bc74..3f4644d57a7 100644
--- a/ACE/ace/Filecache.cpp
+++ b/ACE/ace/Filecache.cpp
@@ -43,13 +43,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_Filecache *ACE_Filecache::cvf_ = 0;
 
 void
-ACE_Filecache_Handle::init (void)
+ACE_Filecache_Handle::init ()
 {
   this->file_ = 0;
   this->handle_ = ACE_INVALID_HANDLE;
 }
 
-ACE_Filecache_Handle::ACE_Filecache_Handle (void)
+ACE_Filecache_Handle::ACE_Filecache_Handle ()
   : file_ (0), handle_ (0)
 {
   this->init ();
@@ -89,7 +89,7 @@ ACE_Filecache_Handle::ACE_Filecache_Handle (const ACE_TCHAR *filename,
     }
 }
 
-ACE_Filecache_Handle::~ACE_Filecache_Handle (void)
+ACE_Filecache_Handle::~ACE_Filecache_Handle ()
 {
   if (this->handle_ != ACE_INVALID_HANDLE)
     // this was dup ()'d
@@ -99,13 +99,13 @@ ACE_Filecache_Handle::~ACE_Filecache_Handle (void)
 }
 
 void *
-ACE_Filecache_Handle::address (void) const
+ACE_Filecache_Handle::address () const
 {
   return this->file_ == 0 ? 0 : this->file_->address ();
 }
 
 ACE_HANDLE
-ACE_Filecache_Handle::handle (void) const
+ACE_Filecache_Handle::handle () const
 {
   if (this->handle_ == ACE_INVALID_HANDLE && this->file_ != 0)
     {
@@ -117,7 +117,7 @@ ACE_Filecache_Handle::handle (void) const
 }
 
 int
-ACE_Filecache_Handle::error (void) const
+ACE_Filecache_Handle::error () const
 {
   if (this->file_ == 0)
     return -1;
@@ -126,7 +126,7 @@ ACE_Filecache_Handle::error (void) const
 }
 
 ACE_OFF_T
-ACE_Filecache_Handle::size (void) const
+ACE_Filecache_Handle::size () const
 {
   if (this->file_ == 0)
     return -1;
@@ -169,7 +169,7 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next,
 }
 
 template <>
-ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void)
+ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry ()
 {
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_Allocator::instance()->free ((void *) ext_id_);
@@ -205,7 +205,7 @@ ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1,
 // -------------
 
 ACE_Filecache *
-ACE_Filecache::instance (void)
+ACE_Filecache::instance ()
 {
   // Double check locking pattern.
   if (ACE_Filecache::cvf_ == 0)
@@ -226,13 +226,13 @@ ACE_Filecache::instance (void)
   return ACE_Filecache::cvf_;
 }
 
-ACE_Filecache::ACE_Filecache (void)
+ACE_Filecache::ACE_Filecache ()
   : size_ (ACE_DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE),
     hash_ (size_)
 {
 }
 
-ACE_Filecache::~ACE_Filecache (void)
+ACE_Filecache::~ACE_Filecache ()
 {
 }
 
@@ -461,7 +461,7 @@ ACE_Filecache::finish (ACE_Filecache_Object *&file)
 }
 
 void
-ACE_Filecache_Object::init (void)
+ACE_Filecache_Object::init ()
 {
   this->filename_[0] = '\0';
   this->handle_ = ACE_INVALID_HANDLE;
@@ -472,7 +472,7 @@ ACE_Filecache_Object::init (void)
   ACE_OS::memset (&(this->stat_), 0, sizeof (this->stat_));
 }
 
-ACE_Filecache_Object::ACE_Filecache_Object (void)
+ACE_Filecache_Object::ACE_Filecache_Object ()
   : tempname_ (0),
     mmap_ (),
     handle_ (0),
@@ -612,7 +612,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename,
   // Ok, done!
 }
 
-ACE_Filecache_Object::~ACE_Filecache_Object (void)
+ACE_Filecache_Object::~ACE_Filecache_Object ()
 {
   if (this->error_ == ACE_SUCCESS)
     {
@@ -627,13 +627,13 @@ ACE_Filecache_Object::~ACE_Filecache_Object (void)
 ACE_ALLOC_HOOK_DEFINE(ACE_Filecache_Object)
 
 int
-ACE_Filecache_Object::acquire (void)
+ACE_Filecache_Object::acquire ()
 {
   return this->lock_.tryacquire_read ();
 }
 
 int
-ACE_Filecache_Object::release (void)
+ACE_Filecache_Object::release ()
 {
   if (this->action_ == ACE_WRITING)
     {
@@ -688,7 +688,7 @@ ACE_Filecache_Object::release (void)
 }
 
 int
-ACE_Filecache_Object::error (void) const
+ACE_Filecache_Object::error () const
 {
   // The existence of the object means a read lock is being held.
   return this->error_;
@@ -704,35 +704,35 @@ ACE_Filecache_Object::error_i (int error_value, const ACE_TCHAR *s)
 }
 
 const ACE_TCHAR *
-ACE_Filecache_Object::filename (void) const
+ACE_Filecache_Object::filename () const
 {
   // The existence of the object means a read lock is being held.
   return this->filename_;
 }
 
 ACE_OFF_T
-ACE_Filecache_Object::size (void) const
+ACE_Filecache_Object::size () const
 {
   // The existence of the object means a read lock is being held.
   return this->size_;
 }
 
 ACE_HANDLE
-ACE_Filecache_Object::handle (void) const
+ACE_Filecache_Object::handle () const
 {
   // The existence of the object means a read lock is being held.
   return this->handle_;
 }
 
 void *
-ACE_Filecache_Object::address (void) const
+ACE_Filecache_Object::address () const
 {
   // The existence of the object means a read lock is being held.
   return this->mmap_.addr ();
 }
 
 int
-ACE_Filecache_Object::update (void) const
+ACE_Filecache_Object::update () const
 {
   // The existence of the object means a read lock is being held.
   int result;
diff --git a/ACE/ace/Framework_Component.cpp b/ACE/ace/Framework_Component.cpp
index 513d378b943..64b24c65cd5 100644
--- a/ACE/ace/Framework_Component.cpp
+++ b/ACE/ace/Framework_Component.cpp
@@ -12,7 +12,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Framework_Component::~ACE_Framework_Component (void)
+ACE_Framework_Component::~ACE_Framework_Component ()
 {
   ACE_TRACE ("ACE_Framework_Component::~ACE_Framework_Component");
 
@@ -29,7 +29,7 @@ sig_atomic_t ACE_Framework_Repository::shutting_down_ = 0;
 // Pointer to the Singleton instance.
 ACE_Framework_Repository *ACE_Framework_Repository::repository_ = 0;
 
-ACE_Framework_Repository::~ACE_Framework_Repository (void)
+ACE_Framework_Repository::~ACE_Framework_Repository ()
 {
   ACE_TRACE ("ACE_Framework_Repository::~ACE_Framework_Repository");
   this->close ();
@@ -58,7 +58,7 @@ ACE_Framework_Repository::open (int size)
 }
 
 int
-ACE_Framework_Repository::close (void)
+ACE_Framework_Repository::close ()
 {
   ACE_TRACE ("ACE_Framework_Repository::close");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
@@ -118,7 +118,7 @@ ACE_Framework_Repository::instance (int size)
 }
 
 void
-ACE_Framework_Repository::close_singleton (void)
+ACE_Framework_Repository::close_singleton ()
 {
   ACE_TRACE ("ACE_Framework_Repository::close_singleton");
 
@@ -216,7 +216,7 @@ ACE_Framework_Repository::remove_dll_components_i (const ACE_TCHAR *dll_name)
 }
 
 void
-ACE_Framework_Repository::compact (void)
+ACE_Framework_Repository::compact ()
 {
   ACE_TRACE ("ACE_Framework_Repository::compact");
 
@@ -263,7 +263,7 @@ ACE_Framework_Repository::compact (void)
 }
 
 void
-ACE_Framework_Repository::dump (void) const
+ACE_Framework_Repository::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Framework_Repository::dump");
diff --git a/ACE/ace/Framework_Component.h b/ACE/ace/Framework_Component.h
index 8ffba2d5fac..20882ebe79c 100644
--- a/ACE/ace/Framework_Component.h
+++ b/ACE/ace/Framework_Component.h
@@ -67,11 +67,11 @@ public:
                            const ACE_TCHAR *name = 0);
 
   /// Close the contained singleton.
-  virtual void close_singleton (void) = 0;
+  virtual void close_singleton () = 0;
 
 protected:
   /// Destructor.
-  virtual ~ACE_Framework_Component (void);
+  virtual ~ACE_Framework_Component ();
 
 private:
   /// Pointer to the actual component.
@@ -106,21 +106,21 @@ public:
 
   /// Close down the repository and free up dynamically allocated
   /// resources.
-  ~ACE_Framework_Repository (void);
+  ~ACE_Framework_Repository ();
 
   /// Initialize the repository.
   int open (int size = DEFAULT_SIZE);
 
   /// Close down the repository and free up dynamically allocated
   /// resources, also called by dtor.
-  int close (void);
+  int close ();
 
   /// Get pointer to a process-wide ACE_Framework_Repository.
   static ACE_Framework_Repository *instance
     (int size = ACE_Framework_Repository::DEFAULT_SIZE);
 
   /// Delete the dynamically allocated Singleton.
-  static void close_singleton (void);
+  static void close_singleton ();
 
   // = Search structure operations (all acquire locks as necessary).
 
@@ -136,13 +136,13 @@ public:
   int remove_dll_components (const ACE_TCHAR *dll_name);
 
   /// Return the current size of the repository.
-  int current_size (void) const;
+  int current_size () const;
 
   /// Return the total size of the repository.
-  int total_size (void) const;
+  int total_size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -157,7 +157,7 @@ private:
 
   /// Compact component_vector_ after components have been removed__maintains
   /// order.
-  void compact (void);
+  void compact ();
 
 private:
   /// Contains all the framework components.
diff --git a/ACE/ace/Framework_Component.inl b/ACE/ace/Framework_Component.inl
index e5d25bb2fe8..0ac8b7faa6a 100644
--- a/ACE/ace/Framework_Component.inl
+++ b/ACE/ace/Framework_Component.inl
@@ -18,7 +18,7 @@ ACE_Framework_Component::ACE_Framework_Component (void *_this,
 /***************************************************************/
 
 ACE_INLINE int
-ACE_Framework_Repository::current_size (void) const
+ACE_Framework_Repository::current_size () const
 {
   ACE_TRACE ("ACE_Framework_Repository::current_size");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast <ACE_SYNCH_MUTEX&>(this->lock_), -1);
@@ -26,7 +26,7 @@ ACE_Framework_Repository::current_size (void) const
 }
 
 ACE_INLINE int
-ACE_Framework_Repository::total_size (void) const
+ACE_Framework_Repository::total_size () const
 {
   ACE_TRACE ("ACE_Framework_Repository::total_size");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast <ACE_SYNCH_MUTEX&>(this->lock_), -1);
diff --git a/ACE/ace/Framework_Component_T.cpp b/ACE/ace/Framework_Component_T.cpp
index abefe8325b9..1c503d5dd4e 100644
--- a/ACE/ace/Framework_Component_T.cpp
+++ b/ACE/ace/Framework_Component_T.cpp
@@ -17,7 +17,7 @@ ACE_Framework_Component_T<Concrete>::ACE_Framework_Component_T (Concrete *concre
 }
 
 template <class Concrete>
-ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T (void)
+ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T ()
 {
   ACE_TRACE ("ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T");
   Concrete::close_singleton ();
@@ -26,7 +26,7 @@ ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T (void)
 ACE_ALLOC_HOOK_DEFINE_Tt(ACE_Framework_Component_T)
 
 template <class Concrete> void
-ACE_Framework_Component_T<Concrete>::close_singleton (void)
+ACE_Framework_Component_T<Concrete>::close_singleton ()
 {
   ACE_TRACE ("ACE_Framework_Component_T<Concrete>::close_singleton");
   Concrete::close_singleton ();
diff --git a/ACE/ace/Framework_Component_T.h b/ACE/ace/Framework_Component_T.h
index 5d5c3995586..a4e7d4ee356 100644
--- a/ACE/ace/Framework_Component_T.h
+++ b/ACE/ace/Framework_Component_T.h
@@ -40,10 +40,10 @@ public:
   ACE_Framework_Component_T (Concrete *concrete);
 
   /// Destructor.
-  ~ACE_Framework_Component_T (void);
+  ~ACE_Framework_Component_T ();
 
   /// Close the contained singleton.
-  void close_singleton (void);
+  void close_singleton ();
 
   ACE_ALLOC_HOOK_DECLARE;
 };
diff --git a/ACE/ace/Free_List.cpp b/ACE/ace/Free_List.cpp
index 36eed6d47f4..e9e9c483fe5 100644
--- a/ACE/ace/Free_List.cpp
+++ b/ACE/ace/Free_List.cpp
@@ -15,7 +15,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
-ACE_Free_List<T>::~ACE_Free_List (void)
+ACE_Free_List<T>::~ACE_Free_List ()
 {
 }
 
@@ -42,7 +42,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::ACE_Locked_Free_List (int mode,
 // Destructor - removes all the elements from the free_list
 
 template <class T, class ACE_LOCK>
-ACE_Locked_Free_List<T, ACE_LOCK>::~ACE_Locked_Free_List (void)
+ACE_Locked_Free_List<T, ACE_LOCK>::~ACE_Locked_Free_List ()
 {
   if (this->mode_ != ACE_PURE_FREE_LIST)
     while (this->free_list_ != 0)
@@ -79,7 +79,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::add (T *element)
 // water mark.
 
 template <class T, class ACE_LOCK> T *
-ACE_Locked_Free_List<T, ACE_LOCK>::remove (void)
+ACE_Locked_Free_List<T, ACE_LOCK>::remove ()
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, 0));
 
@@ -103,7 +103,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::remove (void)
 // Returns the current size of the free list
 
 template <class T, class ACE_LOCK> size_t
-ACE_Locked_Free_List<T, ACE_LOCK>::size (void)
+ACE_Locked_Free_List<T, ACE_LOCK>::size ()
 {
   return this->size_;
 }
diff --git a/ACE/ace/Free_List.h b/ACE/ace/Free_List.h
index 38ca93100e6..7f661d41db2 100644
--- a/ACE/ace/Free_List.h
+++ b/ACE/ace/Free_List.h
@@ -36,7 +36,7 @@ class ACE_Free_List
 {
 public:
   /// Destructor - removes all the elements from the free_list.
-  virtual ~ACE_Free_List (void);
+  virtual ~ACE_Free_List ();
 
   /// Inserts an element onto the free list (if it isn't past the high
   /// water mark).
@@ -44,10 +44,10 @@ public:
 
   /// Takes a element off the freelist and returns it.  It creates
   /// <inc> new elements if the size is at or below the low water mark.
-  virtual T *remove (void) = 0;
+  virtual T *remove () = 0;
 
   /// Returns the current size of the free list.
-  virtual size_t size (void) = 0;
+  virtual size_t size () = 0;
 
   /// Resizes the free list to @a newsize.
   virtual void resize (size_t newsize) = 0;
@@ -82,7 +82,7 @@ public:
                         size_t inc = ACE_DEFAULT_FREE_LIST_INC);
 
   /// Destructor - removes all the elements from the free_list.
-  virtual ~ACE_Locked_Free_List (void);
+  virtual ~ACE_Locked_Free_List ();
 
   /// Inserts an element onto the free list (if it isn't past the high
   /// water mark).
@@ -90,10 +90,10 @@ public:
 
   /// Takes a element off the freelist and returns it.  It creates
   /// <inc> new elements if the size is at or below the low water mark.
-  virtual T *remove (void);
+  virtual T *remove ();
 
   /// Returns the current size of the free list.
-  virtual size_t size (void);
+  virtual size_t size ();
 
   /// Resizes the free list to @a newsize.
   virtual void resize (size_t newsize);
diff --git a/ACE/ace/Functor.cpp b/ACE/ace/Functor.cpp
index b5b13c92102..8d41b4062f9 100644
--- a/ACE/ace/Functor.cpp
+++ b/ACE/ace/Functor.cpp
@@ -33,7 +33,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Command_Base::~ACE_Command_Base (void)
+ACE_Command_Base::~ACE_Command_Base ()
 {
 }
 
diff --git a/ACE/ace/Functor.h b/ACE/ace/Functor.h
index 8920966639d..8a88dce9312 100644
--- a/ACE/ace/Functor.h
+++ b/ACE/ace/Functor.h
@@ -58,10 +58,10 @@ class ACE_Export ACE_Command_Base
 {
 public:
   /// Default constructor.
-  ACE_Command_Base (void);
+  ACE_Command_Base ();
 
   /// Virtual destructor.
-  virtual ~ACE_Command_Base (void);
+  virtual ~ACE_Command_Base ();
 
   /**
    * Invokes the method encapsulated by the command, passing along the
diff --git a/ACE/ace/Functor.inl b/ACE/ace/Functor.inl
index d50490d9f2d..c7d170c2e67 100644
--- a/ACE/ace/Functor.inl
+++ b/ACE/ace/Functor.inl
@@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Default constructor.
 
 ACE_INLINE
-ACE_Command_Base::ACE_Command_Base (void)
+ACE_Command_Base::ACE_Command_Base ()
 {
 }
 
diff --git a/ACE/ace/Functor_T.cpp b/ACE/ace/Functor_T.cpp
index 9b99c5029ee..e71a64fb258 100644
--- a/ACE/ace/Functor_T.cpp
+++ b/ACE/ace/Functor_T.cpp
@@ -34,7 +34,7 @@ ACE_Command_Callback<RECEIVER, ACTION>::ACE_Command_Callback (RECEIVER &recvr,
 }
 
 template <class RECEIVER, class ACTION>
-ACE_Command_Callback<RECEIVER, ACTION>::~ACE_Command_Callback (void)
+ACE_Command_Callback<RECEIVER, ACTION>::~ACE_Command_Callback ()
 {
 }
 
diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h
index f89b683d567..c3b6deb2bb1 100644
--- a/ACE/ace/Functor_T.h
+++ b/ACE/ace/Functor_T.h
@@ -64,7 +64,7 @@ public:
   ACE_Command_Callback (RECEIVER &recvr, ACTION action);
 
   /// Virtual destructor.
-  virtual ~ACE_Command_Callback (void);
+  virtual ~ACE_Command_Callback ();
 
   /// Invokes the method @c action_ from the object @c receiver_.
   virtual int execute (void *arg = 0);
@@ -89,14 +89,14 @@ template <class RECEIVER>
 class ACE_Member_Function_Command : public ACE_Command_Base
 {
 public:
-  typedef void (RECEIVER::*PTMF)(void);
+  typedef void (RECEIVER::*PTMF)();
 
   /// Con Constructor: sets the <receiver_> of the Command to @a recvr, and the
   /// <action_> of the Command to <action>.
   ACE_Member_Function_Command (RECEIVER &recvr, PTMF ptmf);
 
   /// Virtual destructor.
-  virtual ~ACE_Member_Function_Command (void);
+  virtual ~ACE_Member_Function_Command ();
 
   /// Invokes the method <action_> from the object <receiver_>.  The
   /// parameter is ignored
diff --git a/ACE/ace/Functor_T.inl b/ACE/ace/Functor_T.inl
index 415a0090b42..8a4d1d01290 100644
--- a/ACE/ace/Functor_T.inl
+++ b/ACE/ace/Functor_T.inl
@@ -11,7 +11,7 @@ ACE_Member_Function_Command (RECEIVER &recvr, PTMF ptmf)
 
 template<class RECEIVER> ACE_INLINE
 ACE_Member_Function_Command<RECEIVER>::
-~ACE_Member_Function_Command (void)
+~ACE_Member_Function_Command ()
 {
 }
 
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
index dcaf1eb7da4..b206feaa511 100644
--- a/ACE/ace/Future.h
+++ b/ACE/ace/Future.h
@@ -154,7 +154,7 @@ private:
   operator T ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -344,7 +344,7 @@ public:
   int detach (ACE_Future_Observer<T> *observer);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /**
    * Get the underlying ACE_Future_Rep pointer. Note that this method should
diff --git a/ACE/ace/Get_Opt.cpp b/ACE/ace/Get_Opt.cpp
index 9e8d7c1fb2b..b990a9d5704 100644
--- a/ACE/ace/Get_Opt.cpp
+++ b/ACE/ace/Get_Opt.cpp
@@ -156,7 +156,7 @@ ACE_Get_Opt::ACE_Get_Opt (int argc,
     }
 }
 
-ACE_Get_Opt::~ACE_Get_Opt (void)
+ACE_Get_Opt::~ACE_Get_Opt ()
 {
   ACE_TRACE ("ACE_Get_Opt::~ACE_Get_Opt");
 
@@ -183,7 +183,7 @@ ACE_Get_Opt::~ACE_Get_Opt (void)
 }
 
 int
-ACE_Get_Opt::nextchar_i (void)
+ACE_Get_Opt::nextchar_i ()
 {
   ACE_TRACE ("ACE_Get_Opt::nextchar_i");
 
@@ -231,7 +231,7 @@ ACE_Get_Opt::nextchar_i (void)
 }
 
 int
-ACE_Get_Opt::long_option_i (void)
+ACE_Get_Opt::long_option_i ()
 {
   ACE_TRACE ("ACE_Get_Opt::long_option_i");
 
@@ -359,7 +359,7 @@ ACE_Get_Opt::long_option_i (void)
 }
 
 int
-ACE_Get_Opt::short_option_i (void)
+ACE_Get_Opt::short_option_i ()
 {
   ACE_TRACE ("ACE_Get_Opt::short_option_i");
 
@@ -436,7 +436,7 @@ ACE_Get_Opt::short_option_i (void)
 }
 
 int
-ACE_Get_Opt::operator () (void)
+ACE_Get_Opt::operator () ()
 {
   ACE_TRACE ("ACE_Get_Opt_Long::operator");
 
@@ -569,7 +569,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name,
 }
 
 const ACE_TCHAR*
-ACE_Get_Opt::long_option (void) const
+ACE_Get_Opt::long_option () const
 {
   ACE_TRACE ("ACE_Get_Opt::long_option (void)");
   if (this->long_option_)
@@ -578,7 +578,7 @@ ACE_Get_Opt::long_option (void) const
 }
 
 const ACE_TCHAR*
-ACE_Get_Opt::last_option (void) const
+ACE_Get_Opt::last_option () const
 {
   return this->last_option_->c_str ();
 }
@@ -590,7 +590,7 @@ ACE_Get_Opt::last_option (const ACE_TString &last_option)
 }
 
 void
-ACE_Get_Opt::dump (void) const
+ACE_Get_Opt::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Get_Opt::dump");
@@ -629,7 +629,7 @@ ACE_Get_Opt::dump (void) const
 }
 
 void
-ACE_Get_Opt::permute_args (void)
+ACE_Get_Opt::permute_args ()
 {
   ACE_TRACE ("ACE_Get_Opt::permute_args");
 
@@ -665,7 +665,7 @@ ACE_Get_Opt::permute_args (void)
 }
 
 int
-ACE_Get_Opt::permute (void)
+ACE_Get_Opt::permute ()
 {
   ACE_TRACE ("ACE_Get_Opt::permute");
 
@@ -706,7 +706,7 @@ ACE_Get_Opt::permute (void)
 }
 
 const ACE_TCHAR *
-ACE_Get_Opt::optstring (void) const
+ACE_Get_Opt::optstring () const
 {
   return this->optstring_->c_str ();
 }
@@ -720,7 +720,7 @@ ACE_Get_Opt::ACE_Get_Opt_Long_Option::ACE_Get_Opt_Long_Option (
      val_ (val)
 {}
 
-ACE_Get_Opt::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option (void)
+ACE_Get_Opt::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option ()
 {
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_Allocator::instance()->free(const_cast<ACE_TCHAR*>(this->name_));
diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h
index fbe64a18a3b..040df2b8cb2 100644
--- a/ACE/ace/Get_Opt.h
+++ b/ACE/ace/Get_Opt.h
@@ -195,7 +195,7 @@ public:
                int long_only = 0);
 #endif
   /// Default dtor.
-  ~ACE_Get_Opt (void);
+  ~ACE_Get_Opt ();
 
   /**
    * Scan elements of @a argv (whose length is @a argc) for short option
@@ -233,14 +233,14 @@ public:
    * @a optstring up unto the first short option character for '+', '-',
    * and ':' in order to determine ordering and missing argument behavior.
    */
-  int operator () (void);
+  int operator () ();
 
   /**
    * For communication from @c operator() to the caller.  When
    * @c operator() finds an option that takes an argument, the argument
    * value is returned from this method, otherwise it returns 0.
    */
-  ACE_TCHAR *opt_arg (void) const;
+  ACE_TCHAR *opt_arg () const;
 
   /**
    * Returns the most recently matched option character. Especially
@@ -248,7 +248,7 @@ public:
    * that's required, since this allows the caller to learn what option
    * was specified without its required argument.
    */
-  int opt_opt (void);
+  int opt_opt ();
 
   /**
    * Index in @a argv of the next element to be scanned.  This is used
@@ -262,7 +262,7 @@ public:
    * Otherwise, @c opt_ind() communicates from one call to the next how
    * much of @a argv has been scanned so far.
    */
-  int &opt_ind (void);
+  int &opt_ind ();
 
   /// Adds a long option with no corresponding short option.
   /**
@@ -298,26 +298,26 @@ public:
 
   /// Returns the name of the long option found on the last call to
   /// @c operator() or 0 if none was found.
-  const ACE_TCHAR *long_option (void) const;
+  const ACE_TCHAR *long_option () const;
 
   /// The number of arguments in the internal @c argv_.
-  int argc (void) const;
+  int argc () const;
 
   /// Accessor for the internal @c argv_ pointer.
-  ACE_TCHAR **argv (void) const;
+  ACE_TCHAR **argv () const;
 
   /// Accessor for the @c last_option that was processed.  This allows
   /// applications to know if the found option was a short or long
   /// option, and is especially useful in cases where it was invalid
   /// and the caller wants to print out the invalid value.
-  const ACE_TCHAR *last_option (void) const;
+  const ACE_TCHAR *last_option () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Return the @a optstring.  This is handy to verify that calls to
   /// long_option added short options as expected.
-  const ACE_TCHAR *optstring (void) const;
+  const ACE_TCHAR *optstring () const;
 
 public:
   /*
@@ -387,7 +387,7 @@ private:
                              int val = 0);
 
     /// Dtor.
-    ~ACE_Get_Opt_Long_Option (void);
+    ~ACE_Get_Opt_Long_Option ();
 
     bool operator < (const ACE_Get_Opt_Long_Option &rhs);
 
@@ -409,28 +409,29 @@ private:
   };
 
   /// Updates nextchar_.
-  int nextchar_i (void);
+  int nextchar_i ();
 
   /// Handles long options.
-  int long_option_i (void);
+  int long_option_i ();
 
   /// Handles short options.
-  int short_option_i (void);
+  int short_option_i ();
 
   /// If permuting args, this functions manages the nonopt_start_ and
   /// nonopt_end_ indexes and makes calls to permute to actually
   /// reorder the <argv>-elements.
-  void permute_args (void);
+  void permute_args ();
 
   /// Handles reordering <argv>-elements.
-  int permute (void);
+  int permute ();
 
   /// Set last_option.
   void last_option (const ACE_TString &s);
 
-  // Disallow copying and assignment.
-  ACE_Get_Opt (const ACE_Get_Opt &);
-  ACE_Get_Opt &operator= (const ACE_Get_Opt &);
+  ACE_Get_Opt (const ACE_Get_Opt &) = delete;
+  ACE_Get_Opt &operator= (const ACE_Get_Opt &) = delete;
+  ACE_Get_Opt (ACE_Get_Opt &&) = delete;
+  ACE_Get_Opt &operator= (ACE_Get_Opt &&) = delete;
 
 private:
 
diff --git a/ACE/ace/Get_Opt.inl b/ACE/ace/Get_Opt.inl
index 32de1d85c18..950d707ec98 100644
--- a/ACE/ace/Get_Opt.inl
+++ b/ACE/ace/Get_Opt.inl
@@ -8,31 +8,31 @@ ACE_Get_Opt::ACE_Get_Opt_Long_Option::operator < (const ACE_Get_Opt_Long_Option
 }
 
 ACE_INLINE int
-ACE_Get_Opt::argc (void) const
+ACE_Get_Opt::argc () const
 {
   return this->argc_;
 }
 
 ACE_INLINE ACE_TCHAR **
-ACE_Get_Opt::argv (void) const
+ACE_Get_Opt::argv () const
 {
   return this->argv_;
 }
 
 ACE_INLINE ACE_TCHAR*
-ACE_Get_Opt::opt_arg (void) const
+ACE_Get_Opt::opt_arg () const
 {
   return this->optarg;
 }
 
 ACE_INLINE int
-ACE_Get_Opt::opt_opt (void)
+ACE_Get_Opt::opt_opt ()
 {
   return this->optopt_;
 }
 
 ACE_INLINE int &
-ACE_Get_Opt::opt_ind (void)
+ACE_Get_Opt::opt_ind ()
 {
   return this->optind;
 }
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index 23d81ef88bc..2ad696e42cf 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-// Included just keep compilers that see #pragma dierctive first
+// Included just keep compilers that see #pragma directive first
 // happy.
 #include /**/ "ace/ACE_export.h"
 
@@ -61,24 +61,15 @@
 #  define ACE_ENDLESS_LOOP
 # endif /* ! ACE_ENDLESS_LOOP */
 
-# if defined (ACE_NEEDS_FUNC_DEFINITIONS) && !defined (ACE_HAS_CPP11)
-    // It just evaporated ;-)  Not pleasant.
-#   define ACE_UNIMPLEMENTED_FUNC(f)
-# else
-#   if defined (ACE_HAS_CPP11)
-#     define ACE_UNIMPLEMENTED_FUNC(f) f = delete;
-#   else
-#     define ACE_UNIMPLEMENTED_FUNC(f) f;
-#   endif
-# endif /* ACE_NEEDS_FUNC_DEFINITIONS */
+#if !defined (ACE_HAS_CPP11)
+# error ACE/TAO require C++11 compliance, please upgrade your compiler and/or fix the platform configuration for your environment
+#endif /* !ACE_HAS_CPP11 */
+
+#define ACE_UNIMPLEMENTED_FUNC(f) f = delete;
 
 // noexcept(false) specification to specify that the operation can
 // throw an exception
-#if defined (ACE_HAS_CPP11)
 #define ACE_NOEXCEPT_FALSE noexcept(false)
-#else
-#define ACE_NOEXCEPT_FALSE
-#endif
 
 // ----------------------------------------------------------------
 
@@ -162,7 +153,7 @@
 
 /* Using ACE_UNEXPECTED_RETURNS is ill-advised because, in many cases,
  *   it fails to inform callers of the error condition.
- * It exists mainly to provide back-compatibility with old, dangegrous,
+ * It exists mainly to provide back-compatibility with old, dangerous,
  *   incorrect behavior.
  * Code that previously used ACE_GUARD() or ACE_GUARD_RETURN() to return
  *   upon failure to acquire a lock can now use:
diff --git a/ACE/ace/Guard_T.cpp b/ACE/ace/Guard_T.cpp
index dd4f9a2b967..aa997fd4029 100644
--- a/ACE/ace/Guard_T.cpp
+++ b/ACE/ace/Guard_T.cpp
@@ -23,7 +23,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // ACE_ALLOC_HOOK_DEFINE(ACE_Guard)
 
 template <class ACE_LOCK> void
-ACE_Guard<ACE_LOCK>::dump (void) const
+ACE_Guard<ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Guard<ACE_LOCK>::dump");
@@ -38,7 +38,7 @@ ACE_Guard<ACE_LOCK>::dump (void) const
 // ACE_ALLOC_HOOK_DEFINE(ACE_Write_Guard)
 
 template <class ACE_LOCK> void
-ACE_Write_Guard<ACE_LOCK>::dump (void) const
+ACE_Write_Guard<ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Write_Guard<ACE_LOCK>::dump");
@@ -49,7 +49,7 @@ ACE_Write_Guard<ACE_LOCK>::dump (void) const
 // ACE_ALLOC_HOOK_DEFINE(ACE_Read_Guard)
 
 template <class ACE_LOCK> void
-ACE_Read_Guard<ACE_LOCK>::dump (void) const
+ACE_Read_Guard<ACE_LOCK>::dump () const
 {
 // ACE_TRACE ("ACE_Read_Guard<ACE_LOCK>::dump");
   ACE_Guard<ACE_LOCK>::dump ();
diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h
index 03fa8dba9bf..b90de0bced4 100644
--- a/ACE/ace/Guard_T.h
+++ b/ACE/ace/Guard_T.h
@@ -80,33 +80,33 @@ public:
   ACE_Guard (ACE_LOCK &l, bool block, int become_owner);
 
   /// Implicitly release the lock.
-  ~ACE_Guard (void);
+  ~ACE_Guard ();
 
   // = Lock accessors.
 
   /// Explicitly acquire the lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the lock (i.e., won't block).
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Explicitly release the lock, but only if it is held!
-  int release (void);
+  int release ();
 
   /// Relinquish ownership of the lock so that it is not released
   /// implicitly in the destructor.
-  void disown (void);
+  void disown ();
 
   // = Utility methods.
   /// true if locked, false if couldn't acquire the lock
   /// (errno will contain the reason for this).
-  bool locked (void) const;
+  bool locked () const;
 
   /// Explicitly remove the lock.
-  int remove (void);
+  int remove ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -152,21 +152,21 @@ public:
   // = Lock accessors.
 
   /// Explicitly acquire the write lock.
-  int acquire_write (void);
+  int acquire_write ();
 
   /// Explicitly acquire the write lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the write lock (i.e., won't block).
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /// Conditionally acquire the write lock (i.e., won't block).
-  int tryacquire (void);
+  int tryacquire ();
 
   // = Utility methods.
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -196,21 +196,21 @@ public:
   // = Lock accessors.
 
   /// Explicitly acquire the read lock.
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Explicitly acquire the read lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the read lock (i.e., won't block).
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /// Conditionally acquire the read lock (i.e., won't block).
-  int tryacquire (void);
+  int tryacquire ();
 
   // = Utility methods.
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -242,36 +242,36 @@ public:
   ACE_TSS_Guard (ACE_LOCK &lock, bool block = true);
 
   /// Implicitly release the thread-specific lock.
-  ~ACE_TSS_Guard (void);
+  ~ACE_TSS_Guard ();
 
   // = Lock accessors.
 
   /// Explicitly acquire the thread-specific lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the thread-specific lock (i.e., won't
   /// block).
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Explicitly release the thread-specific lock.
-  int release (void);
+  int release ();
 
   // = Utility methods.
   /// Explicitly release the thread-specific lock.
-  int remove (void);
+  int remove ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Helper, meant for subclass only.
-  ACE_TSS_Guard (void);
+  ACE_TSS_Guard ();
 
   /// Initialize the key.
-  void init_key (void);
+  void init_key ();
 
   /// Called when thread exits to clean up the lock.
   static void cleanup (void *ptr);
@@ -306,21 +306,21 @@ public:
   // = Lock accessors.
 
   /// Explicitly acquire the thread-specific write lock.
-  int acquire_write (void);
+  int acquire_write ();
 
   /// Explicitly acquire the thread-specific write lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the thread-specific write lock (i.e., won't block).
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /// Conditionally acquire the thread-specific write lock (i.e., won't block).
-  int tryacquire (void);
+  int tryacquire ();
 
   // = Utility methods.
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -348,22 +348,22 @@ public:
 
   // = Lock accessors.
   /// Explicitly acquire the thread-specific read lock.
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Explicitly acquire the thread-specific read lock.
-  int acquire (void);
+  int acquire ();
 
   /// Conditionally acquire the thread-specific read lock (i.e., won't
   /// block).
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /// Conditionally acquire the thread-specific read lock (i.e., won't
   /// block).
-  int tryacquire (void);
+  int tryacquire ();
 
   // = Utility methods.
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
diff --git a/ACE/ace/Guard_T.inl b/ACE/ace/Guard_T.inl
index 02d6989cdc0..7135fc32cb0 100644
--- a/ACE/ace/Guard_T.inl
+++ b/ACE/ace/Guard_T.inl
@@ -6,19 +6,19 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Guard<ACE_LOCK>::acquire (void)
+ACE_Guard<ACE_LOCK>::acquire ()
 {
   return this->owner_ = this->lock_->acquire ();
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Guard<ACE_LOCK>::tryacquire (void)
+ACE_Guard<ACE_LOCK>::tryacquire ()
 {
   return this->owner_ = this->lock_->tryacquire ();
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Guard<ACE_LOCK>::release (void)
+ACE_Guard<ACE_LOCK>::release ()
 {
   if (this->owner_ == -1)
     return -1;
@@ -59,25 +59,25 @@ ACE_Guard<ACE_LOCK>::ACE_Guard (ACE_LOCK &l, bool /* block */, int become_owner)
 // lock.
 
 template <class ACE_LOCK> ACE_INLINE
-ACE_Guard<ACE_LOCK>::~ACE_Guard (void)
+ACE_Guard<ACE_LOCK>::~ACE_Guard ()
 {
   this->release ();
 }
 
 template <class ACE_LOCK> ACE_INLINE bool
-ACE_Guard<ACE_LOCK>::locked (void) const
+ACE_Guard<ACE_LOCK>::locked () const
 {
   return this->owner_ != -1;
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Guard<ACE_LOCK>::remove (void)
+ACE_Guard<ACE_LOCK>::remove ()
 {
   return this->lock_->remove ();
 }
 
 template <class ACE_LOCK> ACE_INLINE void
-ACE_Guard<ACE_LOCK>::disown (void)
+ACE_Guard<ACE_LOCK>::disown ()
 {
   this->owner_ = -1;
 }
@@ -90,25 +90,25 @@ ACE_Write_Guard<ACE_LOCK>::ACE_Write_Guard (ACE_LOCK &m)
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Write_Guard<ACE_LOCK>::acquire_write (void)
+ACE_Write_Guard<ACE_LOCK>::acquire_write ()
 {
   return this->owner_ = this->lock_->acquire_write ();
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Write_Guard<ACE_LOCK>::acquire (void)
+ACE_Write_Guard<ACE_LOCK>::acquire ()
 {
   return this->owner_ = this->lock_->acquire_write ();
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Write_Guard<ACE_LOCK>::tryacquire_write (void)
+ACE_Write_Guard<ACE_LOCK>::tryacquire_write ()
 {
   return this->owner_ = this->lock_->tryacquire_write ();
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Write_Guard<ACE_LOCK>::tryacquire (void)
+ACE_Write_Guard<ACE_LOCK>::tryacquire ()
 {
   return this->owner_ = this->lock_->tryacquire_write ();
 }
@@ -125,25 +125,25 @@ ACE_Write_Guard<ACE_LOCK>::ACE_Write_Guard (ACE_LOCK &m,
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Read_Guard<ACE_LOCK>::acquire_read (void)
+ACE_Read_Guard<ACE_LOCK>::acquire_read ()
 {
   return this->owner_ = this->lock_->acquire_read ();
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Read_Guard<ACE_LOCK>::acquire (void)
+ACE_Read_Guard<ACE_LOCK>::acquire ()
 {
   return this->owner_ = this->lock_->acquire_read ();
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Read_Guard<ACE_LOCK>::tryacquire_read (void)
+ACE_Read_Guard<ACE_LOCK>::tryacquire_read ()
 {
   return this->owner_ = this->lock_->tryacquire_read ();
 }
 
 template <class ACE_LOCK> ACE_INLINE int
-ACE_Read_Guard<ACE_LOCK>::tryacquire (void)
+ACE_Read_Guard<ACE_LOCK>::tryacquire ()
 {
   return this->owner_ = this->lock_->tryacquire_read ();
 }
diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp
index 8f1831757ee..54512b1535b 100644
--- a/ACE/ace/Handle_Set.cpp
+++ b/ACE/ace/Handle_Set.cpp
@@ -33,7 +33,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set)
 #endif  /* ACE_LINUX && __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 && !_XOPEN_SOURCE */
 
 void
-ACE_Handle_Set::dump (void) const
+ACE_Handle_Set::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Handle_Set::dump");
@@ -91,7 +91,7 @@ const char ACE_Handle_Set::nbits_[256] =
 
 // Constructor, initializes the bitmask to all 0s.
 
-ACE_Handle_Set::ACE_Handle_Set (void)
+ACE_Handle_Set::ACE_Handle_Set ()
 {
   ACE_TRACE ("ACE_Handle_Set::ACE_Handle_Set");
   this->reset ();
@@ -245,7 +245,7 @@ ACE_Handle_Set::set_max (ACE_HANDLE current_max)
 ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set_Iterator)
 
 void
-ACE_Handle_Set_Iterator::dump (void) const
+ACE_Handle_Set_Iterator::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Handle_Set_Iterator::dump");
@@ -263,7 +263,7 @@ ACE_Handle_Set_Iterator::dump (void) const
 }
 
 ACE_HANDLE
-ACE_Handle_Set_Iterator::operator () (void)
+ACE_Handle_Set_Iterator::operator () ()
 {
   ACE_TRACE ("ACE_Handle_Set_Iterator::operator");
 #if defined (ACE_HANDLE_SET_USES_FD_ARRAY)
@@ -462,7 +462,7 @@ ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs)
 }
 
 void
-ACE_Handle_Set_Iterator::reset_state (void)
+ACE_Handle_Set_Iterator::reset_state ()
 {
   ACE_TRACE ("ACE_Handle_Set_Iterator::reset_state");
 
diff --git a/ACE/ace/Handle_Set.h b/ACE/ace/Handle_Set.h
index 4e4cf36ab94..33a9728a62d 100644
--- a/ACE/ace/Handle_Set.h
+++ b/ACE/ace/Handle_Set.h
@@ -63,7 +63,7 @@ public:
   };
 
   /// Constructor, initializes the bitmask to all 0s.
-  ACE_Handle_Set (void);
+  ACE_Handle_Set ();
 
   /**
    * Constructor, initializes the handle set from a given mask.
@@ -72,7 +72,7 @@ public:
 
   // = Methods for manipulating bitsets.
   /// Initialize the bitmask to all 0s and reset the associated fields.
-  void reset (void);
+  void reset ();
 
   /**
    * Checks whether @a handle is enabled.  No range checking is
@@ -90,10 +90,10 @@ public:
   void clr_bit (ACE_HANDLE handle);
 
   /// Returns a count of the number of enabled bits.
-  int num_set (void) const;
+  int num_set () const;
 
   /// Returns the number of the large bit.
-  ACE_HANDLE max_set (void) const;
+  ACE_HANDLE max_set () const;
 
   /**
    * Rescan the underlying @c fd_set up to handle @a max to find the new
@@ -110,7 +110,7 @@ public:
 
   /// Returns a pointer to the underlying @c fd_set.  Returns 0 if
   /// there are no handle bits set (<size_> == 0).
-  fd_set *fdset (void);
+  fd_set *fdset ();
 
 #if defined (ACE_HAS_BIG_FD_SET)
   /// Assignment operator optimizes for cases where <size_> == 0.
@@ -118,7 +118,7 @@ public:
 #endif /* ACE_HAS_BIG_FD_SET */
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -177,11 +177,11 @@ public:
   ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs);
 
   /// Default dtor.
-  ~ACE_Handle_Set_Iterator (void);
+  ~ACE_Handle_Set_Iterator ();
 
   /// Reset the state of the iterator by reinitializing the state
   /// that we maintain.
-  void reset_state (void);
+  void reset_state ();
 
   /**
    * "Next" operator.  Returns the next unseen ACE_HANDLE in the
@@ -190,10 +190,10 @@ public:
    * the iterator automatically, so you need not call <operator++>
    * (which is now obsolete).
    */
-  ACE_HANDLE operator () (void);
+  ACE_HANDLE operator () ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl
index db76152f168..c156c78c846 100644
--- a/ACE/ace/Handle_Set.inl
+++ b/ACE/ace/Handle_Set.inl
@@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Initialize the bitmask to all 0s and reset the associated fields.
 
 ACE_INLINE void
-ACE_Handle_Set::reset (void)
+ACE_Handle_Set::reset ()
 {
   ACE_TRACE ("ACE_Handle_Set::reset");
   this->max_handle_ =
@@ -53,7 +53,7 @@ ACE_Handle_Set::operator = (const ACE_Handle_Set &rhs)
 // Returns the number of the large bit.
 
 ACE_INLINE ACE_HANDLE
-ACE_Handle_Set::max_set (void) const
+ACE_Handle_Set::max_set () const
 {
   ACE_TRACE ("ACE_Handle_Set::max_set");
   return this->max_handle_;
@@ -133,7 +133,7 @@ ACE_Handle_Set::clr_bit (ACE_HANDLE handle)
 // Returns a count of the number of enabled bits.
 
 ACE_INLINE int
-ACE_Handle_Set::num_set (void) const
+ACE_Handle_Set::num_set () const
 {
   ACE_TRACE ("ACE_Handle_Set::num_set");
 #if defined (ACE_HANDLE_SET_USES_FD_ARRAY)
@@ -159,7 +159,7 @@ ACE_Handle_Set::operator fd_set *()
 // Returns a pointer to the underlying fd_set.
 
 ACE_INLINE fd_set *
-ACE_Handle_Set::fdset (void)
+ACE_Handle_Set::fdset ()
 {
   ACE_TRACE ("ACE_Handle_Set::fdset");
 
@@ -170,7 +170,7 @@ ACE_Handle_Set::fdset (void)
 }
 
 ACE_INLINE
-ACE_Handle_Set_Iterator::~ACE_Handle_Set_Iterator (void)
+ACE_Handle_Set_Iterator::~ACE_Handle_Set_Iterator ()
 {
 }
 
diff --git a/ACE/ace/Hash_Map_Manager_T.cpp b/ACE/ace/Hash_Map_Manager_T.cpp
index 604cab1207a..579b7784b56 100644
--- a/ACE/ace/Hash_Map_Manager_T.cpp
+++ b/ACE/ace/Hash_Map_Manager_T.cpp
@@ -54,7 +54,7 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Map_Entry (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class INT_ID>
-ACE_Hash_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Map_Entry (void)
+ACE_Hash_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Map_Entry ()
 {
 }
 
@@ -83,7 +83,7 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::item () const
 }
 
 template <class EXT_ID, class INT_ID> void
-ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const
+ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -94,7 +94,7 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -162,7 +162,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::open
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close_i (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close_i ()
 {
   // Protect against "double-deletion" in case the destructor also
   // gets called.
@@ -197,7 +197,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all_i (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all_i ()
 {
   // Iterate through the entire map calling the destuctor of each
   // <ACE_Hash_Map_Entry>.
@@ -398,7 +398,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin
 // ------------------------------------------------------------
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const
+ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i () const
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
@@ -409,7 +409,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
+ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i ()
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i");
 
@@ -439,7 +439,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
+ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i ()
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i");
 
@@ -470,7 +470,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 // ------------------------------------------------------------
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const
+ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i () const
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
@@ -481,7 +481,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
+ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i");
 
@@ -511,7 +511,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
+ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i");
 
diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h
index 561a7273c1f..755283eb302 100644
--- a/ACE/ace/Hash_Map_Manager_T.h
+++ b/ACE/ace/Hash_Map_Manager_T.h
@@ -45,19 +45,19 @@ public:
                       ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev);
 
   /// Destructor.
-  ~ACE_Hash_Map_Entry (void);
+  ~ACE_Hash_Map_Entry ();
 
   /// Key accessor.
-  EXT_ID& key (void);
+  EXT_ID& key ();
 
   /// Read-only key accessor.
-  const EXT_ID& key (void) const;
+  const EXT_ID& key () const;
 
   /// Item accessor.
-  INT_ID& item (void);
+  INT_ID& item ();
 
   /// Read-only item accessor.
-  const INT_ID& item (void) const;
+  const INT_ID& item () const;
 
   /// Key used to look up an entry.
   /// @deprecated Use key()
@@ -74,7 +74,7 @@ public:
   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev_;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 };
 
 // Forward decl.
@@ -223,13 +223,13 @@ public:
 
   /// Close down the ACE_Hash_Map_Manager_Ex and release dynamically allocated
   /// resources.
-  int close (void);
+  int close ();
 
   /// Removes all the entries in the ACE_Hash_Map_Manager_Ex.
-  int unbind_all (void);
+  int unbind_all ();
 
   /// Cleanup the ACE_Hash_Map_Manager_Ex.
-  ~ACE_Hash_Map_Manager_Ex (void);
+  ~ACE_Hash_Map_Manager_Ex ();
 
   /**
    * Associate @a item with @a int_id.  If @a item is already in the
@@ -390,11 +390,11 @@ public:
 
   /// Returns the current number of ACE_Hash_Map_Entry objects in the
   /// hash table.
-  size_t current_size (void) const;
+  size_t current_size () const;
 
   /// Return the size of the array that's used to point to the
   /// linked lists of ACE_Hash_Map_Entry objects in the hash table.
-  size_t total_size (void) const;
+  size_t total_size () const;
 
   /**
    * Returns a reference to the underlying <ACE_LOCK>.  This makes it
@@ -404,24 +404,24 @@ public:
    * guard the state of an iterator.
    * @note The right name would be <lock>, but HP/C++ will choke on that!
    */
-  ACE_LOCK &mutex (void);
+  ACE_LOCK &mutex ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  iterator begin (void);
-  iterator end (void);
-  const_iterator begin (void) const;
-  const_iterator end (void) const;
+  iterator begin ();
+  iterator end ();
+  const_iterator begin () const;
+  const_iterator end () const;
 
   /// Return reverse iterator.
-  reverse_iterator rbegin (void);
-  reverse_iterator rend (void);
-  const_reverse_iterator rbegin (void) const;
-  const_reverse_iterator rend (void) const;
+  reverse_iterator rbegin ();
+  reverse_iterator rend ();
+  const_reverse_iterator rbegin () const;
+  const_reverse_iterator rend () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -523,11 +523,11 @@ protected:
 
   /// Close down a <Map_Manager_Ex>.  Must be called with
   /// locks held.
-  int close_i (void);
+  int close_i ();
 
   /// Removes all the entries in <Map_Manager_Ex>.  Must be called with
   /// locks held.
-  int unbind_all_i (void);
+  int unbind_all_i ();
 
   /// Pointer to a memory allocator used for table_, so it should
   /// supply size*sizeof (ACE_Hash_Map_Entry<EXT_ID, INT_ID>),
@@ -555,7 +555,7 @@ protected:
                    size_t &loc);
 
   /// Accessor of the underlying table
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *table (void);
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *table ();
 
 private:
   /**
@@ -634,17 +634,17 @@ public:
   int next (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&next_entry) const;
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Returns a reference to the interal element @c this is pointing to.
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* (void) const;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* () const;
 
   /// Returns a pointer to the interal element @c this is pointing to.
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> () const;
 
   /// Returns reference the Hash_Map_Manager_Ex that is being iterated
   /// over.
-  ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void);
+  ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
@@ -656,14 +656,14 @@ public:
 protected:
   /// Move forward by one element in the set.  Returns 0 when there's
   /// no more item in the set after the current items, else 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move backward by one element in the set.  Returns 0 when there's
   /// no more item in the set before the current item, else 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Dump the state of an object.
-  void dump_i (void) const;
+  void dump_i () const;
 
   /// Map we are iterating over.
   ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_;
@@ -710,17 +710,17 @@ public:
   int next (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&next_entry) const;
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Returns a reference to the interal element @c this is pointing to.
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* (void) const;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* () const;
 
   /// Returns a pointer to the interal element @c this is pointing to.
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> () const;
 
   /// Returns reference the Hash_Map_Manager_Ex that is being iterated
   /// over.
-  const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void);
+  const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
@@ -732,14 +732,14 @@ public:
 protected:
   /// Move forward by one element in the set.  Returns 0 when there's
   /// no more item in the set after the current items, else 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move backward by one element in the set.  Returns 0 when there's
   /// no more item in the set before the current item, else 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Dump the state of an object.
-  void dump_i (void) const;
+  void dump_i () const;
 
   /// Map we are iterating over.
   const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_;
@@ -798,21 +798,21 @@ public:
   // = Iteration methods.
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance.
-  ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix advance.
   ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix reverse.
   ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
@@ -854,21 +854,21 @@ public:
   // = Iteration methods.
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance.
-  ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix advance.
   ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix reverse.
   ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
@@ -918,26 +918,26 @@ public:
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance.
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix advance.
   ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix reverse.
   ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
 
   /// Returns a reference to the interal element @c this is pointing to.
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* (void) const;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* () const;
 
   /// Returns a pointer to the interal element @c this is pointing to.
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> () const;
 
   /// Returns reference the Hash_Map_Manager_Ex that is being iterated
   /// over.
-  ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void);
+  ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const;
@@ -946,11 +946,11 @@ public:
 protected:
   /// Move forward by one element in the set.  Returns 0 when there's
   /// no more item in the set after the current items, else 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move backward by one element in the set.  Returns 0 when there's
   /// no more item in the set before the current item, else 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Map we are iterating over.
   ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_;
@@ -996,21 +996,21 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix reverse.
-  ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix reverse.
   ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix advance.
-  ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix advance.
   ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
@@ -1052,21 +1052,21 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix reverse.
-  ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void);
+  ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ ();
 
   /// Postfix reverse.
   ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix advance.
-  ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void);
+  ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- ();
 
   /// Postfix advance.
   ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int);
diff --git a/ACE/ace/Hash_Map_Manager_T.inl b/ACE/ace/Hash_Map_Manager_T.inl
index 7af638f58f0..479bbe9c11f 100644
--- a/ACE/ace/Hash_Map_Manager_T.inl
+++ b/ACE/ace/Hash_Map_Manager_T.inl
@@ -32,7 +32,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close ()
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -40,7 +40,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all ()
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -48,25 +48,25 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbin
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~ACE_Hash_Map_Manager_Ex (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~ACE_Hash_Map_Manager_Ex ()
 {
   this->close ();
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size (void) const
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size () const
 {
   return this->cur_size_;
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size (void) const
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size () const
 {
   return this->total_size_;
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_LOCK &
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::mutex (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::mutex ()
 {
   ACE_TRACE ("ACE_Hash_Map_Manager_Ex::mutex");
   return this->lock_;
@@ -372,63 +372,63 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::iterator
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::begin (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::begin ()
 {
   return iterator (*this);
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::iterator
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::end (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::end ()
 {
   return iterator (*this, 1);
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::const_iterator
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::begin (void) const
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::begin () const
 {
   return const_iterator (*this);
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::const_iterator
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::end (void) const
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::end () const
 {
   return const_iterator (*this, 1);
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_iterator
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rbegin (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rbegin ()
 {
   return reverse_iterator (*this);
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_iterator
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rend (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rend ()
 {
   return reverse_iterator (*this, 1);
 }
 
  template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
  typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::const_reverse_iterator
- ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rbegin (void) const
+ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rbegin () const
  {
    return const_reverse_iterator (*this);
  }
 
  template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
  typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::const_reverse_iterator
- ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rend (void) const
+ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rend () const
  {
    return const_reverse_iterator (*this, 1);
  }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Entry<EXT_ID, INT_ID> *
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::table (void)
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::table ()
 {
   return this->table_;
 }
@@ -536,7 +536,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done (void) const
+ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done () const
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done");
 
@@ -547,7 +547,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Entry<EXT_ID, INT_ID> &
-ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const
+ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*");
   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *retv = 0;
@@ -562,7 +562,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Entry<EXT_ID, INT_ID> *
-ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const
+ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->");
   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *retv = 0;
@@ -579,7 +579,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 // iterated over.
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>&
-ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map (void)
+ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map ()
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map");
   return *this->map_man_;
@@ -634,7 +634,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done (void) const
+ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done () const
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done");
 
@@ -645,7 +645,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Entry<EXT_ID, INT_ID> &
-ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const
+ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*");
   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *retv = 0;
@@ -660,7 +660,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Entry<EXT_ID, INT_ID> *
-ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const
+ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->");
   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *retv = 0;
@@ -677,7 +677,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
 // iterated over.
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>&
-ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map (void)
+ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map");
   return *this->map_man_;
@@ -702,7 +702,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
-ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -751,7 +751,7 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID,
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance (void)
+ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance ()
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance");
   return this->forward_i ();
@@ -759,7 +759,7 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::adva
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
+ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ ()
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
 
@@ -780,7 +780,7 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::oper
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
+ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- ()
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
 
@@ -800,7 +800,7 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::oper
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
-ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -821,7 +821,7 @@ ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance (void)
+ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance");
   return this->forward_i ();
@@ -829,7 +829,7 @@ ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
+ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
 
@@ -850,7 +850,7 @@ ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
+ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
 
@@ -886,7 +886,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
+ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ ()
 {
   ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
 
@@ -907,7 +907,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
+ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- ()
 {
   ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
 
@@ -927,7 +927,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
+ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i ()
 {
   ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i");
 
@@ -936,7 +936,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
+ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i ()
 {
   ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i");
 
@@ -946,7 +946,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Entry<EXT_ID, INT_ID> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const
+ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const
 {
   ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*");
 
@@ -955,7 +955,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Entry<EXT_ID, INT_ID> *
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const
+ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const
 {
   ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->");
 
@@ -964,7 +964,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map (void)
+ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map ()
 {
   ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map");
   return *this->map_man_;
@@ -989,7 +989,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
-ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -1008,7 +1008,7 @@ ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance (void)
+ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance ()
 {
   ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance");
   return this->reverse_i ();
@@ -1016,7 +1016,7 @@ ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
+ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ ()
 {
   ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
 
@@ -1037,7 +1037,7 @@ ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
+ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- ()
 {
   ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
 
@@ -1057,7 +1057,7 @@ ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
-ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -1076,7 +1076,7 @@ ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
-ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance (void)
+ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance");
   return this->reverse_i ();
@@ -1084,7 +1084,7 @@ ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
+ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
 
@@ -1105,7 +1105,7 @@ ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &
-ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
+ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- ()
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
 
diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h
index 0818ee00727..1cacc63ba39 100644
--- a/ACE/ace/Hash_Multi_Map_Manager_T.h
+++ b/ACE/ace/Hash_Multi_Map_Manager_T.h
@@ -87,7 +87,7 @@ public:
   ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *prev_;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 };
 
 // Forward decl.
@@ -409,7 +409,7 @@ public:
   ACE_LOCK &mutex (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iterator factory functions.
 
@@ -755,7 +755,7 @@ public:
   int advance (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
@@ -800,7 +800,7 @@ public:
   int advance (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
@@ -920,7 +920,7 @@ public:
   int advance (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
diff --git a/ACE/ace/Hashable.cpp b/ACE/ace/Hashable.cpp
index 547a3065f64..00fd0dd9be0 100644
--- a/ACE/ace/Hashable.cpp
+++ b/ACE/ace/Hashable.cpp
@@ -6,12 +6,12 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Hashable::~ACE_Hashable (void)
+ACE_Hashable::~ACE_Hashable ()
 {
 }
 
 unsigned long
-ACE_Hashable::hash (void) const
+ACE_Hashable::hash () const
 {
   // In doing the check below, we take chance of paying a performance
   // price when the hash value is zero.  But, that will (hopefully)
diff --git a/ACE/ace/Hashable.h b/ACE/ace/Hashable.h
index 6e9e332ad4d..d8db181c588 100644
--- a/ACE/ace/Hashable.h
+++ b/ACE/ace/Hashable.h
@@ -29,27 +29,24 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Hashable
 {
 public:
-
   /// Destructor.
-  virtual ~ACE_Hashable (void);
+  virtual ~ACE_Hashable ();
 
   /// Computes and returns hash value.  This "caches" the hash value to
   /// improve performance.
-  virtual unsigned long hash (void) const;
+  virtual unsigned long hash () const;
 
 protected:
   /// Protected constructor.
-  ACE_Hashable (void);
+  ACE_Hashable ();
 
   /// This is the method that actually performs the non-cached hash
   /// computation.
-  virtual unsigned long hash_i (void) const = 0;
+  virtual unsigned long hash_i () const = 0;
 
 protected:
-
   /// Pre-computed hash-value.
   mutable unsigned long hash_value_;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Hashable.inl b/ACE/ace/Hashable.inl
index ac9af977a36..2a6d55f1388 100644
--- a/ACE/ace/Hashable.inl
+++ b/ACE/ace/Hashable.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Hashable::ACE_Hashable (void)
+ACE_Hashable::ACE_Hashable ()
   : hash_value_ (0)
 {
 }
diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp
index 048cb4d6387..a803982ef0f 100644
--- a/ACE/ace/High_Res_Timer.cpp
+++ b/ACE/ace/High_Res_Timer.cpp
@@ -73,7 +73,7 @@ int ACE_High_Res_Timer::global_scale_factor_status_ = 0;
 #if defined (ACE_LINUX) && !defined (ACE_LACKS_SSCANF)
 // Determine the apparent CPU clock speed from /proc/cpuinfo
 ACE_UINT32
-ACE_High_Res_Timer::get_cpuinfo (void)
+ACE_High_Res_Timer::get_cpuinfo ()
 {
   ACE_UINT32 scale_factor = 1u;
 
@@ -186,7 +186,7 @@ ACE_High_Res_Timer::get_cpuinfo (void)
 #endif /* ACE_LINUX && !ACE_LACKS_SSCANF*/
 
 ACE_High_Res_Timer::global_scale_factor_type
-ACE_High_Res_Timer::global_scale_factor (void)
+ACE_High_Res_Timer::global_scale_factor ()
 {
 #if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \
      defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \
@@ -251,7 +251,7 @@ ACE_High_Res_Timer::global_scale_factor (void)
   return ACE_High_Res_Timer::global_scale_factor_;
 }
 
-ACE_High_Res_Timer::ACE_High_Res_Timer (void)
+ACE_High_Res_Timer::ACE_High_Res_Timer ()
 {
   ACE_TRACE ("ACE_High_Res_Timer::ACE_High_Res_Timer");
 
@@ -304,7 +304,7 @@ ACE_High_Res_Timer::calibrate (const ACE_UINT32 usec,
 }
 
 void
-ACE_High_Res_Timer::dump (void) const
+ACE_High_Res_Timer::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_High_Res_Timer::dump");
@@ -330,7 +330,7 @@ ACE_High_Res_Timer::dump (void) const
 }
 
 void
-ACE_High_Res_Timer::reset (void)
+ACE_High_Res_Timer::reset ()
 {
   ACE_TRACE ("ACE_High_Res_Timer::reset");
 
diff --git a/ACE/ace/High_Res_Timer.h b/ACE/ace/High_Res_Timer.h
index 848ec99040c..ff4d544159b 100644
--- a/ACE/ace/High_Res_Timer.h
+++ b/ACE/ace/High_Res_Timer.h
@@ -120,7 +120,7 @@ public:
   static void global_scale_factor (global_scale_factor_type gsf);
 
   /// Returns the global_scale_factor.
-  static global_scale_factor_type global_scale_factor (void);
+  static global_scale_factor_type global_scale_factor ();
 
 #ifndef  ACE_HR_SCALE_CONVERSION
 #  define ACE_HR_SCALE_CONVERSION (ACE_ONE_SECOND_IN_USECS)
@@ -151,13 +151,13 @@ public:
                                const u_int iterations = 10);
 
   /// Initialize the timer.
-  ACE_High_Res_Timer (void);
+  ACE_High_Res_Timer ();
 
   /// Destructor.
-  ~ACE_High_Res_Timer (void);
+  ~ACE_High_Res_Timer ();
 
   /// Reinitialize the timer.
-  void reset (void);
+  void reset ();
 
   /// Start timing.
   void start (const ACE_OS::ACE_HRTimer_Op = ACE_OS::ACE_HRTIMER_GETTIME);
@@ -213,7 +213,7 @@ public:
                   ACE_HANDLE handle = ACE_STDOUT) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -224,7 +224,7 @@ public:
    * as the gettimeofday function, thereby basing the timer calculations
    * on the high res timer rather than wall clock time.
    */
-  static ACE_Time_Value gettimeofday_hr (void);
+  static ACE_Time_Value gettimeofday_hr ();
 
   /**
    * @deprecated THIS FUNCTION IS DEPRECATED.  PLEASE USE
@@ -252,7 +252,7 @@ public:
    * factor.  If there are any problems getting it, we just return 1
    * (the default).
    */
-  static ACE_UINT32 get_cpuinfo (void);
+  static ACE_UINT32 get_cpuinfo ();
 #endif /* defined (ACE_LINUX) && !ACE_LACKS_SSCANF */
 
 private:
diff --git a/ACE/ace/High_Res_Timer.inl b/ACE/ace/High_Res_Timer.inl
index fd0a1e8b088..34dc21d383b 100644
--- a/ACE/ace/High_Res_Timer.inl
+++ b/ACE/ace/High_Res_Timer.inl
@@ -69,7 +69,7 @@ ACE_High_Res_Timer::gettimeofday (const ACE_OS::ACE_HRTimer_Op op)
 /// function, which is deprecated. If it gets removed, please move the
 /// code down here, intact.
 ACE_INLINE ACE_Time_Value
-ACE_High_Res_Timer::gettimeofday_hr (void)
+ACE_High_Res_Timer::gettimeofday_hr ()
 {
   return ACE_High_Res_Timer::gettimeofday ();
 }
@@ -106,7 +106,7 @@ ACE_High_Res_Timer::elapsed_hrtime (const ACE_hrtime_t end,
 }
 
 ACE_INLINE
-ACE_High_Res_Timer::~ACE_High_Res_Timer (void)
+ACE_High_Res_Timer::~ACE_High_Res_Timer ()
 {
 }
 
diff --git a/ACE/ace/ICMP_Socket.cpp b/ACE/ace/ICMP_Socket.cpp
index 87ed3f58603..7d077a7553e 100644
--- a/ACE/ace/ICMP_Socket.cpp
+++ b/ACE/ace/ICMP_Socket.cpp
@@ -17,12 +17,12 @@ ACE_ALLOC_HOOK_DEFINE (ACE_ICMP_Socket)
 
 
 void
-ACE_ICMP_Socket::dump (void) const
+ACE_ICMP_Socket::dump () const
 {
   ACE_TRACE ("ACE_ICMP_Socket::dump");
 }
 
-ACE_ICMP_Socket::ACE_ICMP_Socket (void)
+ACE_ICMP_Socket::ACE_ICMP_Socket ()
 {
   ACE_TRACE ("ACE_ICMP_Socket::ACE_ICMP_Socket");
 }
diff --git a/ACE/ace/ICMP_Socket.h b/ACE/ace/ICMP_Socket.h
index ab3f549cf17..d1c02087c1c 100644
--- a/ACE/ace/ICMP_Socket.h
+++ b/ACE/ace/ICMP_Socket.h
@@ -72,7 +72,7 @@ public:
             int reuse_addr = 0);
 
   /// Dump the state of object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index b51cfe9fa70..6afe61038f2 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -77,7 +77,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
 }
 
 void
-ACE_INET_Addr::dump (void) const
+ACE_INET_Addr::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_INET_Addr::dump");
@@ -142,7 +142,7 @@ ACE_INET_Addr::is_ip_equal (const ACE_INET_Addr &sap) const
 
 
 u_long
-ACE_INET_Addr::hash (void) const
+ACE_INET_Addr::hash () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type () == PF_INET6)
@@ -156,7 +156,7 @@ ACE_INET_Addr::hash (void) const
 }
 
 bool
-ACE_INET_Addr::next (void)
+ACE_INET_Addr::next ()
 {
   if (this->inet_addrs_.empty () ||
       this->inet_addrs_iter_ == this->inet_addrs_.end ())
@@ -168,13 +168,13 @@ ACE_INET_Addr::next (void)
 }
 
 void
-ACE_INET_Addr::reset (void)
+ACE_INET_Addr::reset ()
 {
   this->inet_addrs_iter_ = this->inet_addrs_.begin ();
   this->next ();
 }
 
-ACE_INET_Addr::ACE_INET_Addr (void)
+ACE_INET_Addr::ACE_INET_Addr ()
   : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
   // ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
@@ -327,7 +327,6 @@ ACE_INET_Addr::ACE_INET_Addr (const ACE_INET_Addr &sa)
 
 // Initializes a ACE_INET_Addr from a PORT_NUMBER and a 32 bit Internet
 // address.
-
 int
 ACE_INET_Addr::set (u_short port_number,
                     ACE_UINT32 inet_address,
@@ -344,10 +343,8 @@ ACE_INET_Addr::set (u_short port_number,
   return 0;
 }
 
-
 // Initializes a ACE_INET_Addr from a PORT_NUMBER and the remote
 // HOST_NAME.
-
 int
 ACE_INET_Addr::set (u_short port_number,
                     const char host_name[],
@@ -482,7 +479,6 @@ static int get_port_number_from_name (const char port_name[],
     }
 
   // We try to resolve port number from its name.
-
 #if defined (ACE_LACKS_GETSERVBYNAME)
   port_number = 0;
   ACE_UNUSED_ARG (port_name);
@@ -502,9 +498,8 @@ static int get_port_number_from_name (const char port_name[],
   return port_number;
 }
 
-// Initializes a ACE_INET_Addr from a <port_name> and the remote
-// <host_name>.
-
+/// Initializes a ACE_INET_Addr from a @a port_name and the remote
+/// @a host_name.
 int
 ACE_INET_Addr::set (const char port_name[],
                     const char host_name[],
@@ -532,9 +527,8 @@ ACE_INET_Addr::set (const char port_name[],
                     host_name, 0, address_family);
 }
 
-// Initializes a ACE_INET_Addr from a <port_name> and a 32 bit
-// Internet address.
-
+/// Initializes a ACE_INET_Addr from a @a port_name and a 32 bit
+/// Internet address.
 int
 ACE_INET_Addr::set (const char port_name[],
                     ACE_UINT32 inet_address,
@@ -555,7 +549,6 @@ ACE_INET_Addr::set (const char port_name[],
 
 // Creates a ACE_INET_Addr from a PORT_NUMBER and the remote
 // HOST_NAME.
-
 ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                               const char host_name[],
                               int address_family)
@@ -594,7 +587,6 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
 #endif /* ACE_HAS_WCHAR */
 
 // Creates a ACE_INET_Addr from a sockaddr_in structure.
-
 int
 ACE_INET_Addr::set (const sockaddr_in *addr, int len)
 {
@@ -603,7 +595,7 @@ ACE_INET_Addr::set (const sockaddr_in *addr, int len)
   this->reset_i ();
   if (addr->sin_family == AF_INET)
     {
-      int maxlen = static_cast<int> (sizeof (this->inet_addr_.in4_));
+      int const maxlen = static_cast<int> (sizeof (this->inet_addr_.in4_));
       if (len > maxlen)
         len = maxlen;
       ACE_OS::memcpy (&this->inet_addr_.in4_, addr, len);
@@ -613,7 +605,7 @@ ACE_INET_Addr::set (const sockaddr_in *addr, int len)
 #if defined (ACE_HAS_IPV6)
   else if (addr->sin_family == AF_INET6)
     {
-      int maxlen = static_cast<int> (sizeof (this->inet_addr_.in6_));
+      int const maxlen = static_cast<int> (sizeof (this->inet_addr_.in6_));
       if (len > maxlen)
         len = maxlen;
       ACE_OS::memcpy (&this->inet_addr_.in6_, addr, len);
@@ -627,9 +619,8 @@ ACE_INET_Addr::set (const sockaddr_in *addr, int len)
 }
 
 // Return the address.
-
 void *
-ACE_INET_Addr::get_addr (void) const
+ACE_INET_Addr::get_addr () const
 {
   ACE_TRACE ("ACE_INET_Addr::get_addr");
   return (void*)&this->inet_addr_;
@@ -677,7 +668,6 @@ ACE_INET_Addr::set_addr (const void *addr, int /* len */, int map)
 }
 
 // Creates a ACE_INET_Addr from a sockaddr_in structure.
-
 ACE_INET_Addr::ACE_INET_Addr (const sockaddr_in *addr, int len)
   : ACE_Addr (determine_type (), sizeof (inet_addr_))
 {
@@ -686,7 +676,6 @@ ACE_INET_Addr::ACE_INET_Addr (const sockaddr_in *addr, int len)
 }
 
 // Creates a ACE_INET_Addr from a PORT_NUMBER and an Internet address.
-
 ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                               ACE_UINT32 inet_address)
   : ACE_Addr (determine_type (), sizeof (inet_addr_))
@@ -700,7 +689,6 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
 
 // Creates a ACE_INET_Addr from a PORT_NAME and the remote
 // HOST_NAME.
-
 ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
                               const char host_name[],
                               const char protocol[])
@@ -730,7 +718,6 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
 #endif /* ACE_HAS_WCHAR */
 
 // Creates a ACE_INET_Addr from a PORT_NAME and an Internet address.
-
 ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
                               ACE_UINT32 inet_address,
                               const char protocol[])
@@ -759,7 +746,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
 }
 #endif /* ACE_HAS_WCHAR */
 
-ACE_INET_Addr::~ACE_INET_Addr (void)
+ACE_INET_Addr::~ACE_INET_Addr ()
 {
 }
 
@@ -810,7 +797,7 @@ ACE_INET_Addr::get_host_name (wchar_t hostname[],
     len = MAXHOSTNAMELEN + 1;
 
   // Call the char version
-  int result = this->get_host_name (char_hostname, len);
+  int const result = this->get_host_name (char_hostname, len);
 
   // And copy it over, if successful
   if (result == 0)
@@ -824,7 +811,7 @@ ACE_INET_Addr::get_host_name (wchar_t hostname[],
 // Return the character representation of the hostname.
 
 const char *
-ACE_INET_Addr::get_host_name (void) const
+ACE_INET_Addr::get_host_name () const
 {
   ACE_TRACE ("ACE_INET_Addr::get_host_name");
 
@@ -1090,7 +1077,7 @@ ACE_INET_Addr::get_host_addr (char *dst, int size) const
 
 // Return the dotted Internet address.
 const char *
-ACE_INET_Addr::get_host_addr (void) const
+ACE_INET_Addr::get_host_addr () const
 {
   ACE_TRACE ("ACE_INET_Addr::get_host_addr");
 #if defined (ACE_HAS_IPV6)
@@ -1104,7 +1091,7 @@ ACE_INET_Addr::get_host_addr (void) const
 
 // Return the 4-byte IP address, converting it into host byte order.
 ACE_UINT32
-ACE_INET_Addr::get_ip_address (void) const
+ACE_INET_Addr::get_ip_address () const
 {
   ACE_TRACE ("ACE_INET_Addr::get_ip_address");
 #if defined (ACE_HAS_IPV6)
diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h
index 29c87f8cf55..1388d424a97 100644
--- a/ACE/ace/INET_Addr.h
+++ b/ACE/ace/INET_Addr.h
@@ -37,7 +37,7 @@ class ACE_Export ACE_INET_Addr : public ACE_Addr
 {
 public:
   /// Default constructor.
-  ACE_INET_Addr (void);
+  ACE_INET_Addr ();
 
   /// Copy constructor.
   ACE_INET_Addr (const ACE_INET_Addr &);
@@ -109,7 +109,7 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  ~ACE_INET_Addr (void);
+  ~ACE_INET_Addr ();
 
   // = Direct initialization methods.
 
@@ -210,8 +210,8 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Return a pointer to the underlying network address.
-  virtual void *get_addr (void) const;
-  int get_addr_size(void) const;
+  virtual void *get_addr () const;
+  int get_addr_size() const;
 
   /// Set a pointer to the address.
   virtual void set_addr (const void *, int len);
@@ -284,7 +284,7 @@ public:
 #endif /* (ACE_LINUX || ACE_WIN32) && ACE_HAS_IPV6 */
 
   /// Return the port number, converting it into host byte-order.
-  u_short get_port_number (void) const;
+  u_short get_port_number () const;
 
   /**
    * Return the character representation of the name of the host,
@@ -309,7 +309,7 @@ public:
    * (2) use the "reentrant" version of get_host_name() described
    * above.
    */
-  const char *get_host_name (void) const;
+  const char *get_host_name () const;
 
   /**
    * Return the "dotted decimal" Internet address representation of
@@ -326,20 +326,20 @@ public:
    * using strdup() or (2) use the "reentrant" version of
    * get_host_addr() described above.
    */
-  const char *get_host_addr (void) const;
+  const char *get_host_addr () const;
 
   /// Return the 4-byte IP address, converting it into host byte
   /// order.
-  ACE_UINT32 get_ip_address (void) const;
+  ACE_UINT32 get_ip_address () const;
 
   /// Return @c true if the IP address is INADDR_ANY or IN6ADDR_ANY.
-  bool is_any (void) const;
+  bool is_any () const;
 
   /// Return @c true if the IP address is IPv4/IPv6 loopback address.
-  bool is_loopback (void) const;
+  bool is_loopback () const;
 
   /// Return @c true if the IP address is IPv4/IPv6 multicast address.
-  bool is_multicast (void) const;
+  bool is_multicast () const;
 
 #if defined (ACE_HAS_IPV6)
   /// Return @c true if the IP address is IPv6 linklocal address.
@@ -375,17 +375,17 @@ public:
   bool is_ip_equal (const ACE_INET_Addr &SAP) const;
 
   /// Computes and returns hash value.
-  virtual u_long hash (void) const;
+  virtual u_long hash () const;
 
   /// If there is another address to examine, move to it and return true;
   /// else return false.
-  bool next (void);
+  bool next ();
 
   /// Reset the set of address so they can be scanned again using next().
-  void reset (void);
+  void reset ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -396,12 +396,12 @@ private:
 
   // Methods to gain access to the actual address of
   // the underlying internet address structure.
-  void *ip_addr_pointer (void) const;
-  int ip_addr_size (void) const;
-  int determine_type (void) const;
+  void *ip_addr_pointer () const;
+  int ip_addr_size () const;
+  int determine_type () const;
 
   /// Initialize underlying inet_addr_ to default values
-  void reset_i (void);
+  void reset_i ();
 
   /// Underlying representation.
   /// This union uses the knowledge that the two structures share the
diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl
index 96bbb161b67..f8aa3f42a1e 100644
--- a/ACE/ace/INET_Addr.inl
+++ b/ACE/ace/INET_Addr.inl
@@ -7,7 +7,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
-ACE_INET_Addr::reset_i (void)
+ACE_INET_Addr::reset_i ()
 {
   ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_));
   if (this->get_type() == AF_INET)
@@ -32,7 +32,7 @@ ACE_INET_Addr::reset_i (void)
 }
 
 ACE_INLINE int
-ACE_INET_Addr::determine_type (void) const
+ACE_INET_Addr::determine_type () const
 {
 #if defined (ACE_HAS_IPV6)
 #  if defined (ACE_USES_IPV4_IPV6_MIGRATION)
@@ -46,7 +46,7 @@ ACE_INET_Addr::determine_type (void) const
 }
 
 ACE_INLINE void *
-ACE_INET_Addr::ip_addr_pointer (void) const
+ACE_INET_Addr::ip_addr_pointer () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type () == PF_INET)
@@ -59,7 +59,7 @@ ACE_INET_Addr::ip_addr_pointer (void) const
 }
 
 ACE_INLINE int
-ACE_INET_Addr::ip_addr_size (void) const
+ACE_INET_Addr::ip_addr_size () const
 {
   // Since this size value is used to pass to other host db-type
   // functions (gethostbyaddr, etc.) the length is of int type.
@@ -78,7 +78,7 @@ ACE_INET_Addr::ip_addr_size (void) const
 // Return the port number, converting it into host byte order...
 
 ACE_INLINE u_short
-ACE_INET_Addr::get_port_number (void) const
+ACE_INET_Addr::get_port_number () const
 {
   ACE_TRACE ("ACE_INET_Addr::get_port_number");
 #if defined (ACE_HAS_IPV6)
@@ -96,7 +96,7 @@ ACE_INET_Addr::get_port_number (void) const
 }
 
 ACE_INLINE int
-ACE_INET_Addr::get_addr_size (void) const
+ACE_INET_Addr::get_addr_size () const
 {
   ACE_TRACE ("ACE_INET_Addr::get_addr_size");
 #if defined (ACE_HAS_IPV6)
@@ -181,7 +181,7 @@ ACE_INET_Addr::set (const wchar_t addr[], int address_family)
 
 // Return @c true if the IP address is INADDR_ANY or IN6ADDR_ANY.
 ACE_INLINE bool
-ACE_INET_Addr::is_any (void) const
+ACE_INET_Addr::is_any () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type () == AF_INET6)
@@ -193,7 +193,7 @@ ACE_INET_Addr::is_any (void) const
 
 // Return @c true if the IP address is IPv4/IPv6 loopback address.
 ACE_INLINE bool
-ACE_INET_Addr::is_loopback (void) const
+ACE_INET_Addr::is_loopback () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type () == AF_INET6)
@@ -206,7 +206,7 @@ ACE_INET_Addr::is_loopback (void) const
 
 // Return @c true if the IP address is IPv4/IPv6 multicast address.
 ACE_INLINE bool
-ACE_INET_Addr::is_multicast (void) const
+ACE_INET_Addr::is_multicast () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type() == AF_INET6)
diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h
index 0c01cf2878a..8a8776a79eb 100644
--- a/ACE/ace/IOStream_T.h
+++ b/ACE/ace/IOStream_T.h
@@ -224,8 +224,6 @@ protected:
   ACE_Streambuf_T<STREAM> *streambuf_;
 
 private:
-  // = Private methods.
-
   // We move these into the private section so that they cannot be
   // used by the application programmer.  This is necessary because
   // streambuf_ will be buffering IO on the STREAM object.  If these
diff --git a/ACE/ace/IO_Cntl_Msg.h b/ACE/ace/IO_Cntl_Msg.h
index 36c683684d7..d626fd0ef70 100644
--- a/ACE/ace/IO_Cntl_Msg.h
+++ b/ACE/ace/IO_Cntl_Msg.h
@@ -55,31 +55,31 @@ public:
   // = Get/set methods
 
   /// Get command.
-  ACE_IO_Cntl_Cmds cmd (void);
+  ACE_IO_Cntl_Cmds cmd ();
 
   /// Set command.
   void cmd (ACE_IO_Cntl_Cmds c);
 
   /// Get count.
-  size_t count (void);
+  size_t count ();
 
   /// Set count.
   void count (size_t c);
 
   /// Get error.
-  int error (void);
+  int error ();
 
   /// Set error.
   void error (int e);
 
   /// Get return value.
-  int rval (void);
+  int rval ();
 
   /// Set return value.
   void rval (int r);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/IO_Cntl_Msg.inl b/ACE/ace/IO_Cntl_Msg.inl
index 17f1dbcfb6e..c90b1be554d 100644
--- a/ACE/ace/IO_Cntl_Msg.inl
+++ b/ACE/ace/IO_Cntl_Msg.inl
@@ -11,7 +11,7 @@ ACE_IO_Cntl_Msg::ACE_IO_Cntl_Msg (ACE_IO_Cntl_Cmds c) :
 }
 
 ACE_INLINE ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds
-ACE_IO_Cntl_Msg::cmd (void)
+ACE_IO_Cntl_Msg::cmd ()
 {
   return this->cmd_;
 }
@@ -23,7 +23,7 @@ ACE_IO_Cntl_Msg::cmd (ACE_IO_Cntl_Cmds c)
 }
 
 ACE_INLINE size_t
-ACE_IO_Cntl_Msg::count (void)
+ACE_IO_Cntl_Msg::count ()
 {
   return this->count_;
 }
@@ -35,7 +35,7 @@ ACE_IO_Cntl_Msg::count (size_t c)
 }
 
 ACE_INLINE int
-ACE_IO_Cntl_Msg::error (void)
+ACE_IO_Cntl_Msg::error ()
 {
   return this->error_;
 }
@@ -47,7 +47,7 @@ ACE_IO_Cntl_Msg::error (int e)
 }
 
 ACE_INLINE int
-ACE_IO_Cntl_Msg::rval (void)
+ACE_IO_Cntl_Msg::rval ()
 {
   return this->rval_;
 }
diff --git a/ACE/ace/IO_SAP.cpp b/ACE/ace/IO_SAP.cpp
index 9411e765307..1c5fcdf311d 100644
--- a/ACE/ace/IO_SAP.cpp
+++ b/ACE/ace/IO_SAP.cpp
@@ -20,14 +20,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_IO_SAP)
 // This is the do-nothing constructor.  It does not perform a
 // ACE_OS::open system call.
 
-ACE_IO_SAP::ACE_IO_SAP (void)
+ACE_IO_SAP::ACE_IO_SAP ()
   : handle_ (ACE_INVALID_HANDLE)
 {
   ACE_TRACE ("ACE_IO_SAP::ACE_IO_SAP");
 }
 
 void
-ACE_IO_SAP::dump (void) const
+ACE_IO_SAP::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_IO_SAP::dump");
diff --git a/ACE/ace/IO_SAP.h b/ACE/ace/IO_SAP.h
index f1183e638d9..81a4679145f 100644
--- a/ACE/ace/IO_SAP.h
+++ b/ACE/ace/IO_SAP.h
@@ -20,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -39,7 +38,7 @@ public:
   };
 
   /// Default dtor.
-  ~ACE_IO_SAP (void);
+  ~ACE_IO_SAP ();
 
   /// Interface for ioctl.
   int control (int cmd, void *) const;
@@ -61,20 +60,20 @@ public:
   int disable (int value) const;
 
   /// Get the underlying handle.
-  ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const;
 
   /// Set the underlying handle.
   void set_handle (ACE_HANDLE handle);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Ensure that ACE_IO_SAP is an abstract base class.
-  ACE_IO_SAP (void);
+  ACE_IO_SAP ();
 
 private:
   /// Underlying I/O handle.
diff --git a/ACE/ace/IO_SAP.inl b/ACE/ace/IO_SAP.inl
index d3472bb974c..12d8a50e397 100644
--- a/ACE/ace/IO_SAP.inl
+++ b/ACE/ace/IO_SAP.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_IO_SAP::~ACE_IO_SAP (void)
+ACE_IO_SAP::~ACE_IO_SAP ()
 {
   ACE_TRACE ("ACE_IO_SAP::~ACE_IO_SAP");
 }
@@ -12,7 +12,7 @@ ACE_IO_SAP::~ACE_IO_SAP (void)
 // Used to return the underlying handle_.
 
 ACE_INLINE ACE_HANDLE
-ACE_IO_SAP::get_handle (void) const
+ACE_IO_SAP::get_handle () const
 {
   ACE_TRACE ("ACE_IO_SAP::get_handle");
   return this->handle_;
diff --git a/ACE/ace/IPC_SAP.cpp b/ACE/ace/IPC_SAP.cpp
index 1bf77aaf23e..c88f8830f55 100644
--- a/ACE/ace/IPC_SAP.cpp
+++ b/ACE/ace/IPC_SAP.cpp
@@ -20,7 +20,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
 
 void
-ACE_IPC_SAP::dump (void) const
+ACE_IPC_SAP::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_IPC_SAP::dump");
@@ -34,7 +34,7 @@ ACE_IPC_SAP::dump (void) const
 // This is the do-nothing constructor.  It does not perform a
 // ACE_OS::socket system call.
 
-ACE_IPC_SAP::ACE_IPC_SAP (void)
+ACE_IPC_SAP::ACE_IPC_SAP ()
   : handle_ (ACE_INVALID_HANDLE)
 {
   // ACE_TRACE ("ACE_IPC_SAP::ACE_IPC_SAP");
diff --git a/ACE/ace/IPC_SAP.h b/ACE/ace/IPC_SAP.h
index ff48c365712..dce2fabb6fc 100644
--- a/ACE/ace/IPC_SAP.h
+++ b/ACE/ace/IPC_SAP.h
@@ -30,7 +30,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_IPC_SAP
 {
 public:
-
   /// Interface for <ioctl>.
   int control (int cmd, void *) const;
 
@@ -51,22 +50,21 @@ public:
   int disable (int value) const;
 
   /// Get the underlying handle.
-  ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const;
 
   /// Set the underlying handle.
   void set_handle (ACE_HANDLE handle);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-
   // = Ensure that ACE_IPC_SAP is an abstract base class.
   /// Default constructor.
-  ACE_IPC_SAP (void);
+  ACE_IPC_SAP ();
 
   /// Protected destructor.
   /**
@@ -74,7 +72,7 @@ protected:
    * operator delete() from being called through a base class
    * ACE_IPC_SAP pointer/reference.
    */
-  ~ACE_IPC_SAP (void);
+  ~ACE_IPC_SAP ();
 
 private:
   /// Underlying I/O handle.
diff --git a/ACE/ace/IPC_SAP.inl b/ACE/ace/IPC_SAP.inl
index 8419609148e..fe06636a02e 100644
--- a/ACE/ace/IPC_SAP.inl
+++ b/ACE/ace/IPC_SAP.inl
@@ -4,13 +4,13 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_IPC_SAP::~ACE_IPC_SAP (void)
+ACE_IPC_SAP::~ACE_IPC_SAP ()
 {
   // ACE_TRACE ("ACE_IPC_SAP::~ACE_IPC_SAP");
 }
 
 ACE_INLINE ACE_HANDLE
-ACE_IPC_SAP::get_handle (void) const
+ACE_IPC_SAP::get_handle () const
 {
   ACE_TRACE ("ACE_IPC_SAP::get_handle");
   return this->handle_;
diff --git a/ACE/ace/If_Then_Else.h b/ACE/ace/If_Then_Else.h
index 5b8d3e93f42..626b331f8fc 100644
--- a/ACE/ace/If_Then_Else.h
+++ b/ACE/ace/If_Then_Else.h
@@ -21,7 +21,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
-
   /**
    * @struct If_Then_Else
    *
diff --git a/ACE/ace/Init_ACE.cpp b/ACE/ace/Init_ACE.cpp
index 9e07a8ab4c3..65e551ca81c 100644
--- a/ACE/ace/Init_ACE.cpp
+++ b/ACE/ace/Init_ACE.cpp
@@ -7,19 +7,18 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 unsigned int ACE::init_fini_count_ = 0;
 
 int
-ACE::init (void)
+ACE::init ()
 {
   // Don't use ACE_TRACE, because Object_Manager might not have been
   // instantiated yet.
   // ACE_TRACE ("ACE::init");
-
   ++ACE::init_fini_count_;
 
   return ACE_Object_Manager::instance ()->init ();
 }
 
 int
-ACE::fini (void)
+ACE::fini ()
 {
   ACE_TRACE ("ACE::fini");
 
diff --git a/ACE/ace/Intrusive_Auto_Ptr.cpp b/ACE/ace/Intrusive_Auto_Ptr.cpp
index 69ecffe2852..c437ce99e42 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.cpp
+++ b/ACE/ace/Intrusive_Auto_Ptr.cpp
@@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Intrusive_Auto_Ptr)
 
 template <class X>
-ACE_Intrusive_Auto_Ptr<X>::~ACE_Intrusive_Auto_Ptr (void)
+ACE_Intrusive_Auto_Ptr<X>::~ACE_Intrusive_Auto_Ptr ()
 {
   reset (0);
 }
diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h
index 2a6955f129b..c2eae90691b 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.h
+++ b/ACE/ace/Intrusive_Auto_Ptr.h
@@ -47,20 +47,17 @@ template <class X>
 class ACE_Intrusive_Auto_Ptr
 {
 protected:
-
-    /// Used to define a proper boolean conversion for "if (sp) ..."
+  /// Used to define a proper boolean conversion for "if (sp) ..."
   static void unspecified_bool(ACE_Intrusive_Auto_Ptr<X>***){};
   typedef void (*unspecified_bool_type)(ACE_Intrusive_Auto_Ptr<X>***);
 
 public:
-
   /// Enables "if (sp) ..."
   operator unspecified_bool_type() const
     {
         return rep_ == 0 ? 0: unspecified_bool;
     }
 
-
   /// Constructor that initializes an ACE_Intrusive_Auto_Ptr to
   /// the specified pointer value.
   ACE_Intrusive_Auto_Ptr (X *p = 0, bool addref = true);
@@ -76,7 +73,7 @@ public:
   /// Destructor. Releases the reference to the underlying representation.
   /// If the release of that reference causes its reference count to reach 0,
   /// the representation object will also be destroyed.
-  virtual ~ACE_Intrusive_Auto_Ptr (void);
+  virtual ~ACE_Intrusive_Auto_Ptr ();
 
   /// Assignment operator that binds the current object and @a r to the same
   /// ACE_Intrusive_Auto_Ptr_Rep. An ACE_Intrusive_Auto_Ptr_Rep
@@ -84,33 +81,29 @@ public:
   void operator = (const ACE_Intrusive_Auto_Ptr<X> &r);
 
   /// Redirection operator
-  X *operator-> (void) const;
+  X *operator-> () const;
 
   /// Accessor method.
   X &operator *() const;
 
   /// Releases the reference to the underlying representation object.
   /// @retval The pointer value prior to releasing it.
-  X *release (void);
+  X *release ();
 
   /// Releases the current pointer value and then sets a new
   /// pointer value specified by @a p.
   void reset (X *p = 0);
 
   /// Get the pointer value.
-  X *get (void) const;
+  X *get () const;
 
    /// Get the reference count value.
-  long count (void) const;
-
-  /// Returns @c true if this object does not contain a valid pointer.
-  //  bool null (void) const;
+  long count () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-
   /// Protect operations on the ACE_Intrusive_Auto_Ptr.
   X *rep_;
 };
diff --git a/ACE/ace/Intrusive_Auto_Ptr.inl b/ACE/ace/Intrusive_Auto_Ptr.inl
index 7d353e316c9..f208d6feb4b 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.inl
+++ b/ACE/ace/Intrusive_Auto_Ptr.inl
@@ -21,7 +21,7 @@ ACE_Intrusive_Auto_Ptr<X>::ACE_Intrusive_Auto_Ptr (const ACE_Intrusive_Auto_Ptr<
 }
 
 template <class X> ACE_INLINE X *
-ACE_Intrusive_Auto_Ptr<X>::operator-> (void) const
+ACE_Intrusive_Auto_Ptr<X>::operator-> () const
 {
     return this->rep_;
 }
@@ -33,14 +33,14 @@ ACE_Intrusive_Auto_Ptr<X>::operator *() const
 }
 
 template <class X> ACE_INLINE X*
-ACE_Intrusive_Auto_Ptr<X>::get (void) const
+ACE_Intrusive_Auto_Ptr<X>::get () const
 {
   // We return the ACE_Future_rep.
   return this->rep_;
 }
 
 template<class X> ACE_INLINE X *
-ACE_Intrusive_Auto_Ptr<X>::release (void)
+ACE_Intrusive_Auto_Ptr<X>::release ()
 {
   X *p = this->rep_;
   if (this->rep_ != 0)
@@ -114,31 +114,30 @@ template<class T, class U> ACE_INLINE bool operator==(ACE_Intrusive_Auto_Ptr<T>
     return a.get() == b.get();
 }
 
-  /// Inequality operator, which is the opposite of equality.
-  template<class T, class U> ACE_INLINE bool operator!=(ACE_Intrusive_Auto_Ptr<T> const & a, ACE_Intrusive_Auto_Ptr<U> const & b)
+/// Inequality operator, which is the opposite of equality.
+template<class T, class U> ACE_INLINE bool operator!=(ACE_Intrusive_Auto_Ptr<T> const & a, ACE_Intrusive_Auto_Ptr<U> const & b)
 {
     return a.get() != b.get();
 }
 
-    template<class T, class U> ACE_INLINE bool operator==(ACE_Intrusive_Auto_Ptr<T> const & a, U * b)
+template<class T, class U> ACE_INLINE bool operator==(ACE_Intrusive_Auto_Ptr<T> const & a, U * b)
 {
     return a.get() == b;
 }
 
-      template<class T, class U> ACE_INLINE bool operator!=(ACE_Intrusive_Auto_Ptr<T> & a, U * b)
+template<class T, class U> ACE_INLINE bool operator!=(ACE_Intrusive_Auto_Ptr<T> & a, U * b)
 {
     return a.get() != b;
 }
 
-        template<class T, class U> ACE_INLINE bool operator==(T * a, ACE_Intrusive_Auto_Ptr<U> const & b)
+template<class T, class U> ACE_INLINE bool operator==(T * a, ACE_Intrusive_Auto_Ptr<U> const & b)
 {
     return a == b.get();
 }
 
-          template<class T, class U> ACE_INLINE bool operator!=(T * a, ACE_Intrusive_Auto_Ptr<U> const & b)
+template<class T, class U> ACE_INLINE bool operator!=(T * a, ACE_Intrusive_Auto_Ptr<U> const & b)
 {
     return a != b.get();
 }
 
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Intrusive_List.cpp b/ACE/ace/Intrusive_List.cpp
index 0623adbe493..54bafc4c7b7 100644
--- a/ACE/ace/Intrusive_List.cpp
+++ b/ACE/ace/Intrusive_List.cpp
@@ -14,14 +14,14 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
-ACE_Intrusive_List<T>::ACE_Intrusive_List (void)
+ACE_Intrusive_List<T>::ACE_Intrusive_List ()
   : head_ (0)
   , tail_ (0)
 {
 }
 
 template<class T>
-ACE_Intrusive_List<T>::~ACE_Intrusive_List (void)
+ACE_Intrusive_List<T>::~ACE_Intrusive_List ()
 {
 }
 
@@ -64,7 +64,7 @@ ACE_Intrusive_List<T>::push_front (T *node)
 }
 
 template<class T> T *
-ACE_Intrusive_List<T>::pop_front (void)
+ACE_Intrusive_List<T>::pop_front ()
 {
   T *node = this->head_;
   if (node != 0)
@@ -75,7 +75,7 @@ ACE_Intrusive_List<T>::pop_front (void)
 }
 
 template<class T> T *
-ACE_Intrusive_List<T>::pop_back (void)
+ACE_Intrusive_List<T>::pop_back ()
 {
   T *node = this->tail_;
   if (node != 0)
diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h
index 2ed02750b35..d5ba0534d41 100644
--- a/ACE/ace/Intrusive_List.h
+++ b/ACE/ace/Intrusive_List.h
@@ -57,15 +57,15 @@ class ACE_Intrusive_List
 public:
   /// Constructor.  Use user specified allocation strategy
   /// if specified.
-  ACE_Intrusive_List (void);
+  ACE_Intrusive_List ();
 
   /// Destructor.
-  ~ACE_Intrusive_List (void);
+  ~ACE_Intrusive_List ();
 
   // = Check boundary conditions.
 
   /// Returns true if the container is empty, otherwise returns false.
-  bool is_empty (void) const;
+  bool is_empty () const;
 
   /// Insert an element at the beginning of the list
   void push_front (T *node);
@@ -74,16 +74,16 @@ public:
   void push_back (T *node);
 
   /// Remove the element at the beginning of the list
-  T *pop_front (void);
+  T *pop_front ();
 
   /// Remove the element at the end of the list
-  T *pop_back (void);
+  T *pop_back ();
 
   /// Get the element at the head of the queue
-  T *head (void) const;
+  T *head () const;
 
   /// Get the element at the tail of the queue
-  T *tail (void) const;
+  T *tail () const;
 
   /// Remove a element from the list
   /**
diff --git a/ACE/ace/Intrusive_List.inl b/ACE/ace/Intrusive_List.inl
index 17d7a15653e..ae004a341a0 100644
--- a/ACE/ace/Intrusive_List.inl
+++ b/ACE/ace/Intrusive_List.inl
@@ -4,19 +4,19 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T> ACE_INLINE bool
-ACE_Intrusive_List<T>::is_empty (void) const
+ACE_Intrusive_List<T>::is_empty () const
 {
   return this->head_ == 0;
 }
 
 template<class T> ACE_INLINE T *
-ACE_Intrusive_List<T>::head (void) const
+ACE_Intrusive_List<T>::head () const
 {
   return this->head_;
 }
 
 template<class T> ACE_INLINE T *
-ACE_Intrusive_List<T>::tail (void) const
+ACE_Intrusive_List<T>::tail () const
 {
   return this->tail_;
 }
diff --git a/ACE/ace/Intrusive_List_Node.cpp b/ACE/ace/Intrusive_List_Node.cpp
index 830ea4b1ce7..74f27993d02 100644
--- a/ACE/ace/Intrusive_List_Node.cpp
+++ b/ACE/ace/Intrusive_List_Node.cpp
@@ -14,7 +14,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T>
-ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node (void)
+ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node ()
   : prev_ (0)
   , next_ (0)
 {
diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h
index 732a5179242..366083712e5 100644
--- a/ACE/ace/Intrusive_List_Node.h
+++ b/ACE/ace/Intrusive_List_Node.h
@@ -44,9 +44,9 @@ public:
    *
    */
   //@{
-  T *prev (void) const;
+  T *prev () const;
   void prev (T *);
-  T *next (void) const;
+  T *next () const;
   void next (T *);
   //@}
 
@@ -56,7 +56,7 @@ protected:
    * The constructor is protected, because only derived classes should
    * be instantiated.
    */
-  ACE_Intrusive_List_Node (void);
+  ACE_Intrusive_List_Node ();
 
 private:
   /// Head and tail of the list
diff --git a/ACE/ace/Intrusive_List_Node.inl b/ACE/ace/Intrusive_List_Node.inl
index 220453adc46..d26a78a4179 100644
--- a/ACE/ace/Intrusive_List_Node.inl
+++ b/ACE/ace/Intrusive_List_Node.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T> ACE_INLINE T*
-ACE_Intrusive_List_Node<T>::prev (void) const
+ACE_Intrusive_List_Node<T>::prev () const
 {
   return this->prev_;
 }
@@ -14,7 +14,7 @@ ACE_Intrusive_List_Node<T>::prev (T *x)
 }
 
 template<class T> ACE_INLINE T*
-ACE_Intrusive_List_Node<T>::next (void) const
+ACE_Intrusive_List_Node<T>::next () const
 {
   return this->next_;
 }
diff --git a/ACE/ace/LSOCK.cpp b/ACE/ace/LSOCK.cpp
index 332890ed82c..ef57f5448c7 100644
--- a/ACE/ace/LSOCK.cpp
+++ b/ACE/ace/LSOCK.cpp
@@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK)
 
 void
-ACE_LSOCK::dump (void) const
+ACE_LSOCK::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK::dump");
diff --git a/ACE/ace/LSOCK.h b/ACE/ace/LSOCK.h
index cb9603afd86..61482cdf600 100644
--- a/ACE/ace/LSOCK.h
+++ b/ACE/ace/LSOCK.h
@@ -46,7 +46,7 @@ public:
 #endif /* ACE_HAS_MSG */
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/LSOCK_Acceptor.cpp b/ACE/ace/LSOCK_Acceptor.cpp
index 28a45ea3faa..1dc0cf8f998 100644
--- a/ACE/ace/LSOCK_Acceptor.cpp
+++ b/ACE/ace/LSOCK_Acceptor.cpp
@@ -30,7 +30,7 @@ ACE_LSOCK_Acceptor::get_local_addr (ACE_Addr &a) const
 }
 
 void
-ACE_LSOCK_Acceptor::dump (void) const
+ACE_LSOCK_Acceptor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Acceptor::dump");
@@ -43,7 +43,7 @@ ACE_LSOCK_Acceptor::dump (void) const
 
 // Do nothing routine for constructor.
 
-ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (void)
+ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor ()
 {
   ACE_TRACE ("ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor");
 }
@@ -131,7 +131,7 @@ ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_stream,
 // from the file system.
 
 int
-ACE_LSOCK_Acceptor::remove (void)
+ACE_LSOCK_Acceptor::remove ()
 {
   ACE_TRACE ("ACE_LSOCK_Acceptor::remove");
   int result = this->close ();
diff --git a/ACE/ace/LSOCK_Acceptor.h b/ACE/ace/LSOCK_Acceptor.h
index fb5bbba519c..330101fcc75 100644
--- a/ACE/ace/LSOCK_Acceptor.h
+++ b/ACE/ace/LSOCK_Acceptor.h
@@ -75,7 +75,7 @@ public:
   typedef ACE_LSOCK_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/LSOCK_CODgram.cpp b/ACE/ace/LSOCK_CODgram.cpp
index d3f6d72e616..6f28664991a 100644
--- a/ACE/ace/LSOCK_CODgram.cpp
+++ b/ACE/ace/LSOCK_CODgram.cpp
@@ -17,7 +17,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_CODgram)
 
 void
-ACE_LSOCK_CODgram::dump (void) const
+ACE_LSOCK_CODgram::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_CODgram::dump");
diff --git a/ACE/ace/LSOCK_CODgram.h b/ACE/ace/LSOCK_CODgram.h
index 694df50d481..0c9f8f64a96 100644
--- a/ACE/ace/LSOCK_CODgram.h
+++ b/ACE/ace/LSOCK_CODgram.h
@@ -90,7 +90,7 @@ public:
   void set_handle (ACE_HANDLE);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/LSOCK_Connector.cpp b/ACE/ace/LSOCK_Connector.cpp
index a7c9b2e718c..45bb9c67249 100644
--- a/ACE/ace/LSOCK_Connector.cpp
+++ b/ACE/ace/LSOCK_Connector.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Connector)
 
 void
-ACE_LSOCK_Connector::dump (void) const
+ACE_LSOCK_Connector::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Connector::dump");
@@ -29,7 +29,7 @@ ACE_LSOCK_Connector::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_LSOCK_Connector::ACE_LSOCK_Connector (void)
+ACE_LSOCK_Connector::ACE_LSOCK_Connector ()
 {
   ACE_TRACE ("ACE_LSOCK_Connector::ACE_LSOCK_Connector");
 }
diff --git a/ACE/ace/LSOCK_Connector.h b/ACE/ace/LSOCK_Connector.h
index 20ced3ba7ef..2351805f99f 100644
--- a/ACE/ace/LSOCK_Connector.h
+++ b/ACE/ace/LSOCK_Connector.h
@@ -71,7 +71,7 @@ public:
   typedef ACE_LSOCK_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/LSOCK_Dgram.cpp b/ACE/ace/LSOCK_Dgram.cpp
index 58059aede11..d544d4d3850 100644
--- a/ACE/ace/LSOCK_Dgram.cpp
+++ b/ACE/ace/LSOCK_Dgram.cpp
@@ -17,7 +17,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Dgram)
 
 void
-ACE_LSOCK_Dgram::dump (void) const
+ACE_LSOCK_Dgram::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Dgram::dump");
@@ -31,7 +31,7 @@ ACE_LSOCK_Dgram::dump (void) const
 
 // The "do nothing" constructor.
 
-ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (void)
+ACE_LSOCK_Dgram::ACE_LSOCK_Dgram ()
 {
   ACE_TRACE ("ACE_LSOCK_Dgram::ACE_LSOCK_Dgram");
 }
diff --git a/ACE/ace/LSOCK_Dgram.h b/ACE/ace/LSOCK_Dgram.h
index 07b7da1d5c7..a5690f45f43 100644
--- a/ACE/ace/LSOCK_Dgram.h
+++ b/ACE/ace/LSOCK_Dgram.h
@@ -54,7 +54,7 @@ public:
   void set_handle (ACE_HANDLE);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/LSOCK_Stream.cpp b/ACE/ace/LSOCK_Stream.cpp
index 0bbf126956b..4af5927f1c3 100644
--- a/ACE/ace/LSOCK_Stream.cpp
+++ b/ACE/ace/LSOCK_Stream.cpp
@@ -47,7 +47,7 @@ ACE_LSOCK_Stream::get_remote_addr (ACE_Addr &addr) const
 }
 
 void
-ACE_LSOCK_Stream::dump (void) const
+ACE_LSOCK_Stream::dump () const
 {
   ACE_TRACE ("ACE_LSOCK_Stream::dump");
 
diff --git a/ACE/ace/LSOCK_Stream.h b/ACE/ace/LSOCK_Stream.h
index 54f87e1fd10..9cf6e8373d3 100644
--- a/ACE/ace/LSOCK_Stream.h
+++ b/ACE/ace/LSOCK_Stream.h
@@ -56,7 +56,7 @@ public:
   typedef ACE_UNIX_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Local_Memory_Pool.cpp b/ACE/ace/Local_Memory_Pool.cpp
index 0332f6f36e0..c4d3f360b5b 100644
--- a/ACE/ace/Local_Memory_Pool.cpp
+++ b/ACE/ace/Local_Memory_Pool.cpp
@@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Local_Memory_Pool)
 
 void
-ACE_Local_Memory_Pool::dump (void) const
+ACE_Local_Memory_Pool::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Local_Memory_Pool::dump");
@@ -24,7 +24,7 @@ ACE_Local_Memory_Pool::ACE_Local_Memory_Pool (const ACE_TCHAR *,
   ACE_TRACE ("ACE_Local_Memory_Pool::ACE_Local_Memory_Pool");
 }
 
-ACE_Local_Memory_Pool::~ACE_Local_Memory_Pool (void)
+ACE_Local_Memory_Pool::~ACE_Local_Memory_Pool ()
 {
   // Free up all memory allocated by this pool.
   this->release ();
@@ -137,7 +137,7 @@ ACE_Local_Memory_Pool::remap (void *)
 }
 
 void *
-ACE_Local_Memory_Pool::base_addr (void) const
+ACE_Local_Memory_Pool::base_addr () const
 {
   return 0;
 }
diff --git a/ACE/ace/Local_Memory_Pool.h b/ACE/ace/Local_Memory_Pool.h
index 1d931e3df37..4fb5111b705 100644
--- a/ACE/ace/Local_Memory_Pool.h
+++ b/ACE/ace/Local_Memory_Pool.h
@@ -110,7 +110,7 @@ public:
   virtual void *base_addr (void) const;
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -122,7 +122,6 @@ protected:
   /// Implement the algorithm for rounding up the request to an
   /// appropriate chunksize.
   virtual size_t round_up (size_t nbytes);
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Local_Name_Space.cpp b/ACE/ace/Local_Name_Space.cpp
index 59645093ef0..ce5f345b39d 100644
--- a/ACE/ace/Local_Name_Space.cpp
+++ b/ACE/ace/Local_Name_Space.cpp
@@ -7,7 +7,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_NS_String::~ACE_NS_String (void)
+ACE_NS_String::~ACE_NS_String ()
 {
   if (this->delete_rep_)
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -18,7 +18,7 @@ ACE_NS_String::~ACE_NS_String (void)
 }
 
 ACE_WCHAR_T *
-ACE_NS_String::fast_rep (void) const
+ACE_NS_String::fast_rep () const
 {
   ACE_TRACE ("ACE_NS_String::fast_rep");
   return this->rep_;
@@ -32,14 +32,14 @@ ACE_NS_String::operator ACE_NS_WString () const
 }
 
 size_t
-ACE_NS_String::len (void) const
+ACE_NS_String::len () const
 {
   ACE_TRACE ("ACE_NS_String::len");
   return this->len_;
 }
 
 char *
-ACE_NS_String::char_rep (void) const
+ACE_NS_String::char_rep () const
 {
   ACE_TRACE ("ACE_NS_String::char_rep");
   ACE_NS_WString w_string (this->rep_,
@@ -47,7 +47,7 @@ ACE_NS_String::char_rep (void) const
   return w_string.char_rep ();
 }
 
-ACE_NS_String::ACE_NS_String (void)
+ACE_NS_String::ACE_NS_String ()
   : len_ (0),
     rep_ (0),
     delete_rep_ (false)
@@ -125,14 +125,14 @@ ACE_NS_String::ACE_NS_String (ACE_WCHAR_T *dst,
 }
 
 u_long
-ACE_NS_String::hash (void) const
+ACE_NS_String::hash () const
 {
   return ACE::hash_pjw
     (reinterpret_cast<char *> (const_cast<ACE_WCHAR_T *> (this->rep_)),
      this->len_);
 }
 
-ACE_NS_Internal::ACE_NS_Internal (void)
+ACE_NS_Internal::ACE_NS_Internal ()
   : value_ (),
     type_ ()
 {
@@ -153,14 +153,14 @@ ACE_NS_Internal::operator == (const ACE_NS_Internal &s) const
 }
 
 ACE_NS_String
-ACE_NS_Internal::value (void)
+ACE_NS_Internal::value ()
 {
   ACE_TRACE ("ACE_NS_Internal::value");
   return this->value_;
 }
 
 const char *
-ACE_NS_Internal::type (void)
+ACE_NS_Internal::type ()
 {
   ACE_TRACE ("ACE_NS_Internal::type");
   return this->type_;
diff --git a/ACE/ace/Local_Name_Space_T.h b/ACE/ace/Local_Name_Space_T.h
index 3db7d339c60..fe8189670b1 100644
--- a/ACE/ace/Local_Name_Space_T.h
+++ b/ACE/ace/Local_Name_Space_T.h
@@ -204,7 +204,7 @@ public:
                                    const ACE_NS_WString &pattern);
 
   /// Dump the state of the object
-  virtual void dump (void) const;
+  virtual void dump () const;
   virtual void dump_i (void) const;
 
   // = I just know this is going to cause problems on some platform...
diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp
index 67ce73af55d..1a8aaac0ad1 100644
--- a/ACE/ace/Local_Tokens.cpp
+++ b/ACE/ace/Local_Tokens.cpp
@@ -1135,7 +1135,7 @@ ACE_Token_Proxy::name (void) const
   return this->token_->name ();
 }
 
-#if defined (ACE_WIN32_VC8)
+#if defined (_MSC_VER)
 #  pragma warning (push)
 #  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
 #endif
@@ -1156,7 +1156,7 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &)
 {
   ACE_TRACE ("ACE_Token_Proxy::ACE_Token_Proxy");
 }
-#if defined (ACE_WIN32_VC8)
+#if defined (_MSC_VER)
 #  pragma warning (pop)
 #endif
 
diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h
index 4cf35edbeb3..61a366375ae 100644
--- a/ACE/ace/Local_Tokens.h
+++ b/ACE/ace/Local_Tokens.h
@@ -158,7 +158,7 @@ public:
   void call_sleep_hook (void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   // = Used to block the thread if an acquire fails with EWOULDBLOCK.
   ACE_TOKEN_CONST::COND_VAR cond_var_;
@@ -225,7 +225,7 @@ public:
   operator ACE_TPQ_Entry *(void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
 #if defined (ACE_NO_TSS_TOKENS)
   ACE_TPQ_Entry *operator-> (void)
@@ -278,7 +278,7 @@ public:
   void advance (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 private:
   ACE_TPQ_Entry *current_;
@@ -334,7 +334,7 @@ public:
   int size (void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// Head.
@@ -432,7 +432,7 @@ public:
   int dec_reference (void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /**
    * These are the Token types supported by the library at ship time.
@@ -552,7 +552,7 @@ public:
   virtual int release (ACE_TPQ_Entry *caller);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Returns ACE_Tokens::MUTEX.
   virtual int type (void) const;
@@ -647,7 +647,7 @@ public:
   virtual int release (ACE_TPQ_Entry *caller);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// These are the types that proxies can be.
   enum PROXY_TYPE { READER, WRITER };
@@ -713,7 +713,7 @@ public:
   void name (const ACE_TCHAR *new_name);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
 private:
   /// Name of the token.
@@ -862,7 +862,7 @@ public:
   virtual ACE_Token_Proxy *clone (void) const = 0;
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /**
    * This method can be used be Tokens (e.g. Readers/Writer Tokens) to
@@ -942,7 +942,7 @@ public:
   virtual ACE_Token_Proxy *clone (void) const { return new ACE_Null_Token; }
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Do not allow the Token Manager to create us.
   virtual ACE_Tokens *create_token (const ACE_TCHAR *) { return 0; }
@@ -984,7 +984,7 @@ public:
   ~ACE_Local_Mutex (void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Return deep copy.
   virtual ACE_Token_Proxy *clone (void) const;
@@ -1036,7 +1036,7 @@ public:
   ~ACE_Local_RLock (void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Returns ACE_RW_Token::RLOCK.
   virtual int type (void) const;
@@ -1091,7 +1091,7 @@ public:
   ~ACE_Local_WLock (void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Returns ACE_RW_Token::WLOCK.
   virtual int type (void) const;
diff --git a/ACE/ace/Lock.cpp b/ACE/ace/Lock.cpp
index ada3e97f3ec..b3b78a4729a 100644
--- a/ACE/ace/Lock.cpp
+++ b/ACE/ace/Lock.cpp
@@ -8,75 +8,75 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Lock::~ACE_Lock (void)
+ACE_Lock::~ACE_Lock ()
 {
 }
 
-ACE_Adaptive_Lock::ACE_Adaptive_Lock (void)
+ACE_Adaptive_Lock::ACE_Adaptive_Lock ()
   : lock_ (0)
 {
 }
 
-ACE_Adaptive_Lock::~ACE_Adaptive_Lock (void)
+ACE_Adaptive_Lock::~ACE_Adaptive_Lock ()
 {
 }
 
 int
-ACE_Adaptive_Lock::remove (void)
+ACE_Adaptive_Lock::remove ()
 {
   return this->lock_->remove ();
 }
 
 int
-ACE_Adaptive_Lock::acquire (void)
+ACE_Adaptive_Lock::acquire ()
 {
   return this->lock_->acquire ();
 }
 
 int
-ACE_Adaptive_Lock::tryacquire (void)
+ACE_Adaptive_Lock::tryacquire ()
 {
   return this->lock_->tryacquire ();
 }
 
 int
-ACE_Adaptive_Lock::release (void)
+ACE_Adaptive_Lock::release ()
 {
   return this->lock_->release ();
 }
 
 int
-ACE_Adaptive_Lock::acquire_read (void)
+ACE_Adaptive_Lock::acquire_read ()
 {
   return this->lock_->acquire_read ();
 }
 
 int
-ACE_Adaptive_Lock::acquire_write (void)
+ACE_Adaptive_Lock::acquire_write ()
 {
   return this->lock_->acquire_write ();
 }
 
 int
-ACE_Adaptive_Lock::tryacquire_read (void)
+ACE_Adaptive_Lock::tryacquire_read ()
 {
   return this->lock_->tryacquire_read ();
 }
 
 int
-ACE_Adaptive_Lock::tryacquire_write (void)
+ACE_Adaptive_Lock::tryacquire_write ()
 {
   return this->lock_->tryacquire_write ();
 }
 
 int
-ACE_Adaptive_Lock::tryacquire_write_upgrade (void)
+ACE_Adaptive_Lock::tryacquire_write_upgrade ()
 {
   return this->lock_->tryacquire_write_upgrade ();
 }
 
 void
-ACE_Adaptive_Lock::dump (void) const
+ACE_Adaptive_Lock::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   //  return this->lock_->dump ();
diff --git a/ACE/ace/Lock.h b/ACE/ace/Lock.h
index f1318800153..2216a6f5581 100644
--- a/ACE/ace/Lock.h
+++ b/ACE/ace/Lock.h
@@ -42,45 +42,45 @@ class ACE_Export ACE_Lock
 {
 public:
   /// CE needs a default constructor here.
-  ACE_Lock (void);
+  ACE_Lock ();
 
   /// Noop virtual destructor
-  virtual ~ACE_Lock (void);
+  virtual ~ACE_Lock ();
 
   /**
    * Explicitly destroy the lock.  Note that only one thread should
    * call this method since it doesn't protect against race
    * conditions.
    */
-  virtual int remove (void) = 0;
+  virtual int remove () = 0;
 
   /// Block the thread until the lock is acquired.  Returns -1 on
   /// failure.
-  virtual int acquire (void) = 0;
+  virtual int acquire () = 0;
 
   /**
    * Conditionally acquire the lock (i.e., won't block).  Returns -1
    * on failure.  If we "failed" because someone else already had the
    * lock, @c errno is set to @c EBUSY.
    */
-  virtual int tryacquire (void) = 0;
+  virtual int tryacquire () = 0;
 
   /// Release the lock.  Returns -1 on failure.
-  virtual int release (void) = 0;
+  virtual int release () = 0;
 
   /**
    * Block until the thread acquires a read lock.  If the locking
    * mechanism doesn't support read locks then this just calls
    * acquire().  Returns -1 on failure.
    */
-  virtual int acquire_read (void) = 0;
+  virtual int acquire_read () = 0;
 
   /**
    * Block until the thread acquires a write lock.  If the locking
    * mechanism doesn't support read locks then this just calls
    * acquire().  Returns -1 on failure.
    */
-  virtual int acquire_write (void) = 0;
+  virtual int acquire_write () = 0;
 
   /**
    * Conditionally acquire a read lock.  If the locking mechanism
@@ -88,7 +88,7 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  virtual int tryacquire_read (void) = 0;
+  virtual int tryacquire_read () = 0;
 
   /**
    * Conditionally acquire a write lock.  If the locking mechanism
@@ -96,14 +96,14 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  virtual int tryacquire_write (void) = 0;
+  virtual int tryacquire_write () = 0;
 
   /**
    * Conditionally try to upgrade a lock held for read to a write lock.
    * If the locking mechanism doesn't support read locks then this just
    * calls acquire(). Returns 0 on success, -1 on failure.
    */
-  virtual int tryacquire_write_upgrade (void) = 0;
+  virtual int tryacquire_write_upgrade () = 0;
 };
 
 /**
@@ -123,20 +123,20 @@ class ACE_Export ACE_Adaptive_Lock : public ACE_Lock
 public:
   /// You must also override the destructor function to match with how
   /// you construct the underneath @c lock_.
-  virtual ~ACE_Adaptive_Lock (void);
+  virtual ~ACE_Adaptive_Lock ();
 
   // = Lock/unlock operations.
 
-  virtual int remove (void);
-  virtual int acquire (void);
-  virtual int tryacquire (void);
-  virtual int release (void);
-  virtual int acquire_read (void);
-  virtual int acquire_write (void);
-  virtual int tryacquire_read (void);
-  virtual int tryacquire_write (void);
-  virtual int tryacquire_write_upgrade (void);
-  void dump (void) const;
+  virtual int remove ();
+  virtual int acquire ();
+  virtual int tryacquire ();
+  virtual int release ();
+  virtual int acquire_read ();
+  virtual int acquire_write ();
+  virtual int tryacquire_read ();
+  virtual int tryacquire_write ();
+  virtual int tryacquire_write_upgrade ();
+  void dump () const;
 
 protected:
   /**
@@ -144,7 +144,7 @@ protected:
    * The default constructor simply set the @c lock_ to 0 (null).  You
    * must overwrite this method for this class to work.
    */
-  ACE_Adaptive_Lock (void);
+  ACE_Adaptive_Lock ();
 
   ACE_Lock *lock_;
 };
diff --git a/ACE/ace/Lock.inl b/ACE/ace/Lock.inl
index 43b4bac0898..f2ad9996716 100644
--- a/ACE/ace/Lock.inl
+++ b/ACE/ace/Lock.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Lock::ACE_Lock (void)
+ACE_Lock::ACE_Lock ()
 {
 }
 
diff --git a/ACE/ace/Lock_Adapter_T.cpp b/ACE/ace/Lock_Adapter_T.cpp
index 0068e8ae0d1..9bf13d3fc9a 100644
--- a/ACE/ace/Lock_Adapter_T.cpp
+++ b/ACE/ace/Lock_Adapter_T.cpp
@@ -15,7 +15,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCKING_MECHANISM>
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::~ACE_Lock_Adapter (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::~ACE_Lock_Adapter ()
 {
   if (this->delete_lock_)
     delete this->lock_;
@@ -23,14 +23,14 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::~ACE_Lock_Adapter (void)
 
 // Explicitly destroy the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::remove (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::remove ()
 {
   return this->lock_->remove ();
 }
 
 // Block the thread until the lock is acquired.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire ()
 {
   return this->lock_->acquire ();
 }
@@ -38,7 +38,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire (void)
 // Conditionally acquire the lock (i.e., won't block).
 
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire ()
 {
   return this->lock_->tryacquire ();
 }
@@ -46,7 +46,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire (void)
 // Release the lock.
 
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::release (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::release ()
 {
   return this->lock_->release ();
 }
@@ -56,7 +56,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::release (void)
 // <acquire>.
 
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_read (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_read ()
 {
   return this->lock_->acquire_read ();
 }
@@ -66,7 +66,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_read (void)
 // <acquire>.
 
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_write (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_write ()
 {
   return this->lock_->acquire_write ();
 }
@@ -75,7 +75,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_write (void)
 // doesn't support read locks then this just calls <acquire>.
 
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_read (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_read ()
 {
   return this->lock_->tryacquire_read ();
 }
@@ -84,7 +84,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_read (void)
 // doesn't support write locks then this just calls <acquire>.
 
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write ()
 {
   return this->lock_->tryacquire_write ();
 }
@@ -94,7 +94,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write (void)
 // calls <acquire>. Returns 0 on success, -1 on failure.
 
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade ()
 {
   return this->lock_->tryacquire_write_upgrade ();
 }
diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h
index 2e1f0a53290..ece637ae264 100644
--- a/ACE/ace/Lock_Adapter_T.h
+++ b/ACE/ace/Lock_Adapter_T.h
@@ -46,53 +46,53 @@ public:
 
   /// Constructor. Since no lock is provided by the user, one will be
   /// created internally.
-  ACE_Lock_Adapter (void);
+  ACE_Lock_Adapter ();
 
   /// Destructor. If @c lock_ was not passed in by the user, it will be
   /// deleted.
-  virtual ~ACE_Lock_Adapter (void);
+  virtual ~ACE_Lock_Adapter ();
 
   // = Lock accessors.
   /// Block the thread until the lock is acquired.
-  virtual int acquire (void);
+  virtual int acquire ();
 
   /// Conditionally acquire the lock (i.e., won't block).
-  virtual int tryacquire (void);
+  virtual int tryacquire ();
 
   /// Release the lock.
-  virtual int release (void);
+  virtual int release ();
 
   /**
    * Block until the thread acquires a read lock.  If the locking
    * mechanism doesn't support read locks then this just calls
    * acquire().
    */
-  virtual int acquire_read (void);
+  virtual int acquire_read ();
 
   /**
    * Block until the thread acquires a write lock.  If the locking
    * mechanism doesn't support read locks then this just calls
    * acquire().
    */
-  virtual int acquire_write (void);
+  virtual int acquire_write ();
 
   /// Conditionally acquire a read lock.  If the locking mechanism
   /// doesn't support read locks then this just calls acquire().
-  virtual int tryacquire_read (void);
+  virtual int tryacquire_read ();
 
   /// Conditionally acquire a write lock.  If the locking mechanism
   /// doesn't support read locks then this just calls acquire().
-  virtual int tryacquire_write (void);
+  virtual int tryacquire_write ();
 
   /**
    * Conditionally try to upgrade a lock held for read to a write lock.
    * If the locking mechanism doesn't support read locks then this just
    * calls acquire(). Returns 0 on success, -1 on failure.
    */
-  virtual int tryacquire_write_upgrade (void);
+  virtual int tryacquire_write_upgrade ();
 
   /// Explicitly destroy the lock.
-  virtual int remove (void);
+  virtual int remove ();
 
 private:
   /// The concrete locking mechanism that all the methods delegate to.
diff --git a/ACE/ace/Lock_Adapter_T.inl b/ACE/ace/Lock_Adapter_T.inl
index 5de19ea5b2f..efffe4980af 100644
--- a/ACE/ace/Lock_Adapter_T.inl
+++ b/ACE/ace/Lock_Adapter_T.inl
@@ -14,7 +14,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (
 
 template <class ACE_LOCKING_MECHANISM>
 ACE_INLINE
-ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (void)
+ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter ()
   : lock_ (0),
     delete_lock_ (true)
 {
diff --git a/ACE/ace/Log_Category.h b/ACE/ace/Log_Category.h
index 8e1d898d924..b753a5b5301 100644
--- a/ACE/ace/Log_Category.h
+++ b/ACE/ace/Log_Category.h
@@ -242,14 +242,14 @@ private:
  * and then use @c per_thr_obj() for logging. For example,
  *
  * \code{.cpp}
- *  ACE_Log_Category test_catogory("Test");
- *  test_cateogry.per_thr_obj()->log(LM_DEBUG, "Log into the Test category.");
+ *  ACE_Log_Category test_category("Test");
+ *  test_category.per_thr_obj()->log(LM_DEBUG, "Log into the Test category.");
  *
  *  // set the process wide priority mask
- *  test_catogory.priority_mask(LM_DEBUG|LM_ERROR);
+ *  test_category.priority_mask(LM_DEBUG|LM_ERROR);
  *
  *  // set the thread specific priority mask
- *  test_cateogry.per_thr_obj()->priority_mask(LM_DEBUG);
+ *  test_category.per_thr_obj()->priority_mask(LM_DEBUG);
  * \endcode
  */
 class ACE_Export ACE_Log_Category
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index dbf09f5d3da..97b2d34253c 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -62,7 +62,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg)
 
 static ACE_thread_key_t the_log_msg_tss_key;
 
-ACE_thread_key_t *log_msg_tss_key (void)
+ACE_thread_key_t *log_msg_tss_key ()
 {
   return &the_log_msg_tss_key;
 }
@@ -125,10 +125,10 @@ public:
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   //FUZZ: disable check_for_lack_ACE_OS
-  static void close (void) ACE_GCC_DESTRUCTOR_ATTRIBUTE;
+  static void close () ACE_GCC_DESTRUCTOR_ATTRIBUTE;
   //FUZZ: enable check_for_lack_ACE_OS
 
-  static ACE_Recursive_Thread_Mutex *get_lock (void);
+  static ACE_Recursive_Thread_Mutex *get_lock ();
 
 private:
   static ACE_Recursive_Thread_Mutex *lock_;
@@ -196,7 +196,7 @@ int ACE_Log_Msg_Manager::init_backend (const u_long *flags)
 ACE_Recursive_Thread_Mutex *ACE_Log_Msg_Manager::lock_ = 0;
 
 ACE_Recursive_Thread_Mutex *
-ACE_Log_Msg_Manager::get_lock (void)
+ACE_Log_Msg_Manager::get_lock ()
 {
   // This function is called by the first thread to create an ACE_Log_Msg
   // instance.  It makes the call while holding a mutex, so we don't have
@@ -215,7 +215,7 @@ ACE_Log_Msg_Manager::get_lock (void)
 }
 
 void
-ACE_Log_Msg_Manager::close (void)
+ACE_Log_Msg_Manager::close ()
 {
 #if defined (ACE_HAS_STHREADS) && ! defined (ACE_HAS_TSS_EMULATION) && ! defined (ACE_HAS_EXCEPTIONS)
   // Delete the (main thread's) Log_Msg instance.  I think that this
@@ -264,7 +264,7 @@ ACE_TSS_CLEANUP_NAME (void *ptr)
 
 /* static */
 int
-ACE_Log_Msg::exists (void)
+ACE_Log_Msg::exists ()
 {
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \
@@ -285,7 +285,7 @@ ACE_Log_Msg::exists (void)
 }
 
 ACE_Log_Msg *
-ACE_Log_Msg::instance (void)
+ACE_Log_Msg::instance ()
 {
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \
@@ -395,7 +395,7 @@ ACE_Log_Msg::instance (void)
 // Not inlined to help prevent having to include OS.h just to
 // get ACELIB_DEBUG, et al, macros.
 int
-ACE_Log_Msg::last_error_adapter (void)
+ACE_Log_Msg::last_error_adapter ()
 {
   return ACE_OS::last_error ();
 }
@@ -423,7 +423,7 @@ ACE_Log_Msg::disable_debug_messages (ACE_Log_Priority priority)
 }
 
 const ACE_TCHAR *
-ACE_Log_Msg::program_name (void)
+ACE_Log_Msg::program_name ()
 {
   return ACE_Log_Msg::program_name_;
 }
@@ -459,7 +459,7 @@ u_long ACE_Log_Msg::process_priority_mask_ = LM_SHUTDOWN
                                              | LM_EMERGENCY;
 
 void
-ACE_Log_Msg::close (void)
+ACE_Log_Msg::close ()
 {
   // This call needs to go here to avoid memory leaks.
   ACE_MT (ACE_Log_Msg_Manager::close ());
@@ -523,7 +523,7 @@ ACE_Log_Msg::sync_hook (const ACE_TCHAR *prg_name)
 }
 
 ACE_OS_Thread_Descriptor *
-ACE_Log_Msg::thr_desc_hook (void)
+ACE_Log_Msg::thr_desc_hook ()
 {
   return ACE_LOG_MSG->thr_desc ();
 }
@@ -551,7 +551,7 @@ ACE_Log_Msg::sync (const ACE_TCHAR *prog_name)
 }
 
 u_long
-ACE_Log_Msg::flags (void)
+ACE_Log_Msg::flags ()
 {
   ACE_TRACE ("ACE_Log_Msg::flags");
   u_long result;
@@ -583,7 +583,7 @@ ACE_Log_Msg::clr_flags (u_long flgs)
 }
 
 int
-ACE_Log_Msg::acquire (void)
+ACE_Log_Msg::acquire ()
 {
   ACE_TRACE ("ACE_Log_Msg::acquire");
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
@@ -613,7 +613,7 @@ ACE_Log_Msg::priority_mask (u_long n_mask, MASK_TYPE mask_type)
 }
 
 int
-ACE_Log_Msg::release (void)
+ACE_Log_Msg::release ()
 {
   ACE_TRACE ("ACE_Log_Msg::release");
 
@@ -624,7 +624,7 @@ ACE_Log_Msg::release (void)
 #endif /* ! ACE_MT_SAFE */
 }
 
-ACE_Log_Msg::ACE_Log_Msg (void)
+ACE_Log_Msg::ACE_Log_Msg ()
   : status_ (0),
     errnum_ (0),
     linenum_ (0),
@@ -676,7 +676,7 @@ ACE_Log_Msg::ACE_Log_Msg (void)
 #endif /* ACE_HAS_ALLOC_HOOKS */
 }
 
-ACE_Log_Msg::~ACE_Log_Msg (void)
+ACE_Log_Msg::~ACE_Log_Msg ()
 {
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 
@@ -999,7 +999,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 #else
   // External decls.
 
-  typedef void (*PointerToFunction)(...);
+  using PointerToFunction = void (*)(...);
 
   // Check if there were any conditional values set.
   bool const conditional_values = this->conditional_values_.is_set_;
@@ -2810,8 +2810,8 @@ ssize_t ACE_Log_Msg::log (const ACE_Log_Formatter &formatter)
 class ACE_Log_Msg_Sig_Guard
 {
 private:
-  ACE_Log_Msg_Sig_Guard (void);
-  ~ACE_Log_Msg_Sig_Guard (void);
+  ACE_Log_Msg_Sig_Guard ();
+  ~ACE_Log_Msg_Sig_Guard ();
 
   /// Original signal mask.
   sigset_t omask_;
@@ -2820,7 +2820,7 @@ private:
                                    int suppress_stderr);
 };
 
-ACE_Log_Msg_Sig_Guard::ACE_Log_Msg_Sig_Guard (void)
+ACE_Log_Msg_Sig_Guard::ACE_Log_Msg_Sig_Guard ()
 {
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
   ACE_OS::sigemptyset (&this->omask_);
@@ -2837,7 +2837,7 @@ ACE_Log_Msg_Sig_Guard::ACE_Log_Msg_Sig_Guard (void)
 #endif /* ACE_LACKS_UNIX_SIGNALS */
 }
 
-ACE_Log_Msg_Sig_Guard::~ACE_Log_Msg_Sig_Guard (void)
+ACE_Log_Msg_Sig_Guard::~ACE_Log_Msg_Sig_Guard ()
 {
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
 # if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK)
@@ -3055,7 +3055,7 @@ ACE_Log_Msg::conditional_set (const char *filename,
 }
 
 void
-ACE_Log_Msg::dump (void) const
+ACE_Log_Msg::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Log_Msg::dump");
@@ -3122,7 +3122,7 @@ ACE_Log_Msg::msg_backend (ACE_Log_Msg_Backend *b)
 }
 
 ACE_Log_Msg_Backend *
-ACE_Log_Msg::msg_backend (void)
+ACE_Log_Msg::msg_backend ()
 {
   ACE_TRACE ("ACE_Log_Msg::msg_backend");
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h
index 6a3e481197e..474962401a3 100644
--- a/ACE/ace/Log_Msg.h
+++ b/ACE/ace/Log_Msg.h
@@ -245,16 +245,16 @@ public:
   };
 
   /// Returns a pointer to the Singleton.
-  static ACE_Log_Msg *instance (void);
+  static ACE_Log_Msg *instance ();
 
   /// Returns last error.
-  static int last_error_adapter (void);
+  static int last_error_adapter ();
 
   /// Returns non-null if an ACE_Log_Msg exists for the calling thread.
-  static int exists (void);
+  static int exists ();
 
   /// Returns the current program name used for logging.
-  static const ACE_TCHAR * program_name (void);
+  static const ACE_TCHAR * program_name ();
 
   /// Clears the flag from the default priority mask used to
   /// initialize ACE_Log_Msg instances.
@@ -265,10 +265,10 @@ public:
   static void enable_debug_messages (ACE_Log_Priority priority = LM_DEBUG);
 
   /// Initialize logger.
-  ACE_Log_Msg (void);
+  ACE_Log_Msg ();
 
   /// cleanup logger.
-  ~ACE_Log_Msg (void);
+  ~ACE_Log_Msg ();
 
   /// Initialize the ACE logging facility.
   /**
@@ -308,7 +308,7 @@ public:
   /**
    * Return the bits in the logger's options flags.
    */
-  u_long flags (void);
+  u_long flags ();
 
   /** @name Allow apps to acquire and release internal synchronization
    *        lock
@@ -320,10 +320,10 @@ public:
   //@{
 
   /// Acquire the internal lock.
-  int acquire (void);
+  int acquire ();
 
   /// Release the internal lock.
-  int release (void);
+  int release ();
   //@}
 
   /// Call after doing a @c fork() to resynchronize the process id and
@@ -339,7 +339,7 @@ public:
 
   /// Get the result of the operation status (by convention, -1 means
   /// error).
-  int op_status (void) const;
+  int op_status () const;
 
   /// Set the value of the errnum (by convention this corresponds to
   /// errno).
@@ -347,25 +347,25 @@ public:
 
   /// Get the value of the errnum (by convention this corresponds to
   /// errno).
-  int errnum (void) const;
+  int errnum () const;
 
   /// Set the line number where an error occurred.
   void linenum (int);
 
   /// Get the line number where an error occurred.
-  int linenum (void) const;
+  int linenum () const;
 
   /// Set the file name where an error occurred.
   void file (const char *);
 
   /// Get the file name where an error occurred.
-  const char *file (void);
+  const char *file ();
 
   /// Set the message that describes what type of error occurred.
   void msg (const ACE_TCHAR *);
 
   /// Get the message that describes what type of error occurred.
-  const ACE_TCHAR *msg (void);
+  const ACE_TCHAR *msg ();
 
   /// Set the field that indicates whether interrupted calls should be
   /// restarted.
@@ -373,7 +373,7 @@ public:
 
   /// Get the field that indicates whether interrupted calls should be
   /// restarted.
-  bool restart (void) const;
+  bool restart () const;
 
   // = Notice that the following two function is equivalent to
   //   "void msg_ostream (HANDLE)" and "HANDLE msg_ostream (void)"
@@ -390,7 +390,7 @@ public:
   void msg_ostream (ACE_OSTREAM_TYPE *, bool delete_ostream);
 
   /// Get the ostream that is used to print error messages.
-  ACE_OSTREAM_TYPE *msg_ostream (void) const;
+  ACE_OSTREAM_TYPE *msg_ostream () const;
 
   /**
    * Set a new callback object and return the existing callback to
@@ -399,7 +399,7 @@ public:
    * them in each thread.
    */
   ACE_Log_Msg_Callback *msg_callback (ACE_Log_Msg_Callback *c);
-  ACE_Log_Msg_Callback *msg_callback (void) const;
+  ACE_Log_Msg_Callback *msg_callback () const;
 
   /**
    * Set a new backend object and return the existing backend to
@@ -411,28 +411,28 @@ public:
    * on a backend object.
    */
   static ACE_Log_Msg_Backend *msg_backend (ACE_Log_Msg_Backend *b);
-  static ACE_Log_Msg_Backend *msg_backend (void);
+  static ACE_Log_Msg_Backend *msg_backend ();
 
   /// Nesting depth increment.
-  int inc (void);
+  int inc ();
 
   /// Nesting depth decrement.
-  int dec (void);
+  int dec ();
 
   /// Get trace depth.
-  int trace_depth (void) const;
+  int trace_depth () const;
 
   /// Set trace depth.
   void trace_depth (int);
 
   /// Get trace active status.
-  bool trace_active (void) const;
+  bool trace_active () const;
 
   /// Set  trace active status.
   void trace_active (bool value);
 
   /// Get the TSS thread descriptor.
-  ACE_Thread_Descriptor *thr_desc (void) const;
+  ACE_Thread_Descriptor *thr_desc () const;
 
   /**
    * Set the TSS thread descriptor.  This method will call
@@ -442,13 +442,13 @@ public:
   void thr_desc (ACE_Thread_Descriptor *td);
 
   /// Stop tracing status on a per-thread basis...
-  void stop_tracing (void);
+  void stop_tracing ();
 
   /// Start tracing status on a per-thread basis...
-  void start_tracing (void);
+  void start_tracing ();
 
   /// Query tracing status on a per-thread basis...
-  bool tracing_enabled (void) const;
+  bool tracing_enabled () const;
 
   typedef enum
   {
@@ -486,10 +486,10 @@ public:
 
   /// Optimize reading of the pid (avoids a system call if the value is
   /// cached...).
-  pid_t getpid (void) const;
+  pid_t getpid () const;
 
   /// Get the name of the local host.
-  const ACE_TCHAR *local_host (void) const;
+  const ACE_TCHAR *local_host () const;
 
   /// Set the name of the local host.
   void local_host (const ACE_TCHAR *);
@@ -626,7 +626,7 @@ public:
                             ACE_OS_Log_Msg_Attributes &attributes);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -749,13 +749,13 @@ private:
 #endif /* ACE_MT_SAFE */
 
   /// For cleanup, at program termination.
-  static void close (void);
+  static void close ();
 
   /// Decouple the OS layer from the ACE_Log_Msg layer.
   static void sync_hook (const ACE_TCHAR *prg_name);
 
   /// Return the TSS singleton thread descriptor
-  static ACE_OS_Thread_Descriptor *thr_desc_hook (void);
+  static ACE_OS_Thread_Descriptor *thr_desc_hook ();
 
   //friend void ACE_OS::cleanup_tss (const u_int);
 
diff --git a/ACE/ace/Log_Msg.inl b/ACE/ace/Log_Msg.inl
index 1062c15c6b1..bca6dc2271f 100644
--- a/ACE/ace/Log_Msg.inl
+++ b/ACE/ace/Log_Msg.inl
@@ -31,7 +31,7 @@ ACE_Log_Msg::op_status (int status)
 
 ACE_INLINE
 int
-ACE_Log_Msg::op_status (void) const
+ACE_Log_Msg::op_status () const
 {
   return this->status_;
 }
@@ -45,14 +45,14 @@ ACE_Log_Msg::restart (bool r)
 
 ACE_INLINE
 bool
-ACE_Log_Msg::restart (void) const
+ACE_Log_Msg::restart () const
 {
   return this->restart_;
 }
 
 ACE_INLINE
 int
-ACE_Log_Msg::errnum (void) const
+ACE_Log_Msg::errnum () const
 {
   return this->errnum_;
 }
@@ -66,7 +66,7 @@ ACE_Log_Msg::errnum (int e)
 
 ACE_INLINE
 int
-ACE_Log_Msg::linenum (void) const
+ACE_Log_Msg::linenum () const
 {
   return this->linenum_;
 }
@@ -80,21 +80,21 @@ ACE_Log_Msg::linenum (int l)
 
 ACE_INLINE
 int
-ACE_Log_Msg::inc (void)
+ACE_Log_Msg::inc ()
 {
   return this->trace_depth_++;
 }
 
 ACE_INLINE
 int
-ACE_Log_Msg::dec (void)
+ACE_Log_Msg::dec ()
 {
   return this->trace_depth_ == 0 ? 0 : --this->trace_depth_;
 }
 
 ACE_INLINE
 int
-ACE_Log_Msg::trace_depth (void) const
+ACE_Log_Msg::trace_depth () const
 {
   return this->trace_depth_;
 }
@@ -108,7 +108,7 @@ ACE_Log_Msg::trace_depth (int depth)
 
 ACE_INLINE
 bool
-ACE_Log_Msg::trace_active (void) const
+ACE_Log_Msg::trace_active () const
 {
   return this->trace_active_;
 }
@@ -122,7 +122,7 @@ ACE_Log_Msg::trace_active (bool value)
 
 ACE_INLINE
 ACE_Thread_Descriptor *
-ACE_Log_Msg::thr_desc (void) const
+ACE_Log_Msg::thr_desc () const
 {
   return this->thr_desc_;
 }
@@ -130,7 +130,7 @@ ACE_Log_Msg::thr_desc (void) const
 /// Enable the tracing facility on a per-thread basis.
 ACE_INLINE
 void
-ACE_Log_Msg::start_tracing (void)
+ACE_Log_Msg::start_tracing ()
 {
   this->tracing_enabled_ = true;
 }
@@ -138,21 +138,21 @@ ACE_Log_Msg::start_tracing (void)
 /// Disable the tracing facility on a per-thread basis.
 ACE_INLINE
 void
-ACE_Log_Msg::stop_tracing (void)
+ACE_Log_Msg::stop_tracing ()
 {
   this->tracing_enabled_ = false;
 }
 
 ACE_INLINE
 bool
-ACE_Log_Msg::tracing_enabled (void) const
+ACE_Log_Msg::tracing_enabled () const
 {
   return this->tracing_enabled_;
 }
 
 ACE_INLINE
 const char *
-ACE_Log_Msg::file (void)
+ACE_Log_Msg::file ()
 {
   return this->file_;
 }
@@ -166,7 +166,7 @@ ACE_Log_Msg::file (const char *s)
 
 ACE_INLINE
 const ACE_TCHAR *
-ACE_Log_Msg::msg (void)
+ACE_Log_Msg::msg ()
 {
   return this->msg_ + ACE_Log_Msg::msg_off_;
 }
@@ -181,7 +181,7 @@ ACE_Log_Msg::msg (const ACE_TCHAR *m)
 
 ACE_INLINE
 ACE_Log_Msg_Callback *
-ACE_Log_Msg::msg_callback (void) const
+ACE_Log_Msg::msg_callback () const
 {
   return this->msg_callback_;
 }
@@ -197,7 +197,7 @@ ACE_Log_Msg::msg_callback (ACE_Log_Msg_Callback *c)
 
 ACE_INLINE
 ACE_OSTREAM_TYPE *
-ACE_Log_Msg::msg_ostream (void) const
+ACE_Log_Msg::msg_ostream () const
 {
   return this->ostream_;
 }
@@ -211,14 +211,14 @@ ACE_Log_Msg::msg_ostream (ACE_OSTREAM_TYPE *m)
 
 ACE_INLINE
 const ACE_TCHAR *
-ACE_Log_Msg::local_host (void) const
+ACE_Log_Msg::local_host () const
 {
   return ACE_Log_Msg::local_host_;
 }
 
 ACE_INLINE
 pid_t
-ACE_Log_Msg::getpid (void) const
+ACE_Log_Msg::getpid () const
 {
   return ACE_OS::getpid ();
 }
diff --git a/ACE/ace/Log_Msg_Backend.cpp b/ACE/ace/Log_Msg_Backend.cpp
index 95fd1a6a7d4..8d3dbe699b1 100644
--- a/ACE/ace/Log_Msg_Backend.cpp
+++ b/ACE/ace/Log_Msg_Backend.cpp
@@ -5,7 +5,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Log_Msg_Backend::~ACE_Log_Msg_Backend (void)
+ACE_Log_Msg_Backend::~ACE_Log_Msg_Backend ()
 {
 }
 
diff --git a/ACE/ace/Log_Msg_Callback.cpp b/ACE/ace/Log_Msg_Callback.cpp
index 5586c7470f6..b88de627c63 100644
--- a/ACE/ace/Log_Msg_Callback.cpp
+++ b/ACE/ace/Log_Msg_Callback.cpp
@@ -2,11 +2,11 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Log_Msg_Callback::ACE_Log_Msg_Callback (void)
+ACE_Log_Msg_Callback::ACE_Log_Msg_Callback ()
 {
 }
 
-ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback (void)
+ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback ()
 {
 }
 
diff --git a/ACE/ace/Log_Msg_Callback.h b/ACE/ace/Log_Msg_Callback.h
index 0493a076933..f61587013ee 100644
--- a/ACE/ace/Log_Msg_Callback.h
+++ b/ACE/ace/Log_Msg_Callback.h
@@ -27,27 +27,27 @@ class ACE_Log_Record;
  *
  * @brief An interface class used to get logging callbacks.
  *
- *     Users who are interested in getting the logging messages
- *     directly, can subclass this interface and override the log()
- *     method. They must then register their subclass with the
- *     Log_Msg class and make sure that they turn on the
- *     ACE_Log_Msg::MSG_CALLBACK flag.
+ * Users who are interested in getting the logging messages
+ * directly, can subclass this interface and override the log()
+ * method. They must then register their subclass with the
+ * Log_Msg class and make sure that they turn on the
+ * ACE_Log_Msg::MSG_CALLBACK flag.
  *
- *     Your log() routine is called with an instance of
- *     ACE_Log_Record.  From this class, you can get the log
- *     message, the verbose log message, message type, message
- *     priority, and so on.
+ * Your log() routine is called with an instance of
+ * ACE_Log_Record.  From this class, you can get the log
+ * message, the verbose log message, message type, message
+ * priority, and so on.
  *
- *     Remember that there is one Log_Msg object per thread.
- *     Therefore, you may need to register your callback object with
- *     many ACE_Log_Msg objects (and have the correct
- *     synchronization in the log() method) or have a separate
- *     callback object per Log_Msg object.  Moreover,
- *     ACE_Log_Msg_Callbacks are not inherited when a new thread
- *     is spawned because it might have been allocated off of the
- *     stack of the original thread, in which case all hell would
- *     break loose...  Therefore, you'll need to reset these in each
- *     new thread.
+ * Remember that there is one Log_Msg object per thread.
+ * Therefore, you may need to register your callback object with
+ * many ACE_Log_Msg objects (and have the correct
+ * synchronization in the log() method) or have a separate
+ * callback object per Log_Msg object.  Moreover,
+ * ACE_Log_Msg_Callbacks are not inherited when a new thread
+ * is spawned because it might have been allocated off of the
+ * stack of the original thread, in which case all hell would
+ * break loose...  Therefore, you'll need to reset these in each
+ * new thread.
  */
 class ACE_Export ACE_Log_Msg_Callback
 {
diff --git a/ACE/ace/Log_Msg_IPC.cpp b/ACE/ace/Log_Msg_IPC.cpp
index 94b710a6b73..56fd98df942 100644
--- a/ACE/ace/Log_Msg_IPC.cpp
+++ b/ACE/ace/Log_Msg_IPC.cpp
@@ -7,11 +7,11 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Log_Msg_IPC::ACE_Log_Msg_IPC (void)
+ACE_Log_Msg_IPC::ACE_Log_Msg_IPC ()
 {
 }
 
-ACE_Log_Msg_IPC::~ACE_Log_Msg_IPC (void)
+ACE_Log_Msg_IPC::~ACE_Log_Msg_IPC ()
 {
   (void) this->close ();
 }
@@ -27,7 +27,7 @@ ACE_Log_Msg_IPC::open (const ACE_TCHAR *logger_key)
 }
 
 int
-ACE_Log_Msg_IPC::reset (void)
+ACE_Log_Msg_IPC::reset ()
 {
   if (this->message_queue_.get_handle () != ACE_INVALID_HANDLE)
     {
@@ -39,7 +39,7 @@ ACE_Log_Msg_IPC::reset (void)
 }
 
 int
-ACE_Log_Msg_IPC::close (void)
+ACE_Log_Msg_IPC::close ()
 {
   return this->message_queue_.close ();
 }
diff --git a/ACE/ace/Log_Msg_UNIX_Syslog.cpp b/ACE/ace/Log_Msg_UNIX_Syslog.cpp
index 0c14e0fbb3a..73c9403d096 100644
--- a/ACE/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/ACE/ace/Log_Msg_UNIX_Syslog.cpp
@@ -22,11 +22,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 //   should not be too limiting, as the ACE_Log_Msg class itself can
 //   be used to control thread specific logging behavior.
 
-ACE_Log_Msg_UNIX_Syslog::ACE_Log_Msg_UNIX_Syslog (void)
+ACE_Log_Msg_UNIX_Syslog::ACE_Log_Msg_UNIX_Syslog ()
 {
 }
 
-ACE_Log_Msg_UNIX_Syslog::~ACE_Log_Msg_UNIX_Syslog (void)
+ACE_Log_Msg_UNIX_Syslog::~ACE_Log_Msg_UNIX_Syslog ()
 {
   (void) this->close ();
 }
@@ -70,13 +70,13 @@ ACE_Log_Msg_UNIX_Syslog::open (const ACE_TCHAR * logger_key)
 }
 
 int
-ACE_Log_Msg_UNIX_Syslog::reset (void)
+ACE_Log_Msg_UNIX_Syslog::reset ()
 {
   return this->close ();
 }
 
 int
-ACE_Log_Msg_UNIX_Syslog::close (void)
+ACE_Log_Msg_UNIX_Syslog::close ()
 {
   closelog();
   return 0;
diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp
index 68c4ef78a1d..cae0e3b2c2c 100644
--- a/ACE/ace/Log_Record.cpp
+++ b/ACE/ace/Log_Record.cpp
@@ -78,7 +78,7 @@ ACE_Log_Record::priority_name (ACE_Log_Priority p,
 }
 
 u_long
-ACE_Log_Record::priority (void) const
+ACE_Log_Record::priority () const
 {
   ACE_TRACE ("ACE_Log_Record::priority");
 
@@ -99,7 +99,7 @@ ACE_Log_Record::priority (u_long p)
 }
 
 void
-ACE_Log_Record::dump (void) const
+ACE_Log_Record::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Log_Record::dump");
@@ -191,7 +191,7 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp,
 }
 
 void
-ACE_Log_Record::round_up (void)
+ACE_Log_Record::round_up ()
 {
   // ACE_TRACE ("ACE_Log_Record::round_up");
   // Determine the length of the payload.
@@ -203,7 +203,7 @@ ACE_Log_Record::round_up (void)
   this->length_ = static_cast<ACE_UINT32> (len);
 }
 
-ACE_Log_Record::ACE_Log_Record (void)
+ACE_Log_Record::ACE_Log_Record ()
   : length_ (0),
     type_ (0),
     secs_ (0),
diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h
index 0ace47d7fc9..4096dccf969 100644
--- a/ACE/ace/Log_Record.h
+++ b/ACE/ace/Log_Record.h
@@ -58,7 +58,7 @@ public:
    * Create a Log_Record and set its priority, time stamp, and
    * process id.
    */
-  ACE_Log_Record (void);
+  ACE_Log_Record ();
   ACE_Log_Record (ACE_Log_Priority lp,
                   time_t time_stamp,
                   long pid);
@@ -67,7 +67,7 @@ public:
                   long pid);
 
   /// Default dtor.
-  ~ACE_Log_Record (void);
+  ~ACE_Log_Record ();
 
   /// Write the contents of the logging record to the appropriate
   /// FILE if the corresponding type is enabled.
@@ -103,13 +103,13 @@ public:
   static void priority_name (ACE_Log_Priority p, const ACE_TCHAR *name);
 
   /// Get the type of the Log_Record.
-  ACE_UINT32 type (void) const;
+  ACE_UINT32 type () const;
 
   /// Set the type of the Log_Record.
   void type (ACE_UINT32);
 
   /// Get the category of the Log_Record.
-  ACE_Log_Category_TSS* category (void) const;
+  ACE_Log_Category_TSS* category () const;
   /// Set the category of the Log_Record.
   void category (ACE_Log_Category_TSS*);
 
@@ -118,7 +118,7 @@ public:
    * as the base 2 logarithm of <type_> (which must be a power of 2,
    * as defined by the enums in ACE_Log_Priority).
    */
-  u_long priority (void) const;
+  u_long priority () const;
 
   /// Set the priority of the Log_Record <type_> (which must be a
   /// power of 2, as defined by the enums in ACE_Log_Priority).
@@ -126,26 +126,26 @@ public:
 
   /// Get the total length of the Log_Record, which includes the
   /// size of the various data member fields.
-  long length (void) const;
+  long length () const;
 
   /// Set the total length of the Log_Record, which needs to account for
   /// the size of the various data member fields.
   void length (long);
 
   /// Get the time stamp of the Log_Record.
-  ACE_Time_Value time_stamp (void) const;
+  ACE_Time_Value time_stamp () const;
 
   /// Set the time stamp of the Log_Record.
   void time_stamp (const ACE_Time_Value &ts);
 
   /// Get the process id of the Log_Record.
-  long pid (void) const;
+  long pid () const;
 
   /// Set the process id of the Log_Record.
   void pid (long);
 
   /// Get the message data of the Log_Record.
-  const ACE_TCHAR *msg_data (void) const;
+  const ACE_TCHAR *msg_data () const;
 
   /// Set the message data of the record. If @a data is longer than the
   /// current msg_data_ buffer, a new msg_data_ buffer is allocated to
@@ -154,17 +154,17 @@ public:
 
   /// Get the size of the message data of the Log_Record, including
   /// a byte for the NUL.
-  size_t msg_data_len (void) const;
+  size_t msg_data_len () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
   /// Round up to the alignment restrictions.
-  void round_up (void);
+  void round_up ();
 
   /**
    * Total length of the logging record in bytes.  This field *must*
@@ -193,9 +193,10 @@ private:
   ///
   ACE_Log_Category_TSS* category_;
 
-  /// disallow copying...
-  ACE_Log_Record (const ACE_Log_Record& rhs);
-  ACE_Log_Record& operator= (const ACE_Log_Record& rhs);
+  ACE_Log_Record (const ACE_Log_Record&) = delete;
+  ACE_Log_Record& operator= (const ACE_Log_Record&) = delete;
+  ACE_Log_Record (ACE_Log_Record&&) = delete;
+  ACE_Log_Record& operator= (ACE_Log_Record&& rhs) = delete;
 };
 
 // Forward decls.
diff --git a/ACE/ace/Log_Record.inl b/ACE/ace/Log_Record.inl
index dfd7e75b5b6..9c46fae907b 100644
--- a/ACE/ace/Log_Record.inl
+++ b/ACE/ace/Log_Record.inl
@@ -11,7 +11,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Log_Record::~ACE_Log_Record (void)
+ACE_Log_Record::~ACE_Log_Record ()
 {
   if (this->msg_data_)
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -22,7 +22,7 @@ ACE_Log_Record::~ACE_Log_Record (void)
 }
 
 ACE_INLINE ACE_UINT32
-ACE_Log_Record::type (void) const
+ACE_Log_Record::type () const
 {
   ACE_TRACE ("ACE_Log_Record::type");
   return this->type_;
@@ -37,7 +37,7 @@ ACE_Log_Record::category (ACE_Log_Category_TSS* t)
 
 
 ACE_INLINE ACE_Log_Category_TSS*
-ACE_Log_Record::category (void) const
+ACE_Log_Record::category () const
 {
   ACE_TRACE ("ACE_Log_Record::category");
   return this->category_;
@@ -51,7 +51,7 @@ ACE_Log_Record::type (ACE_UINT32 t)
 }
 
 ACE_INLINE long
-ACE_Log_Record::length (void) const
+ACE_Log_Record::length () const
 {
   ACE_TRACE ("ACE_Log_Record::length");
   return (long) this->length_;
@@ -65,7 +65,7 @@ ACE_Log_Record::length (long l)
 }
 
 ACE_INLINE ACE_Time_Value
-ACE_Log_Record::time_stamp (void) const
+ACE_Log_Record::time_stamp () const
 {
   ACE_TRACE ("ACE_Log_Record::time_stamp");
   return ACE_Time_Value (this->secs_, (long) this->usecs_);
@@ -80,7 +80,7 @@ ACE_Log_Record::time_stamp (const ACE_Time_Value &ts)
 }
 
 ACE_INLINE long
-ACE_Log_Record::pid (void) const
+ACE_Log_Record::pid () const
 {
   ACE_TRACE ("ACE_Log_Record::pid");
   return (long) this->pid_;
@@ -94,14 +94,14 @@ ACE_Log_Record::pid (long p)
 }
 
 ACE_INLINE const ACE_TCHAR *
-ACE_Log_Record::msg_data (void) const
+ACE_Log_Record::msg_data () const
 {
   ACE_TRACE ("ACE_Log_Record::msg_data");
   return this->msg_data_;
 }
 
 ACE_INLINE size_t
-ACE_Log_Record::msg_data_len (void) const
+ACE_Log_Record::msg_data_len () const
 {
   ACE_TRACE ("ACE_Log_Record::msg_data_len");
   return ACE_OS::strlen (this->msg_data_) + 1;
diff --git a/ACE/ace/Logging_Strategy.cpp b/ACE/ace/Logging_Strategy.cpp
index 78f5ac0acf7..4a87f07c3df 100644
--- a/ACE/ace/Logging_Strategy.cpp
+++ b/ACE/ace/Logging_Strategy.cpp
@@ -234,7 +234,7 @@ ACE_Logging_Strategy::parse_args (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-ACE_Logging_Strategy::ACE_Logging_Strategy (void)
+ACE_Logging_Strategy::ACE_Logging_Strategy ()
   : thread_priority_mask_ (0),
     process_priority_mask_ (0),
     flags_ (0),
@@ -278,7 +278,7 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void)
 #endif /* ACE_DEFAULT_LOGFILE */
 }
 
-ACE_Logging_Strategy::~ACE_Logging_Strategy (void)
+ACE_Logging_Strategy::~ACE_Logging_Strategy ()
 {
   // This is allocated in constructor, so it must be deallocated in
   // the destructor!
@@ -290,7 +290,7 @@ ACE_Logging_Strategy::~ACE_Logging_Strategy (void)
 }
 
 int
-ACE_Logging_Strategy::fini (void)
+ACE_Logging_Strategy::fini ()
 {
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_Allocator::instance()->free(this->filename_);
@@ -603,7 +603,7 @@ ACE_Logging_Strategy::reactor (ACE_Reactor *r)
 }
 
 ACE_Reactor *
-ACE_Logging_Strategy::reactor (void) const
+ACE_Logging_Strategy::reactor () const
 {
   return ACE_Service_Object::reactor ();
 }
diff --git a/ACE/ace/Logging_Strategy.h b/ACE/ace/Logging_Strategy.h
index 140e3352a23..e853dfdb5b1 100644
--- a/ACE/ace/Logging_Strategy.h
+++ b/ACE/ace/Logging_Strategy.h
@@ -79,16 +79,16 @@ class ACE_Export ACE_Logging_Strategy : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  ACE_Logging_Strategy (void);
+  ACE_Logging_Strategy ();
 
   /// Destructor.
-  ~ACE_Logging_Strategy (void);
+  ~ACE_Logging_Strategy ();
 
   /// Dynamic linking initialization hook.
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Dynamic linking termination hook.
-  virtual int fini (void);
+  virtual int fini ();
 
   /**
    * Timeout handler which tests logfile size.  If the current logfile
@@ -112,7 +112,7 @@ public:
    */
   virtual void reactor (ACE_Reactor *r);
 
-  virtual ACE_Reactor * reactor (void) const;
+  virtual ACE_Reactor * reactor () const;
 
   /**
    * Parse arguments provided in svc.conf file.
diff --git a/ACE/ace/MEM_Acceptor.cpp b/ACE/ace/MEM_Acceptor.cpp
index a7353b6e3fe..27bc04ab4d0 100644
--- a/ACE/ace/MEM_Acceptor.cpp
+++ b/ACE/ace/MEM_Acceptor.cpp
@@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Acceptor)
 
 void
-ACE_MEM_Acceptor::dump (void) const
+ACE_MEM_Acceptor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Acceptor::dump");
@@ -28,7 +28,7 @@ ACE_MEM_Acceptor::dump (void) const
 
 // Do nothing routine for constructor.
 
-ACE_MEM_Acceptor::ACE_MEM_Acceptor (void)
+ACE_MEM_Acceptor::ACE_MEM_Acceptor ()
   : mmap_prefix_ (0),
     malloc_options_ (ACE_DEFAULT_BASE_ADDR, 0),
     preferred_strategy_ (ACE_MEM_IO::Reactive)
@@ -36,7 +36,7 @@ ACE_MEM_Acceptor::ACE_MEM_Acceptor (void)
   ACE_TRACE ("ACE_MEM_Acceptor::ACE_MEM_Acceptor");
 }
 
-ACE_MEM_Acceptor::~ACE_MEM_Acceptor (void)
+ACE_MEM_Acceptor::~ACE_MEM_Acceptor ()
 {
   ACE_TRACE ("ACE_MEM_Acceptor::~ACE_MEM_Acceptor");
 #if defined (ACE_HAS_ALLOC_HOOKS)
diff --git a/ACE/ace/MEM_Acceptor.h b/ACE/ace/MEM_Acceptor.h
index 333a79d464e..a1477de1a4d 100644
--- a/ACE/ace/MEM_Acceptor.h
+++ b/ACE/ace/MEM_Acceptor.h
@@ -122,7 +122,7 @@ public:
   typedef ACE_MEM_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/MEM_Addr.cpp b/ACE/ace/MEM_Addr.cpp
index 985a99be5eb..5c5082891f0 100644
--- a/ACE/ace/MEM_Addr.cpp
+++ b/ACE/ace/MEM_Addr.cpp
@@ -22,7 +22,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Addr)
 
 // Transform the current address into string format.
 
-ACE_MEM_Addr::ACE_MEM_Addr (void)
+ACE_MEM_Addr::ACE_MEM_Addr ()
   : ACE_Addr (AF_INET, sizeof (ACE_MEM_Addr))
 {
   // ACE_TRACE ("ACE_MEM_Addr::ACE_MEM_Addr");
@@ -54,7 +54,7 @@ ACE_MEM_Addr::ACE_MEM_Addr (u_short port_number)
   this->initialize_local (port_number);
 }
 
-ACE_MEM_Addr::~ACE_MEM_Addr (void)
+ACE_MEM_Addr::~ACE_MEM_Addr ()
 {
 }
 
@@ -110,7 +110,7 @@ ACE_MEM_Addr::string_to_addr (const ACE_TCHAR s[])
 // Return the address.
 
 void *
-ACE_MEM_Addr::get_addr (void) const
+ACE_MEM_Addr::get_addr () const
 {
   ACE_TRACE ("ACE_MEM_Addr::get_addr");
   return this->external_.get_addr ();
@@ -137,20 +137,20 @@ ACE_MEM_Addr::get_host_name (ACE_TCHAR hostname[],
 // Return the character representation of the hostname.
 
 const char *
-ACE_MEM_Addr::get_host_name (void) const
+ACE_MEM_Addr::get_host_name () const
 {
   ACE_TRACE ("ACE_MEM_Addr::get_host_name");
   return this->external_.get_host_name ();
 }
 
 u_long
-ACE_MEM_Addr::hash (void) const
+ACE_MEM_Addr::hash () const
 {
   return this->external_.hash ();
 }
 
 void
-ACE_MEM_Addr::dump (void) const
+ACE_MEM_Addr::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Addr::dump");
diff --git a/ACE/ace/MEM_Addr.h b/ACE/ace/MEM_Addr.h
index 21728cf45e1..7791cb1ec2b 100644
--- a/ACE/ace/MEM_Addr.h
+++ b/ACE/ace/MEM_Addr.h
@@ -141,7 +141,7 @@ public:
   virtual u_long hash (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/MEM_Connector.cpp b/ACE/ace/MEM_Connector.cpp
index 4df5ec48866..65fc6e32efd 100644
--- a/ACE/ace/MEM_Connector.cpp
+++ b/ACE/ace/MEM_Connector.cpp
@@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Connector)
 
 void
-ACE_MEM_Connector::dump (void) const
+ACE_MEM_Connector::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Connector::dump");
@@ -22,7 +22,7 @@ ACE_MEM_Connector::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_MEM_Connector::ACE_MEM_Connector (void)
+ACE_MEM_Connector::ACE_MEM_Connector ()
   : malloc_options_ (ACE_DEFAULT_BASE_ADDR, 0),
     preferred_strategy_ (ACE_MEM_IO::Reactive)
 {
diff --git a/ACE/ace/MEM_Connector.h b/ACE/ace/MEM_Connector.h
index 1138d22cedc..ac7dd7570cf 100644
--- a/ACE/ace/MEM_Connector.h
+++ b/ACE/ace/MEM_Connector.h
@@ -143,7 +143,7 @@ public:
   typedef ACE_MEM_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/MEM_IO.cpp b/ACE/ace/MEM_IO.cpp
index 04e49821ded..1a27b9a72d8 100644
--- a/ACE/ace/MEM_IO.cpp
+++ b/ACE/ace/MEM_IO.cpp
@@ -14,7 +14,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_IO)
 
-ACE_Reactive_MEM_IO::~ACE_Reactive_MEM_IO (void)
+ACE_Reactive_MEM_IO::~ACE_Reactive_MEM_IO ()
 {
 }
 
@@ -334,7 +334,7 @@ ACE_MT_MEM_IO::send_buf (ACE_MEM_SAP_Node *buf,
 #endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */
 
 void
-ACE_MEM_IO::dump (void) const
+ACE_MEM_IO::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_IO::dump");
@@ -374,7 +374,7 @@ ACE_MEM_IO::init (const ACE_TCHAR *name,
 }
 
 int
-ACE_MEM_IO::fini (void)
+ACE_MEM_IO::fini ()
 {
   if (this->deliver_strategy_ != 0)
     {
diff --git a/ACE/ace/MEM_IO.h b/ACE/ace/MEM_IO.h
index 515f573a0c1..a7a582e1f07 100644
--- a/ACE/ace/MEM_IO.h
+++ b/ACE/ace/MEM_IO.h
@@ -267,7 +267,7 @@ public:
 
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/MEM_SAP.cpp b/ACE/ace/MEM_SAP.cpp
index 4386c0ca719..26a85a07292 100644
--- a/ACE/ace/MEM_SAP.cpp
+++ b/ACE/ace/MEM_SAP.cpp
@@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_SAP)
 
 void
-ACE_MEM_SAP::dump (void) const
+ACE_MEM_SAP::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_SAP::dump");
@@ -27,14 +27,14 @@ ACE_MEM_SAP::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_MEM_SAP::ACE_MEM_SAP (void)
+ACE_MEM_SAP::ACE_MEM_SAP ()
   : handle_ (ACE_INVALID_HANDLE),
     shm_malloc_ (0)
 {
   // ACE_TRACE ("ACE_MEM_SAP::ACE_MEM_SAP");
 }
 
-ACE_MEM_SAP::~ACE_MEM_SAP (void)
+ACE_MEM_SAP::~ACE_MEM_SAP ()
 {
   // ACE_TRACE ("ACE_MEM_SAP::~ACE_MEM_SAP");
   delete this->shm_malloc_;
@@ -75,7 +75,7 @@ ACE_MEM_SAP::create_shm_malloc (const ACE_TCHAR *name,
 }
 
 int
-ACE_MEM_SAP::close_shm_malloc (void)
+ACE_MEM_SAP::close_shm_malloc ()
 {
   ACE_TRACE ("ACE_MEM_SAP::close_shm_malloc");
 
diff --git a/ACE/ace/MEM_SAP.h b/ACE/ace/MEM_SAP.h
index 90a7e035b0a..0053ebad40c 100644
--- a/ACE/ace/MEM_SAP.h
+++ b/ACE/ace/MEM_SAP.h
@@ -117,7 +117,7 @@ public:
   int release_buffer (ACE_MEM_SAP_Node *buf);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/MEM_Stream.cpp b/ACE/ace/MEM_Stream.cpp
index 74690a6dd2f..2af690115d6 100644
--- a/ACE/ace/MEM_Stream.cpp
+++ b/ACE/ace/MEM_Stream.cpp
@@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Stream)
 
 void
-ACE_MEM_Stream::dump (void) const
+ACE_MEM_Stream::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Stream::dump");
@@ -21,7 +21,7 @@ ACE_MEM_Stream::dump (void) const
 }
 
 int
-ACE_MEM_Stream::close (void)
+ACE_MEM_Stream::close ()
 {
   this->send ((char *)0, 0);
 
diff --git a/ACE/ace/MEM_Stream.h b/ACE/ace/MEM_Stream.h
index 92d9caa9fb1..55f8db9c23a 100644
--- a/ACE/ace/MEM_Stream.h
+++ b/ACE/ace/MEM_Stream.h
@@ -98,7 +98,7 @@ public:
   typedef ACE_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index c0a02bac81c..ea1c432895e 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -22,7 +22,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_MMAP_Memory_Pool)
 
 void
-ACE_MMAP_Memory_Pool::dump (void) const
+ACE_MMAP_Memory_Pool::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MMAP_Memory_Pool::dump");
@@ -206,7 +206,7 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (
 #endif /* ACE_WIN32 */
 }
 
-ACE_MMAP_Memory_Pool::~ACE_MMAP_Memory_Pool (void)
+ACE_MMAP_Memory_Pool::~ACE_MMAP_Memory_Pool ()
 {
 }
 
@@ -547,7 +547,7 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
 #endif
 
 void *
-ACE_MMAP_Memory_Pool::base_addr (void) const
+ACE_MMAP_Memory_Pool::base_addr () const
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool::base_addr");
   return this->base_addr_;
@@ -569,7 +569,7 @@ ACE_Lite_MMAP_Memory_Pool::ACE_Lite_MMAP_Memory_Pool (const ACE_TCHAR *backing_s
   ACE_TRACE ("ACE_Lite_MMAP_Memory_Pool::ACE_Lite_MMAP_Memory_Pool");
 }
 
-ACE_Lite_MMAP_Memory_Pool::~ACE_Lite_MMAP_Memory_Pool (void)
+ACE_Lite_MMAP_Memory_Pool::~ACE_Lite_MMAP_Memory_Pool ()
 {
 }
 
diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h
index 70455ba79ec..7021586e26c 100644
--- a/ACE/ace/MMAP_Memory_Pool.h
+++ b/ACE/ace/MMAP_Memory_Pool.h
@@ -214,7 +214,7 @@ public:
   virtual void *base_addr (void) const;
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Get reference to underlying ACE_Mem_Map object.
   ACE_Mem_Map const & mmap (void) const;
diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp
index 874b7b75bc0..77023adeb43 100644
--- a/ACE/ace/Malloc.cpp
+++ b/ACE/ace/Malloc.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_Allocator *ACE_Allocator::allocator_ = 0;
 
 void
-ACE_Control_Block::ACE_Malloc_Header::dump (void) const
+ACE_Control_Block::ACE_Malloc_Header::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::ACE_Malloc_Header::dump");
@@ -28,7 +28,7 @@ ACE_Control_Block::ACE_Malloc_Header::dump (void) const
 }
 
 void
-ACE_Control_Block::print_alignment_info (void)
+ACE_Control_Block::print_alignment_info ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::print_alignment_info");
@@ -64,7 +64,7 @@ ACE_Control_Block::print_alignment_info (void)
 }
 
 void
-ACE_Control_Block::dump (void) const
+ACE_Control_Block::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::dump");
@@ -90,7 +90,7 @@ ACE_Control_Block::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
+ACE_Control_Block::ACE_Name_Node::ACE_Name_Node ()
   : name_ (0),
     pointer_ (0),
     next_ (0),
@@ -116,19 +116,19 @@ ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
 }
 
 const char *
-ACE_Control_Block::ACE_Name_Node::name (void) const
+ACE_Control_Block::ACE_Name_Node::name () const
 {
   return this->name_;
 }
 
-ACE_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
+ACE_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header ()
   : next_block_ (0),
     size_ (0)
 {
 }
 
 void
-ACE_Control_Block::ACE_Name_Node::dump (void) const
+ACE_Control_Block::ACE_Name_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::dump");
diff --git a/ACE/ace/Malloc.h b/ACE/ace/Malloc.h
index 3ad30ac5f08..06cc550c507 100644
--- a/ACE/ace/Malloc.h
+++ b/ACE/ace/Malloc.h
@@ -188,7 +188,7 @@ typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT;
 struct ACE_Export ACE_Malloc_Stats
 {
   ACE_Malloc_Stats (void);
-  void dump (void) const;
+  void dump () const;
 
   /// Coarse-grained unit of allocation.
   ACE_INT nchunks_;
@@ -265,7 +265,7 @@ public:
   class ACE_Export ACE_Malloc_Header
   {
   public:
-    ACE_Malloc_Header (void);
+    ACE_Malloc_Header ();
 
     /// Points to next block if on free list.
     ACE_Malloc_Header *next_block_;
@@ -284,7 +284,7 @@ public:
     char padding_[(ACE_MALLOC_PADDING_SIZE) ? ACE_MALLOC_PADDING_SIZE : ACE_MALLOC_ALIGN];
 
     /// Dump the state of the object.
-    void dump (void) const;
+    void dump () const;
   };
 
   /**
@@ -307,10 +307,10 @@ public:
                    ACE_Name_Node *head);
 
     /// Constructor.
-    ACE_Name_Node (void);
+    ACE_Name_Node ();
 
     /// Constructor.
-    ~ACE_Name_Node (void);
+    ~ACE_Name_Node ();
 
     /// Initialize a name node pointer.
     static void init_ptr (ACE_Name_Node **ptr,
@@ -318,7 +318,7 @@ public:
                           void *base_addr);
 
     /// Return a pointer to the name of this node.
-    const char *name (void) const;
+    const char *name () const;
 
     /// Name of the Node.
     char *name_;
@@ -333,14 +333,14 @@ public:
     ACE_Name_Node *prev_;
 
     /// Dump the state of the object.
-    void dump (void) const;
+    void dump () const;
   private:
     /// Copy constructor.
     ACE_Name_Node (const ACE_Name_Node &);
   };
 
   /// Print out a bunch of size info for debugging.
-  static void print_alignment_info (void);
+  static void print_alignment_info ();
 
   /// Reference counter.
   int ref_counter_;
@@ -379,7 +379,7 @@ public:
   ACE_Malloc_Header base_;
 
   /// Dump the state of the object.
-  void dump (void) const;
+  void dump () const;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Malloc.inl b/ACE/ace/Malloc.inl
index 2eb2a3a2325..691cc300af2 100644
--- a/ACE/ace/Malloc.inl
+++ b/ACE/ace/Malloc.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Control_Block::ACE_Name_Node::~ACE_Name_Node (void)
+ACE_Control_Block::ACE_Name_Node::~ACE_Name_Node ()
 {
 }
 
diff --git a/ACE/ace/Malloc_Allocator.cpp b/ACE/ace/Malloc_Allocator.cpp
index 58543303d9b..0726226648c 100644
--- a/ACE/ace/Malloc_Allocator.cpp
+++ b/ACE/ace/Malloc_Allocator.cpp
@@ -13,7 +13,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Allocator *
-ACE_Allocator::instance (void)
+ACE_Allocator::instance ()
 {
   //  ACE_TRACE ("ACE_Allocator::instance");
 
@@ -74,17 +74,17 @@ ACE_Allocator::instance (ACE_Allocator *r)
 }
 
 void
-ACE_Allocator::close_singleton (void)
+ACE_Allocator::close_singleton ()
 {
   ACE_TRACE ("ACE_Allocator::close_singleton");
 }
 
-ACE_Allocator::~ACE_Allocator (void)
+ACE_Allocator::~ACE_Allocator ()
 {
   ACE_TRACE ("ACE_Allocator::~ACE_Allocator");
 }
 
-ACE_Allocator::ACE_Allocator (void)
+ACE_Allocator::ACE_Allocator ()
 {
   ACE_TRACE ("ACE_Allocator::ACE_Allocator");
 }
@@ -129,7 +129,7 @@ ACE_New_Allocator::free (void *ptr)
 }
 
 int
-ACE_New_Allocator::remove (void)
+ACE_New_Allocator::remove ()
 {
   ACE_NOTSUP_RETURN (-1);
 }
@@ -202,7 +202,7 @@ ACE_New_Allocator::print_stats (void) const
 #endif /* ACE_HAS_MALLOC_STATS */
 
 void
-ACE_New_Allocator::dump (void) const
+ACE_New_Allocator::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 #endif /* ACE_HAS_DUMP */
@@ -255,7 +255,7 @@ ACE_Static_Allocator_Base::free (void *ptr)
 }
 
 int
-ACE_Static_Allocator_Base::remove (void)
+ACE_Static_Allocator_Base::remove ()
 {
   return -1;
 }
@@ -328,7 +328,7 @@ ACE_Static_Allocator_Base::print_stats (void) const
 #endif /* ACE_HAS_MALLOC_STATS */
 
 void
-ACE_Static_Allocator_Base::dump (void) const
+ACE_Static_Allocator_Base::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Static_Allocator_Base::dump");
diff --git a/ACE/ace/Malloc_Allocator.h b/ACE/ace/Malloc_Allocator.h
index 81710aad54f..52df2ac9480 100644
--- a/ACE/ace/Malloc_Allocator.h
+++ b/ACE/ace/Malloc_Allocator.h
@@ -59,7 +59,7 @@ public:
   virtual void free (void *ptr);
 
   /// These methods are no-ops.
-  virtual int remove (void);
+  virtual int remove ();
   virtual int bind (const char *name, void *pointer, int duplicates = 0);
   virtual int trybind (const char *name, void *&pointer);
   virtual int find (const char *name, void *&pointer);
@@ -73,7 +73,7 @@ public:
 #if defined (ACE_HAS_MALLOC_STATS)
   virtual void print_stats (void) const;
 #endif /* ACE_HAS_MALLOC_STATS */
-  virtual void dump (void) const;
+  virtual void dump () const;
 
 private:
   // DO NOT ADD ANY STATE (DATA MEMBERS) TO THIS CLASS!!!!  See the
@@ -103,7 +103,7 @@ public:
   virtual void *calloc (size_t nbytes, char initial_value = '\0');
   virtual void *calloc (size_t n_elem, size_t elem_size, char initial_value = '\0');
   virtual void free (void *ptr);
-  virtual int remove (void);
+  virtual int remove ();
   virtual int bind (const char *name, void *pointer, int duplicates = 0);
   virtual int trybind (const char *name, void *&pointer);
   virtual int find (const char *name, void *&pointer);
@@ -117,11 +117,11 @@ public:
 #if defined (ACE_HAS_MALLOC_STATS)
   virtual void print_stats (void) const;
 #endif /* ACE_HAS_MALLOC_STATS */
-  virtual void dump (void) const;
+  virtual void dump () const;
 
 protected:
   /// Don't allow direct instantiations of this class.
-  ACE_Static_Allocator_Base (void);
+  ACE_Static_Allocator_Base ();
 
   /// Pointer to the buffer.
   char *buffer_;
diff --git a/ACE/ace/Malloc_Base.h b/ACE/ace/Malloc_Base.h
index 267021ce799..76e63076bd6 100644
--- a/ACE/ace/Malloc_Base.h
+++ b/ACE/ace/Malloc_Base.h
@@ -45,20 +45,20 @@ public:
   // = Memory Management
 
   /// Get pointer to a default ACE_Allocator.
-  static ACE_Allocator *instance (void);
+  static ACE_Allocator *instance ();
 
   /// Set pointer to a process-wide ACE_Allocator and return existing
   /// pointer.
   static ACE_Allocator *instance (ACE_Allocator *);
 
   /// Delete the dynamically allocated Singleton
-  static void close_singleton (void);
+  static void close_singleton ();
 
   /// "No-op" constructor (needed to make certain compilers happy).
-  ACE_Allocator (void);
+  ACE_Allocator ();
 
   /// Virtual destructor
-  virtual ~ACE_Allocator (void);
+  virtual ~ACE_Allocator ();
 
   /// Allocate @a nbytes, but don't give them any initial value.
   virtual void *malloc (size_type nbytes) = 0;
@@ -76,7 +76,7 @@ public:
   virtual void free (void *ptr) = 0;
 
   /// Remove any resources associated with this memory manager.
-  virtual int remove (void) = 0;
+  virtual int remove () = 0;
 
   // = Map manager like functions
 
@@ -149,7 +149,7 @@ public:
 #endif /* ACE_HAS_MALLOC_STATS */
 
   /// Dump the state of the object.
-  virtual void dump (void) const = 0;
+  virtual void dump () const = 0;
 private:
   // DO NOT ADD ANY STATE (DATA MEMBERS) TO THIS CLASS!!!!  See the
   // <ACE_Allocator::instance> implementation for explanation.
diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp
index 0f966f99c8f..b2d117f045c 100644
--- a/ACE/ace/Malloc_T.cpp
+++ b/ACE/ace/Malloc_T.cpp
@@ -55,7 +55,7 @@ ACE_Cached_Allocator<T, ACE_LOCK>::ACE_Cached_Allocator (size_t n_chunks)
 }
 
 template <class T, class ACE_LOCK>
-ACE_Cached_Allocator<T, ACE_LOCK>::~ACE_Cached_Allocator (void)
+ACE_Cached_Allocator<T, ACE_LOCK>::~ACE_Cached_Allocator ()
 {
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_Allocator::instance()->free (this->pool_);
@@ -131,7 +131,7 @@ ACE_Dynamic_Cached_Allocator<ACE_LOCK>::ACE_Dynamic_Cached_Allocator
 }
 
 template <class ACE_LOCK>
-ACE_Dynamic_Cached_Allocator<ACE_LOCK>::~ACE_Dynamic_Cached_Allocator (void)
+ACE_Dynamic_Cached_Allocator<ACE_LOCK>::~ACE_Dynamic_Cached_Allocator ()
 {
   delete [] this->pool_;
   this->pool_ = 0;
@@ -204,7 +204,7 @@ ACE_Allocator_Adapter<MALLOC>::calloc (size_t n_elem,
 }
 
 template <class MALLOC> MALLOC &
-ACE_Allocator_Adapter<MALLOC>::alloc (void)
+ACE_Allocator_Adapter<MALLOC>::alloc ()
 {
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::allocator");
   return this->allocator_;
@@ -218,7 +218,7 @@ ACE_Allocator_Adapter<MALLOC>::free (void *ptr)
 }
 
 template <class MALLOC> int
-ACE_Allocator_Adapter<MALLOC>::remove (void)
+ACE_Allocator_Adapter<MALLOC>::remove ()
 {
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::remove");
   return this->allocator_.remove ();
@@ -339,7 +339,7 @@ ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (
 #endif /* ACE_HAS_WCHAR */
 
 template <class MALLOC>
-ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter (void)
+ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter ()
 {
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter");
 }
@@ -354,7 +354,7 @@ ACE_Allocator_Adapter<MALLOC>::print_stats (void) const
 #endif /* ACE_HAS_MALLOC_STATS */
 
 template <class MALLOC> void
-ACE_Allocator_Adapter<MALLOC>::dump (void) const
+ACE_Allocator_Adapter<MALLOC>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::dump");
@@ -365,7 +365,7 @@ ACE_Allocator_Adapter<MALLOC>::dump (void) const
 ACE_ALLOC_HOOK_DEFINE_Tt(ACE_Allocator_Adapter)
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
@@ -430,7 +430,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::free (void *ptr)
 // initialize the control block pointer.
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open (void)
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open ()
 {
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open");
   ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
@@ -577,7 +577,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_T (void)
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_T ()
 {
   ACE_TRACE ("ACE_Malloc_T<MEM_POOL>::~ACE_Malloc_T<MEM_POOL>");
   if (this->delete_lock_)
@@ -590,7 +590,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_T (void)
 // Clean up the resources allocated by ACE_Malloc_T.
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void)
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove ()
 {
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove");
   // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) destroying ACE_Malloc_T\n")));
@@ -1053,7 +1053,7 @@ ACE_Malloc_Lock_Adapter_T<ACE_LOCK>::operator () (const ACE_TCHAR *name)
 /*****************************************************************************/
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void
-ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
+ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
@@ -1085,7 +1085,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_LIFO_It
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
-ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_LIFO_Iterator_T (void)
+ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_LIFO_Iterator_T ()
 {
   ACE_OS::free ((void *) this->name_);
 }
@@ -1121,7 +1121,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::next (void *&next_
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int
-ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done (void) const
+ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done () const
 {
   ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done");
 
@@ -1129,7 +1129,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done (void) const
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int
-ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void)
+ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance ()
 {
   ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance");
 
@@ -1147,7 +1147,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void)
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void
-ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
+ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
@@ -1181,7 +1181,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_FIFO_It
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
-ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_FIFO_Iterator_T (void)
+ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_FIFO_Iterator_T ()
 {
   ACE_OS::free ((void *) this->name_);
 }
@@ -1217,7 +1217,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::next (void *&next_
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int
-ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done (void) const
+ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done () const
 {
   ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done");
 
@@ -1225,7 +1225,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done (void) const
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int
-ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void)
+ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance ()
 {
   ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance");
 
@@ -1243,7 +1243,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void)
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int
-ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::start (void)
+ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::start ()
 {
   this->curr_ = this->curr_->next_;
   NAME_NODE *prev = 0;
diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h
index 0b622ec3df2..47aa74b0180 100644
--- a/ACE/ace/Malloc_T.h
+++ b/ACE/ace/Malloc_T.h
@@ -43,10 +43,10 @@ class ACE_Cached_Mem_Pool_Node
 {
 public:
   /// Return the address of free memory.
-  T *addr (void);
+  T *addr ();
 
   /// Get the next ACE_Cached_Mem_Pool_Node in a list.
-  ACE_Cached_Mem_Pool_Node<T> *get_next (void);
+  ACE_Cached_Mem_Pool_Node<T> *get_next ();
 
   /// Set the next ACE_Cached_Mem_Pool_Node.
   void set_next (ACE_Cached_Mem_Pool_Node<T> *ptr);
@@ -90,7 +90,7 @@ public:
   ACE_Cached_Allocator (size_t n_chunks);
 
   /// Clear things up.
-  ~ACE_Cached_Allocator (void);
+  ~ACE_Cached_Allocator ();
 
   /**
    * Get a chunk of memory from free list cache.  Note that @a nbytes is
@@ -119,7 +119,7 @@ public:
   void free (void *);
 
   /// Return the number of chunks available in the cache.
-  size_t pool_depth (void);
+  size_t pool_depth ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
@@ -157,7 +157,7 @@ public:
   ACE_Dynamic_Cached_Allocator (size_t n_chunks, size_t chunk_size);
 
   /// Clear things up.
-  ~ACE_Dynamic_Cached_Allocator (void);
+  ~ACE_Dynamic_Cached_Allocator ();
 
   /**
    * Get a chunk of memory from free list cache.  Note that @a nbytes is
@@ -186,7 +186,7 @@ public:
   void free (void *);
 
   /// Return the number of chunks available in the cache.
-  size_t pool_depth (void);
+  size_t pool_depth ();
 
 private:
   /// Remember how we allocate the memory in the first place so
@@ -251,7 +251,7 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Destructor.
-  virtual ~ACE_Allocator_Adapter (void);
+  virtual ~ACE_Allocator_Adapter ();
 
   // = Memory Management
 
@@ -271,7 +271,7 @@ public:
   virtual void free (void *ptr);
 
   /// Remove any resources associated with this memory manager.
-  virtual int remove (void);
+  virtual int remove ();
 
   // = Map manager like functions
 
@@ -338,7 +338,7 @@ public:
   virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
 
   /// Returns the underlying allocator.
-  ALLOCATOR &alloc (void);
+  ALLOCATOR &alloc ();
 
 #if defined (ACE_HAS_MALLOC_STATS)
   /// Dump statistics of how malloc is behaving.
@@ -346,7 +346,7 @@ public:
 #endif /* ACE_HAS_MALLOC_STATS */
 
   /// Dump the state of the object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   ACE_ALLOC_HOOK_DECLARE;
 
@@ -370,7 +370,7 @@ template <size_t POOL_SIZE>
 class ACE_Static_Allocator : public ACE_Static_Allocator_Base
 {
 public:
-  ACE_Static_Allocator (void)
+  ACE_Static_Allocator ()
     : ACE_Static_Allocator_Base (pool_, POOL_SIZE)
   {
     // This function <{must}> be inlined!!!
@@ -480,16 +480,16 @@ public:
                 ACE_LOCK *lock);
 
   /// Destructor
-  ~ACE_Malloc_T (void);
+  ~ACE_Malloc_T ();
 
   /// Get Reference counter.
-  int ref_counter (void);
+  int ref_counter ();
 
   /// Release ref counter.
   int release (int close = 0);
 
   /// Releases resources allocated by this object.
-  int remove (void);
+  int remove ();
 
   // = Memory management
 
@@ -510,7 +510,7 @@ public:
   void free (void *ptr);
 
   /// Returns a reference to the underlying memory pool.
-  MEMORY_POOL &memory_pool (void);
+  MEMORY_POOL &memory_pool ();
 
   // = Map manager like functions
 
@@ -602,16 +602,16 @@ public:
 
   /// Returns a pointer to the lock used to provide mutual exclusion to
   /// an ACE_Malloc allocator.
-  ACE_LOCK &mutex (void);
+  ACE_LOCK &mutex ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Return cb_ptr value.
-  void *base_addr (void);
+  void *base_addr ();
 
   /**
    * Bad flag.  This operation should be called immediately after the
@@ -619,13 +619,13 @@ public:
    * constructed successfully.  If not, the user should invoke @c
    * remove and release the object (it is not usable.)
    * @retval 0 if all is fine.  non-zero if this malloc object is
-   *         unuable.
+   *         unusable.
    */
-  int bad (void);
+  int bad ();
 
 private:
   /// Initialize the Malloc pool.
-  int open (void);
+  int open ();
 
   /// Associate @a name with @a pointer.  Assumes that locks are held by
   /// callers.
@@ -703,12 +703,12 @@ public:
                               const char *name = 0);
 
   /// Destructor.
-  ~ACE_Malloc_LIFO_Iterator_T (void);
+  ~ACE_Malloc_LIFO_Iterator_T ();
 
   // = Iteration methods.
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Pass back the next entry in the set that hasn't yet been
   /// visited.  Returns 0 when all items have been seen, else 1.
@@ -723,10 +723,10 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -771,12 +771,12 @@ public:
                               const char *name = 0);
 
   /// Destructor.
-  ~ACE_Malloc_FIFO_Iterator_T (void);
+  ~ACE_Malloc_FIFO_Iterator_T ();
 
   // = Iteration methods.
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Pass back the next entry in the set that hasn't yet been
   /// visited.  Returns 0 when all items have been seen, else 1.
@@ -791,14 +791,14 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Go to the starting element that was inserted first. Returns 0
   /// when there is no item in the set, else 1.
-  int start (void);
+  int start ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Malloc_T.inl b/ACE/ace/Malloc_T.inl
index 42321a18a4e..8a8d939c972 100644
--- a/ACE/ace/Malloc_T.inl
+++ b/ACE/ace/Malloc_T.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T> ACE_INLINE T *
-ACE_Cached_Mem_Pool_Node<T>::addr (void)
+ACE_Cached_Mem_Pool_Node<T>::addr ()
 {
   // This should be done using a single reinterpret_cast, but Sun/CC
   // (4.2) gets awfully confused when T is a char[20] (and maybe other
@@ -13,7 +13,7 @@ ACE_Cached_Mem_Pool_Node<T>::addr (void)
 }
 
 template <class T> ACE_INLINE ACE_Cached_Mem_Pool_Node<T> *
-ACE_Cached_Mem_Pool_Node<T>::get_next (void)
+ACE_Cached_Mem_Pool_Node<T>::get_next ()
 {
   return this->next_;
 }
@@ -27,19 +27,19 @@ ACE_Cached_Mem_Pool_Node<T>::set_next (ACE_Cached_Mem_Pool_Node<T> *ptr)
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Cached_Mem_Pool_Node)
 
 template <class T, class ACE_LOCK> ACE_INLINE size_t
-ACE_Cached_Allocator<T, ACE_LOCK>::pool_depth (void)
+ACE_Cached_Allocator<T, ACE_LOCK>::pool_depth ()
 {
   return this->free_list_.size ();
 }
 
 template <class ACE_LOCK> ACE_INLINE size_t
-ACE_Dynamic_Cached_Allocator<ACE_LOCK>::pool_depth (void)
+ACE_Dynamic_Cached_Allocator<ACE_LOCK>::pool_depth ()
 {
   return this->free_list_.size ();
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE int
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ref_counter (void)
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ref_counter ()
 {
   ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
   if (this->cb_ptr_ != 0)
@@ -49,7 +49,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ref_counter (void)
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE int
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::bad (void)
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::bad ()
 {
   return this->bad_flag_;
 }
@@ -77,7 +77,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::release (int close)
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE ACE_MEM_POOL &
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::memory_pool (void)
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::memory_pool ()
 {
   ACE_TRACE ("ACE_Malloc_T<MEMORY_POOL, ACE_LOCK, ACE_CB>::memory_pool");
   return this->memory_pool_;
@@ -118,13 +118,13 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::protect (void *addr,
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE ACE_LOCK &
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::mutex (void)
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::mutex ()
 {
   return *this->lock_;
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE void *
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::base_addr (void)
+ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::base_addr ()
 {
   return this->cb_ptr_;
 }
diff --git a/ACE/ace/Managed_Object.cpp b/ACE/ace/Managed_Object.cpp
index 3935cf96f0d..b6f512202fe 100644
--- a/ACE/ace/Managed_Object.cpp
+++ b/ACE/ace/Managed_Object.cpp
@@ -18,7 +18,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TYPE>
-ACE_Cleanup_Adapter<TYPE>::~ACE_Cleanup_Adapter (void)
+ACE_Cleanup_Adapter<TYPE>::~ACE_Cleanup_Adapter ()
 {
 }
 
diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h
index 207c0abfc35..eed45cbbc23 100644
--- a/ACE/ace/Managed_Object.h
+++ b/ACE/ace/Managed_Object.h
@@ -42,13 +42,13 @@ class ACE_Cleanup_Adapter : public ACE_Cleanup
 {
 public:
   /// Default constructor.
-  ACE_Cleanup_Adapter (void);
+  ACE_Cleanup_Adapter ();
 
   /// Virtual destructor, needed by some compilers for vtable placement.
-  virtual ~ACE_Cleanup_Adapter (void);
+  virtual ~ACE_Cleanup_Adapter ();
 
   /// Accessor for contained object.
-  TYPE &object (void);
+  TYPE &object ();
 
 private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Cleanup_Adapter (const ACE_Cleanup_Adapter<TYPE> &))
diff --git a/ACE/ace/Managed_Object.inl b/ACE/ace/Managed_Object.inl
index 4747e8faa2b..c3b3acae0a1 100644
--- a/ACE/ace/Managed_Object.inl
+++ b/ACE/ace/Managed_Object.inl
@@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TYPE>
 ACE_INLINE
-ACE_Cleanup_Adapter<TYPE>::ACE_Cleanup_Adapter (void)
+ACE_Cleanup_Adapter<TYPE>::ACE_Cleanup_Adapter ()
   // Note: don't explicitly initialize "object_", because TYPE may not
   // have a default constructor.  Let the compiler figure it out . . .
 {
@@ -12,7 +12,7 @@ ACE_Cleanup_Adapter<TYPE>::ACE_Cleanup_Adapter (void)
 template <class TYPE>
 ACE_INLINE
 TYPE &
-ACE_Cleanup_Adapter<TYPE>::object (void)
+ACE_Cleanup_Adapter<TYPE>::object ()
 {
   return this->object_;
 }
diff --git a/ACE/ace/Manual_Event.cpp b/ACE/ace/Manual_Event.cpp
index d0504f84e62..91235a610e0 100644
--- a/ACE/ace/Manual_Event.cpp
+++ b/ACE/ace/Manual_Event.cpp
@@ -44,7 +44,7 @@ ACE_Manual_Event_T<TIME_POLICY>::ACE_Manual_Event_T (
 
 template <class TIME_POLICY>
 void
-ACE_Manual_Event_T<TIME_POLICY>::dump (void) const
+ACE_Manual_Event_T<TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_Event_T<TIME_POLICY>::dump ();
diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h
index 5287eec3e27..a2981f41ffd 100644
--- a/ACE/ace/Manual_Event.h
+++ b/ACE/ace/Manual_Event.h
@@ -53,10 +53,10 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  ~ACE_Manual_Event_T (void);
+  ~ACE_Manual_Event_T ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks
   ACE_ALLOC_HOOK_DECLARE;
@@ -85,7 +85,7 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  virtual ~ACE_Manual_Event (void) {}
+  virtual ~ACE_Manual_Event () {}
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Manual_Event.inl b/ACE/ace/Manual_Event.inl
index d72fdfc85e6..7db9b7b0ebd 100644
--- a/ACE/ace/Manual_Event.inl
+++ b/ACE/ace/Manual_Event.inl
@@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TIME_POLICY>
 ACE_INLINE
-ACE_Manual_Event_T<TIME_POLICY>::~ACE_Manual_Event_T (void)
+ACE_Manual_Event_T<TIME_POLICY>::~ACE_Manual_Event_T ()
 {
 }
 
diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp
index ecb34ab503b..fb7d6046cf6 100644
--- a/ACE/ace/Map_Manager.cpp
+++ b/ACE/ace/Map_Manager.cpp
@@ -57,7 +57,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::open (size_t size,
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close_i (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close_i ()
 {
   // Free entries.
   this->free_search_structure ();
@@ -385,7 +385,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find_and_return_index (const EXT_ID &
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_all (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_all ()
 {
   // Go through the entire occupied list.
   for (ACE_UINT32 i = this->occupied_list_.next ();
@@ -551,7 +551,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::resize_i (ACE_UINT32 new_size)
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_UINT32
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size ()
 {
   // Calculate the new size.
   ACE_UINT32 current_size = this->total_size_;
@@ -568,7 +568,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size (void)
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure ()
 {
   // Free up the structure.
   if (this->search_structure_ != 0)
@@ -590,7 +590,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure (void)
 }
 
 template <class EXT_ID, class INT_ID> void
-ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const
+ACE_Map_Entry<EXT_ID, INT_ID>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -606,7 +606,7 @@ ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -619,7 +619,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
+ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -629,7 +629,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
+ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -639,7 +639,7 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
+ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->dump_i ();
@@ -647,7 +647,7 @@ ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
+ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->dump_i ();
@@ -655,7 +655,7 @@ ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
-ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
+ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->dump_i ();
diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h
index e4c541957de..4ca68a32721 100644
--- a/ACE/ace/Map_Manager.h
+++ b/ACE/ace/Map_Manager.h
@@ -38,11 +38,11 @@ class ACE_Map_Entry
 {
 public:
   /// Initialize member variables.
-  ACE_Map_Entry (void);
+  ACE_Map_Entry ();
 
   /// We need this destructor to keep some compilers from complaining.
   /// It's just a no-op, however.
-  ~ACE_Map_Entry (void);
+  ~ACE_Map_Entry ();
 
   /// Key used to look up an entry.
   EXT_ID ext_id_;
@@ -51,7 +51,7 @@ public:
   INT_ID int_id_;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -60,13 +60,13 @@ public:
   // are not portable.
 
   /// Get next entry.
-  ACE_UINT32 next (void) const;
+  ACE_UINT32 next () const;
 
   /// Set next entry.
   void next (ACE_UINT32 n);
 
   /// Get prev entry.
-  ACE_UINT32 prev (void) const;
+  ACE_UINT32 prev () const;
 
   /// Set prev entry.
   void prev (ACE_UINT32 p);
@@ -157,11 +157,11 @@ public:
 
   /// Close down a ACE_Map_Manager and release dynamically allocated
   /// resources.
-  int close (void);
+  int close ();
 
   /// Close down a ACE_Map_Manager and release dynamically allocated
   /// resources.
-  ~ACE_Map_Manager (void);
+  ~ACE_Map_Manager ();
 
   /**
    * Associate @a ext_id with @a int_id.  If @a ext_id is already in the
@@ -248,13 +248,13 @@ public:
   /**
    * Unbind all entires.
    */
-  void unbind_all (void);
+  void unbind_all ();
 
   /// Return the current size of the map.
-  size_t current_size (void) const;
+  size_t current_size () const;
 
   /// Return the total size of the map.
-  size_t total_size (void) const;
+  size_t total_size () const;
 
   /**
    * Returns a reference to the underlying ACE_LOCK.  This makes it
@@ -264,20 +264,20 @@ public:
    * guard the state of an iterator.
    * @note The right name would be lock, but HP/C++ will choke on that!
    */
-  ACE_LOCK &mutex (void);
+  ACE_LOCK &mutex ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> begin (void);
-  ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> end (void);
+  ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> begin ();
+  ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> end ();
 
   /// Return reverse iterator.
-  ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> rbegin (void);
-  ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> rend (void);
+  ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> rbegin ();
+  ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> rend ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -353,7 +353,7 @@ protected:
   int resize_i (ACE_UINT32 size);
 
   /// Close down a <Map_Manager>.  Must be called with locks held.
-  int close_i (void);
+  int close_i ();
 
   /// Returns 1 if <id1> == <id2>, else 0.  This is defined as a
   /// separate method to facilitate template specialization.
@@ -361,17 +361,17 @@ protected:
 
   /// This function returns the new size of the Map Manager.  This
   /// function is called when we run out of room and need to resize.
-  ACE_UINT32 new_size (void);
+  ACE_UINT32 new_size ();
 
   /// Explicitly call the destructors and free up the
   /// <search_structure_>.
-  void free_search_structure (void);
+  void free_search_structure ();
 
   /// Id of the free list sentinel.
-  ACE_UINT32 free_list_id (void) const;
+  ACE_UINT32 free_list_id () const;
 
   /// Id of the occupied list sentinel.
-  ACE_UINT32 occupied_list_id (void) const;
+  ACE_UINT32 occupied_list_id () const;
 
   /// Finds the next free slot.
   int next_free (ACE_UINT32 &slot);
@@ -460,14 +460,14 @@ public:
   int next (ACE_Map_Entry<EXT_ID, INT_ID> *&next_entry) const;
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Returns a reference to the interal element @c this is pointing to.
-  ACE_Map_Entry<EXT_ID, INT_ID>& operator* (void) const;
+  ACE_Map_Entry<EXT_ID, INT_ID>& operator* () const;
 
   /// Returns reference the Map_Manager that is being iterated
   /// over.
-  ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& map (void);
+  ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& map ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> &) const;
@@ -479,14 +479,14 @@ public:
 protected:
   /// Move forward by one element in the set.  Returns 0 when there's
   /// no more item in the set after the current items, else 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move backware by one element in the set.  Returns 0 when there's
   /// no more item in the set before the current item, else 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Dump the state of an object.
-  void dump_i (void) const;
+  void dump_i () const;
 
   /// Map we are iterating over.
   ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> *map_man_;
@@ -518,14 +518,14 @@ public:
   int next (ACE_Map_Entry<EXT_ID, INT_ID> *&next_entry) const;
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Returns a reference to the interal element @c this is pointing to.
-  ACE_Map_Entry<EXT_ID, INT_ID>& operator* (void) const;
+  ACE_Map_Entry<EXT_ID, INT_ID>& operator* () const;
 
   /// Returns reference the Map_Manager that is being iterated
   /// over.
-  const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& map (void) const;
+  const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& map () const;
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> &) const;
@@ -537,14 +537,14 @@ public:
 protected:
   /// Move forward by one element in the set.  Returns 0 when there's
   /// no more item in the set after the current items, else 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move backware by one element in the set.  Returns 0 when there's
   /// no more item in the set before the current item, else 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Dump the state of an object.
-  void dump_i (void) const;
+  void dump_i () const;
 
   /// Map we are iterating over.
   const ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> *map_man_;
@@ -576,21 +576,21 @@ public:
 
   /// Move forward by one element in the set.   Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance.
-  ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (void);
+  ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ ();
 
   /// Postfix advance.
   ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (void);
+  ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- ();
 
   /// Postfix reverse.
   ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator-- (int);
@@ -622,21 +622,21 @@ public:
 
   /// Move forward by one element in the set.   Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix advance.
-  ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (void);
+  ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ ();
 
   /// Postfix advance.
   ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (void);
+  ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- ();
 
   /// Postfix reverse.
   ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator-- (int);
@@ -668,21 +668,21 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
   /// Prefix reverse.
-  ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (void);
+  ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ ();
 
   /// Postfix reverse.
   ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator++ (int);
 
   /// Prefix advance.
-  ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (void);
+  ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- ();
 
   /// Postfix advance.
   ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator-- (int);
diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl
index 3c132b4f9bf..5ef512b49ed 100644
--- a/ACE/ace/Map_Manager.inl
+++ b/ACE/ace/Map_Manager.inl
@@ -5,7 +5,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class EXT_ID, class INT_ID> ACE_INLINE
-ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry (void)
+ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry ()
   : next_ (0),
     prev_ (0)
 #if defined (ACE_HAS_LAZY_MAP_MANAGER)
@@ -15,13 +15,13 @@ ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry (void)
 }
 
 template <class EXT_ID, class INT_ID> ACE_INLINE
-ACE_Map_Entry<EXT_ID, INT_ID>::~ACE_Map_Entry (void)
+ACE_Map_Entry<EXT_ID, INT_ID>::~ACE_Map_Entry ()
 {
   // No-op just to keep some compilers happy...
 }
 
 template <class EXT_ID, class INT_ID> ACE_INLINE ACE_UINT32
-ACE_Map_Entry<EXT_ID, INT_ID>::next (void) const
+ACE_Map_Entry<EXT_ID, INT_ID>::next () const
 {
   return this->next_;
 }
@@ -33,7 +33,7 @@ ACE_Map_Entry<EXT_ID, INT_ID>::next (ACE_UINT32 n)
 }
 
 template <class EXT_ID, class INT_ID> ACE_INLINE ACE_UINT32
-ACE_Map_Entry<EXT_ID, INT_ID>::prev (void) const
+ACE_Map_Entry<EXT_ID, INT_ID>::prev () const
 {
   return this->prev_;
 }
@@ -68,7 +68,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (ACE_Allocator *alloc
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close ()
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -76,7 +76,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close (void)
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::~ACE_Map_Manager (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::~ACE_Map_Manager ()
 {
   this->close ();
 }
@@ -186,21 +186,21 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id)
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE size_t
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size (void) const
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size () const
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, static_cast<size_t> (-1));
   return this->cur_size_;
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE size_t
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void) const
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size () const
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, static_cast<size_t> (-1));
   return this->total_size_;
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_LOCK &
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::mutex (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::mutex ()
 {
   return this->lock_;
 }
@@ -233,7 +233,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::equal (const EXT_ID &id1,
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_UINT32
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_list_id (void) const
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_list_id () const
 {
   // If you change ~0, please change
   // ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key()
@@ -242,35 +242,35 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_list_id (void) const
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_UINT32
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::occupied_list_id (void) const
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::occupied_list_id () const
 {
   return (ACE_UINT32) ~1;
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::begin (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::begin ()
 {
   return ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> (*this);
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::end (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::end ()
 {
   return ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> (*this, 1);
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rbegin (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rbegin ()
 {
   return ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> (*this);
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rend (void)
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rend ()
 {
   return ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> (*this, 1);
 }
@@ -295,13 +295,13 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Map_Entry<EXT_ID, INT
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done (void) const
+ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done () const
 {
   return this->next_ == this->map_man_->occupied_list_id ();
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void)
+ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i ()
 {
 
 #if defined (ACE_HAS_LAZY_MAP_MANAGER)
@@ -332,7 +332,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void)
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void)
+ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i ()
 {
 
 #if defined (ACE_HAS_LAZY_MAP_MANAGER)
@@ -364,7 +364,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map (void)
+ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map ()
 {
   return *this->map_man_;
 }
@@ -402,13 +402,13 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Map_Entry<EXT_I
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done (void) const
+ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done () const
 {
   return this->next_ == this->map_man_->occupied_list_id ();
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void)
+ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i ()
 {
 
 #if defined (ACE_HAS_LAZY_MAP_MANAGER)
@@ -439,7 +439,7 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void)
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void)
+ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i ()
 {
 
 #if defined (ACE_HAS_LAZY_MAP_MANAGER)
@@ -471,7 +471,7 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &
-ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map (void) const
+ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map () const
 {
   return *this->map_man_;
 }
@@ -528,14 +528,14 @@ ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Iterator (ACE_Map_Manager<EX
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void)
+ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance ()
 {
   return this->forward_i ();
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
-ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (void)
+ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ ()
 {
   this->forward_i ();
   return *this;
@@ -552,7 +552,7 @@ ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (int)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
-ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (void)
+ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- ()
 {
   this->reverse_i ();
   return *this;
@@ -606,14 +606,14 @@ ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Const_Iterator (const
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void)
+ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance ()
 {
   return this->forward_i ();
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
-ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (void)
+ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ ()
 {
   this->forward_i ();
   return *this;
@@ -630,7 +630,7 @@ ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (int)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
-ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (void)
+ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- ()
 {
   this->reverse_i ();
   return *this;
@@ -684,14 +684,14 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Reverse_Iterator (AC
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
-ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void)
+ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance ()
 {
   return this->reverse_i ();
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
-ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (void)
+ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ ()
 {
   this->reverse_i ();
   return *this;
@@ -708,7 +708,7 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (int)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &
-ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (void)
+ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- ()
 {
   this->forward_i ();
   return *this;
@@ -725,7 +725,7 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (int)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Entry<EXT_ID, INT_ID>&
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
+ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* () const
 {
   ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
 
@@ -738,7 +738,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Entry<EXT_ID, INT_ID>&
-ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
+ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* () const
 {
   ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
 
diff --git a/ACE/ace/Map_T.cpp b/ACE/ace/Map_T.cpp
index f67f07ef8f8..6ebb44e61dd 100644
--- a/ACE/ace/Map_T.cpp
+++ b/ACE/ace/Map_T.cpp
@@ -14,28 +14,28 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class KEY, class VALUE>
-ACE_Map<KEY, VALUE>::~ACE_Map (void)
+ACE_Map<KEY, VALUE>::~ACE_Map ()
 {
 }
 
 template <class T>
-ACE_Iterator_Impl<T>::~ACE_Iterator_Impl (void)
+ACE_Iterator_Impl<T>::~ACE_Iterator_Impl ()
 {
 }
 
 template <class T>
-ACE_Reverse_Iterator_Impl<T>::~ACE_Reverse_Iterator_Impl (void)
+ACE_Reverse_Iterator_Impl<T>::~ACE_Reverse_Iterator_Impl ()
 {
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY>
-ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::~ACE_Map_Impl_Iterator_Adapter (void)
+ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::~ACE_Map_Impl_Iterator_Adapter ()
 {
 }
 
 
 template <class T, class IMPLEMENTATION, class ENTRY> ACE_Iterator_Impl<T> *
-ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone (void) const
+ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone () const
 {
   ACE_Iterator_Impl<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -62,24 +62,24 @@ ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::dereference () const
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY> void
-ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::plus_plus (void)
+ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::plus_plus ()
 {
   ++this->implementation_;
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY> void
-ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::minus_minus (void)
+ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::minus_minus ()
 {
   --this->implementation_;
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY>
-ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::~ACE_Map_Impl_Reverse_Iterator_Adapter (void)
+ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::~ACE_Map_Impl_Reverse_Iterator_Adapter ()
 {
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY> ACE_Reverse_Iterator_Impl<T> *
-ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone (void) const
+ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone () const
 {
   ACE_Reverse_Iterator_Impl<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -107,20 +107,20 @@ ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::dereference ()
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY> void
-ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::plus_plus (void)
+ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::plus_plus ()
 {
   ++this->implementation_;
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY> void
-ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::minus_minus (void)
+ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::minus_minus ()
 {
   --this->implementation_;
 }
 
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY>
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::~ACE_Map_Impl (void)
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::~ACE_Map_Impl ()
 {
 }
 
@@ -133,7 +133,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ope
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> int
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::close (void)
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::close ()
 {
   return this->implementation_.close ();
 }
@@ -249,19 +249,19 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::unb
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> size_t
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size (void) const
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size () const
 {
   return this->implementation_.current_size ();
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> size_t
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size (void) const
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size () const
 {
   return this->implementation_.total_size ();
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> void
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::dump (void) const
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->implementation_.dump ();
@@ -269,7 +269,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::dum
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::begin_impl (void)
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::begin_impl ()
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -279,7 +279,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::beg
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::end_impl (void)
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::end_impl ()
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -289,7 +289,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::end
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rbegin_impl (void)
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rbegin_impl ()
 {
   ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -299,7 +299,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rbe
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rend_impl (void)
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rend_impl ()
 {
   ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -309,12 +309,12 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ren
 }
 
 template <class T, class VALUE>
-ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::~ACE_Active_Map_Manager_Iterator_Adapter (void)
+ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::~ACE_Active_Map_Manager_Iterator_Adapter ()
 {
 }
 
 template <class T, class VALUE> ACE_Iterator_Impl<T> *
-ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::clone (void) const
+ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::clone () const
 {
   ACE_Iterator_Impl<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -343,24 +343,24 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::dereference () const
 }
 
 template <class T, class VALUE> void
-ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::plus_plus (void)
+ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::plus_plus ()
 {
   ++this->implementation_;
 }
 
 template <class T, class VALUE> void
-ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::minus_minus (void)
+ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::minus_minus ()
 {
   --this->implementation_;
 }
 
 template <class T, class VALUE>
-ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::~ACE_Active_Map_Manager_Reverse_Iterator_Adapter (void)
+ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::~ACE_Active_Map_Manager_Reverse_Iterator_Adapter ()
 {
 }
 
 template <class T, class VALUE> ACE_Reverse_Iterator_Impl<T> *
-ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::clone (void) const
+ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::clone () const
 {
   ACE_Reverse_Iterator_Impl<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -389,19 +389,19 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::dereference () const
 }
 
 template <class T, class VALUE> void
-ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::plus_plus (void)
+ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::plus_plus ()
 {
   ++this->implementation_;
 }
 
 template <class T, class VALUE> void
-ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::minus_minus (void)
+ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::minus_minus ()
 {
   --this->implementation_;
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER>
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::~ACE_Active_Map_Manager_Adapter (void)
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::~ACE_Active_Map_Manager_Adapter ()
 {
 }
 
@@ -414,7 +414,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::open (size_t length,
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> int
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::close (void)
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::close ()
 {
   return this->implementation_.close ();
 }
@@ -691,19 +691,19 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key,
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> size_t
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size (void) const
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size () const
 {
   return this->implementation_.current_size ();
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> size_t
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size (void) const
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size () const
 {
   return this->implementation_.total_size ();
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> void
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::dump (void) const
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->implementation_.dump ();
@@ -711,7 +711,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::dump (void) const
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::begin_impl (void)
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::begin_impl ()
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -721,7 +721,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::begin_impl (void)
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::end_impl (void)
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::end_impl ()
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -731,7 +731,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::end_impl (void)
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rbegin_impl (void)
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rbegin_impl ()
 {
   ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -741,7 +741,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rbegin_impl (void)
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rend_impl (void)
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rend_impl ()
 {
   ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -751,12 +751,12 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rend_impl (void)
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS>
-ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::~ACE_Hash_Map_Manager_Ex_Iterator_Adapter (void)
+ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::~ACE_Hash_Map_Manager_Ex_Iterator_Adapter ()
 {
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_Iterator_Impl<T> *
-ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::clone (void) const
+ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::clone () const
 {
   ACE_Iterator_Impl<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -785,24 +785,24 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>:
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> void
-ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::plus_plus (void)
+ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::plus_plus ()
 {
   ++this->implementation_;
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> void
-ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::minus_minus (void)
+ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::minus_minus ()
 {
   --this->implementation_;
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS>
-ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (void)
+ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter ()
 {
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_Reverse_Iterator_Impl<T> *
-ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::clone (void) const
+ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::clone () const
 {
   ACE_Reverse_Iterator_Impl<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -831,19 +831,19 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> void
-ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::plus_plus (void)
+ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::plus_plus ()
 {
   ++this->implementation_;
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> void
-ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::minus_minus (void)
+ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::minus_minus ()
 {
   --this->implementation_;
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR>
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::~ACE_Hash_Map_Manager_Ex_Adapter (void)
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::~ACE_Hash_Map_Manager_Ex_Adapter ()
 {
 }
 
@@ -856,7 +856,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> int
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::close (void)
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::close ()
 {
   return this->implementation_.close ();
 }
@@ -984,19 +984,19 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> size_t
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size (void) const
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size () const
 {
   return this->implementation_.current_size ();
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> size_t
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size (void) const
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size () const
 {
   return this->implementation_.total_size ();
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> void
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::dump (void) const
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->implementation_.dump ();
@@ -1004,7 +1004,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::begin_impl (void)
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::begin_impl ()
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1014,7 +1014,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::end_impl (void)
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::end_impl ()
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1024,7 +1024,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rbegin_impl (void)
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rbegin_impl ()
 {
   ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1034,7 +1034,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rend_impl (void)
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rend_impl ()
 {
   ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1044,12 +1044,12 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class T, class KEY, class VALUE>
-ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::~ACE_Map_Manager_Iterator_Adapter (void)
+ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::~ACE_Map_Manager_Iterator_Adapter ()
 {
 }
 
 template <class T, class KEY, class VALUE> ACE_Iterator_Impl<T> *
-ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::clone (void) const
+ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::clone () const
 {
   ACE_Iterator_Impl<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1078,24 +1078,24 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::dereference () const
 }
 
 template <class T, class KEY, class VALUE> void
-ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::plus_plus (void)
+ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::plus_plus ()
 {
   ++this->implementation_;
 }
 
 template <class T, class KEY, class VALUE> void
-ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::minus_minus (void)
+ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::minus_minus ()
 {
   --this->implementation_;
 }
 
 template <class T, class KEY, class VALUE>
-ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::~ACE_Map_Manager_Reverse_Iterator_Adapter (void)
+ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::~ACE_Map_Manager_Reverse_Iterator_Adapter ()
 {
 }
 
 template <class T, class KEY, class VALUE> ACE_Reverse_Iterator_Impl<T> *
-ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::clone (void) const
+ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::clone () const
 {
   ACE_Reverse_Iterator_Impl<T> *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1124,19 +1124,19 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::dereference () const
 }
 
 template <class T, class KEY, class VALUE> void
-ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::plus_plus (void)
+ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::plus_plus ()
 {
   ++this->implementation_;
 }
 
 template <class T, class KEY, class VALUE> void
-ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::minus_minus (void)
+ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::minus_minus ()
 {
   --this->implementation_;
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR>
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::~ACE_Map_Manager_Adapter (void)
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::~ACE_Map_Manager_Adapter ()
 {
 }
 
@@ -1149,7 +1149,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::open (size_t length,
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> int
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::close (void)
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::close ()
 {
   return this->implementation_.close ();
 }
@@ -1277,19 +1277,19 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::unbind (const KEY &key,
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> size_t
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size (void) const
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size () const
 {
   return this->implementation_.current_size ();
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> size_t
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size (void) const
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size () const
 {
   return this->implementation_.total_size ();
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> void
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::dump (void) const
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   this->implementation_.dump ();
@@ -1297,7 +1297,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::dump (void) const
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::begin_impl (void)
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::begin_impl ()
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1307,7 +1307,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::begin_impl (void)
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::end_impl (void)
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::end_impl ()
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1317,7 +1317,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::end_impl (void)
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rbegin_impl (void)
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rbegin_impl ()
 {
   ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -1327,7 +1327,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rbegin_impl (void)
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rend_impl (void)
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rend_impl ()
 {
   ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
   ACE_NEW_RETURN (temp,
diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h
index 3da8e4809d8..bb8938acaa3 100644
--- a/ACE/ace/Map_T.h
+++ b/ACE/ace/Map_T.h
@@ -56,13 +56,13 @@ class ACE_Incremental_Key_Generator
 public:
 
   /// Constructor.
-  ACE_Incremental_Key_Generator (void);
+  ACE_Incremental_Key_Generator ();
 
   /// Functor method: generates a new key.
   int operator () (T &t);
 
   /// Returns the current value.
-  const T& current_value (void) const;
+  const T& current_value () const;
 
 protected:
 
@@ -83,22 +83,22 @@ class ACE_Iterator_Impl
 public:
 
   /// Destructor.
-  virtual ~ACE_Iterator_Impl (void);
+  virtual ~ACE_Iterator_Impl ();
 
   /// Clone.
-  virtual ACE_Iterator_Impl<T> *clone (void) const = 0;
+  virtual ACE_Iterator_Impl<T> *clone () const = 0;
 
   /// Comparison.
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const = 0;
 
   /// Dereference.
-  virtual T dereference (void) const = 0;
+  virtual T dereference () const = 0;
 
   /// Advance.
-  virtual void plus_plus (void) = 0;
+  virtual void plus_plus () = 0;
 
   /// Reverse.
-  virtual void minus_minus (void) = 0;
+  virtual void minus_minus () = 0;
 };
 
 /**
@@ -114,22 +114,22 @@ class ACE_Reverse_Iterator_Impl
 public:
 
   /// Destructor.
-  virtual ~ACE_Reverse_Iterator_Impl (void);
+  virtual ~ACE_Reverse_Iterator_Impl ();
 
   /// Clone.
-  virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const = 0;
+  virtual ACE_Reverse_Iterator_Impl<T> *clone () const = 0;
 
   /// Comparison.
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const = 0;
 
   /// Dereference.
-  virtual T dereference (void) const = 0;
+  virtual T dereference () const = 0;
 
   /// Advance.
-  virtual void plus_plus (void) = 0;
+  virtual void plus_plus () = 0;
 
   /// Reverse.
-  virtual void minus_minus (void) = 0;
+  virtual void minus_minus () = 0;
 };
 
 /**
@@ -155,7 +155,7 @@ public:
   ACE_Iterator (const ACE_Iterator<T> &rhs);
 
   /// Destructor.
-  ~ACE_Iterator (void);
+  ~ACE_Iterator ();
 
   /// Assignment operator.
   ACE_Iterator<T> &operator= (const ACE_Iterator<T> &rhs);
@@ -168,19 +168,19 @@ public:
   T operator *() const;
 
   /// Prefix advance.
-  ACE_Iterator<T> &operator++ (void);
+  ACE_Iterator<T> &operator++ ();
 
   /// Postfix advance.
   ACE_Iterator<T> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Iterator<T> &operator-- (void);
+  ACE_Iterator<T> &operator-- ();
 
   /// Postfix reverse.
   ACE_Iterator<T> operator-- (int);
 
   /// Accessor to implementation object.
-  ACE_Iterator_Impl<T> &impl (void);
+  ACE_Iterator_Impl<T> &impl ();
 
 protected:
 
@@ -211,7 +211,7 @@ public:
   ACE_Reverse_Iterator (const ACE_Reverse_Iterator<T> &rhs);
 
   /// Destructor.
-  ~ACE_Reverse_Iterator (void);
+  ~ACE_Reverse_Iterator ();
 
   /// Assignment operator.
   ACE_Reverse_Iterator<T> &operator= (const ACE_Reverse_Iterator<T> &rhs);
@@ -230,19 +230,19 @@ public:
   T operator *() const;
 
   /// Prefix advance.
-  ACE_Reverse_Iterator<T> &operator++ (void);
+  ACE_Reverse_Iterator<T> &operator++ ();
 
   /// Postfix advance.
   ACE_Reverse_Iterator<T> operator++ (int);
 
   /// Prefix reverse.
-  ACE_Reverse_Iterator<T> &operator-- (void);
+  ACE_Reverse_Iterator<T> &operator-- ();
 
   /// Postfix reverse.
   ACE_Reverse_Iterator<T> operator-- (int);
 
   /// Accessor to implementation object.
-  ACE_Reverse_Iterator_Impl<T> &impl (void);
+  ACE_Reverse_Iterator_Impl<T> &impl ();
 
 protected:
 
@@ -279,14 +279,14 @@ public:
           reverse_iterator_implementation;
 
   /// Close down and release dynamically allocated resources.
-  virtual ~ACE_Map (void);
+  virtual ~ACE_Map ();
 
   /// Initialize a map with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0) = 0;
 
   /// Close down a <Map> and release dynamically allocated resources.
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /**
    * Add @a key / @a value pair to the map.  If @a key is already in the
@@ -404,36 +404,36 @@ public:
                       VALUE &value) = 0;
 
   /// Return the current size of the map.
-  virtual size_t current_size (void) const = 0;
+  virtual size_t current_size () const = 0;
 
   /// Return the total size of the map.
-  virtual size_t total_size (void) const = 0;
+  virtual size_t total_size () const = 0;
 
   /// Dump the state of an object.
-  virtual void dump (void) const = 0;
+  virtual void dump () const = 0;
 
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  iterator begin (void);
-  iterator end (void);
+  iterator begin ();
+  iterator end ();
 
   /// Return reverse iterator.
-  reverse_iterator rbegin (void);
-  reverse_iterator rend (void);
+  reverse_iterator rbegin ();
+  reverse_iterator rend ();
 
 protected:
 
   // = Protected no-op constructor.
-  ACE_Map (void);
+  ACE_Map ();
 
   /// Return forward iterator.
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void) = 0;
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void) = 0;
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl () = 0;
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl () = 0;
 
   /// Return reverse iterator.
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void) = 0;
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void) = 0;
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl () = 0;
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl () = 0;
 
 private:
 
@@ -462,25 +462,25 @@ public:
   ACE_Map_Impl_Iterator_Adapter (const IMPLEMENTATION &impl);
 
   /// Destructor.
-  virtual ~ACE_Map_Impl_Iterator_Adapter (void);
+  virtual ~ACE_Map_Impl_Iterator_Adapter ();
 
   /// Clone.
-  virtual ACE_Iterator_Impl<T> *clone (void) const;
+  virtual ACE_Iterator_Impl<T> *clone () const;
 
   /// Comparison.
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const;
 
   /// Dereference.
-  virtual T dereference (void) const;
+  virtual T dereference () const;
 
   /// Advance.
-  virtual void plus_plus (void);
+  virtual void plus_plus ();
 
   /// Reverse.
-  virtual void minus_minus (void);
+  virtual void minus_minus ();
 
   /// Accessor to implementation object.
-  IMPLEMENTATION &impl (void);
+  IMPLEMENTATION &impl ();
 
 protected:
 
@@ -508,25 +508,25 @@ public:
   ACE_Map_Impl_Reverse_Iterator_Adapter (const IMPLEMENTATION &impl);
 
   /// Destructor.
-  virtual ~ACE_Map_Impl_Reverse_Iterator_Adapter (void);
+  virtual ~ACE_Map_Impl_Reverse_Iterator_Adapter ();
 
   /// Clone.
-  virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const;
+  virtual ACE_Reverse_Iterator_Impl<T> *clone () const;
 
   /// Comparison.
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const;
 
   /// Dereference.
-  virtual T dereference (void) const;
+  virtual T dereference () const;
 
   /// Advance.
-  virtual void plus_plus (void);
+  virtual void plus_plus ();
 
   /// Reverse.
-  virtual void minus_minus (void);
+  virtual void minus_minus ();
 
   /// Accessor to implementation object.
-  IMPLEMENTATION &impl (void);
+  IMPLEMENTATION &impl ();
 
 protected:
 
@@ -563,14 +563,14 @@ public:
                 ACE_Allocator *alloc = 0);
 
   /// Close down and release dynamically allocated resources.
-  virtual ~ACE_Map_Impl (void);
+  virtual ~ACE_Map_Impl ();
 
   /// Initialize a <Map> with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0);
 
   /// Close down a <Map> and release dynamically allocated resources.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Add @a key / @a value pair to the map.  If @a key is already in the
@@ -688,16 +688,16 @@ public:
                       VALUE &value);
 
   /// Return the current size of the map.
-  virtual size_t current_size (void) const;
+  virtual size_t current_size () const;
 
   /// Return the total size of the map.
-  virtual size_t total_size (void) const;
+  virtual size_t total_size () const;
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Accessor to implementation object.
-  IMPLEMENTATION &impl (void);
+  IMPLEMENTATION &impl ();
 
 protected:
 
@@ -707,12 +707,12 @@ protected:
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void);
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void);
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl ();
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl ();
 
   /// Return reverse iterator.
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void);
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void);
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl ();
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl ();
 
 private:
 
@@ -741,25 +741,25 @@ public:
   ACE_Active_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl);
 
   /// Destructor.
-  virtual ~ACE_Active_Map_Manager_Iterator_Adapter (void);
+  virtual ~ACE_Active_Map_Manager_Iterator_Adapter ();
 
   /// Clone.
-  virtual ACE_Iterator_Impl<T> *clone (void) const;
+  virtual ACE_Iterator_Impl<T> *clone () const;
 
   /// Comparison.
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const;
 
   /// Dereference.
-  virtual T dereference (void) const;
+  virtual T dereference () const;
 
   /// Advance.
-  virtual void plus_plus (void);
+  virtual void plus_plus ();
 
   /// Reverse.
-  virtual void minus_minus (void);
+  virtual void minus_minus ();
 
   /// Accessor to implementation object.
-  ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (void);
+  ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl ();
 
 protected:
 
@@ -787,25 +787,25 @@ public:
   ACE_Active_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl);
 
   /// Destructor.
-  virtual ~ACE_Active_Map_Manager_Reverse_Iterator_Adapter (void);
+  virtual ~ACE_Active_Map_Manager_Reverse_Iterator_Adapter ();
 
   /// Clone.
-  virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const;
+  virtual ACE_Reverse_Iterator_Impl<T> *clone () const;
 
   /// Comparison.
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const;
 
   /// Dereference.
-  virtual T dereference (void) const;
+  virtual T dereference () const;
 
   /// Advance.
-  virtual void plus_plus (void);
+  virtual void plus_plus ();
 
   /// Reverse.
-  virtual void minus_minus (void);
+  virtual void minus_minus ();
 
   /// Accessor to implementation object.
-  ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (void);
+  ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl ();
 
 protected:
 
@@ -843,14 +843,14 @@ public:
                                   ACE_Allocator *alloc = 0);
 
   /// Close down and release dynamically allocated resources.
-  virtual ~ACE_Active_Map_Manager_Adapter (void);
+  virtual ~ACE_Active_Map_Manager_Adapter ();
 
   /// Initialize a Map with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0);
 
   /// Close down a Map and release dynamically allocated resources.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Add @a key / @a value pair to the map.  If @a key is already in the
@@ -967,19 +967,19 @@ public:
                       VALUE &value);
 
   /// Return the current size of the map.
-  virtual size_t current_size (void) const;
+  virtual size_t current_size () const;
 
   /// Return the total size of the map.
-  virtual size_t total_size (void) const;
+  virtual size_t total_size () const;
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Accessor to implementation object.
-  ACE_Active_Map_Manager<std::pair<KEY, VALUE> > &impl (void);
+  ACE_Active_Map_Manager<std::pair<KEY, VALUE> > &impl ();
 
   /// Accessor to key adapter.
-  KEY_ADAPTER &key_adapter (void);
+  KEY_ADAPTER &key_adapter ();
 
 protected:
 
@@ -1000,12 +1000,12 @@ protected:
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void);
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void);
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl ();
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl ();
 
   /// Return reverse iterator.
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void);
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void);
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl ();
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl ();
 
 private:
 
@@ -1034,25 +1034,25 @@ public:
   ACE_Hash_Map_Manager_Ex_Iterator_Adapter (const ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl);
 
   /// Destructor.
-  virtual ~ACE_Hash_Map_Manager_Ex_Iterator_Adapter (void);
+  virtual ~ACE_Hash_Map_Manager_Ex_Iterator_Adapter ();
 
   /// Clone.
-  virtual ACE_Iterator_Impl<T> *clone (void) const;
+  virtual ACE_Iterator_Impl<T> *clone () const;
 
   /// Comparison.
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const;
 
   /// Dereference.
-  virtual T dereference (void) const;
+  virtual T dereference () const;
 
   /// Advance.
-  virtual void plus_plus (void);
+  virtual void plus_plus ();
 
   /// Reverse.
-  virtual void minus_minus (void);
+  virtual void minus_minus ();
 
   /// Accessor to implementation object.
-  ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (void);
+  ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl ();
 
 protected:
 
@@ -1080,25 +1080,25 @@ public:
   ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (const ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl);
 
   /// Destructor.
-  virtual ~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (void);
+  virtual ~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter ();
 
   /// Clone.
-  virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const;
+  virtual ACE_Reverse_Iterator_Impl<T> *clone () const;
 
   /// Comparison.
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const;
 
   /// Dereference.
-  virtual T dereference (void) const;
+  virtual T dereference () const;
 
   /// Advance.
-  virtual void plus_plus (void);
+  virtual void plus_plus ();
 
   /// Reverse.
-  virtual void minus_minus (void);
+  virtual void minus_minus ();
 
   /// Accessor to implementation object.
-  ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (void);
+  ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl ();
 
 protected:
 
@@ -1134,14 +1134,14 @@ public:
                                    ACE_Allocator *alloc = 0);
 
   /// Close down and release dynamically allocated resources.
-  virtual ~ACE_Hash_Map_Manager_Ex_Adapter (void);
+  virtual ~ACE_Hash_Map_Manager_Ex_Adapter ();
 
   /// Initialize a Map with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0);
 
   /// Close down a Map and release dynamically allocated resources.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Add @a key / @a value pair to the map.  If @a key is already in the
@@ -1259,19 +1259,19 @@ public:
                       VALUE &value);
 
   /// Return the current size of the map.
-  virtual size_t current_size (void) const;
+  virtual size_t current_size () const;
 
   /// Return the total size of the map.
-  virtual size_t total_size (void) const;
+  virtual size_t total_size () const;
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Accessor to implementation object.
-  ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (void);
+  ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl ();
 
   /// Accessor to key generator.
-  KEY_GENERATOR &key_generator (void);
+  KEY_GENERATOR &key_generator ();
 
 protected:
 
@@ -1284,12 +1284,12 @@ protected:
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void);
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void);
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl ();
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl ();
 
   /// Return reverse iterator.
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void);
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void);
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl ();
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl ();
 
 private:
 
@@ -1318,25 +1318,25 @@ public:
   ACE_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl);
 
   /// Destructor.
-  virtual ~ACE_Map_Manager_Iterator_Adapter (void);
+  virtual ~ACE_Map_Manager_Iterator_Adapter ();
 
   /// Clone.
-  virtual ACE_Iterator_Impl<T> *clone (void) const;
+  virtual ACE_Iterator_Impl<T> *clone () const;
 
   /// Comparison.
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const;
 
   /// Dereference.
-  virtual T dereference (void) const;
+  virtual T dereference () const;
 
   /// Advance.
-  virtual void plus_plus (void);
+  virtual void plus_plus ();
 
   /// Reverse.
-  virtual void minus_minus (void);
+  virtual void minus_minus ();
 
   /// Accessor to implementation object.
-  ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl (void);
+  ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl ();
 
 protected:
 
@@ -1364,25 +1364,25 @@ public:
   ACE_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl);
 
   /// Destructor.
-  virtual ~ACE_Map_Manager_Reverse_Iterator_Adapter (void);
+  virtual ~ACE_Map_Manager_Reverse_Iterator_Adapter ();
 
   /// Clone.
-  virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const;
+  virtual ACE_Reverse_Iterator_Impl<T> *clone () const;
 
   /// Comparison.
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const;
 
   /// Dereference.
-  virtual T dereference (void) const;
+  virtual T dereference () const;
 
   /// Advance.
-  virtual void plus_plus (void);
+  virtual void plus_plus ();
 
   /// Reverse.
-  virtual void minus_minus (void);
+  virtual void minus_minus ();
 
   /// Accessor to implementation object.
-  ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl (void);
+  ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl ();
 
 protected:
 
@@ -1418,14 +1418,14 @@ public:
                            ACE_Allocator *alloc = 0);
 
   /// Close down and release dynamically allocated resources.
-  virtual ~ACE_Map_Manager_Adapter (void);
+  virtual ~ACE_Map_Manager_Adapter ();
 
   /// Initialize a <Map> with size @a length.
   virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE,
                     ACE_Allocator *alloc = 0);
 
   /// Close down a <Map> and release dynamically allocated resources.
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Add @a key / @a value pair to the map.  If @a key is already in the
@@ -1543,19 +1543,19 @@ public:
                       VALUE &value);
 
   /// Return the current size of the map.
-  virtual size_t current_size (void) const;
+  virtual size_t current_size () const;
 
   /// Return the total size of the map.
-  virtual size_t total_size (void) const;
+  virtual size_t total_size () const;
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Accessor to implementation object.
-  ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> &impl (void);
+  ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> &impl ();
 
   /// Accessor to key generator.
-  KEY_GENERATOR &key_generator (void);
+  KEY_GENERATOR &key_generator ();
 
 protected:
 
@@ -1568,12 +1568,12 @@ protected:
   // = STL styled iterator factory functions.
 
   /// Return forward iterator.
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void);
-  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void);
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl ();
+  virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl ();
 
   /// Return reverse iterator.
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void);
-  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void);
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl ();
+  virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl ();
 
 private:
 
diff --git a/ACE/ace/Map_T.inl b/ACE/ace/Map_T.inl
index 1e4ae9b8173..076819c4d2c 100644
--- a/ACE/ace/Map_T.inl
+++ b/ACE/ace/Map_T.inl
@@ -8,7 +8,7 @@ ACE_Noop_Key_Generator<T>::operator() (T &)
 }
 
 template <class T> ACE_INLINE
-ACE_Incremental_Key_Generator<T>::ACE_Incremental_Key_Generator (void)
+ACE_Incremental_Key_Generator<T>::ACE_Incremental_Key_Generator ()
   : t_ (0)
 {
 }
@@ -21,7 +21,7 @@ ACE_Incremental_Key_Generator<T>::operator() (T &t)
 }
 
 template <class T> ACE_INLINE const T &
-ACE_Incremental_Key_Generator<T>::current_value (void) const
+ACE_Incremental_Key_Generator<T>::current_value () const
 {
   return this->t_;
 }
@@ -39,7 +39,7 @@ ACE_Iterator<T>::ACE_Iterator (const ACE_Iterator<T> &rhs)
 }
 
 template <class T> ACE_INLINE
-ACE_Iterator<T>::~ACE_Iterator (void)
+ACE_Iterator<T>::~ACE_Iterator ()
 {
   delete this->implementation_;
 }
@@ -65,13 +65,13 @@ ACE_Iterator<T>::operator!= (const ACE_Iterator<T> &rhs) const
 }
 
 template <class T> ACE_INLINE T
-ACE_Iterator<T>::operator* (void) const
+ACE_Iterator<T>::operator* () const
 {
   return this->implementation_->dereference ();
 }
 
 template <class T> ACE_INLINE ACE_Iterator<T> &
-ACE_Iterator<T>::operator++ (void)
+ACE_Iterator<T>::operator++ ()
 {
   this->implementation_->plus_plus ();
   return *this;
@@ -86,7 +86,7 @@ ACE_Iterator<T>::operator++ (int)
 }
 
 template <class T> ACE_INLINE ACE_Iterator<T> &
-ACE_Iterator<T>::operator-- (void)
+ACE_Iterator<T>::operator-- ()
 {
   this->implementation_->minus_minus ();
   return *this;
@@ -101,7 +101,7 @@ ACE_Iterator<T>::operator-- (int)
 }
 
 template <class T> ACE_INLINE ACE_Iterator_Impl<T> &
-ACE_Iterator<T>::impl (void)
+ACE_Iterator<T>::impl ()
 {
   return *this->implementation_;
 }
@@ -119,7 +119,7 @@ ACE_Reverse_Iterator<T>::ACE_Reverse_Iterator (const ACE_Reverse_Iterator<T> &rh
 }
 
 template <class T> ACE_INLINE
-ACE_Reverse_Iterator<T>::~ACE_Reverse_Iterator (void)
+ACE_Reverse_Iterator<T>::~ACE_Reverse_Iterator ()
 {
   delete this->implementation_;
 }
@@ -145,13 +145,13 @@ ACE_Reverse_Iterator<T>::operator!= (const ACE_Reverse_Iterator<T> &rhs) const
 }
 
 template <class T> ACE_INLINE T
-ACE_Reverse_Iterator<T>::operator* (void) const
+ACE_Reverse_Iterator<T>::operator* () const
 {
   return this->implementation_->dereference ();
 }
 
 template <class T> ACE_INLINE ACE_Reverse_Iterator<T> &
-ACE_Reverse_Iterator<T>::operator++ (void)
+ACE_Reverse_Iterator<T>::operator++ ()
 {
   this->implementation_->plus_plus ();
   return *this;
@@ -166,7 +166,7 @@ ACE_Reverse_Iterator<T>::operator++ (int)
 }
 
 template <class T> ACE_INLINE ACE_Reverse_Iterator<T> &
-ACE_Reverse_Iterator<T>::operator-- (void)
+ACE_Reverse_Iterator<T>::operator-- ()
 {
   this->implementation_->minus_minus ();
   return *this;
@@ -181,36 +181,36 @@ ACE_Reverse_Iterator<T>::operator-- (int)
 }
 
 template <class T> ACE_INLINE ACE_Reverse_Iterator_Impl<T> &
-ACE_Reverse_Iterator<T>::impl (void)
+ACE_Reverse_Iterator<T>::impl ()
 {
   return *this->implementation_;
 }
 
 template <class KEY, class VALUE> ACE_INLINE
-ACE_Map<KEY, VALUE>::ACE_Map (void)
+ACE_Map<KEY, VALUE>::ACE_Map ()
 {
 }
 
 template <class KEY, class VALUE> ACE_INLINE ACE_Iterator<ACE_Reference_Pair<const KEY, VALUE> >
-ACE_Map<KEY, VALUE>::begin (void)
+ACE_Map<KEY, VALUE>::begin ()
 {
   return iterator (this->begin_impl ());
 }
 
 template <class KEY, class VALUE> ACE_INLINE ACE_Iterator<ACE_Reference_Pair<const KEY, VALUE> >
-ACE_Map<KEY, VALUE>::end (void)
+ACE_Map<KEY, VALUE>::end ()
 {
   return iterator (this->end_impl ());
 }
 
 template <class KEY, class VALUE> ACE_INLINE ACE_Reverse_Iterator<ACE_Reference_Pair<const KEY, VALUE> >
-ACE_Map<KEY, VALUE>::rbegin (void)
+ACE_Map<KEY, VALUE>::rbegin ()
 {
   return reverse_iterator (this->rbegin_impl ());
 }
 
 template <class KEY, class VALUE> ACE_INLINE ACE_Reverse_Iterator<ACE_Reference_Pair<const KEY, VALUE> >
-ACE_Map<KEY, VALUE>::rend (void)
+ACE_Map<KEY, VALUE>::rend ()
 {
   return reverse_iterator (this->rend_impl ());
 }
@@ -222,7 +222,7 @@ ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::ACE_Map_Impl_Iterator_A
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE IMPLEMENTATION &
-ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void)
+ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl ()
 {
   return this->implementation_;
 }
@@ -234,7 +234,7 @@ ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::ACE_Map_Impl_Re
 }
 
 template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE IMPLEMENTATION &
-ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void)
+ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl ()
 {
   return this->implementation_;
 }
@@ -254,7 +254,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ACE
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE IMPLEMENTATION &
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::impl (void)
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::impl ()
 {
   return this->implementation_;
 }
@@ -266,7 +266,7 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::ACE_Active_Map_Manager_Iterat
 }
 
 template <class T, class VALUE> ACE_INLINE ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &
-ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::impl (void)
+ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::impl ()
 {
   return this->implementation_;
 }
@@ -278,7 +278,7 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::ACE_Active_Map_Manage
 }
 
 template <class T, class VALUE> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &
-ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::impl (void)
+ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::impl ()
 {
   return this->implementation_;
 }
@@ -298,13 +298,13 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::ACE_Active_Map_Manager_
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE ACE_Active_Map_Manager<std::pair<KEY, VALUE> > &
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::impl (void)
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::impl ()
 {
   return this->implementation_;
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE KEY_ADAPTER &
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::key_adapter (void)
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::key_adapter ()
 {
   return this->key_adapter_;
 }
@@ -316,7 +316,7 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>:
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &
-ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::impl (void)
+ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::impl ()
 {
   return this->implementation_;
 }
@@ -328,7 +328,7 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &
-ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::impl (void)
+ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::impl ()
 {
   return this->implementation_;
 }
@@ -348,13 +348,13 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::impl (void)
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::impl ()
 {
   return this->implementation_;
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE KEY_GENERATOR &
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::key_generator (void)
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::key_generator ()
 {
   return this->key_generator_;
 }
@@ -366,7 +366,7 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::ACE_Map_Manager_Iterator_Adapte
 }
 
 template <class T, class KEY, class VALUE> ACE_INLINE ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &
-ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::impl (void)
+ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::impl ()
 {
   return this->implementation_;
 }
@@ -378,7 +378,7 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::ACE_Map_Manager_Reverse
 }
 
 template <class T, class KEY, class VALUE> ACE_INLINE ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &
-ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::impl (void)
+ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::impl ()
 {
   return this->implementation_;
 }
@@ -398,13 +398,13 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::ACE_Map_Manager_Adapter (siz
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> &
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::impl (void)
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::impl ()
 {
   return this->implementation_;
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE KEY_GENERATOR &
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::key_generator (void)
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::key_generator ()
 {
   return this->key_generator_;
 }
diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp
index e2e04c8df67..93a5b52b880 100644
--- a/ACE/ace/Mem_Map.cpp
+++ b/ACE/ace/Mem_Map.cpp
@@ -20,7 +20,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Mem_Map)
 
 void
-ACE_Mem_Map::dump (void) const
+ACE_Mem_Map::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Mem_Map::dump");
@@ -37,7 +37,7 @@ ACE_Mem_Map::dump (void) const
 }
 
 int
-ACE_Mem_Map::close (void)
+ACE_Mem_Map::close ()
 {
   ACE_TRACE ("ACE_Mem_Map::close");
 
@@ -46,7 +46,7 @@ ACE_Mem_Map::close (void)
   return this->close_handle ();
 }
 
-ACE_Mem_Map::~ACE_Mem_Map (void)
+ACE_Mem_Map::~ACE_Mem_Map ()
 {
   ACE_TRACE ("ACE_Mem_Map::~ACE_Mem_Map");
 
@@ -236,7 +236,7 @@ ACE_Mem_Map::map (const ACE_TCHAR *file_name,
                          sa);
 }
 
-ACE_Mem_Map::ACE_Mem_Map (void)
+ACE_Mem_Map::ACE_Mem_Map ()
   : base_addr_ (MAP_FAILED),
     length_ (0),
     handle_ (ACE_INVALID_HANDLE),
@@ -315,7 +315,7 @@ ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle,
 // Close down and remove the file from the file system.
 
 int
-ACE_Mem_Map::remove (void)
+ACE_Mem_Map::remove ()
 {
   ACE_TRACE ("ACE_Mem_Map::remove");
 
diff --git a/ACE/ace/Mem_Map.h b/ACE/ace/Mem_Map.h
index abdafb8e254..4ea7b55be55 100644
--- a/ACE/ace/Mem_Map.h
+++ b/ACE/ace/Mem_Map.h
@@ -93,7 +93,7 @@ public:
            LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Destructor.
-  ~ACE_Mem_Map (void);
+  ~ACE_Mem_Map ();
 
   /// Open the file without mapping it.
   int open (const ACE_TCHAR *filename,
@@ -102,28 +102,28 @@ public:
             LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Close down the <handle_> if necessary and unmap the mapping.
-  int close (void);
+  int close ();
 
   /// Close down the <handle_> if necessary.
-  int close_handle (void);
+  int close_handle ();
 
   /**
    * Close down the internal <file_mapping_> if necessary.  This is
    * mostly necessary on Win32, which has a different handle for
    * file-mapping kernel object.
    */
-  int close_filemapping_handle (void);
+  int close_filemapping_handle ();
 
   /// This operator passes back the starting address of the mapped
   /// file.
   int operator () (void *&addr);
 
   /// Return the base address.
-  void *addr (void) const;
+  void *addr () const;
 
   /// This function returns the number of bytes currently mapped in the
   /// file.
-  size_t size (void) const;
+  size_t size () const;
 
   /// Unmap the region starting at base_addr_.
   int unmap (ssize_t len = -1);
@@ -165,19 +165,19 @@ public:
   int protect (void *addr, size_t len, int prot = PROT_RDWR);
 
   /// Close and remove the file from the file system.
-  int remove (void);
+  int remove ();
 
   /// Hook into the underlying VM system.
   int advise (int behavior, int len = -1);
 
   /// Return the underlying <handle_>.
-  ACE_HANDLE handle (void) const;
+  ACE_HANDLE handle () const;
 
   /// Return the name of file that is mapped (if any).
-  const ACE_TCHAR *filename (void) const;
+  const ACE_TCHAR *filename () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -195,7 +195,6 @@ private:
               LPSECURITY_ATTRIBUTES sa = 0);
 
 private:
-
   /// Base address of the memory-mapped file.
   void *base_addr_;
 
@@ -214,7 +213,6 @@ private:
   /// Keeps track of whether we need to close the handle.  This is set
   /// if we opened the file.
   bool close_handle_;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp
index fca5f105a48..3c6e51350ca 100644
--- a/ACE/ace/Message_Block.cpp
+++ b/ACE/ace/Message_Block.cpp
@@ -121,7 +121,7 @@ ACE_Message_Block::copy (const char *buf)
 }
 
 int
-ACE_Message_Block::crunch (void)
+ACE_Message_Block::crunch ()
 {
   if (this->rd_ptr_ != 0)
     {
@@ -139,7 +139,7 @@ ACE_Message_Block::crunch (void)
 }
 
 void
-ACE_Data_Block::dump (void) const
+ACE_Data_Block::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Data_Block::dump");
@@ -167,7 +167,7 @@ ACE_Data_Block::dump (void) const
 }
 
 void
-ACE_Message_Block::dump (void) const
+ACE_Message_Block::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Block::dump");
@@ -193,7 +193,7 @@ ACE_Message_Block::dump (void) const
 }
 
 int
-ACE_Data_Block::reference_count (void) const
+ACE_Data_Block::reference_count () const
 {
   if (this->locking_strategy_)
     {
@@ -266,7 +266,7 @@ ACE_Message_Block::total_size_and_length (size_t &mb_size,
 }
 
 size_t
-ACE_Message_Block::total_size (void) const
+ACE_Message_Block::total_size () const
 {
   ACE_TRACE ("ACE_Message_Block::total_size");
 
@@ -280,7 +280,7 @@ ACE_Message_Block::total_size (void) const
 }
 
 size_t
-ACE_Message_Block::total_length (void) const
+ACE_Message_Block::total_length () const
 {
   ACE_TRACE ("ACE_Message_Block::total_length");
 
@@ -294,7 +294,7 @@ ACE_Message_Block::total_length (void) const
 }
 
 size_t
-ACE_Message_Block::total_capacity (void) const
+ACE_Message_Block::total_capacity () const
 {
   ACE_TRACE ("ACE_Message_Block::total_capacity");
 
@@ -308,7 +308,7 @@ ACE_Message_Block::total_capacity (void) const
   return size;
 }
 
-ACE_Data_Block::ACE_Data_Block (void)
+ACE_Data_Block::ACE_Data_Block ()
   : type_ (ACE_Message_Block::MB_DATA),
     cur_size_ (0),
     max_size_ (0),
@@ -751,7 +751,7 @@ ACE_Message_Block::init_i (size_t size,
   return 0;
 }
 
-ACE_Data_Block::~ACE_Data_Block (void)
+ACE_Data_Block::~ACE_Data_Block ()
 {
   // Sanity check...
   ACE_ASSERT (this->reference_count_ <= 1);
@@ -768,7 +768,7 @@ ACE_Data_Block::~ACE_Data_Block (void)
 }
 
 ACE_Data_Block *
-ACE_Data_Block::release_i (void)
+ACE_Data_Block::release_i ()
 {
   ACE_TRACE ("ACE_Data_Block::release_i");
 
@@ -851,7 +851,7 @@ ACE_Data_Block::release (ACE_Lock *lock)
 }
 
 ACE_Message_Block *
-ACE_Message_Block::release (void)
+ACE_Message_Block::release ()
 {
   ACE_TRACE ("ACE_Message_Block::release");
 
@@ -967,7 +967,7 @@ ACE_Message_Block::release (ACE_Message_Block *mb)
     return 0;
 }
 
-ACE_Message_Block::~ACE_Message_Block (void)
+ACE_Message_Block::~ACE_Message_Block ()
 {
   ACE_TRACE ("ACE_Message_Block::~ACE_Message_Block");
 
@@ -982,7 +982,7 @@ ACE_Message_Block::~ACE_Message_Block (void)
 }
 
 ACE_Data_Block *
-ACE_Data_Block::duplicate (void)
+ACE_Data_Block::duplicate ()
 {
   ACE_TRACE ("ACE_Data_Block::duplicate");
 
@@ -1009,7 +1009,7 @@ ACE_Data_Block::duplicate (void)
 #endif /* ACE_HAS_TIMED_MESSAGE_BLOCKS */
 
 ACE_Message_Block *
-ACE_Message_Block::duplicate (void) const
+ACE_Message_Block::duplicate () const
 {
   ACE_TRACE ("ACE_Message_Block::duplicate");
 
diff --git a/ACE/ace/Message_Block.h b/ACE/ace/Message_Block.h
index 1ad30dd0338..954071060f4 100644
--- a/ACE/ace/Message_Block.h
+++ b/ACE/ace/Message_Block.h
@@ -241,22 +241,22 @@ public:
    * @note Note that release() is designed to release the continuation
    * chain; the destructor is not. See release() for details.
    */
-  virtual ~ACE_Message_Block (void);
+  virtual ~ACE_Message_Block ();
 
   // = Message Type accessors and mutators.
 
   /// Get type of the message.
-  ACE_Message_Type msg_type (void) const;
+  ACE_Message_Type msg_type () const;
 
   /// Set type of the message.
   void msg_type (ACE_Message_Type type);
 
   /// Find out what type of message this is.
-  int is_data_msg (void) const;
+  int is_data_msg () const;
 
   /// Find out what class of message this is (there are two classes,
   /// @c normal messages and @c high-priority messages).
-  ACE_Message_Type msg_class (void) const;
+  ACE_Message_Type msg_class () const;
 
   // = Message flag accessors and mutators.
   /// Bitwise-or the @a more_flags into the existing message flags and
@@ -268,7 +268,7 @@ public:
   Message_Flags clr_flags (Message_Flags less_flags);
 
   /// Get the current message flags.
-  Message_Flags flags (void) const;
+  Message_Flags flags () const;
 
   // = Data Block flag accessors and mutators.
   /// Bitwise-or the @a more_flags into the existing message flags and
@@ -285,22 +285,22 @@ public:
   Message_Flags clr_self_flags (ACE_Message_Block::Message_Flags less_flags);
 
   /// Get the current message flags.
-  Message_Flags self_flags (void) const;
+  Message_Flags self_flags () const;
 
   /// Get priority of the message.
-  unsigned long msg_priority (void) const;
+  unsigned long msg_priority () const;
 
   /// Set priority of the message.
   void msg_priority (unsigned long priority);
 
   /// Get execution time associated with the message.
-  const ACE_Time_Value &msg_execution_time (void) const;
+  const ACE_Time_Value &msg_execution_time () const;
 
   /// Set execution time associated with the message.
   void msg_execution_time (const ACE_Time_Value &et);
 
   /// Get absolute time of deadline associated with the message.
-  const ACE_Time_Value &msg_deadline_time (void) const;
+  const ACE_Time_Value &msg_deadline_time () const;
 
   /// Set absolute time of deadline associated with the message.
   void msg_deadline_time (const ACE_Time_Value &dt);
@@ -312,7 +312,7 @@ public:
   virtual ACE_Message_Block *clone (Message_Flags mask = 0) const;
 
   /// Return a "shallow" copy that increments our reference count by 1.
-  virtual ACE_Message_Block *duplicate (void) const;
+  virtual ACE_Message_Block *duplicate () const;
 
   /**
    * Return a "shallow" copy that increments our reference count by 1.
@@ -349,7 +349,7 @@ public:
    * @retval 0, always, and the object this method was invoked on is no
    *            longer valid.
    */
-  virtual ACE_Message_Block *release (void);
+  virtual ACE_Message_Block *release ();
 
   /**
    * This behaves like the non-static method release(), except that it
@@ -395,11 +395,11 @@ public:
   /// then readjusts <rd_ptr> to point to <base> and <wr_ptr> to point
   /// to <base> + the length of the moved data.  Returns -1 and does
   /// nothing if the <rd_ptr> is > <wr_ptr>, else 0 on success.
-  int crunch (void);
+  int crunch ();
 
   /// Resets the Message Block data to contain nothing, i.e., sets the
   /// read and write pointers to align with the base.
-  void reset (void);
+  void reset ();
 
   /// Access all the allocators in the message block.
   /// @todo Not sure whether we would need finer control while
@@ -433,7 +433,7 @@ public:
                          ACE_Allocator *message_block_allocator = 0);
 
   /// Get message data.
-  char *base (void) const;
+  char *base () const;
 
   /// Set message data (doesn't reallocate).
   void base (char *data,
@@ -441,17 +441,17 @@ public:
              Message_Flags = DONT_DELETE);
 
   /// Return a pointer to 1 past the end of the allocated data in a message.
-  char *end (void) const;
+  char *end () const;
 
   /**
    * Return a pointer to 1 past the end of the allotted data in a message.
    * Allotted data may be less than allocated data  if a value smaller than
    * capacity() to is passed to size().
    */
-  char *mark (void) const;
+  char *mark () const;
 
   /// Get the read pointer.
-  char *rd_ptr (void) const;
+  char *rd_ptr () const;
 
   /// Set the read pointer to @a ptr.
   void rd_ptr (char *ptr);
@@ -460,7 +460,7 @@ public:
   void rd_ptr (size_t n);
 
   /// Get the write pointer.
-  char *wr_ptr (void) const;
+  char *wr_ptr () const;
 
   /// Set the write pointer to @a ptr.
   void wr_ptr (char *ptr);
@@ -478,18 +478,18 @@ public:
    */
   //@{
   /// Get the length of the message
-  size_t length (void) const;
+  size_t length () const;
 
   /// Set the length of the message
   void length (size_t n);
 
   /// Get the length of the Message_Blocks, including chained
   /// Message_Blocks.
-  size_t total_length (void) const;
+  size_t total_length () const;
 
   /// Get the total number of bytes in all Message_Blocks, including
   /// chained Message_Blocks.
-  size_t total_size (void) const;
+  size_t total_size () const;
 
   /// Get the total number of bytes and total length in all
   /// Message_Blocks, including chained Message_Blocks.
@@ -498,7 +498,7 @@ public:
 
   /// Get the number of bytes in the top-level Message_Block (i.e.,
   /// does not consider the bytes in chained Message_Blocks).
-  size_t size (void) const;
+  size_t size () const;
 
   /**
    * Set the number of bytes in the top-level Message_Block,
@@ -510,14 +510,14 @@ public:
 
   /// Get the number of allocated bytes in all Message_Block, including
   /// chained Message_Blocks.
-  size_t total_capacity (void) const;
+  size_t total_capacity () const;
 
   /// Get the number of allocated bytes in the top-level Message_Block.
-  size_t capacity (void) const;
+  size_t capacity () const;
 
   /// Get the number of bytes available after the <wr_ptr_> in the
   /// top-level Message_Block.
-  size_t space (void) const;
+  size_t space () const;
   //@}
 
   // = ACE_Data_Block methods.
@@ -527,7 +527,7 @@ public:
    * still references the block; this call does not change the reference
    * count.
    */
-  ACE_Data_Block *data_block (void) const;
+  ACE_Data_Block *data_block () const;
 
   /**
    * Set a new data block pointer. The original ACE_Data_Block is released
@@ -544,37 +544,37 @@ public:
 
   // = The continuation field chains together composite messages.
   /// Get the continuation field.
-  ACE_Message_Block *cont (void) const;
+  ACE_Message_Block *cont () const;
 
   /// Set the continuation field.
   void cont (ACE_Message_Block *);
 
   // = Pointer to the Message_Block directly ahead in the ACE_Message_Queue.
   /// Get link to next message.
-  ACE_Message_Block *next (void) const;
+  ACE_Message_Block *next () const;
 
   /// Set link to next message.
   void next (ACE_Message_Block *);
 
   // = Pointer to the Message_Block directly behind in the ACE_Message_Queue.
   /// Get link to prev message.
-  ACE_Message_Block *prev (void) const;
+  ACE_Message_Block *prev () const;
 
   /// Set link to prev message.
   void prev (ACE_Message_Block *);
 
   // = The locking strategy prevents race conditions.
   /// Get the locking strategy.
-  ACE_Lock *locking_strategy (void);
+  ACE_Lock *locking_strategy ();
 
   /// Set a new locking strategy and return the hold one.
   ACE_Lock *locking_strategy (ACE_Lock *);
 
   /// Get the current reference count.
-  int reference_count (void) const;
+  int reference_count () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -675,7 +675,7 @@ class ACE_Export ACE_Data_Block
 {
 public:
   /// Default "do-nothing" constructor.
-  ACE_Data_Block (void);
+  ACE_Data_Block ();
 
   /// Initialize.
   ACE_Data_Block (size_t size,
@@ -687,16 +687,16 @@ public:
                   ACE_Allocator *data_block_allocator);
 
   /// Delete all the resources held in the message.
-  virtual ~ACE_Data_Block (void);
+  virtual ~ACE_Data_Block ();
 
   /// Get type of the message.
-  ACE_Message_Block::ACE_Message_Type msg_type (void) const;
+  ACE_Message_Block::ACE_Message_Type msg_type () const;
 
   /// Set type of the message.
   void msg_type (ACE_Message_Block::ACE_Message_Type type);
 
   /// Get message data pointer
-  char *base (void) const;
+  char *base () const;
 
   /// Set message data pointer (doesn't reallocate).
   void base (char *data,
@@ -704,27 +704,27 @@ public:
              ACE_Message_Block::Message_Flags mflags = ACE_Message_Block::DONT_DELETE);
 
   /// Return a pointer to 1 past the end of the allocated data in a message.
-  char *end (void) const;
+  char *end () const;
 
   /**
    * Return a pointer to 1 past the end of the allotted data in a message.
    * The allotted data may be less than allocated data if <size()> is passed
    * an argument less than <capacity()>.
    */
-  char *mark (void) const;
+  char *mark () const;
 
   // = Message size is the total amount of space allocated.
 
   /// Get the total amount of allotted space in the message.  The amount of
   /// allotted space may be less than allocated space.
-  size_t size (void) const;
+  size_t size () const;
 
   /// Set the total amount of space in the message.  Returns 0 if
   /// successful, else -1.
   int size (size_t length);
 
   /// Get the total amount of allocated space.
-  size_t capacity (void) const;
+  size_t capacity () const;
 
   /**
    * Return an exact "deep copy" of the message, i.e., create fresh
@@ -747,7 +747,7 @@ public:
                                         size_t max_size = 0) const;
 
   /// Return a "shallow" copy that increments our reference count by 1.
-  ACE_Data_Block *duplicate (void);
+  ACE_Data_Block *duplicate ();
 
   /**
    * Decrease the shared reference count by 1.  If the reference count
@@ -767,33 +767,33 @@ public:
   ACE_Message_Block::Message_Flags clr_flags (ACE_Message_Block::Message_Flags less_flags);
 
   /// Get the current message flags.
-  ACE_Message_Block::Message_Flags flags (void) const;
+  ACE_Message_Block::Message_Flags flags () const;
 
   /// Obtain the allocator strategy.
-  ACE_Allocator *allocator_strategy (void) const;
+  ACE_Allocator *allocator_strategy () const;
 
   // = The locking strategy prevents race conditions.
   /// Get the locking strategy.
-  ACE_Lock *locking_strategy (void);
+  ACE_Lock *locking_strategy ();
 
   /// Set a new locking strategy and return the hold one.
   ACE_Lock *locking_strategy (ACE_Lock *);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Get the current reference count.
-  int reference_count (void) const;
+  int reference_count () const;
 
   /// Get the allocator used to create this object
-  ACE_Allocator *data_block_allocator (void) const;
+  ACE_Allocator *data_block_allocator () const;
 
 protected:
   /// Internal release implementation
-  virtual ACE_Data_Block *release_i (void);
+  virtual ACE_Data_Block *release_i ();
 
   /// Internal get the current reference count.
-  int reference_count_i (void) const;
+  int reference_count_i () const;
 
   /**
    * Decrease the reference count, but don't delete the object.
diff --git a/ACE/ace/Message_Block.inl b/ACE/ace/Message_Block.inl
index 1bc636fbd7a..f6d69e9cf01 100644
--- a/ACE/ace/Message_Block.inl
+++ b/ACE/ace/Message_Block.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Data_Block *
-ACE_Message_Block::data_block (void) const
+ACE_Message_Block::data_block () const
 {
   ACE_TRACE ("ACE_Message_Block::data_block");
   return this->data_block_;
@@ -27,40 +27,40 @@ ACE_Message_Block::clr_self_flags (ACE_Message_Block::Message_Flags less_flags)
 }
 
 ACE_INLINE ACE_Message_Block::Message_Flags
-ACE_Message_Block::self_flags (void) const
+ACE_Message_Block::self_flags () const
 {
   ACE_TRACE ("ACE_Message_Block::self_flags");
   return this->flags_;
 }
 
 ACE_INLINE int
-ACE_Data_Block::reference_count_i (void) const
+ACE_Data_Block::reference_count_i () const
 {
   return reference_count_;
 }
 
 ACE_INLINE int
-ACE_Message_Block::reference_count (void) const
+ACE_Message_Block::reference_count () const
 {
   return data_block () ? data_block ()->reference_count () : 0;
 }
 
 ACE_INLINE char *
-ACE_Data_Block::base (void) const
+ACE_Data_Block::base () const
 {
   ACE_TRACE ("ACE_Data_Block::base");
   return this->base_;
 }
 
 ACE_INLINE size_t
-ACE_Data_Block::size (void) const
+ACE_Data_Block::size () const
 {
   ACE_TRACE ("ACE_Data_Block::size");
   return this->cur_size_;
 }
 
 ACE_INLINE size_t
-ACE_Data_Block::capacity (void) const
+ACE_Data_Block::capacity () const
 {
   ACE_TRACE ("ACE_Data_Block::capacity");
   return this->max_size_;
@@ -85,14 +85,14 @@ ACE_Data_Block::clr_flags (ACE_Message_Block::Message_Flags less_flags)
 }
 
 ACE_INLINE ACE_Message_Block::Message_Flags
-ACE_Data_Block::flags (void) const
+ACE_Data_Block::flags () const
 {
   ACE_TRACE ("ACE_Data_Block::flags");
    return this->flags_;
 }
 
 ACE_INLINE ACE_Allocator*
-ACE_Data_Block::data_block_allocator (void) const
+ACE_Data_Block::data_block_allocator () const
 {
   ACE_TRACE ("ACE_Data_Block::data_block_allocator");
   return this->data_block_allocator_;
@@ -113,7 +113,7 @@ ACE_Message_Block::clr_flags (ACE_Message_Block::Message_Flags less_flags)
 }
 
 ACE_INLINE ACE_Message_Block::Message_Flags
-ACE_Message_Block::flags (void) const
+ACE_Message_Block::flags () const
 {
   ACE_TRACE ("ACE_Message_Block::flags");
    return this->data_block ()->flags ();
@@ -122,7 +122,7 @@ ACE_Message_Block::flags (void) const
 // Return the length of the "active" portion of the message.
 
 ACE_INLINE size_t
-ACE_Message_Block::length (void) const
+ACE_Message_Block::length () const
 {
   ACE_TRACE ("ACE_Message_Block::length");
   return this->wr_ptr_ - this->rd_ptr_;
@@ -141,21 +141,21 @@ ACE_Message_Block::length (size_t len)
 // Return the length of the potential size of the message.
 
 ACE_INLINE size_t
-ACE_Message_Block::size (void) const
+ACE_Message_Block::size () const
 {
   ACE_TRACE ("ACE_Message_Block::size");
   return this->data_block ()->size ();
 }
 
 ACE_INLINE size_t
-ACE_Message_Block::capacity (void) const
+ACE_Message_Block::capacity () const
 {
   ACE_TRACE ("ACE_Message_Block::capacity");
   return this->data_block ()->capacity ();
 }
 
 ACE_INLINE ACE_Message_Block::ACE_Message_Type
-ACE_Data_Block::msg_type (void) const
+ACE_Data_Block::msg_type () const
 {
   ACE_TRACE ("ACE_Data_Block::msg_type");
   return this->type_;
@@ -169,7 +169,7 @@ ACE_Data_Block::msg_type (ACE_Message_Block::ACE_Message_Type t)
 }
 
 ACE_INLINE ACE_Message_Block::ACE_Message_Type
-ACE_Message_Block::msg_type (void) const
+ACE_Message_Block::msg_type () const
 {
   ACE_TRACE ("ACE_Message_Block::msg_type");
   return this->data_block ()->msg_type ();
@@ -183,7 +183,7 @@ ACE_Message_Block::msg_type (ACE_Message_Block::ACE_Message_Type t)
 }
 
 ACE_INLINE ACE_Message_Block::ACE_Message_Type
-ACE_Message_Block::msg_class (void) const
+ACE_Message_Block::msg_class () const
 {
   ACE_TRACE ("ACE_Message_Block::msg_class");
 
@@ -196,7 +196,7 @@ ACE_Message_Block::msg_class (void) const
 }
 
 ACE_INLINE int
-ACE_Message_Block::is_data_msg (void) const
+ACE_Message_Block::is_data_msg () const
 {
   ACE_TRACE ("ACE_Message_Block::is_data_msg");
   ACE_Message_Type mt = this->msg_type ();
@@ -207,7 +207,7 @@ ACE_Message_Block::is_data_msg (void) const
 }
 
 ACE_INLINE unsigned long
-ACE_Message_Block::msg_priority (void) const
+ACE_Message_Block::msg_priority () const
 {
   ACE_TRACE ("ACE_Message_Block::msg_priority");
   return this->priority_;
@@ -221,7 +221,7 @@ ACE_Message_Block::msg_priority (unsigned long pri)
 }
 
 ACE_INLINE const ACE_Time_Value &
-ACE_Message_Block::msg_execution_time (void) const
+ACE_Message_Block::msg_execution_time () const
 {
   ACE_TRACE ("ACE_Message_Block::msg_execution_time (void)");
 #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS)
@@ -243,7 +243,7 @@ ACE_Message_Block::msg_execution_time (const ACE_Time_Value &et)
 }
 
 ACE_INLINE const ACE_Time_Value &
-ACE_Message_Block::msg_deadline_time (void) const
+ACE_Message_Block::msg_deadline_time () const
 {
   ACE_TRACE ("ACE_Message_Block::msg_deadline_time (void)");
 
@@ -279,7 +279,7 @@ ACE_Message_Block::access_allocators (ACE_Allocator *& allocator_strategy,
 }
 
 ACE_INLINE char *
-ACE_Message_Block::base (void) const
+ACE_Message_Block::base () const
 {
   ACE_TRACE ("ACE_Message_Block::base");
   return this->data_block ()->base ();
@@ -297,7 +297,7 @@ ACE_Message_Block::base (char *msg_data,
 }
 
 ACE_INLINE char *
-ACE_Message_Block::rd_ptr (void) const
+ACE_Message_Block::rd_ptr () const
 {
   ACE_TRACE ("ACE_Message_Block::rd_ptr");
   return this->base () + this->rd_ptr_;
@@ -313,28 +313,28 @@ ACE_Message_Block::wr_ptr (char *new_ptr)
 // Return a pointer to 1 past the end of the data buffer.
 
 ACE_INLINE char *
-ACE_Data_Block::mark (void) const
+ACE_Data_Block::mark () const
 {
   ACE_TRACE ("ACE_Data_Block::mark");
   return this->base_ + this->cur_size_;
 }
 
 ACE_INLINE char *
-ACE_Message_Block::mark (void) const
+ACE_Message_Block::mark () const
 {
   ACE_TRACE ("ACE_Message_Block::mark");
   return this->data_block ()->mark ();
 }
 
 ACE_INLINE char *
-ACE_Data_Block::end (void) const
+ACE_Data_Block::end () const
 {
   ACE_TRACE ("ACE_Data_Block::end");
   return this->base_ + this->max_size_;
 }
 
 ACE_INLINE char *
-ACE_Message_Block::end (void) const
+ACE_Message_Block::end () const
 {
   ACE_TRACE ("ACE_Message_Block::end");
   return this->data_block ()->end ();
@@ -356,7 +356,7 @@ ACE_Message_Block::rd_ptr (size_t n)
 }
 
 ACE_INLINE char *
-ACE_Message_Block::wr_ptr (void) const
+ACE_Message_Block::wr_ptr () const
 {
   ACE_TRACE ("ACE_Message_Block::wr_ptr");
   return this->base () + this->wr_ptr_;
@@ -370,7 +370,7 @@ ACE_Message_Block::wr_ptr (size_t n)
 }
 
 ACE_INLINE void
-ACE_Message_Block::reset (void)
+ACE_Message_Block::reset ()
 {
   ACE_TRACE ("ACE_Message_Block::reset");
   this->rd_ptr_ = 0;
@@ -378,7 +378,7 @@ ACE_Message_Block::reset (void)
 }
 
 ACE_INLINE size_t
-ACE_Message_Block::space (void) const
+ACE_Message_Block::space () const
 {
   ACE_TRACE ("ACE_Message_Block::space");
   return this->mark () - this->wr_ptr ();
@@ -410,7 +410,7 @@ ACE_Message_Block::cont (ACE_Message_Block *cont_msg)
 }
 
 ACE_INLINE ACE_Message_Block *
-ACE_Message_Block::cont (void) const
+ACE_Message_Block::cont () const
 {
   ACE_TRACE ("ACE_Message_Block::cont");
   return this->cont_;
@@ -442,7 +442,7 @@ ACE_Message_Block::next (ACE_Message_Block *next_msg)
 }
 
 ACE_INLINE ACE_Message_Block *
-ACE_Message_Block::next (void) const
+ACE_Message_Block::next () const
 {
   ACE_TRACE ("ACE_Message_Block::next");
   return this->next_;
@@ -456,21 +456,21 @@ ACE_Message_Block::prev (ACE_Message_Block *next_msg)
 }
 
 ACE_INLINE ACE_Message_Block *
-ACE_Message_Block::prev (void) const
+ACE_Message_Block::prev () const
 {
   ACE_TRACE ("ACE_Message_Block::prev");
   return this->prev_;
 }
 
 ACE_INLINE ACE_Allocator *
-ACE_Data_Block::allocator_strategy (void) const
+ACE_Data_Block::allocator_strategy () const
 {
   ACE_TRACE ("ACE_Data_Block::allocator_strategy");
   return this->allocator_strategy_;
 }
 
 ACE_INLINE ACE_Lock *
-ACE_Data_Block::locking_strategy (void)
+ACE_Data_Block::locking_strategy ()
 {
   ACE_TRACE ("ACE_Data_Block::locking_strategy");
   return this->locking_strategy_;
@@ -487,7 +487,7 @@ ACE_Data_Block::locking_strategy (ACE_Lock *nls)
 }
 
 ACE_INLINE ACE_Lock *
-ACE_Message_Block::locking_strategy (void)
+ACE_Message_Block::locking_strategy ()
 {
   ACE_TRACE ("ACE_Message_Block::locking_strategy");
   return this->data_block ()->locking_strategy ();
diff --git a/ACE/ace/Message_Block_T.cpp b/ACE/ace/Message_Block_T.cpp
index e4161efed1c..57a9923a257 100644
--- a/ACE/ace/Message_Block_T.cpp
+++ b/ACE/ace/Message_Block_T.cpp
@@ -12,7 +12,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class L>
-ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block (void)
+ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block ()
 {
 }
 
diff --git a/ACE/ace/Message_Block_T.h b/ACE/ace/Message_Block_T.h
index eebb9408192..d2e854d82cd 100644
--- a/ACE/ace/Message_Block_T.h
+++ b/ACE/ace/Message_Block_T.h
@@ -37,7 +37,7 @@ class ACE_Locked_Data_Block : public ACE_Data_Block
 {
 public:
   /// Default "do-nothing" constructor.
-  ACE_Locked_Data_Block (void);
+  ACE_Locked_Data_Block ();
 
   /// Initialize.
   ACE_Locked_Data_Block (size_t size,
@@ -48,7 +48,7 @@ public:
                          ACE_Allocator *data_block_allocator);
 
   /// Delete all the resources held in the message.
-  virtual ~ACE_Locked_Data_Block (void);
+  virtual ~ACE_Locked_Data_Block ();
 
   /**
    * Return an exact "deep copy" of the message, the dynamic type is
diff --git a/ACE/ace/Message_Block_T.inl b/ACE/ace/Message_Block_T.inl
index cdc1b73872f..af729e9f450 100644
--- a/ACE/ace/Message_Block_T.inl
+++ b/ACE/ace/Message_Block_T.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class ACE_LOCK> ACE_INLINE
-ACE_Locked_Data_Block<ACE_LOCK>::ACE_Locked_Data_Block (void)
+ACE_Locked_Data_Block<ACE_LOCK>::ACE_Locked_Data_Block ()
 {
   this->locking_strategy_ = &this->lock_;
 }
diff --git a/ACE/ace/Message_Queue.cpp b/ACE/ace/Message_Queue.cpp
index dc359532551..32f25eff813 100644
--- a/ACE/ace/Message_Queue.cpp
+++ b/ACE/ace/Message_Queue.cpp
@@ -7,12 +7,12 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Message_Queue_Base::~ACE_Message_Queue_Base (void)
+ACE_Message_Queue_Base::~ACE_Message_Queue_Base ()
 {
 }
 
 int
-ACE_Message_Queue_Base::state (void)
+ACE_Message_Queue_Base::state ()
 {
   ACE_TRACE ("ACE_Message_Queue_Base::state");
 
diff --git a/ACE/ace/Message_Queue.h b/ACE/ace/Message_Queue.h
index a88763997d0..3b0a88fe230 100644
--- a/ACE/ace/Message_Queue.h
+++ b/ACE/ace/Message_Queue.h
@@ -73,13 +73,13 @@ public:
 
   };
 
-  ACE_Message_Queue_Base (void);
+  ACE_Message_Queue_Base ();
 
   /// Close down the message queue and release all resources.
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /// Close down the message queue and release all resources.
-  virtual ~ACE_Message_Queue_Base (void);
+  virtual ~ACE_Message_Queue_Base ();
 
   // = Enqueue and dequeue methods.
 
@@ -125,23 +125,23 @@ public:
 
   // = Check if queue is full/empty.
   /// True if queue is full, else false.
-  virtual bool is_full (void) = 0;
+  virtual bool is_full () = 0;
 
   /// True if queue is empty, else false.
-  virtual bool is_empty (void) = 0;
+  virtual bool is_empty () = 0;
 
   // = Queue statistic methods.
 
   /// Number of total bytes on the queue, i.e., sum of the message
   /// block sizes.
-  virtual size_t message_bytes (void) = 0;
+  virtual size_t message_bytes () = 0;
 
   /// Number of total length on the queue, i.e., sum of the message
   /// block lengths.
-  virtual size_t message_length (void) = 0;
+  virtual size_t message_length () = 0;
 
   /// Number of total messages on the queue.
-  virtual size_t message_count (void) = 0;
+  virtual size_t message_count () = 0;
 
   /// New value of the number of total bytes on the queue, i.e.,
   /// sum of the message block sizes.
@@ -162,7 +162,7 @@ public:
    *
    * @retval  The queue's state before this call.
    */
-  virtual int deactivate (void) = 0;
+  virtual int deactivate () = 0;
 
   /**
    * Reactivate the queue so that threads can enqueue and dequeue
@@ -170,7 +170,7 @@ public:
    *
    * @retval  The queue's state before this call.
    */
-  virtual int activate (void) = 0;
+  virtual int activate () = 0;
 
   /**
    * Pulse the queue to wake up any waiting threads.  Changes the
@@ -179,17 +179,17 @@ public:
    *
    * @retval  The queue's state before this call.
    */
-  virtual int pulse (void) = 0;
+  virtual int pulse () = 0;
 
   /// Returns the current state of the queue.
-  virtual int state (void);
+  virtual int state ();
 
   /// Returns 1 if the state of the queue is DEACTIVATED,
   /// and 0 if the queue's state is ACTIVATED or PULSED.
-  virtual int deactivated (void) = 0;
+  virtual int deactivated () = 0;
 
   /// Get the notification strategy for the Message_Queue
-  virtual ACE_Notification_Strategy *notification_strategy (void) = 0;
+  virtual ACE_Notification_Strategy *notification_strategy () = 0;
 
   /// Set the notification strategy for the Message_Queue
   virtual void notification_strategy (ACE_Notification_Strategy *s) = 0;
@@ -197,7 +197,7 @@ public:
   // = Notification hook.
 
   /// Dump the state of an object.
-  virtual void dump (void) const = 0;
+  virtual void dump () const = 0;
 
 private:
   // = Disallow copying and assignment.
diff --git a/ACE/ace/Message_Queue.inl b/ACE/ace/Message_Queue.inl
index 31f420e4c20..4df5d6404dc 100644
--- a/ACE/ace/Message_Queue.inl
+++ b/ACE/ace/Message_Queue.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Message_Queue_Base::ACE_Message_Queue_Base (void)
+ACE_Message_Queue_Base::ACE_Message_Queue_Base ()
 {
 }
 
diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h
index 9cf0520033a..6fea82734a4 100644
--- a/ACE/ace/Message_Queue_NT.h
+++ b/ACE/ace/Message_Queue_NT.h
@@ -173,7 +173,7 @@ public:
   // = Notification hook.
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Get the handle to the underlying completion port.
   virtual ACE_HANDLE completion_port (void);
@@ -182,10 +182,10 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
-  // Disallow copying and assignment.
-  ACE_Message_Queue_NT (const ACE_Message_Queue_NT &);
-  void operator= (const ACE_Message_Queue_NT &);
+  ACE_Message_Queue_NT (const ACE_Message_Queue_NT &) = delete;
+  void operator= (const ACE_Message_Queue_NT &) = delete;
+  ACE_Message_Queue_NT (ACE_Message_Queue_NT &&) = delete;
+  void operator= (ACE_Message_Queue_NT &&) = delete;
 
 private:
   // = Internal states.
diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp
index ef07d294d2f..81e352d781a 100644
--- a/ACE/ace/Message_Queue_T.cpp
+++ b/ACE/ace/Message_Queue_T.cpp
@@ -34,7 +34,7 @@ ACE_ALLOC_HOOK_DEFINE_Tcyc(ACE_Message_Queue_Ex)
 ACE_ALLOC_HOOK_DEFINE_Tcyc(ACE_Message_Queue_Ex_N)
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump");
@@ -72,7 +72,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex");
 }
@@ -90,7 +90,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::open (size_t
 // Clean up the queue if we have not already done so!
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::close (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::close ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::close");
 
@@ -98,7 +98,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::close (void)
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush");
 
@@ -106,7 +106,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush (void)
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush_i (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush_i ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush_i");
 
@@ -335,7 +335,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dequeue_dead
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notify (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notify ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notify");
 
@@ -364,19 +364,19 @@ next (ACE_MESSAGE_TYPE *&entry)
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::done (void) const
+ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::done () const
 {
   return this->iter_.done ();
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::advance (void)
+ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::advance ()
 {
   return this->iter_.advance ();
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
   this->iter_.dump ();
 }
@@ -405,19 +405,19 @@ next (ACE_MESSAGE_TYPE *&entry)
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::done (void) const
+ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::done () const
 {
   return this->iter_.done ();
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::advance (void)
+ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::advance ()
 {
   return this->iter_.advance ();
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
   this->iter_.dump ();
 }
@@ -437,7 +437,7 @@ ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Messag
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex_N (void)
+ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex_N ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex_N");
 }
@@ -542,7 +542,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dequeue (ACE
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> ACE_Notification_Strategy *
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notification_strategy (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notification_strategy ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notification_strategy");
 
@@ -560,7 +560,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notification
 // Check if queue is empty (holds locks).
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> bool
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_empty (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_empty ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_empty");
 
@@ -570,7 +570,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_empty (vo
 // Check if queue is full (holds locks).
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> bool
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_full (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_full ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_full");
 
@@ -578,7 +578,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_full (voi
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::high_water_mark (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::high_water_mark ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::high_water_mark");
 
@@ -594,7 +594,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::high_water_m
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::low_water_mark (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::low_water_mark ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::low_water_mark");
 
@@ -610,7 +610,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::low_water_ma
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_bytes (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_bytes ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_bytes");
 
@@ -618,7 +618,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_byte
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_length (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_length ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_length");
 
@@ -626,7 +626,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_leng
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_count (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_count ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_count");
 
@@ -634,7 +634,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_coun
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivate (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivate ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivate");
 
@@ -642,7 +642,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivate (
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::activate (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::activate ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::activate");
 
@@ -650,7 +650,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::activate (vo
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::pulse (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::pulse ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::pulse");
 
@@ -658,7 +658,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::pulse (void)
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivated (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivated ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivated");
 
@@ -666,7 +666,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivated
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::state (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::state ()
 {
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::state");
 
@@ -674,7 +674,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::state (void)
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> ACE_SYNCH_MUTEX_T &
-ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::lock (void)
+ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::lock ()
 {
   return this->queue_.lock ();
 }
@@ -695,8 +695,8 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::set_time_pol
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
 ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue_Iterator (ACE_Message_Queue <ACE_SYNCH_USE, TIME_POLICY> &q)
-  : queue_ (q),
-    curr_ (q.head_)
+  : queue_ (q)
+  , curr_ (q.head_)
 {
 }
 
@@ -715,7 +715,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::next (ACE_Message_Block
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) const
+ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done () const
 {
   ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
 
@@ -723,7 +723,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) const
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance (void)
+ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance ()
 {
   ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
 
@@ -733,7 +733,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 #endif /* ACE_HAS_DUMP */
@@ -743,8 +743,8 @@ ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Message_Queue_Iterator)
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
 ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue_Reverse_Iterator (ACE_Message_Queue <ACE_SYNCH_USE, TIME_POLICY> &q)
-  : queue_ (q),
-    curr_ (queue_.tail_)
+  : queue_ (q)
+  , curr_ (queue_.tail_)
 {
 }
 
@@ -763,7 +763,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::next (ACE_Messag
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) const
+ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done () const
 {
   ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
 
@@ -771,7 +771,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) cons
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance (void)
+ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance ()
 {
   ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
 
@@ -781,7 +781,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 #endif /* ACE_HAS_DUMP */
@@ -796,7 +796,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue (ACE_Message_Block *&firs
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_Notification_Strategy *
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notification_strategy (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notification_strategy ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notification_strategy");
 
@@ -814,7 +814,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notification_strategy (ACE_Notifi
 // Check if queue is empty (does not hold locks).
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> bool
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty_i (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty_i ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty_i");
   return this->tail_ == 0;
@@ -823,7 +823,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty_i (void)
 // Check if queue is full (does not hold locks).
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> bool
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full_i (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full_i ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full_i");
   return this->cur_bytes_ >= this->high_water_mark_;
@@ -832,7 +832,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full_i (void)
 // Check if queue is empty (holds locks).
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> bool
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, false);
@@ -843,7 +843,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty (void)
 // Check if queue is full (holds locks).
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> bool
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, false);
@@ -852,7 +852,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::high_water_mark (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::high_water_mark ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::high_water_mark");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
@@ -870,7 +870,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::high_water_mark (size_t hwm)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::low_water_mark (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::low_water_mark ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::low_water_mark");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
@@ -888,7 +888,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::low_water_mark (size_t lwm)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_bytes (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_bytes ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_bytes");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
@@ -897,7 +897,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_bytes (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_length (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_length ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_length");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
@@ -906,7 +906,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_length (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> size_t
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_count (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_count ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_count");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
@@ -924,7 +924,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivate ()
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
@@ -942,7 +942,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::pulse ()
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivated (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivated ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivated");
 
@@ -950,7 +950,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivated (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::state (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::state ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::state");
 
@@ -958,14 +958,14 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::state (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_SYNCH_MUTEX_T &
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::lock (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::lock ()
 {
   return this->lock_;
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
 ACE_Time_Value_T<TIME_POLICY>
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday (void) const
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday () const
 {
   return this->time_policy_ ();
 }
@@ -978,7 +978,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::set_time_policy (TIME_POLICY cons
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump");
@@ -1081,7 +1081,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue (size_t hwm,
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue");
   if (this->head_ != 0 && this->close () == -1)
@@ -1095,7 +1095,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush_i (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush_i ()
 {
   int number_flushed = 0;
 
@@ -1180,7 +1180,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivate_i (int pulse)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate_i (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate_i ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate_i");
   int const previous_state = this->state_;
@@ -1189,7 +1189,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate_i (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
@@ -1201,7 +1201,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush (void)
 // Clean up the queue if we have not already done so!
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::close (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::close ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::close");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
@@ -1215,7 +1215,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::close (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_enqueue_waiters (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_enqueue_waiters ()
 {
   if (this->not_full_cond_.signal () != 0)
     return -1;
@@ -1223,7 +1223,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_enqueue_waiters (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_dequeue_waiters (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_dequeue_waiters ()
 {
   // Tell any blocked threads that the queue has a new item!
   if (this->not_empty_cond_.signal () != 0)
@@ -2041,7 +2041,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_deadline (ACE_Message_Blo
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notify (void)
+ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notify ()
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notify");
 
@@ -2074,7 +2074,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Dynamic_Message_Queue
 // dtor: free message strategy and let base class dtor do the rest.
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Dynamic_Message_Queue (void)
+ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Dynamic_Message_Queue ()
 {
   delete &this->message_strategy_;
 }
@@ -2260,7 +2260,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head (ACE_Message
 // of the queue.
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump");
diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h
index b1cad73845c..6bc74f3e191 100644
--- a/ACE/ace/Message_Queue_T.h
+++ b/ACE/ace/Message_Queue_T.h
@@ -112,10 +112,10 @@ public:
   /// @sa flush().
   ///
   /// @retval The number of messages released from the queue; -1 on error.
-  virtual int close (void);
+  virtual int close ();
 
   /// Releases all resources from the message queue and marks it deactivated.
-  virtual ~ACE_Message_Queue (void);
+  virtual ~ACE_Message_Queue ();
 
   /**
    * Releases all resources from the message queue but does not mark it
@@ -124,7 +124,7 @@ public:
    *
    * @return The number of messages flushed; -1 on error.
    */
-  virtual int flush (void);
+  virtual int flush ();
 
   /**
    * Release all resources from the message queue but do not mark it
@@ -135,7 +135,7 @@ public:
    *
    * @return The number of messages flushed.
    */
-  virtual int flush_i (void);
+  virtual int flush_i ();
 
   /** @name Enqueue and dequeue methods
    *
@@ -355,26 +355,26 @@ public:
   //@{
 
   /// True if queue is full, else false.
-  virtual bool is_full (void);
+  virtual bool is_full ();
   /// True if queue is empty, else false.
-  virtual bool is_empty (void);
+  virtual bool is_empty ();
 
   /**
    * Number of total bytes on the queue, i.e., sum of the message
    * block sizes.
    */
-  virtual size_t message_bytes (void);
+  virtual size_t message_bytes ();
 
   /**
    * Number of total length on the queue, i.e., sum of the message
    * block lengths.
    */
-  virtual size_t message_length (void);
+  virtual size_t message_length ();
 
   /**
    * Number of total messages on the queue.
    */
-  virtual size_t message_count (void);
+  virtual size_t message_count ();
 
   // = Manual changes to these stats (used when queued message blocks
   // change size or lengths).
@@ -399,7 +399,7 @@ public:
   /**
    * Get high watermark.
    */
-  virtual size_t high_water_mark (void);
+  virtual size_t high_water_mark ();
   /**
    * Set the high watermark, which determines how many bytes can be
    * stored in a queue before it's considered "full."
@@ -409,7 +409,7 @@ public:
   /**
    * Get low watermark.
    */
-  virtual size_t low_water_mark (void);
+  virtual size_t low_water_mark ();
   /**
    * Set the low watermark, which determines how many bytes must be in
    * the queue before supplier threads are allowed to enqueue
@@ -433,13 +433,13 @@ public:
    * ESHUTDOWN.  Returns WAS_INACTIVE if queue was inactive before the
    * call and WAS_ACTIVE if queue was active before the call.
    */
-  virtual int deactivate (void);
+  virtual int deactivate ();
 
   /**
    * Reactivate the queue so that threads can enqueue and dequeue
    * messages again.  Returns the state of the queue before the call.
    */
-  virtual int activate (void);
+  virtual int activate ();
 
   /**
    * Pulse the queue to wake up any waiting threads.  Changes the
@@ -448,15 +448,15 @@ public:
    *
    * @return The queue's state before this call.
    */
-  virtual int pulse (void);
+  virtual int pulse ();
 
   /// Returns the current state of the queue, which can be one of
   /// ACTIVATED, DEACTIVATED, or PULSED.
-  virtual int state (void);
+  virtual int state ();
 
   /// Returns true if the state of the queue is <DEACTIVATED>,
   /// but false if the queue's is <ACTIVATED> or <PULSED>.
-  virtual int deactivated (void);
+  virtual int deactivated ();
   //@}
 
   /** @name Notification strategy methods
@@ -473,28 +473,28 @@ public:
    * guarantee that the queue will be still be non-empty by the time
    * the notification occurs.
    */
-  virtual int notify (void);
+  virtual int notify ();
 
   /// Get the notification strategy for the <Message_Queue>
-  virtual ACE_Notification_Strategy *notification_strategy (void);
+  virtual ACE_Notification_Strategy *notification_strategy ();
 
   /// Set the notification strategy for the <Message_Queue>
   virtual void notification_strategy (ACE_Notification_Strategy *s);
   //@}
 
   /// Returns a reference to the lock used by the ACE_Message_Queue.
-  virtual ACE_SYNCH_MUTEX_T &lock (void);
+  virtual ACE_SYNCH_MUTEX_T &lock ();
 
   /// Get the current time of day according to the queue's TIME_POLICY.
   /// Allows users to initialize timeout values using correct time policy.
-  ACE_Time_Value_T<TIME_POLICY> gettimeofday (void) const;
+  ACE_Time_Value_T<TIME_POLICY> gettimeofday () const;
 
   /// Allows applications to control how the timer queue gets the time
   /// of day.
   void set_time_policy (TIME_POLICY const & time_policy);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -537,10 +537,10 @@ protected:
   // = Check the boundary conditions (assumes locks are held).
 
   /// True if queue is full, else false.
-  virtual bool is_full_i (void);
+  virtual bool is_full_i ();
 
   /// True if queue is empty, else false.
-  virtual bool is_empty_i (void);
+  virtual bool is_empty_i ();
 
   // = Implementation of the public <activate> and <deactivate> methods.
 
@@ -563,7 +563,7 @@ protected:
   virtual int deactivate_i (int pulse = 0);
 
   /// Activate the queue.
-  virtual int activate_i (void);
+  virtual int activate_i ();
 
   // = Helper methods to factor out common #ifdef code.
 
@@ -574,10 +574,10 @@ protected:
   virtual int wait_not_empty_cond (ACE_Time_Value *timeout);
 
   /// Inform any threads waiting to enqueue that they can procede.
-  virtual int signal_enqueue_waiters (void);
+  virtual int signal_enqueue_waiters ();
 
   /// Inform any threads waiting to dequeue that they can procede.
-  virtual int signal_dequeue_waiters (void);
+  virtual int signal_dequeue_waiters ();
 
   /// Pointer to head of ACE_Message_Block list.
   ACE_Message_Block *head_;
@@ -657,14 +657,14 @@ public:
   int next (ACE_Message_Block *&entry);
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Move forward by one element in the queue.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -673,6 +673,7 @@ private:
   /// Message_Queue we are iterating over.
   ACE_Message_Queue <ACE_SYNCH_USE, TIME_POLICY> &queue_;
 
+protected:
   /// Keeps track of how far we've advanced...
   ACE_Message_Block *curr_;
 };
@@ -694,14 +695,14 @@ public:
   int next (ACE_Message_Block *&entry);
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Move forward by one element in the queue.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -710,6 +711,7 @@ private:
   /// Message_Queue we are iterating over.
   ACE_Message_Queue <ACE_SYNCH_USE, TIME_POLICY> &queue_;
 
+protected:
   /// Keeps track of how far we've advanced...
   ACE_Message_Block *curr_;
 };
@@ -791,7 +793,7 @@ public:
                              ACE_Notification_Strategy * = 0);
 
   /// Close down the message queue and release all resources.
-  virtual ~ACE_Dynamic_Message_Queue (void);
+  virtual ~ACE_Dynamic_Message_Queue ();
 
   /**
    * Detach all messages with status given in the passed flags from
@@ -815,7 +817,7 @@ public:
                             ACE_Time_Value *timeout = 0);
 
   /// Dump the state of the queue.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /**
    * Just call priority enqueue method: tail enqueue semantics for dynamic
@@ -1053,10 +1055,10 @@ public:
   /// @sa flush().
   ///
   /// @retval The number of messages released from the queue; -1 on error.
-  virtual int close (void);
+  virtual int close ();
 
   /// Releases all resources from the message queue and marks it deactivated.
-  virtual ~ACE_Message_Queue_Ex (void);
+  virtual ~ACE_Message_Queue_Ex ();
 
   /**
    * Releases all resources from the message queue but does not mark it
@@ -1065,7 +1067,7 @@ public:
    *
    * @return The number of messages flushed; -1 on error.
    */
-  virtual int flush (void);
+  virtual int flush ();
 
   /**
    * Release all resources from the message queue but do not mark it
@@ -1076,7 +1078,7 @@ public:
    *
    * @return The number of messages flushed.
    */
-  virtual int flush_i (void);
+  virtual int flush_i ();
 
   /** @name Enqueue and dequeue methods
    *
@@ -1256,25 +1258,25 @@ public:
   //@{
 
   /// True if queue is full, else false.
-  virtual bool is_full (void);
+  virtual bool is_full ();
 
   /// True if queue is empty, else false.
-  virtual bool is_empty (void);
+  virtual bool is_empty ();
 
   /**
    * Number of total bytes on the queue, i.e., sum of the message
    * block sizes.
    */
-  virtual size_t message_bytes (void);
+  virtual size_t message_bytes ();
   /**
    * Number of total length on the queue, i.e., sum of the message
    * block lengths.
    */
-  virtual size_t message_length (void);
+  virtual size_t message_length ();
   /**
    * Number of total messages on the queue.
    */
-  virtual size_t message_count (void);
+  virtual size_t message_count ();
 
   // = Manual changes to these stats (used when queued message blocks
   // change size or lengths).
@@ -1298,7 +1300,7 @@ public:
   /**
    * Get high watermark.
    */
-  virtual size_t high_water_mark (void);
+  virtual size_t high_water_mark ();
   /**
    * Set the high watermark, which determines how many bytes can be
    * stored in a queue before it's considered "full."
@@ -1308,7 +1310,7 @@ public:
   /**
    * Get low watermark.
    */
-  virtual size_t low_water_mark (void);
+  virtual size_t low_water_mark ();
   /**
    * Set the low watermark, which determines how many bytes must be in
    * the queue before supplier threads are allowed to enqueue
@@ -1332,13 +1334,13 @@ public:
    * ESHUTDOWN.  Returns WAS_INACTIVE if queue was inactive before the
    * call and WAS_ACTIVE if queue was active before the call.
    */
-  virtual int deactivate (void);
+  virtual int deactivate ();
 
   /**
    * Reactivate the queue so that threads can enqueue and dequeue
    * messages again.  Returns the state of the queue before the call.
    */
-  virtual int activate (void);
+  virtual int activate ();
 
   /**
    * Pulse the queue to wake up any waiting threads.  Changes the
@@ -1347,15 +1349,15 @@ public:
    *
    * @retval  The queue's state before this call.
    */
-  virtual int pulse (void);
+  virtual int pulse ();
 
   /// Returns the current state of the queue, which can be one of
   /// ACTIVATED, DEACTIVATED, or PULSED.
-  virtual int state (void);
+  virtual int state ();
 
   /// Returns true if the state of the queue is DEACTIVATED,
   /// but false if the queue's state is ACTIVATED or PULSED.
-  virtual int deactivated (void);
+  virtual int deactivated ();
   //@}
 
   /** @name Notification strategy methods
@@ -1372,17 +1374,17 @@ public:
    * guarantee that the queue will be still be non-empty by the time
    * the notification occurs.
    */
-  virtual int notify (void);
+  virtual int notify ();
 
   /// Get the notification strategy for the <Message_Queue>
-  virtual ACE_Notification_Strategy *notification_strategy (void);
+  virtual ACE_Notification_Strategy *notification_strategy ();
 
   /// Set the notification strategy for the <Message_Queue>
   virtual void notification_strategy (ACE_Notification_Strategy *s);
   //@}
 
   /// Returns a reference to the lock used by the ACE_Message_Queue_Ex.
-  virtual ACE_SYNCH_MUTEX_T &lock (void);
+  virtual ACE_SYNCH_MUTEX_T &lock ();
 
   /// Get the current time of day according to the queue's TIME_POLICY.
   /// Allows users to initialize timeout
@@ -1393,7 +1395,7 @@ public:
   void set_time_policy (TIME_POLICY const & time_policy);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1420,14 +1422,14 @@ public:
   int next (ACE_MESSAGE_TYPE *&entry);
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Move forward by one element in the queue.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1454,14 +1456,14 @@ public:
   int next (ACE_MESSAGE_TYPE *&entry);
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Move forward by one element in the queue.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1512,7 +1514,7 @@ public:
                           ACE_Notification_Strategy * ns = 0);
 
   /// Close down the message queue and release all resources.
-  virtual ~ACE_Message_Queue_Ex_N (void);
+  virtual ~ACE_Message_Queue_Ex_N ();
 
   /**
    * Enqueue one or more @c ACE_MESSAGE_TYPE objects at the head of the queue.
diff --git a/ACE/ace/Message_Queue_Vx.h b/ACE/ace/Message_Queue_Vx.h
index 2ff5a390650..527801a53bb 100644
--- a/ACE/ace/Message_Queue_Vx.h
+++ b/ACE/ace/Message_Queue_Vx.h
@@ -128,7 +128,7 @@ public:
   // = Activation control methods.
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -190,10 +190,10 @@ protected:
   MSG_Q_ID msgq (void);
 
 private:
-
-  // Disallow copying and assignment.
-  ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &);
-  void operator= (const ACE_Message_Queue_Vx &);
+  ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &) = delete;
+  void operator= (const ACE_Message_Queue_Vx &) = delete;
+  ACE_Message_Queue_Vx (ACE_Message_Queue_Vx &&) = delete;
+  void operator= (ACE_Message_Queue_Vx &&) = delete;
 
   virtual int peek_dequeue_head (ACE_Message_Block *&first_item,
                                  ACE_Time_Value *tv = 0);
diff --git a/ACE/ace/Method_Request.cpp b/ACE/ace/Method_Request.cpp
index f48d395cba2..161ff174d13 100644
--- a/ACE/ace/Method_Request.cpp
+++ b/ACE/ace/Method_Request.cpp
@@ -7,12 +7,12 @@ ACE_Method_Request::ACE_Method_Request (unsigned long prio)
 {
 }
 
-ACE_Method_Request::~ACE_Method_Request (void)
+ACE_Method_Request::~ACE_Method_Request ()
 {
 }
 
 unsigned long
-ACE_Method_Request::priority (void) const
+ACE_Method_Request::priority () const
 {
   return this->priority_;
 }
diff --git a/ACE/ace/Method_Request.h b/ACE/ace/Method_Request.h
index c742dcd92e7..2b59488e9e7 100644
--- a/ACE/ace/Method_Request.h
+++ b/ACE/ace/Method_Request.h
@@ -79,10 +79,10 @@ public:
   virtual int call (void) = 0;
 
 private:
-
-  /// Disallow copying and assignment.
-  ACE_Method_Request (const ACE_Method_Request &);
-  void operator= (const ACE_Method_Request &);
+  ACE_Method_Request (const ACE_Method_Request &) = delete;
+  void operator= (const ACE_Method_Request &) = delete;
+  ACE_Method_Request (ACE_Method_Request &&) = delete;
+  void operator= (ACE_Method_Request &&) = delete;
 
 protected:
   /// The priority of the request.
diff --git a/ACE/ace/Module.cpp b/ACE/ace/Module.cpp
index 17602386045..8136364dcb6 100644
--- a/ACE/ace/Module.cpp
+++ b/ACE/ace/Module.cpp
@@ -22,7 +22,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Module)
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::dump");
@@ -159,7 +159,7 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::sibling (ACE_Task<ACE_SYNCH_USE, TIME_PO
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module (void)
+ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module ()
   : next_ (0)
   , arg_ (0)
   , flags_ (M_FLAGS_NOT_SET)
@@ -172,7 +172,7 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module (void)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Module (void)
+ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Module ()
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Module");
 
diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h
index 40d61918595..dfe9afead4f 100644
--- a/ACE/ace/Module.h
+++ b/ACE/ace/Module.h
@@ -77,10 +77,10 @@ class ACE_Module : public ACE_Module_Base
 {
 public:
   /// Create an empty Module.
-  ACE_Module (void);
+  ACE_Module ();
 
   /// Shutdown the Module.
-  virtual ~ACE_Module (void);
+  virtual ~ACE_Module ();
 
   /// Create an initialized module with @a module_name as its identity
   /// and @a reader and @a writer as its tasks.
@@ -114,7 +114,7 @@ public:
 
   // = ACE_Task manipulation routines
   /// Get the writer task.
-  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *writer (void);
+  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *writer ();
 
   /**
    * Set the writer task. @a flags can be used to indicate that the
@@ -126,7 +126,7 @@ public:
   void writer (ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *q, int flags = M_DELETE_WRITER);
 
   /// Get the reader task.
-  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *reader (void);
+  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *reader ();
 
   /**
    * Set the reader task. @a flags can be used to indicate that the
@@ -142,14 +142,14 @@ public:
 
   // = Identify the module
   /// Get the module name.
-  const ACE_TCHAR *name (void) const;
+  const ACE_TCHAR *name () const;
 
   /// Set the module name.
   void name (const ACE_TCHAR *);
 
   // = Argument to the Tasks.
   /// Get the argument passed to the tasks.
-  void *arg (void) const;
+  void *arg () const;
 
   /// Set the argument passed to the tasks.
   void arg (void *);
@@ -158,13 +158,13 @@ public:
   void link (ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *m);
 
   /// Get the next pointer to the module above in the stream.
-  ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *next (void);
+  ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *next ();
 
   /// Set the next pointer to the module above in the stream.
-  void next (ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *m);
+  virtual void next (ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *m);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Module.inl b/ACE/ace/Module.inl
index 43f9dba762c..8c34f087a85 100644
--- a/ACE/ace/Module.inl
+++ b/ACE/ace/Module.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE void *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg (void) const
+ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg () const
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg");
   return this->arg_;
@@ -18,7 +18,7 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg (void *a)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE const ACE_TCHAR *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name (void) const
+ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name () const
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name");
   return this->name_;
@@ -32,21 +32,21 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name (const ACE_TCHAR *n)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::writer (void)
+ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::writer ()
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::writer");
   return this->q_pair_[1];
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::reader (void)
+ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::reader ()
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::reader");
   return this->q_pair_[0];
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next (void)
+ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next ()
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next");
   return this->next_;
diff --git a/ACE/ace/Monitor_Admin.cpp b/ACE/ace/Monitor_Admin.cpp
index 78e82e75df4..d739c88fbe2 100644
--- a/ACE/ace/Monitor_Admin.cpp
+++ b/ACE/ace/Monitor_Admin.cpp
@@ -25,12 +25,12 @@ namespace ACE
 
     //====================================================================
 
-    Monitor_Admin::Monitor_Admin (void)
+    Monitor_Admin::Monitor_Admin ()
       : reactor_ (ACE_Reactor::instance ()),
         default_reactor_ (true)
     {}
 
-    Monitor_Admin::~Monitor_Admin (void)
+    Monitor_Admin::~Monitor_Admin ()
     {
       if (this->default_reactor_)
         {
@@ -98,7 +98,7 @@ namespace ACE
     }
 
     ACE_Reactor*
-    Monitor_Admin::reactor (void) const
+    Monitor_Admin::reactor () const
     {
       return this->reactor_;
     }
diff --git a/ACE/ace/Monitor_Admin_Manager.cpp b/ACE/ace/Monitor_Admin_Manager.cpp
index b4a363f1d38..86bb54817ec 100644
--- a/ACE/ace/Monitor_Admin_Manager.cpp
+++ b/ACE/ace/Monitor_Admin_Manager.cpp
@@ -11,13 +11,13 @@ namespace ACE
   namespace Monitor_Control
   {
     Monitor_Admin&
-    Monitor_Admin_Manager::admin (void)
+    Monitor_Admin_Manager::admin ()
     {
       return this->admin_;
     }
 
     int
-    Monitor_Admin_Manager::Initializer (void)
+    Monitor_Admin_Manager::Initializer ()
     {
       return
         ACE_Service_Config::process_directive (ace_svc_desc_MC_ADMINMANAGER);
diff --git a/ACE/ace/Monitor_Base.cpp b/ACE/ace/Monitor_Base.cpp
index c152ece18c9..ce445ae9d7b 100644
--- a/ACE/ace/Monitor_Base.cpp
+++ b/ACE/ace/Monitor_Base.cpp
@@ -28,7 +28,7 @@ namespace ACE
     {
     }
 
-    Monitor_Base::~Monitor_Base (void)
+    Monitor_Base::~Monitor_Base ()
     {
       ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_);
 
@@ -46,7 +46,7 @@ namespace ACE
     }
 
     void
-    Monitor_Base::update (void)
+    Monitor_Base::update ()
     {
       /// Overridden in derived classes.
     }
@@ -190,7 +190,7 @@ namespace ACE
     }
 
     void
-    Monitor_Base::clear (void)
+    Monitor_Base::clear ()
     {
       ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_);
 
@@ -221,7 +221,7 @@ namespace ACE
     }
 
     void
-    Monitor_Base::remove_from_registry (void)
+    Monitor_Base::remove_from_registry ()
     {
       if (!Monitor_Point_Registry::instance ()->remove (this->name ()))
         {
@@ -238,7 +238,7 @@ namespace ACE
     }
 
     double
-    Monitor_Base::average (void) const
+    Monitor_Base::average () const
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_COUNTER
           || this->data_.type_ == Monitor_Control_Types::MC_GROUP
@@ -258,7 +258,7 @@ namespace ACE
     }
 
     double
-    Monitor_Base::sum_of_squares (void) const
+    Monitor_Base::sum_of_squares () const
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_COUNTER
           || this->data_.type_ == Monitor_Control_Types::MC_GROUP
@@ -277,7 +277,7 @@ namespace ACE
     }
 
     size_t
-    Monitor_Base::count (void) const
+    Monitor_Base::count () const
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_GROUP)
         {
@@ -295,7 +295,7 @@ namespace ACE
     }
 
     double
-    Monitor_Base::minimum_sample (void) const
+    Monitor_Base::minimum_sample () const
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_GROUP
           || this->data_.type_ == Monitor_Control_Types::MC_LIST)
@@ -313,7 +313,7 @@ namespace ACE
     }
 
     double
-    Monitor_Base::maximum_sample (void) const
+    Monitor_Base::maximum_sample () const
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_GROUP
           || this->data_.type_ == Monitor_Control_Types::MC_LIST)
@@ -331,7 +331,7 @@ namespace ACE
     }
 
     double
-    Monitor_Base::last_sample (void) const
+    Monitor_Base::last_sample () const
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_GROUP
           || this->data_.type_ == Monitor_Control_Types::MC_LIST)
@@ -349,7 +349,7 @@ namespace ACE
     }
 
     Monitor_Control_Types::NameList
-    Monitor_Base::get_list (void) const
+    Monitor_Base::get_list () const
     {
       Monitor_Control_Types::NameList retval;
 
@@ -374,7 +374,7 @@ namespace ACE
     }
 
     void
-    Monitor_Base::clear_i (void)
+    Monitor_Base::clear_i ()
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_LIST)
         {
diff --git a/ACE/ace/Monitor_Base.h b/ACE/ace/Monitor_Base.h
index 769418e25d6..c327755e956 100644
--- a/ACE/ace/Monitor_Base.h
+++ b/ACE/ace/Monitor_Base.h
@@ -51,11 +51,11 @@ namespace ACE
 
       Monitor_Base (const char* name,
                     Monitor_Control_Types::Information_Type type);
-      virtual ~Monitor_Base (void);
+      virtual ~Monitor_Base ();
 
       /// Implemented by the most-derived class. Does the actual
       /// work of fetching the monitored value.
-      virtual void update (void);
+      virtual void update ();
 
       /// Updates the monitor's data if it is a numeric floating point.
       virtual void receive (double data);
@@ -75,10 +75,10 @@ namespace ACE
       Control_Action* remove_constraint (const long constraint_id);
 
       /// Get all constraints
-      CONSTRAINTS& constraints (void);
+      CONSTRAINTS& constraints ();
 
       /// Reset function.
-      virtual void clear (void);
+      virtual void clear ();
 
       /// Data accessors.
       void retrieve (Monitor_Control_Types::Data& data) const;
@@ -88,42 +88,42 @@ namespace ACE
 
       void add_to_registry (
         const ACE_Time_Value& time = ACE_Time_Value::zero);
-      void remove_from_registry (void);
+      void remove_from_registry ();
 
-      const char* name (void) const;
+      const char* name () const;
       void name (const char* new_name);
 
-      void add_ref (void);
-      void remove_ref (void);
+      void add_ref ();
+      void remove_ref ();
 
       /// Calculate the average of the accumulated samples.
-      double average (void) const;
+      double average () const;
 
       /// Calculate the sum of the squares of the samples.
-      double sum_of_squares (void) const;
+      double sum_of_squares () const;
 
       /// Returns the number of samples
-      size_t count (void) const;
+      size_t count () const;
 
       /// Returns the minimum sample value
-      double minimum_sample (void) const;
+      double minimum_sample () const;
 
       /// Returns the maximum sample value
-      double maximum_sample (void) const;
+      double maximum_sample () const;
 
       /// Returns the most recent sample value
-      double last_sample (void) const;
+      double last_sample () const;
 
       /// Return the type of this statistic
-      Monitor_Control_Types::Information_Type type (void) const;
+      Monitor_Control_Types::Information_Type type () const;
 
       /// Return the list or error msg if wrong type.
-      Monitor_Control_Types::NameList get_list (void) const;
+      Monitor_Control_Types::NameList get_list () const;
 
     protected:
       /// Overridden in some monitors (for example the OS monitors) where
       /// clearing requires monitor-specific actions.
-      virtual void clear_i (void);
+      virtual void clear_i ();
 
     protected:
       Monitor_Control_Types::Data data_;
diff --git a/ACE/ace/Monitor_Base.inl b/ACE/ace/Monitor_Base.inl
index 53248c3db83..f5dc8338696 100644
--- a/ACE/ace/Monitor_Base.inl
+++ b/ACE/ace/Monitor_Base.inl
@@ -6,7 +6,7 @@ namespace ACE
   {
     ACE_INLINE
     const char*
-    Monitor_Base::name (void) const
+    Monitor_Base::name () const
     {
       return this->name_.c_str ();
     }
@@ -20,21 +20,21 @@ namespace ACE
 
     ACE_INLINE
     Monitor_Base::CONSTRAINTS&
-    Monitor_Base::constraints (void)
+    Monitor_Base::constraints ()
     {
       return this->constraints_;
     }
 
     ACE_INLINE
     void
-    Monitor_Base::add_ref (void)
+    Monitor_Base::add_ref ()
     {
       (void) this->increment ();
     }
 
     ACE_INLINE
     void
-    Monitor_Base::remove_ref (void)
+    Monitor_Base::remove_ref ()
     {
       long const new_count = this->decrement ();
 
@@ -46,7 +46,7 @@ namespace ACE
 
     ACE_INLINE
     Monitor_Control_Types::Information_Type
-    Monitor_Base::type (void) const
+    Monitor_Base::type () const
     {
       return this->data_.type_;
     }
diff --git a/ACE/ace/Monitor_Control_Action.cpp b/ACE/ace/Monitor_Control_Action.cpp
index 63416dde183..1eb9c1324ea 100644
--- a/ACE/ace/Monitor_Control_Action.cpp
+++ b/ACE/ace/Monitor_Control_Action.cpp
@@ -10,21 +10,21 @@ namespace ACE
 {
   namespace Monitor_Control
   {
-    Control_Action::Control_Action (void)
+    Control_Action::Control_Action ()
       : ACE_Refcountable_T<ACE_SYNCH_MUTEX> (1)
     {}
 
-    Control_Action::~Control_Action (void)
+    Control_Action::~Control_Action ()
     {}
 
     void
-    Control_Action::add_ref (void)
+    Control_Action::add_ref ()
     {
       (void) this->increment ();
     }
 
     void
-    Control_Action::remove_ref (void)
+    Control_Action::remove_ref ()
     {
       const long new_count = this->decrement ();
 
diff --git a/ACE/ace/Monitor_Control_Types.cpp b/ACE/ace/Monitor_Control_Types.cpp
index 786ca4c8a93..f5679829841 100644
--- a/ACE/ace/Monitor_Control_Types.cpp
+++ b/ACE/ace/Monitor_Control_Types.cpp
@@ -26,7 +26,7 @@ namespace ACE
 
     //=============================================================
 
-    Monitor_Control_Types::Constraint::Constraint (void)
+    Monitor_Control_Types::Constraint::Constraint ()
       : control_action (0)
     {}
 
@@ -40,7 +40,7 @@ namespace ACE
         }
     }
 
-    Monitor_Control_Types::Constraint::~Constraint (void)
+    Monitor_Control_Types::Constraint::~Constraint ()
     {
       if (this->control_action != 0)
         {
diff --git a/ACE/ace/Monitor_Control_Types.h b/ACE/ace/Monitor_Control_Types.h
index 0eaba0e5a76..4c7b66f194b 100644
--- a/ACE/ace/Monitor_Control_Types.h
+++ b/ACE/ace/Monitor_Control_Types.h
@@ -74,8 +74,8 @@ namespace ACE
        */
       struct ACE_Export Constraint
       {
-        Constraint (void);
-        ~Constraint (void);
+        Constraint ();
+        ~Constraint ();
 
         /// Implemented explicitly so reference counting of control
         /// actions can be managed.
diff --git a/ACE/ace/Monitor_Point_Registry.cpp b/ACE/ace/Monitor_Point_Registry.cpp
index d6c558a2480..05f13aae1d7 100644
--- a/ACE/ace/Monitor_Point_Registry.cpp
+++ b/ACE/ace/Monitor_Point_Registry.cpp
@@ -12,13 +12,13 @@ namespace ACE
   namespace Monitor_Control
   {
     Monitor_Point_Registry*
-    Monitor_Point_Registry::instance (void)
+    Monitor_Point_Registry::instance ()
     {
       return
         ACE_Singleton<Monitor_Point_Registry, ACE_SYNCH_MUTEX>::instance ();
     }
 
-    Monitor_Point_Registry::Monitor_Point_Registry (void)
+    Monitor_Point_Registry::Monitor_Point_Registry ()
       : constraint_id_ (0)
     {
     }
@@ -101,7 +101,7 @@ namespace ACE
     }
 
     Monitor_Control_Types::NameList
-    Monitor_Point_Registry::names (void)
+    Monitor_Point_Registry::names ()
     {
       Monitor_Control_Types::NameList name_holder_;
 
@@ -137,7 +137,7 @@ namespace ACE
     }
 
     long
-    Monitor_Point_Registry::constraint_id (void)
+    Monitor_Point_Registry::constraint_id ()
     {
       long retval = 0;
 
@@ -151,7 +151,7 @@ namespace ACE
     }
 
     void
-    Monitor_Point_Registry::cleanup (void)
+    Monitor_Point_Registry::cleanup ()
     {
       for (Map::ITERATOR i = this->map_.begin ();
            i != this->map_.end ();
diff --git a/ACE/ace/Monitor_Point_Registry.h b/ACE/ace/Monitor_Point_Registry.h
index 42245249d63..e6cf87129f6 100644
--- a/ACE/ace/Monitor_Point_Registry.h
+++ b/ACE/ace/Monitor_Point_Registry.h
@@ -48,7 +48,7 @@ namespace ACE
 
       /// Used to help ensure that there is only a single instance
       /// per process of Monitor_Point_Registry.
-      static Monitor_Point_Registry* instance (void);
+      static Monitor_Point_Registry* instance ();
 
       /// Adds a monitor to the registry.
       bool add (Monitor_Base* type);
@@ -57,22 +57,22 @@ namespace ACE
       bool remove (const char* name);
 
       /// Returns a list of names stored in the registry
-      Monitor_Control_Types::NameList names (void);
+      Monitor_Control_Types::NameList names ();
 
       /// Increments the refcount, so the caller is responsible for
       /// decrementing it when finished.
       Monitor_Base* get (const ACE_CString& name) const;
 
       /// Returns a unique id for a constraint when it is created.
-      long constraint_id (void);
+      long constraint_id ();
 
       /// Decrements the reference count on all remaining entries,
       /// called right before we go out of scope (i.e., process exits).
-      void cleanup (void);
+      void cleanup ();
 
     private:
       /// Prevent that users can make an instance.
-      Monitor_Point_Registry (void);
+      Monitor_Point_Registry ();
 
       /// Underlying container for the registry.
       typedef ACE_Hash_Map_Manager<ACE_CString,
diff --git a/ACE/ace/Monitor_Size.cpp b/ACE/ace/Monitor_Size.cpp
index 545a09690aa..d314c72f60b 100644
--- a/ACE/ace/Monitor_Size.cpp
+++ b/ACE/ace/Monitor_Size.cpp
@@ -10,7 +10,7 @@ namespace ACE
 {
   namespace Monitor_Control
   {
-    Size_Monitor::Size_Monitor (void)
+    Size_Monitor::Size_Monitor ()
       : Monitor_Base ("", Monitor_Control_Types::MC_NUMBER)
     {
     }
@@ -20,19 +20,19 @@ namespace ACE
     {
     }
 
-    Size_Monitor::~Size_Monitor (void)
+    Size_Monitor::~Size_Monitor ()
     {
     }
 
     void
-    Size_Monitor::update (void)
+    Size_Monitor::update ()
     {
       // No platform-specific or periodic code is needed, receive() can be
       // called directly whenever the size changes.
     }
 
     void
-    Size_Monitor::clear (void)
+    Size_Monitor::clear ()
     {
       this->Monitor_Base::clear ();
     }
diff --git a/ACE/ace/Monitor_Size.h b/ACE/ace/Monitor_Size.h
index aba45955665..72b14e0d451 100644
--- a/ACE/ace/Monitor_Size.h
+++ b/ACE/ace/Monitor_Size.h
@@ -39,16 +39,16 @@ namespace ACE
     class ACE_Export Size_Monitor : public Monitor_Base
     {
     public:
-      Size_Monitor (void);
+      Size_Monitor ();
       Size_Monitor (const char* name);
-      virtual ~Size_Monitor (void);
+      virtual ~Size_Monitor ();
 
       /// Implemented by the most-derived class. Does the actual
       /// work of fetching the monitored value.
-      virtual void update (void);
+      virtual void update ();
 
       /// Reset function.
-      virtual void clear (void);
+      virtual void clear ();
     };
   }
 }
diff --git a/ACE/ace/Multihomed_INET_Addr.cpp b/ACE/ace/Multihomed_INET_Addr.cpp
index 1acc40c1053..08de42a0ea3 100644
--- a/ACE/ace/Multihomed_INET_Addr.cpp
+++ b/ACE/ace/Multihomed_INET_Addr.cpp
@@ -13,7 +13,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Multihomed_INET_Addr)
 
 // Default constructor
 
-ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr (void)
+ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr ()
   : secondaries_ (0)
 {
   ACE_TRACE ("ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr");
@@ -323,7 +323,7 @@ ACE_Multihomed_INET_Addr::get_addresses(sockaddr_in6 *addrs,
 #endif /* ACE_HAS_IPV6 */
 
 
-ACE_Multihomed_INET_Addr::~ACE_Multihomed_INET_Addr (void)
+ACE_Multihomed_INET_Addr::~ACE_Multihomed_INET_Addr ()
 {
 
 }
diff --git a/ACE/ace/Mutex.cpp b/ACE/ace/Mutex.cpp
index c5e982a5d59..9a41c715ddb 100644
--- a/ACE/ace/Mutex.cpp
+++ b/ACE/ace/Mutex.cpp
@@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE (ACE_Mutex)
 
 void
-ACE_Mutex::dump (void) const
+ACE_Mutex::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Mutex::dump");
@@ -143,7 +143,7 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name,
                    ACE_TEXT ("ACE_Mutex::ACE_Mutex")));
 }
 
-ACE_Mutex::~ACE_Mutex (void)
+ACE_Mutex::~ACE_Mutex ()
 {
 // ACE_TRACE ("ACE_Mutex::~ACE_Mutex");
   this->remove ();
diff --git a/ACE/ace/Mutex.h b/ACE/ace/Mutex.h
index 159f57da038..2f371a772a5 100644
--- a/ACE/ace/Mutex.h
+++ b/ACE/ace/Mutex.h
@@ -55,17 +55,17 @@ public:
              mode_t mode = ACE_DEFAULT_FILE_PERMS);
 
   /// Implicitly destroy the mutex.
-  ~ACE_Mutex (void);
+  ~ACE_Mutex ();
 
   /// Explicitly destroy the mutex.
   /**
    * @note Only one thread should call this method since it doesn't
    *        protect against race conditions.
    */
-  int remove (void);
+  int remove ();
 
   /// Acquire lock ownership (wait on queue if necessary).
-  int acquire (void);
+  int acquire ();
 
   /// Block the thread until the mutex is acquired or @a tv times out,
   /// in which case -1 is returned and @c errno == @c ETIME.
@@ -94,24 +94,24 @@ public:
    * @return -1 on failure.  If we "failed" because someone
    *         else already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Release lock and unblock a thread at head of queue.
-  int release (void);
+  int release ();
 
   /// Acquire mutex ownership.
   /**
    * This calls @c acquire and is only here to make the @c ACE_Mutex
    * interface consistent with the other synchronization APIs.
    */
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Acquire mutex ownership.
   /**
    * This calls @c acquire and is only here to make the @c ACE_Mutex
    * interface consistent with the other synchronization APIs.
    */
-  int acquire_write (void);
+  int acquire_write ();
 
   /// Conditionally acquire mutex (i.e., won't block).
   /**
@@ -121,7 +121,7 @@ public:
    * @return -1 on failure.  If we "failed" because someone else
    *         already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /// Conditionally acquire mutex (i.e., won't block).
   /**
@@ -131,25 +131,25 @@ public:
    * @return -1 on failure.  If we "failed" because someone else
    *         already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /**
    * This is only here for consistency with the other synchronization
    * APIs and usability with Lock adapters. Assumes the caller already has
    * acquired the mutex and returns 0 in all cases.
    */
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
   /// Return the underlying mutex.
-  const ACE_mutex_t &lock (void) const;
-  ACE_mutex_t &lock (void);
+  const ACE_mutex_t &lock () const;
+  ACE_mutex_t &lock ();
 
   /// If a file was created as the underlying storage for the mutex,
   /// remove it from the filesystem (for process-shared mutexes).
   static int unlink (const ACE_TCHAR *name);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Mutex.inl b/ACE/ace/Mutex.inl
index 42870709716..7adfceaa12c 100644
--- a/ACE/ace/Mutex.inl
+++ b/ACE/ace/Mutex.inl
@@ -9,7 +9,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
-ACE_Mutex::acquire_read (void)
+ACE_Mutex::acquire_read ()
 {
 // ACE_TRACE ("ACE_Mutex::acquire_read");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -23,7 +23,7 @@ ACE_Mutex::acquire_read (void)
 }
 
 ACE_INLINE int
-ACE_Mutex::acquire_write (void)
+ACE_Mutex::acquire_write ()
 {
 // ACE_TRACE ("ACE_Mutex::acquire_write");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -37,7 +37,7 @@ ACE_Mutex::acquire_write (void)
 }
 
 ACE_INLINE int
-ACE_Mutex::tryacquire_read (void)
+ACE_Mutex::tryacquire_read ()
 {
 // ACE_TRACE ("ACE_Mutex::tryacquire_read");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -51,7 +51,7 @@ ACE_Mutex::tryacquire_read (void)
 }
 
 ACE_INLINE const ACE_mutex_t &
-ACE_Mutex::lock (void) const
+ACE_Mutex::lock () const
 {
 // ACE_TRACE ("ACE_Mutex::lock");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -62,7 +62,7 @@ ACE_Mutex::lock (void) const
 }
 
 ACE_INLINE ACE_mutex_t &
-ACE_Mutex::lock (void)
+ACE_Mutex::lock ()
 {
 // ACE_TRACE ("ACE_Mutex::lock");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -73,7 +73,7 @@ ACE_Mutex::lock (void)
 }
 
 ACE_INLINE int
-ACE_Mutex::tryacquire_write (void)
+ACE_Mutex::tryacquire_write ()
 {
 // ACE_TRACE ("ACE_Mutex::tryacquire_write");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -87,14 +87,14 @@ ACE_Mutex::tryacquire_write (void)
 }
 
 ACE_INLINE int
-ACE_Mutex::tryacquire_write_upgrade (void)
+ACE_Mutex::tryacquire_write_upgrade ()
 {
 // ACE_TRACE ("ACE_Mutex::tryacquire_write_upgrade");
   return 0;
 }
 
 ACE_INLINE int
-ACE_Mutex::acquire (void)
+ACE_Mutex::acquire ()
 {
 // ACE_TRACE ("ACE_Mutex::acquire");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -135,7 +135,7 @@ ACE_Mutex::acquire (ACE_Time_Value *tv)
 }
 
 ACE_INLINE int
-ACE_Mutex::tryacquire (void)
+ACE_Mutex::tryacquire ()
 {
 // ACE_TRACE ("ACE_Mutex::tryacquire");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -149,7 +149,7 @@ ACE_Mutex::tryacquire (void)
 }
 
 ACE_INLINE int
-ACE_Mutex::release (void)
+ACE_Mutex::release ()
 {
 // ACE_TRACE ("ACE_Mutex::release");
 #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX
@@ -163,7 +163,7 @@ ACE_Mutex::release (void)
 }
 
 ACE_INLINE int
-ACE_Mutex::remove (void)
+ACE_Mutex::remove ()
 {
 // ACE_TRACE ("ACE_Mutex::remove");
   int result = 0;
diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h
index 2769d82d15b..6e03aabd6b2 100644
--- a/ACE/ace/NT_Service.h
+++ b/ACE/ace/NT_Service.h
@@ -159,7 +159,7 @@ public:
   // SCM registry.
 
   /// Sets the name and description for the service.
-  /// If desc is 0, it takes the same value as name.
+  /// If @a desc is 0, it takes the same value as name.
   void name (const ACE_TCHAR *name, const ACE_TCHAR *desc = 0);
 
   /// Get the service name.
@@ -299,7 +299,7 @@ public:
   DWORD state (ACE_Time_Value *wait_hint = 0);
 
   /// A version of <state> that returns -1 for failure, 0 for success.
-  /// The DWORD pointed to by pstate receives the state value.
+  /// The DWORD pointed to by @a pstate receives the state value.
   int state (DWORD *pstate, ACE_Time_Value *wait_hint = 0);
 
   /**
diff --git a/ACE/ace/Name_Proxy.cpp b/ACE/ace/Name_Proxy.cpp
index fc99cb6aa0c..02371967f7b 100644
--- a/ACE/ace/Name_Proxy.cpp
+++ b/ACE/ace/Name_Proxy.cpp
@@ -7,7 +7,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-ACE_Name_Proxy::dump (void) const
+ACE_Name_Proxy::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Proxy::dump");
@@ -22,7 +22,7 @@ ACE_Name_Proxy::dump (void) const
 
 // Default constructor.
 
-ACE_Name_Proxy::ACE_Name_Proxy (void)
+ACE_Name_Proxy::ACE_Name_Proxy ()
   : reactor_ (0)
 {
   ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy");
@@ -64,7 +64,7 @@ ACE_Name_Proxy::ACE_Name_Proxy (
 // Obtain underlying handle.
 
 /* VIRTUAL */ ACE_HANDLE
-ACE_Name_Proxy::get_handle (void) const
+ACE_Name_Proxy::get_handle () const
 {
   ACE_TRACE ("ACE_Name_Proxy::get_handle");
   return this->peer_.get_handle ();
@@ -198,7 +198,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
 
 // Close down the connection to the server.
 
-ACE_Name_Proxy::~ACE_Name_Proxy (void)
+ACE_Name_Proxy::~ACE_Name_Proxy ()
 {
   ACE_TRACE ("ACE_Name_Proxy::~ACE_Name_Proxy");
   this->peer_.close ();
diff --git a/ACE/ace/Name_Proxy.h b/ACE/ace/Name_Proxy.h
index 05254a0a368..0132dfe6f8e 100644
--- a/ACE/ace/Name_Proxy.h
+++ b/ACE/ace/Name_Proxy.h
@@ -73,7 +73,7 @@ public:
   virtual ~ACE_Name_Proxy (void);
 
   /// Dump the state of the object;
-  void dump (void) const;
+  void dump () const;
 
 private:
 
diff --git a/ACE/ace/Name_Request_Reply.cpp b/ACE/ace/Name_Request_Reply.cpp
index 72cc2a2a39a..e76dbf257c1 100644
--- a/ACE/ace/Name_Request_Reply.cpp
+++ b/ACE/ace/Name_Request_Reply.cpp
@@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default "do nothing" constructor.
 
-ACE_Name_Request::ACE_Name_Request (void)
+ACE_Name_Request::ACE_Name_Request ()
 {
   ACE_TRACE ("ACE_Name_Request::ACE_Name_Request");
 }
@@ -77,7 +77,7 @@ ACE_Name_Request::ACE_Name_Request (
 // Initialize length_ in order to avoid problems with byte-ordering.
 
 void
-ACE_Name_Request::init (void)
+ACE_Name_Request::init ()
 {
   ACE_TRACE ("ACE_Name_Request::init");
   this->length (sizeof this->transfer_);
@@ -86,7 +86,7 @@ ACE_Name_Request::init (void)
 // = Set/get the length of the encoded/decoded message.
 
 ACE_UINT32
-ACE_Name_Request::length (void) const
+ACE_Name_Request::length () const
 {
   ACE_TRACE ("ACE_Name_Request::length");
   return this->transfer_.length_;
@@ -102,7 +102,7 @@ ACE_Name_Request::length (ACE_UINT32 l)
 // = Set/get the type of the message.
 
 ACE_INT32
-ACE_Name_Request::msg_type (void) const
+ACE_Name_Request::msg_type () const
 {
   ACE_TRACE ("ACE_Name_Request::msg_type");
   return this->transfer_.msg_type_;
@@ -118,7 +118,7 @@ ACE_Name_Request::msg_type (ACE_INT32 t)
 // = Set/get the len of the name
 
 ACE_UINT32
-ACE_Name_Request::name_len (void) const
+ACE_Name_Request::name_len () const
 {
   ACE_TRACE ("ACE_Name_Request::name_len");
   return this->transfer_.name_len_;
@@ -134,7 +134,7 @@ ACE_Name_Request::name_len (ACE_UINT32 t)
 // = Set/get the len of the value
 
 ACE_UINT32
-ACE_Name_Request::value_len (void) const
+ACE_Name_Request::value_len () const
 {
   ACE_TRACE ("ACE_Name_Request::value_len");
   return this->transfer_.value_len_;
@@ -150,7 +150,7 @@ ACE_Name_Request::value_len (ACE_UINT32 t)
 // = Set/get the len of the type
 
 ACE_UINT32
-ACE_Name_Request::type_len (void) const
+ACE_Name_Request::type_len () const
 {
   ACE_TRACE ("ACE_Name_Request::type_len");
   return this->transfer_.type_len_;
@@ -166,7 +166,7 @@ ACE_Name_Request::type_len (ACE_UINT32 t)
 // = Set/get the blocking semantics.
 
 ACE_UINT32
-ACE_Name_Request::block_forever (void) const
+ACE_Name_Request::block_forever () const
 {
   ACE_TRACE ("ACE_Name_Request::block_forever");
   return this->transfer_.block_forever_;
@@ -182,7 +182,7 @@ ACE_Name_Request::block_forever (ACE_UINT32 bs)
 // = Set/get the timeout.
 
 ACE_Time_Value
-ACE_Name_Request::timeout (void) const
+ACE_Name_Request::timeout () const
 {
   ACE_TRACE ("ACE_Name_Request::timeout");
   time_t sec = ACE_Utils::truncate_cast<time_t> (this->transfer_.sec_timeout_);
@@ -200,7 +200,7 @@ ACE_Name_Request::timeout (const ACE_Time_Value timeout)
 // = Set/get the name
 
 const ACE_WCHAR_T *
-ACE_Name_Request::name (void) const
+ACE_Name_Request::name () const
 {
   ACE_TRACE ("ACE_Name_Request::name");
   return this->name_;
@@ -218,7 +218,7 @@ ACE_Name_Request::name (const ACE_WCHAR_T *t)
 // = Set/get the value
 
 const ACE_WCHAR_T *
-ACE_Name_Request::value (void) const
+ACE_Name_Request::value () const
 {
   ACE_TRACE ("ACE_Name_Request::value");
   return this->value_;
@@ -237,7 +237,7 @@ ACE_Name_Request::value (const ACE_WCHAR_T *c)
 // = Set/get the type
 
 const char *
-ACE_Name_Request::type (void) const
+ACE_Name_Request::type () const
 {
   ACE_TRACE ("ACE_Name_Request::type");
   return this->type_;
@@ -291,7 +291,7 @@ ACE_Name_Request::encode (void *&buf)
 // be used by the server.
 
 int
-ACE_Name_Request::decode (void)
+ACE_Name_Request::decode ()
 {
   ACE_TRACE ("ACE_Name_Request::decode");
   // Decode the fixed-sized portion first.
@@ -327,7 +327,7 @@ ACE_Name_Request::decode (void)
 // Print out the current values of the ACE_Name_Request.
 
 void
-ACE_Name_Request::dump (void) const
+ACE_Name_Request::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Request::dump");
@@ -413,7 +413,7 @@ ACE_Name_Request::dump (void) const
 
 // Default constructor.
 
-ACE_Name_Reply::ACE_Name_Reply (void)
+ACE_Name_Reply::ACE_Name_Reply ()
 {
   ACE_TRACE ("ACE_Name_Reply::ACE_Name_Reply");
 
@@ -436,7 +436,7 @@ ACE_Name_Reply::ACE_Name_Reply (ACE_UINT32 t, ACE_UINT32 err) // Type of reply.
 // Initialize length_ to avoid problems with byte-ordering.
 
 void
-ACE_Name_Reply::init (void)
+ACE_Name_Reply::init ()
 {
   ACE_TRACE ("ACE_Name_Reply::init");
   this->length (sizeof this->transfer_);
@@ -445,7 +445,7 @@ ACE_Name_Reply::init (void)
 // = Set/get the length of the encoded/decoded message.
 
 ACE_UINT32
-ACE_Name_Reply::length (void) const
+ACE_Name_Reply::length () const
 {
   ACE_TRACE ("ACE_Name_Reply::length");
   return this->transfer_.length_;
@@ -461,7 +461,7 @@ ACE_Name_Reply::length (ACE_UINT32 l)
 // = Set/get the type of the message.
 
 ACE_INT32
-ACE_Name_Reply::msg_type (void) const
+ACE_Name_Reply::msg_type () const
 {
   ACE_TRACE ("ACE_Name_Reply::msg_type");
   return this->transfer_.type_;
@@ -477,7 +477,7 @@ ACE_Name_Reply::msg_type (ACE_INT32 t)
 // Get the status of the reply (0 == success, -1 == failure).
 
 ACE_INT32
-ACE_Name_Reply::status (void) const
+ACE_Name_Reply::status () const
 {
   ACE_TRACE ("ACE_Name_Reply::status");
   return this->transfer_.type_;
@@ -497,7 +497,7 @@ ACE_Name_Reply::status (ACE_INT32 s)
 
 // = Set/get the errno of a failed reply.
 ACE_UINT32
-ACE_Name_Reply::errnum (void) const
+ACE_Name_Reply::errnum () const
 {
   ACE_TRACE ("ACE_Name_Reply::errnum");
   return this->transfer_.errno_;
@@ -530,7 +530,7 @@ ACE_Name_Reply::encode (void *&buf)
 // used by the client.
 
 int
-ACE_Name_Reply::decode (void)
+ACE_Name_Reply::decode ()
 {
   ACE_TRACE ("ACE_Name_Reply::decode");
   this->transfer_.length_ = ACE_NTOHL (this->transfer_.length_);
@@ -542,7 +542,7 @@ ACE_Name_Reply::decode (void)
 // Print out current values of the ACE_Name_Reply object.
 
 void
-ACE_Name_Reply::dump (void) const
+ACE_Name_Reply::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Reply::dump");
diff --git a/ACE/ace/Name_Request_Reply.h b/ACE/ace/Name_Request_Reply.h
index 5c91d2389dd..b11f8747bc2 100644
--- a/ACE/ace/Name_Request_Reply.h
+++ b/ACE/ace/Name_Request_Reply.h
@@ -130,7 +130,7 @@ public:
   int decode (void);
 
   /// Print out the values of the message for debugging purposes.
-  void dump (void) const;
+  void dump () const;
 
 private:
   // = The 5 fields in the <Transfer> struct are transmitted to the server.
@@ -233,7 +233,7 @@ public:
   int decode (void);
 
   /// Print out the values of the message for debugging purposes.
-  void dump (void) const;
+  void dump () const;
 
 private:
   // = The 3 fields in the <Transfer> struct are transmitted to the server.
diff --git a/ACE/ace/Name_Space.cpp b/ACE/ace/Name_Space.cpp
index 403f473bdb1..0e1228909a5 100644
--- a/ACE/ace/Name_Space.cpp
+++ b/ACE/ace/Name_Space.cpp
@@ -7,7 +7,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Name_Binding::ACE_Name_Binding (void)
+ACE_Name_Binding::ACE_Name_Binding ()
   : name_ (),
     value_ (),
     type_ (ACE_OS::strdup (""))
@@ -16,7 +16,7 @@ ACE_Name_Binding::ACE_Name_Binding (void)
 }
 
 
-ACE_Name_Binding::~ACE_Name_Binding (void)
+ACE_Name_Binding::~ACE_Name_Binding ()
 {
   ACE_TRACE ("ACE_Name_Binding::~ACE_Name_Binding");
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -73,7 +73,7 @@ ACE_Name_Binding::operator == (const ACE_Name_Binding &s) const
     && ACE_OS::strcmp (this->type_, s.type_) == 0;
 }
 
-ACE_Name_Space::~ACE_Name_Space (void)
+ACE_Name_Space::~ACE_Name_Space ()
 {
   ACE_TRACE ("ACE_Name_Space::~ACE_Name_Space");
 }
diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp
index 52f70b31d1c..46b6ebd975a 100644
--- a/ACE/ace/Naming_Context.cpp
+++ b/ACE/ace/Naming_Context.cpp
@@ -23,8 +23,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Make life easier later on...
 
-typedef ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LOCAL_NAME_SPACE;
-typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LITE_LOCAL_NAME_SPACE;
+using LOCAL_NAME_SPACE = ACE_Local_Name_Space<ACE_MMAP_Memory_Pool, ACE_RW_Process_Mutex>;
+using LITE_LOCAL_NAME_SPACE = ACE_Local_Name_Space<ACE_Lite_MMAP_Memory_Pool, ACE_RW_Process_Mutex>;
 
 // The ACE_Naming_Context static service object is now defined
 // by the ACE_Object_Manager, in Object_Manager.cpp.
@@ -50,7 +50,7 @@ ACE_Naming_Context::info (ACE_TCHAR **strp,
 }
 
 int
-ACE_Naming_Context::local (void)
+ACE_Naming_Context::local ()
 {
   ACE_TRACE ("ACE_Naming_Context::local");
   return ACE_OS::strcmp (this->netnameserver_host_,
@@ -116,7 +116,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite)
 }
 
 int
-ACE_Naming_Context::close_down (void)
+ACE_Naming_Context::close_down ()
 {
   ACE_TRACE ("ACE_Naming_Context::close_down");
 
@@ -127,7 +127,7 @@ ACE_Naming_Context::close_down (void)
 }
 
 int
-ACE_Naming_Context::close (void)
+ACE_Naming_Context::close ()
 {
   ACE_TRACE ("ACE_Naming_Context::close");
 
@@ -137,7 +137,7 @@ ACE_Naming_Context::close (void)
   return 0;
 }
 
-ACE_Naming_Context::ACE_Naming_Context (void)
+ACE_Naming_Context::ACE_Naming_Context ()
   : name_options_ (0),
     name_space_ (0),
     netnameserver_host_ (0),
@@ -168,7 +168,7 @@ ACE_Naming_Context::ACE_Naming_Context (Context_Scope_Type scope_in,
 }
 
 ACE_Name_Options *
-ACE_Naming_Context::name_options (void)
+ACE_Naming_Context::name_options ()
 {
   return this->name_options_;
 }
@@ -379,7 +379,7 @@ ACE_Naming_Context::list_type_entries (ACE_BINDING_SET &set_out,
                                   ACE_NS_WString (pattern_in));
 }
 
-ACE_Naming_Context::~ACE_Naming_Context (void)
+ACE_Naming_Context::~ACE_Naming_Context ()
 {
   ACE_TRACE ("ACE_Naming_Context::~ACE_Naming_Context");
 
@@ -406,7 +406,7 @@ ACE_Naming_Context::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ACE_Naming_Context::fini (void)
+ACE_Naming_Context::fini ()
 {
   if (ACE::debug ())
     ACELIB_DEBUG ((LM_DEBUG,
@@ -415,7 +415,7 @@ ACE_Naming_Context::fini (void)
   return 0;
 }
 
-ACE_Name_Options::ACE_Name_Options (void)
+ACE_Name_Options::ACE_Name_Options ()
   : debugging_ (false),
     verbosity_ (false),
     use_registry_ (false),
@@ -448,7 +448,7 @@ ACE_Name_Options::ACE_Name_Options (void)
 #endif /* ACE_DEFAULT_NAMESPACE_DIR */
 }
 
-ACE_Name_Options::~ACE_Name_Options (void)
+ACE_Name_Options::~ACE_Name_Options ()
 {
   ACE_TRACE ("ACE_Name_Options::~ACE_Name_Options");
 
@@ -475,7 +475,7 @@ ACE_Name_Options::nameserver_port (int port)
 }
 
 int
-ACE_Name_Options::nameserver_port (void)
+ACE_Name_Options::nameserver_port ()
 {
   ACE_TRACE ("ACE_Name_Options::nameserver_port");
   return this->nameserver_port_;
@@ -519,14 +519,14 @@ ACE_Name_Options::nameserver_host (const ACE_TCHAR *host)
 }
 
 const ACE_TCHAR *
-ACE_Name_Options::nameserver_host (void)
+ACE_Name_Options::nameserver_host ()
 {
   ACE_TRACE ("ACE_Name_Options::nameserver_host");
   return this->nameserver_host_;
 }
 
 const ACE_TCHAR *
-ACE_Name_Options::database (void)
+ACE_Name_Options::database ()
 {
   ACE_TRACE ("ACE_Name_Options::database");
   return this->database_;
@@ -545,7 +545,7 @@ ACE_Name_Options::database (const ACE_TCHAR *db)
 }
 
 char *
-ACE_Name_Options::base_address (void)
+ACE_Name_Options::base_address ()
 {
   ACE_TRACE ("ACE_Name_Options::base_address");
   return this->base_address_;
@@ -559,7 +559,7 @@ ACE_Name_Options::base_address (char *base_address)
 }
 
 ACE_Naming_Context::Context_Scope_Type
-ACE_Name_Options::context (void)
+ACE_Name_Options::context ()
 {
   ACE_TRACE ("ACE_Name_Options::context");
   return this->context_;
diff --git a/ACE/ace/Netlink_Addr.cpp b/ACE/ace/Netlink_Addr.cpp
index 198ee7293fb..dbd44a0e0a0 100644
--- a/ACE/ace/Netlink_Addr.cpp
+++ b/ACE/ace/Netlink_Addr.cpp
@@ -51,13 +51,13 @@ ACE_Netlink_Addr::ACE_Netlink_Addr (const sockaddr_nl *un, int len)
 }
 
 int
-ACE_Netlink_Addr::get_pid (void) const
+ACE_Netlink_Addr::get_pid () const
 {
   return this->nl_.nl_pid;
 }
 
 int
-ACE_Netlink_Addr::get_gid (void) const
+ACE_Netlink_Addr::get_gid () const
 {
   return this->nl_.nl_groups;
 }
diff --git a/ACE/ace/Node.cpp b/ACE/ace/Node.cpp
index f1ca0de37bb..b23dd0a9462 100644
--- a/ACE/ace/Node.cpp
+++ b/ACE/ace/Node.cpp
@@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Node)
 
 template <class T, class C>
-ACE_Node<T, C>::~ACE_Node (void)
+ACE_Node<T, C>::~ACE_Node ()
 {
 }
 
diff --git a/ACE/ace/Node.h b/ACE/ace/Node.h
index aecc69d83d1..d81e189d1f2 100644
--- a/ACE/ace/Node.h
+++ b/ACE/ace/Node.h
@@ -50,7 +50,7 @@ public:
   friend class ACE_Unbounded_Stack_Iterator<T>;
 
   /// This isn't necessary, but it keeps some compilers happy.
-  ~ACE_Node (void);
+  ~ACE_Node ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ace/Notification_Strategy.cpp b/ACE/ace/Notification_Strategy.cpp
index 854e9d962ff..5df0b52dadf 100644
--- a/ACE/ace/Notification_Strategy.cpp
+++ b/ACE/ace/Notification_Strategy.cpp
@@ -13,7 +13,7 @@ ACE_Notification_Strategy::ACE_Notification_Strategy (ACE_Event_Handler *eh,
 {
 }
 
-ACE_Notification_Strategy::~ACE_Notification_Strategy (void)
+ACE_Notification_Strategy::~ACE_Notification_Strategy ()
 {
 }
 
diff --git a/ACE/ace/Notification_Strategy.h b/ACE/ace/Notification_Strategy.h
index f47824b76e7..a517babd68a 100644
--- a/ACE/ace/Notification_Strategy.h
+++ b/ACE/ace/Notification_Strategy.h
@@ -38,19 +38,19 @@ public:
   ACE_Notification_Strategy (ACE_Event_Handler *eh, ACE_Reactor_Mask mask);
 
   /// Destructor.
-  virtual ~ACE_Notification_Strategy (void);
+  virtual ~ACE_Notification_Strategy ();
 
-  virtual int notify (void) = 0;
+  virtual int notify () = 0;
   virtual int notify (ACE_Event_Handler *, ACE_Reactor_Mask mask) = 0;
 
   /// Get the event handler.
-  ACE_Event_Handler *event_handler (void);
+  ACE_Event_Handler *event_handler ();
 
   /// Set the event handler.
   void event_handler (ACE_Event_Handler *eh);
 
   /// Get the reactor mask.
-  ACE_Reactor_Mask mask (void) const;
+  ACE_Reactor_Mask mask () const;
 
   /// Set the reactor mask.
   void mask (ACE_Reactor_Mask m);
diff --git a/ACE/ace/Notification_Strategy.inl b/ACE/ace/Notification_Strategy.inl
index f1c1598d0b4..d566c334224 100644
--- a/ACE/ace/Notification_Strategy.inl
+++ b/ACE/ace/Notification_Strategy.inl
@@ -3,7 +3,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Event_Handler *
-ACE_Notification_Strategy::event_handler (void)
+ACE_Notification_Strategy::event_handler ()
 {
   return eh_;
 }
@@ -15,7 +15,7 @@ ACE_Notification_Strategy::event_handler (ACE_Event_Handler *eh)
 }
 
 ACE_INLINE ACE_Reactor_Mask
-ACE_Notification_Strategy::mask (void) const
+ACE_Notification_Strategy::mask () const
 {
   return mask_;
 }
diff --git a/ACE/ace/Null_Barrier.h b/ACE/ace/Null_Barrier.h
index 50e4e2789ea..c1147907f4e 100644
--- a/ACE/ace/Null_Barrier.h
+++ b/ACE/ace/Null_Barrier.h
@@ -30,14 +30,14 @@ public:
                     void * = 0) {};
 
   /// Default dtor.
-  ~ACE_Null_Barrier (void) {};
+  ~ACE_Null_Barrier () {};
 
   /// Block the caller until all <count> threads have called <wait> and
   /// then allow all the caller threads to continue in parallel.
-  int wait (void) { return 0; };
+  int wait () { return 0; };
 
   /// Dump the state of an object.
-  void dump (void) const {};
+  void dump () const {};
 
   /// Declare the dynamic allocation hooks.
   //ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h
index a86e0c54bec..bf4d4313a4e 100644
--- a/ACE/ace/Null_Condition.h
+++ b/ACE/ace/Null_Condition.h
@@ -49,10 +49,10 @@ public:
                  void * = 0)
   : mutex_ ((ACE_Null_Mutex &) m) {}
 
-  ~ACE_Condition (void) {}
+  ~ACE_Condition () {}
 
   /// Returns 0.
-  int remove (void) {return 0;}
+  int remove () {return 0;}
 
   /// Returns -1 with @c errno == @c ETIME.
   int wait (const ACE_Time_Value * = 0) {errno = ETIME; return -1;}
@@ -62,14 +62,14 @@ public:
             const ACE_Time_Value * = 0) {errno = ETIME; return -1;}
 
   /// Returns 0.
-  int signal (void) {return 0;}
+  int signal () {return 0;}
 
   /// Returns 0.
-  int broadcast (void) {return 0;}
-  ACE_Null_Mutex &mutex (void) {return this->mutex_;};
+  int broadcast () {return 0;}
+  ACE_Null_Mutex &mutex () {return this->mutex_;};
 
   /// Dump the state of an object.
-  void dump (void) const {}
+  void dump () const {}
 
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
diff --git a/ACE/ace/Null_Mutex.h b/ACE/ace/Null_Mutex.h
index cf2ab6c0e25..63d449ecd1e 100644
--- a/ACE/ace/Null_Mutex.h
+++ b/ACE/ace/Null_Mutex.h
@@ -38,12 +38,12 @@ class ACE_Export ACE_Null_Mutex
 public:
   ACE_Null_Mutex (const ACE_TCHAR * = 0)
     : lock_ (0) {}
-  ~ACE_Null_Mutex (void) {}
+  ~ACE_Null_Mutex () {}
   /// Return 0.
-  int remove (void) {return 0;}
+  int remove () {return 0;}
 
   /// Return 0.
-  int acquire (void) {return 0;}
+  int acquire () {return 0;}
 
   /// Return -1 with @c errno == @c ETIME.
   int acquire (ACE_Time_Value &) {errno = ETIME; return -1;}
@@ -52,28 +52,28 @@ public:
   int acquire (ACE_Time_Value *) {errno = ETIME; return -1;}
 
   /// Return 0.
-  int tryacquire (void) {return 0;}
+  int tryacquire () {return 0;}
 
   /// Return 0.
-  int release (void) {return 0;}
+  int release () {return 0;}
 
   /// Return 0.
-  int acquire_write (void) {return 0;}
+  int acquire_write () {return 0;}
 
   /// Return 0.
-  int tryacquire_write (void) {return 0;}
+  int tryacquire_write () {return 0;}
 
   /// Return 0.
-  int tryacquire_write_upgrade (void) {return 0;}
+  int tryacquire_write_upgrade () {return 0;}
 
   /// Return 0.
-  int acquire_read (void) {return 0;}
+  int acquire_read () {return 0;}
 
   /// Return 0.
-  int tryacquire_read (void) {return 0;}
+  int tryacquire_read () {return 0;}
 
   /// Dump the state of an object.
-  void dump (void) const {}
+  void dump () const {}
 
   /// Declare the dynamic allocation hooks.
   //ACE_ALLOC_HOOK_DECLARE;
@@ -106,20 +106,19 @@ public:
   ~ACE_Guard (void) {}
 #endif /* ACE_WIN32 */
 
-  int acquire (void) { return 0; }
-  int tryacquire (void) { return 0; }
-  int release (void) { return 0; }
-  void disown (void) {}
-  int locked (void) { return 1; }
-  int remove (void) { return 0; }
-  void dump (void) const {}
+  int acquire () { return 0; }
+  int tryacquire () { return 0; }
+  int release () { return 0; }
+  void disown () {}
+  int locked () { return 1; }
+  int remove () { return 0; }
+  void dump () const {}
 
 private:
-
-  // Disallow copying and assignment.
-  ACE_Guard (const ACE_Guard<ACE_Null_Mutex> &);
-  void operator= (const ACE_Guard<ACE_Null_Mutex> &);
-
+  ACE_Guard (const ACE_Guard<ACE_Null_Mutex> &) = delete;
+  void operator= (const ACE_Guard<ACE_Null_Mutex> &) = delete;
+  ACE_Guard (ACE_Guard<ACE_Null_Mutex> &&) = delete;
+  void operator= (ACE_Guard<ACE_Null_Mutex> &&) = delete;
 };
 
 template <class ACE_LOCK>
@@ -139,11 +138,11 @@ public:
   ACE_Write_Guard (ACE_Null_Mutex &m, int blocked)
     : ACE_Guard<ACE_Null_Mutex> (m, blocked) {}
 
-  int acquire_write (void) { return 0; }
-  int acquire (void) { return 0; }
-  int tryacquire_write (void) { return 0; }
-  int tryacquire (void) { return 0; }
-  void dump (void) const {}
+  int acquire_write () { return 0; }
+  int acquire () { return 0; }
+  int tryacquire_write () { return 0; }
+  int tryacquire () { return 0; }
+  void dump () const {}
 };
 
 template <class ACE_LOCK>
@@ -163,11 +162,11 @@ public:
   ACE_Read_Guard (ACE_Null_Mutex &m, int blocked)
     : ACE_Guard<ACE_Null_Mutex> (m, blocked) {}
 
-  int acquire_read (void) { return 0; }
-  int acquire (void) { return 0; }
-  int tryacquire_read (void) { return 0; }
-  int tryacquire (void) { return 0; }
-  void dump (void) const {}
+  int acquire_read () { return 0; }
+  int acquire () { return 0; }
+  int tryacquire_read () { return 0; }
+  int tryacquire () { return 0; }
+  void dump () const {}
 };
 
 // FUZZ: enable check_for_ACE_Guard
diff --git a/ACE/ace/Null_Semaphore.h b/ACE/ace/Null_Semaphore.h
index 3e35bdff291..8656098ead9 100644
--- a/ACE/ace/Null_Semaphore.h
+++ b/ACE/ace/Null_Semaphore.h
@@ -51,12 +51,12 @@ public:
                        const ACE_TCHAR * = 0,
                        void * = 0,
                        int = 0x7fffffff) {}
-  ~ACE_Null_Semaphore (void) {}
+  ~ACE_Null_Semaphore () {}
   /// Return 0.
-  int remove (void) {return 0;}
+  int remove () {return 0;}
 
   /// Return 0.
-  int acquire (void) {return 0;}
+  int acquire () {return 0;}
 
   /// Return -1 with @c errno == @c ETIME.
   int acquire (ACE_Time_Value &) {errno = ETIME; return -1;}
@@ -65,31 +65,31 @@ public:
   int acquire (ACE_Time_Value *) {errno = ETIME; return -1;}
 
   /// Return 0.
-  int tryacquire (void) {return 0;}
+  int tryacquire () {return 0;}
 
   /// Return 0.
-  int release (void) {return 0;}
+  int release () {return 0;}
 
   /// Return 0.
   int release (size_t) {return 0;}
 
   /// Return 0.
-  int acquire_write (void) {return 0;}
+  int acquire_write () {return 0;}
 
   /// Return 0.
-  int tryacquire_write (void) {return 0;}
+  int tryacquire_write () {return 0;}
 
   /// Return 0.
-  int tryacquire_write_upgrade (void) {return 0;}
+  int tryacquire_write_upgrade () {return 0;}
 
   /// Return 0.
-  int acquire_read (void) {return 0;}
+  int acquire_read () {return 0;}
 
   /// Return 0.
-  int tryacquire_read (void) {return 0;}
+  int tryacquire_read () {return 0;}
 
   /// Dump the state of an object.
-  void dump (void) const {}
+  void dump () const {}
 
   /// Declare the dynamic allocation hooks.
   //ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Numeric_Limits.h b/ACE/ace/Numeric_Limits.h
index 187123f6a1c..b842ef71de9 100644
--- a/ACE/ace/Numeric_Limits.h
+++ b/ACE/ace/Numeric_Limits.h
@@ -210,37 +210,10 @@ struct ACE_Export ACE_Numeric_Limits<long double>
 template <typename T>
 struct ACE_Numeric_Limits
 {
-  static T min (void) { return std::numeric_limits<T>::min (); }
-  static T max (void) { return std::numeric_limits<T>::max (); }
+  static T min () { return std::numeric_limits<T>::min (); }
+  static T max () { return std::numeric_limits<T>::max (); }
 };
 
-# if (defined (ACE_WIN64) && defined (_MSC_VER) && _MSC_VER <= 1310) \
-    || defined (ACE_LACKS_NUMERIC_LIMITS_64_BIT_TYPES)
-// The Microsoft Platform SDK does not provide std::numeric_limits<>
-// specializations for 64 bit integers so we need to explicitly provide
-// ACE_Numeric_Limits<> specializations to compensate for this
-// deficiency.
-//
-// Unfortunately there is no way to tell if the platform SDK is being
-// used so we specialize for the ACE_WIN64 + MSVC++ 7.1 case, which is
-// the configuration that exhibits this problem.  It also happens to
-// be a fairly isolated configuration since 64-bit support in MSVC++
-// 7.1 was not very good to begin with.
-template<>
-struct ACE_Numeric_Limits<LONGLONG>
-{
-  static LONGLONG min (void) { return _I64_MIN; }
-  static LONGLONG max (void) { return _I64_MAX; }
-};
-
-template<>
-struct ACE_Numeric_Limits<ULONGLONG>
-{
-  static ULONGLONG min (void) { return 0; }
-  static ULONGLONG max (void) { return _UI64_MAX; }
-};
-# endif  /* ACE_WIN64 && _MSC_VER <= 1310 */
-
 #endif /* ACE_LACKS_NUMERIC_LIMITS */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h
index be1a5eee3c3..de7d8420a4c 100644
--- a/ACE/ace/OS_Errno.h
+++ b/ACE/ace/OS_Errno.h
@@ -53,7 +53,7 @@ public:
   ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref);
 
   /// Reset the value of @c errno to <error>.
-  ~ACE_Errno_Guard (void);
+  ~ACE_Errno_Guard ();
 
 #if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
   /// Assign @a errno_ref to <error_>.
diff --git a/ACE/ace/OS_Errno.inl b/ACE/ace/OS_Errno.inl
index 9fd2af39b92..0a7fa0f4ff2 100644
--- a/ACE/ace/OS_Errno.inl
+++ b/ACE/ace/OS_Errno.inl
@@ -26,7 +26,7 @@ ACE_Errno_Guard::ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref)
 }
 
 ACE_INLINE
-ACE_Errno_Guard::~ACE_Errno_Guard (void)
+ACE_Errno_Guard::~ACE_Errno_Guard ()
 {
 #if defined (ACE_MT_SAFE)
   *errno_ptr_ = this->error_;
diff --git a/ACE/ace/OS_Log_Msg_Attributes.h b/ACE/ace/OS_Log_Msg_Attributes.h
index 6ef922b1ace..356c9a7b7f8 100644
--- a/ACE/ace/OS_Log_Msg_Attributes.h
+++ b/ACE/ace/OS_Log_Msg_Attributes.h
@@ -42,7 +42,7 @@ class ACE_Export ACE_OS_Log_Msg_Attributes
 {
 public:
   /// Constructor
-  ACE_OS_Log_Msg_Attributes (void);
+  ACE_OS_Log_Msg_Attributes ();
 
 protected:
   friend class ACE_Log_Msg;
diff --git a/ACE/ace/OS_Log_Msg_Attributes.inl b/ACE/ace/OS_Log_Msg_Attributes.inl
index 222609f53d8..744ac94870f 100644
--- a/ACE/ace/OS_Log_Msg_Attributes.inl
+++ b/ACE/ace/OS_Log_Msg_Attributes.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes (void) :
+ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes () :
   ostream_ (0),
   ostream_refcount_ (0),
   priority_mask_ (0),
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index b7af169c91d..4c94dd13120 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -2404,7 +2404,7 @@ ACE_OS::mutex_lock_cleanup (void *mutex)
 
 #ifndef ACE_WIN32
 
-int ACE_event_t::lock (void)
+int ACE_event_t::lock ()
 {
 # if !ACE_EVENT_USE_MUTEX_PSHARED
   if (this->eventdata_->type_ == USYNC_PROCESS)
@@ -2413,7 +2413,7 @@ int ACE_event_t::lock (void)
   return ACE_OS::mutex_lock (&this->eventdata_->lock_);
 }
 
-int ACE_event_t::unlock (void)
+int ACE_event_t::unlock ()
 {
 # if !ACE_EVENT_USE_MUTEX_PSHARED
   if (this->eventdata_->type_ == USYNC_PROCESS)
@@ -2422,7 +2422,7 @@ int ACE_event_t::unlock (void)
   return ACE_OS::mutex_unlock (&this->eventdata_->lock_);
 }
 
-int ACE_event_t::wake_one (void)
+int ACE_event_t::wake_one ()
 {
 # if !ACE_EVENT_USE_COND_PSHARED
   if (this->eventdata_->type_ == USYNC_PROCESS)
@@ -3600,11 +3600,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
   else
     thread_args = thread_adapter;
 
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr <ACE_Base_Thread_Adapter> auto_thread_args;
-#else
-  auto_ptr <ACE_Base_Thread_Adapter> auto_thread_args;
-#endif /* ACE_HAS_CPP11 */
 
   if (thread_adapter == 0)
     ACE_auto_ptr_reset (auto_thread_args,
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
index 98a24079307..e01e8a2b4f7 100644
--- a/ACE/ace/OS_NS_Thread.h
+++ b/ACE/ace/OS_NS_Thread.h
@@ -701,7 +701,7 @@ public:
                  ACE_hthread_t thr_handle);
 
   /// Initialize the object using calls to ACE_OS::thr_self().
-  ACE_Thread_ID (void);
+  ACE_Thread_ID ();
 
   /// Copy constructor.
   ACE_Thread_ID (const ACE_Thread_ID &id);
@@ -710,13 +710,13 @@ public:
   ACE_Thread_ID& operator= (const ACE_Thread_ID &id);
 
   /// Get the thread id.
-  ACE_thread_t id (void) const;
+  ACE_thread_t id () const;
 
   /// Set the thread id.
   void id (ACE_thread_t);
 
   /// Get the thread handle.
-  ACE_hthread_t handle (void) const;
+  ACE_hthread_t handle () const;
 
   /// Set the thread handle.
   void handle (ACE_hthread_t);
@@ -1629,7 +1629,7 @@ namespace ACE_OS {
   void thr_exit (ACE_THR_FUNC_RETURN status = 0);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int thr_getconcurrency (void);
+  int thr_getconcurrency ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int thr_getprio (ACE_hthread_t id,
@@ -1740,16 +1740,16 @@ namespace ACE_OS {
   int thr_kill (ACE_thread_t thr_id, int signum);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  size_t thr_min_stack (void);
+  size_t thr_min_stack ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_thread_t thr_self (void);
+  ACE_thread_t thr_self ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   void thr_self (ACE_hthread_t &);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  const char* thr_name (void);
+  const char* thr_name ();
 
   /// Stores a string version of the current thread id into buffer and
   /// returns the size of this thread id in bytes.
@@ -1809,10 +1809,10 @@ namespace ACE_OS {
   int thr_suspend (ACE_hthread_t target_thread);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  void thr_testcancel (void);
+  void thr_testcancel ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  void thr_yield (void);
+  void thr_yield ();
 
   //@{ @name A set of wrappers for mutex locks that only work within a single process.
 
@@ -1952,17 +1952,17 @@ class ACE_Export ACE_event_t
 
 public:
   /// Constructor initializing all pointer fields to null
-  ACE_event_t (void);
+  ACE_event_t ();
 
 private:
   /// Lock the internal mutex/semaphore
-  int lock (void);
+  int lock ();
 
   /// Unlock the internal mutex/semaphore
-  int unlock (void);
+  int unlock ();
 
   /// Use the internal semaphore or condition variable to unblock one thread
-  int wake_one (void);
+  int wake_one ();
 
   /// Event name if process shared.
   char *name_;
@@ -2014,13 +2014,13 @@ public:
   ACE_OS_Thread_Mutex_Guard (ACE_thread_mutex_t &m);
 
   /// Implicitly release the lock.
-  ~ACE_OS_Thread_Mutex_Guard (void);
+  ~ACE_OS_Thread_Mutex_Guard ();
 
   /// Explicitly acquire the lock.
-  int acquire (void);
+  int acquire ();
 
   /// Explicitly release the lock.
-  int release (void);
+  int release ();
 
 protected:
   /// Reference to the mutex.
@@ -2059,13 +2059,13 @@ public:
   ACE_OS_Recursive_Thread_Mutex_Guard (ACE_recursive_thread_mutex_t &m);
 
   /// Implicitly release the lock.
-  ~ACE_OS_Recursive_Thread_Mutex_Guard (void);
+  ~ACE_OS_Recursive_Thread_Mutex_Guard ();
 
   /// Explicitly acquire the lock.
-  int acquire (void);
+  int acquire ();
 
   /// Explicitly release the lock.
-  int release (void);
+  int release ();
 
 protected:
   /// Reference to the mutex.
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 8e1e1e94204..4b34fdeea11 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -2821,7 +2821,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread)
 }
 
 ACE_INLINE int
-ACE_OS::thr_getconcurrency (void)
+ACE_OS::thr_getconcurrency ()
 {
   ACE_OS_TRACE ("ACE_OS::thr_getconcurrency");
 #if defined (ACE_HAS_THREADS)
@@ -3108,7 +3108,7 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum)
 }
 
 ACE_INLINE size_t
-ACE_OS::thr_min_stack (void)
+ACE_OS::thr_min_stack ()
 {
   ACE_OS_TRACE ("ACE_OS::thr_min_stack");
 #if defined (ACE_HAS_THREADS)
@@ -3180,7 +3180,7 @@ ACE_OS::thr_gettid (char buffer[], size_t buffer_length)
 }
 
 ACE_INLINE ACE_thread_t
-ACE_OS::thr_self (void)
+ACE_OS::thr_self ()
 {
   // ACE_OS_TRACE ("ACE_OS::thr_self");
 #if defined (ACE_HAS_THREADS)
@@ -3200,7 +3200,7 @@ ACE_OS::thr_self (void)
 }
 
 ACE_INLINE const char*
-ACE_OS::thr_name (void)
+ACE_OS::thr_name ()
 {
 #if defined (ACE_HAS_THREADS)
 #if defined (ACE_HAS_VXTHREADS)
@@ -3555,7 +3555,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread)
 }
 
 ACE_INLINE void
-ACE_OS::thr_testcancel (void)
+ACE_OS::thr_testcancel ()
 {
   ACE_OS_TRACE ("ACE_OS::thr_testcancel");
 #if defined (ACE_HAS_THREADS)
@@ -3572,7 +3572,7 @@ ACE_OS::thr_testcancel (void)
 }
 
 ACE_INLINE void
-ACE_OS::thr_yield (void)
+ACE_OS::thr_yield ()
 {
   ACE_OS_TRACE ("ACE_OS::thr_yield");
 #if defined (ACE_HAS_THREADS)
@@ -3800,14 +3800,14 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m)
 
 ACE_INLINE
 int
-ACE_OS_Thread_Mutex_Guard::acquire (void)
+ACE_OS_Thread_Mutex_Guard::acquire ()
 {
   return owner_ = ACE_OS::thread_mutex_lock (&lock_);
 }
 
 ACE_INLINE
 int
-ACE_OS_Thread_Mutex_Guard::release (void)
+ACE_OS_Thread_Mutex_Guard::release ()
 {
   if (owner_ == -1)
     return 0;
@@ -3836,14 +3836,14 @@ ACE_OS_Thread_Mutex_Guard::~ACE_OS_Thread_Mutex_Guard ()
 
 ACE_INLINE
 int
-ACE_OS_Recursive_Thread_Mutex_Guard::acquire (void)
+ACE_OS_Recursive_Thread_Mutex_Guard::acquire ()
 {
   return owner_ = ACE_OS::recursive_mutex_lock (&lock_);
 }
 
 ACE_INLINE
 int
-ACE_OS_Recursive_Thread_Mutex_Guard::release (void)
+ACE_OS_Recursive_Thread_Mutex_Guard::release ()
 {
   if (owner_ == -1)
     return 0;
@@ -3903,7 +3903,7 @@ ACE_Thread_ID::operator= (const ACE_Thread_ID &id)
 }
 
 ACE_INLINE
-ACE_Thread_ID::ACE_Thread_ID (void)
+ACE_Thread_ID::ACE_Thread_ID ()
   : thread_id_ (ACE_OS::thr_self ())
 {
   ACE_OS::thr_self (thread_handle_);
@@ -3911,7 +3911,7 @@ ACE_Thread_ID::ACE_Thread_ID (void)
 
 ACE_INLINE
 ACE_thread_t
-ACE_Thread_ID::id (void) const
+ACE_Thread_ID::id () const
 {
   return this->thread_id_;
 }
@@ -3923,7 +3923,7 @@ ACE_Thread_ID::id (ACE_thread_t thread_id)
 }
 
 ACE_INLINE ACE_hthread_t
-ACE_Thread_ID::handle (void) const
+ACE_Thread_ID::handle () const
 {
   return this->thread_handle_;
 }
@@ -3951,7 +3951,7 @@ ACE_Thread_ID::operator!= (const ACE_Thread_ID &rhs) const
 #if !defined (ACE_WIN32)
 
 ACE_INLINE
-ACE_event_t::ACE_event_t (void) :
+ACE_event_t::ACE_event_t () :
   name_ (0),
   eventdata_ (0)
 {
diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp
index 182667c7243..a5efb466c06 100644
--- a/ACE/ace/OS_NS_dirent.cpp
+++ b/ACE/ace/OS_NS_dirent.cpp
@@ -181,7 +181,6 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname,
   int nfiles = 0;
   int fail = 0;
 
-  // @@ This code shoulduse readdir_r() rather than readdir().
   for (dp = ACE_OS::readdir (dirp);
        dp != 0;
        dp = ACE_OS::readdir (dirp))
diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h
index 8a35cd9f931..562018d0390 100644
--- a/ACE/ace/OS_NS_dirent.h
+++ b/ACE/ace/OS_NS_dirent.h
@@ -87,11 +87,6 @@ namespace ACE_OS {
   struct ACE_DIRENT *readdir (ACE_DIR *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int readdir_r (ACE_DIR *dirp,
-                 struct ACE_DIRENT *entry,
-                 struct ACE_DIRENT **result);
-
-  ACE_NAMESPACE_INLINE_FUNCTION
   void rewinddir (ACE_DIR *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl
index 145ccb17970..f55ec13406e 100644
--- a/ACE/ace/OS_NS_dirent.inl
+++ b/ACE/ace/OS_NS_dirent.inl
@@ -65,36 +65,6 @@ readdir (ACE_DIR *d)
 #endif /* ACE_HAS_DIRENT */
 }
 
-ACE_INLINE int
-readdir_r (ACE_DIR *dirp,
-           struct ACE_DIRENT *entry,
-           struct ACE_DIRENT **result)
-{
-#if !defined (ACE_HAS_REENTRANT_FUNCTIONS)
-  ACE_UNUSED_ARG (entry);
-  // <result> has better not be 0!
-  *result = ACE_OS::readdir (dirp);
-  if (*result)
-    return 0; // Keep iterating
-  else
-    return 1; // Oops, some type of error!
-#elif defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_READDIR_R)
-#  if defined (ACE_HAS_3_PARAM_READDIR_R)
-       return ::readdir_r (dirp, entry, result);
-#  else
-       // <result> had better not be 0!
-       *result = ::readdir_r (dirp, entry);
-       return 0;
-#  endif /* sun */
-#else  /* ! ACE_HAS_DIRENT  ||  ACE_LACKS_READDIR_R */
-  ACE_UNUSED_ARG (dirp);
-  ACE_UNUSED_ARG (entry);
-  ACE_UNUSED_ARG (result);
-  ACE_NOTSUP_RETURN (0);
-
-#endif /* ACE_HAS_REENTRANT_FUNCTIONS */
-}
-
 ACE_INLINE void
 rewinddir (ACE_DIR *d)
 {
diff --git a/ACE/ace/OS_NS_dlfcn.cpp b/ACE/ace/OS_NS_dlfcn.cpp
index e3d1c96adee..8389a9b375b 100644
--- a/ACE/ace/OS_NS_dlfcn.cpp
+++ b/ACE/ace/OS_NS_dlfcn.cpp
@@ -1,7 +1,5 @@
 #include "ace/OS_NS_dlfcn.h"
 
-
-
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_dlfcn.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_dlfcn.h b/ACE/ace/OS_NS_dlfcn.h
index b5babec2d41..f21e7dd20fb 100644
--- a/ACE/ace/OS_NS_dlfcn.h
+++ b/ACE/ace/OS_NS_dlfcn.h
@@ -40,7 +40,7 @@ namespace ACE_OS {
   int dlclose (ACE_SHLIB_HANDLE handle);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_TCHAR *dlerror (void);
+  ACE_TCHAR *dlerror ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_SHLIB_HANDLE dlopen (const ACE_TCHAR *filename,
diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl
index db5e15f57ab..6f804c67679 100644
--- a/ACE/ace/OS_NS_dlfcn.inl
+++ b/ACE/ace/OS_NS_dlfcn.inl
@@ -55,11 +55,7 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
     return -1;
   if (desc.ref_count > 1)
     return 0;
-# if defined(__GNUC__) || __cplusplus >= 199707L
   ACE_OSCALL_RETURN (::shl_unload (handle), int, -1);
-# else
-  ACE_OSCALL_RETURN (::cxxshl_unload (handle), int, -1);
-# endif  /* aC++ vs. Hp C++ */
 #else
   ACE_UNUSED_ARG (handle);
   ACE_NOTSUP_RETURN (-1);
@@ -67,7 +63,7 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
 }
 
 ACE_INLINE ACE_TCHAR *
-ACE_OS::dlerror (void)
+ACE_OS::dlerror ()
 {
   ACE_OS_TRACE ("ACE_OS::dlerror");
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
@@ -138,12 +134,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
 
   ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (fname), ACE_SHLIB_HANDLE, 0);
 # elif defined (__hpux)
-
-#   if defined(__GNUC__) || __cplusplus >= 199707L
   ACE_OSCALL_RETURN (::shl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0);
-#   else
-  ACE_OSCALL_RETURN (::cxxshl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0);
-#   endif  /* aC++ vs. Hp C++ */
 # elif defined (ACE_VXWORKS) && !defined (__RTP__)
   ACE_UNUSED_ARG (mode);
   MODULE* handle = 0;
diff --git a/ACE/ace/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h
index a240a7fa9ff..407f68a2ee0 100644
--- a/ACE/ace/OS_NS_errno.h
+++ b/ACE/ace/OS_NS_errno.h
@@ -36,16 +36,16 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int last_error (void);
+  int last_error ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   void last_error (int error);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int set_errno_to_last_error (void);
+  int set_errno_to_last_error ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int set_errno_to_wsa_last_error (void);
+  int set_errno_to_wsa_last_error ();
 
 #ifdef ACE_MQX
   int mqx_error_to_errno(int mqx_error);
diff --git a/ACE/ace/OS_NS_errno.inl b/ACE/ace/OS_NS_errno.inl
index cad5d49789b..408039c5526 100644
--- a/ACE/ace/OS_NS_errno.inl
+++ b/ACE/ace/OS_NS_errno.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
-ACE_OS::last_error (void)
+ACE_OS::last_error ()
 {
   // ACE_OS_TRACE ("ACE_OS::last_error");
 
@@ -33,7 +33,7 @@ ACE_OS::last_error (int error)
 }
 
 ACE_INLINE int
-ACE_OS::set_errno_to_last_error (void)
+ACE_OS::set_errno_to_last_error ()
 {
 # if defined (ACE_WIN32)
   return errno = ::GetLastError ();
@@ -43,7 +43,7 @@ ACE_OS::set_errno_to_last_error (void)
 }
 
 ACE_INLINE int
-ACE_OS::set_errno_to_wsa_last_error (void)
+ACE_OS::set_errno_to_wsa_last_error ()
 {
 # if defined (ACE_WIN32)
   return errno = ::WSAGetLastError ();
diff --git a/ACE/ace/OS_NS_pwd.h b/ACE/ace/OS_NS_pwd.h
index 4bdaf900107..86b91883639 100644
--- a/ACE/ace/OS_NS_pwd.h
+++ b/ACE/ace/OS_NS_pwd.h
@@ -40,10 +40,10 @@ namespace ACE_OS
   //@{ @name A set of wrappers for password routines.
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  void endpwent (void);
+  void endpwent ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  struct passwd *getpwent (void);
+  struct passwd *getpwent ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   struct passwd *getpwnam (const char *user);
@@ -56,7 +56,7 @@ namespace ACE_OS
                   struct passwd **result);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  void setpwent (void);
+  void setpwent ();
   //@}
 } /* namespace ACE_OS */
 
diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
index 3d680bba97b..ed75cfdc961 100644
--- a/ACE/ace/OS_NS_pwd.inl
+++ b/ACE/ace/OS_NS_pwd.inl
@@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Accessors to PWD file.
 
 ACE_INLINE void
-ACE_OS::endpwent (void)
+ACE_OS::endpwent ()
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
   ::endpwent ();
@@ -14,7 +14,7 @@ ACE_OS::endpwent (void)
 }
 
 ACE_INLINE struct passwd *
-ACE_OS::getpwent (void)
+ACE_OS::getpwent ()
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
   return ::getpwent ();
@@ -70,7 +70,7 @@ ACE_OS::getpwnam_r (const char *name,
 }
 
 ACE_INLINE void
-ACE_OS::setpwent (void)
+ACE_OS::setpwent ()
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
   ::setpwent ();
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index dd537ae17e9..8579fc7f4b1 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -53,7 +53,7 @@ namespace ACE_OS
 {
 
 void
-ace_flock_t::dump (void) const
+ace_flock_t::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_OS_TRACE ("ACE_OS::ace_flock_t::dump");
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index a7705077d04..68a7b56a0cd 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -189,7 +189,7 @@ namespace ACE_OS {
   {
   public:
   /// Dump state of the object.
-    void dump (void) const;
+    void dump () const;
 
 # if defined (ACE_WIN32)
     ACE_OVERLAPPED overlapped_;
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index 57349ea9873..ca964dc9d83 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -1129,10 +1129,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
      (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
       defined (ACE_HAS_DINKUM_STL) || defined (__DMC__) || \
       defined (ACE_HAS_VSWPRINTF) || \
-      (defined (ACE_WIN32_VC10) && !defined (ACE_HAS_WINCE)) || \
-      (defined (ACE_WIN32_VC9) && !defined (ACE_HAS_WINCE)) || \
-      (defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE) && \
-      _MSC_FULL_VER > 140050000)
+      (defined (_MSC_VER) && !defined (ACE_HAS_WINCE))
 
   // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
   // maxlen argument. Since this method doesn't supply one, pass in
diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp
index e73808e9af7..17cba804867 100644
--- a/ACE/ace/OS_NS_stdlib.cpp
+++ b/ACE/ace/OS_NS_stdlib.cpp
@@ -88,7 +88,7 @@ ACE_OS::free (void *ptr)
 #endif /* ACE_WIN32 && UNICODE !ACE_USES_TCHAR */
 
 ACE_TCHAR *
-ACE_OS::getenvstrings (void)
+ACE_OS::getenvstrings ()
 {
 #if defined (ACE_LACKS_GETENVSTRINGS)
   ACE_NOTSUP_RETURN (0);
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h
index 16209b6722c..0b682b7485f 100644
--- a/ACE/ace/OS_NS_stdlib.h
+++ b/ACE/ace/OS_NS_stdlib.h
@@ -100,10 +100,10 @@ namespace ACE_OS {
    */
   //@{
   ACE_NAMESPACE_INLINE_FUNCTION
-  void _exit (int status = 0);
+  void _exit (int status = 0) ACE_GCC_NO_RETURN;
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  void abort (void);
+  void abort () ACE_GCC_NO_RETURN;
 
   /**
    * Register an at exit hook. The @a name can be used to analyze shutdown
@@ -180,7 +180,7 @@ namespace ACE_OS {
   void *calloc (size_t elements, size_t sizeof_elements);
 
   extern ACE_Export
-  void exit (int status = 0);
+  void exit (int status = 0) ACE_GCC_NO_RETURN;
 
   extern ACE_Export
   void free (void *);
@@ -195,7 +195,7 @@ namespace ACE_OS {
 
   // not in spec
   extern ACE_Export
-  ACE_TCHAR *getenvstrings (void);
+  ACE_TCHAR *getenvstrings ();
 
   // itoa not in spec
   /// Converts an integer to a string.
@@ -276,7 +276,7 @@ namespace ACE_OS {
   int unsetenv(const char *name);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int rand (void);
+  int rand ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int rand_r (unsigned int *seed);
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index 26fa3b0ab93..356b258ae69 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -28,17 +28,16 @@ ACE_OS::_exit (int status)
 #elif defined (ACE_HAS_WINCE)
   ::TerminateProcess (::GetCurrentProcess (), status);
 #elif defined (ACE_MQX)
-   _mqx_exit (status);
+  _mqx_exit (status);
 #elif !defined (ACE_LACKS__EXIT)
-   ::_exit (status);
+  ::_exit (status);
 #else
   ACE_UNUSED_ARG (status);
-
 #endif /* ACE_VXWORKS */
 }
 
 ACE_INLINE void
-ACE_OS::abort (void)
+ACE_OS::abort ()
 {
 #if defined (ACE_ANDROID) && (__ANDROID_API__ < 19)
   ACE_OS::_exit (128 + SIGABRT);
@@ -408,7 +407,7 @@ ACE_OS::qsort (void *base,
 }
 
 ACE_INLINE int
-ACE_OS::rand (void)
+ACE_OS::rand ()
 {
   ACE_OS_TRACE ("ACE_OS::rand");
 #if !defined (ACE_LACKS_RAND)
diff --git a/ACE/ace/OS_NS_sys_socket.cpp b/ACE/ace/OS_NS_sys_socket.cpp
index 2a50289d29e..e7a6a0647bb 100644
--- a/ACE/ace/OS_NS_sys_socket.cpp
+++ b/ACE/ace/OS_NS_sys_socket.cpp
@@ -128,7 +128,7 @@ ACE_OS::socket_init (int version_high, int version_low)
 }
 
 int
-ACE_OS::socket_fini (void)
+ACE_OS::socket_fini ()
 {
 # if defined (ACE_WIN32)
   if (ACE_OS::socket_initialized_ != 0)
diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h
index faa6cd9bdfb..757a3bb1cd1 100644
--- a/ACE/ace/OS_NS_sys_socket.h
+++ b/ACE/ace/OS_NS_sys_socket.h
@@ -281,7 +281,7 @@ namespace ACE_OS
   char *if_indextoname (unsigned int ifindex, char *ifname);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  struct if_nameindex *if_nameindex (void);
+  struct if_nameindex *if_nameindex ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   void if_freenameindex (struct if_nameindex *ptr);
@@ -294,7 +294,7 @@ namespace ACE_OS
 
   /// Finalize WinSock after last use (e.g., when a DLL is unloaded).
   extern ACE_Export
-  int socket_fini (void);
+  int socket_fini ();
 
   /// Create a BSD-style socket (no QoS).
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl
index 3da4104198e..53036af3b8f 100644
--- a/ACE/ace/OS_NS_sys_socket.inl
+++ b/ACE/ace/OS_NS_sys_socket.inl
@@ -1046,7 +1046,7 @@ ACE_OS::if_indextoname (unsigned int ifindex, char *ifname)
 }
 
 ACE_INLINE struct if_nameindex *
-ACE_OS::if_nameindex (void)
+ACE_OS::if_nameindex ()
 {
   ACE_OS_TRACE ("ACE_OS::if_nameindex");
 #ifdef ACE_LACKS_IF_NAMEINDEX
diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h
index cf6e99f3699..06a0862234a 100644
--- a/ACE/ace/OS_NS_sys_stat.h
+++ b/ACE/ace/OS_NS_sys_stat.h
@@ -41,9 +41,6 @@ typedef struct stati64 ACE_stat;
 #       define ACE_STAT_FUNC_NAME ::_stati64
 #       define ACE_WSTAT_FUNC_NAME ::_wstati64
 #   elif !defined (ACE_HAS_WINCE) && defined (_MSC_VER)
-#     if _MSC_VER >= 1400
-//      For vc8 which has time_t as 64bit
-//      64-bit file offsets, 64-bit time_t
 #       if defined (ACE_MSVC_USES_DOUBLE_UNDERSCORE_STAT64)
 typedef struct __stat64 ACE_stat;
 #       else
@@ -51,12 +48,6 @@ typedef struct _stat64 ACE_stat;
 #       endif
 #       define ACE_STAT_FUNC_NAME ::_stat64
 #       define ACE_WSTAT_FUNC_NAME ::_wstat64
-#     else
-//      For vc71 which has time_t as 32bit
-typedef struct _stati64 ACE_stat;
-#       define ACE_STAT_FUNC_NAME ::_stati64
-#       define ACE_WSTAT_FUNC_NAME ::_wstati64
-#     endif  /* _MSC_VER >= 1400 */
 #   elif defined (__MINGW32__)
 typedef struct _stati64 ACE_stat;
 #     define ACE_STAT_FUNC_NAME ::_stati64
diff --git a/ACE/ace/OS_NS_sys_time.h b/ACE/ace/OS_NS_sys_time.h
index 02d63331478..f873d1044e7 100644
--- a/ACE/ace/OS_NS_sys_time.h
+++ b/ACE/ace/OS_NS_sys_time.h
@@ -36,10 +36,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE_OS
 {
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_Time_Value gettimeofday (void);
+  ACE_Time_Value gettimeofday ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_Time_Value gettimeofday_ (void);
+  ACE_Time_Value gettimeofday_ ();
 } /* namespace ACE_OS */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl
index 488e6a1f205..1f7efda9fcb 100644
--- a/ACE/ace/OS_NS_sys_time.inl
+++ b/ACE/ace/OS_NS_sys_time.inl
@@ -9,7 +9,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Time_Value
-ACE_OS::gettimeofday (void)
+ACE_OS::gettimeofday ()
 {
   // ACE_OS_TRACE ("ACE_OS::gettimeofday");
 
@@ -81,7 +81,7 @@ ACE_OS::gettimeofday (void)
 }
 
 ACE_INLINE ACE_Time_Value
-ACE_OS::gettimeofday_ (void)
+ACE_OS::gettimeofday_ ()
 {
   return ACE_OS::gettimeofday ();
 }
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h
index 2a5f074b041..a6c1f40dc21 100644
--- a/ACE/ace/OS_NS_time.h
+++ b/ACE/ace/OS_NS_time.h
@@ -41,20 +41,6 @@ static const ACE_UINT32 ACE_U_ONE_SECOND_IN_MSECS = 1000U;
 static const ACE_UINT32 ACE_U_ONE_SECOND_IN_USECS = 1000000U;
 static const ACE_UINT32 ACE_U_ONE_SECOND_IN_NSECS = 1000000000U;
 
-#if defined (ACE_LACKS_STRUCT_TM)
-struct tm {
-  int tm_sec;
-  int tm_min;
-  int tm_hour;
-  int tm_mday;      // Day of the month
-  int tm_mon;
-  int tm_year;
-  int tm_wday;      // Day of the week
-  int tm_yday;      // Day in the year
-  int tm_isdst;     // >0 if dst in effet; 0 if not; <0 if unknown
-};
-#endif /* ACE_LACKS_STRUCT_TM */
-
 /// Helper for the ACE_OS::timezone() function
 /**
  * We put all the timezone stuff that used to be in ACE_OS::timezone()
@@ -307,11 +293,11 @@ namespace ACE_OS
   time_t time (time_t *tloc = 0);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  long timezone (void);
+  long timezone ();
 
   // wrapper for time zone information.
   ACE_NAMESPACE_INLINE_FUNCTION
-  void tzset (void);
+  void tzset ();
 
   //@}
 } /* namespace ACE_OS */
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index 6bd482761ea..2214a6c873d 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -470,7 +470,7 @@ ACE_OS::time (time_t *tloc)
 #if defined (__GNUG__)
 namespace ACE_OS {
   ACE_INLINE long
-  timezone (void)
+  timezone ()
   {
     return ::ace_timezone ();
   }
@@ -484,7 +484,7 @@ ACE_OS::timezone (void)
 #endif /* ACE_LINUX */
 
 ACE_INLINE void
-ACE_OS::tzset (void)
+ACE_OS::tzset ()
 {
 #if defined (ACE_LACKS_TZSET)
   errno = ENOTSUP;
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index 563e385fffd..04900f3d318 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/ACE/ace/OS_NS_unistd.cpp
@@ -399,7 +399,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
 }
 
 long
-ACE_OS::num_processors (void)
+ACE_OS::num_processors ()
 {
   ACE_OS_TRACE ("ACE_OS::num_processors");
 
@@ -433,7 +433,7 @@ ACE_OS::num_processors (void)
 }
 
 long
-ACE_OS::num_processors_online (void)
+ACE_OS::num_processors_online ()
 {
   ACE_OS_TRACE ("ACE_OS::num_processors_online");
 
diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h
index 460d767d90f..091cc708452 100644
--- a/ACE/ace/OS_NS_unistd.h
+++ b/ACE/ace/OS_NS_unistd.h
@@ -51,7 +51,7 @@ namespace ACE_OS
   unsigned int alarm (u_int secs);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  long allocation_granularity (void);
+  long allocation_granularity ();
 
   /// used by ARGV::argv_to_string() and ACE_OS::fork_exec()
   extern ACE_Export
@@ -125,7 +125,7 @@ namespace ACE_OS
   /// Forks and exec's a process in a manner that works on Solaris and
   /// NT.  argv[0] must be the full path name to the executable.
   ACE_NAMESPACE_INLINE_FUNCTION
-  pid_t fork (void);
+  pid_t fork ();
 
   // not in susv3
   extern ACE_Export
@@ -150,10 +150,10 @@ namespace ACE_OS
 #endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  gid_t getgid (void);
+  gid_t getgid ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  gid_t getegid (void);
+  gid_t getegid ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int getopt (int argc,
@@ -161,22 +161,22 @@ namespace ACE_OS
               const char *optstring);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  long getpagesize (void);
+  long getpagesize ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   pid_t getpgid (pid_t pid);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  pid_t getpid (void);
+  pid_t getpid ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  pid_t getppid (void);
+  pid_t getppid ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  uid_t getuid (void);
+  uid_t getuid ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  uid_t geteuid (void);
+  uid_t geteuid ();
 
   // should call gethostname()
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -211,11 +211,11 @@ namespace ACE_OS
 
   /// Get the number of CPUs configured in the machine.
   extern ACE_Export
-  long num_processors (void);
+  long num_processors ();
 
   /// Get the number of CPUs currently online.
   extern ACE_Export
-  long num_processors_online (void);
+  long num_processors_online ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int pipe (ACE_HANDLE handles[]);
@@ -281,7 +281,7 @@ namespace ACE_OS
   int setreuid (uid_t ruid, uid_t euid);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  pid_t setsid (void);
+  pid_t setsid ();
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int setuid (uid_t);
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index 035f19baf11..bb29b1cfcee 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -94,7 +94,7 @@ ACE_OS::alarm (u_int secs)
 }
 
 ACE_INLINE long
-ACE_OS::getpagesize (void)
+ACE_OS::getpagesize ()
 {
   ACE_OS_TRACE ("ACE_OS::getpagesize");
 #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
@@ -112,7 +112,7 @@ ACE_OS::getpagesize (void)
 }
 
 ACE_INLINE long
-ACE_OS::allocation_granularity (void)
+ACE_OS::allocation_granularity ()
 {
 #if defined (ACE_WIN32)
   SYSTEM_INFO sys_info;
@@ -361,7 +361,7 @@ ACE_OS::execvp (const char *file,
 }
 
 ACE_INLINE pid_t
-ACE_OS::fork (void)
+ACE_OS::fork ()
 {
   ACE_OS_TRACE ("ACE_OS::fork");
 #if defined (ACE_LACKS_FORK)
@@ -451,7 +451,7 @@ ACE_OS::getcwd (wchar_t *buf, size_t size)
 #endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE gid_t
-ACE_OS::getgid (void)
+ACE_OS::getgid ()
 {
   ACE_OS_TRACE ("ACE_OS::getgid");
 #if defined (ACE_LACKS_GETGID)
@@ -462,7 +462,7 @@ ACE_OS::getgid (void)
 }
 
 ACE_INLINE gid_t
-ACE_OS::getegid (void)
+ACE_OS::getegid ()
 {
   ACE_OS_TRACE ("ACE_OS::getegid");
 #if defined (ACE_LACKS_GETEGID)
@@ -505,7 +505,7 @@ ACE_OS::getpgid (pid_t pid)
 }
 
 ACE_INLINE pid_t
-ACE_OS::getpid (void)
+ACE_OS::getpid ()
 {
   // ACE_OS_TRACE ("ACE_OS::getpid");
 #if defined (ACE_LACKS_GETPID)
@@ -518,7 +518,7 @@ ACE_OS::getpid (void)
 }
 
 ACE_INLINE pid_t
-ACE_OS::getppid (void)
+ACE_OS::getppid ()
 {
   ACE_OS_TRACE ("ACE_OS::getppid");
 #if defined (ACE_LACKS_GETPPID)
@@ -529,7 +529,7 @@ ACE_OS::getppid (void)
 }
 
 ACE_INLINE uid_t
-ACE_OS::getuid (void)
+ACE_OS::getuid ()
 {
   ACE_OS_TRACE ("ACE_OS::getuid");
 #if defined (ACE_LACKS_GETUID)
@@ -540,7 +540,7 @@ ACE_OS::getuid (void)
 }
 
 ACE_INLINE uid_t
-ACE_OS::geteuid (void)
+ACE_OS::geteuid ()
 {
   ACE_OS_TRACE ("ACE_OS::geteuid");
 #if defined (ACE_LACKS_GETEUID)
@@ -931,7 +931,7 @@ ACE_OS::setreuid (uid_t ruid, uid_t euid)
 }
 
 ACE_INLINE pid_t
-ACE_OS::setsid (void)
+ACE_OS::setsid ()
 {
   ACE_OS_TRACE ("ACE_OS::setsid");
 #if defined (ACE_LACKS_SETSID)
diff --git a/ACE/ace/OS_QoS.cpp b/ACE/ace/OS_QoS.cpp
index 47bce4a886c..c5b991a0ce2 100644
--- a/ACE/ace/OS_QoS.cpp
+++ b/ACE/ace/OS_QoS.cpp
@@ -59,7 +59,7 @@ ACE_Flow_Spec::ACE_Flow_Spec (unsigned long token_rate,
 #endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */
 }
 
-ACE_Flow_Spec::ACE_Flow_Spec (void)
+ACE_Flow_Spec::ACE_Flow_Spec ()
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
     defined (ACE_HAS_WINSOCK2_GQOS)
@@ -90,7 +90,7 @@ ACE_Flow_Spec::ACE_Flow_Spec (void)
 }
 
 unsigned long
-ACE_Flow_Spec::token_rate (void) const
+ACE_Flow_Spec::token_rate () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   return this->TokenRate;
@@ -110,7 +110,7 @@ ACE_Flow_Spec::token_rate (unsigned long tr)
 }
 
 unsigned long
-ACE_Flow_Spec::token_bucket_size (void) const
+ACE_Flow_Spec::token_bucket_size () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   return this->TokenBucketSize;
@@ -130,7 +130,7 @@ ACE_Flow_Spec::token_bucket_size (unsigned long tbs)
 }
 
 unsigned long
-ACE_Flow_Spec::peak_bandwidth (void) const
+ACE_Flow_Spec::peak_bandwidth () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   return this->PeakBandwidth;
@@ -150,7 +150,7 @@ ACE_Flow_Spec::peak_bandwidth (unsigned long pb)
 }
 
 unsigned long
-ACE_Flow_Spec::latency (void) const
+ACE_Flow_Spec::latency () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   return this->Latency;
@@ -170,7 +170,7 @@ ACE_Flow_Spec::latency (unsigned long l)
 }
 
 unsigned long
-ACE_Flow_Spec::delay_variation (void) const
+ACE_Flow_Spec::delay_variation () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   return this->DelayVariation;
@@ -189,7 +189,7 @@ ACE_Flow_Spec::delay_variation (unsigned long dv)
 }
 
 ACE_SERVICE_TYPE
-ACE_Flow_Spec::service_type (void) const
+ACE_Flow_Spec::service_type () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
     defined (ACE_HAS_WINSOCK2_GQOS)
@@ -211,7 +211,7 @@ ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st)
 }
 
 unsigned long
-ACE_Flow_Spec::max_sdu_size (void) const
+ACE_Flow_Spec::max_sdu_size () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
     defined (ACE_HAS_WINSOCK2_GQOS)
@@ -233,7 +233,7 @@ ACE_Flow_Spec::max_sdu_size (unsigned long mss)
 }
 
 unsigned long
-ACE_Flow_Spec::minimum_policed_size (void) const
+ACE_Flow_Spec::minimum_policed_size () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
     defined (ACE_HAS_WINSOCK2_GQOS)
@@ -255,7 +255,7 @@ ACE_Flow_Spec::minimum_policed_size (unsigned long mps)
 }
 
 int
-ACE_Flow_Spec::ttl (void) const
+ACE_Flow_Spec::ttl () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
     defined (ACE_HAS_WINSOCK2_GQOS)
@@ -278,7 +278,7 @@ ACE_Flow_Spec::ttl (int t)
 }
 
 int
-ACE_Flow_Spec::priority (void) const
+ACE_Flow_Spec::priority () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
     defined (ACE_HAS_WINSOCK2_GQOS)
@@ -300,7 +300,7 @@ ACE_Flow_Spec::priority (int p)
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
-ACE_QoS::ACE_QoS (void)
+ACE_QoS::ACE_QoS ()
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
 #else
   : sending_flowspec_ (0),
@@ -310,7 +310,7 @@ ACE_QoS::ACE_QoS (void)
 }
 
 ACE_Flow_Spec*
-ACE_QoS::sending_flowspec (void) const
+ACE_QoS::sending_flowspec () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   return &((ACE_Flow_Spec &) this->SendingFlowspec);
@@ -330,7 +330,7 @@ ACE_QoS::sending_flowspec (ACE_Flow_Spec *fs)
 }
 
 ACE_Flow_Spec*
-ACE_QoS::receiving_flowspec (void) const
+ACE_QoS::receiving_flowspec () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   return &((ACE_Flow_Spec &) this->ReceivingFlowspec);
@@ -350,7 +350,7 @@ ACE_QoS::receiving_flowspec (ACE_Flow_Spec *fs)
 }
 
 iovec
-ACE_QoS::provider_specific (void) const
+ACE_QoS::provider_specific () const
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   return (iovec&) this->ProviderSpecific;
@@ -383,7 +383,7 @@ ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data,
 }
 
 iovec *
-ACE_QoS_Params::caller_data (void) const
+ACE_QoS_Params::caller_data () const
 {
   return this->caller_data_;
 }
@@ -395,7 +395,7 @@ ACE_QoS_Params::caller_data (iovec *cd)
 }
 
 iovec *
-ACE_QoS_Params::callee_data (void) const
+ACE_QoS_Params::callee_data () const
 {
   return this->callee_data_;
 }
@@ -407,7 +407,7 @@ ACE_QoS_Params::callee_data (iovec *cd)
 }
 
 ACE_QoS *
-ACE_QoS_Params::socket_qos (void) const
+ACE_QoS_Params::socket_qos () const
 {
   return this->socket_qos_;
 }
@@ -419,7 +419,7 @@ ACE_QoS_Params::socket_qos (ACE_QoS *sq)
 }
 
 ACE_QoS *
-ACE_QoS_Params::group_socket_qos (void) const
+ACE_QoS_Params::group_socket_qos () const
 {
   return this->group_socket_qos_;
 }
@@ -431,7 +431,7 @@ ACE_QoS_Params::group_socket_qos (ACE_QoS *gsq)
 }
 
 unsigned long
-ACE_QoS_Params::flags (void) const
+ACE_QoS_Params::flags () const
 {
   return this->flags_;
 }
@@ -450,7 +450,7 @@ ACE_Accept_QoS_Params::ACE_Accept_QoS_Params (ACE_QOS_CONDITION_FUNC qos_conditi
 }
 
 ACE_QOS_CONDITION_FUNC
-ACE_Accept_QoS_Params::qos_condition_callback (void) const
+ACE_Accept_QoS_Params::qos_condition_callback () const
 {
   return this->qos_condition_callback_;
 }
@@ -462,7 +462,7 @@ ACE_Accept_QoS_Params::qos_condition_callback (ACE_QOS_CONDITION_FUNC qcc)
 }
 
 unsigned long
-ACE_Accept_QoS_Params::callback_data (void) const
+ACE_Accept_QoS_Params::callback_data () const
 {
   return this->callback_data_;
 }
diff --git a/ACE/ace/OS_QoS.h b/ACE/ace/OS_QoS.h
index 3173eadba0c..e84c633b806 100644
--- a/ACE/ace/OS_QoS.h
+++ b/ACE/ace/OS_QoS.h
@@ -165,7 +165,7 @@ class ACE_Export ACE_Flow_Spec
 {
 public:
   /// Default constructor.
-  ACE_Flow_Spec (void);
+  ACE_Flow_Spec ();
 
   /// Constructor that initializes all the fields.
   ACE_Flow_Spec (unsigned long token_rate,
@@ -180,61 +180,61 @@ public:
                  int priority);
 
   /// Get the token rate in bytes/sec.
-  unsigned long token_rate (void) const;
+  unsigned long token_rate () const;
 
   /// Set the token rate in bytes/sec.
   void token_rate (unsigned long tr);
 
   /// Get the token bucket size in bytes.
-  unsigned long token_bucket_size (void) const;
+  unsigned long token_bucket_size () const;
 
   /// Set the token bucket size in bytes.
   void token_bucket_size (unsigned long tbs);
 
   /// Get the PeakBandwidth in bytes/sec.
-  unsigned long peak_bandwidth (void) const;
+  unsigned long peak_bandwidth () const;
 
   /// Set the PeakBandwidth in bytes/sec.
   void peak_bandwidth (unsigned long pb);
 
   /// Get the latency in microseconds.
-  unsigned long latency (void) const;
+  unsigned long latency () const;
 
   /// Set the latency in microseconds.
   void latency (unsigned long l);
 
   /// Get the delay variation in microseconds.
-  unsigned long delay_variation (void) const;
+  unsigned long delay_variation () const;
 
   /// Set the delay variation in microseconds.
   void delay_variation (unsigned long dv);
 
   /// Get the service type.
-  ACE_SERVICE_TYPE service_type (void) const;
+  ACE_SERVICE_TYPE service_type () const;
 
   /// Set the service type.
   void service_type (ACE_SERVICE_TYPE st);
 
   /// Get the maximum SDU size in bytes.
-  unsigned long max_sdu_size (void) const;
+  unsigned long max_sdu_size () const;
 
   /// Set the maximum SDU size in bytes.
   void max_sdu_size (unsigned long mss);
 
   /// Get the minimum policed size in bytes.
-  unsigned long minimum_policed_size (void) const;
+  unsigned long minimum_policed_size () const;
 
   /// Set the minimum policed size in bytes.
   void minimum_policed_size (unsigned long mps);
 
   /// Get the time-to-live.
-  int ttl (void) const;
+  int ttl () const;
 
   /// Set the time-to-live.
   void ttl (int t);
 
   /// Get the priority.
-  int priority (void) const;
+  int priority () const;
 
   /// Set the priority.
   void priority (int p);
@@ -270,22 +270,22 @@ class ACE_Export ACE_QoS
 {
 public:
   /// Constructor
-  ACE_QoS (void);
+  ACE_QoS ();
 
   /// Get the flow spec for data sending.
-  ACE_Flow_Spec *sending_flowspec (void) const;
+  ACE_Flow_Spec *sending_flowspec () const;
 
   /// Set the flow spec for data sending.
   void sending_flowspec (ACE_Flow_Spec *fs);
 
   /// Get the flow spec for data receiving.
-  ACE_Flow_Spec *receiving_flowspec (void) const;
+  ACE_Flow_Spec *receiving_flowspec () const;
 
   /// Set the flow spec for data receiving.
   void receiving_flowspec (ACE_Flow_Spec *fs);
 
   /// Get the provider specific information.
-  iovec provider_specific (void) const;
+  iovec provider_specific () const;
 
   /// Set the provider specific information.
   void provider_specific (const iovec &ps);
@@ -327,31 +327,31 @@ public:
                   unsigned long flags = 0);
 
   /// Get caller data.
-  iovec *caller_data (void) const;
+  iovec *caller_data () const;
 
   /// Set caller data.
   void caller_data (iovec *);
 
   /// Get callee data.
-  iovec *callee_data (void) const;
+  iovec *callee_data () const;
 
   /// Set callee data.
   void callee_data (iovec *);
 
   /// Get socket qos.
-  ACE_QoS *socket_qos (void) const;
+  ACE_QoS *socket_qos () const;
 
   /// Set socket qos.
   void socket_qos (ACE_QoS *);
 
   /// Get group socket qos.
-  ACE_QoS *group_socket_qos (void) const;
+  ACE_QoS *group_socket_qos () const;
 
   /// Set group socket qos.
   void group_socket_qos (ACE_QoS *);
 
   /// Get flags.
-  unsigned long flags (void) const;
+  unsigned long flags () const;
 
   /// Set flags.
   void flags (unsigned long);
@@ -412,13 +412,13 @@ public:
                          unsigned long callback_data = 0);
 
   /// Get QoS condition callback.
-  ACE_QOS_CONDITION_FUNC qos_condition_callback (void) const;
+  ACE_QOS_CONDITION_FUNC qos_condition_callback () const;
 
   /// Set QoS condition callback.
   void qos_condition_callback (ACE_QOS_CONDITION_FUNC qcc);
 
   /// Get callback data.
-  unsigned long callback_data (void) const;
+  unsigned long callback_data () const;
 
   /// Set callback data.
   void callback_data (unsigned long cd);
diff --git a/ACE/ace/OS_Thread_Adapter.cpp b/ACE/ace/OS_Thread_Adapter.cpp
index 355408b457e..6074974a232 100644
--- a/ACE/ace/OS_Thread_Adapter.cpp
+++ b/ACE/ace/OS_Thread_Adapter.cpp
@@ -32,14 +32,14 @@ ACE_OS_Thread_Adapter::ACE_OS_Thread_Adapter (
 {
 }
 
-ACE_OS_Thread_Adapter::~ACE_OS_Thread_Adapter (void)
+ACE_OS_Thread_Adapter::~ACE_OS_Thread_Adapter ()
 {
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_OS_Thread_Adapter)
 
 ACE_THR_FUNC_RETURN
-ACE_OS_Thread_Adapter::invoke (void)
+ACE_OS_Thread_Adapter::invoke ()
 {
   // Inherit the logging features if the parent thread has an
   // ACE_Log_Msg instance in thread-specific storage.
diff --git a/ACE/ace/Obchunk.cpp b/ACE/ace/Obchunk.cpp
index e9493a3470c..bcfc5c09a5f 100644
--- a/ACE/ace/Obchunk.cpp
+++ b/ACE/ace/Obchunk.cpp
@@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Obchunk)
 
 void
-ACE_Obchunk::dump (void) const
+ACE_Obchunk::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Obchunk::dump");
diff --git a/ACE/ace/Obchunk.h b/ACE/ace/Obchunk.h
index 3a2fddc260a..4ab76f8a3e8 100644
--- a/ACE/ace/Obchunk.h
+++ b/ACE/ace/Obchunk.h
@@ -36,10 +36,10 @@ public:
   ACE_Obchunk (size_t size);
 
   /// Dtor.
-  ~ACE_Obchunk (void);
+  ~ACE_Obchunk ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Obchunk.inl b/ACE/ace/Obchunk.inl
index b27a8abef07..cb5b68ccef6 100644
--- a/ACE/ace/Obchunk.inl
+++ b/ACE/ace/Obchunk.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Obchunk::~ACE_Obchunk (void)
+ACE_Obchunk::~ACE_Obchunk ()
 {
 }
 
diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp
index eb4dc69ef89..eb8aaf462e7 100644
--- a/ACE/ace/Object_Manager.cpp
+++ b/ACE/ace/Object_Manager.cpp
@@ -117,8 +117,8 @@ void *ACE_Object_Manager::preallocated_array[
 class ACE_Object_Manager_Preallocations
 {
 public:
-  ACE_Object_Manager_Preallocations (void);
-  ~ACE_Object_Manager_Preallocations (void);
+  ACE_Object_Manager_Preallocations ();
+  ~ACE_Object_Manager_Preallocations ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
@@ -126,7 +126,7 @@ private:
   ACE_Static_Svc_Descriptor ace_svc_desc_ACE_Service_Manager;
 };
 
-ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
+ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations ()
 {
   ACE_STATIC_SVC_DEFINE (ACE_Service_Manager_initializer,
                          ACE_TEXT ("ACE_Service_Manager"),
@@ -146,7 +146,7 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
     insert (&ace_svc_desc_ACE_Service_Manager);
 }
 
-ACE_Object_Manager_Preallocations::~ACE_Object_Manager_Preallocations (void)
+ACE_Object_Manager_Preallocations::~ACE_Object_Manager_Preallocations ()
 {
 }
 
@@ -155,13 +155,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Object_Manager_Preallocations)
 #endif /* ! ACE_LACKS_ACE_SVCCONF */
 
 int
-ACE_Object_Manager::starting_up (void)
+ACE_Object_Manager::starting_up ()
 {
   return ACE_Object_Manager::instance_  ?  instance_->starting_up_i ()  :  1;
 }
 
 int
-ACE_Object_Manager::shutting_down (void)
+ACE_Object_Manager::shutting_down ()
 {
   return ACE_Object_Manager::instance_  ?  instance_->shutting_down_i ()  :  1;
 }
@@ -187,7 +187,7 @@ LONG WINAPI ACE_UnhandledExceptionFilter (PEXCEPTION_POINTERS pExceptionInfo)
 // objects, but only The Instance sets up the static preallocated objects and
 // the (static) ACE_Service_Config signal handler.
 int
-ACE_Object_Manager::init (void)
+ACE_Object_Manager::init ()
 {
   if (starting_up_i ())
     {
@@ -271,10 +271,11 @@ ACE_Object_Manager::init (void)
           // And this will catch all unhandled exceptions.
           SetUnhandledExceptionFilter (&ACE_UnhandledExceptionFilter);
 
-#  if (_MSC_VER >= 1400) // VC++ 8.0 and above
+#if !defined (__MINGW32__)
           // And this will stop the abort system call from being treated as a crash
           _set_abort_behavior( 0,  _CALL_REPORTFAULT);
-#  endif
+#endif /* !__MINGW32__ */
+
   // Note the following fix was derived from that proposed by Jochen Kalmbach
   // http://blog.kalmbachnet.de/?postid=75
   // See also:
@@ -289,10 +290,10 @@ ACE_Object_Manager::init (void)
   // from calling SetUnhandledExceptionFilter() after we have done so above.
   // NOTE this only works for intel based windows builds.
 
-#  if (_MSC_VER >= 1400) \
+#  if (_MSC_VER) \
       || (__MINGW32_MAJOR_VERSION > 3)  || \
           ((__MINGW32_MAJOR_VERSION == 3) && \
-           (__MINGW32_MINOR_VERSION >= 15)) // VC++ 8.0 and above || MingW32 >= 3.15
+           (__MINGW32_MINOR_VERSION >= 15)) // VC++ || MingW32 >= 3.15
 #    ifdef _M_IX86
           HMODULE hKernel32 = ACE_TEXT_LoadLibrary (ACE_TEXT ("kernel32.dll"));
           if (hKernel32)
@@ -320,7 +321,7 @@ ACE_Object_Manager::init (void)
                 }
             }
 #    endif // _M_IX86
-#  endif // (_MSC_VER >= 1400) // VC++ 8.0 and above.
+#  endif // (_MSC_VER)
 #endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS */
 
 #     if !defined (ACE_LACKS_ACE_SVCCONF)
@@ -374,7 +375,7 @@ ACE_Object_Manager::init_tss_i (void)
 
 #endif
 
-ACE_Object_Manager::ACE_Object_Manager (void)
+ACE_Object_Manager::ACE_Object_Manager ()
   // With ACE_HAS_TSS_EMULATION, ts_storage_ is initialized by the call to
   // ACE_OS::tss_open () in the function body.
   : exit_info_ ()
@@ -410,7 +411,7 @@ ACE_Object_Manager::ACE_Object_Manager (void)
   init ();
 }
 
-ACE_Object_Manager::~ACE_Object_Manager (void)
+ACE_Object_Manager::~ACE_Object_Manager ()
 {
   dynamically_allocated_ = false;   // Don't delete this again in fini()
   fini ();
@@ -419,7 +420,7 @@ ACE_Object_Manager::~ACE_Object_Manager (void)
 ACE_ALLOC_HOOK_DEFINE(ACE_Object_Manager)
 
 ACE_Object_Manager *
-ACE_Object_Manager::instance (void)
+ACE_Object_Manager::instance ()
 {
   // This function should be called during construction of static
   // instances, or before any other threads have been created in
@@ -708,7 +709,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock)
 // Only The Instance cleans up the static preallocated objects.  All objects
 // clean up their per-object information and managed objects.
 int
-ACE_Object_Manager::fini (void)
+ACE_Object_Manager::fini ()
 {
   if (shutting_down_i ())
     // Too late.  Or, maybe too early.  Either fini () has already
@@ -857,15 +858,15 @@ ACE_Object_Manager::fini (void)
 class ACE_Export ACE_Object_Manager_Manager
 {
 public:
-  ACE_Object_Manager_Manager (void);
-  ~ACE_Object_Manager_Manager (void);
+  ACE_Object_Manager_Manager ();
+  ~ACE_Object_Manager_Manager ();
 
 private:
   /// Save the main thread ID, so that destruction can be suppressed.
   ACE_thread_t saved_main_thread_id_;
 };
 
-ACE_Object_Manager_Manager::ACE_Object_Manager_Manager (void)
+ACE_Object_Manager_Manager::ACE_Object_Manager_Manager ()
   : saved_main_thread_id_ (ACE_OS::thr_self ())
 {
   // Ensure that the Object_Manager gets initialized before any
@@ -875,7 +876,7 @@ ACE_Object_Manager_Manager::ACE_Object_Manager_Manager (void)
   (void) ACE_Object_Manager::instance ();
 }
 
-ACE_Object_Manager_Manager::~ACE_Object_Manager_Manager (void)
+ACE_Object_Manager_Manager::~ACE_Object_Manager_Manager ()
 {
   if (ACE_OS::thr_equal (ACE_OS::thr_self (),
                          saved_main_thread_id_))
@@ -895,7 +896,7 @@ static ACE_Object_Manager_Manager ACE_Object_Manager_Manager_instance;
 
 // This is global so that it doesn't have to be declared in the header
 // file.  That would cause nasty circular include problems.
-typedef ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> ACE_Static_Object_Lock_Type;
+using ACE_Static_Object_Lock_Type = ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex>;
 static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock = 0;
 
 // ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK isn't (currently) used by ACE.
@@ -904,7 +905,7 @@ static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock = 0;
 // <jody@atdesk.com> for contributing it.
 
 ACE_Recursive_Thread_Mutex *
-ACE_Static_Object_Lock::instance (void)
+ACE_Static_Object_Lock::instance ()
 {
   if (ACE_Object_Manager::starting_up ()  ||
       ACE_Object_Manager::shutting_down ())
@@ -951,7 +952,7 @@ ACE_Static_Object_Lock::instance (void)
 }
 
 void
-ACE_Static_Object_Lock::cleanup_lock (void)
+ACE_Static_Object_Lock::cleanup_lock ()
 {
 # if defined(ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK)
     // It was malloc'd, so we need to explicitly call the dtor
diff --git a/ACE/ace/Object_Manager.h b/ACE/ace/Object_Manager.h
index 33171fae85e..3f571874587 100644
--- a/ACE/ace/Object_Manager.h
+++ b/ACE/ace/Object_Manager.h
@@ -204,14 +204,14 @@ public:
    * ACE_Object_Manager.  Returns 0 on success, -1 on failure, and 1
    * if it had already been called.
    */
-  virtual int init (void);
+  virtual int init ();
 
   /**
    * Explicitly destroy the singleton instance of the
    * ACE_Object_Manager.  Returns 0 on success, -1 on failure, and 1
    * if it had already been called.
    */
-  virtual int fini (void);
+  virtual int fini ();
 
   /**
    * Returns 1 before the ACE_Object_Manager has been constructed.
@@ -222,7 +222,7 @@ public:
    * this flag returns 0, if ACE_HAS_NONSTATIC_OBJECT_MANAGER is not
    * defined.)
    */
-  static int starting_up (void);
+  static int starting_up ();
 
   /**
    * Returns 1 after the ACE_Object_Manager has been destroyed.  This
@@ -231,7 +231,7 @@ public:
    * some static objects before this flag can return 1, if
    * ACE_HAS_NONSTATIC_OBJECT_MANAGER is not defined.)
    */
-  static int shutting_down (void);
+  static int shutting_down ();
 
   /**
    * Register an ACE_Cleanup object for cleanup at process
@@ -332,7 +332,7 @@ public:
    * in ACE_Sig_Guard methods.
    * Deprecated: use ACE_Object_Manager::default_mask () instead.
    */
-  static ACE_Sig_Set &default_mask (void);
+  static ACE_Sig_Set &default_mask ();
 
 private:
   /// For at_exit support.
@@ -403,7 +403,7 @@ public:
    * are provided in the interface, this should not be public.  However,
    * it is public so that ACE_Managed_Object<TYPE> can access it.
    */
-  static ACE_Object_Manager *instance (void);
+  static ACE_Object_Manager *instance ();
 
   /// Table of preallocated objects.
   static void *preallocated_object[ACE_PREALLOCATED_OBJECTS];
@@ -416,8 +416,8 @@ public:
   /// hidden here.  They're public so that the ACE_Object_Manager can
   /// be constructed/destructed in <main> with
   /// ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-  ACE_Object_Manager (void);
-  ~ACE_Object_Manager (void);
+  ACE_Object_Manager ();
+  ~ACE_Object_Manager ();
 
 private:
   /// Singleton pointer.
@@ -445,9 +445,10 @@ private:
   friend class ACE_Object_Manager_Manager;
 #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 
-  /// Disallow copying by not implementing the following . . .
-  ACE_Object_Manager (const ACE_Object_Manager &);
-  ACE_Object_Manager &operator= (const ACE_Object_Manager &);
+  ACE_Object_Manager (const ACE_Object_Manager &) = delete;
+  ACE_Object_Manager &operator= (const ACE_Object_Manager &) = delete;
+  ACE_Object_Manager (ACE_Object_Manager &&) = delete;
+  ACE_Object_Manager &operator= (ACE_Object_Manager &&) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Object_Manager.inl b/ACE/ace/Object_Manager.inl
index a65098a6fa0..bd27ee65a87 100644
--- a/ACE/ace/Object_Manager.inl
+++ b/ACE/ace/Object_Manager.inl
@@ -37,7 +37,7 @@ ACE_Object_Manager::remove_at_exit (void *object)
 
 ACE_INLINE
 ACE_Sig_Set &
-ACE_Object_Manager::default_mask (void)
+ACE_Object_Manager::default_mask ()
 {
   // A safe cast, but this static method shouldn't be used anyways.
   // Use ACE_Object_Manager::default_mask () instead.
diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp
index 9e17e8210cd..c38e811c73b 100644
--- a/ACE/ace/Object_Manager_Base.cpp
+++ b/ACE/ace/Object_Manager_Base.cpp
@@ -47,14 +47,14 @@ int ACE_SEH_Default_Exception_Handler (void *)
     preallocated_object[ID] = 0;
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-ACE_Object_Manager_Base::ACE_Object_Manager_Base (void)
+ACE_Object_Manager_Base::ACE_Object_Manager_Base ()
   : object_manager_state_ (OBJ_MAN_UNINITIALIZED)
   , dynamically_allocated_ (false)
   , next_ (0)
 {
 }
 
-ACE_Object_Manager_Base::~ACE_Object_Manager_Base (void)
+ACE_Object_Manager_Base::~ACE_Object_Manager_Base ()
 {
 #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
   // Clear the flag so that fini () doesn't delete again.
@@ -89,7 +89,7 @@ ACE_OS_Object_Manager *ACE_OS_Object_Manager::instance_ = 0;
 void *ACE_OS_Object_Manager::preallocated_object[
   ACE_OS_Object_Manager::ACE_OS_PREALLOCATED_OBJECTS] = { 0 };
 
-ACE_OS_Object_Manager::ACE_OS_Object_Manager (void)
+ACE_OS_Object_Manager::ACE_OS_Object_Manager ()
   : default_mask_ (0)
   , thread_hook_ (0)
   , exit_info_ ()
@@ -115,7 +115,7 @@ ACE_OS_Object_Manager::ACE_OS_Object_Manager (void)
   init ();
 }
 
-ACE_OS_Object_Manager::~ACE_OS_Object_Manager (void)
+ACE_OS_Object_Manager::~ACE_OS_Object_Manager ()
 {
   dynamically_allocated_ = false;   // Don't delete this again in fini()
   fini ();
@@ -124,13 +124,13 @@ ACE_OS_Object_Manager::~ACE_OS_Object_Manager (void)
 ACE_ALLOC_HOOK_DEFINE(ACE_OS_Object_Manager)
 
 sigset_t *
-ACE_OS_Object_Manager::default_mask (void)
+ACE_OS_Object_Manager::default_mask ()
 {
   return ACE_OS_Object_Manager::instance ()->default_mask_;
 }
 
 ACE_Thread_Hook *
-ACE_OS_Object_Manager::thread_hook (void)
+ACE_OS_Object_Manager::thread_hook ()
 {
   return ACE_OS_Object_Manager::instance ()->thread_hook_;
 }
@@ -181,7 +181,7 @@ ACE_OS_Object_Manager::thread_hook (ACE_Thread_Hook *new_thread_hook)
 }
 
 ACE_OS_Object_Manager *
-ACE_OS_Object_Manager::instance (void)
+ACE_OS_Object_Manager::instance ()
 {
   // This function should be called during construction of static
   // instances, or before any other threads have been created in the
@@ -206,7 +206,7 @@ ACE_OS_Object_Manager::instance (void)
 }
 
 int
-ACE_OS_Object_Manager::init (void)
+ACE_OS_Object_Manager::init ()
 {
   if (starting_up_i ())
     {
@@ -306,7 +306,7 @@ ACE_OS_Object_Manager::init (void)
 // reason.  All objects clean up their per-object information and managed
 // objects, but only The Instance cleans up the static preallocated objects.
 int
-ACE_OS_Object_Manager::fini (void)
+ACE_OS_Object_Manager::fini ()
 {
   if (instance_ == 0  ||  shutting_down_i ())
     // Too late.  Or, maybe too early.  Either fini () has already
@@ -480,7 +480,7 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number,
 }
 
 int
-ACE_OS_Object_Manager::starting_up (void)
+ACE_OS_Object_Manager::starting_up ()
 {
   return ACE_OS_Object_Manager::instance_
     ? instance_->starting_up_i ()
@@ -488,7 +488,7 @@ ACE_OS_Object_Manager::starting_up (void)
 }
 
 int
-ACE_OS_Object_Manager::shutting_down (void)
+ACE_OS_Object_Manager::shutting_down ()
 {
   return ACE_OS_Object_Manager::instance_
     ? instance_->shutting_down_i ()
@@ -512,17 +512,17 @@ class ACE_OS_Object_Manager_Manager
 {
 public:
   /// Constructor.
-  ACE_OS_Object_Manager_Manager (void);
+  ACE_OS_Object_Manager_Manager ();
 
   /// Destructor.
-  ~ACE_OS_Object_Manager_Manager (void);
+  ~ACE_OS_Object_Manager_Manager ();
 
 private:
   /// Save the main thread ID, so that destruction can be suppressed.
   ACE_thread_t saved_main_thread_id_;
 };
 
-ACE_OS_Object_Manager_Manager::ACE_OS_Object_Manager_Manager (void)
+ACE_OS_Object_Manager_Manager::ACE_OS_Object_Manager_Manager ()
   : saved_main_thread_id_ (ACE_OS::thr_self ())
 {
   // Ensure that the Object_Manager gets initialized before any
@@ -532,7 +532,7 @@ ACE_OS_Object_Manager_Manager::ACE_OS_Object_Manager_Manager (void)
   (void) ACE_OS_Object_Manager::instance ();
 }
 
-ACE_OS_Object_Manager_Manager::~ACE_OS_Object_Manager_Manager (void)
+ACE_OS_Object_Manager_Manager::~ACE_OS_Object_Manager_Manager ()
 {
   if (ACE_OS::thr_equal (ACE_OS::thr_self (),
                          saved_main_thread_id_))
diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h
index dca3054c81f..a1758e0a616 100644
--- a/ACE/ace/Object_Manager_Base.h
+++ b/ACE/ace/Object_Manager_Base.h
@@ -47,10 +47,10 @@ class ACE_Export ACE_Object_Manager_Base
 {
 protected:
   /// Default constructor.
-  ACE_Object_Manager_Base (void);
+  ACE_Object_Manager_Base ();
 
   /// Destructor.
-  virtual ~ACE_Object_Manager_Base (void);
+  virtual ~ACE_Object_Manager_Base ();
 
 public:
   /**
@@ -58,14 +58,14 @@ public:
    * to dynamic allocation failure (in which case errno is set to
    * ENOMEM), or 1 if it had already been called.
    */
-  virtual int init (void) = 0;
+  virtual int init () = 0;
 
   /**
    * Explicitly destroy.  Returns 0 on success, -1 on failure because
    * the number of fini () calls hasn't reached the number of init ()
    * calls, or 1 if it had already been called.
    */
-  virtual int fini (void) = 0;
+  virtual int fini () = 0;
 
   enum Object_Manager_State
     {
@@ -86,7 +86,7 @@ protected:
    * this flag returns 0, if ACE_HAS_NONSTATIC_OBJECT_MANAGER is not
    * defined.)
    */
-  int starting_up_i (void);
+  int starting_up_i ();
 
   /**
    * Returns 1 after ACE_Object_Manager_Base has been destroyed.  This
@@ -95,7 +95,7 @@ protected:
    * some static objects before this flag can return 1, if
    * ACE_HAS_NONSTATIC_OBJECT_MANAGER is not defined.)
    */
-  int shutting_down_i (void);
+  int shutting_down_i ();
 
   /// State of the Object_Manager;
   Object_Manager_State object_manager_state_;
@@ -111,15 +111,14 @@ protected:
   /// Link to next Object_Manager, for chaining.
   ACE_Object_Manager_Base *next_;
 private:
-  // Disallow copying by not implementing the following . . .
-  ACE_Object_Manager_Base (const ACE_Object_Manager_Base &);
-  ACE_Object_Manager_Base &operator= (const ACE_Object_Manager_Base &);
+  ACE_Object_Manager_Base (const ACE_Object_Manager_Base &) = delete;
+  ACE_Object_Manager_Base &operator= (const ACE_Object_Manager_Base &) = delete;
+  ACE_Object_Manager_Base (ACE_Object_Manager_Base &&) = delete;
+  ACE_Object_Manager_Base &operator= (ACE_Object_Manager_Base &&) = delete;
 };
 
 extern "C"
-void
-ACE_OS_Object_Manager_Internal_Exit_Hook (void);
-
+void ACE_OS_Object_Manager_Internal_Exit_Hook (void);
 
 // @@ This forward declaration should go away.
 class ACE_Log_Msg;
@@ -130,21 +129,21 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Explicitly initialize.
-  virtual int init (void);
+  virtual int init ();
 
   /// Explicitly destroy.
-  virtual int fini (void);
+  virtual int fini ();
 
   /**
    * Returns 1 before the ACE_OS_Object_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 ACE_OS_Object_Manager has been destroyed.
   /// See <ACE_Object_Manager::shutting_down> for more information.
-  static int shutting_down (void);
+  static int shutting_down ();
 
   /// Unique identifiers for preallocated objects.
   enum Preallocated_Object
@@ -172,10 +171,10 @@ public:
 
   /// 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);
@@ -196,13 +195,13 @@ public:
   // constructed/destructed in <main> with
   // <ACE_HAS_NONSTATIC_OBJECT_MANAGER>.
   /// Constructor.
-  ACE_OS_Object_Manager (void);
+  ACE_OS_Object_Manager ();
 
   /// Destructor.
-  ~ACE_OS_Object_Manager (void);
+  ~ACE_OS_Object_Manager ();
 
   /// Accessor to singleton instance.
-  static ACE_OS_Object_Manager *instance (void);
+  static ACE_OS_Object_Manager *instance ();
 
   /// For <ACE_OS::atexit> support.
   int at_exit (ACE_EXIT_HOOK func, const char* name = 0);
diff --git a/ACE/ace/Obstack_T.cpp b/ACE/ace/Obstack_T.cpp
index 659f643e980..99eb072b674 100644
--- a/ACE/ace/Obstack_T.cpp
+++ b/ACE/ace/Obstack_T.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Obstack_T)
 
 template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::dump (void) const
+ACE_Obstack_T<ACE_CHAR_T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::dump");
@@ -104,7 +104,7 @@ ACE_Obstack_T<ACE_CHAR_T>::grow (ACE_CHAR_T c)
 }
 
 template <class ACE_CHAR_T> ACE_Obchunk *
-ACE_Obstack_T<ACE_CHAR_T>::new_chunk (void)
+ACE_Obstack_T<ACE_CHAR_T>::new_chunk ()
 {
   ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::new_chunk");
 
@@ -137,7 +137,7 @@ ACE_Obstack_T<ACE_CHAR_T>::ACE_Obstack_T (size_t size,
 }
 
 template <class ACE_CHAR_T>
-ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T (void)
+ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T ()
 {
   ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T");
 
@@ -193,7 +193,7 @@ ACE_Obstack_T<ACE_CHAR_T>::unwind_i (void* obj)
 }
 
 template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::release (void)
+ACE_Obstack_T<ACE_CHAR_T>::release ()
 {
   ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::release");
 
@@ -209,7 +209,7 @@ ACE_Obstack_T<ACE_CHAR_T>::grow_fast (ACE_CHAR_T c)
 }
 
 template <class ACE_CHAR_T> ACE_CHAR_T *
-ACE_Obstack_T<ACE_CHAR_T>::freeze (void)
+ACE_Obstack_T<ACE_CHAR_T>::freeze ()
 {
   ACE_CHAR_T *retv = reinterpret_cast<ACE_CHAR_T *> (this->curr_->block_);
   * (reinterpret_cast<ACE_CHAR_T *> (this->curr_->cur_)) = 0;
diff --git a/ACE/ace/Obstack_T.h b/ACE/ace/Obstack_T.h
index 027f0e394c8..5de08a1669f 100644
--- a/ACE/ace/Obstack_T.h
+++ b/ACE/ace/Obstack_T.h
@@ -38,7 +38,7 @@ class ACE_Obstack_T
 public:
   ACE_Obstack_T (size_t size = (4096 * sizeof (ACE_CHAR_T)) - sizeof (ACE_Obchunk),
                  ACE_Allocator *allocator_strategy = 0);
-  ~ACE_Obstack_T (void);
+  ~ACE_Obstack_T ();
 
   /// Request Obstack to prepare a block at least @a len long for building
   /// a new string.  Return -1 if fail, 0 if success.
@@ -59,7 +59,7 @@ public:
   /// Freeze the current building block by null terminating it.
   /// Return the starting address of the current building block, 0
   /// if error occurs.
-  ACE_CHAR_T *freeze (void);
+  ACE_CHAR_T *freeze ();
 
   /// Copy the data into the current Obchunk and freeze the current
   /// block.  Return the starting address of the current building
@@ -69,28 +69,28 @@ public:
               size_t len);
 
   /// Return the maximum @a size
-  size_t size (void) const;
+  size_t size () const;
 
   /// "Unwind" the stack. If @a obj is a null pointer, everything allocated
   /// in the stack is released. Otherwise, @a obj must be an address of an
   /// object allocated in the stack. In this case, @a obj is released along
-  /// with everthing allocated in the Obstack since @a obj.
+  /// with everything allocated in the Obstack since @a obj.
   void unwind (void *obj);
 
   /// "Release" the entire stack of Obchunks, putting it back on the free
   /// list.
-  void release (void);
+  void release ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-  class ACE_Obchunk *new_chunk (void);
+  class ACE_Obchunk *new_chunk ();
 
-  /// Search through the list of Obchunks and release them. Helper funtion
+  /// Search through the list of Obchunks and release them. Helper function
   /// used by unwind.
   void unwind_i (void *obj);
 
diff --git a/ACE/ace/PI_Malloc.cpp b/ACE/ace/PI_Malloc.cpp
index b1e94335e9a..10373d36131 100644
--- a/ACE/ace/PI_Malloc.cpp
+++ b/ACE/ace/PI_Malloc.cpp
@@ -16,7 +16,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
+ACE_PI_Control_Block::ACE_Malloc_Header::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::ACE_Malloc_Header::dump");
@@ -29,7 +29,7 @@ ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
 }
 
 void
-ACE_PI_Control_Block::print_alignment_info (void)
+ACE_PI_Control_Block::print_alignment_info ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::ACE_Control_Block::print_alignment_info");
@@ -65,7 +65,7 @@ ACE_PI_Control_Block::print_alignment_info (void)
 }
 
 void
-ACE_PI_Control_Block::dump (void) const
+ACE_PI_Control_Block::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::dump");
@@ -91,7 +91,7 @@ ACE_PI_Control_Block::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
+ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node ()
 {
   ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node");
 }
@@ -119,7 +119,7 @@ ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
 }
 
 const char *
-ACE_PI_Control_Block::ACE_Name_Node::name (void) const
+ACE_PI_Control_Block::ACE_Name_Node::name () const
 {
   return this->name_;
 }
@@ -130,14 +130,14 @@ ACE_PI_Control_Block::ACE_Name_Node::name (const char *)
   ACE_ASSERT (0); // not implemented yet.
 }
 
-ACE_PI_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
+ACE_PI_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header ()
   : next_block_ (0),
     size_ (0)
 {
 }
 
 void
-ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
+ACE_PI_Control_Block::ACE_Name_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::dump");
diff --git a/ACE/ace/PI_Malloc.h b/ACE/ace/PI_Malloc.h
index 94dcb392d42..12933958aa8 100644
--- a/ACE/ace/PI_Malloc.h
+++ b/ACE/ace/PI_Malloc.h
@@ -34,9 +34,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief This information is stored in memory allocated by the Memory_Pool.
  *
  * This class implements the control block structure that can be
- * used in a "position indepent" fashion, i.e., you don't need to
+ * used in a "position independent" fashion, i.e., you don't need to
  * "map" the underlying memory pool to the same address in
- * processes sharing the memory.  The tradoff of this flexibility
+ * processes sharing the memory.  The trade off of this flexibility
  * is more expensive malloc/free operations.
  */
 class ACE_Export ACE_PI_Control_Block
@@ -78,14 +78,12 @@ public:
     char padding_[(ACE_PI_MALLOC_PADDING_SIZE) ? ACE_PI_MALLOC_PADDING_SIZE : ACE_MALLOC_ALIGN];
 
     /// Dump the state of the object.
-    void dump (void) const;
+    void dump () const;
 
   private:
-
     // Disallow copy construction and assignment.
     ACE_Malloc_Header (ACE_Malloc_Header const &);
     void operator= (ACE_Malloc_Header const &);
-
   };
 
   /**
@@ -140,10 +138,9 @@ public:
     NAME_NODE_PTR prev_;
 
     /// Dump the state of the object.
-    void dump (void) const;
+    void dump () const;
 
   private:
-
     // Disallow assignment.
     void operator= (const ACE_Name_Node &);
   };
@@ -189,10 +186,9 @@ public:
   ACE_Malloc_Header base_;
 
   /// Dump the state of the object.
-  void dump (void) const;
+  void dump () const;
 
 private:
-
   // Disallow assignment.
   void operator= (const ACE_Control_Block &);
 };
diff --git a/ACE/ace/POSIX_Asynch_IO.cpp b/ACE/ace/POSIX_Asynch_IO.cpp
index 2b29515b934..0631292ce78 100644
--- a/ACE/ace/POSIX_Asynch_IO.cpp
+++ b/ACE/ace/POSIX_Asynch_IO.cpp
@@ -15,7 +15,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 size_t
-ACE_POSIX_Asynch_Result::bytes_transferred (void) const
+ACE_POSIX_Asynch_Result::bytes_transferred () const
 {
   return this->bytes_transferred_;
 }
@@ -27,25 +27,25 @@ ACE_POSIX_Asynch_Result::set_bytes_transferred (size_t nbytes)
 }
 
 const void *
-ACE_POSIX_Asynch_Result::act (void) const
+ACE_POSIX_Asynch_Result::act () const
 {
   return this->act_;
 }
 
 int
-ACE_POSIX_Asynch_Result::success (void) const
+ACE_POSIX_Asynch_Result::success () const
 {
   return this->success_;
 }
 
 const void *
-ACE_POSIX_Asynch_Result::completion_key (void) const
+ACE_POSIX_Asynch_Result::completion_key () const
 {
   return this->completion_key_;
 }
 
 u_long
-ACE_POSIX_Asynch_Result::error (void) const
+ACE_POSIX_Asynch_Result::error () const
 {
   return this->error_;
 }
@@ -56,19 +56,19 @@ ACE_POSIX_Asynch_Result::set_error (u_long errcode)
   this->error_=errcode;
 }
 ACE_HANDLE
-ACE_POSIX_Asynch_Result::event (void) const
+ACE_POSIX_Asynch_Result::event () const
 {
   return ACE_INVALID_HANDLE;
 }
 
 u_long
-ACE_POSIX_Asynch_Result::offset (void) const
+ACE_POSIX_Asynch_Result::offset () const
 {
   return this->aio_offset;
 }
 
 u_long
-ACE_POSIX_Asynch_Result::offset_high (void) const
+ACE_POSIX_Asynch_Result::offset_high () const
 {
   //
   // @@ Support aiocb64??
@@ -77,13 +77,13 @@ ACE_POSIX_Asynch_Result::offset_high (void) const
 }
 
 int
-ACE_POSIX_Asynch_Result::priority (void) const
+ACE_POSIX_Asynch_Result::priority () const
 {
   return this->aio_reqprio;
 }
 
 int
-ACE_POSIX_Asynch_Result::signal_number (void) const
+ACE_POSIX_Asynch_Result::signal_number () const
 {
   return this->aio_sigevent.sigev_signo;
 }
@@ -101,7 +101,7 @@ ACE_POSIX_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor_impl)
   return posix_proactor->post_completion (this);
 }
 
-ACE_POSIX_Asynch_Result::~ACE_POSIX_Asynch_Result (void)
+ACE_POSIX_Asynch_Result::~ACE_POSIX_Asynch_Result ()
 {
 }
 
@@ -175,7 +175,7 @@ ACE_POSIX_Asynch_Operation::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 }
 
 int
-ACE_POSIX_Asynch_Operation::cancel (void)
+ACE_POSIX_Asynch_Operation::cancel ()
 {
   if (!posix_proactor_)
     return -1;
@@ -183,18 +183,18 @@ ACE_POSIX_Asynch_Operation::cancel (void)
 }
 
 ACE_Proactor *
-ACE_POSIX_Asynch_Operation::proactor (void) const
+ACE_POSIX_Asynch_Operation::proactor () const
 {
   return this->proactor_;
 }
 
 ACE_POSIX_Proactor *
-ACE_POSIX_Asynch_Operation::posix_proactor (void) const
+ACE_POSIX_Asynch_Operation::posix_proactor () const
 {
   return this->posix_proactor_;
 }
 
-ACE_POSIX_Asynch_Operation::~ACE_POSIX_Asynch_Operation (void)
+ACE_POSIX_Asynch_Operation::~ACE_POSIX_Asynch_Operation ()
 {
 }
 
@@ -207,19 +207,19 @@ ACE_POSIX_Asynch_Operation::ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posi
 // *********************************************************************
 
 size_t
-ACE_POSIX_Asynch_Read_Stream_Result::bytes_to_read (void) const
+ACE_POSIX_Asynch_Read_Stream_Result::bytes_to_read () const
 {
   return this->aio_nbytes;
 }
 
 ACE_Message_Block &
-ACE_POSIX_Asynch_Read_Stream_Result::message_block (void) const
+ACE_POSIX_Asynch_Read_Stream_Result::message_block () const
 {
   return this->message_block_;
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Read_Stream_Result::handle (void) const
+ACE_POSIX_Asynch_Read_Stream_Result::handle () const
 {
   return this->aio_fildes;
 }
@@ -268,7 +268,7 @@ ACE_POSIX_Asynch_Read_Stream_Result::complete (size_t bytes_transferred,
     handler->handle_read_stream (result);
 }
 
-ACE_POSIX_Asynch_Read_Stream_Result::~ACE_POSIX_Asynch_Read_Stream_Result (void)
+ACE_POSIX_Asynch_Read_Stream_Result::~ACE_POSIX_Asynch_Read_Stream_Result ()
 {
 }
 
@@ -317,26 +317,26 @@ ACE_POSIX_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
   return return_val;
 }
 
-ACE_POSIX_Asynch_Read_Stream::~ACE_POSIX_Asynch_Read_Stream (void)
+ACE_POSIX_Asynch_Read_Stream::~ACE_POSIX_Asynch_Read_Stream ()
 {
 }
 
 // *********************************************************************
 
 size_t
-ACE_POSIX_Asynch_Write_Stream_Result::bytes_to_write (void) const
+ACE_POSIX_Asynch_Write_Stream_Result::bytes_to_write () const
 {
   return this->aio_nbytes;
 }
 
 ACE_Message_Block &
-ACE_POSIX_Asynch_Write_Stream_Result::message_block (void) const
+ACE_POSIX_Asynch_Write_Stream_Result::message_block () const
 {
   return this->message_block_;
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Write_Stream_Result::handle (void) const
+ACE_POSIX_Asynch_Write_Stream_Result::handle () const
 {
   return this->aio_fildes;
 }
@@ -386,7 +386,7 @@ ACE_POSIX_Asynch_Write_Stream_Result::complete (size_t bytes_transferred,
     handler->handle_write_stream (result);
 }
 
-ACE_POSIX_Asynch_Write_Stream_Result::~ACE_POSIX_Asynch_Write_Stream_Result (void)
+ACE_POSIX_Asynch_Write_Stream_Result::~ACE_POSIX_Asynch_Write_Stream_Result ()
 {
 }
 
@@ -435,7 +435,7 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
   return return_val;
 }
 
-ACE_POSIX_Asynch_Write_Stream::~ACE_POSIX_Asynch_Write_Stream (void)
+ACE_POSIX_Asynch_Write_Stream::~ACE_POSIX_Asynch_Write_Stream ()
 {
 }
 
@@ -495,7 +495,7 @@ ACE_POSIX_Asynch_Read_File_Result::complete (size_t bytes_transferred,
     handler->handle_read_file (result);
 }
 
-ACE_POSIX_Asynch_Read_File_Result::~ACE_POSIX_Asynch_Read_File_Result (void)
+ACE_POSIX_Asynch_Read_File_Result::~ACE_POSIX_Asynch_Read_File_Result ()
 {
 }
 
@@ -548,7 +548,7 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block,
   return return_val;
 }
 
-ACE_POSIX_Asynch_Read_File::~ACE_POSIX_Asynch_Read_File (void)
+ACE_POSIX_Asynch_Read_File::~ACE_POSIX_Asynch_Read_File ()
 {
 }
 
@@ -622,7 +622,7 @@ ACE_POSIX_Asynch_Write_File_Result::complete (size_t bytes_transferred,
     handler->handle_write_file (result);
 }
 
-ACE_POSIX_Asynch_Write_File_Result::~ACE_POSIX_Asynch_Write_File_Result  (void)
+ACE_POSIX_Asynch_Write_File_Result::~ACE_POSIX_Asynch_Write_File_Result  ()
 {
 }
 
@@ -675,7 +675,7 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block,
   return return_val;
 }
 
-ACE_POSIX_Asynch_Write_File::~ACE_POSIX_Asynch_Write_File (void)
+ACE_POSIX_Asynch_Write_File::~ACE_POSIX_Asynch_Write_File ()
 {
 }
 
@@ -697,25 +697,25 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block,
 
 
 size_t
-ACE_POSIX_Asynch_Accept_Result::bytes_to_read (void) const
+ACE_POSIX_Asynch_Accept_Result::bytes_to_read () const
 {
   return this->aio_nbytes;
 }
 
 ACE_Message_Block &
-ACE_POSIX_Asynch_Accept_Result::message_block (void) const
+ACE_POSIX_Asynch_Accept_Result::message_block () const
 {
   return this->message_block_;
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Accept_Result::listen_handle (void) const
+ACE_POSIX_Asynch_Accept_Result::listen_handle () const
 {
   return this->listen_handle_;
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Accept_Result::accept_handle (void) const
+ACE_POSIX_Asynch_Accept_Result::accept_handle () const
 {
   return this->aio_fildes;
 }
@@ -764,7 +764,7 @@ ACE_POSIX_Asynch_Accept_Result::complete (size_t bytes_transferred,
     handler->handle_accept (result);
 }
 
-ACE_POSIX_Asynch_Accept_Result::~ACE_POSIX_Asynch_Accept_Result (void)
+ACE_POSIX_Asynch_Accept_Result::~ACE_POSIX_Asynch_Accept_Result ()
 {
 }
 
@@ -776,14 +776,14 @@ ACE_POSIX_Asynch_Accept::ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_pro
 {
 }
 
-ACE_POSIX_Asynch_Accept::~ACE_POSIX_Asynch_Accept (void)
+ACE_POSIX_Asynch_Accept::~ACE_POSIX_Asynch_Accept ()
 {
   this->close ();
   this->reactor (0); // to avoid purge_pending_notifications
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Accept::get_handle (void) const
+ACE_POSIX_Asynch_Accept::get_handle () const
 {
   return this->handle_;
 }
@@ -959,7 +959,7 @@ ACE_POSIX_Asynch_Accept::cancel_uncompleted (int flg_notify)
 }
 
 int
-ACE_POSIX_Asynch_Accept::cancel (void)
+ACE_POSIX_Asynch_Accept::cancel ()
 {
   ACE_TRACE ("ACE_POSIX_Asynch_Accept::cancel");
 
@@ -1130,7 +1130,7 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */)
 // *********************************************************************
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Connect_Result::connect_handle (void) const
+ACE_POSIX_Asynch_Connect_Result::connect_handle () const
 {
   return this->aio_fildes;
 }
@@ -1176,7 +1176,7 @@ ACE_POSIX_Asynch_Connect_Result::complete (size_t bytes_transferred,
     handler->handle_connect (result);
 }
 
-ACE_POSIX_Asynch_Connect_Result::~ACE_POSIX_Asynch_Connect_Result (void)
+ACE_POSIX_Asynch_Connect_Result::~ACE_POSIX_Asynch_Connect_Result ()
 {
 }
 
@@ -1188,14 +1188,14 @@ ACE_POSIX_Asynch_Connect::ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_p
 {
 }
 
-ACE_POSIX_Asynch_Connect::~ACE_POSIX_Asynch_Connect (void)
+ACE_POSIX_Asynch_Connect::~ACE_POSIX_Asynch_Connect ()
 {
   this->close ();
   this->reactor(0); // to avoid purge_pending_notifications
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Connect::get_handle (void) const
+ACE_POSIX_Asynch_Connect::get_handle () const
 {
   ACE_ASSERT (0);
   return  ACE_INVALID_HANDLE;
@@ -1489,7 +1489,7 @@ ACE_POSIX_Asynch_Connect::cancel_uncompleted (bool flg_notify,
 }
 
 int
-ACE_POSIX_Asynch_Connect::cancel (void)
+ACE_POSIX_Asynch_Connect::cancel ()
 {
   ACE_TRACE ("ACE_POSIX_Asynch_Connect::cancel");
 
@@ -1521,7 +1521,7 @@ ACE_POSIX_Asynch_Connect::cancel (void)
 }
 
 int
-ACE_POSIX_Asynch_Connect::close (void)
+ACE_POSIX_Asynch_Connect::close ()
 {
   ACE_TRACE ("ACE_POSIX_Asynch_Connect::close");
 
@@ -1611,37 +1611,37 @@ ACE_POSIX_Asynch_Connect::handle_close (ACE_HANDLE fd, ACE_Reactor_Mask)
 // *********************************************************************
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Transmit_File_Result::socket (void) const
+ACE_POSIX_Asynch_Transmit_File_Result::socket () const
 {
   return this->socket_;
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Transmit_File_Result::file (void) const
+ACE_POSIX_Asynch_Transmit_File_Result::file () const
 {
   return this->aio_fildes;
 }
 
 ACE_Asynch_Transmit_File::Header_And_Trailer *
-ACE_POSIX_Asynch_Transmit_File_Result::header_and_trailer (void) const
+ACE_POSIX_Asynch_Transmit_File_Result::header_and_trailer () const
 {
   return this->header_and_trailer_;
 }
 
 size_t
-ACE_POSIX_Asynch_Transmit_File_Result::bytes_to_write (void) const
+ACE_POSIX_Asynch_Transmit_File_Result::bytes_to_write () const
 {
   return this->aio_nbytes;
 }
 
 size_t
-ACE_POSIX_Asynch_Transmit_File_Result::bytes_per_send (void) const
+ACE_POSIX_Asynch_Transmit_File_Result::bytes_per_send () const
 {
   return this->bytes_per_send_;
 }
 
 u_long
-ACE_POSIX_Asynch_Transmit_File_Result::flags (void) const
+ACE_POSIX_Asynch_Transmit_File_Result::flags () const
 {
   return this->flags_;
 }
@@ -1708,7 +1708,7 @@ ACE_POSIX_Asynch_Transmit_File_Result::complete (size_t bytes_transferred,
     handler->handle_transmit_file (result);
 }
 
-ACE_POSIX_Asynch_Transmit_File_Result::~ACE_POSIX_Asynch_Transmit_File_Result (void)
+ACE_POSIX_Asynch_Transmit_File_Result::~ACE_POSIX_Asynch_Transmit_File_Result ()
 {
 }
 
@@ -1734,11 +1734,11 @@ public:
                                      ACE_POSIX_Asynch_Transmit_File_Result *result);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Transmit_Handler (void);
+  ~ACE_POSIX_Asynch_Transmit_Handler () override;
 
   /// Do the transmission. All the info to do the transmission is in
   /// the <result> member.
-  int transmit (void);
+  int transmit ();
 
 protected:
 
@@ -1775,13 +1775,13 @@ protected:
   size_t bytes_transferred_;
 
   /// This is called when asynchronous writes from the socket complete.
-  virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
+  void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) override;
 
   /// This is called when asynchronous reads from the file complete.
-  virtual void handle_read_file (const ACE_Asynch_Read_File::Result &result);
+  void handle_read_file (const ACE_Asynch_Read_File::Result &result) override;
 
   /// Issue asynch read from  the file.
-  int initiate_read_file (void);
+  int initiate_read_file ();
 
   /// To read from the file to be transmitted.
   ACE_POSIX_Asynch_Read_File rf_;
@@ -1816,7 +1816,7 @@ ACE_POSIX_Asynch_Transmit_Handler::ACE_POSIX_Asynch_Transmit_Handler
 }
 
 // Destructor.
-ACE_POSIX_Asynch_Transmit_Handler::~ACE_POSIX_Asynch_Transmit_Handler (void)
+ACE_POSIX_Asynch_Transmit_Handler::~ACE_POSIX_Asynch_Transmit_Handler ()
 {
   delete result_;
   mb_->release ();
@@ -1827,7 +1827,7 @@ ACE_POSIX_Asynch_Transmit_Handler::~ACE_POSIX_Asynch_Transmit_Handler (void)
 // Initiate transmitting the header. When that completes
 // handle_write_stream will be called, there start transmitting the file.
 int
-ACE_POSIX_Asynch_Transmit_Handler::transmit (void)
+ACE_POSIX_Asynch_Transmit_Handler::transmit ()
 {
   // No proactor is given for the <open>'s. Because we are using the
   // concrete implementations of the  Asynch_Operations, and we have
@@ -2005,7 +2005,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_read_file (const ACE_Asynch_Read_File:
 }
 
 int
-ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file (void)
+ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file ()
 {
   // Is there something to read.
   if (this->file_offset_ >= this->file_size_)
@@ -2123,13 +2123,13 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
   return 0;
 }
 
-ACE_POSIX_Asynch_Transmit_File::~ACE_POSIX_Asynch_Transmit_File (void)
+ACE_POSIX_Asynch_Transmit_File::~ACE_POSIX_Asynch_Transmit_File ()
 {
 }
 
 // *********************************************************************
 size_t
-ACE_POSIX_Asynch_Read_Dgram_Result::bytes_to_read (void) const
+ACE_POSIX_Asynch_Read_Dgram_Result::bytes_to_read () const
 {
   return this->bytes_to_read_;
 }
@@ -2158,13 +2158,13 @@ ACE_POSIX_Asynch_Read_Dgram_Result::saddr () const
 
 
 int
-ACE_POSIX_Asynch_Read_Dgram_Result::flags (void) const
+ACE_POSIX_Asynch_Read_Dgram_Result::flags () const
 {
   return this->flags_;
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Read_Dgram_Result::handle (void) const
+ACE_POSIX_Asynch_Read_Dgram_Result::handle () const
 {
   return this->handle_;
 }
@@ -2231,26 +2231,26 @@ ACE_POSIX_Asynch_Read_Dgram_Result::complete (size_t bytes_transferred,
     handler->handle_read_dgram (result);
 }
 
-ACE_POSIX_Asynch_Read_Dgram_Result::~ACE_POSIX_Asynch_Read_Dgram_Result (void)
+ACE_POSIX_Asynch_Read_Dgram_Result::~ACE_POSIX_Asynch_Read_Dgram_Result ()
 {
   delete this->remote_address_;
 }
 
 //***************************************************************************
 size_t
-ACE_POSIX_Asynch_Write_Dgram_Result::bytes_to_write (void) const
+ACE_POSIX_Asynch_Write_Dgram_Result::bytes_to_write () const
 {
   return this->bytes_to_write_;
 }
 
 int
-ACE_POSIX_Asynch_Write_Dgram_Result::flags (void) const
+ACE_POSIX_Asynch_Write_Dgram_Result::flags () const
 {
   return this->flags_;
 }
 
 ACE_HANDLE
-ACE_POSIX_Asynch_Write_Dgram_Result::handle (void) const
+ACE_POSIX_Asynch_Write_Dgram_Result::handle () const
 {
   return this->handle_;
 }
@@ -2312,12 +2312,12 @@ ACE_POSIX_Asynch_Write_Dgram_Result::complete (size_t bytes_transferred,
     handler->handle_write_dgram (result);
 }
 
-ACE_POSIX_Asynch_Write_Dgram_Result::~ACE_POSIX_Asynch_Write_Dgram_Result (void)
+ACE_POSIX_Asynch_Write_Dgram_Result::~ACE_POSIX_Asynch_Write_Dgram_Result ()
 {
 }
 
 /***************************************************************************/
-ACE_POSIX_Asynch_Read_Dgram::~ACE_POSIX_Asynch_Read_Dgram (void)
+ACE_POSIX_Asynch_Read_Dgram::~ACE_POSIX_Asynch_Read_Dgram ()
 {
 }
 
@@ -2361,7 +2361,7 @@ ACE_POSIX_Asynch_Read_Dgram::ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_Proactor *po
 
 //***************************************************************************
 
-ACE_POSIX_Asynch_Write_Dgram::~ACE_POSIX_Asynch_Write_Dgram (void)
+ACE_POSIX_Asynch_Write_Dgram::~ACE_POSIX_Asynch_Write_Dgram ()
 {
 }
 
diff --git a/ACE/ace/POSIX_CB_Proactor.cpp b/ACE/ace/POSIX_CB_Proactor.cpp
index 9be836cc814..77b2e406268 100644
--- a/ACE/ace/POSIX_CB_Proactor.cpp
+++ b/ACE/ace/POSIX_CB_Proactor.cpp
@@ -21,13 +21,13 @@ ACE_POSIX_CB_Proactor::ACE_POSIX_CB_Proactor (size_t max_aio_operations)
 }
 
 // Destructor.
-ACE_POSIX_CB_Proactor::~ACE_POSIX_CB_Proactor (void)
+ACE_POSIX_CB_Proactor::~ACE_POSIX_CB_Proactor ()
 {
   this->close ();
 }
 
 ACE_POSIX_Proactor::Proactor_Type
-ACE_POSIX_CB_Proactor::get_impl_type (void)
+ACE_POSIX_CB_Proactor::get_impl_type ()
 {
   return PROACTOR_CB;
 }
@@ -56,7 +56,7 @@ ACE_POSIX_CB_Proactor::handle_events (ACE_Time_Value &wait_time)
 }
 
 int
-ACE_POSIX_CB_Proactor::handle_events (void)
+ACE_POSIX_CB_Proactor::handle_events ()
 {
   return this->handle_events_i (ACE_INFINITE);
 }
diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp
index e3414396b3a..225e4acc18e 100644
--- a/ACE/ace/POSIX_Proactor.cpp
+++ b/ACE/ace/POSIX_Proactor.cpp
@@ -45,18 +45,18 @@ public:
                                int signal_number = ACE_SIGRTMIN);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Wakeup_Completion (void);
+  ~ACE_POSIX_Wakeup_Completion () override;
 
 
   /// This method calls the <handler>'s <handle_wakeup> method.
-  virtual void complete (size_t bytes_transferred = 0,
+  void complete (size_t bytes_transferred = 0,
                          int success = 1,
                          const void *completion_key = 0,
-                         u_long error = 0);
+                         u_long error = 0) override;
 };
 
 // *********************************************************************
-ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
+ACE_POSIX_Proactor::ACE_POSIX_Proactor ()
   :  os_id_ (ACE_OS_UNDEFINED)
 {
 #if defined(sun)
@@ -91,13 +91,13 @@ ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
 #endif
 }
 
-ACE_POSIX_Proactor::~ACE_POSIX_Proactor (void)
+ACE_POSIX_Proactor::~ACE_POSIX_Proactor ()
 {
   this->close ();
 }
 
 int
-ACE_POSIX_Proactor::close (void)
+ACE_POSIX_Proactor::close ()
 {
   return 0;
 }
@@ -112,7 +112,7 @@ ACE_POSIX_Proactor::register_handle (ACE_HANDLE handle,
 }
 
 int
-ACE_POSIX_Proactor::wake_up_dispatch_threads (void)
+ACE_POSIX_Proactor::wake_up_dispatch_threads ()
 {
   return 0;
 }
@@ -124,7 +124,7 @@ ACE_POSIX_Proactor::close_dispatch_threads (int)
 }
 
 size_t
-ACE_POSIX_Proactor::number_of_threads (void) const
+ACE_POSIX_Proactor::number_of_threads () const
 {
   // @@ Implement it.
   ACE_NOTSUP_RETURN (0);
@@ -138,13 +138,13 @@ ACE_POSIX_Proactor::number_of_threads (size_t threads)
 }
 
 ACE_HANDLE
-ACE_POSIX_Proactor::get_handle (void) const
+ACE_POSIX_Proactor::get_handle () const
 {
   return ACE_INVALID_HANDLE;
 }
 
 ACE_Asynch_Read_Stream_Impl *
-ACE_POSIX_Proactor::create_asynch_read_stream (void)
+ACE_POSIX_Proactor::create_asynch_read_stream ()
 {
   ACE_Asynch_Read_Stream_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -180,7 +180,7 @@ ACE_POSIX_Proactor::create_asynch_read_stream_result
 
 
 ACE_Asynch_Write_Stream_Impl *
-ACE_POSIX_Proactor::create_asynch_write_stream (void)
+ACE_POSIX_Proactor::create_asynch_write_stream ()
 {
   ACE_Asynch_Write_Stream_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -216,7 +216,7 @@ ACE_POSIX_Proactor::create_asynch_write_stream_result
 
 
 ACE_Asynch_Read_File_Impl *
-ACE_POSIX_Proactor::create_asynch_read_file (void)
+ACE_POSIX_Proactor::create_asynch_read_file ()
 {
   ACE_Asynch_Read_File_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -256,7 +256,7 @@ ACE_POSIX_Proactor::create_asynch_read_file_result
 
 
 ACE_Asynch_Write_File_Impl *
-ACE_POSIX_Proactor::create_asynch_write_file (void)
+ACE_POSIX_Proactor::create_asynch_write_file ()
 {
   ACE_Asynch_Write_File_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -296,7 +296,7 @@ ACE_POSIX_Proactor::create_asynch_write_file_result
 
 
 ACE_Asynch_Read_Dgram_Impl *
-ACE_POSIX_Proactor::create_asynch_read_dgram (void)
+ACE_POSIX_Proactor::create_asynch_read_dgram ()
 {
     ACE_Asynch_Read_Dgram_Impl *implementation = 0;
     ACE_NEW_RETURN (implementation,
@@ -337,7 +337,7 @@ ACE_POSIX_Proactor::create_asynch_read_dgram_result
 
 
 ACE_Asynch_Write_Dgram_Impl *
-ACE_POSIX_Proactor::create_asynch_write_dgram (void)
+ACE_POSIX_Proactor::create_asynch_write_dgram ()
 {
         ACE_Asynch_Write_Dgram_Impl *implementation = 0;
         ACE_NEW_RETURN (implementation,
@@ -377,7 +377,7 @@ ACE_POSIX_Proactor::create_asynch_write_dgram_result
 
 
 ACE_Asynch_Accept_Impl *
-ACE_POSIX_Proactor::create_asynch_accept (void)
+ACE_POSIX_Proactor::create_asynch_accept ()
 {
   ACE_Asynch_Accept_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -416,7 +416,7 @@ ACE_POSIX_Proactor::create_asynch_accept_result
 
 
 ACE_Asynch_Connect_Impl *
-ACE_POSIX_Proactor::create_asynch_connect (void)
+ACE_POSIX_Proactor::create_asynch_connect ()
 {
   ACE_Asynch_Connect_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -449,7 +449,7 @@ ACE_POSIX_Proactor::create_asynch_connect_result
 
 
 ACE_Asynch_Transmit_File_Impl *
-ACE_POSIX_Proactor::create_asynch_transmit_file (void)
+ACE_POSIX_Proactor::create_asynch_transmit_file ()
 {
   ACE_Asynch_Transmit_File_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
@@ -554,7 +554,7 @@ ACE_POSIX_Proactor::post_wakeup_completions (int how_many)
 }
 
 ACE_POSIX_Proactor::Proactor_Type
-ACE_POSIX_Proactor::get_impl_type (void)
+ACE_POSIX_Proactor::get_impl_type ()
 {
   return PROACTOR_POSIX;
 }
@@ -595,14 +595,14 @@ public:
   ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
 
   /// Destructor.
-  virtual ~ACE_AIOCB_Notify_Pipe_Manager (void);
+  ~ACE_AIOCB_Notify_Pipe_Manager () override;
 
   /// Send the result pointer through the notification pipe.
   int notify ();
 
   /// This is the call back method when <Asynch_Read> from the pipe is
   /// complete.
-  virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result);
+  void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) override;
 
 private:
   /// The implementation proactor class.
@@ -619,7 +619,7 @@ private:
   ACE_POSIX_Asynch_Read_Stream read_stream_;
 
   /// Default constructor. Shouldnt be called.
-  ACE_AIOCB_Notify_Pipe_Manager (void);
+  ACE_AIOCB_Notify_Pipe_Manager ();
 };
 
 ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor)
@@ -666,7 +666,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
                 ACE_TEXT("Read from pipe failed")));
 }
 
-ACE_AIOCB_Notify_Pipe_Manager::~ACE_AIOCB_Notify_Pipe_Manager (void)
+ACE_AIOCB_Notify_Pipe_Manager::~ACE_AIOCB_Notify_Pipe_Manager ()
 {
   // 1. try to cancel pending aio
   this->read_stream_.cancel ();
@@ -789,20 +789,20 @@ ACE_POSIX_AIOCB_Proactor::ACE_POSIX_AIOCB_Proactor (size_t max_aio_operations,
 }
 
 // Destructor.
-ACE_POSIX_AIOCB_Proactor::~ACE_POSIX_AIOCB_Proactor (void)
+ACE_POSIX_AIOCB_Proactor::~ACE_POSIX_AIOCB_Proactor ()
 {
   this->close();
 }
 
 ACE_POSIX_Proactor::Proactor_Type
-ACE_POSIX_AIOCB_Proactor::get_impl_type (void)
+ACE_POSIX_AIOCB_Proactor::get_impl_type ()
 {
   return PROACTOR_AIOCB;
 }
 
 
 int
-ACE_POSIX_AIOCB_Proactor::close (void)
+ACE_POSIX_AIOCB_Proactor::close ()
 {
   // stop asynch accept task
   this->get_asynch_pseudo_task().stop ();
@@ -819,7 +819,7 @@ void ACE_POSIX_AIOCB_Proactor::set_notify_handle (ACE_HANDLE h)
   notify_pipe_read_handle_ = h;
 }
 
-int ACE_POSIX_AIOCB_Proactor::create_result_aiocb_list (void)
+int ACE_POSIX_AIOCB_Proactor::create_result_aiocb_list ()
 {
   if (aiocb_list_ != 0)
     return 0;
@@ -840,7 +840,7 @@ int ACE_POSIX_AIOCB_Proactor::create_result_aiocb_list (void)
   return 0;
 }
 
-int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void)
+int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list ()
 {
   if (aiocb_list_ == 0)  // already deleted
     return 0;
@@ -977,7 +977,7 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num ()
 }
 
 void
-ACE_POSIX_AIOCB_Proactor::create_notify_manager (void)
+ACE_POSIX_AIOCB_Proactor::create_notify_manager ()
 {
   // Remember! this issues a Asynch_Read
   // on the notify pipe for doing the Asynch_Accept/Connect.
@@ -988,7 +988,7 @@ ACE_POSIX_AIOCB_Proactor::create_notify_manager (void)
 }
 
 void
-ACE_POSIX_AIOCB_Proactor::delete_notify_manager (void)
+ACE_POSIX_AIOCB_Proactor::delete_notify_manager ()
 {
   // We are responsible for delete as all pointers set to 0 after
   // delete, it is save to delete twice
@@ -1005,7 +1005,7 @@ ACE_POSIX_AIOCB_Proactor::handle_events (ACE_Time_Value &wait_time)
 }
 
 int
-ACE_POSIX_AIOCB_Proactor::handle_events (void)
+ACE_POSIX_AIOCB_Proactor::handle_events ()
 {
   return this->handle_events_i (ACE_INFINITE);
 }
@@ -1050,7 +1050,7 @@ ACE_POSIX_AIOCB_Proactor::putq_result (ACE_POSIX_Asynch_Result *result)
   return 0;
 }
 
-ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result (void)
+ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result ()
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0));
 
@@ -1070,7 +1070,7 @@ ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result (void)
   return result;
 }
 
-int ACE_POSIX_AIOCB_Proactor::clear_result_queue (void)
+int ACE_POSIX_AIOCB_Proactor::clear_result_queue ()
 {
   int ret_val = 0;
   ACE_POSIX_Asynch_Result* result = 0;
@@ -1084,7 +1084,7 @@ int ACE_POSIX_AIOCB_Proactor::clear_result_queue (void)
   return ret_val;
 }
 
-int ACE_POSIX_AIOCB_Proactor::process_result_queue (void)
+int ACE_POSIX_AIOCB_Proactor::process_result_queue ()
 {
   int ret_val = 0;
   ACE_POSIX_Asynch_Result* result = 0;
@@ -1632,7 +1632,7 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set,
   return;
 }
 
-ACE_POSIX_SIG_Proactor::~ACE_POSIX_SIG_Proactor (void)
+ACE_POSIX_SIG_Proactor::~ACE_POSIX_SIG_Proactor ()
 {
   this->close ();
 
@@ -1640,7 +1640,7 @@ ACE_POSIX_SIG_Proactor::~ACE_POSIX_SIG_Proactor (void)
 }
 
 ACE_POSIX_Proactor::Proactor_Type
-ACE_POSIX_SIG_Proactor::get_impl_type (void)
+ACE_POSIX_SIG_Proactor::get_impl_type ()
 {
   return PROACTOR_SIG;
 }
@@ -1654,7 +1654,7 @@ ACE_POSIX_SIG_Proactor::handle_events (ACE_Time_Value &wait_time)
 }
 
 int
-ACE_POSIX_SIG_Proactor::handle_events (void)
+ACE_POSIX_SIG_Proactor::handle_events ()
 {
   return this->handle_events_i (0);
 }
@@ -1787,7 +1787,7 @@ ACE_POSIX_SIG_Proactor::setup_signal_handler (int signal_number) const
 
 
 int
-ACE_POSIX_SIG_Proactor::block_signals (void) const
+ACE_POSIX_SIG_Proactor::block_signals () const
 {
   return ACE_OS::pthread_sigmask (SIG_BLOCK, &this->RT_completion_signals_, 0);
 }
@@ -1985,7 +1985,7 @@ ACE_POSIX_Wakeup_Completion::ACE_POSIX_Wakeup_Completion
 {
 }
 
-ACE_POSIX_Wakeup_Completion::~ACE_POSIX_Wakeup_Completion (void)
+ACE_POSIX_Wakeup_Completion::~ACE_POSIX_Wakeup_Completion ()
 {
 }
 
diff --git a/ACE/ace/Pair_T.h b/ACE/ace/Pair_T.h
index 6f60ed76ed7..36c32500e37 100644
--- a/ACE/ace/Pair_T.h
+++ b/ACE/ace/Pair_T.h
@@ -41,10 +41,10 @@ public:
   ACE_Reference_Pair (T1 &t1, T2 &t2);
 
   /// Access first.
-  T1 &first (void) const;
+  T1 &first () const;
 
   /// Access second.
-  T2 &second (void) const;
+  T2 &second () const;
 
   // Compare pairs.
   bool operator== (const ACE_Reference_Pair<T1, T2> &rhs) const;
diff --git a/ACE/ace/Pair_T.inl b/ACE/ace/Pair_T.inl
index a8f620350f6..bb7f763633d 100644
--- a/ACE/ace/Pair_T.inl
+++ b/ACE/ace/Pair_T.inl
@@ -10,13 +10,13 @@ ACE_Reference_Pair<T1, T2>::ACE_Reference_Pair (T1 &t1,
 }
 
 template <class T1, class T2> ACE_INLINE T1 &
-ACE_Reference_Pair<T1, T2>::first (void) const
+ACE_Reference_Pair<T1, T2>::first () const
 {
   return this->first_;
 }
 
 template <class T1, class T2> ACE_INLINE T2 &
-ACE_Reference_Pair<T1, T2>::second (void) const
+ACE_Reference_Pair<T1, T2>::second () const
 {
   return this->second_;
 }
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index c362f07637a..919635917d8 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -21,7 +21,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Stream_Node)
 // Nodes.
 
 void
-ACE_Stream_Node::dump (void) const
+ACE_Stream_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream_Node::dump");
@@ -51,7 +51,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
   typedef std::list<const ACE_Static_Node *,
                     ACE_Allocator_Std_Adapter<const ACE_Static_Node *> > list_t;
 #else
-  typedef std::list<const ACE_Static_Node *> list_t;
+  using list_t = std::list<const ACE_Static_Node *>;
 #endif /* ACE_HAS_ALLOC_HOOKS */
   list_t mod_list;
   const ACE_Static_Node *module;
@@ -112,7 +112,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 ACE_ALLOC_HOOK_DEFINE (ACE_Parse_Node)
 
   void
-ACE_Parse_Node::dump (void) const
+ACE_Parse_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Parse_Node::dump");
@@ -120,14 +120,14 @@ ACE_Parse_Node::dump (void) const
 }
 
 const ACE_TCHAR *
-ACE_Parse_Node::name (void) const
+ACE_Parse_Node::name () const
 {
   ACE_TRACE ("ACE_Parse_Node::name");
   return this->name_;
 }
 
 ACE_Parse_Node *
-ACE_Parse_Node::link (void) const
+ACE_Parse_Node::link () const
 {
   ACE_TRACE ("ACE_Parse_Node::link");
   return this->next_;
@@ -157,7 +157,7 @@ ACE_Stream_Node::ACE_Stream_Node (const ACE_Static_Node *str_ops,
 }
 
 
-ACE_Stream_Node::~ACE_Stream_Node (void)
+ACE_Stream_Node::~ACE_Stream_Node ()
 {
   ACE_TRACE ("ACE_Stream_Node::~ACE_Stream_Node");
   ACE_Static_Node *n = const_cast<ACE_Static_Node *> (this->node_);
@@ -166,7 +166,7 @@ ACE_Stream_Node::~ACE_Stream_Node (void)
   delete m;
 }
 
-ACE_Parse_Node::ACE_Parse_Node (void)
+ACE_Parse_Node::ACE_Parse_Node ()
   : name_ (0),
     next_ (0)
 {
@@ -182,7 +182,7 @@ ACE_Parse_Node::ACE_Parse_Node (const ACE_TCHAR *nm)
 }
 
 void
-ACE_Parse_Node::print (void) const
+ACE_Parse_Node::print () const
 {
   ACE_TRACE ("ACE_Parse_Node::print");
 
@@ -195,7 +195,7 @@ ACE_Parse_Node::print (void) const
 }
 
 
-ACE_Parse_Node::~ACE_Parse_Node (void)
+ACE_Parse_Node::~ACE_Parse_Node ()
 {
   ACE_TRACE ("ACE_Parse_Node::~ACE_Parse_Node");
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -209,7 +209,7 @@ ACE_Parse_Node::~ACE_Parse_Node (void)
 ACE_ALLOC_HOOK_DEFINE (ACE_Suspend_Node)
 
   void
-ACE_Suspend_Node::dump (void) const
+ACE_Suspend_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Suspend_Node::dump");
@@ -222,14 +222,14 @@ ACE_Suspend_Node::ACE_Suspend_Node (const ACE_TCHAR *name)
   ACE_TRACE ("ACE_Suspend_Node::ACE_Suspend_Node");
 }
 
-ACE_Suspend_Node::~ACE_Suspend_Node (void)
+ACE_Suspend_Node::~ACE_Suspend_Node ()
 {
 }
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Resume_Node)
 
   void
-ACE_Resume_Node::dump (void) const
+ACE_Resume_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Resume_Node::dump");
@@ -242,7 +242,7 @@ ACE_Resume_Node::ACE_Resume_Node (const ACE_TCHAR *name)
   ACE_TRACE ("ACE_Resume_Node::ACE_Resume_Node");
 }
 
-ACE_Resume_Node::~ACE_Resume_Node (void)
+ACE_Resume_Node::~ACE_Resume_Node ()
 {
 }
 
@@ -283,7 +283,7 @@ ACE_Resume_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 ACE_ALLOC_HOOK_DEFINE (ACE_Remove_Node)
 
   void
-ACE_Remove_Node::dump (void) const
+ACE_Remove_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remove_Node::dump");
@@ -296,7 +296,7 @@ ACE_Remove_Node::ACE_Remove_Node (const ACE_TCHAR *name)
   ACE_TRACE ("ACE_Remove_Node::ACE_Remove_Node");
 }
 
-ACE_Remove_Node::~ACE_Remove_Node (void)
+ACE_Remove_Node::~ACE_Remove_Node ()
 {
 }
 
@@ -349,14 +349,14 @@ ACE_Dynamic_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 ACE_ALLOC_HOOK_DEFINE (ACE_Dynamic_Node)
 
   void
-ACE_Dynamic_Node::dump (void) const
+ACE_Dynamic_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Node::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Dynamic_Node::~ACE_Dynamic_Node (void)
+ACE_Dynamic_Node::~ACE_Dynamic_Node ()
 {
   ACE_TRACE ("ACE_Dynamic_Node::~ACE_Dynamic_Node");
 }
@@ -364,7 +364,7 @@ ACE_Dynamic_Node::~ACE_Dynamic_Node (void)
 ACE_ALLOC_HOOK_DEFINE (ACE_Static_Node)
 
   void
-ACE_Static_Node::dump (void) const
+ACE_Static_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Static_Node::dump");
@@ -392,7 +392,7 @@ ACE_Static_Node::record (const ACE_Service_Gestalt *config) const
 }
 
 ACE_TCHAR *
-ACE_Static_Node::parameters (void) const
+ACE_Static_Node::parameters () const
 {
   ACE_TRACE ("ACE_Static_Node::parameters");
   return this->parameters_;
@@ -416,7 +416,7 @@ ACE_Static_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 #endif /* ACE_NLOGGING */
 }
 
-ACE_Static_Node::~ACE_Static_Node (void)
+ACE_Static_Node::~ACE_Static_Node ()
 {
   ACE_TRACE ("ACE_Static_Node::~ACE_Static_Node");
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -430,14 +430,14 @@ ACE_Static_Node::~ACE_Static_Node (void)
 ACE_ALLOC_HOOK_DEFINE (ACE_Location_Node)
 
   void
-ACE_Location_Node::dump (void) const
+ACE_Location_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Location_Node::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Location_Node::ACE_Location_Node (void)
+ACE_Location_Node::ACE_Location_Node ()
   : pathname_ (0),
     must_delete_ (0),
     dll_ (),
@@ -446,19 +446,19 @@ ACE_Location_Node::ACE_Location_Node (void)
   ACE_TRACE ("ACE_Location_Node::ACE_Location_Node");
 }
 
-ACE_Location_Node::~ACE_Location_Node (void)
+ACE_Location_Node::~ACE_Location_Node ()
 {
   ACE_TRACE ("ACE_Location_Node::~ACE_Location_Node");
 }
 
 const ACE_DLL &
-ACE_Location_Node::dll (void)
+ACE_Location_Node::dll ()
 {
   return this->dll_;
 }
 
 const ACE_TCHAR *
-ACE_Location_Node::pathname (void) const
+ACE_Location_Node::pathname () const
 {
   ACE_TRACE ("ACE_Location_Node::pathname");
   return this->pathname_;
@@ -472,7 +472,7 @@ ACE_Location_Node::pathname (const ACE_TCHAR *p)
 }
 
 int
-ACE_Location_Node::dispose (void) const
+ACE_Location_Node::dispose () const
 {
   ACE_TRACE ("ACE_Location_Node::dispose");
   return this->must_delete_;
@@ -522,7 +522,7 @@ ACE_Location_Node::set_symbol (void *s)
 ACE_ALLOC_HOOK_DEFINE (ACE_Object_Node)
 
   void
-ACE_Object_Node::dump (void) const
+ACE_Object_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Object_Node::dump");
@@ -574,7 +574,7 @@ ACE_Object_Node::symbol (ACE_Service_Gestalt *,
   return 0;
 }
 
-ACE_Object_Node::~ACE_Object_Node (void)
+ACE_Object_Node::~ACE_Object_Node ()
 {
   ACE_TRACE ("ACE_Object_Node::~ACE_Object_Node");
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -587,7 +587,7 @@ ACE_Object_Node::~ACE_Object_Node (void)
 ACE_ALLOC_HOOK_DEFINE (ACE_Function_Node)
 
   void
-ACE_Function_Node::dump (void) const
+ACE_Function_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Function_Node::dump");
@@ -668,8 +668,7 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
                            int &yyerrno,
                            ACE_Service_Object_Exterminator *gobbler)
 {
-  typedef ACE_Service_Object *(*ACE_Service_Factory_Ptr)
-    (ACE_Service_Object_Exterminator *);
+  using ACE_Service_Factory_Ptr = ACE_Service_Object *(*)(ACE_Service_Object_Exterminator *);
 
   ACE_TRACE ("ACE_Function_Node::symbol");
   if (this->open_dll (yyerrno) == 0)
@@ -728,7 +727,7 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
   return this->symbol_;
 }
 
-ACE_Function_Node::~ACE_Function_Node (void)
+ACE_Function_Node::~ACE_Function_Node ()
 {
   ACE_TRACE ("ACE_Function_Node::~ACE_Function_Node");
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -743,7 +742,7 @@ ACE_Function_Node::~ACE_Function_Node (void)
 ACE_ALLOC_HOOK_DEFINE (ACE_Dummy_Node)
 
   void
-ACE_Dummy_Node::dump (void) const
+ACE_Dummy_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dummy_Node::dump");
@@ -775,7 +774,7 @@ ACE_Dummy_Node::apply (ACE_Service_Gestalt *, int &yyerrno)
 #endif /* ACE_NLOGGING */
 }
 
-ACE_Dummy_Node::~ACE_Dummy_Node (void)
+ACE_Dummy_Node::~ACE_Dummy_Node ()
 {
   ACE_TRACE ("ACE_Dummy_Node::~ACE_Dummy_Node");
   ACE_Static_Node *n = const_cast<ACE_Static_Node *> (this->node_);
@@ -787,7 +786,7 @@ ACE_Dummy_Node::~ACE_Dummy_Node (void)
 ACE_ALLOC_HOOK_DEFINE (ACE_Static_Function_Node)
 
   void
-ACE_Static_Function_Node::dump (void) const
+ACE_Static_Function_Node::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Static_Function_Node::dump");
@@ -864,7 +863,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config,
   return this->symbol_;
 }
 
-ACE_Static_Function_Node::~ACE_Static_Function_Node (void)
+ACE_Static_Function_Node::~ACE_Static_Function_Node ()
 {
   ACE_TRACE ("ACE_Static_Function_Node::~ACE_Static_Function_Node");
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -888,7 +887,7 @@ ACE_Service_Type_Factory::ACE_Service_Type_Factory (ACE_TCHAR const *name,
 }
 
 
-ACE_Service_Type_Factory::~ACE_Service_Type_Factory (void)
+ACE_Service_Type_Factory::~ACE_Service_Type_Factory ()
 {
 }
 
@@ -941,7 +940,7 @@ ACE_Service_Type_Factory::make_service_type (ACE_Service_Gestalt *cfg) const
 }
 
 ACE_TCHAR const*
-ACE_Service_Type_Factory::name (void) const
+ACE_Service_Type_Factory::name () const
 {
   return name_.c_str ();
 }
diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h
index 34625229188..ffc9c419807 100644
--- a/ACE/ace/Parse_Node.h
+++ b/ACE/ace/Parse_Node.h
@@ -60,7 +60,7 @@ public:
   void print (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -92,7 +92,7 @@ public:
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -120,7 +120,7 @@ public:
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -148,7 +148,7 @@ public:
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -179,7 +179,7 @@ public:
   ACE_TCHAR *parameters (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -216,7 +216,7 @@ public:
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -248,7 +248,7 @@ public:
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -280,7 +280,7 @@ public:
   virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -323,7 +323,7 @@ public:
                         ACE_Service_Object_Exterminator * = 0) = 0;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -371,7 +371,7 @@ public:
   virtual ~ACE_Object_Node (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -404,7 +404,7 @@ public:
   virtual ~ACE_Function_Node (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -461,7 +461,7 @@ public:
   virtual ~ACE_Static_Function_Node (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Ping_Socket.cpp b/ACE/ace/Ping_Socket.cpp
index 3779ca2526a..d806a30b1ee 100644
--- a/ACE/ace/Ping_Socket.cpp
+++ b/ACE/ace/Ping_Socket.cpp
@@ -87,12 +87,12 @@ ACE_Time_Value const ACE_Ping_Socket::time_default_ (0, 500000);
 
 
 void
-ACE_Ping_Socket::dump (void) const
+ACE_Ping_Socket::dump () const
 {
   ACE_TRACE ("ACE_Ping_Socket::dump");
 }
 
-ACE_Ping_Socket::ACE_Ping_Socket (void)
+ACE_Ping_Socket::ACE_Ping_Socket ()
 {
   ACE_TRACE ("ACE_Ping_Socket::ACE_Ping_Socket");
 }
@@ -126,7 +126,7 @@ ACE_Ping_Socket::ACE_Ping_Socket (ACE_Addr const & local,
                         sizeof (size));
 }
 
-ACE_Ping_Socket::~ACE_Ping_Socket (void)
+ACE_Ping_Socket::~ACE_Ping_Socket ()
 {
   ACE_TRACE ("ACE_Ping_Socket::~ACE_Ping_Socket");
 }
diff --git a/ACE/ace/Ping_Socket.h b/ACE/ace/Ping_Socket.h
index 7b05fec41e5..7391660de18 100644
--- a/ACE/ace/Ping_Socket.h
+++ b/ACE/ace/Ping_Socket.h
@@ -70,7 +70,7 @@ public:
   char * icmp_recv_buff (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp
index 7384dcc6332..0ae4f4cd13c 100644
--- a/ACE/ace/Pipe.cpp
+++ b/ACE/ace/Pipe.cpp
@@ -29,7 +29,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-ACE_Pipe::dump (void) const
+ACE_Pipe::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Pipe::dump");
@@ -264,7 +264,7 @@ ACE_Pipe::open (ACE_HANDLE handles[2])
 
 // Do nothing...
 
-ACE_Pipe::ACE_Pipe (void)
+ACE_Pipe::ACE_Pipe ()
 {
   ACE_TRACE ("ACE_Pipe::ACE_Pipe");
 
@@ -290,7 +290,7 @@ ACE_Pipe::ACE_Pipe (ACE_HANDLE read,
 }
 
 int
-ACE_Pipe::close (void)
+ACE_Pipe::close ()
 {
   ACE_TRACE ("ACE_Pipe::close");
 
@@ -300,12 +300,12 @@ ACE_Pipe::close (void)
 }
 
 int
-ACE_Pipe::close_read (void)
+ACE_Pipe::close_read ()
 {
   return this->close_handle (0);
 }
 
-int ACE_Pipe::close_write (void)
+int ACE_Pipe::close_write ()
 {
   return this->close_handle (1);
 }
diff --git a/ACE/ace/Pipe.h b/ACE/ace/Pipe.h
index 5aa2b038d51..d118479141e 100644
--- a/ACE/ace/Pipe.h
+++ b/ACE/ace/Pipe.h
@@ -82,7 +82,7 @@ public:
   ACE_HANDLE write_handle (void) const;
 
   /// Dump the state of the object.
-  void dump (void) const;
+  void dump () const;
 
   /// send upto @a n bytes in @a buf.
   ssize_t send (const void *buf, size_t n) const;
diff --git a/ACE/ace/Priority_Reactor.cpp b/ACE/ace/Priority_Reactor.cpp
index dbb29c3cbe2..e4418972540 100644
--- a/ACE/ace/Priority_Reactor.cpp
+++ b/ACE/ace/Priority_Reactor.cpp
@@ -5,10 +5,10 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-typedef ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple> QUEUE_ITERATOR;
+using QUEUE_ITERATOR = ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple>;
 // Its iterator.
 
-typedef ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_SYNCH_NULL_MUTEX> TUPLE_ALLOCATOR;
+using TUPLE_ALLOCATOR = ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_MT_SYNCH::NULL_MUTEX>;
 // Defines the memory allocator used, no need for locking because it
 // is only used in one thread of control.
 
@@ -20,7 +20,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Priority_Reactor)
         ACE_Event_Handler::HI_PRIORITY-ACE_Event_Handler::LO_PRIORITY+1
 
 void
-ACE_Priority_Reactor::init_bucket (void)
+ACE_Priority_Reactor::init_bucket ()
 {
   // Allocate enough space for all the handles.
   // TODO: This can be wrong, maybe we should use other kind of
@@ -65,7 +65,7 @@ ACE_Priority_Reactor::ACE_Priority_Reactor (size_t size,
   this->init_bucket ();
 }
 
-ACE_Priority_Reactor::~ACE_Priority_Reactor (void)
+ACE_Priority_Reactor::~ACE_Priority_Reactor ()
 {
   ACE_TRACE ("ACE_Priority_Reactor::~ACE_Priority_Reactor");
 
@@ -179,7 +179,7 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
 }
 
 void
-ACE_Priority_Reactor::dump (void) const
+ACE_Priority_Reactor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Priority_Reactor::dump");
diff --git a/ACE/ace/Priority_Reactor.h b/ACE/ace/Priority_Reactor.h
index 9e4aa16026f..0ff760895bd 100644
--- a/ACE/ace/Priority_Reactor.h
+++ b/ACE/ace/Priority_Reactor.h
@@ -49,7 +49,7 @@ public:
   virtual ~ACE_Priority_Reactor (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index 420379b359e..0c09737d542 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -61,23 +61,23 @@ public:
   explicit ACE_Proactor_Timer_Handler (ACE_Proactor &proactor);
 
   /// Destructor.
-  virtual ~ACE_Proactor_Timer_Handler (void);
+  ~ACE_Proactor_Timer_Handler () override;
 
   /// Proactor calls this to shut down the timer handler
   /// gracefully. Just calling the destructor alone doesnt do what
   /// <destroy> does. <destroy> make sure the thread exits properly.
-  int destroy (void);
+  int destroy ();
 
   /// Proactor calls this to refresh the timer event thread, to wake
   /// up the thread from a sleep.  This is needed to make the thread
   /// recompute its sleep time after changes to the timer queue.
-  int signal (void);
+  int signal ();
 
 protected:
   /// Run by a daemon thread to handle deferred processing. In other
   /// words, this method will do the waiting on the earliest timer and
   /// event.
-  virtual int svc (void);
+  int svc () override;
 
   /// Event to wait on.
   ACE_Auto_Event timer_event_;
@@ -96,13 +96,13 @@ ACE_Proactor_Timer_Handler::ACE_Proactor_Timer_Handler (ACE_Proactor &proactor)
 {
 }
 
-ACE_Proactor_Timer_Handler::~ACE_Proactor_Timer_Handler (void)
+ACE_Proactor_Timer_Handler::~ACE_Proactor_Timer_Handler ()
 {
   this->destroy();
 }
 
 int
-ACE_Proactor_Timer_Handler::destroy (void)
+ACE_Proactor_Timer_Handler::destroy ()
 {
   // Mark for closing down.
   this->shutting_down_ = 1;
@@ -116,13 +116,13 @@ ACE_Proactor_Timer_Handler::destroy (void)
 }
 
 int
-ACE_Proactor_Timer_Handler::signal (void)
+ACE_Proactor_Timer_Handler::signal ()
 {
   return this->timer_event_.signal ();
 }
 
 int
-ACE_Proactor_Timer_Handler::svc (void)
+ACE_Proactor_Timer_Handler::svc ()
 {
   ACE_Time_Value absolute_time;
   ACE_Time_Value relative_time;
@@ -178,7 +178,7 @@ ACE_Proactor_Timer_Handler::svc (void)
 
 // *********************************************************************
 
-ACE_Proactor_Handle_Timeout_Upcall::ACE_Proactor_Handle_Timeout_Upcall (void)
+ACE_Proactor_Handle_Timeout_Upcall::ACE_Proactor_Handle_Timeout_Upcall ()
   : proactor_ (0)
 {
 }
@@ -243,11 +243,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &,
                        ACE_TEXT ("create_asynch_timer failed")),
                       -1);
 
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<ACE_Asynch_Result_Impl> safe_asynch_timer (asynch_timer);
-#else
-  auto_ptr<ACE_Asynch_Result_Impl> safe_asynch_timer (asynch_timer);
-#endif /* ACE_HAS_CPP11 */
 
   // Post a completion.
   if (-1 == safe_asynch_timer->post_completion
@@ -365,7 +361,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
                 ACE_TEXT ("Task::activate:could not create thread\n")));
 }
 
-ACE_Proactor::~ACE_Proactor (void)
+ACE_Proactor::~ACE_Proactor ()
 {
   this->close ();
 }
@@ -413,7 +409,7 @@ ACE_Proactor::instance (ACE_Proactor * r, bool delete_proactor)
 }
 
 void
-ACE_Proactor::close_singleton (void)
+ACE_Proactor::close_singleton ()
 {
   ACE_TRACE ("ACE_Proactor::close_singleton");
 
@@ -429,13 +425,13 @@ ACE_Proactor::close_singleton (void)
 }
 
 const ACE_TCHAR *
-ACE_Proactor::dll_name (void)
+ACE_Proactor::dll_name ()
 {
   return ACE_TEXT ("ACE");
 }
 
 const ACE_TCHAR *
-ACE_Proactor::name (void)
+ACE_Proactor::name ()
 {
   return ACE_TEXT ("ACE_Proactor");
 }
@@ -563,7 +559,7 @@ ACE_Proactor::proactor_run_event_loop (ACE_Time_Value &tv,
 }
 
 int
-ACE_Proactor::proactor_reset_event_loop(void)
+ACE_Proactor::proactor_reset_event_loop()
 {
   ACE_TRACE ("ACE_Proactor::proactor_reset_event_loop");
 
@@ -575,7 +571,7 @@ ACE_Proactor::proactor_reset_event_loop(void)
 }
 
 int
-ACE_Proactor::proactor_end_event_loop (void)
+ACE_Proactor::proactor_end_event_loop ()
 {
   ACE_TRACE ("ACE_Proactor::proactor_end_event_loop");
 
@@ -601,7 +597,7 @@ ACE_Proactor::proactor_end_event_loop (void)
 }
 
 int
-ACE_Proactor::proactor_event_loop_done (void)
+ACE_Proactor::proactor_event_loop_done ()
 {
   ACE_TRACE ("ACE_Proactor::proactor_event_loop_done");
 
@@ -611,7 +607,7 @@ ACE_Proactor::proactor_event_loop_done (void)
 }
 
 int
-ACE_Proactor::close (void)
+ACE_Proactor::close ()
 {
   // Close the implementation.
   if (this->implementation ()->close () == -1)
@@ -731,13 +727,13 @@ ACE_Proactor::handle_events (ACE_Time_Value &wait_time)
 }
 
 int
-ACE_Proactor::handle_events (void)
+ACE_Proactor::handle_events ()
 {
   return this->implementation ()->handle_events ();
 }
 
 int
-ACE_Proactor::wake_up_dispatch_threads (void)
+ACE_Proactor::wake_up_dispatch_threads ()
 {
   return 0;
 }
@@ -749,7 +745,7 @@ ACE_Proactor::close_dispatch_threads (int)
 }
 
 size_t
-ACE_Proactor::number_of_threads (void) const
+ACE_Proactor::number_of_threads () const
 {
   return this->implementation ()->number_of_threads ();
 }
@@ -761,7 +757,7 @@ ACE_Proactor::number_of_threads (size_t threads)
 }
 
 ACE_Proactor_Timer_Queue *
-ACE_Proactor::timer_queue (void) const
+ACE_Proactor::timer_queue () const
 {
   return this->timer_queue_;
 }
@@ -794,7 +790,7 @@ ACE_Proactor::timer_queue (ACE_Proactor_Timer_Queue *tq)
     }
 
   // Set the proactor in the timer queue's functor
-  typedef ACE_Timer_Queue_Upcall_Base<ACE_Handler*,ACE_Proactor_Handle_Timeout_Upcall> TQ_Base;
+  using TQ_Base = ACE_Timer_Queue_Upcall_Base<ACE_Handler *, ACE_Proactor_Handle_Timeout_Upcall>;
 
   TQ_Base * tqb = dynamic_cast<TQ_Base*> (this->timer_queue_);
 
@@ -805,68 +801,68 @@ ACE_Proactor::timer_queue (ACE_Proactor_Timer_Queue *tq)
 }
 
 ACE_HANDLE
-ACE_Proactor::get_handle (void) const
+ACE_Proactor::get_handle () const
 {
   return this->implementation ()->get_handle ();
 }
 
 ACE_Proactor_Impl *
-ACE_Proactor::implementation (void) const
+ACE_Proactor::implementation () const
 {
   return this->implementation_;
 }
 
 
 ACE_Asynch_Read_Stream_Impl *
-ACE_Proactor::create_asynch_read_stream (void)
+ACE_Proactor::create_asynch_read_stream ()
 {
   return this->implementation ()->create_asynch_read_stream ();
 }
 
 ACE_Asynch_Write_Stream_Impl *
-ACE_Proactor::create_asynch_write_stream (void)
+ACE_Proactor::create_asynch_write_stream ()
 {
   return this->implementation ()->create_asynch_write_stream ();
 }
 
 ACE_Asynch_Read_Dgram_Impl *
-ACE_Proactor::create_asynch_read_dgram (void)
+ACE_Proactor::create_asynch_read_dgram ()
 {
   return this->implementation ()->create_asynch_read_dgram ();
 }
 
 ACE_Asynch_Write_Dgram_Impl *
-ACE_Proactor::create_asynch_write_dgram (void)
+ACE_Proactor::create_asynch_write_dgram ()
 {
   return this->implementation ()->create_asynch_write_dgram ();
 }
 
 ACE_Asynch_Read_File_Impl *
-ACE_Proactor::create_asynch_read_file (void)
+ACE_Proactor::create_asynch_read_file ()
 {
   return this->implementation ()->create_asynch_read_file ();
 }
 
 ACE_Asynch_Write_File_Impl *
-ACE_Proactor::create_asynch_write_file (void)
+ACE_Proactor::create_asynch_write_file ()
 {
   return this->implementation ()->create_asynch_write_file ();
 }
 
 ACE_Asynch_Accept_Impl *
-ACE_Proactor::create_asynch_accept (void)
+ACE_Proactor::create_asynch_accept ()
 {
   return this->implementation ()->create_asynch_accept ();
 }
 
 ACE_Asynch_Connect_Impl *
-ACE_Proactor::create_asynch_connect (void)
+ACE_Proactor::create_asynch_connect ()
 {
   return this->implementation ()->create_asynch_connect ();
 }
 
 ACE_Asynch_Transmit_File_Impl *
-ACE_Proactor::create_asynch_transmit_file (void)
+ACE_Proactor::create_asynch_transmit_file ()
 {
   return this->implementation ()->create_asynch_transmit_file ();
 }
diff --git a/ACE/ace/Proactor_Impl.cpp b/ACE/ace/Proactor_Impl.cpp
index 9cf5f4795da..a1e2175bd7a 100644
--- a/ACE/ace/Proactor_Impl.cpp
+++ b/ACE/ace/Proactor_Impl.cpp
@@ -6,7 +6,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Proactor_Impl::~ACE_Proactor_Impl (void)
+ACE_Proactor_Impl::~ACE_Proactor_Impl ()
 {
 }
 
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index ed29ffd5c5a..1da8d0f8039 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -41,7 +41,7 @@ sigchld_nop (int, siginfo_t *, ucontext_t *)
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Process::ACE_Process (void)
+ACE_Process::ACE_Process ()
   :
 #if !defined (ACE_WIN32)
   child_id_ (ACE_INVALID_PID),
@@ -55,7 +55,7 @@ ACE_Process::ACE_Process (void)
 #endif /* ACE_WIN32 */
 }
 
-ACE_Process::~ACE_Process (void)
+ACE_Process::~ACE_Process ()
 {
 #if defined (ACE_WIN32)
   // Free resources allocated in kernel.
@@ -577,13 +577,13 @@ ACE_Process::child (pid_t)
 }
 
 void
-ACE_Process::unmanage (void)
+ACE_Process::unmanage ()
 {
   // nothing to do
 }
 
 int
-ACE_Process::running (void) const
+ACE_Process::running () const
 {
 #if defined (ACE_WIN32)
     DWORD code;
@@ -731,7 +731,7 @@ ACE_Process::wait (const ACE_Time_Value &tv,
 }
 
 void
-ACE_Process::close_dup_handles (void)
+ACE_Process::close_dup_handles ()
 {
   if (this->dup_handles_.num_set () > 0)
     {
@@ -746,7 +746,7 @@ ACE_Process::close_dup_handles (void)
 }
 
 void
-ACE_Process::close_passed_handles (void)
+ACE_Process::close_passed_handles ()
 {
   if (this->handles_passed_.num_set () > 0)
     {
@@ -971,7 +971,7 @@ ACE_Process_Options::inherit_environment (void)
 #else /* defined ACE_WIN32 */
 
 ACE_TCHAR * const *
-ACE_Process_Options::env_argv (void)
+ACE_Process_Options::env_argv ()
 {
   return environment_argv_;
 }
@@ -1242,7 +1242,7 @@ ACE_Process_Options::release_handles ()
 #endif /* !ACE_HAS_WINCE */
 
 
-ACE_Process_Options::~ACE_Process_Options (void)
+ACE_Process_Options::~ACE_Process_Options ()
 {
 #if !defined (ACE_HAS_WINCE)
   release_handles();
@@ -1371,7 +1371,7 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...)
 #endif // ACE_LACKS_VA_FUNCTIONS
 
 ACE_TCHAR *
-ACE_Process_Options::env_buf (void)
+ACE_Process_Options::env_buf ()
 {
 #if !defined (ACE_HAS_WINCE)
   if (environment_buf_[0] == '\0')
@@ -1384,7 +1384,7 @@ ACE_Process_Options::env_buf (void)
 }
 
 ACE_TCHAR * const *
-ACE_Process_Options::command_line_argv (void)
+ACE_Process_Options::command_line_argv ()
 {
   if (!command_line_argv_calculated_)
     {
@@ -1453,14 +1453,14 @@ ACE_Process_Options::passed_handles (ACE_Handle_Set &set) const
   return 1;
 }
 
-ACE_Managed_Process::~ACE_Managed_Process (void)
+ACE_Managed_Process::~ACE_Managed_Process ()
 {
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Managed_Process)
 
 void
-ACE_Managed_Process::unmanage (void)
+ACE_Managed_Process::unmanage ()
 {
   delete this;
 }
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 1465103ef63..90adcae52fc 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -86,7 +86,7 @@ public:
                        size_t max_cmdline_args = MAX_COMMAND_LINE_OPTIONS);
 
   /// Destructor.
-  ~ACE_Process_Options (void);
+  ~ACE_Process_Options ();
 
   // = Methods to set process creation options portably.
 
@@ -112,7 +112,7 @@ public:
                    ACE_HANDLE std_err = ACE_INVALID_HANDLE);
 
   /// Release the standard handles previously set with set_handles;
-  void release_handles (void);
+  void release_handles ();
 
 #ifndef ACE_LACKS_VA_FUNCTIONS
   /// @param format must be of the form "VARIABLE=VALUE".  There can not be
@@ -189,10 +189,10 @@ public:
 
   /// Return the process_name.  If the <process_name(name)> set
   /// method is not called, this method will return argv[0].
-  const ACE_TCHAR *process_name (void);
+  const ACE_TCHAR *process_name ();
 
   /// Get the creation flags.
-  u_long creation_flags (void) const;
+  u_long creation_flags () const;
 
   /**
    * Set the creation flags to affect how a new process is spawned.
@@ -208,7 +208,7 @@ public:
   void creation_flags (u_long);
 
   /// Current working directory.  Returns "" if nothing has been set.
-  ACE_TCHAR *working_directory (void);
+  ACE_TCHAR *working_directory ();
 
   /// Buffer of command-line options.  Returns a pointer to a buffer that
   /// contains the list of command line options.  Prior to a call to
@@ -229,18 +229,18 @@ public:
    * and returned with each entry pointing to the start of
    * null-terminated string.  Returns { 0 } if nothing has been set.
    */
-  ACE_TCHAR * const *command_line_argv (void);
+  ACE_TCHAR * const *command_line_argv ();
 
   /**
    * Null-terminated buffer of null terminated strings.  Each string
    * is an environment assignment "VARIABLE=value".  This buffer
    * should end with two null characters.
    */
-  ACE_TCHAR *env_buf (void);
+  ACE_TCHAR *env_buf ();
 
   /// Get the process group.  On UNIX, these methods are used by the
   /// ACE_Process_Manager to manage groups of processes.
-  pid_t getgroup (void) const;
+  pid_t getgroup () const;
 
   /// Set the process group.  On UNIX, these methods are used by the
   /// ACE_Process_Manager to manage groups of processes.
@@ -254,7 +254,7 @@ public:
   /// ACE_Process_Options::set_handles() you must not call
   /// handle_inheritance(false). Doing so will prevent the duplicated handles
   /// from surviving in the created process.
-  int handle_inheritance (void);
+  int handle_inheritance ();
   void handle_inheritance (int);
 
   /// Cause the specified handle to be passed to a child process
@@ -291,17 +291,17 @@ public:
   void avoid_zombies (int);
 
   /// Get current value for avoid_zombies.
-  int avoid_zombies (void);
+  int avoid_zombies ();
 
   /// Enable the use of a Unicode environment.  This only makes sense
   /// for Win32 when ACE_USES_WCHAR is not defined.
-  void enable_unicode_environment (void);
+  void enable_unicode_environment ();
 
   /// Disable the use of a Unicode environment.
-  void disable_unicode_environment (void);
+  void disable_unicode_environment ();
 
   /// Return the unicode environment status
-  bool use_unicode_environment (void) const;
+  bool use_unicode_environment () const;
 
 #if defined (ACE_WIN32)
   // = Non-portable accessors for when you "just have to use them."
@@ -336,12 +336,12 @@ public:
 #else /* All things not WIN32 */
 
   /// argv-style array of environment settings.
-  ACE_TCHAR *const *env_argv (void);
+  ACE_TCHAR *const *env_argv ();
 
   // = Accessors for the standard handles.
-  ACE_HANDLE get_stdin (void) const;
-  ACE_HANDLE get_stdout (void) const;
-  ACE_HANDLE get_stderr (void) const;
+  ACE_HANDLE get_stdin () const;
+  ACE_HANDLE get_stdout () const;
+  ACE_HANDLE get_stderr () const;
 
   // = Set/get real & effective user & group id associated with user.
   int setreugid (const ACE_TCHAR* user);
@@ -349,15 +349,15 @@ public:
   void seteuid (uid_t id);
   void setrgid (uid_t id);
   void setegid (uid_t id);
-  uid_t getruid (void) const;
-  uid_t geteuid (void) const;
-  uid_t getrgid (void) const;
-  uid_t getegid (void) const;
+  uid_t getruid () const;
+  uid_t geteuid () const;
+  uid_t getrgid () const;
+  uid_t getegid () const;
 
   /**
    * Get the inherit_environment flag.
    */
-  bool inherit_environment (void) const;
+  bool inherit_environment () const;
 
   /**
    * Set the inherit_environment flag.
@@ -517,10 +517,10 @@ public:
   friend class ACE_Process_Manager;
 
   /// Default construction.  Use ACE_Process::spawn() to start a process.
-  ACE_Process (void);
+  ACE_Process ();
 
   /// Destructor.
-  virtual ~ACE_Process (void);
+  virtual ~ACE_Process ();
 
   /**
    * Called back from spawn() just before spawning the child.  If this
@@ -563,7 +563,7 @@ public:
 
   /// Called by a ACE_Process_Manager that is removing this object from
   /// its table of managed processes. Default is to do nothing.
-  virtual void unmanage (void);
+  virtual void unmanage ();
 
   /**
    * Wait for a previously spawned process to exit.
@@ -608,44 +608,44 @@ public:
    * This call doesn't give the process a chance to cleanup, so use it
    * with caution.
    */
-  int terminate (void);
+  int terminate ();
 
   /// Return the process id of the new child process.
-  pid_t getpid (void) const;
+  pid_t getpid () const;
 
   /// Return the handle of the process, if it has one.
-  ACE_HANDLE gethandle (void) const;
+  ACE_HANDLE gethandle () const;
 
   /// Return 1 if running; 0 otherwise.
-  int running (void) const;
+  int running () const;
 
   /// Return the process's exit code.  This method returns the raw
   /// exit status returned from system APIs (such as @c wait() or
   /// @c waitpid() ).  This value is system dependent.
-  ACE_exitcode exit_code (void) const;
+  ACE_exitcode exit_code () const;
 
   /// Return the process's return value.  This method returns the
   /// actual return value that a child process returns or exits with.
-  int return_value (void) const;
+  int return_value () const;
 
   /// Close all the handles in the set obtained from the
   /// @a ACE_Process_Options::dup_handles object used to spawn
   /// the process.
-  void close_dup_handles (void);
+  void close_dup_handles ();
 
   /// Close all the passed handles in the set obtained from the
   /// ACE_Process_Options object used to spawn the process.
-  void close_passed_handles (void);
+  void close_passed_handles ();
 
 #if defined (ACE_WIN32)
   PROCESS_INFORMATION process_info (void);
 #endif /* ACE_WIN32 */
 
 private:
-
-  // Disallow copying and assignment since we don't support this (yet).
-  ACE_Process (const ACE_Process &);
-  void operator= (const ACE_Process &);
+  ACE_Process (const ACE_Process &) = delete;
+  void operator= (const ACE_Process &) = delete;
+  ACE_Process (ACE_Process &&) = delete;
+  void operator= (ACE_Process &&) = delete;
 
 protected:
   /// Set this process's exit code.  ACE_Process_Manager uses this
@@ -689,14 +689,14 @@ class ACE_Export ACE_Managed_Process : public ACE_Process
 public:
 
   /// Cleanup by deleting @c this.
-  virtual void unmanage (void);
+  virtual void unmanage ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
 
   /// Make sure that we're allocated dynamically!
-  virtual ~ACE_Managed_Process (void);
+  virtual ~ACE_Managed_Process ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl
index 66241f43661..f1bacf8d431 100644
--- a/ACE/ace/Process.inl
+++ b/ACE/ace/Process.inl
@@ -8,19 +8,19 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
-ACE_Process_Options::enable_unicode_environment (void)
+ACE_Process_Options::enable_unicode_environment ()
 {
   this->use_unicode_environment_ = true;
 }
 
 ACE_INLINE void
-ACE_Process_Options::disable_unicode_environment (void)
+ACE_Process_Options::disable_unicode_environment ()
 {
   this->use_unicode_environment_ = false;
 }
 
 ACE_INLINE bool
-ACE_Process_Options::use_unicode_environment (void) const
+ACE_Process_Options::use_unicode_environment () const
 {
   return this->use_unicode_environment_;
 }
@@ -35,7 +35,7 @@ ACE_Process::process_info (void)
 #endif /* ACE_WIN32 */
 
 ACE_INLINE ACE_HANDLE
-ACE_Process::gethandle (void) const
+ACE_Process::gethandle () const
 {
 #if defined (ACE_WIN32)
   return process_info_.hProcess;
@@ -45,7 +45,7 @@ ACE_Process::gethandle (void) const
 }
 
 ACE_INLINE pid_t
-ACE_Process::getpid (void) const
+ACE_Process::getpid () const
 {
 #if defined (ACE_WIN32)
   return process_info_.dwProcessId;
@@ -82,7 +82,7 @@ ACE_Process::kill (int signum)
 }
 
 ACE_INLINE int
-ACE_Process::terminate (void)
+ACE_Process::terminate ()
 {
   if (this->getpid () != -1)
     return ACE::terminate_process (this->getpid ());
@@ -91,7 +91,7 @@ ACE_Process::terminate (void)
 }
 
 ACE_INLINE int
-ACE_Process::return_value (void) const
+ACE_Process::return_value () const
 {
 #if defined (ACE_WIN32)
   return this->exit_code_;
@@ -101,7 +101,7 @@ ACE_Process::return_value (void) const
 }
 
 ACE_INLINE ACE_exitcode
-ACE_Process::exit_code (void) const
+ACE_Process::exit_code () const
 {
   return this->exit_code_;
 }
@@ -113,7 +113,7 @@ ACE_Process::exit_code (ACE_exitcode code)
 }
 
 ACE_INLINE u_long
-ACE_Process_Options::creation_flags (void) const
+ACE_Process_Options::creation_flags () const
 {
 #if defined (ACE_USES_WCHAR) && defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   return creation_flags_ | CREATE_UNICODE_ENVIRONMENT;
@@ -129,7 +129,7 @@ ACE_Process_Options::creation_flags (u_long cf)
 }
 
 ACE_INLINE pid_t
-ACE_Process_Options::getgroup (void) const
+ACE_Process_Options::getgroup () const
 {
   return process_group_;
 }
@@ -143,7 +143,7 @@ ACE_Process_Options::setgroup (pid_t pgrp)
 }
 
 ACE_INLINE int
-ACE_Process_Options::handle_inheritance (void)
+ACE_Process_Options::handle_inheritance ()
 {
   return handle_inheritance_;
 }
@@ -155,7 +155,7 @@ ACE_Process_Options::handle_inheritance (int hi)
 }
 
 ACE_INLINE int
-ACE_Process_Options::avoid_zombies (void)
+ACE_Process_Options::avoid_zombies ()
 {
   return avoid_zombies_;
 }
@@ -227,25 +227,25 @@ ACE_INLINE HANDLE ACE_Process_Options::get_user_token (void) const
 #else /* !defined (ACE_WIN32) */
 
 ACE_INLINE ACE_HANDLE
-ACE_Process_Options::get_stdin (void) const
+ACE_Process_Options::get_stdin () const
 {
   return stdin_;
 }
 
 ACE_INLINE ACE_HANDLE
-ACE_Process_Options::get_stdout (void) const
+ACE_Process_Options::get_stdout () const
 {
   return stdout_;
 }
 
 ACE_INLINE ACE_HANDLE
-ACE_Process_Options::get_stderr (void) const
+ACE_Process_Options::get_stderr () const
 {
   return stderr_;
 }
 
 ACE_INLINE bool
-ACE_Process_Options::inherit_environment (void) const
+ACE_Process_Options::inherit_environment () const
 {
   return inherit_environment_;
 }
@@ -303,25 +303,25 @@ ACE_Process_Options::setegid (uid_t id)
 }
 
 ACE_INLINE uid_t
-ACE_Process_Options::getruid (void) const
+ACE_Process_Options::getruid () const
 {
   return this->ruid_;
 }
 
 ACE_INLINE uid_t
-ACE_Process_Options::geteuid (void) const
+ACE_Process_Options::geteuid () const
 {
   return this->euid_;
 }
 
 ACE_INLINE uid_t
-ACE_Process_Options::getrgid (void) const
+ACE_Process_Options::getrgid () const
 {
   return this->rgid_;
 }
 
 ACE_INLINE uid_t
-ACE_Process_Options::getegid (void) const
+ACE_Process_Options::getegid () const
 {
   return this->egid_;
 }
@@ -336,7 +336,7 @@ ACE_Process_Options::command_line_buf (size_t *max_lenp)
 }
 
 ACE_INLINE ACE_TCHAR *
-ACE_Process_Options::working_directory (void)
+ACE_Process_Options::working_directory ()
 {
 #if !defined (ACE_HAS_WINCE)
   if (working_directory_[0] == '\0')
@@ -377,7 +377,7 @@ ACE_Process_Options::process_name (const ACE_TCHAR *p)
 }
 
 ACE_INLINE const ACE_TCHAR *
-ACE_Process_Options::process_name (void)
+ACE_Process_Options::process_name ()
 {
   if (process_name_[0] == '\0')
     this->process_name (this->command_line_argv ()[0]);
diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp
index 4db0f020eed..6990ba40eec 100644
--- a/ACE/ace/Process_Manager.cpp
+++ b/ACE/ace/Process_Manager.cpp
@@ -60,14 +60,14 @@ ACE_Process_Manager *ACE_Process_Manager::instance_ = 0;
 // (we can only delete it safely if we created it!)
 bool ACE_Process_Manager::delete_instance_ = false;
 
-ACE_Process_Manager::Process_Descriptor::~Process_Descriptor (void)
+ACE_Process_Manager::Process_Descriptor::~Process_Descriptor ()
 {
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Process_Manager::Process_Descriptor)
 
 void
-ACE_Process_Manager::Process_Descriptor::dump (void) const
+ACE_Process_Manager::Process_Descriptor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Process_Manager::Process_Descriptor::dump");
@@ -82,7 +82,7 @@ ACE_Process_Manager::Process_Descriptor::dump (void) const
 }
 
 void
-ACE_Process_Manager::dump (void) const
+ACE_Process_Manager::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Process_Manager::dump");
@@ -99,7 +99,7 @@ ACE_Process_Manager::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Process_Manager::Process_Descriptor::Process_Descriptor (void)
+ACE_Process_Manager::Process_Descriptor::Process_Descriptor ()
   : process_ (0),
     exit_notify_ (0)
 {
@@ -107,7 +107,7 @@ ACE_Process_Manager::Process_Descriptor::Process_Descriptor (void)
 }
 
 ACE_Process_Manager *
-ACE_Process_Manager::instance (void)
+ACE_Process_Manager::instance ()
 {
   ACE_TRACE ("ACE_Process_Manager::instance");
 
@@ -161,7 +161,7 @@ ACE_Process_Manager::instance (ACE_Process_Manager *tm)
 }
 
 void
-ACE_Process_Manager::close_singleton( void )
+ACE_Process_Manager::close_singleton( )
 {
   ACE_TRACE ("ACE_Process_Manager::close_singleton");
 
@@ -251,7 +251,7 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size,
 
 // Close up and release all resources.
 int
-ACE_Process_Manager::close (void)
+ACE_Process_Manager::close ()
 {
   ACE_TRACE ("ACE_Process_Manager::close");
 
@@ -283,7 +283,7 @@ ACE_Process_Manager::close (void)
   return 0;
 }
 
-ACE_Process_Manager::~ACE_Process_Manager (void)
+ACE_Process_Manager::~ACE_Process_Manager ()
 {
   ACE_TRACE ("ACE_Process_Manager::~ACE_Process_Manager");
   this->close ();
diff --git a/ACE/ace/Process_Manager.h b/ACE/ace/Process_Manager.h
index dbfd2b06808..90fc88d5472 100644
--- a/ACE/ace/Process_Manager.h
+++ b/ACE/ace/Process_Manager.h
@@ -130,11 +130,11 @@ public:
             ACE_Reactor *r = 0);
 
   /// Release all resources.  Do not wait for processes to exit.
-  int close (void);
+  int close ();
 
   /// Destructor releases all resources and does not wait for processes
   /// to exit.
-  virtual ~ACE_Process_Manager (void);
+  virtual ~ACE_Process_Manager ();
 
   //@}
 
@@ -143,14 +143,14 @@ public:
    */
   //@{
   /// Get pointer to a process-wide ACE_Process_Manager.
-  static ACE_Process_Manager *instance (void);
+  static ACE_Process_Manager *instance ();
 
   /// Set pointer to a process-wide ACE_Process_Manager and return
   /// existing pointer.
   static ACE_Process_Manager *instance (ACE_Process_Manager *);
 
   /// Delete the dynamically allocated singleton.
-  static void close_singleton (void);
+  static void close_singleton ();
 
   /// Cleanup method, used by the ACE_Object_Manager to destroy the
   /// singleton.
@@ -243,7 +243,7 @@ public:
    * @retval 0 on success; -1 on failure.
    */
   int wait (const ACE_Time_Value &timeout = ACE_Time_Value::max_time);
-#if defined (ACE_HAS_CPP11)
+
   /// @sa wait
   template< class Rep, class Period >
   int wait (const std::chrono::duration<Rep, Period>& timeout)
@@ -251,7 +251,6 @@ public:
     ACE_Time_Value const tv (timeout);
     return this->wait (tv);
   }
-#endif
 
   /**
    * Wait up to @a timeout for a single specified process to terminate.
@@ -269,7 +268,7 @@ public:
   pid_t wait (pid_t pid,
               const ACE_Time_Value &timeout,
               ACE_exitcode *status = 0);
-#if defined (ACE_HAS_CPP11)
+
   /// @sa wait
   template< class Rep, class Period >
   pid_t wait (pid_t pid,
@@ -279,7 +278,6 @@ public:
     ACE_Time_Value const tv (timeout);
     return this->wait (pid, tv, status);
   }
-#endif
 
   /**
    * Wait indefinitely for a single, specified process to terminate.
@@ -320,7 +318,7 @@ public:
   int remove (pid_t pid);
 
   /// Return the number of managed processes.
-  size_t managed (void) const;
+  size_t managed () const;
 
   /**
    * Sets the scheduling parameters for process identified by @a pid by
@@ -341,7 +339,7 @@ public:
   int set_scheduler_all (const ACE_Sched_Params &params);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -408,8 +406,8 @@ private:
   struct Process_Descriptor
   {
     /// Default ctor/dtor.
-    Process_Descriptor (void);
-    ~Process_Descriptor (void);
+    Process_Descriptor ();
+    ~Process_Descriptor ();
 
     /// Describes the process itself.
     ACE_Process *process_;
@@ -418,7 +416,7 @@ private:
     ACE_Event_Handler *exit_notify_;
 
     /// Dump the state of an object.
-    void dump (void) const;
+    void dump () const;
 
     ACE_ALLOC_HOOK_DECLARE;
   };
diff --git a/ACE/ace/Process_Manager.inl b/ACE/ace/Process_Manager.inl
index 33d2c034be7..18bbe7a4ffe 100644
--- a/ACE/ace/Process_Manager.inl
+++ b/ACE/ace/Process_Manager.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE size_t
-ACE_Process_Manager::managed (void) const
+ACE_Process_Manager::managed () const
 {
   return current_count_;
 }
diff --git a/ACE/ace/Process_Mutex.cpp b/ACE/ace/Process_Mutex.cpp
index 3a137267990..3c0cd195b5a 100644
--- a/ACE/ace/Process_Mutex.cpp
+++ b/ACE/ace/Process_Mutex.cpp
@@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Process_Mutex)
 
 void
-ACE_Process_Mutex::dump (void) const
+ACE_Process_Mutex::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Process_Mutex::dump");
@@ -27,7 +27,7 @@ ACE_Process_Mutex::dump (void) const
 }
 
 const ACE_TCHAR *
-ACE_Process_Mutex::unique_name (void)
+ACE_Process_Mutex::unique_name ()
 {
   // For all platforms other than Win32, we are going to create a
   // machine-wide unique name if one is not provided by the user.  On
@@ -92,7 +92,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name,
 #endif /* _ACE_USE_SV_SEM */
 }
 #endif /* ACE_HAS_WCHAR */
-ACE_Process_Mutex::~ACE_Process_Mutex (void)
+ACE_Process_Mutex::~ACE_Process_Mutex ()
 {
 }
 
diff --git a/ACE/ace/Process_Mutex.h b/ACE/ace/Process_Mutex.h
index 3b713c526ef..c1f042c2269 100644
--- a/ACE/ace/Process_Mutex.h
+++ b/ACE/ace/Process_Mutex.h
@@ -206,7 +206,7 @@ public:
   static int unlink (const ACE_TCHAR *name);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Process_Semaphore.cpp b/ACE/ace/Process_Semaphore.cpp
index bb3f94e4efc..9b40f67d0db 100644
--- a/ACE/ace/Process_Semaphore.cpp
+++ b/ACE/ace/Process_Semaphore.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Process_Semaphore)
 
 void
-ACE_Process_Semaphore::dump (void) const
+ACE_Process_Semaphore::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Process_Semaphore::dump");
@@ -48,7 +48,7 @@ ACE_Process_Semaphore::ACE_Process_Semaphore (u_int count,
 // Explicitly destroy the semaphore.
 
 int
-ACE_Process_Semaphore::remove (void)
+ACE_Process_Semaphore::remove ()
 {
 // ACE_TRACE ("ACE_Process_Semaphore::remove");
   return this->lock_.remove ();
@@ -58,7 +58,7 @@ ACE_Process_Semaphore::remove (void)
 // greater than 0, then decrement it.
 
 int
-ACE_Process_Semaphore::acquire (void)
+ACE_Process_Semaphore::acquire ()
 {
 // ACE_TRACE ("ACE_Process_Semaphore::acquire");
 #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM)
@@ -72,7 +72,7 @@ ACE_Process_Semaphore::acquire (void)
 // than 0 (i.e., won't block).
 
 int
-ACE_Process_Semaphore::tryacquire (void)
+ACE_Process_Semaphore::tryacquire ()
 {
 // ACE_TRACE ("ACE_Process_Semaphore::tryacquire");
 #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM)
@@ -86,7 +86,7 @@ ACE_Process_Semaphore::tryacquire (void)
 // a waiting thread.
 
 int
-ACE_Process_Semaphore::release (void)
+ACE_Process_Semaphore::release ()
 {
 // ACE_TRACE ("ACE_Process_Semaphore::release");
 #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM)
diff --git a/ACE/ace/Process_Semaphore.h b/ACE/ace/Process_Semaphore.h
index 3f3fb1c5fa3..57d47da2b05 100644
--- a/ACE/ace/Process_Semaphore.h
+++ b/ACE/ace/Process_Semaphore.h
@@ -114,7 +114,7 @@ public:
 #endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM */
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp
index 0e80384eaf6..0d807f96dad 100644
--- a/ACE/ace/Profile_Timer.cpp
+++ b/ACE/ace/Profile_Timer.cpp
@@ -27,7 +27,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer)
 
 
 void
-ACE_Profile_Timer::dump (void) const
+ACE_Profile_Timer::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Profile_Timer::dump");
@@ -36,7 +36,7 @@ ACE_Profile_Timer::dump (void) const
 
 // Initialize interval timer.
 
-ACE_Profile_Timer::ACE_Profile_Timer (void)
+ACE_Profile_Timer::ACE_Profile_Timer ()
 {
   ACE_TRACE ("ACE_Profile_Timer::ACE_Profile_Timer");
   ACE_OS::memset (&this->end_usage_, 0, sizeof this->end_usage_);
@@ -61,7 +61,7 @@ ACE_Profile_Timer::ACE_Profile_Timer (void)
 }
 
 // Terminate the interval timer.
-ACE_Profile_Timer::~ACE_Profile_Timer (void)
+ACE_Profile_Timer::~ACE_Profile_Timer ()
 {
   ACE_TRACE ("ACE_Profile_Timer::~ACE_Profile_Timer");
 #  if defined (ACE_HAS_PRUSAGE_T)
diff --git a/ACE/ace/Profile_Timer.h b/ACE/ace/Profile_Timer.h
index a28376d44d4..c60e7164181 100644
--- a/ACE/ace/Profile_Timer.h
+++ b/ACE/ace/Profile_Timer.h
@@ -78,7 +78,7 @@ public:
   void get_rusage (ACE_Profile_Timer::Rusage &rusage);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/RB_Tree.cpp b/ACE/ace/RB_Tree.cpp
index 0c8c2a713b6..b953a0e6cbe 100644
--- a/ACE/ace/RB_Tree.cpp
+++ b/ACE/ace/RB_Tree.cpp
@@ -40,7 +40,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_I
 // Destructor.
 
 template <class EXT_ID, class INT_ID>
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node (void)
+ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node ()
 {
   ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node");
 }
@@ -906,7 +906,7 @@ dump_node_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> &node) const
 /// Tests the red-black invariant(s) throughout the whole tree.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>  int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant (void)
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
@@ -1167,7 +1167,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 void
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i () const
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h
index b3b08f19aab..4c7b773ef27 100644
--- a/ACE/ace/RB_Tree.h
+++ b/ACE/ace/RB_Tree.h
@@ -56,34 +56,34 @@ public:
   ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t);
 
   /// Destructor.
-  ~ACE_RB_Tree_Node (void);
+  ~ACE_RB_Tree_Node ();
 
   /// Key accessor.
-  EXT_ID &key (void);
+  EXT_ID &key ();
 
   /// Item accessor.
-  INT_ID &item (void);
+  INT_ID &item ();
 
   /// Set color of the node.
   void color (RB_Tree_Node_Color c);
 
   /// Get color of the node.
-  RB_Tree_Node_Color color (void);
+  RB_Tree_Node_Color color ();
 
   /// Accessor for node's parent pointer.
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *parent (void);
+  ACE_RB_Tree_Node<EXT_ID, INT_ID> *parent ();
 
   /// Mutator for node's parent pointer.
   void parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p);
 
   /// Accessor for node's left child pointer.
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *left (void);
+  ACE_RB_Tree_Node<EXT_ID, INT_ID> *left ();
 
   /// Mutator for node's left child pointer.
   void left (ACE_RB_Tree_Node<EXT_ID, INT_ID> *l);
 
   /// Accessor for node's right child pointer.
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *right (void);
+  ACE_RB_Tree_Node<EXT_ID, INT_ID> *right ();
 
   /// Mutator for node's right child pointer
   void right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r);
@@ -125,7 +125,7 @@ public:
    *       of this method occurred.  Placing the definition inline in
    *       the header avoids such errors.
    */
-  ACE_Allocator * allocator (void) const { return this->allocator_; }
+  ACE_Allocator * allocator () const { return this->allocator_; }
 
 protected:
   // = Protected members.
@@ -210,10 +210,10 @@ public:
 
   /// Close down an RB_Tree and release dynamically allocated
   /// resources.
-  int close (void);
+  int close ();
 
   /// Destructor.
-  virtual ~ACE_RB_Tree (void);
+  virtual ~ACE_RB_Tree ();
 
   // = insertion, removal, and search methods.
 
@@ -352,7 +352,7 @@ public:
   // = Public helper methods.
 
   /// Returns the current number of nodes in the tree.
-  size_t current_size (void) const;
+  size_t current_size () const;
 
   /// Assignment operator.
   void operator= (const ACE_RB_Tree<EXT_ID,
@@ -368,31 +368,31 @@ public:
    * guard the state of an iterator.
    * @note The right name would be <lock>, but HP/C++ will choke on that!
    */
-  ACE_LOCK &mutex (void);
+  ACE_LOCK &mutex ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iterator factory functions.
 
   /// Return forward iterator positioned at first node in tree.
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> begin (void);
+  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> begin ();
 
   /// Return forward iterator positioned at last node in tree.
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> end (void);
+  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> end ();
 
   /// Return reverse iterator positioned at last node in tree.
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rbegin (void);
+  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rbegin ();
 
   /// Return reverse iterator positioned at first node in tree.
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rend (void);
+  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rend ();
 
   /// Recursively tests the invariant red-black properties at each
   /// node of the tree.  Returns 0 if invariant holds, else -1.
   /// This method is computationally expensive, and should only be
   /// called for testing purposes, and not in code that depends on the
   /// algorithmic complexity bounds provided by the other methods.
-  int test_invariant (void);
+  int test_invariant ();
 
   // = DEPRECATED methods.
   //   Please migrate your code to use the new methods instead
@@ -431,7 +431,7 @@ public:
 
   /// @deprecated
   /// Destroys all nodes and sets the root pointer null.
-  void clear (void);
+  void clear ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -504,7 +504,7 @@ protected:
 
   /// Close down an RB_Tree.  this method should
   /// only be called with locks already held.
-  int close_i (void);
+  int close_i ();
 
   /**
    * Retrieves a pointer to the item corresponding to the
@@ -599,18 +599,18 @@ public:
   // = Iteration methods.
 
   /// Returns 1 when the iteration has completed, otherwise 0.
-  int done (void) const;
+  int done () const;
 
   /// STL-like iterator dereference operator: returns a reference
   /// to the node underneath the iterator.
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> & operator* (void) const;
+  ACE_RB_Tree_Node<EXT_ID, INT_ID> & operator* () const;
 
   /// STL-like iterator dereference operator: returns a pointer
   /// to the node underneath the iterator.
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> * operator-> (void) const;
+  ACE_RB_Tree_Node<EXT_ID, INT_ID> * operator-> () const;
 
   /// Returns a const reference to the tree over which we're iterating.
-  const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree (void);
+  const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree ();
 
   /// Comparison operator: returns 1 if both iterators point to the same position, otherwise 0.
   bool operator== (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &) const;
@@ -624,7 +624,7 @@ public:
 protected:
   /// Create the singular iterator.  No valid iterator can be equal to
   /// it, it is illegal to dereference a singular iterator, etc. etc.
-  ACE_RB_Tree_Iterator_Base (void);
+  ACE_RB_Tree_Iterator_Base ();
 
   /**
    * Constructor.  Takes an ACE_RB_Tree over which to iterate, and
@@ -650,20 +650,20 @@ protected:
                              ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS,ACE_LOCK> &tree);
 
   /// Destructor.
-  ~ACE_RB_Tree_Iterator_Base (void);
+  ~ACE_RB_Tree_Iterator_Base ();
 
   // = Internal methods
 
   /// Move forward by one element in the tree.  Returns 0 when
   /// there are no more elements in the tree, otherwise 1.
-  int forward_i (void);
+  int forward_i ();
 
   /// Move back by one element in the tree.  Returns 0 when
   /// there are no more elements in the tree, otherwise 1.
-  int reverse_i (void);
+  int reverse_i ();
 
   /// Dump the state of an object.
-  void dump_i (void) const;
+  void dump_i () const;
 
   // = Protected members.
 
@@ -689,7 +689,7 @@ public:
    * It is illegal to deference the iterator, no valid iterator is
    * equal to a singular iterator, etc. etc.
    */
-  ACE_RB_Tree_Iterator (void);
+  ACE_RB_Tree_Iterator ();
 
   /**
    * Constructor.  Takes an ACE_RB_Tree over which to iterate, and
@@ -714,27 +714,27 @@ public:
                         ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree);
 
   /// Destructor.
-  ~ACE_RB_Tree_Iterator (void);
+  ~ACE_RB_Tree_Iterator ();
 
   // = ACE-style iteration methods.
 
   /// Move forward by one element in the tree.  Returns
   /// 0 when all elements have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL-style iteration methods.
 
   /// Prefix advance.
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ (void);
+  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ ();
 
   /// Postfix advance.
   ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- (void);
+  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- ();
 
   /// Postfix reverse.
   ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (int);
@@ -759,34 +759,34 @@ public:
 
   /// @deprecated
   /// Accessor for key of node under iterator (if any).
-  EXT_ID *key (void);
+  EXT_ID *key ();
 
   /// @deprecated
   /// Accessor for item of node under iterator (if any).
-  INT_ID *item (void);
+  INT_ID *item ();
 
   /// @deprecated
   /// Move to the first item in the iteration (and in the tree).
-  int first (void);
+  int first ();
 
   /// @deprecated
   /// Move to the last item in the iteration (and in the tree).
-  int last (void);
+  int last ();
 
   /// @deprecated
   /// Move to the next item in the iteration (and in the tree).
-  int next (void);
+  int next ();
 
   /// @deprecated
   /// Move to the previous item in the iteration (and in the tree).
-  int previous (void);
+  int previous ();
 
   /**
    * @deprecated: use the base class <done> method instead.
    * Returns 0 if the iterator is positioned over a valid ACE_RB_Tree
    * node, returns 1 if not.
    */
-  int is_done (void);
+  int is_done ();
 
 };
 
@@ -804,7 +804,7 @@ public:
    * It is illegal to deference the iterator, no valid iterator is
    * equal to a singular iterator, etc. etc.
    */
-  ACE_RB_Tree_Reverse_Iterator (void);
+  ACE_RB_Tree_Reverse_Iterator ();
 
   /**
    * Constructor.  Takes an ACE_RB_Tree over which to iterate, and
@@ -830,27 +830,27 @@ public:
                                 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree);
 
   /// Destructor.
-  ~ACE_RB_Tree_Reverse_Iterator (void);
+  ~ACE_RB_Tree_Reverse_Iterator ();
 
   // = ACE-style iteration methods.
 
   /// Move forward by one element in the tree.  Returns
   /// 0 when all elements have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL-style iteration methods.
 
   /// Prefix advance.
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ (void);
+  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ ();
 
   /// Postfix advance.
   ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (int);
 
   /// Prefix reverse.
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- (void);
+  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- ();
 
   /// Postfix reverse.
   ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (int);
diff --git a/ACE/ace/RB_Tree.inl b/ACE/ace/RB_Tree.inl
index dcebea5e71a..4e31894eb4d 100644
--- a/ACE/ace/RB_Tree.inl
+++ b/ACE/ace/RB_Tree.inl
@@ -154,7 +154,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::open (ACE_Allocator *alloc)
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close (void)
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
@@ -550,7 +550,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (ACE_RB_Tree_Node<EX
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_LOCK &
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex (void)
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex");
   return this->lock_;
@@ -561,7 +561,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex (void)
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -580,7 +580,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin (void)
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin");
 
@@ -592,7 +592,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin (void)
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end (void)
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end");
 
@@ -604,7 +604,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end (void)
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin (void)
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin");
 
@@ -616,7 +616,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin (void)
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend (void)
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend");
 
@@ -719,7 +719,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size () const
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base (void)
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base ()
   : tree_ (0), node_ (0)
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base (void)");
@@ -729,7 +729,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_I
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done (void) const
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done () const
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done");
 
@@ -742,7 +742,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done (void) c
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> &
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator* (void) const
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator* () const
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator*");
   return *(this->node_);
@@ -754,7 +754,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator* (vo
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-> () const
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator->");
   return this->node_;
@@ -764,7 +764,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-> (v
 // Returns a reference to the tree over which we're iterating.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>ACE_INLINE const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree (void)
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree ()
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree");
   return *tree_;
@@ -800,7 +800,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator!=
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i ()
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i");
 
@@ -818,7 +818,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i (vo
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i ()
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i");
 
@@ -838,7 +838,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i (vo
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator (void)
+ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator ()
   : ACE_RB_Tree_Iterator_Base<EXT_ID,INT_ID,COMPARE_KEYS,ACE_LOCK> ()
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator (void)");
@@ -849,7 +849,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterat
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void)
+ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance ()
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance");
 
@@ -861,7 +861,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void)
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE void
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -875,7 +875,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
+ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ ()
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (void)");
 
@@ -902,7 +902,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (int)
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
+ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- ()
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (void)");
 
@@ -1043,7 +1043,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::is_done ()
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator (void)
+ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator ()
   : ACE_RB_Tree_Iterator_Base<EXT_ID,INT_ID,COMPARE_KEYS,ACE_LOCK> ()
 {
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator (void)");
@@ -1054,7 +1054,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tre
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE int
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void)
+ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance ()
 {
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance");
 
@@ -1066,7 +1066,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (v
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE void
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
@@ -1080,7 +1080,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
+ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ ()
 {
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
 
@@ -1107,7 +1107,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
+ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- ()
 {
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
 
diff --git a/ACE/ace/README b/ACE/ace/README
index 52fda588d2b..e975426f438 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -141,8 +141,8 @@ ACE_HAS_ALT_CUSERID                     Use ACE's alternate cuserid()
                                         geteuid() system call exists.
 ACE_HAS_DINKUM_STL                      Using the Dinkum STL library
 ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE
-                                        Non-C++ Complient compilers that automatically
-                                        provide storeage for class static const int
+                                        Non-C++ Compliant compilers that automatically
+                                        provide storage for class static const int
                                         when their declaration is seen. I.e. they object
                                         to explicit definitions being seen in the .cpp
                                         file.
@@ -692,48 +692,6 @@ ACE_LACKS_UINTMAX_T                     Platform lacks the uintmax_t type.
 ACE_LACKS_INTPTR_T                      Platform lacks the intptr_t type
 ACE_LACKS_UINTPTR_T                     Platform lacks the uintptr_t type.
 
-ACE_HAS_INT8_T                          Platform provides the int8_t type.
-ACE_HAS_INT16_T                         Platform provides the int16_t type.
-ACE_HAS_INT32_T                         Platform provides the int32_t type.
-ACE_HAS_INT64_T                         Platform provides the int64_t type.
-ACE_HAS_UINT8_T                         Platform provides the uint8_t type.
-ACE_HAS_UINT16_T                        Platform provides the uint16_t type.
-ACE_HAS_UINT32_T                        Platform provides the uint32_t type.
-ACE_HAS_UINT64_T                        Platform provides the uint64_t type.
-
-ACE_INT8_TYPE                           Specific type to use for ACE_INT8.
-                                        If not defined, ACE will attempt to
-                                        determine the correct type
-                                        unless ACE_HAS_INT8_T has been defined
-ACE_INT16_TYPE                          Specific type to use for ACE_INT16.
-                                        If not defined, ACE will attempt to
-                                        determine the correct type
-                                        unless ACE_HAS_INT16_T has been defined
-ACE_INT32_TYPE                          Specific type to use for ACE_INT32.
-                                        If not defined, ACE will attempt to
-                                        determine the correct type
-                                        unless ACE_HAS_INT32_T has been defined
-ACE_INT64_TYPE                          Specific type to use for ACE_INT64.
-                                        If not defined, ACE will attempt to
-                                        determine the correct type
-                                        unless ACE_HAS_INT64_T has been defined
-ACE_UINT8_TYPE                          Specific type to use for ACE_UINT8.
-                                        If not defined, ACE will attempt to
-                                        determine the correct type
-                                        unless ACE_HAS_UINT8_T has been defined
-ACE_UINT16_TYPE                         Specific type to use for ACE_UINT16.
-                                        If not defined, ACE will attempt to
-                                        determine the correct type
-                                        unless ACE_HAS_UINT16_T has been defined
-ACE_UINT32_TYPE                         Specific type to use for ACE_UINT32.
-                                        If not defined, ACE will attempt to
-                                        determine the correct type
-                                        unless ACE_HAS_UINT32_T has been defined
-ACE_UINT64_TYPE                         Specific type to use for ACE_UINT64.
-                                        If not defined, ACE will attempt to
-                                        determine the correct type
-                                        unless ACE_HAS_UINT64_T has been defined
-
 ACE_INT8_FORMAT_SPECIFIER               String literal containing *printf
                                         format specifier (including the '%')
                                         to be used for ACE_INT8 values.  If
diff --git a/ACE/ace/RW_Mutex.cpp b/ACE/ace/RW_Mutex.cpp
index 3711ca5ce9a..9a4fbaef0c1 100644
--- a/ACE/ace/RW_Mutex.cpp
+++ b/ACE/ace/RW_Mutex.cpp
@@ -21,7 +21,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-ACE_RW_Mutex::dump (void) const
+ACE_RW_Mutex::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_RW_Mutex::dump");
@@ -42,7 +42,7 @@ ACE_RW_Mutex::ACE_RW_Mutex (int type, const ACE_TCHAR *name, void *arg)
                 ACE_TEXT ("ACE_RW_Mutex::ACE_RW_Mutex")));
 }
 
-ACE_RW_Mutex::~ACE_RW_Mutex (void)
+ACE_RW_Mutex::~ACE_RW_Mutex ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::~ACE_RW_Mutex");
   this->remove ();
diff --git a/ACE/ace/RW_Mutex.h b/ACE/ace/RW_Mutex.h
index 46f7458ed39..f01f4dc035f 100644
--- a/ACE/ace/RW_Mutex.h
+++ b/ACE/ace/RW_Mutex.h
@@ -45,31 +45,31 @@ public:
                 void *arg = 0);
 
   /// Implicitly destroy a readers/writer lock
-  ~ACE_RW_Mutex (void);
+  ~ACE_RW_Mutex ();
 
   /**
    * Explicitly destroy a readers/writer lock.  Note that only one
    * thread should call this method since it doesn't protect against
    * race conditions.
    */
-  int remove (void);
+  int remove ();
 
   /// Acquire a read lock, but block if a writer hold the lock.
-  int acquire_read (void);
+  int acquire_read ();
 
   /// Acquire a write lock, but block if any readers or a
   /// writer hold the lock.
-  int acquire_write (void);
+  int acquire_write ();
 
   /**
    * Conditionally acquire a read lock (i.e., won't block).  Returns
    * -1 on failure.  If we "failed" because someone else already had
    * the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /// Conditionally acquire a write lock (i.e., won't block).
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /**
    * Conditionally upgrade a read lock to a write lock.  This only
@@ -79,14 +79,14 @@ public:
    * already possess this lock as a read lock (but this condition is
    * not checked by the current implementation).
    */
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
   /**
    * Note, for interface uniformity with other synchronization
    * wrappers we include the <acquire> method.  This is implemented as
    * a write-lock to safe...
    */
-  int acquire (void);
+  int acquire ();
 
   /**
    * Note, for interface uniformity with other synchronization
@@ -95,16 +95,16 @@ public:
    * "failed" because someone else already had the lock, @c errno is
    * set to @c EBUSY.
    */
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Unlock a readers/writer lock.
-  int release (void);
+  int release ();
 
   /// Return the underlying lock.
-  const ACE_rwlock_t &lock (void) const;
+  const ACE_rwlock_t &lock () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/RW_Mutex.inl b/ACE/ace/RW_Mutex.inl
index 3939b8c23fd..6d3566bb8d9 100644
--- a/ACE/ace/RW_Mutex.inl
+++ b/ACE/ace/RW_Mutex.inl
@@ -2,14 +2,14 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE const ACE_rwlock_t &
-ACE_RW_Mutex::lock (void) const
+ACE_RW_Mutex::lock () const
 {
 // ACE_TRACE ("ACE_RW_Mutex::lock");
   return this->lock_;
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::remove (void)
+ACE_RW_Mutex::remove ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::remove");
   int result = 0;
@@ -22,56 +22,56 @@ ACE_RW_Mutex::remove (void)
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::acquire_read (void)
+ACE_RW_Mutex::acquire_read ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::acquire_read");
   return ACE_OS::rw_rdlock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::acquire_write (void)
+ACE_RW_Mutex::acquire_write ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::acquire_write");
   return ACE_OS::rw_wrlock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::acquire (void)
+ACE_RW_Mutex::acquire ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::acquire");
   return ACE_OS::rw_wrlock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::tryacquire_read (void)
+ACE_RW_Mutex::tryacquire_read ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::tryacquire_read");
   return ACE_OS::rw_tryrdlock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::tryacquire_write (void)
+ACE_RW_Mutex::tryacquire_write ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::tryacquire_write");
   return ACE_OS::rw_trywrlock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::tryacquire_write_upgrade (void)
+ACE_RW_Mutex::tryacquire_write_upgrade ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::tryacquire_write_upgrade");
   return ACE_OS::rw_trywrlock_upgrade (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::tryacquire (void)
+ACE_RW_Mutex::tryacquire ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::tryacquire");
   return this->tryacquire_write ();
 }
 
 ACE_INLINE int
-ACE_RW_Mutex::release (void)
+ACE_RW_Mutex::release ()
 {
 // ACE_TRACE ("ACE_RW_Mutex::release");
   return ACE_OS::rw_unlock (&this->lock_);
diff --git a/ACE/ace/RW_Process_Mutex.cpp b/ACE/ace/RW_Process_Mutex.cpp
index eda9c8a8199..19acafb8577 100644
--- a/ACE/ace/RW_Process_Mutex.cpp
+++ b/ACE/ace/RW_Process_Mutex.cpp
@@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_RW_Process_Mutex)
 
 const ACE_TCHAR *
-ACE_RW_Process_Mutex::unique_name (void)
+ACE_RW_Process_Mutex::unique_name ()
 {
   ACE::unique_name (this, this->name_, ACE_UNIQUE_NAME_LEN);
   return this->name_;
@@ -33,13 +33,13 @@ ACE_RW_Process_Mutex::ACE_RW_Process_Mutex (const ACE_TCHAR *name,
 // ACE_TRACE ("ACE_RW_Process_Mutex::ACE_RW_Process_Mutex");
 }
 
-ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex (void)
+ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex ()
 {
 // ACE_TRACE ("ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex");
 }
 
 void
-ACE_RW_Process_Mutex::dump (void) const
+ACE_RW_Process_Mutex::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_RW_Process_Mutex::dump");
diff --git a/ACE/ace/RW_Process_Mutex.h b/ACE/ace/RW_Process_Mutex.h
index f07a567353d..13e46ededc7 100644
--- a/ACE/ace/RW_Process_Mutex.h
+++ b/ACE/ace/RW_Process_Mutex.h
@@ -108,7 +108,7 @@ public:
   const ACE_File_Lock &lock (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/RW_Thread_Mutex.cpp b/ACE/ace/RW_Thread_Mutex.cpp
index cffcc8d4e32..c77a75c30d7 100644
--- a/ACE/ace/RW_Thread_Mutex.cpp
+++ b/ACE/ace/RW_Thread_Mutex.cpp
@@ -34,7 +34,7 @@ ACE_RW_Thread_Mutex::ACE_RW_Thread_Mutex (const ACE_TCHAR *name,
 }
 
 void
-ACE_RW_Thread_Mutex::dump (void) const
+ACE_RW_Thread_Mutex::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_RW_Thread_Mutex::dump");
diff --git a/ACE/ace/RW_Thread_Mutex.h b/ACE/ace/RW_Thread_Mutex.h
index d54997e7b03..54a4ebcfaa5 100644
--- a/ACE/ace/RW_Thread_Mutex.h
+++ b/ACE/ace/RW_Thread_Mutex.h
@@ -41,7 +41,7 @@ public:
                        void *arg = 0);
 
   /// Default dtor.
-  ~ACE_RW_Thread_Mutex (void);
+  ~ACE_RW_Thread_Mutex ();
 
   /**
    * Conditionally upgrade a read lock to a write lock.  This only
@@ -51,10 +51,10 @@ public:
    * already possess this lock as a read lock (but this condition is
    * not checked by the current implementation).
    */
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/RW_Thread_Mutex.inl b/ACE/ace/RW_Thread_Mutex.inl
index a69c8b597c0..0531f9063d2 100644
--- a/ACE/ace/RW_Thread_Mutex.inl
+++ b/ACE/ace/RW_Thread_Mutex.inl
@@ -2,14 +2,14 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
-ACE_RW_Thread_Mutex::tryacquire_write_upgrade (void)
+ACE_RW_Thread_Mutex::tryacquire_write_upgrade ()
 {
 // ACE_TRACE ("ACE_RW_Thread_Mutex::tryacquire_write_upgrade");
   return ACE_OS::rw_trywrlock_upgrade (&this->lock_);
 }
 
 ACE_INLINE
-ACE_RW_Thread_Mutex::~ACE_RW_Thread_Mutex (void)
+ACE_RW_Thread_Mutex::~ACE_RW_Thread_Mutex ()
 {
 }
 
diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp
index b23e3effe2a..e08c9b9d141 100644
--- a/ACE/ace/Reactor.cpp
+++ b/ACE/ace/Reactor.cpp
@@ -4,14 +4,6 @@
 #  include "ace/Service_Config.h"
 #endif /* !ACE_LACKS_ACE_SVCCONF */
 
-/*
- * Hook to specialize the includes directly with the concrete
- * Reactor type, e.g., select, thread pool reactor
- * known at compile time. This hook results in all the
- * #defines being commented
- * out and the concrete header file directly included.
- */
-//@@ REACTOR_SPL_COMMENT_INCLUDE_START_HOOK
 // Only include the headers needed to compile.
 #if !defined (ACE_WIN32) \
       || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \
@@ -35,11 +27,6 @@
 #  endif /* ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL */
 #endif /* !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */
 
-/*
- * End comment hook.
- */
-//@@ REACTOR_SPL_COMMENT_INCLUDE_END_HOOK
-
 #include "ace/Static_Object_Lock.h"
 #include "ace/Framework_Component.h"
 #include "ace/Guard_T.h"
@@ -62,13 +49,6 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
 
   if (this->implementation () == 0)
     {
-/*
- * Hook to specialize the reactor implementation with the concrete
- * Reactor implementation known at compile time. This hook will
- * cause the conditionally defined code to be commented out and
- * the concrete Reactor directly created.
- */
-//@@ REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_START
 #if !defined (ACE_WIN32) \
       || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \
       || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \
@@ -95,18 +75,12 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
                ACE_WFMO_Reactor);
   #endif /* ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL */
 #endif /* !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */
-
-/*
- * End hook.
- */
-//@@ REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_END
-
       this->implementation (impl);
       this->delete_implementation_ = true;
     }
 }
 
-ACE_Reactor::~ACE_Reactor (void)
+ACE_Reactor::~ACE_Reactor ()
 {
   this->implementation ()->close ();
   if (this->delete_implementation_)
@@ -121,7 +95,7 @@ ACE_Reactor *ACE_Reactor::reactor_ = 0;
 bool ACE_Reactor::delete_reactor_ = false;
 
 ACE_Reactor *
-ACE_Reactor::instance (void)
+ACE_Reactor::instance ()
 {
   ACE_TRACE ("ACE_Reactor::instance");
 
@@ -165,7 +139,7 @@ ACE_Reactor::instance (ACE_Reactor *r, bool delete_reactor)
 }
 
 void
-ACE_Reactor::close_singleton (void)
+ACE_Reactor::close_singleton ()
 {
   ACE_TRACE ("ACE_Reactor::close_singleton");
 
@@ -181,13 +155,13 @@ ACE_Reactor::close_singleton (void)
 }
 
 const ACE_TCHAR *
-ACE_Reactor::dll_name (void)
+ACE_Reactor::dll_name ()
 {
   return ACE_TEXT ("ACE");
 }
 
 const ACE_TCHAR *
-ACE_Reactor::name (void)
+ACE_Reactor::name ()
 {
   return ACE_TEXT ("ACE_Reactor");
 }
diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h
index d44a519092b..c43a28be8d9 100644
--- a/ACE/ace/Reactor.h
+++ b/ACE/ace/Reactor.h
@@ -30,6 +30,7 @@
 
 // Get ACE_Time_Value in
 #include "ace/Time_Value.h"
+#include "ace/Synch_Traits.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -39,13 +40,6 @@ class ACE_Sig_Action;
 class ACE_Sig_Handler;
 class ACE_Sig_Set;
 
-/*
- * Hook to specialize the Reactor implementation with the concrete
- * Reactor type, for example, select, thread pool reactor known
- * at compile time.
- */
-//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class ACE_Reactor
  *
@@ -84,7 +78,7 @@ public:
   typedef int (*REACTOR_EVENT_HOOK)(ACE_Reactor *);
 
   /// Get pointer to a process-wide ACE_Reactor.
-  static ACE_Reactor *instance (void);
+  static ACE_Reactor *instance ();
 
   /**
    * Set pointer to a process-wide ACE_Reactor and return existing
@@ -94,13 +88,13 @@ public:
   static ACE_Reactor *instance (ACE_Reactor *, bool delete_reactor = false);
 
   /// Delete the dynamically allocated Singleton
-  static void close_singleton (void);
+  static void close_singleton ();
 
   /// Name of the dll in which the dll lives.
-  static const ACE_TCHAR *dll_name (void);
+  static const ACE_TCHAR *dll_name ();
 
   /// Name of the component--ACE_Reactor in this case.
-  static const ACE_TCHAR *name (void);
+  static const ACE_TCHAR *name ();
 
   // = Singleton reactor event loop management methods.
 
@@ -116,8 +110,8 @@ public:
    *
    * @deprecated Use ACE_Reactor::instance()->run_reactor_event_loop() instead
    */
-  static int run_event_loop (void);
-  static int run_alertable_event_loop (void);
+  static int run_event_loop ();
+  static int run_alertable_event_loop ();
 
   /**
    * Run the event loop until the ACE_Reactor::handle_events() or
@@ -142,7 +136,7 @@ public:
    *
    * @deprecated Use ACE_Reactor::instance()->end_reactor_event_loop() instead
    */
-  static int end_event_loop (void);
+  static int end_event_loop ();
 
   /**
    * Report if the ACE_Reactor::instance()'s event loop is finished.
@@ -152,7 +146,7 @@ public:
    *
    * @deprecated Use ACE_Reactor::instance()->reactor_event_loop_done() instead
    */
-  static int event_loop_done (void);
+  static int event_loop_done ();
 
   /**
    * Resets the ACE_Reactor::end_event_loop_  static so that the
@@ -163,7 +157,7 @@ public:
    * @deprecated Use ACE_Reactor::instance()->reset_reactor_event_loop()
    * instead
    */
-  static void reset_event_loop (void);
+  static void reset_event_loop ();
 
   /**
    * The singleton reactor is used by the ACE_Service_Config.
@@ -210,14 +204,14 @@ public:
    * will be dispatched then. If the reactor is closed or deleted without
    * further dispatching, the notifications will be lost.
    */
-  int end_reactor_event_loop (void);
+  int end_reactor_event_loop ();
 
   /// Indicate if the Reactor's event loop has been ended.
-  int reactor_event_loop_done (void);
+  int reactor_event_loop_done ();
 
   /// Resets the ACE_Reactor::end_event_loop_ static so that the
   /// run_event_loop() method can be restarted.
-  void reset_reactor_event_loop (void);
+  void reset_reactor_event_loop ();
 
   /**
    * Create the Reactor using @a implementation.  The flag
@@ -232,7 +226,7 @@ public:
    * Any notifications that remain queued on this reactor instance are
    * lost.
    */
-  virtual ~ACE_Reactor (void);
+  virtual ~ACE_Reactor ();
 
   /**
    * Initialize the ACE_Reactor to manage @a max_number_of_handles.
@@ -253,10 +247,10 @@ public:
   int timer_queue (ACE_Timer_Queue *tq);
 
   /// Return the current ACE_Timer_Queue.
-  ACE_Timer_Queue *timer_queue (void) const;
+  ACE_Timer_Queue *timer_queue () const;
 
   /// Close down and release all resources.
-  int close (void);
+  int close ();
 
   // = Event loop drivers.
 
@@ -504,7 +498,7 @@ public:
   /**
    * Suspend all registered handles temporarily.
    */
-  int suspend_handlers (void);
+  int suspend_handlers ();
 
   /**
    * Resume @a handle.
@@ -529,13 +523,13 @@ public:
   /**
    * Resume all registered handles.
    */
-  int resume_handlers (void);
+  int resume_handlers ();
 
   /// Does the reactor allow the application to resume the handle on
   /// its own ie. can it pass on the control of handle resumption to
   /// the application. A positive value indicates that the handlers
   /// are application resumable. A value of 0 indicates otherwise.
-  int resumable_handler (void);
+  int resumable_handler ();
 
   // = Timer management.
 
@@ -576,7 +570,7 @@ public:
                                const ACE_Time_Value &delay,
                                const ACE_Time_Value &interval =
                                 ACE_Time_Value::zero);
-#if defined (ACE_HAS_CPP11)
+
   template<class Rep1, class Period1, class Rep2 = int, class Period2 = std::ratio<1>>
   long schedule_timer (ACE_Event_Handler *event_handler,
                        const void *arg,
@@ -588,7 +582,7 @@ public:
     ACE_Time_Value const tv_interval (interval);
     return this->schedule_timer (event_handler, arg, tv_delay, tv_interval);
   }
-#endif
+
   /**
    * Reset recurring timer interval.
    *
@@ -602,7 +596,7 @@ public:
    */
   virtual int reset_timer_interval (long timer_id,
                                     const ACE_Time_Value &interval);
-#if defined (ACE_HAS_CPP11)
+
   template<class Rep, class Period>
   int reset_timer_interval (long timer_id,
                             const std::chrono::duration<Rep, Period>& interval)
@@ -610,7 +604,6 @@ public:
     ACE_Time_Value const tv_interval (interval);
     return this->reset_timer_interval (timer_id, tv_interval);
   }
-#endif
 
   /**
    * Cancel timer.
@@ -745,7 +738,7 @@ public:
    * via the notify queue before breaking out of its
    * ACE_Message_Queue::dequeue() loop.
    */
-  int max_notify_iterations (void);
+  int max_notify_iterations ();
 
   /**
    * Purge any notifications pending in this reactor for the specified
@@ -795,17 +788,17 @@ public:
 
   /// Returns true if Reactor has been successfully initialized, else
   /// false.
-  int initialized (void);
+  int initialized ();
 
   /// Returns the current size of the Reactor's internal descriptor
   /// table.
-  size_t size (void) const;
+  size_t size () const;
 
   /// Returns a reference to the Reactor's internal lock.
-  ACE_Lock &lock (void);
+  ACE_Lock &lock ();
 
   /// Wake up all threads in waiting in the event loop
-  void wakeup_all_threads (void);
+  void wakeup_all_threads ();
 
   /// Transfers ownership of Reactor to the @a new_owner.
   int owner (ACE_thread_t new_owner,
@@ -818,10 +811,10 @@ public:
   void requeue_position (int position);
 
   /// Get position of the owner thread.
-  int requeue_position (void);
+  int requeue_position ();
 
   /// Get the existing restart value.
-  bool restart (void);
+  bool restart ();
 
   /// Set a new value for restart and return the original value.
   bool restart (bool r);
@@ -853,7 +846,7 @@ public:
                  int ops);
 
   /// Get the implementation class
-  ACE_Reactor_Impl *implementation (void) const;
+  ACE_Reactor_Impl *implementation () const;
 
   /**
    * Returns 0, if the size of the current message has been put in
@@ -865,13 +858,13 @@ public:
 
   /// Return true if we any event associations were made by the reactor
   /// for the handles that it waits on, false otherwise.
-  bool uses_event_associations (void);
+  bool uses_event_associations ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Dump the state of the object.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// Set the implementation class.
diff --git a/ACE/ace/Reactor.inl b/ACE/ace/Reactor.inl
index 5d2bc60cfff..809e63d5922 100644
--- a/ACE/ace/Reactor.inl
+++ b/ACE/ace/Reactor.inl
@@ -1,18 +1,12 @@
 // -*- C++ -*-
 #include "ace/Reactor_Impl.h"
 
-/*
- * Hook to specialize the Reactor with the concrete implementation
- * known at compile time.
- */
-//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Run the event loop until the <ACE_Reactor::handle_events> method
 // returns -1 or the <end_event_loop> method is invoked.
 ACE_INLINE int
-ACE_Reactor::run_event_loop (void)
+ACE_Reactor::run_event_loop ()
 {
   ACE_TRACE ("ACE_Reactor::run_event_loop");
   ACE_Reactor *r = ACE_Reactor::instance ();
@@ -44,7 +38,7 @@ ACE_Reactor::run_event_loop (ACE_Time_Value &tv)
 // returns -1 or the <end_event_loop> method is invoked.
 
 ACE_INLINE int
-ACE_Reactor::run_alertable_event_loop (void)
+ACE_Reactor::run_alertable_event_loop ()
 {
   ACE_TRACE ("ACE_Reactor::run_alertable_event_loop");
   ACE_Reactor *r = ACE_Reactor::instance ();
@@ -73,7 +67,7 @@ ACE_Reactor::run_alertable_event_loop (ACE_Time_Value &tv)
 }
 
 ACE_INLINE void
-ACE_Reactor::reset_event_loop (void)
+ACE_Reactor::reset_event_loop ()
 {
   ACE_TRACE ("ACE_Reactor::reset_event_loop");
 
@@ -81,7 +75,7 @@ ACE_Reactor::reset_event_loop (void)
 }
 
 ACE_INLINE int
-ACE_Reactor::end_event_loop (void)
+ACE_Reactor::end_event_loop ()
 {
   ACE_TRACE ("ACE_Reactor::end_event_loop");
   ACE_Reactor::instance ()->end_reactor_event_loop ();
@@ -90,14 +84,14 @@ ACE_Reactor::end_event_loop (void)
 }
 
 ACE_INLINE int
-ACE_Reactor::event_loop_done (void)
+ACE_Reactor::event_loop_done ()
 {
   ACE_TRACE ("ACE_Reactor::event_loop_done");
   return ACE_Reactor::instance ()->reactor_event_loop_done ();
 }
 
 ACE_INLINE int
-ACE_Reactor::end_reactor_event_loop (void)
+ACE_Reactor::end_reactor_event_loop ()
 {
   ACE_TRACE ("ACE_Reactor::end_reactor_event_loop");
 
@@ -107,7 +101,7 @@ ACE_Reactor::end_reactor_event_loop (void)
 }
 
 ACE_INLINE void
-ACE_Reactor::reset_reactor_event_loop (void)
+ACE_Reactor::reset_reactor_event_loop ()
 {
   ACE_TRACE ("ACE_Reactor::reset_reactor_event_loop");
 
@@ -115,13 +109,13 @@ ACE_Reactor::reset_reactor_event_loop (void)
 }
 
 ACE_INLINE int
-ACE_Reactor::resumable_handler (void)
+ACE_Reactor::resumable_handler ()
 {
   return this->implementation ()->resumable_handler ();
 }
 
 ACE_INLINE ACE_Reactor_Impl *
-ACE_Reactor::implementation (void) const
+ACE_Reactor::implementation () const
 {
   return this->implementation_;
 }
@@ -162,13 +156,13 @@ ACE_Reactor::timer_queue (ACE_Timer_Queue *tq)
 }
 
 ACE_INLINE ACE_Timer_Queue *
-ACE_Reactor::timer_queue (void) const
+ACE_Reactor::timer_queue () const
 {
   return this->implementation ()->timer_queue ();
 }
 
 ACE_INLINE int
-ACE_Reactor::close (void)
+ACE_Reactor::close ()
 {
   return this->implementation ()->close ();
 }
@@ -285,7 +279,7 @@ ACE_Reactor::suspend_handler (const ACE_Handle_Set &handles)
 }
 
 ACE_INLINE int
-ACE_Reactor::suspend_handlers (void)
+ACE_Reactor::suspend_handlers ()
 {
   return this->implementation ()->suspend_handlers ();
 }
@@ -309,7 +303,7 @@ ACE_Reactor::resume_handler (const ACE_Handle_Set &handles)
 }
 
 ACE_INLINE int
-ACE_Reactor::resume_handlers (void)
+ACE_Reactor::resume_handlers ()
 {
   return this->implementation ()->resume_handlers ();
 }
@@ -344,7 +338,7 @@ ACE_Reactor::max_notify_iterations (int iterations)
 }
 
 ACE_INLINE int
-ACE_Reactor::max_notify_iterations (void)
+ACE_Reactor::max_notify_iterations ()
 {
   return this->implementation ()->max_notify_iterations ();
 }
@@ -378,19 +372,19 @@ ACE_Reactor::handler (int signum,
 }
 
 ACE_INLINE int
-ACE_Reactor::initialized (void)
+ACE_Reactor::initialized ()
 {
   return this->implementation ()->initialized ();
 }
 
 ACE_INLINE ACE_Lock &
-ACE_Reactor::lock (void)
+ACE_Reactor::lock ()
 {
   return this->implementation ()->lock ();
 }
 
 ACE_INLINE void
-ACE_Reactor::wakeup_all_threads (void)
+ACE_Reactor::wakeup_all_threads ()
 {
   this->implementation ()->wakeup_all_threads ();
 }
@@ -408,7 +402,7 @@ ACE_Reactor::owner (ACE_thread_t *owner)
 }
 
 ACE_INLINE bool
-ACE_Reactor::restart (void)
+ACE_Reactor::restart ()
 {
   return this->implementation ()->restart ();
 }
@@ -426,7 +420,7 @@ ACE_Reactor::requeue_position (int position)
 }
 
 ACE_INLINE int
-ACE_Reactor::requeue_position (void)
+ACE_Reactor::requeue_position ()
 {
   return this->implementation ()->requeue_position ();
 }
@@ -464,26 +458,26 @@ ACE_Reactor::ready_ops (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_Reactor::reactor_event_loop_done (void)
+ACE_Reactor::reactor_event_loop_done ()
 {
   ACE_TRACE ("ACE_Reactor::reactor_event_loop_done");
   return this->implementation_->deactivated ();
 }
 
 ACE_INLINE size_t
-ACE_Reactor::size (void) const
+ACE_Reactor::size () const
 {
   return this->implementation ()->size ();
 }
 
 ACE_INLINE bool
-ACE_Reactor::uses_event_associations (void)
+ACE_Reactor::uses_event_associations ()
 {
   return this->implementation ()->uses_event_associations ();
 }
 
 ACE_INLINE void
-ACE_Reactor::dump (void) const
+ACE_Reactor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Reactor::dump");
diff --git a/ACE/ace/Reactor_Impl.cpp b/ACE/ace/Reactor_Impl.cpp
index dd496854ad0..fcbeb4a5965 100644
--- a/ACE/ace/Reactor_Impl.cpp
+++ b/ACE/ace/Reactor_Impl.cpp
@@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Reactor_Impl)
 
-ACE_Reactor_Impl::~ACE_Reactor_Impl (void)
+ACE_Reactor_Impl::~ACE_Reactor_Impl ()
 {
 }
 
diff --git a/ACE/ace/Reactor_Impl.h b/ACE/ace/Reactor_Impl.h
index b6513e5ec4b..696b7a35a0c 100644
--- a/ACE/ace/Reactor_Impl.h
+++ b/ACE/ace/Reactor_Impl.h
@@ -24,6 +24,7 @@
 // Event_Handler.h contains the definition of ACE_Reactor_Mask
 #include "ace/Event_Handler.h"
 #include "ace/Countdown_Time.h"
+#include "ace/Synch_Traits.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -48,7 +49,7 @@ public:
   virtual int open (ACE_Reactor_Impl *,
                     ACE_Timer_Queue *timer_queue = 0,
                     int disable_notify = 0) = 0;
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /**
    * Called by a thread when it wants to unblock the Reactor_Impl.
@@ -72,7 +73,7 @@ public:
   /// Returns the ACE_HANDLE of the notify pipe on which the reactor
   /// is listening for notifications so that other threads can unblock
   /// the Reactor_Impl
-  virtual ACE_HANDLE notify_handle (void) = 0;
+  virtual ACE_HANDLE notify_handle () = 0;
 
   /// Verify whether the buffer has dispatchable info  or not.
   virtual int is_dispatchable (ACE_Notification_Buffer &buffer)= 0;
@@ -103,7 +104,7 @@ public:
    * passed in via the notify queue before breaking out of its event
    * loop.
    */
-  virtual int max_notify_iterations (void) = 0;
+  virtual int max_notify_iterations () = 0;
 
   /**
    * Purge any notifications pending in this reactor for the specified
@@ -114,7 +115,7 @@ public:
                                            ACE_Reactor_Mask    = ACE_Event_Handler::ALL_EVENTS_MASK) = 0;
 
   /// Dump the state of an object.
-  virtual void dump (void) const = 0;
+  virtual void dump () const = 0;
 };
 
 /**
@@ -126,7 +127,7 @@ class ACE_Export ACE_Reactor_Impl
 {
 public:
   /// Close down and release all resources.
-  virtual ~ACE_Reactor_Impl (void);
+  virtual ~ACE_Reactor_Impl ();
 
   /// Initialization.
   virtual int open (size_t size,
@@ -150,10 +151,10 @@ public:
   virtual int timer_queue (ACE_Timer_Queue *tq) = 0;
 
   /// Return the current ACE_Timer_Queue.
-  virtual ACE_Timer_Queue *timer_queue (void) const = 0;
+  virtual ACE_Timer_Queue *timer_queue () const = 0;
 
   /// Close down and release all resources.
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   // = Event loop drivers.
   /**
@@ -208,7 +209,7 @@ public:
    * actively handling events.  If it returns non-zero, handling_events() and
    * handle_alertable_events() return -1 immediately.
    */
-  virtual int deactivated (void) = 0;
+  virtual int deactivated () = 0;
 
   /**
    * Control whether the Reactor will handle any more incoming events or not.
@@ -334,7 +335,7 @@ public:
   virtual int suspend_handler (const ACE_Handle_Set &handles) = 0;
 
   /// Suspend all <handles> temporarily.
-  virtual int suspend_handlers (void) = 0;
+  virtual int suspend_handlers () = 0;
 
   /// Resume @a event_handler. Uses ACE_Event_Handler::get_handle() to
   /// get the handle.
@@ -347,16 +348,16 @@ public:
   virtual int resume_handler (const ACE_Handle_Set &handles) = 0;
 
   /// Resume all handles.
-  virtual int resume_handlers (void) = 0;
+  virtual int resume_handlers () = 0;
 
   /// Does the reactor allow the application to resume the handle on
   /// its own ie. can it pass on the control of handle resumption to
   /// the application
-  virtual int resumable_handler (void) = 0;
+  virtual int resumable_handler () = 0;
 
   /// Return true if we any event associations were made by the reactor
   /// for the handles that it waits on, false otherwise.
-  virtual bool uses_event_associations (void) = 0;
+  virtual bool uses_event_associations () = 0;
 
   // If we need to reset handles returned from accept/connect.
 
@@ -462,7 +463,7 @@ public:
    * via the notify queue before breaking out of its
    * ACE_Message_Queue::dequeue() loop.
    */
-  virtual int max_notify_iterations (void) = 0;
+  virtual int max_notify_iterations () = 0;
 
   /**
    * Purge any notifications pending in this reactor for the specified
@@ -497,17 +498,17 @@ public:
 
   /// Returns true if Reactor has been successfully initialized, else
   /// false.
-  virtual bool initialized (void) = 0;
+  virtual bool initialized () = 0;
 
   /// Returns the current size of the Reactor's internal descriptor
   /// table.
-  virtual size_t size (void) const = 0;
+  virtual size_t size () const = 0;
 
   /// Returns a reference to the Reactor's internal lock.
-  virtual ACE_Lock &lock (void) = 0;
+  virtual ACE_Lock &lock () = 0;
 
   /// Wake up all threads in waiting in the event loop
-  virtual void wakeup_all_threads (void) = 0;
+  virtual void wakeup_all_threads () = 0;
 
   /// Transfers ownership of Reactor_Impl to the @a new_owner.
   virtual int owner (ACE_thread_t new_owner, ACE_thread_t *old_owner = 0) = 0;
@@ -516,7 +517,7 @@ public:
   virtual int owner (ACE_thread_t *owner) = 0;
 
   /// Get the existing restart value.
-  virtual bool restart (void) = 0;
+  virtual bool restart () = 0;
 
   /// Set a new value for restart and return the original value.
   virtual bool restart (bool r) = 0;
@@ -525,7 +526,7 @@ public:
   virtual void requeue_position (int) = 0;
 
   /// Get position of the owner thread.
-  virtual int requeue_position (void) = 0;
+  virtual int requeue_position () = 0;
 
   // = Low-level wait_set mask manipulation methods.
 
@@ -554,7 +555,7 @@ public:
                          int ops) = 0;
 
   /// Dump the state of an object.
-  virtual void dump (void) const = 0;
+  virtual void dump () const = 0;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Reactor_Notification_Strategy.cpp b/ACE/ace/Reactor_Notification_Strategy.cpp
index 534236bebb4..ec3c95f7e3b 100644
--- a/ACE/ace/Reactor_Notification_Strategy.cpp
+++ b/ACE/ace/Reactor_Notification_Strategy.cpp
@@ -16,12 +16,12 @@ ACE_Reactor_Notification_Strategy::ACE_Reactor_Notification_Strategy (
 {
 }
 
-ACE_Reactor_Notification_Strategy::~ACE_Reactor_Notification_Strategy (void)
+ACE_Reactor_Notification_Strategy::~ACE_Reactor_Notification_Strategy ()
 {
 }
 
 int
-ACE_Reactor_Notification_Strategy::notify (void)
+ACE_Reactor_Notification_Strategy::notify ()
 {
   return this->reactor_->notify (this->eh_, this->mask_);
 }
diff --git a/ACE/ace/Reactor_Timer_Interface.h b/ACE/ace/Reactor_Timer_Interface.h
index 3000d93b1d0..71202e0ccf7 100644
--- a/ACE/ace/Reactor_Timer_Interface.h
+++ b/ACE/ace/Reactor_Timer_Interface.h
@@ -31,14 +31,13 @@ class ACE_Event_Handler;
 class ACE_Export ACE_Reactor_Timer_Interface
 {
 public:
-  virtual ~ACE_Reactor_Timer_Interface (void);
+  virtual ~ACE_Reactor_Timer_Interface ();
 
   virtual long schedule_timer (ACE_Event_Handler *event_handler,
                                const void *arg,
                                const ACE_Time_Value &delay,
                                const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0;
 
-#if defined (ACE_HAS_CPP11)
   template<class Rep1, class Period1, class Rep2 = int, class Period2 = std::ratio<1>>
   long schedule_timer (ACE_Event_Handler *event_handler,
                        const void *arg,
@@ -49,11 +48,10 @@ public:
     ACE_Time_Value const tv_interval (interval);
     return this->schedule_timer (event_handler, arg, tv_delay, tv_interval);
   }
-#endif
 
   virtual int reset_timer_interval (long timer_id,
                                     const ACE_Time_Value &interval) = 0;
-#if defined (ACE_HAS_CPP11)
+
   template<class Rep, class Period>
   int reset_timer_interval (long timer_id,
                             const std::chrono::duration<Rep, Period>& interval)
@@ -61,7 +59,6 @@ public:
     ACE_Time_Value const tv_interval (interval);
     return this->reset_timer_interval (timer_id, tv_interval);
   }
-#endif
 
   virtual int cancel_timer (long timer_id,
                             const void **arg = 0,
diff --git a/ACE/ace/Reactor_Token_T.h b/ACE/ace/Reactor_Token_T.h
index 521fdc8452e..0f92ec7206c 100644
--- a/ACE/ace/Reactor_Token_T.h
+++ b/ACE/ace/Reactor_Token_T.h
@@ -68,7 +68,7 @@ public:
   void reactor (ACE_Reactor_Impl &);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Read_Buffer.cpp b/ACE/ace/Read_Buffer.cpp
index 14ac5ded6ba..e3667a66b07 100644
--- a/ACE/ace/Read_Buffer.cpp
+++ b/ACE/ace/Read_Buffer.cpp
@@ -14,7 +14,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-ACE_Read_Buffer::dump (void) const
+ACE_Read_Buffer::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Read_Buffer::dump");
@@ -58,7 +58,7 @@ ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle,
 }
 #endif  // ACE_HAS_WINCE
 
-ACE_Read_Buffer::~ACE_Read_Buffer (void)
+ACE_Read_Buffer::~ACE_Read_Buffer ()
 {
   ACE_TRACE ("ACE_Read_Buffer::~ACE_Read_Buffer");
 
diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h
index b22d3f2d85a..f71f67b8562 100644
--- a/ACE/ace/Read_Buffer.h
+++ b/ACE/ace/Read_Buffer.h
@@ -86,13 +86,13 @@ public:
   ACE_Allocator *alloc (void) const;
 
   /// Dump the state of the object.
-  void dump (void) const;
+  void dump () const;
 
 private:
-
-  // Disallow copying and assignment...
-  void operator= (const ACE_Read_Buffer &);
-  ACE_Read_Buffer (const ACE_Read_Buffer &);
+  void operator= (const ACE_Read_Buffer &) = delete;
+  ACE_Read_Buffer (const ACE_Read_Buffer &) = delete;
+  void operator= (ACE_Read_Buffer &&) = delete;
+  ACE_Read_Buffer (ACE_Read_Buffer &&) = delete;
 
 private:
   /// Recursive helper method that does the work...
diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp
index 7d379ab20b5..047a334a24b 100644
--- a/ACE/ace/Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Recursive_Thread_Mutex.cpp
@@ -36,18 +36,18 @@ ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name,
                  ACE_TEXT ("recursive_mutex_init")));
 }
 
-ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex (void)
+ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex ()
 {
   // ACE_TRACE ("ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex");
   this->remove ();
 }
 
 int
-ACE_Recursive_Thread_Mutex::remove (void)
+ACE_Recursive_Thread_Mutex::remove ()
 {
 // ACE_TRACE ("ACE_Recursive_Thread_Mutex::remove");
   int result = 0;
-  if (this->removed_ == false)
+  if (!this->removed_)
     {
       this->removed_ = true;
       result = ACE_OS::recursive_mutex_destroy (&this->lock_);
@@ -58,7 +58,7 @@ ACE_Recursive_Thread_Mutex::remove (void)
 // The counter part of the following two functions for Win32 are
 // located in file Synch.i
 ACE_thread_t
-ACE_Recursive_Thread_Mutex::get_thread_id (void)
+ACE_Recursive_Thread_Mutex::get_thread_id ()
 {
   // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_thread_id");
 #if defined (ACE_HAS_RECURSIVE_MUTEXES)
@@ -78,7 +78,7 @@ ACE_Recursive_Thread_Mutex::get_thread_id (void)
 }
 
 int
-ACE_Recursive_Thread_Mutex::get_nesting_level (void)
+ACE_Recursive_Thread_Mutex::get_nesting_level ()
 {
   // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level");
 #if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE)
@@ -105,7 +105,7 @@ ACE_Recursive_Thread_Mutex::get_nesting_level (void)
 }
 
 void
-ACE_Recursive_Thread_Mutex::dump (void) const
+ACE_Recursive_Thread_Mutex::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Recursive_Thread_Mutex::dump");
diff --git a/ACE/ace/Recursive_Thread_Mutex.h b/ACE/ace/Recursive_Thread_Mutex.h
index 8c4c867ff12..f88e7b79a1c 100644
--- a/ACE/ace/Recursive_Thread_Mutex.h
+++ b/ACE/ace/Recursive_Thread_Mutex.h
@@ -44,21 +44,21 @@ public:
                               ACE_mutexattr_t *arg = 0);
 
   /// Implicitly release a recursive mutex.
-  ~ACE_Recursive_Thread_Mutex (void);
+  ~ACE_Recursive_Thread_Mutex ();
 
   /**
    * Implicitly release a recursive mutex.  Note that only one thread
    * should call this method since it doesn't protect against race
    * conditions.
    */
-  int remove (void);
+  int remove ();
 
   /**
    * Acquire a recursive mutex (will increment the nesting level and
    * not deadmutex if the owner of the mutex calls this method more
    * than once).
    */
-  int acquire (void);
+  int acquire ();
 
   /**
    * Block the thread until we acquire the mutex or until @a tv times
@@ -84,21 +84,21 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire (void);
+  int tryacquire ();
 
   /**
    * Acquire mutex ownership.  This calls acquire() and is only
    * here to make the ACE_Recusive_Thread_Mutex interface consistent
    * with the other synchronization APIs.
    */
-  int acquire_read (void);
+  int acquire_read ();
 
   /**
    * Acquire mutex ownership.  This calls acquire() and is only
    * here to make the ACE_Recusive_Thread_Mutex interface consistent
    * with the other synchronization APIs.
    */
-  int acquire_write (void);
+  int acquire_write ();
 
   /**
    * Conditionally acquire mutex (i.e., won't block).  This calls
@@ -108,7 +108,7 @@ public:
    * because someone else already had the lock, @c errno is set to
    * @c EBUSY.
    */
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /**
    * Conditionally acquire mutex (i.e., won't block).  This calls
@@ -118,7 +118,7 @@ public:
    * because someone else already had the lock, @c errno is set to
    * @c EBUSY.
    */
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /**
    * This is only here to make the ACE_Recursive_Thread_Mutex
@@ -126,17 +126,17 @@ public:
    * Assumes the caller has already acquired the mutex using one of
    * the above calls, and returns 0 (success) always.
    */
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
   /**
    * Releases a recursive mutex (will not release mutex until all the
    * nesting level drops to 0, which means the mutex is no longer
    * held).
    */
-  int release (void);
+  int release ();
 
   /// Return the id of the thread that currently owns the mutex.
-  ACE_thread_t get_thread_id (void);
+  ACE_thread_t get_thread_id ();
 
   /**
    * Return the nesting level of the recursion.  When a thread has
@@ -146,16 +146,16 @@ public:
    * macro is enabled then this method may return -1 on platforms that
    * do not expose the internal count.
    */
-  int get_nesting_level (void);
+  int get_nesting_level ();
 
   /// Returns a reference to the recursive mutex;
-  ACE_recursive_thread_mutex_t &lock (void);
+  ACE_recursive_thread_mutex_t &lock ();
 
   /// Returns a reference to the recursive mutex's internal mutex;
-  ACE_thread_mutex_t &get_nesting_mutex (void);
+  ACE_thread_mutex_t &get_nesting_mutex ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Recursive_Thread_Mutex.inl b/ACE/ace/Recursive_Thread_Mutex.inl
index 739e7756930..53fae98e083 100644
--- a/ACE/ace/Recursive_Thread_Mutex.inl
+++ b/ACE/ace/Recursive_Thread_Mutex.inl
@@ -2,13 +2,13 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_recursive_thread_mutex_t &
-ACE_Recursive_Thread_Mutex::lock (void)
+ACE_Recursive_Thread_Mutex::lock ()
 {
   return lock_;
 }
 
 ACE_INLINE ACE_thread_mutex_t &
-ACE_Recursive_Thread_Mutex::get_nesting_mutex (void)
+ACE_Recursive_Thread_Mutex::get_nesting_mutex ()
 {
 #if defined (ACE_HAS_RECURSIVE_MUTEXES)
   return static_cast<ACE_thread_mutex_t &> (lock_);
@@ -29,19 +29,19 @@ ACE_Recursive_Thread_Mutex::set_thread_id (ACE_thread_t t)
 }
 
 ACE_INLINE int
-ACE_Recursive_Thread_Mutex::acquire (void)
+ACE_Recursive_Thread_Mutex::acquire ()
 {
   return ACE_OS::recursive_mutex_lock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_Recursive_Thread_Mutex::release (void)
+ACE_Recursive_Thread_Mutex::release ()
 {
   return ACE_OS::recursive_mutex_unlock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_Recursive_Thread_Mutex::tryacquire (void)
+ACE_Recursive_Thread_Mutex::tryacquire ()
 {
   return ACE_OS::recursive_mutex_trylock (&this->lock_);
 }
@@ -59,31 +59,31 @@ ACE_Recursive_Thread_Mutex::acquire (ACE_Time_Value *tv)
 }
 
 ACE_INLINE int
-ACE_Recursive_Thread_Mutex::acquire_read (void)
+ACE_Recursive_Thread_Mutex::acquire_read ()
 {
   return this->acquire ();
 }
 
 ACE_INLINE int
-ACE_Recursive_Thread_Mutex::acquire_write (void)
+ACE_Recursive_Thread_Mutex::acquire_write ()
 {
   return this->acquire ();
 }
 
 ACE_INLINE int
-ACE_Recursive_Thread_Mutex::tryacquire_read (void)
+ACE_Recursive_Thread_Mutex::tryacquire_read ()
 {
   return this->tryacquire ();
 }
 
 ACE_INLINE int
-ACE_Recursive_Thread_Mutex::tryacquire_write (void)
+ACE_Recursive_Thread_Mutex::tryacquire_write ()
 {
   return this->tryacquire ();
 }
 
 ACE_INLINE int
-ACE_Recursive_Thread_Mutex::tryacquire_write_upgrade (void)
+ACE_Recursive_Thread_Mutex::tryacquire_write_upgrade ()
 {
   return 0;
 }
diff --git a/ACE/ace/Recyclable.cpp b/ACE/ace/Recyclable.cpp
index d42aea8a4f4..0b975675059 100644
--- a/ACE/ace/Recyclable.cpp
+++ b/ACE/ace/Recyclable.cpp
@@ -14,7 +14,7 @@ ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state)
 {
 }
 
-ACE_Recyclable::~ACE_Recyclable (void)
+ACE_Recyclable::~ACE_Recyclable ()
 {
 }
 
diff --git a/ACE/ace/Recyclable.h b/ACE/ace/Recyclable.h
index 47d06052f96..3ffe4bed865 100644
--- a/ACE/ace/Recyclable.h
+++ b/ACE/ace/Recyclable.h
@@ -48,10 +48,10 @@ class ACE_Export ACE_Recyclable
 {
 public:
   /// Destructor.
-  virtual ~ACE_Recyclable (void);
+  virtual ~ACE_Recyclable ();
 
   /// Get the recyclable bit
-  ACE_Recyclable_State recycle_state (void) const;
+  ACE_Recyclable_State recycle_state () const;
 
   /// Set the recyclable bit
   void recycle_state (ACE_Recyclable_State new_state);
diff --git a/ACE/ace/Recyclable.inl b/ACE/ace/Recyclable.inl
index 7a7e3fda268..08892ad9251 100644
--- a/ACE/ace/Recyclable.inl
+++ b/ACE/ace/Recyclable.inl
@@ -3,7 +3,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Recyclable_State
-ACE_Recyclable::recycle_state (void) const
+ACE_Recyclable::recycle_state () const
 {
   return this->recycle_state_;
 }
diff --git a/ACE/ace/Refcountable_T.cpp b/ACE/ace/Refcountable_T.cpp
index 5ffada80af7..b0d79661193 100644
--- a/ACE/ace/Refcountable_T.cpp
+++ b/ACE/ace/Refcountable_T.cpp
@@ -10,7 +10,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCK>
-ACE_Refcountable_T<ACE_LOCK>::~ACE_Refcountable_T (void)
+ACE_Refcountable_T<ACE_LOCK>::~ACE_Refcountable_T ()
 {
 }
 
diff --git a/ACE/ace/Refcountable_T.h b/ACE/ace/Refcountable_T.h
index b4916bf986c..0d7f09829ae 100644
--- a/ACE/ace/Refcountable_T.h
+++ b/ACE/ace/Refcountable_T.h
@@ -29,16 +29,16 @@ class ACE_Refcountable_T
 {
 public:
   /// Destructor.
-  virtual ~ACE_Refcountable_T (void);
+  virtual ~ACE_Refcountable_T ();
 
   /// Increment refcount
-  long increment (void);
+  long increment ();
 
   /// Decrement refcount
-  long decrement (void);
+  long decrement ();
 
   /// Returns the current refcount.
-  long refcount (void) const;
+  long refcount () const;
 
 protected:
   /// Protected constructor.
diff --git a/ACE/ace/Refcountable_T.inl b/ACE/ace/Refcountable_T.inl
index 7a901476d9a..1bbc937546e 100644
--- a/ACE/ace/Refcountable_T.inl
+++ b/ACE/ace/Refcountable_T.inl
@@ -11,21 +11,21 @@ ACE_Refcountable_T<ACE_LOCK>::ACE_Refcountable_T (long refcount)
 
 template <class ACE_LOCK>
 ACE_INLINE long
-ACE_Refcountable_T<ACE_LOCK>::increment (void)
+ACE_Refcountable_T<ACE_LOCK>::increment ()
 {
   return ++this->refcount_;
 }
 
 template <class ACE_LOCK>
 ACE_INLINE long
-ACE_Refcountable_T<ACE_LOCK>::decrement (void)
+ACE_Refcountable_T<ACE_LOCK>::decrement ()
 {
   return --this->refcount_;
 }
 
 template <class ACE_LOCK>
 ACE_INLINE long
-ACE_Refcountable_T<ACE_LOCK>::refcount (void) const
+ACE_Refcountable_T<ACE_LOCK>::refcount () const
 {
   return this->refcount_.value ();
 }
diff --git a/ACE/ace/Refcounted_Auto_Ptr.cpp b/ACE/ace/Refcounted_Auto_Ptr.cpp
index d97c128b99a..ae40c485ad5 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.cpp
+++ b/ACE/ace/Refcounted_Auto_Ptr.cpp
@@ -9,7 +9,7 @@ ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Refcounted_Auto_Ptr)
 ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Refcounted_Auto_Ptr_Rep)
 
 template <class X, class ACE_LOCK>
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr (void)
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr ()
 {
   AUTO_REFCOUNTED_PTR_REP::detach (rep_);
 }
diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h
index 670243dc1b5..b52872806ab 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.h
+++ b/ACE/ace/Refcounted_Auto_Ptr.h
@@ -57,7 +57,7 @@ public:
   /// Destructor. Releases the reference to the underlying representation.
   /// If the release of that reference causes its reference count to reach 0,
   /// the representation object will also be destroyed.
-  virtual ~ACE_Refcounted_Auto_Ptr (void);
+  virtual ~ACE_Refcounted_Auto_Ptr ();
 
   /// Assignment operator that binds the current object and @a r to the same
   /// ACE_Refcounted_Auto_Ptr_Rep. An ACE_Refcounted_Auto_Ptr_Rep
@@ -77,7 +77,7 @@ public:
   bool operator != (const ACE_Refcounted_Auto_Ptr<X, ACE_LOCK> &r) const;
 
   /// Redirection operator
-  X *operator-> (void) const;
+  X *operator-> () const;
 
   /// Accessor method.
   X &operator *() const;
@@ -90,20 +90,20 @@ public:
 
   /// Releases the reference to the underlying representation object.
   /// @retval The pointer value prior to releasing it.
-  X *release (void);
+  X *release ();
 
   /// Releases the current pointer value and then sets a new
   /// pointer value specified by @a p.
   void reset (X *p = 0);
 
   /// Get the pointer value.
-  X *get (void) const;
+  X *get () const;
 
   /// Get the reference count value.
-  long count (void) const;
+  long count () const;
 
   /// Returns @c true if this object does not contain a valid pointer.
-  bool null (void) const;
+  bool null () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -133,10 +133,10 @@ private:
   friend class ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>;
 
   /// Get the pointer value.
-  X *get (void) const;
+  X *get () const;
 
   /// Get the reference count value.
-  long count (void) const;
+  long count () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -174,7 +174,7 @@ private:
 private:
   // = Constructor and destructor private.
   ACE_Refcounted_Auto_Ptr_Rep (X *p = 0);
-  ~ACE_Refcounted_Auto_Ptr_Rep (void);
+  ~ACE_Refcounted_Auto_Ptr_Rep ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Refcounted_Auto_Ptr.inl b/ACE/ace/Refcounted_Auto_Ptr.inl
index f495076b153..2c46bbb5d3f 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.inl
+++ b/ACE/ace/Refcounted_Auto_Ptr.inl
@@ -5,19 +5,19 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class X, class ACE_LOCK> inline long
-ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::count (void) const
+ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::count () const
 {
   return this->ref_count_.value();
 }
 
 template <class X, class ACE_LOCK> inline long
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::count (void) const
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::count () const
 {
   return this->rep_->count ();
 }
 
 template <class X, class ACE_LOCK> inline bool
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::null (void) const
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::null () const
 {
   return (this->rep_ == 0 || this->rep_->get () == 0);
 }
@@ -75,12 +75,12 @@ ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::ACE_Refcounted_Auto_Ptr_Rep (X *p)
 }
 
 template <class X, class ACE_LOCK> inline
-ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr_Rep (void)
+ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr_Rep ()
 {
 }
 
 template <class X, class ACE_LOCK> inline X *
-ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::get (void) const
+ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::get () const
 {
   return this->ptr_.get ();
 }
@@ -110,7 +110,7 @@ ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator!= (const ACE_Refcounted_Auto_Ptr<
 }
 
 template <class X, class ACE_LOCK> inline X *
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator-> (void) const
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator-> () const
 {
     return this->rep_->get();
 }
@@ -134,14 +134,14 @@ ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator bool () const
 }
 
 template <class X, class ACE_LOCK> inline X*
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::get (void) const
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::get () const
 {
   // We return the ACE_Future_rep.
   return this->rep_->get ();
 }
 
 template<class X, class ACE_LOCK> inline X *
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::release (void)
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::release ()
 {
   X *p = this->get ();
   AUTO_REFCOUNTED_PTR_REP::detach (this->rep_);
diff --git a/ACE/ace/Registry_Name_Space.h b/ACE/ace/Registry_Name_Space.h
index 5c830112d4c..caf8461cfe2 100644
--- a/ACE/ace/Registry_Name_Space.h
+++ b/ACE/ace/Registry_Name_Space.h
@@ -121,7 +121,7 @@ public:
                          const ACE_NS_WString &pattern);
 
   /// Dump the state of the object
-  void dump (void) const;
+  void dump () const;
 
 private:
 
diff --git a/ACE/ace/Remote_Name_Space.cpp b/ACE/ace/Remote_Name_Space.cpp
index c40d190ef3d..a2af9bbf35b 100644
--- a/ACE/ace/Remote_Name_Space.cpp
+++ b/ACE/ace/Remote_Name_Space.cpp
@@ -23,7 +23,7 @@ ACE_Remote_Name_Space::open (const ACE_TCHAR *servername, u_short port)
   return 0;
 }
 
-ACE_Remote_Name_Space::ACE_Remote_Name_Space (void)
+ACE_Remote_Name_Space::ACE_Remote_Name_Space ()
 {
   ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space");
 }
@@ -362,7 +362,7 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
   return 0;
 }
 
-ACE_Remote_Name_Space::~ACE_Remote_Name_Space (void)
+ACE_Remote_Name_Space::~ACE_Remote_Name_Space ()
 {
   ACE_TRACE ("ACE_Remote_Name_Space::~ACE_Remote_Name_Space");
 }
@@ -370,7 +370,7 @@ ACE_Remote_Name_Space::~ACE_Remote_Name_Space (void)
 ACE_ALLOC_HOOK_DEFINE(ACE_Remote_Name_Space)
 
 void
-ACE_Remote_Name_Space::dump (void) const
+ACE_Remote_Name_Space::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_Name_Space::dump");
diff --git a/ACE/ace/Remote_Name_Space.h b/ACE/ace/Remote_Name_Space.h
index 6c0c4272240..cdda6074e68 100644
--- a/ACE/ace/Remote_Name_Space.h
+++ b/ACE/ace/Remote_Name_Space.h
@@ -130,7 +130,7 @@ public:
                                  const ACE_NS_WString &pattern);
 
   /// Dump the state of the object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ace/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h
index 582e63ee449..4326ac3f80f 100644
--- a/ACE/ace/Remote_Tokens.h
+++ b/ACE/ace/Remote_Tokens.h
@@ -137,7 +137,7 @@ public:
   static void set_server_address (const ACE_INET_Addr &server_address);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
 protected:
 
@@ -175,7 +175,7 @@ public:
                     int debug = 0);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Return deep copy.
   virtual ACE_Token_Proxy *clone (void) const;
@@ -211,7 +211,7 @@ public:
   ACE_Remote_RLock (const ACE_Remote_RLock &mutex);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Returns ACE_RW_Token::RLOCK;
   virtual int type (void) const;
@@ -249,7 +249,7 @@ public:
   ACE_Remote_WLock (const ACE_Remote_WLock &mutex);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Returns ACE_RW_Token::WLOCK;
   virtual int type (void) const;
@@ -293,7 +293,7 @@ public:
   static void set_server_address (const ACE_INET_Addr &server_address);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// The address of the Token Server used by all instances of
diff --git a/ACE/ace/Reverse_Lock_T.cpp b/ACE/ace/Reverse_Lock_T.cpp
index e55e1f47261..eac8be2976b 100644
--- a/ACE/ace/Reverse_Lock_T.cpp
+++ b/ACE/ace/Reverse_Lock_T.cpp
@@ -14,34 +14,34 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCKING_MECHANISM>
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock ()
 {
 }
 
 // Explicitly destroy the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::remove (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::remove ()
 {
   return this->lock_.remove ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire ()
 {
   return this->lock_.release ();
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire ()
 {
   ACE_NOTSUP_RETURN (-1);
 }
 
 // Acquire the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release ()
 {
   if (this->acquire_method_ == ACE_Acquire_Method::ACE_READ)
     return this->lock_.acquire_read ();
@@ -53,35 +53,35 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release (void)
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_read (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_read ()
 {
   ACE_NOTSUP_RETURN (-1);
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_write (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_write ()
 {
   ACE_NOTSUP_RETURN (-1);
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_read (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_read ()
 {
   ACE_NOTSUP_RETURN (-1);
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write ()
 {
   ACE_NOTSUP_RETURN (-1);
 }
 
 // Release the lock.
 template <class ACE_LOCKING_MECHANISM> int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade ()
 {
   ACE_NOTSUP_RETURN (-1);
 }
diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h
index f582c3f4986..571deb0de85 100644
--- a/ACE/ace/Reverse_Lock_T.h
+++ b/ACE/ace/Reverse_Lock_T.h
@@ -81,35 +81,35 @@ public:
 
   /// Destructor. If <lock_> was not passed in by the user, it will be
   /// deleted.
-  virtual ~ACE_Reverse_Lock (void);
+  virtual ~ACE_Reverse_Lock ();
 
   // = Lock accessors.
   /// Release the lock.
-  virtual int acquire (void);
+  virtual int acquire ();
 
   /// Release the lock.
-  virtual int tryacquire (void);
+  virtual int tryacquire ();
 
   /// Acquire the lock.
-  virtual int release (void);
+  virtual int release ();
 
   /// Release the lock.
-  virtual int acquire_read (void);
+  virtual int acquire_read ();
 
   /// Release the lock.
-  virtual int acquire_write (void);
+  virtual int acquire_write ();
 
   /// Release the lock.
-  virtual int tryacquire_read (void);
+  virtual int tryacquire_read ();
 
   /// Release the lock.
-  virtual int tryacquire_write (void);
+  virtual int tryacquire_write ();
 
   /// Release the lock.
-  virtual int tryacquire_write_upgrade (void);
+  virtual int tryacquire_write_upgrade ();
 
   /// Explicitly destroy the lock.
-  virtual int remove (void);
+  virtual int remove ();
 
 private:
   /// The concrete locking mechanism that all the methods delegate to.
diff --git a/ACE/ace/SOCK.cpp b/ACE/ace/SOCK.cpp
index 6127d625da5..6dae4f91b79 100644
--- a/ACE/ace/SOCK.cpp
+++ b/ACE/ace/SOCK.cpp
@@ -15,14 +15,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK)
 
 void
-ACE_SOCK::dump (void) const
+ACE_SOCK::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_SOCK::ACE_SOCK (void)
+ACE_SOCK::ACE_SOCK ()
 {
   // ACE_TRACE ("ACE_SOCK::ACE_SOCK");
 }
@@ -69,7 +69,7 @@ ACE_SOCK::get_local_addr (ACE_Addr &sa) const
 // Close down a ACE_SOCK.
 
 int
-ACE_SOCK::close (void)
+ACE_SOCK::close ()
 {
   ACE_TRACE ("ACE_SOCK::close");
   int result = 0;
diff --git a/ACE/ace/SOCK.h b/ACE/ace/SOCK.h
index 8fa3942c4b1..62ef4b9121c 100644
--- a/ACE/ace/SOCK.h
+++ b/ACE/ace/SOCK.h
@@ -59,7 +59,7 @@ public:
    * @return The result of closing the socket; 0 if the handle value
    *         was already ACE_INVALID_HANDLE.
    */
-  int close (void);
+  int close ();
 
   /// Return the local endpoint address in the referenced ACE_Addr.
   /// Returns 0 if successful, else -1.
@@ -73,7 +73,7 @@ public:
   int get_remote_addr (ACE_Addr &) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -114,7 +114,7 @@ protected:
 
   /// Default constructor is protected to prevent instances of this class
   /// from being defined.
-  ACE_SOCK (void);
+  ACE_SOCK ();
 
   /// Protected destructor.
   /**
@@ -122,7 +122,7 @@ protected:
    * operator delete() from being called through a base class ACE_SOCK
    * pointer/reference.
    */
-  ~ACE_SOCK (void);
+  ~ACE_SOCK ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SOCK.inl b/ACE/ace/SOCK.inl
index 74875bd41c3..6d55989b218 100644
--- a/ACE/ace/SOCK.inl
+++ b/ACE/ace/SOCK.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_SOCK::~ACE_SOCK (void)
+ACE_SOCK::~ACE_SOCK ()
 {
   // ACE_TRACE ("ACE_SOCK::~ACE_SOCK");
 }
diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp
index 47057df08d3..af0fd98670d 100644
--- a/ACE/ace/SOCK_Acceptor.cpp
+++ b/ACE/ace/SOCK_Acceptor.cpp
@@ -25,7 +25,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Acceptor)
 
 // Do nothing routine for constructor.
 
-ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (void)
+ACE_SOCK_Acceptor::ACE_SOCK_Acceptor ()
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
 }
@@ -211,7 +211,7 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 #endif  // ACE_HAS_WINCE
 
 void
-ACE_SOCK_Acceptor::dump (void) const
+ACE_SOCK_Acceptor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Acceptor::dump");
@@ -425,7 +425,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
 }
 
 int
-ACE_SOCK_Acceptor::close (void)
+ACE_SOCK_Acceptor::close ()
 {
   return ACE_SOCK::close ();
 }
diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h
index b05375a3ca4..1dc947fb9cf 100644
--- a/ACE/ace/SOCK_Acceptor.h
+++ b/ACE/ace/SOCK_Acceptor.h
@@ -38,7 +38,7 @@ class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK
 {
 public:
   /// Default constructor.
-  ACE_SOCK_Acceptor (void);
+  ACE_SOCK_Acceptor ();
 
   /**
    * Initialize a passive-mode BSD-style acceptor socket (no QoS).
@@ -98,10 +98,10 @@ public:
             int ipv6_only = 0);
 
   /// Close the socket.  Returns 0 on success and -1 on failure.
-  int close (void);
+  int close ();
 
   /// Default dtor.
-  ~ACE_SOCK_Acceptor (void);
+  ~ACE_SOCK_Acceptor ();
 
   // = Passive connection <accept> methods.
   /**
@@ -143,7 +143,7 @@ public:
   typedef ACE_SOCK_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Acceptor.inl b/ACE/ace/SOCK_Acceptor.inl
index bf6822a3e0f..525336c28ed 100644
--- a/ACE/ace/SOCK_Acceptor.inl
+++ b/ACE/ace/SOCK_Acceptor.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor (void)
+ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor ()
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor");
 }
diff --git a/ACE/ace/SOCK_CODgram.cpp b/ACE/ace/SOCK_CODgram.cpp
index 3921375ac2a..8cf14f0ebe2 100644
--- a/ACE/ace/SOCK_CODgram.cpp
+++ b/ACE/ace/SOCK_CODgram.cpp
@@ -14,7 +14,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_CODgram)
 
 void
-ACE_SOCK_CODgram::dump (void) const
+ACE_SOCK_CODgram::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_CODgram::dump");
diff --git a/ACE/ace/SOCK_CODgram.h b/ACE/ace/SOCK_CODgram.h
index b22eb6075d7..bbe37f29623 100644
--- a/ACE/ace/SOCK_CODgram.h
+++ b/ACE/ace/SOCK_CODgram.h
@@ -125,7 +125,7 @@ public:
   typedef ACE_INET_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp
index e84767064f9..cba9987fa0e 100644
--- a/ACE/ace/SOCK_Connector.cpp
+++ b/ACE/ace/SOCK_Connector.cpp
@@ -21,7 +21,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Connector)
 
 void
-ACE_SOCK_Connector::dump (void) const
+ACE_SOCK_Connector::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Connector::dump");
diff --git a/ACE/ace/SOCK_Connector.h b/ACE/ace/SOCK_Connector.h
index e84410257fc..2a7dde20db4 100644
--- a/ACE/ace/SOCK_Connector.h
+++ b/ACE/ace/SOCK_Connector.h
@@ -42,7 +42,7 @@ class ACE_Export ACE_SOCK_Connector
 {
 public:
   /// Default constructor.
-  ACE_SOCK_Connector (void);
+  ACE_SOCK_Connector ();
 
   /**
    * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream
@@ -247,7 +247,7 @@ public:
 #endif  // ACE_HAS_WINCE
 
   /// Default destructor.
-  ~ACE_SOCK_Connector (void);
+  ~ACE_SOCK_Connector ();
 
   // = Completion routine.
   /**
@@ -274,7 +274,7 @@ public:
   typedef ACE_SOCK_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Connector.inl b/ACE/ace/SOCK_Connector.inl
index ff1c7031182..d00f8d889f0 100644
--- a/ACE/ace/SOCK_Connector.inl
+++ b/ACE/ace/SOCK_Connector.inl
@@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // the specified REMOTE_SAP address using a blocking open.
 
 ACE_INLINE
-ACE_SOCK_Connector::~ACE_SOCK_Connector (void)
+ACE_SOCK_Connector::~ACE_SOCK_Connector ()
 {
   ACE_TRACE ("ACE_SOCK_Connector::~ACE_SOCK_Connector");
 }
@@ -13,7 +13,7 @@ ACE_SOCK_Connector::~ACE_SOCK_Connector (void)
 // Do-nothing constructor...
 
 ACE_INLINE
-ACE_SOCK_Connector::ACE_SOCK_Connector (void)
+ACE_SOCK_Connector::ACE_SOCK_Connector ()
 {
   ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector");
 }
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index c67fe8c58ba..4b06480ae2f 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -31,7 +31,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram)
 
 void
-ACE_SOCK_Dgram::dump (void) const
+ACE_SOCK_Dgram::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Dgram::dump");
diff --git a/ACE/ace/SOCK_Dgram.h b/ACE/ace/SOCK_Dgram.h
index 6746627148e..ea418e6a21c 100644
--- a/ACE/ace/SOCK_Dgram.h
+++ b/ACE/ace/SOCK_Dgram.h
@@ -38,7 +38,7 @@ class ACE_Export ACE_SOCK_Dgram : public ACE_SOCK
 {
 public:
   /// Default constructor.
-  ACE_SOCK_Dgram (void);
+  ACE_SOCK_Dgram ();
 
   /// This is a BSD-style method (i.e., no QoS) for initiating a socket
   /// dgram that will accept datagrams at the <local> address.
@@ -85,7 +85,7 @@ public:
             int ipv6_only = 0);
 
   /// Default dtor.
-  ~ACE_SOCK_Dgram (void);
+  ~ACE_SOCK_Dgram ();
 
   // = Data transfer routines.
   /// Send an @a n byte @a buf to the datagram socket (uses <sendto(3)>).
@@ -204,7 +204,7 @@ public:
   typedef ACE_INET_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Set NIC to use as multicast interface.
   int set_nic (const ACE_TCHAR *net_if,
diff --git a/ACE/ace/SOCK_Dgram.inl b/ACE/ace/SOCK_Dgram.inl
index b2a116c31b9..275c6eeeeee 100644
--- a/ACE/ace/SOCK_Dgram.inl
+++ b/ACE/ace/SOCK_Dgram.inl
@@ -8,13 +8,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Here's the simple-minded constructor.
 
 ACE_INLINE
-ACE_SOCK_Dgram::ACE_SOCK_Dgram (void)
+ACE_SOCK_Dgram::ACE_SOCK_Dgram ()
 {
   ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
 }
 
 ACE_INLINE
-ACE_SOCK_Dgram::~ACE_SOCK_Dgram (void)
+ACE_SOCK_Dgram::~ACE_SOCK_Dgram ()
 {
   ACE_TRACE ("ACE_SOCK_Dgram::~ACE_SOCK_Dgram");
 }
diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp
index f4cc86f7aba..1b4cedfa8ad 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Bcast.cpp
@@ -31,7 +31,7 @@ ACE_Bcast_Node::ACE_Bcast_Node (ACE_INET_Addr &addr,
 ACE_ALLOC_HOOK_DEFINE(ACE_Bcast_Node)
 
 void
-ACE_SOCK_Dgram_Bcast::dump (void) const
+ACE_SOCK_Dgram_Bcast::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::dump");
@@ -41,7 +41,7 @@ ACE_SOCK_Dgram_Bcast::dump (void) const
 // Close up and release resources.
 
 int
-ACE_SOCK_Dgram_Bcast::close (void)
+ACE_SOCK_Dgram_Bcast::close ()
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::close");
 
@@ -63,7 +63,7 @@ ACE_SOCK_Dgram_Bcast::close (void)
 
 // Here's the simple-minded constructor.
 
-ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (void)
+ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast ()
   : if_list_ (0)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast");
diff --git a/ACE/ace/SOCK_Dgram_Bcast.h b/ACE/ace/SOCK_Dgram_Bcast.h
index 3175ba84a95..16703839471 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.h
+++ b/ACE/ace/SOCK_Dgram_Bcast.h
@@ -113,7 +113,7 @@ public:
                 int flags = 0) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp
index cfaab1fcba2..ce1ce0ae20e 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Mcast.cpp
@@ -70,7 +70,7 @@ public:
 ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram_Mcast)
 
 void
-ACE_SOCK_Dgram_Mcast::dump (void) const
+ACE_SOCK_Dgram_Mcast::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::dump");
@@ -143,7 +143,7 @@ ACE_SOCK_Dgram_Mcast::ACE_SOCK_Dgram_Mcast
 }
 
 // Destructor.
-ACE_SOCK_Dgram_Mcast::~ACE_SOCK_Dgram_Mcast (void)
+ACE_SOCK_Dgram_Mcast::~ACE_SOCK_Dgram_Mcast ()
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::~ACE_SOCK_Dgram_Mcast");
 
@@ -915,7 +915,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
 }
 
 int
-ACE_SOCK_Dgram_Mcast::clear_subs_list (void)
+ACE_SOCK_Dgram_Mcast::clear_subs_list ()
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::clear_subs_list");
   int result = 0;
diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h
index 4a274c17de6..5c4c835eccd 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.h
+++ b/ACE/ace/SOCK_Dgram_Mcast.h
@@ -206,7 +206,7 @@ public:
    * done by the destructor.  If not, most systems will automatically
    * unsubscribe upon the close of the socket.
    */
-  ~ACE_SOCK_Dgram_Mcast (void);
+  ~ACE_SOCK_Dgram_Mcast ();
 
   /**
    * Explicitly open/bind the socket and define the network interface
@@ -330,7 +330,7 @@ public:
    * Logs the setting of all options, the bound address, the send address and
    * interface, and the list of current subscriptions.
    */
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -352,7 +352,7 @@ private:
                      int reuse_addr);
 
   /// Do subscription processing w/out updating the subscription list.
-  /// (Layered method for <subscribe> processing).
+  /// (Layered method for subscribe() processing).
   int subscribe_i (const ACE_INET_Addr &mcast_addr,
                    int reuse_addr = 1,
                    const ACE_TCHAR *net_if = 0);
@@ -374,7 +374,7 @@ protected:
               int reuse_addr = 1);
 
   /// Empty the dynamic subscription list.
-  int clear_subs_list (void);
+  int clear_subs_list ();
 
 private:
   /// Per-instance options..
diff --git a/ACE/ace/SOCK_IO.cpp b/ACE/ace/SOCK_IO.cpp
index e2b68a64545..65c261aaac2 100644
--- a/ACE/ace/SOCK_IO.cpp
+++ b/ACE/ace/SOCK_IO.cpp
@@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_IO)
 
 void
-ACE_SOCK_IO::dump (void) const
+ACE_SOCK_IO::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_IO::dump");
diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h
index 0ea281bb3ef..ee1f460f4b1 100644
--- a/ACE/ace/SOCK_IO.h
+++ b/ACE/ace/SOCK_IO.h
@@ -48,10 +48,10 @@ class ACE_Export ACE_SOCK_IO : public ACE_SOCK
 {
 public:
   /// Constructor.
-  ACE_SOCK_IO (void);
+  ACE_SOCK_IO ();
 
   /// Destructor.
-  ~ACE_SOCK_IO (void);
+  ~ACE_SOCK_IO ();
 
   /// Recv an @a n byte buffer from the connected socket.
   ssize_t recv (void *buf,
@@ -119,7 +119,7 @@ public:
                 ACE_OVERLAPPED *overlapped) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_IO.inl b/ACE/ace/SOCK_IO.inl
index eec644cd71f..9fd9a63d9f8 100644
--- a/ACE/ace/SOCK_IO.inl
+++ b/ACE/ace/SOCK_IO.inl
@@ -6,13 +6,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Send an n byte message to the connected socket.
 
 ACE_INLINE
-ACE_SOCK_IO::ACE_SOCK_IO (void)
+ACE_SOCK_IO::ACE_SOCK_IO ()
 {
   // ACE_TRACE ("ACE_SOCK_IO::ACE_SOCK_IO");
 }
 
 ACE_INLINE
-ACE_SOCK_IO::~ACE_SOCK_IO (void)
+ACE_SOCK_IO::~ACE_SOCK_IO ()
 {
   // ACE_TRACE ("ACE_SOCK_IO::~ACE_SOCK_IO");
 }
diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
index fc1bc669b22..8efe8acfc9b 100644
--- a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -19,7 +19,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Acceptor)
 
 // Do nothing routine for constructor.
 
-ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (void)
+ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor ()
 {
   ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor");
 }
@@ -150,7 +150,7 @@ ACE_SOCK_SEQPACK_Acceptor::accept (ACE_SOCK_SEQPACK_Association &new_association
 }
 
 void
-ACE_SOCK_SEQPACK_Acceptor::dump (void) const
+ACE_SOCK_SEQPACK_Acceptor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::dump");
@@ -595,7 +595,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Multihomed_INET_
 }
 
 int
-ACE_SOCK_SEQPACK_Acceptor::close (void)
+ACE_SOCK_SEQPACK_Acceptor::close ()
 {
   return ACE_SOCK::close ();
 }
diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.h b/ACE/ace/SOCK_SEQPACK_Acceptor.h
index a4f6b3c8473..16e936127d7 100644
--- a/ACE/ace/SOCK_SEQPACK_Acceptor.h
+++ b/ACE/ace/SOCK_SEQPACK_Acceptor.h
@@ -137,7 +137,7 @@ public:
   typedef ACE_SOCK_SEQPACK_Association PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp
index e1921645f2a..ef250e4bca1 100644
--- a/ACE/ace/SOCK_SEQPACK_Association.cpp
+++ b/ACE/ace/SOCK_SEQPACK_Association.cpp
@@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association)
 
 void
-ACE_SOCK_SEQPACK_Association::dump (void) const
+ACE_SOCK_SEQPACK_Association::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_SEQPACK_Association::dump");
@@ -24,7 +24,7 @@ ACE_SOCK_SEQPACK_Association::dump (void) const
 }
 
 int
-ACE_SOCK_SEQPACK_Association::close (void)
+ACE_SOCK_SEQPACK_Association::close ()
 {
 #if defined (ACE_WIN32)
   // We need the following call to make things work correctly on
@@ -43,7 +43,7 @@ ACE_SOCK_SEQPACK_Association::close (void)
 // draft-ietf-tsvwg-sctpsocket-09.txt to abruptly free a transport
 // transport association's resources.
 int
-ACE_SOCK_SEQPACK_Association::abort (void)
+ACE_SOCK_SEQPACK_Association::abort ()
 {
   //
   // setsockopt() SO_LINGER configures socket to reap immediately.
diff --git a/ACE/ace/SOCK_SEQPACK_Association.h b/ACE/ace/SOCK_SEQPACK_Association.h
index c1eb5be442f..a9a0a80cc6e 100644
--- a/ACE/ace/SOCK_SEQPACK_Association.h
+++ b/ACE/ace/SOCK_SEQPACK_Association.h
@@ -182,7 +182,7 @@ public:
   typedef ACE_Multihomed_INET_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_SEQPACK_Connector.cpp b/ACE/ace/SOCK_SEQPACK_Connector.cpp
index 92787f9a5e3..ba95da79993 100644
--- a/ACE/ace/SOCK_SEQPACK_Connector.cpp
+++ b/ACE/ace/SOCK_SEQPACK_Connector.cpp
@@ -23,7 +23,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Connector)
 
 void
-ACE_SOCK_SEQPACK_Connector::dump (void) const
+ACE_SOCK_SEQPACK_Connector::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::dump");
diff --git a/ACE/ace/SOCK_SEQPACK_Connector.h b/ACE/ace/SOCK_SEQPACK_Connector.h
index 102940fdf3a..59db01155c8 100644
--- a/ACE/ace/SOCK_SEQPACK_Connector.h
+++ b/ACE/ace/SOCK_SEQPACK_Connector.h
@@ -278,7 +278,7 @@ public:
   typedef ACE_SOCK_SEQPACK_Association PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Stream.cpp b/ACE/ace/SOCK_Stream.cpp
index c25a9b42961..e15d2e0ed80 100644
--- a/ACE/ace/SOCK_Stream.cpp
+++ b/ACE/ace/SOCK_Stream.cpp
@@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Stream)
 
 void
-ACE_SOCK_Stream::dump (void) const
+ACE_SOCK_Stream::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Stream::dump");
@@ -21,7 +21,7 @@ ACE_SOCK_Stream::dump (void) const
 }
 
 int
-ACE_SOCK_Stream::close (void)
+ACE_SOCK_Stream::close ()
 {
 #if defined (ACE_WIN32)
   // We need the following call to make things work correctly on
diff --git a/ACE/ace/SOCK_Stream.h b/ACE/ace/SOCK_Stream.h
index ae0c6969c2b..35203184249 100644
--- a/ACE/ace/SOCK_Stream.h
+++ b/ACE/ace/SOCK_Stream.h
@@ -40,13 +40,13 @@ class ACE_Export ACE_SOCK_Stream : public ACE_SOCK_IO
 public:
   // Initialization and termination methods.
   /// Constructor.
-  ACE_SOCK_Stream (void);
+  ACE_SOCK_Stream ();
 
   /// Constructor (sets the underlying ACE_HANDLE with @a h).
   ACE_SOCK_Stream (ACE_HANDLE h);
 
   /// Destructor.
-  ~ACE_SOCK_Stream (void);
+  ~ACE_SOCK_Stream ();
 
   /** @name Counted send/receive methods
    *
@@ -153,23 +153,23 @@ public:
 
   // = Selectively close endpoints.
   /// Close down the reader.
-  int close_reader (void);
+  int close_reader ();
 
   /// Close down the writer.
-  int close_writer (void);
+  int close_writer ();
 
   /**
    * Close down the socket (we need this to make things work correctly
    * on Win32, which requires use to do a close_writer() before doing
    * the close to avoid losing data).
    */
-  int close (void);
+  int close ();
 
   // = Meta-type info
   typedef ACE_INET_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Stream.inl b/ACE/ace/SOCK_Stream.inl
index fe25fdde36e..f2aad80ad3e 100644
--- a/ACE/ace/SOCK_Stream.inl
+++ b/ACE/ace/SOCK_Stream.inl
@@ -5,7 +5,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_SOCK_Stream::ACE_SOCK_Stream (void)
+ACE_SOCK_Stream::ACE_SOCK_Stream ()
 {
   // ACE_TRACE ("ACE_SOCK_Stream::ACE_SOCK_Stream");
 }
@@ -18,13 +18,13 @@ ACE_SOCK_Stream::ACE_SOCK_Stream (ACE_HANDLE h)
 }
 
 ACE_INLINE
-ACE_SOCK_Stream::~ACE_SOCK_Stream (void)
+ACE_SOCK_Stream::~ACE_SOCK_Stream ()
 {
   // ACE_TRACE ("ACE_SOCK_Stream::~ACE_SOCK_Stream");
 }
 
 ACE_INLINE int
-ACE_SOCK_Stream::close_reader (void)
+ACE_SOCK_Stream::close_reader ()
 {
   ACE_TRACE ("ACE_SOCK_Stream::close_reader");
   if (this->get_handle () != ACE_INVALID_HANDLE)
@@ -36,7 +36,7 @@ ACE_SOCK_Stream::close_reader (void)
 // Shut down just the writing end of a ACE_SOCK.
 
 ACE_INLINE int
-ACE_SOCK_Stream::close_writer (void)
+ACE_SOCK_Stream::close_writer ()
 {
   ACE_TRACE ("ACE_SOCK_Stream::close_writer");
   if (this->get_handle () != ACE_INVALID_HANDLE)
diff --git a/ACE/ace/SPIPE.cpp b/ACE/ace/SPIPE.cpp
index a57a8a0ae70..546307a9355 100644
--- a/ACE/ace/SPIPE.cpp
+++ b/ACE/ace/SPIPE.cpp
@@ -18,13 +18,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE)
 
 // This is the do-nothing constructor.
 
-ACE_SPIPE::ACE_SPIPE (void)
+ACE_SPIPE::ACE_SPIPE ()
 {
   // ACE_TRACE ("ACE_SPIPE::ACE_SPIPE");
 }
 
 void
-ACE_SPIPE::dump (void) const
+ACE_SPIPE::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SPIPE::dump");
@@ -44,7 +44,7 @@ ACE_SPIPE::get_local_addr (ACE_SPIPE_Addr &local_sap) const
 // Close down the STREAM pipe without removing the rendezvous point.
 
 int
-ACE_SPIPE::close (void)
+ACE_SPIPE::close ()
 {
   ACE_TRACE ("ACE_SPIPE::close");
   int result = 0;
@@ -64,7 +64,7 @@ ACE_SPIPE::close (void)
 // file system.
 
 int
-ACE_SPIPE::remove (void)
+ACE_SPIPE::remove ()
 {
   ACE_TRACE ("ACE_SPIPE::remove");
   int result = this->close ();
diff --git a/ACE/ace/SPIPE.h b/ACE/ace/SPIPE.h
index 0ae586ec313..5435477e551 100644
--- a/ACE/ace/SPIPE.h
+++ b/ACE/ace/SPIPE.h
@@ -79,7 +79,7 @@ public:
   int disable (int signum) const ;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 #if defined (ACE_HAS_STREAM_PIPES)
   /// Temporary store of duplex pipe handle.
diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp
index 84420da62bc..e3313097ae9 100644
--- a/ACE/ace/SPIPE_Acceptor.cpp
+++ b/ACE/ace/SPIPE_Acceptor.cpp
@@ -14,7 +14,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (void)
+ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor ()
 #if defined (ACE_HAS_WIN32_NAMED_PIPES)
   : sa_ (0), pipe_handle_ (ACE_INVALID_HANDLE)
 #endif /* ACE_HAS_WIN32_NAMED_PIPES */
@@ -23,7 +23,7 @@ ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (void)
 }
 
 int
-ACE_SPIPE_Acceptor::remove (void)
+ACE_SPIPE_Acceptor::remove ()
 {
   ACE_TRACE ("ACE_SPIPE_Acceptor::remove");
 #if defined (ACE_HAS_STREAM_PIPES)
@@ -41,7 +41,7 @@ ACE_SPIPE_Acceptor::remove (void)
 ACE_ALLOC_HOOK_DEFINE (ACE_SPIPE_Acceptor)
 
 void
-ACE_SPIPE_Acceptor::dump (void) const
+ACE_SPIPE_Acceptor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SPIPE_Acceptor::dump");
@@ -180,7 +180,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
 }
 
 int
-ACE_SPIPE_Acceptor::close (void)
+ACE_SPIPE_Acceptor::close ()
 {
   ACE_TRACE ("ACE_SPIPE_Acceptor::close");
 
diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h
index ced2fc835b3..817c53bcc1a 100644
--- a/ACE/ace/SPIPE_Acceptor.h
+++ b/ACE/ace/SPIPE_Acceptor.h
@@ -125,7 +125,7 @@ public:
   typedef ACE_SPIPE_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SPIPE_Addr.cpp b/ACE/ace/SPIPE_Addr.cpp
index ef34d66dc24..a12c0c79e68 100644
--- a/ACE/ace/SPIPE_Addr.cpp
+++ b/ACE/ace/SPIPE_Addr.cpp
@@ -7,14 +7,12 @@
 #include "ace/SPIPE_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Addr)
 
 void
-ACE_SPIPE_Addr::dump (void) const
+ACE_SPIPE_Addr::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 #endif /* ACE_HAS_DUMP */
@@ -33,7 +31,7 @@ ACE_SPIPE_Addr::set_addr (const void *addr, int len)
 // Return the address.
 
 void *
-ACE_SPIPE_Addr::get_addr (void) const
+ACE_SPIPE_Addr::get_addr () const
 {
   return (void *) &this->SPIPE_addr_;
 }
@@ -41,7 +39,7 @@ ACE_SPIPE_Addr::get_addr (void) const
 
 // Do nothing constructor.
 
-ACE_SPIPE_Addr::ACE_SPIPE_Addr (void)
+ACE_SPIPE_Addr::ACE_SPIPE_Addr ()
   : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_)
 {
   (void) ACE_OS::memset ((void *) &this->SPIPE_addr_,
diff --git a/ACE/ace/SPIPE_Addr.h b/ACE/ace/SPIPE_Addr.h
index e6d781e195e..d8ae394882b 100644
--- a/ACE/ace/SPIPE_Addr.h
+++ b/ACE/ace/SPIPE_Addr.h
@@ -34,7 +34,7 @@ class ACE_Export ACE_SPIPE_Addr : public ACE_Addr
 {
 public:
   /// Default constructor.
-  ACE_SPIPE_Addr (void);
+  ACE_SPIPE_Addr ();
 
   /// Copy constructor.
   ACE_SPIPE_Addr (const ACE_SPIPE_Addr &sa);
@@ -51,7 +51,7 @@ public:
   int set (const ACE_TCHAR *rendezvous_point, gid_t = 0, uid_t = 0);
 
   /// Return a pointer to the address.
-  virtual void *get_addr (void) const;
+  virtual void *get_addr () const;
 
   /// Set a pointer to the underlying network address.
   virtual void set_addr (const void *addr, int len);
@@ -74,7 +74,7 @@ public:
   const ACE_TCHAR *get_path_name (void) const;
 
   /// Get user id.
-  uid_t user_id (void) const;
+  uid_t user_id () const;
 
   /// Set user id.
   void user_id (uid_t uid);
@@ -83,10 +83,10 @@ public:
   void group_id (gid_t gid);
 
   /// Get group ids.
-  gid_t group_id (void) const;
+  gid_t group_id () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp
index 3b29e4fcb19..bfb24eb91fd 100644
--- a/ACE/ace/SPIPE_Connector.cpp
+++ b/ACE/ace/SPIPE_Connector.cpp
@@ -39,14 +39,14 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io,
 }
 
 void
-ACE_SPIPE_Connector::dump (void) const
+ACE_SPIPE_Connector::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SPIPE_Connector::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_SPIPE_Connector::ACE_SPIPE_Connector (void)
+ACE_SPIPE_Connector::ACE_SPIPE_Connector ()
 {
   ACE_TRACE ("ACE_SPIPE_Connector::ACE_SPIPE_Connector");
 }
diff --git a/ACE/ace/SPIPE_Connector.h b/ACE/ace/SPIPE_Connector.h
index 76f233fccc7..ca3a5060653 100644
--- a/ACE/ace/SPIPE_Connector.h
+++ b/ACE/ace/SPIPE_Connector.h
@@ -33,7 +33,7 @@ class ACE_Export ACE_SPIPE_Connector
 {
 public:
   /// Default constructor.
-  ACE_SPIPE_Connector (void);
+  ACE_SPIPE_Connector ();
 
   /**
    * Actively connect and produce a <new_stream> if things go well.
@@ -99,7 +99,7 @@ public:
   typedef ACE_SPIPE_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SPIPE_Stream.cpp b/ACE/ace/SPIPE_Stream.cpp
index c9374c19b42..003aa7c860d 100644
--- a/ACE/ace/SPIPE_Stream.cpp
+++ b/ACE/ace/SPIPE_Stream.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Stream)
 
 void
-ACE_SPIPE_Stream::dump (void) const
+ACE_SPIPE_Stream::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SPIPE_Stream::dump");
@@ -24,7 +24,7 @@ ACE_SPIPE_Stream::dump (void) const
 
 // Simple-minded do nothing constructor.
 
-ACE_SPIPE_Stream::ACE_SPIPE_Stream (void)
+ACE_SPIPE_Stream::ACE_SPIPE_Stream ()
 {
   // ACE_TRACE ("ACE_SPIPE_Stream::ACE_SPIPE_Stream");
 }
diff --git a/ACE/ace/SPIPE_Stream.h b/ACE/ace/SPIPE_Stream.h
index 5eaf33ce98d..e371069192e 100644
--- a/ACE/ace/SPIPE_Stream.h
+++ b/ACE/ace/SPIPE_Stream.h
@@ -55,7 +55,7 @@ public:
   friend class ACE_SPIPE_Connector;
 
   /// Default constructor.
-  ACE_SPIPE_Stream (void);
+  ACE_SPIPE_Stream ();
 
   /// Obtain the address of whom we are connected with.
   int get_remote_addr (ACE_SPIPE_Addr &remote_sap) const;
@@ -151,7 +151,7 @@ public:
   typedef ACE_SPIPE_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h
index a9104780a8a..fc6d39fa637 100644
--- a/ACE/ace/SSL/SSL_Context.h
+++ b/ACE/ace/SSL/SSL_Context.h
@@ -35,17 +35,17 @@ class ACE_SSL_Export ACE_SSL_Data_File
 {
 public:
   /// Default constructor
-  ACE_SSL_Data_File (void);
+  ACE_SSL_Data_File ();
 
   /// Constructor from a file name and the file type.
   ACE_SSL_Data_File (const char *file_name,
                      int type = SSL_FILETYPE_PEM);
 
   /// The file name
-  const char *file_name (void) const;
+  const char *file_name () const;
 
   /// The type
-  int type (void) const;
+  int type () const;
 
 private:
   /// The file name
@@ -110,17 +110,17 @@ public:
   };
 
   /// Constructor
-  ACE_SSL_Context (void);
+  ACE_SSL_Context ();
 
   /// Destructor
-  ~ACE_SSL_Context (void);
+  ~ACE_SSL_Context ();
 
   /// The Singleton context, the SSL components use the singleton if
   /// nothing else is available.
-  static ACE_SSL_Context *instance (void);
+  static ACE_SSL_Context *instance ();
 
   /// Explicitly delete the Singleton context.
-  static void close (void);
+  static void close ();
 
   /**
    * Set the CTX mode.  The mode can be set only once, afterwards the
@@ -132,14 +132,14 @@ public:
    */
   int set_mode (int mode = ACE_SSL_Context::SSLv23);
 
-  int get_mode (void) const;
+  int get_mode () const;
 
   /// Get the SSL context
-  SSL_CTX *context (void);
+  SSL_CTX *context ();
 
   /// Get the file name and file format used for the private key
-  int private_key_type (void) const;
-  const char *private_key_file_name (void) const;
+  int private_key_type () const;
+  const char *private_key_file_name () const;
 
   /// Set the private key file.
   /**
@@ -155,11 +155,11 @@ public:
    *       been set since key verification is performed against the
    *       certificate, among other things.
    */
-  int verify_private_key (void);
+  int verify_private_key ();
 
   /// Get the file name and file format used for the certificate file
-  int certificate_type (void) const;
-  const char *certificate_file_name (void) const;
+  int certificate_type () const;
+  const char *certificate_file_name () const;
 
   /// Set the certificate file.
   int certificate (const char *file_name,
@@ -255,7 +255,7 @@ public:
    *  @retval >0  The number of successful CA load attempts.
    *  @retval  0  If all CA load attempts have failed.
    */
-  int have_trusted_ca (void) const;
+  int have_trusted_ca () const;
 
   /**
    *  @todo Complete this documentation where elipses(...) are used
@@ -298,7 +298,7 @@ public:
    * It can be overriden on a per-ACE_SSL object.
    */
   void default_verify_mode (int mode);
-  int default_verify_mode (void) const;
+  int default_verify_mode () const;
 
   /**
    * Set and query the default verify callback for this context, it is
@@ -306,7 +306,7 @@ public:
    * It can be overriden on a per-ACE_SSL object.
    */
   void default_verify_callback (extern_C_CallBackVerify_t);
-  extern_C_CallBackVerify_t  default_verify_callback (void) const;
+  extern_C_CallBackVerify_t  default_verify_callback () const;
 
   /**
    * @name OpenSSL Random Number Generator Seed Related Methods
@@ -336,7 +336,7 @@ public:
   static void report_error (unsigned long error_code);
 
   /// Print the last SSL error for the current thread.
-  static void report_error (void);
+  static void report_error ();
 
   /**
    * @name Diffie-Hellman (DH) Parameters
@@ -361,7 +361,7 @@ public:
 
 private:
   /// Verify if the context has been initialized or not.
-  void check_context (void);
+  void check_context ();
 
   /// @@ More to document
   void ssl_library_init ();
diff --git a/ACE/ace/SSL/SSL_Context.inl b/ACE/ace/SSL/SSL_Context.inl
index f95beb88e0f..67edb162d64 100644
--- a/ACE/ace/SSL/SSL_Context.inl
+++ b/ACE/ace/SSL/SSL_Context.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_SSL_Data_File::ACE_SSL_Data_File (void)
+ACE_SSL_Data_File::ACE_SSL_Data_File ()
   : type_ (-1)
 {
 }
@@ -16,13 +16,13 @@ ACE_SSL_Data_File::ACE_SSL_Data_File (const char *file_name,
 }
 
 ACE_INLINE const char *
-ACE_SSL_Data_File::file_name (void) const
+ACE_SSL_Data_File::file_name () const
 {
   return this->file_name_.c_str ();
 }
 
 ACE_INLINE int
-ACE_SSL_Data_File::type (void) const
+ACE_SSL_Data_File::type () const
 {
   return this->type_;
 }
@@ -30,7 +30,7 @@ ACE_SSL_Data_File::type (void) const
 // ****************************************************************
 
 ACE_INLINE void
-ACE_SSL_Context::check_context (void)
+ACE_SSL_Context::check_context ()
 {
   if (this->context_ == 0)
     {
@@ -45,44 +45,44 @@ ACE_SSL_Context::check_context (void)
 }
 
 ACE_INLINE SSL_CTX *
-ACE_SSL_Context::context (void)
+ACE_SSL_Context::context ()
 {
   this->check_context ();
   return this->context_;
 }
 
 ACE_INLINE int
-ACE_SSL_Context::private_key_type (void) const
+ACE_SSL_Context::private_key_type () const
 {
   return this->private_key_.type ();
 }
 
 ACE_INLINE const char*
-ACE_SSL_Context::private_key_file_name (void) const
+ACE_SSL_Context::private_key_file_name () const
 {
   return this->private_key_.file_name ();
 }
 
 ACE_INLINE int
-ACE_SSL_Context::certificate_type (void) const
+ACE_SSL_Context::certificate_type () const
 {
   return this->certificate_.type ();
 }
 
 ACE_INLINE const char*
-ACE_SSL_Context::certificate_file_name (void) const
+ACE_SSL_Context::certificate_file_name () const
 {
   return this->certificate_.file_name ();
 }
 
 ACE_INLINE int
-ACE_SSL_Context::dh_params_file_type (void) const
+ACE_SSL_Context::dh_params_file_type () const
 {
   return this->dh_params_.type ();
 }
 
 ACE_INLINE const char*
-ACE_SSL_Context::dh_params_file_name (void) const
+ACE_SSL_Context::dh_params_file_name () const
 {
   return this->dh_params_.file_name ();
 }
@@ -94,7 +94,7 @@ ACE_SSL_Context::default_verify_mode (int mode)
 }
 
 ACE_INLINE int
-ACE_SSL_Context::default_verify_mode (void) const
+ACE_SSL_Context::default_verify_mode () const
 {
   return this->default_verify_mode_;
 }
@@ -105,19 +105,19 @@ ACE_SSL_Context::default_verify_callback (extern_C_CallBackVerify_t  callback)
   this->default_verify_callback_ = callback;
 }
 
-ACE_INLINE extern_C_CallBackVerify_t  ACE_SSL_Context::default_verify_callback(void) const
+ACE_INLINE extern_C_CallBackVerify_t  ACE_SSL_Context::default_verify_callback() const
 {
   return this->default_verify_callback_;
 }
 
 ACE_INLINE int
-ACE_SSL_Context::get_mode (void) const
+ACE_SSL_Context::get_mode () const
 {
   return this->mode_;
 }
 
 ACE_INLINE int
-ACE_SSL_Context::have_trusted_ca (void) const
+ACE_SSL_Context::have_trusted_ca () const
 {
   return this->have_ca_;
 }
diff --git a/ACE/ace/SSL/SSL_SOCK.h b/ACE/ace/SSL/SSL_SOCK.h
index 29df1c85ce2..d1c68ea5604 100644
--- a/ACE/ace/SSL/SSL_SOCK.h
+++ b/ACE/ace/SSL/SSL_SOCK.h
@@ -55,14 +55,14 @@ public:
   int enable (int value) const;
   int disable (int value) const;
   void set_handle (ACE_HANDLE);
-  ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const;
   int control (int cmd, void *arg) const;
   //@}
 
 protected:
   /// Default constructor is private to prevent instances of this class
   /// from being defined.
-  ACE_SSL_SOCK (void);
+  ACE_SSL_SOCK ();
 
   /// Destructor
   /**
@@ -70,7 +70,7 @@ protected:
    * operator delete() from being called through a base class
    * ACE_SSL_SOCK pointer/reference.
    */
-  ~ACE_SSL_SOCK (void);
+  ~ACE_SSL_SOCK ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SSL/SSL_SOCK.inl b/ACE/ace/SSL/SSL_SOCK.inl
index 6a12914d844..a3380ecd426 100644
--- a/ACE/ace/SSL/SSL_SOCK.inl
+++ b/ACE/ace/SSL/SSL_SOCK.inl
@@ -10,7 +10,7 @@ ACE_SSL_SOCK::set_handle (ACE_HANDLE fd)
 }
 
 ACE_INLINE ACE_HANDLE
-ACE_SSL_SOCK::get_handle (void) const
+ACE_SSL_SOCK::get_handle () const
 {
   // return this->ssl_ ? (ACE_HANDLE) ::SSL_get_fd (this->ssl_) : ACE_INVALID_HANDLE;
   return this->ACE_SOCK::get_handle ();
diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.h b/ACE/ace/SSL/SSL_SOCK_Acceptor.h
index e71226be9fe..0cbfa232c28 100644
--- a/ACE/ace/SSL/SSL_SOCK_Acceptor.h
+++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.h
@@ -50,10 +50,10 @@ class ACE_SSL_Export ACE_SSL_SOCK_Acceptor : public ACE_SSL_SOCK
 {
 public:
   /// Default constructor.
-  ACE_SSL_SOCK_Acceptor (void);
+  ACE_SSL_SOCK_Acceptor ();
 
   /// Default destructor.
-  ~ACE_SSL_SOCK_Acceptor (void);
+  ~ACE_SSL_SOCK_Acceptor ();
 
   /**
    * Initiate a passive mode SSL/BSD-style acceptor socket.
@@ -112,7 +112,7 @@ public:
             int ipv6_only = 0);
 
   /// Close the listening socket.
-  int close (void);
+  int close ();
 
   /**
    * @name Passive Connection "accept" Methods
diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.inl b/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
index 5c6b3555271..cfe1cb906ad 100644
--- a/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
+++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (void)
+ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor ()
   : acceptor_ ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor");
@@ -75,7 +75,7 @@ ACE_SSL_SOCK_Acceptor::open (const ACE_Addr &local_sap,
 }
 
 ACE_INLINE int
-ACE_SSL_SOCK_Acceptor::close (void)
+ACE_SSL_SOCK_Acceptor::close ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::close ()");
 
diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.h b/ACE/ace/SSL/SSL_SOCK_Connector.h
index 72917a0abb0..4ea9c59b0c1 100644
--- a/ACE/ace/SSL/SSL_SOCK_Connector.h
+++ b/ACE/ace/SSL/SSL_SOCK_Connector.h
@@ -284,7 +284,7 @@ public:
   //@}
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -294,7 +294,7 @@ protected:
   int ssl_connect (ACE_SSL_SOCK_Stream &new_stream,
                    const ACE_Time_Value *timeout);
 
-private:
+protected:
   /// The class that does all of the non-secure socket connection.
   /// It is default constructed, and subsequently used by connect().
   ACE_SOCK_Connector connector_;
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.h b/ACE/ace/SSL/SSL_SOCK_Stream.h
index ed75a132747..fdacb49d5f4 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.h
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.h
@@ -72,7 +72,7 @@ public:
                        ACE_SSL_Context::instance ());
 
   /// Destructor
-  ~ACE_SSL_SOCK_Stream (void);
+  ~ACE_SSL_SOCK_Stream ();
 
   /// Send an @a n byte buffer to the ssl socket using the semantics of
   /// send(3n).
@@ -263,14 +263,14 @@ public:
    */
   //@{
   /// Close down the reader.
-  int close_reader (void);
+  int close_reader ();
 
   /// Close down the writer.
-  int close_writer (void);
+  int close_writer ();
   //@}
 
   ///Close down the socket.
-  int close (void);
+  int close ();
 
   /// Meta-type info
   typedef ACE_INET_Addr PEER_ADDR;
@@ -287,7 +287,7 @@ public:
   void set_handle (ACE_HANDLE fd);
 
   /// Return a pointer to the underlying SSL structure.
-  SSL *ssl (void) const;
+  SSL *ssl () const;
 
   /**
    * Return the address of the remotely connected peer (if there is
@@ -301,7 +301,7 @@ public:
   int get_remote_addr (ACE_Addr &) const;
 
   /// Return the underlying ACE_SOCK_Stream which ACE_SSL runs atop of.
-  ACE_SOCK_Stream & peer (void);
+  ACE_SOCK_Stream & peer ();
 
 protected:
   /// Underlying send() helper method common to all public send()
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.inl b/ACE/ace/SSL/SSL_SOCK_Stream.inl
index 558be3e6628..f0773ba336f 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.inl
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.inl
@@ -292,21 +292,21 @@ ACE_SSL_SOCK_Stream::send_n (const void *buf,
 }
 
 ACE_INLINE int
-ACE_SSL_SOCK_Stream::close_reader (void)
+ACE_SSL_SOCK_Stream::close_reader ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::close_reader");
   return this->stream_.close_reader ();
 }
 
 ACE_INLINE int
-ACE_SSL_SOCK_Stream::close_writer (void)
+ACE_SSL_SOCK_Stream::close_writer ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::close_writer");
   return this->stream_.close_writer ();
 }
 
 ACE_INLINE int
-ACE_SSL_SOCK_Stream::close (void)
+ACE_SSL_SOCK_Stream::close ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::close");
 
@@ -348,14 +348,14 @@ ACE_SSL_SOCK_Stream::close (void)
 }
 
 ACE_INLINE ACE_SOCK_Stream &
-ACE_SSL_SOCK_Stream::peer (void)
+ACE_SSL_SOCK_Stream::peer ()
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::peer");
   return this->stream_;
 }
 
 ACE_INLINE SSL *
-ACE_SSL_SOCK_Stream::ssl (void) const
+ACE_SSL_SOCK_Stream::ssl () const
 {
   return this->ssl_;
 }
diff --git a/ACE/ace/SString.cpp b/ACE/ace/SString.cpp
index 1d678159c63..d7732205bdf 100644
--- a/ACE/ace/SString.cpp
+++ b/ACE/ace/SString.cpp
@@ -53,7 +53,7 @@ operator<< (ACE_OSTREAM_TYPE &os, const ACE_SString &ss)
 // *****************************************************************
 
 char *
-ACE_NS_WString::char_rep (void) const
+ACE_NS_WString::char_rep () const
 {
   ACE_TRACE ("ACE_NS_WString::char_rep");
   if (this->len_ == 0)
@@ -83,7 +83,7 @@ ACE_NS_WString::char_rep (void) const
 }
 
 ACE_UINT16 *
-ACE_NS_WString::ushort_rep (void) const
+ACE_NS_WString::ushort_rep () const
 {
   ACE_TRACE ("ACE_NS_WString::ushort_rep");
   if (this->len_ <= 0)
@@ -165,7 +165,7 @@ ACE_SString::size_type const ACE_SString::npos =
 ACE_ALLOC_HOOK_DEFINE(ACE_SString)
 
 void
-ACE_SString::dump (void) const
+ACE_SString::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SString::dump");
diff --git a/ACE/ace/SString.h b/ACE/ace/SString.h
index 1f4f6749e83..2d599c6e54a 100644
--- a/ACE/ace/SString.h
+++ b/ACE/ace/SString.h
@@ -95,11 +95,11 @@ public:
 
   /// Transform into a copy of the ASCII character representation.
   /// (caller must delete)
-  char *char_rep (void) const;
+  char *char_rep () const;
 
   /// Transform into a copy of a USHORT16 representation (caller must
   /// delete).  Note, behavior is undefined when sizeof (wchar_t) != 2.
-  ACE_UINT16 *ushort_rep (void) const;
+  ACE_UINT16 *ushort_rep () const;
 };
 
 ACE_Export
@@ -152,7 +152,7 @@ public:
   ACE_SString (char c, ACE_Allocator *alloc = 0);
 
   /// Default destructor.
-  ~ACE_SString (void);
+  ~ACE_SString ();
 
   /// Return the slot'th character in the string (doesn't perform
   /// bounds checking).
@@ -176,23 +176,23 @@ public:
   ACE_SString substr (size_type offset, size_type length = npos) const;
 
   /// Returns a hash value for this string.
-  u_long hash (void) const;
+  u_long hash () const;
 
   /// Return the length of the string.
-  size_type length (void) const;
+  size_type length () const;
 
   /// Set the underlying pointer.  Since this does not copy memory or
   /// delete existing memory use with extreme caution!!!
   void rep (char *s);
 
   /// Get the underlying pointer.
-  const char *rep (void) const;
+  const char *rep () const;
 
   /// Get the underlying pointer.
-  const char *fast_rep (void) const;
+  const char *fast_rep () const;
 
   /// Same as STL String's c_str() and fast_rep().
-  const char *c_str (void) const;
+  const char *c_str () const;
 
   /// Comparison operator that will match substrings.  Returns the
   /// slot of the first location that matches, else @c npos.
@@ -230,7 +230,7 @@ public:
   int compare (const ACE_SString &s) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -277,12 +277,12 @@ public:
   explicit ACE_Auto_String_Free (char* p = 0);
   ACE_Auto_String_Free (ACE_Auto_String_Free &rhs);
   ACE_Auto_String_Free& operator= (ACE_Auto_String_Free &rhs);
-  ~ACE_Auto_String_Free (void);
+  ~ACE_Auto_String_Free ();
 
   char* operator* () const;
   char operator[] (size_t i) const;
-  char* get (void) const;
-  char* release (void);
+  char* get () const;
+  char* release ();
   void reset (char* p = 0);
 
 private:
diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl
index c5685c0905b..5079e51a174 100644
--- a/ACE/ace/SString.inl
+++ b/ACE/ace/SString.inl
@@ -60,7 +60,7 @@ operator+ (const ACE_NS_WString &s, const ACE_NS_WString &t)
 // -------------------------------------------------------
 
 ACE_INLINE
-ACE_SString::~ACE_SString (void)
+ACE_SString::~ACE_SString ()
 {
 }
 
@@ -92,7 +92,7 @@ ACE_SString::operator[] (size_type slot)
 // Get the underlying pointer (does not make a copy, so beware!).
 
 ACE_INLINE const char *
-ACE_SString::rep (void) const
+ACE_SString::rep () const
 {
   ACE_TRACE ("ACE_SString::rep");
   return this->rep_;
@@ -101,7 +101,7 @@ ACE_SString::rep (void) const
 // Get the underlying pointer (does not make a copy, so beware!).
 
 ACE_INLINE const char *
-ACE_SString::fast_rep (void) const
+ACE_SString::fast_rep () const
 {
   ACE_TRACE ("ACE_SString::fast_rep");
   return this->rep_;
@@ -110,7 +110,7 @@ ACE_SString::fast_rep (void) const
 // Get the underlying pointer (does not make a copy, so beware!).
 
 ACE_INLINE const char *
-ACE_SString::c_str (void) const
+ACE_SString::c_str () const
 {
   ACE_TRACE ("ACE_SString::c_str");
   return this->rep_;
@@ -218,13 +218,13 @@ ACE_SString::rfind (char c, size_type pos) const
 }
 
 ACE_INLINE u_long
-ACE_SString::hash (void) const
+ACE_SString::hash () const
 {
   return ACE::hash_pjw (this->rep_);
 }
 
 ACE_INLINE ACE_SString::size_type
-ACE_SString::length (void) const
+ACE_SString::length () const
 {
   ACE_TRACE ("ACE_SString::length");
   return this->len_;
@@ -266,13 +266,13 @@ ACE_Auto_String_Free::operator= (ACE_Auto_String_Free& rhs)
 }
 
 ACE_INLINE
-ACE_Auto_String_Free::~ACE_Auto_String_Free (void)
+ACE_Auto_String_Free::~ACE_Auto_String_Free ()
 {
   this->reset (0);
 }
 
 ACE_INLINE char*
-ACE_Auto_String_Free::operator* (void) const
+ACE_Auto_String_Free::operator* () const
 {
   return this->p_;
 }
@@ -284,13 +284,13 @@ ACE_Auto_String_Free::operator[] (size_t i) const
 }
 
 ACE_INLINE char*
-ACE_Auto_String_Free::get (void) const
+ACE_Auto_String_Free::get () const
 {
   return this->p_;
 }
 
 ACE_INLINE char*
-ACE_Auto_String_Free::release (void)
+ACE_Auto_String_Free::release ()
 {
   char* p = this->p_;
   this->p_ = 0;
diff --git a/ACE/ace/SV_Message.cpp b/ACE/ace/SV_Message.cpp
index 0e22199f2dd..182f9ca6294 100644
--- a/ACE/ace/SV_Message.cpp
+++ b/ACE/ace/SV_Message.cpp
@@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message)
 
 void
-ACE_SV_Message::dump (void) const
+ACE_SV_Message::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Message::dump");
diff --git a/ACE/ace/SV_Message.h b/ACE/ace/SV_Message.h
index 3ad09a1cc6f..07a254fb821 100644
--- a/ACE/ace/SV_Message.h
+++ b/ACE/ace/SV_Message.h
@@ -43,7 +43,7 @@ public:
   void type (long);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SV_Message_Queue.cpp b/ACE/ace/SV_Message_Queue.cpp
index a57be50fba4..36bab27f258 100644
--- a/ACE/ace/SV_Message_Queue.cpp
+++ b/ACE/ace/SV_Message_Queue.cpp
@@ -15,20 +15,20 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message_Queue)
 
 void
-ACE_SV_Message_Queue::dump (void) const
+ACE_SV_Message_Queue::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Message_Queue::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_SV_Message_Queue::ACE_SV_Message_Queue (void) :
+ACE_SV_Message_Queue::ACE_SV_Message_Queue () :
   internal_id_ (-1)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue");
 }
 
-ACE_SV_Message_Queue::~ACE_SV_Message_Queue (void)
+ACE_SV_Message_Queue::~ACE_SV_Message_Queue ()
 {
   ACE_TRACE ("ACE_SV_Message_Queue::~ACE_SV_Message_Queue");
 }
diff --git a/ACE/ace/SV_Message_Queue.h b/ACE/ace/SV_Message_Queue.h
index e7cd28ae8ea..3359ba7f379 100644
--- a/ACE/ace/SV_Message_Queue.h
+++ b/ACE/ace/SV_Message_Queue.h
@@ -81,7 +81,7 @@ public:
   void set_id (int);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SV_Semaphore_Complex.cpp b/ACE/ace/SV_Semaphore_Complex.cpp
index aa1a590bba1..fb20a96d555 100644
--- a/ACE/ace/SV_Semaphore_Complex.cpp
+++ b/ACE/ace/SV_Semaphore_Complex.cpp
@@ -14,7 +14,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Complex)
 
 void
-ACE_SV_Semaphore_Complex::dump (void) const
+ACE_SV_Semaphore_Complex::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Semaphore_Complex::dump");
@@ -185,7 +185,7 @@ ACE_SV_Semaphore_Complex::open (const char *name,
 // the ACE_SV_Semaphore.
 
 int
-ACE_SV_Semaphore_Complex::close (void)
+ACE_SV_Semaphore_Complex::close ()
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::close");
   int semval;
@@ -257,14 +257,14 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name,
     ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_SV_Semaphore_Complex")));
 }
 
-ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex (void)
+ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex ()
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex");
   if (this->internal_id_ >= 0)
     this->close ();
 }
 
-ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (void)
+ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex ()
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex");
 #ifdef ACE_HAS_SYSV_IPC
diff --git a/ACE/ace/SV_Semaphore_Complex.h b/ACE/ace/SV_Semaphore_Complex.h
index 5fa0dded2c0..b94932ac66b 100644
--- a/ACE/ace/SV_Semaphore_Complex.h
+++ b/ACE/ace/SV_Semaphore_Complex.h
@@ -132,7 +132,7 @@ public:
   using ACE_SV_Semaphore_Simple::remove;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SV_Semaphore_Simple.cpp b/ACE/ace/SV_Semaphore_Simple.cpp
index 593065ec661..c5b904e63de 100644
--- a/ACE/ace/SV_Semaphore_Simple.cpp
+++ b/ACE/ace/SV_Semaphore_Simple.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE (ACE_SV_Semaphore_Simple)
 
 void
-ACE_SV_Semaphore_Simple::dump (void) const
+ACE_SV_Semaphore_Simple::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Semaphore_Simple::dump");
@@ -224,13 +224,13 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name,
 }
 #endif /* ACE_HAS_WCHAR */
 
-ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void)
+ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple ()
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple");
   this->close ();
 }
 
-ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (void) :
+ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple () :
   sem_number_ (0)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
@@ -246,7 +246,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (void) :
 // other processes should use close() below.
 
 int
-ACE_SV_Semaphore_Simple::remove (void) const
+ACE_SV_Semaphore_Simple::remove () const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::remove");
   int const result = this->control (IPC_RMID);
diff --git a/ACE/ace/SV_Semaphore_Simple.h b/ACE/ace/SV_Semaphore_Simple.h
index e64d1602495..71d178a9636 100644
--- a/ACE/ace/SV_Semaphore_Simple.h
+++ b/ACE/ace/SV_Semaphore_Simple.h
@@ -154,7 +154,7 @@ public:
   int get_id (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SV_Shared_Memory.cpp b/ACE/ace/SV_Shared_Memory.cpp
index ef65d4976c9..d98fc614695 100644
--- a/ACE/ace/SV_Shared_Memory.cpp
+++ b/ACE/ace/SV_Shared_Memory.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Shared_Memory)
 
 void
-ACE_SV_Shared_Memory::dump (void) const
+ACE_SV_Shared_Memory::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Shared_Memory::dump");
@@ -60,7 +60,7 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id,
 
 // The "do nothing" constructor.
 
-ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (void)
+ACE_SV_Shared_Memory::ACE_SV_Shared_Memory ()
   : internal_id_ (0),
     size_ (0),
     segment_ptr_ (0)
diff --git a/ACE/ace/SV_Shared_Memory.h b/ACE/ace/SV_Shared_Memory.h
index 6d8237d3399..16354e171b9 100644
--- a/ACE/ace/SV_Shared_Memory.h
+++ b/ACE/ace/SV_Shared_Memory.h
@@ -82,7 +82,7 @@ public:
   ACE_HANDLE get_id (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Sample_History.cpp b/ACE/ace/Sample_History.cpp
index 7cebff07e59..9f6abafac04 100644
--- a/ACE/ace/Sample_History.cpp
+++ b/ACE/ace/Sample_History.cpp
@@ -25,7 +25,7 @@ ACE_Sample_History::ACE_Sample_History (size_t max_samples)
 #endif /* ACE_HAS_ALLOC_HOOKS */
 }
 
-ACE_Sample_History::~ACE_Sample_History (void)
+ACE_Sample_History::~ACE_Sample_History ()
 {
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_Allocator::instance()->free(this->samples_);
diff --git a/ACE/ace/Sbrk_Memory_Pool.cpp b/ACE/ace/Sbrk_Memory_Pool.cpp
index 45dd167ac6b..66c54e02b68 100644
--- a/ACE/ace/Sbrk_Memory_Pool.cpp
+++ b/ACE/ace/Sbrk_Memory_Pool.cpp
@@ -85,7 +85,7 @@ ACE_Sbrk_Memory_Pool::init_acquire (size_t nbytes,
 }
 
 void
-ACE_Sbrk_Memory_Pool::dump (void) const
+ACE_Sbrk_Memory_Pool::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sbrk_Memory_Pool::dump");
@@ -98,12 +98,12 @@ ACE_Sbrk_Memory_Pool::ACE_Sbrk_Memory_Pool (const ACE_TCHAR *,
   ACE_TRACE ("ACE_Sbrk_Memory_Pool::ACE_Sbrk_Memory_Pool");
 }
 
-ACE_Sbrk_Memory_Pool::~ACE_Sbrk_Memory_Pool (void)
+ACE_Sbrk_Memory_Pool::~ACE_Sbrk_Memory_Pool ()
 {
 }
 
 void *
-ACE_Sbrk_Memory_Pool::base_addr (void) const
+ACE_Sbrk_Memory_Pool::base_addr () const
 {
   return 0;
 }
diff --git a/ACE/ace/Sbrk_Memory_Pool.h b/ACE/ace/Sbrk_Memory_Pool.h
index ea435b11d96..5f4d54cf6da 100644
--- a/ACE/ace/Sbrk_Memory_Pool.h
+++ b/ACE/ace/Sbrk_Memory_Pool.h
@@ -93,7 +93,7 @@ public:
   virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Return the base address of this memory pool, 0 if base_addr
   /// never changes.
diff --git a/ACE/ace/Sched_Params.h b/ACE/ace/Sched_Params.h
index ba496741269..7ca200bbf46 100644
--- a/ACE/ace/Sched_Params.h
+++ b/ACE/ace/Sched_Params.h
@@ -78,24 +78,24 @@ public:
                     const ACE_Time_Value &quantum = ACE_Time_Value::zero);
 
   /// Termination.
-  ~ACE_Sched_Params (void);
+  ~ACE_Sched_Params ();
 
   // = Get/Set methods:
 
   // = Get/Set policy
-  Policy policy (void) const;
+  Policy policy () const;
   void policy (const Policy);
 
   // = Get/Set priority.
-  ACE_Sched_Priority priority (void) const;
+  ACE_Sched_Priority priority () const;
   void priority (const ACE_Sched_Priority);
 
   // = Get/Set scope.
-  int scope (void) const;
+  int scope () const;
   void scope(const int);
 
   // = Get/Set quantum.
-  const ACE_Time_Value &quantum (void) const;
+  const ACE_Time_Value &quantum () const;
   void quantum (const ACE_Time_Value &);
 
   // = Accessors for OS-specific priorities.
@@ -184,23 +184,23 @@ public:
                                int scope = ACE_SCOPE_THREAD);
 
   /// Default dtor.
-  ~ACE_Sched_Priority_Iterator (void);
+  ~ACE_Sched_Priority_Iterator ();
 
   /// Check if there are more priorities.
-  int more (void) const;
+  int more () const;
 
   /// Return the current priority.
-  int priority (void) const;
+  int priority () const;
 
   /// Move to the next priority.
   /// The iteration is from lowest to highest importance.
-  void next (void);
+  void next ();
 
   /// Accessor for the scheduling policy over which we are iterating.
-  const ACE_Sched_Params::Policy &policy (void) const;
+  const ACE_Sched_Params::Policy &policy () const;
 
   /// Accessor for the scheduling
-  int scope (void) const;
+  int scope () const;
 
 private:
   /// The Scheduling policy (FIFO, RR, etc.) and scheduling scope
diff --git a/ACE/ace/Sched_Params.inl b/ACE/ace/Sched_Params.inl
index 5392611ac08..1aef3ec8466 100644
--- a/ACE/ace/Sched_Params.inl
+++ b/ACE/ace/Sched_Params.inl
@@ -24,12 +24,12 @@ ACE_Sched_Params::ACE_Sched_Params (
 {
 }
 
-ACE_INLINE ACE_Sched_Params::~ACE_Sched_Params (void)
+ACE_INLINE ACE_Sched_Params::~ACE_Sched_Params ()
 {
 }
 
 ACE_INLINE ACE_Sched_Params::Policy
-ACE_Sched_Params::policy (void) const
+ACE_Sched_Params::policy () const
 {
   return this->policy_;
 }
@@ -41,7 +41,7 @@ ACE_Sched_Params::policy (const ACE_Sched_Params::Policy policy)
 }
 
 ACE_INLINE ACE_Sched_Priority
-ACE_Sched_Params::priority (void) const
+ACE_Sched_Params::priority () const
 {
   return this->priority_;
 }
@@ -53,7 +53,7 @@ ACE_Sched_Params::priority (const ACE_Sched_Priority priority)
 }
 
 ACE_INLINE int
-ACE_Sched_Params::scope (void) const
+ACE_Sched_Params::scope () const
 {
   return this->scope_;
 }
@@ -65,7 +65,7 @@ ACE_Sched_Params::scope (const int scope)
 }
 
 ACE_INLINE const ACE_Time_Value &
-ACE_Sched_Params::quantum (void) const
+ACE_Sched_Params::quantum () const
 {
   return this->quantum_;
 }
@@ -77,13 +77,13 @@ ACE_Sched_Params::quantum (const ACE_Time_Value &quant)
 }
 
 ACE_INLINE const ACE_Sched_Params::Policy &
-ACE_Sched_Priority_Iterator::policy (void) const
+ACE_Sched_Priority_Iterator::policy () const
 {
   return this->policy_;
 }
 
 ACE_INLINE int
-ACE_Sched_Priority_Iterator::scope (void) const
+ACE_Sched_Priority_Iterator::scope () const
 {
   return this->scope_;
 }
@@ -100,24 +100,24 @@ ACE_Sched_Priority_Iterator::ACE_Sched_Priority_Iterator (const ACE_Sched_Params
 }
 
 ACE_INLINE
-ACE_Sched_Priority_Iterator::~ACE_Sched_Priority_Iterator (void)
+ACE_Sched_Priority_Iterator::~ACE_Sched_Priority_Iterator ()
 {
 }
 
 ACE_INLINE int
-ACE_Sched_Priority_Iterator::more (void) const
+ACE_Sched_Priority_Iterator::more () const
 {
   return !this->done_;
 }
 
 ACE_INLINE int
-ACE_Sched_Priority_Iterator::priority (void) const
+ACE_Sched_Priority_Iterator::priority () const
 {
   return this->priority_;
 }
 
 ACE_INLINE void
-ACE_Sched_Priority_Iterator::next (void)
+ACE_Sched_Priority_Iterator::next ()
 {
   if (this->done_)
     return;
diff --git a/ACE/ace/Select_Reactor.h b/ACE/ace/Select_Reactor.h
index 4843d2e60be..687ef4d382e 100644
--- a/ACE/ace/Select_Reactor.h
+++ b/ACE/ace/Select_Reactor.h
@@ -21,7 +21,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-//@@ TAO_REACTOR_SPL_COMMENT_HOOK_START
 typedef ACE_Reactor_Token_T<ACE_SELECT_TOKEN> ACE_Select_Reactor_Token;
 
 #if defined (_MSC_VER) && (_MSC_VER >= 1600)
@@ -29,7 +28,6 @@ template class ACE_Export ACE_Select_Reactor_T<ACE_Select_Reactor_Token>;
 #endif /* _MSC_VER */
 
 typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Token> ACE_Select_Reactor;
-//@@ TAO_REACTOR_SPL_COMMENT_HOOK_END
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE == 0)
 // FUZZ: disable check_for_ACE_Guard
@@ -58,10 +56,10 @@ public:
   void dump (void) const {}
 
 private:
-  // Disallow copying and assignment.
-  ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &);
-  void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &);
-
+  ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &) = delete;
+  void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &) = delete;
+  ACE_Guard (ACE_Guard<ACE_Reactor_Token_T<ACE_Noop_Token> > &&) = delete;
+  void operator= (ACE_Guard<ACE_Reactor_Token_T<ACE_Noop_Token> > &&) = delete;
 };
 // FUZZ: enable check_for_ACE_Guard
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE == 0 */
diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp
index 592e95da6e8..391dd182b94 100644
--- a/ACE/ace/Select_Reactor_Base.cpp
+++ b/ACE/ace/Select_Reactor_Base.cpp
@@ -116,7 +116,7 @@ ACE_Select_Reactor_Handler_Repository::ACE_Select_Reactor_Handler_Repository (AC
 }
 
 int
-ACE_Select_Reactor_Handler_Repository::unbind_all (void)
+ACE_Select_Reactor_Handler_Repository::unbind_all ()
 {
   // Unbind all of the <handle, ACE_Event_Handler>s.
 #ifdef ACE_SELECT_REACTOR_BASE_USES_HASH_MAP
@@ -157,7 +157,7 @@ ACE_Select_Reactor_Handler_Repository::unbind_all (void)
 }
 
 int
-ACE_Select_Reactor_Handler_Repository::close (void)
+ACE_Select_Reactor_Handler_Repository::close ()
 {
   ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::close");
 
@@ -441,7 +441,7 @@ ACE_Select_Reactor_Handler_Repository_Iterator::next (
 // Move forward by one element in the set.
 
 bool
-ACE_Select_Reactor_Handler_Repository_Iterator::advance (void)
+ACE_Select_Reactor_Handler_Repository_Iterator::advance ()
 {
 #ifdef ACE_SELECT_REACTOR_BASE_USES_HASH_MAP
   // No need to explicitly limit search to "current" to
@@ -471,7 +471,7 @@ ACE_Select_Reactor_Handler_Repository_Iterator::advance (void)
 // Dump the state of an object.
 
 void
-ACE_Select_Reactor_Handler_Repository_Iterator::dump (void) const
+ACE_Select_Reactor_Handler_Repository_Iterator::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_Handler_Repository_Iterator::dump");
@@ -489,7 +489,7 @@ ACE_Select_Reactor_Handler_Repository_Iterator::dump (void) const
 }
 
 void
-ACE_Select_Reactor_Handler_Repository::dump (void) const
+ACE_Select_Reactor_Handler_Repository::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::dump");
@@ -528,13 +528,13 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Select_Reactor_Notify::ACE_Select_Reactor_Notify (void)
+ACE_Select_Reactor_Notify::ACE_Select_Reactor_Notify ()
   : select_reactor_ (0)
   , max_notify_iterations_ (-1)
 {
 }
 
-ACE_Select_Reactor_Notify::~ACE_Select_Reactor_Notify (void)
+ACE_Select_Reactor_Notify::~ACE_Select_Reactor_Notify ()
 {
 }
 
@@ -549,7 +549,7 @@ ACE_Select_Reactor_Notify::max_notify_iterations (int iterations)
 }
 
 int
-ACE_Select_Reactor_Notify::max_notify_iterations (void)
+ACE_Select_Reactor_Notify::max_notify_iterations ()
 {
   return this->max_notify_iterations_;
 }
@@ -578,7 +578,7 @@ ACE_Select_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh,
 }
 
 void
-ACE_Select_Reactor_Notify::dump (void) const
+ACE_Select_Reactor_Notify::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_Notify::dump");
@@ -654,7 +654,7 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r,
 }
 
 int
-ACE_Select_Reactor_Notify::close (void)
+ACE_Select_Reactor_Notify::close ()
 {
   ACE_TRACE ("ACE_Select_Reactor_Notify::close");
 
@@ -763,7 +763,7 @@ ACE_Select_Reactor_Notify::dispatch_notifications (int &number_of_active_handles
 
 
 ACE_HANDLE
-ACE_Select_Reactor_Notify::notify_handle (void)
+ACE_Select_Reactor_Notify::notify_handle ()
 {
   ACE_TRACE ("ACE_Select_Reactor_Notify::notify_handle");
 
@@ -1133,7 +1133,7 @@ ACE_Select_Reactor_Impl::clear_dispatch_mask (ACE_HANDLE handle,
 
 
 int
-ACE_Select_Reactor_Impl::resumable_handler (void)
+ACE_Select_Reactor_Impl::resumable_handler ()
 {
   // The select reactor has no handlers that can be resumed by the
   // application. So return 0;
diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h
index 58440ea6bf0..2fa258d1f5b 100644
--- a/ACE/ace/Select_Reactor_Base.h
+++ b/ACE/ace/Select_Reactor_Base.h
@@ -29,7 +29,9 @@
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
 #if defined (ACE_WIN32) || defined (ACE_MQX)
-# define ACE_SELECT_REACTOR_BASE_USES_HASH_MAP
+# ifndef ACE_SELECT_REACTOR_BASE_USES_HASH_MAP
+#  define ACE_SELECT_REACTOR_BASE_USES_HASH_MAP
+# endif
 #endif
 
 #ifdef ACE_SELECT_REACTOR_BASE_USES_HASH_MAP
@@ -55,13 +57,6 @@ typedef int (ACE_Event_Handler::*ACE_EH_PTMF) (ACE_HANDLE);
 class ACE_Select_Reactor_Impl;
 class ACE_Sig_Handler;
 
-/*
- * Hook to specialize the Select_Reactor_Base implementation
- * with the concrete reactor, e.g., select or tp reactor
- * specified at build/compilation time.
- */
-//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class ACE_Select_Reactor_Handle_Set
  *
@@ -226,7 +221,7 @@ public:
       ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -374,7 +369,7 @@ public:
   max_handlep1_type max_handlep1 (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -436,7 +431,7 @@ public:
   bool advance (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -486,13 +481,6 @@ public:
   /// resumed by the  application. So return 0;
   virtual int resumable_handler (void);
 
-  /*
-   * Hook to add concrete methods required to specialize the
-   * implementation with concrete methods required for the concrete
-   * reactor implementation, for example, select, tp reactors.
-   */
-  //@@ REACTOR_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// Allow manipulation of the <wait_set_> mask and <ready_set_> mask.
   virtual int bit_ops (ACE_HANDLE handle,
diff --git a/ACE/ace/Select_Reactor_Base.inl b/ACE/ace/Select_Reactor_Base.inl
index 370b74f25a1..37c7ce800ba 100644
--- a/ACE/ace/Select_Reactor_Base.inl
+++ b/ACE/ace/Select_Reactor_Base.inl
@@ -109,7 +109,7 @@ ACE_Event_Tuple::operator!= (const ACE_Event_Tuple &rhs) const
   return !(*this == rhs);
 }
 
-#if defined (ACE_WIN32_VC8) || defined (ACE_WIN32_VC9)
+#if defined (_MSC_VER)
 #  pragma warning (push)
 #  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
 #endif
@@ -131,7 +131,7 @@ ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl (bool ms)
   , supress_renew_ (0)
 {
 }
-#if defined (ACE_WIN32_VC8) || defined (ACE_WIN32_VC9)
+#if defined (_MSC_VER)
 #  pragma warning (pop)
 #endif
 
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp
index 937dfaf91b0..420c421fb8f 100644
--- a/ACE/ace/Select_Reactor_T.cpp
+++ b/ACE/ace/Select_Reactor_T.cpp
@@ -21,11 +21,6 @@
 // For timer_queue_
 #include "ace/Recursive_Thread_Mutex.h"
 
-/*
- * ACE Reactor specialization hook.
- */
-//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Select_Reactor_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h
index 1e30923f482..f4cec8859ab 100644
--- a/ACE/ace/Select_Reactor_T.h
+++ b/ACE/ace/Select_Reactor_T.h
@@ -23,12 +23,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-/*
- * Hook for specializing the reactor with the concrete
- * type, for example, select, or thread pool.
- */
-//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 typedef ACE_Token ACE_SELECT_TOKEN;
 #else
@@ -536,7 +530,7 @@ public:
   virtual ACE_Lock &lock (void);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Semaphore.cpp b/ACE/ace/Semaphore.cpp
index dcbac24fcc3..63cbf87769e 100644
--- a/ACE/ace/Semaphore.cpp
+++ b/ACE/ace/Semaphore.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Semaphore)
 
 void
-ACE_Semaphore::dump (void) const
+ACE_Semaphore::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Semaphore::dump");
@@ -51,7 +51,7 @@ ACE_Semaphore::ACE_Semaphore (unsigned int count,
                 ACE_TEXT ("ACE_Semaphore::ACE_Semaphore")));
 }
 
-ACE_Semaphore::~ACE_Semaphore (void)
+ACE_Semaphore::~ACE_Semaphore ()
 {
 // ACE_TRACE ("ACE_Semaphore::~ACE_Semaphore");
 
diff --git a/ACE/ace/Semaphore.h b/ACE/ace/Semaphore.h
index a8fc282fa74..9b3c0dc1215 100644
--- a/ACE/ace/Semaphore.h
+++ b/ACE/ace/Semaphore.h
@@ -42,18 +42,18 @@ public:
                  int max = 0x7fffffff);
 
   /// Implicitly destroy the semaphore.
-  ~ACE_Semaphore (void);
+  ~ACE_Semaphore ();
 
   /**
    * Explicitly destroy the semaphore.  Note that only one thread
    * should call this method since it doesn't protect against race
    * conditions.
    */
-  int remove (void);
+  int remove ();
 
   /// Block the thread until the semaphore count becomes
   /// greater than 0, then decrement it.
-  int acquire (void);
+  int acquire ();
 
   /**
    * Block the thread until the semaphore count becomes greater than 0
@@ -95,11 +95,11 @@ public:
    * because someone else already had the lock, @c errno is set to
    * @c EBUSY.
    */
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Increment the semaphore by 1, potentially unblocking a waiting
   /// thread.
-  int release (void);
+  int release ();
 
   /// Increment the semaphore by @a release_count, potentially
   /// unblocking waiting threads.
@@ -110,14 +110,14 @@ public:
    * here to make the ACE_Semaphore interface consistent with the
    * other synchronization APIs.
    */
-  int acquire_read (void);
+  int acquire_read ();
 
   /**
    * Acquire semaphore ownership.  This calls <acquire> and is only
    * here to make the ACE_Semaphore interface consistent with the
    * other synchronization APIs.
    */
-  int acquire_write (void);
+  int acquire_write ();
 
   /**
    * Conditionally acquire semaphore (i.e., won't block).  This calls
@@ -126,7 +126,7 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /**
    * Conditionally acquire semaphore (i.e., won't block).  This calls
@@ -135,7 +135,7 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /**
    * This is only here to make the ACE_Semaphore
@@ -143,16 +143,16 @@ public:
    * Assumes the caller has already acquired the semaphore using one of
    * the above calls, and returns 0 (success) always.
    */
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Return the underlying lock.
-  const ACE_sema_t &lock (void) const;
+  const ACE_sema_t &lock () const;
 
 protected:
   ACE_sema_t semaphore_;
diff --git a/ACE/ace/Semaphore.inl b/ACE/ace/Semaphore.inl
index 8de0beef334..ba38cc96bd7 100644
--- a/ACE/ace/Semaphore.inl
+++ b/ACE/ace/Semaphore.inl
@@ -2,14 +2,14 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE const ACE_sema_t &
-ACE_Semaphore::lock (void) const
+ACE_Semaphore::lock () const
 {
 // ACE_TRACE ("ACE_Semaphore::lock");
   return this->semaphore_;
 }
 
 ACE_INLINE int
-ACE_Semaphore::remove (void)
+ACE_Semaphore::remove ()
 {
 // ACE_TRACE ("ACE_Semaphore::remove");
   int result = 0;
@@ -22,7 +22,7 @@ ACE_Semaphore::remove (void)
 }
 
 ACE_INLINE int
-ACE_Semaphore::acquire (void)
+ACE_Semaphore::acquire ()
 {
 // ACE_TRACE ("ACE_Semaphore::acquire");
   return ACE_OS::sema_wait (&this->semaphore_);
@@ -43,14 +43,14 @@ ACE_Semaphore::acquire (ACE_Time_Value *tv)
 }
 
 ACE_INLINE int
-ACE_Semaphore::tryacquire (void)
+ACE_Semaphore::tryacquire ()
 {
 // ACE_TRACE ("ACE_Semaphore::tryacquire");
   return ACE_OS::sema_trywait (&this->semaphore_);
 }
 
 ACE_INLINE int
-ACE_Semaphore::release (void)
+ACE_Semaphore::release ()
 {
 // ACE_TRACE ("ACE_Semaphore::release");
   return ACE_OS::sema_post (&this->semaphore_);
@@ -68,7 +68,7 @@ ACE_Semaphore::release (unsigned int release_count)
 // other synchronization APIs.
 
 ACE_INLINE int
-ACE_Semaphore::acquire_read (void)
+ACE_Semaphore::acquire_read ()
 {
   return this->acquire ();
 }
@@ -78,7 +78,7 @@ ACE_Semaphore::acquire_read (void)
 // other synchronization APIs.
 
 ACE_INLINE int
-ACE_Semaphore::acquire_write (void)
+ACE_Semaphore::acquire_write ()
 {
   return this->acquire ();
 }
@@ -88,7 +88,7 @@ ACE_Semaphore::acquire_write (void)
 // interface consistent with the other synchronization APIs.
 
 ACE_INLINE int
-ACE_Semaphore::tryacquire_read (void)
+ACE_Semaphore::tryacquire_read ()
 {
   return this->tryacquire ();
 }
@@ -98,7 +98,7 @@ ACE_Semaphore::tryacquire_read (void)
 // interface consistent with the other synchronization APIs.
 
 ACE_INLINE int
-ACE_Semaphore::tryacquire_write (void)
+ACE_Semaphore::tryacquire_write ()
 {
   return this->tryacquire ();
 }
@@ -108,7 +108,7 @@ ACE_Semaphore::tryacquire_write (void)
 // already acquired the semaphore using one of the above calls, and
 // returns 0 (success) always.
 ACE_INLINE int
-ACE_Semaphore::tryacquire_write_upgrade (void)
+ACE_Semaphore::tryacquire_write_upgrade ()
 {
   return 0;
 }
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index 193e54ab823..54b48c37a1a 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -28,13 +28,13 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Threading_Helper<ACE_Thread_Mutex>::~ACE_Threading_Helper (void)
+ACE_Threading_Helper<ACE_Thread_Mutex>::~ACE_Threading_Helper ()
 {
   ACE_OS::thr_key_detach (this->key_);
   ACE_OS::thr_keyfree (this->key_);
 }
 
-ACE_Threading_Helper<ACE_Thread_Mutex>::ACE_Threading_Helper (void)
+ACE_Threading_Helper<ACE_Thread_Mutex>::ACE_Threading_Helper ()
   :  key_ (ACE_OS::NULL_key)
 {
 # if defined (ACE_HAS_TSS_EMULATION)
@@ -59,7 +59,7 @@ ACE_Threading_Helper<ACE_Thread_Mutex>::set (void* p)
 }
 
 void*
-ACE_Threading_Helper<ACE_Thread_Mutex>::get (void)
+ACE_Threading_Helper<ACE_Thread_Mutex>::get ()
 {
   void* temp = 0;
   if (ACE_Thread::getspecific (key_, &temp) == -1)
@@ -84,7 +84,7 @@ ACE_Threading_Helper<ACE_Null_Mutex>::set (void*)
 }
 
 void*
-ACE_Threading_Helper<ACE_Null_Mutex>::get (void)
+ACE_Threading_Helper<ACE_Null_Mutex>::get ()
 {
   return ACE_Service_Config::singleton()->instance_.get ();
 }
@@ -98,8 +98,7 @@ ACE_Threading_Helper<ACE_Null_Mutex>::get (void)
   * know that upon process exit the SC will still be automaticaly and explicitly
   * closed by @c ACE_Object_Manager::fini().
   */
-typedef ACE_Unmanaged_Singleton<ACE_Service_Config,
-                                ACE_SYNCH_RECURSIVE_MUTEX> ACE_SERVICE_CONFIG_SINGLETON;
+using ACE_SERVICE_CONFIG_SINGLETON = ACE_Unmanaged_Singleton<ACE_Service_Config, ACE_MT_SYNCH::RECURSIVE_MUTEX>;
 
 
 /// ctor
@@ -119,7 +118,7 @@ ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg)
   ACE_Service_Config::current (psg);
 }
 
-ACE_Service_Config_Guard::~ACE_Service_Config_Guard (void)
+ACE_Service_Config_Guard::~ACE_Service_Config_Guard ()
 {
   ACE_Service_Gestalt* s = this->saved_.get ();
   ACE_ASSERT (s != 0);
@@ -155,7 +154,7 @@ bool ACE_Service_Config::be_a_daemon_ = false;
 int ACE_Service_Config::signum_ = SIGHUP;
 
 void
-ACE_Service_Config::dump (void) const
+ACE_Service_Config::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Config::dump");
@@ -327,7 +326,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
 /// Return the global configuration instance. Always returns the same
 /// instance
 ACE_Service_Config *
-ACE_Service_Config::singleton (void)
+ACE_Service_Config::singleton ()
 {
   return ACE_SERVICE_CONFIG_SINGLETON::instance ();
 }
@@ -425,7 +424,7 @@ ACE_Service_Config::ACE_Service_Config (const ACE_TCHAR program_name[],
 /// provides a way of temporarily replacing the "current"
 /// configuration instance in the context of a thread.
 ACE_Service_Gestalt*
-ACE_Service_Config::current (void)
+ACE_Service_Config::current ()
 {
   void* temp = ACE_Service_Config::singleton()->threadkey_.get ();
   if (temp == 0) {
@@ -529,7 +528,7 @@ ACE_Service_Config::handle_signal (int sig,
 
 // Trigger reconfiguration to re-read configuration files.
 void
-ACE_Service_Config::reconfigure (void)
+ACE_Service_Config::reconfigure ()
 {
   ACE_TRACE ("ACE_Service_Config::reconfigure");
 
@@ -554,7 +553,7 @@ ACE_Service_Config::reconfigure (void)
 
 // Tidy up and perform last rites on a terminating ACE_Service_Config.
 int
-ACE_Service_Config::close (void)
+ACE_Service_Config::close ()
 {
   ACE_Service_Config::singleton ()->instance_->close ();
 
@@ -570,7 +569,7 @@ ACE_Service_Config::close (void)
 
 
 int
-ACE_Service_Config::fini_svcs (void)
+ACE_Service_Config::fini_svcs ()
 {
   ACE_TRACE ("ACE_Service_Config::fini_svcs");
 
@@ -589,7 +588,7 @@ ACE_Service_Config::fini_svcs (void)
 }
 
 /// Perform user-specified close activities and remove dynamic memory.
-ACE_Service_Config::~ACE_Service_Config (void)
+ACE_Service_Config::~ACE_Service_Config ()
 {
   ACE_TRACE ("ACE_Service_Config::~ACE_Service_Config");
 }
@@ -598,7 +597,7 @@ ACE_Service_Config::~ACE_Service_Config (void)
 
 /* static */
 int
-ACE_Service_Config::reconfig_occurred (void)
+ACE_Service_Config::reconfig_occurred ()
 {
   ACE_TRACE ("ACE_Service_Config::reconfig_occurred");
   return ACE_Service_Config::reconfig_occurred_ != 0;
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index ac9d44df669..062fdd07daf 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -177,7 +177,7 @@ public:
   int active_;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -215,11 +215,11 @@ template<>
 class ACE_Export ACE_Threading_Helper<ACE_Thread_Mutex>
 {
 public:
-  ACE_Threading_Helper (void);
-  ~ACE_Threading_Helper (void);
+  ACE_Threading_Helper ();
+  ~ACE_Threading_Helper ();
 
   void set (void*);
-  void* get (void);
+  void* get ();
 
 private:
   /// Key for the thread-specific data, which is a simple pointer to
@@ -234,11 +234,11 @@ template<>
 class ACE_Export ACE_Threading_Helper<ACE_Null_Mutex>
 {
 public:
-  ACE_Threading_Helper (void);
-  ~ACE_Threading_Helper (void);
+  ACE_Threading_Helper ();
+  ~ACE_Threading_Helper ();
 
   void set (void*);
-  void* get (void);
+  void* get ();
 };
 
 #define ACE_Component_Config ACE_Service_Config
@@ -276,7 +276,6 @@ public:
  */
 class ACE_Export ACE_Service_Config
 {
-
   /// The Instance, or the global (default) configuration context.
   /// The monostate would forward the calls to that instance. The TSS
   /// will point here
@@ -309,10 +308,9 @@ public:
 
   /// Perform user-specified close activities and remove dynamic
   /// memory.
-  virtual ~ACE_Service_Config (void);
+  virtual ~ACE_Service_Config ();
 
 private:
-
   /**
    * Performs an open without parsing command-line arguments.
    * Implements whats different in the opening sequence
@@ -345,7 +343,7 @@ private:
    * Returns the process-wide global singleton instance. It would
    * have been created and will be managed by the Object Manager.
    */
-  static ACE_Service_Config* singleton (void);
+  static ACE_Service_Config* singleton ();
 
   /**
    * Mutator for the currently active configuration context instance
@@ -359,7 +357,7 @@ private:
   /**
    * Accessor for the "current" service gestalt
    */
-  static ACE_Service_Gestalt* current (void);
+  static ACE_Service_Gestalt* current ();
 
   /**
    * This is what the static service initializators are hard-wired to
@@ -372,7 +370,7 @@ private:
    *
    * @deprecated Use current() instead.
    */
-  static ACE_Service_Gestalt* instance (void);
+  static ACE_Service_Gestalt* instance ();
 
   /**
    * Returns a process-wide global singleton instance in contrast with
@@ -382,7 +380,7 @@ private:
    * for dynamically loading services. If you must, use with extreme
    * caution!
    */
-  static ACE_Service_Gestalt* global (void);
+  static ACE_Service_Gestalt* global ();
 
   /**
    * Performs an open without parsing command-line arguments.  The
@@ -471,20 +469,20 @@ private:
 
   /// Tidy up and perform last rites when ACE_Service_Config is shut
   /// down.  This method calls close_svcs().  Returns 0.
-  static int close (void);
+  static int close ();
 
   /// Perform user-specified close hooks and possibly delete all of the
   /// configured services in the <Service_Repository>.
-  static int fini_svcs (void);
+  static int fini_svcs ();
 
   /// True if reconfiguration occurred.
-  static int reconfig_occurred (void);
+  static int reconfig_occurred ();
 
   /// Indicate that reconfiguration occurred.
   static void reconfig_occurred (int);
 
   /// Perform the reconfiguration process.
-  static void reconfigure (void);
+  static void reconfigure ();
 
   // = The following methods are static in order to enforce Singleton
   // semantics for the Reactor, Service_Repository, Thread_Manager,
@@ -506,10 +504,10 @@ private:
   /// idiom for registering static services:
   ///
   ///    ACE_Service_Config::static_svcs ()->insert (...);
-  static ACE_Service_Gestalt* static_svcs (void);
+  static ACE_Service_Gestalt* static_svcs ();
 
   /// Insert a static service descriptor for processing on open_i(). The
-  /// corresponding ACE_STATIC_SVC_* macros were chaged to use this method
+  /// corresponding ACE_STATIC_SVC_* macros were changed to use this method
   /// instead of obtaining a ptr to a container. See the note on static_svcs().
   /// Added to prevent exposing the internal storage representation of the
   /// services repository and provide a better way of debugging service
@@ -555,9 +553,9 @@ private:
 #endif /* ACE_HAS_WINCE */
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
-  /// Set the signal_handler;for internal use by ACE_Object_Manager only.
+  /// Set the signal_handler for internal use by ACE_Object_Manager only.
   static ACE_INLINE void signal_handler (ACE_Sig_Adapter *);
 
   /// Declare the dynamic allocation hooks.
@@ -591,7 +589,7 @@ private:
    * provided in the svc.conf file(s).  Returns the number of errors
    * that occurred.
    */
-  static int process_directives (void);
+  static int process_directives ();
 
   /// Handles signals to trigger reconfigurations.
   static void handle_signal (int sig, siginfo_t *, ucontext_t *);
@@ -632,18 +630,17 @@ private:
   /// @deprecated
   /// Process service configuration requests that were provided on the
   /// command-line.  Returns the number of errors that occurred.
-  static int process_commandline_directives (void);
+  static int process_commandline_directives ();
 
   /// Become a daemon.
-  static int start_daemon (void);
+  static int start_daemon ();
 
   // @deprecated
   // Add the default statically-linked services to the
   // ACE_Service_Repository.
-  static int load_static_svcs (void);
+  static int load_static_svcs ();
 
 protected:
-
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
   /// @deprecated
   /// This is the implementation function that process_directives()
@@ -652,11 +649,7 @@ protected:
   static int process_directives_i (ACE_Svc_Conf_Param *param);
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
 
-
-  // = Process-wide state.
-
 private:
-
   /// Have we called ACE_Service_Config::open() yet?
   bool is_opened_;
 
@@ -722,7 +715,7 @@ class ACE_Export ACE_Service_Config_Guard
 {
 public:
   ACE_Service_Config_Guard (ACE_Service_Gestalt* psg);
-  ~ACE_Service_Config_Guard (void);
+  ~ACE_Service_Config_Guard ();
 
 private:
   // Private AND not implemented to disable copying
@@ -733,7 +726,6 @@ private:
   ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> saved_;
 };
 
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl
index 5cffe43449f..4f187015bcc 100644
--- a/ACE/ace/Service_Config.inl
+++ b/ACE/ace/Service_Config.inl
@@ -67,7 +67,7 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[])
 /// Return the global configuration instance. Allways returns the same
 /// instance
 ACE_INLINE ACE_Service_Gestalt *
-ACE_Service_Config::global (void)
+ACE_Service_Config::global ()
 {
   return ACE_Service_Config::singleton()->instance_.get ();
 }
@@ -78,7 +78,7 @@ ACE_Service_Config::global (void)
 /// ACE_Service_Config_Guard provides a way of temporarily replacing
 /// the "current" configuration instance in the context of a thread.
 ACE_INLINE ACE_Service_Gestalt *
-ACE_Service_Config::instance (void)
+ACE_Service_Config::instance ()
 {
   return ACE_Service_Config::current ();
 }
@@ -92,7 +92,7 @@ ACE_Service_Config::instance (void)
 // service registration problems.
 
 ACE_INLINE ACE_Service_Gestalt*
-ACE_Service_Config::static_svcs (void)
+ACE_Service_Config::static_svcs ()
 {
   return ACE_Service_Config::current ();
 }
@@ -154,7 +154,7 @@ ACE_Service_Config::process_directive (const ACE_TCHAR directive[])
 /// Process service configuration requests as indicated in the queue of
 /// svc.conf files.
 ACE_INLINE int
-ACE_Service_Config::process_directives (void)
+ACE_Service_Config::process_directives ()
 {
   return ACE_Service_Config::current ()->process_directives (false);
 }
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index 6bc653bf2da..24ab2a8578c 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -68,7 +68,7 @@ ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard
 
 
 /// Destructor
-ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void)
+ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard ()
 {
   const ACE_Service_Type *tmp = 0;
 
@@ -140,7 +140,7 @@ Processed_Static_Svc (const ACE_Static_Svc_Descriptor *assd)
   ACE_OS::strcpy(name_,assd->name_);
 }
 
-ACE_Service_Gestalt::Processed_Static_Svc::~Processed_Static_Svc (void)
+ACE_Service_Gestalt::Processed_Static_Svc::~Processed_Static_Svc ()
 {
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_Allocator::instance()->free(name_);
@@ -173,7 +173,7 @@ ACE_Service_Gestalt::intrusive_remove_ref (ACE_Service_Gestalt* g)
 }
 
 
-ACE_Service_Gestalt::~ACE_Service_Gestalt (void)
+ACE_Service_Gestalt::~ACE_Service_Gestalt ()
 {
 
   if (this->svc_repo_is_owned_)
@@ -243,7 +243,7 @@ ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size,
 /// closed instance. Must not be virtual, as it is also called from
 /// the constructor.
 int
-ACE_Service_Gestalt::init_i (void)
+ACE_Service_Gestalt::init_i ()
 {
   // Only initialize the repo_ if (a) we are being constructed, or;
   // (b) we're being open()-ed, perhaps after previously having been
@@ -273,7 +273,7 @@ ACE_Service_Gestalt::init_i (void)
 /// Add the default statically-linked services to the Service
 /// Repository.
 int
-ACE_Service_Gestalt::load_static_svcs (void)
+ACE_Service_Gestalt::load_static_svcs ()
 {
   ACE_TRACE ("ACE_Service_Gestalt::load_static_svcs");
 
@@ -418,7 +418,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Service_Gestalt)
 
 
 void
-ACE_Service_Gestalt::dump (void) const
+ACE_Service_Gestalt::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Gestalt::dump");
@@ -966,7 +966,7 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[])
 
 
 int
-ACE_Service_Gestalt::init_svc_conf_file_queue (void)
+ACE_Service_Gestalt::init_svc_conf_file_queue ()
 {
   if (this->svc_conf_file_queue_ == 0)
     {
@@ -1142,13 +1142,13 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[],
 
 
 int
-ACE_Service_Gestalt::is_opened (void)
+ACE_Service_Gestalt::is_opened ()
 {
   return this->is_opened_;
 }
 
 int
-ACE_Service_Gestalt::process_commandline_directives (void)
+ACE_Service_Gestalt::process_commandline_directives ()
 {
   int result = 0;
   if (this->svc_queue_ != 0)
@@ -1284,7 +1284,7 @@ ACE_Service_Gestalt::process_directives (bool )
 
 // Tidy up and perform last rites on a terminating ACE_Service_Gestalt.
 int
-ACE_Service_Gestalt::close (void)
+ACE_Service_Gestalt::close ()
 {
   ACE_TRACE ("ACE_Service_Gestalt::close");
 
diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h
index 0a4d9b158a4..97af53c33ab 100644
--- a/ACE/ace/Service_Gestalt.h
+++ b/ACE/ace/Service_Gestalt.h
@@ -85,10 +85,10 @@ public:
 
   /// Perform user-specified close activities and remove dynamic
   /// memory.
-  ~ACE_Service_Gestalt (void);
+  ~ACE_Service_Gestalt ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
    /**
    * Performs an open without parsing command-line arguments.  The
@@ -185,7 +185,7 @@ public:
 
   /// Has it been opened?  Returns the difference between the times
   /// open and close have been called on this instance
-  int is_opened (void);
+  int is_opened ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -253,7 +253,7 @@ public:
 
   /// Tidy up and perform last rites when ACE_Service_Config is shut
   /// down.  This method calls @c close_svcs.  Returns 0.
-  int close (void);
+  int close ();
 
   /// Registers a service descriptor for a static service object
   int insert (ACE_Static_Svc_Descriptor *stsd);
@@ -318,17 +318,16 @@ public:
   struct Processed_Static_Svc
   {
     Processed_Static_Svc (const ACE_Static_Svc_Descriptor *);
-    ~Processed_Static_Svc (void);
+    ~Processed_Static_Svc ();
     ACE_TCHAR * name_;
     const ACE_Static_Svc_Descriptor *assd_;
     ACE_ALLOC_HOOK_DECLARE;
   };
 
   /// Get the current ACE_Service_Repository held by this object.
-  ACE_Service_Repository* current_service_repository (void);
+  ACE_Service_Repository* current_service_repository ();
 
 protected:
-
   int parse_args_i (int, ACE_TCHAR *argv[],
                     bool& ignore_default_svc_conf_file);
 
@@ -349,15 +348,15 @@ protected:
               bool ignore_debug_flag = false);
 
   /// Initialize the @c svc_conf_file_queue_ if necessary.
-  int init_svc_conf_file_queue (void);
+  int init_svc_conf_file_queue ();
 
   /// Add the default statically-linked services to the
   /// ACE_Service_Repository.
-  int load_static_svcs (void);
+  int load_static_svcs ();
 
   /// Process service configuration requests that were provided on the
   /// command-line.  Returns the number of errors that occurred.
-  int process_commandline_directives (void);
+  int process_commandline_directives ();
 
   /// Process a static directive without also inserting its descriptor
   /// the global table. This avoids multiple additions when processing
@@ -386,10 +385,9 @@ protected:
   /// Performs the common initialization tasks for a new or previously
   /// closed instance. Must not be virtual, as it is called from the
   /// constructor.
-  int init_i (void);
+  int init_i ();
 
 protected:
-
   /// Maintain a queue of services to be configured from the
   /// command-line.
   typedef ACE_Unbounded_Queue<ACE_TString> ACE_SVC_QUEUE;
@@ -414,7 +412,6 @@ protected:
   friend class ACE_Service_Config_Guard;
 
 protected:
-
   /// Do we own the service repository instance, or have only been
   /// given a ptr to the singleton?
   bool svc_repo_is_owned_;
@@ -495,7 +492,7 @@ public:
   ACE_Service_Type_Dynamic_Guard (ACE_Service_Repository &r,
                                   ACE_TCHAR const *name);
 
-  ~ACE_Service_Type_Dynamic_Guard (void);
+  ~ACE_Service_Type_Dynamic_Guard ();
 
 private:
   ACE_Service_Repository & repo_;
@@ -509,7 +506,6 @@ private:
 #endif
 };
 
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl
index ec46b27060a..3add95108d6 100644
--- a/ACE/ace/Service_Gestalt.inl
+++ b/ACE/ace/Service_Gestalt.inl
@@ -67,7 +67,7 @@ ACE_Service_Gestalt::find (const ACE_TCHAR name[],
 }
 
 ACE_INLINE ACE_Service_Repository*
-ACE_Service_Gestalt::current_service_repository (void)
+ACE_Service_Gestalt::current_service_repository ()
 {
   return this->repo_;
 }
diff --git a/ACE/ace/Service_Manager.cpp b/ACE/ace/Service_Manager.cpp
index 547648ea5c2..7862e2312db 100644
--- a/ACE/ace/Service_Manager.cpp
+++ b/ACE/ace/Service_Manager.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE (ACE_Service_Manager)
 
 void
-ACE_Service_Manager::dump (void) const
+ACE_Service_Manager::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Manager::dump");
@@ -26,27 +26,27 @@ ACE_Service_Manager::dump (void) const
 
 u_short ACE_Service_Manager::DEFAULT_PORT_ = 10000;
 
-ACE_Service_Manager::ACE_Service_Manager (void)
+ACE_Service_Manager::ACE_Service_Manager ()
   : debug_ (false),
     signum_ (SIGHUP)
 {
   ACE_TRACE ("ACE_Service_Manager::ACE_Service_Manager");
 }
 
-ACE_Service_Manager::~ACE_Service_Manager (void)
+ACE_Service_Manager::~ACE_Service_Manager ()
 {
   ACE_TRACE ("ACE_Service_Manager::~ACE_Service_Manager");
 }
 
 int
-ACE_Service_Manager::suspend (void)
+ACE_Service_Manager::suspend ()
 {
   ACE_TRACE ("ACE_Service_Manager::suspend");
   return ACE_Reactor::instance ()->suspend_handler (this);
 }
 
 int
-ACE_Service_Manager::resume (void)
+ACE_Service_Manager::resume ()
 {
   ACE_TRACE ("ACE_Service_Manager::resume");
   return ACE_Reactor::instance ()->resume_handler (this);
@@ -149,7 +149,7 @@ ACE_Service_Manager::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 }
 
 int
-ACE_Service_Manager::fini (void)
+ACE_Service_Manager::fini ()
 {
   ACE_TRACE ("ACE_Service_Manager::fini");
 
@@ -170,7 +170,7 @@ ACE_Service_Manager::fini (void)
 }
 
 ACE_HANDLE
-ACE_Service_Manager::get_handle (void) const
+ACE_Service_Manager::get_handle () const
 {
   ACE_TRACE ("ACE_Service_Manager::get_handle");
   return this->acceptor_.get_handle ();
@@ -186,7 +186,7 @@ ACE_Service_Manager::handle_signal (int, siginfo_t *, ucontext_t *)
 // information back to the client.
 
 int
-ACE_Service_Manager::list_services (void)
+ACE_Service_Manager::list_services ()
 {
   ACE_TRACE ("ACE_Service_Manager::list_services");
   ACE_Service_Repository_Iterator sri (*ACE_Service_Repository::instance (), 0);
@@ -238,7 +238,7 @@ ACE_Service_Manager::list_services (void)
 // svc.conf file.
 
 int
-ACE_Service_Manager::reconfigure_services (void)
+ACE_Service_Manager::reconfigure_services ()
 {
   ACE_TRACE ("ACE_Service_Manager::reconfigure_services");
 
diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h
index c8f94166956..58ed34e6042 100644
--- a/ACE/ace/Service_Manager.h
+++ b/ACE/ace/Service_Manager.h
@@ -80,7 +80,7 @@ protected:
   virtual int resume (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   int open (const ACE_INET_Addr &sia);
diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp
index a16b9af04f2..c7429cfb075 100644
--- a/ACE/ace/Service_Object.cpp
+++ b/ACE/ace/Service_Object.cpp
@@ -24,7 +24,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Service_Object)
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type)
 
 void
-ACE_Service_Type::dump (void) const
+ACE_Service_Type::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Type::dump");
@@ -73,7 +73,7 @@ ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
   this->name (n);
 }
 
-ACE_Service_Type::~ACE_Service_Type (void)
+ACE_Service_Type::~ACE_Service_Type ()
 {
   ACE_TRACE ("ACE_Service_Type::~ACE_Service_Type");
   this->fini ();
@@ -86,7 +86,7 @@ ACE_Service_Type::~ACE_Service_Type (void)
 }
 
 int
-ACE_Service_Type::fini (void)
+ACE_Service_Type::fini ()
 {
   if (ACE::debug ())
     ACELIB_DEBUG ((LM_DEBUG,
@@ -110,7 +110,7 @@ ACE_Service_Type::fini (void)
       return 1; // No implementation was found.
     }
 
-  int ret = this->type_->fini ();
+  int const ret = this->type_->fini ();
 
   // Ensure type is 0 to prevent invalid access after call to fini.
   this->type_ = 0;
@@ -123,7 +123,7 @@ ACE_Service_Type::fini (void)
 }
 
 int
-ACE_Service_Type::suspend (void) const
+ACE_Service_Type::suspend () const
 {
   ACE_TRACE ("ACE_Service_Type::suspend");
   (const_cast<ACE_Service_Type *> (this))->active_ = false;
@@ -131,7 +131,7 @@ ACE_Service_Type::suspend (void) const
 }
 
 int
-ACE_Service_Type::resume (void) const
+ACE_Service_Type::resume () const
 {
   ACE_TRACE ("ACE_Service_Type::resume");
   (const_cast<ACE_Service_Type *> (this))->active_ = true;
@@ -144,20 +144,20 @@ ACE_Service_Object::ACE_Service_Object (ACE_Reactor *r)
   ACE_TRACE ("ACE_Service_Object::ACE_Service_Object");
 }
 
-ACE_Service_Object::~ACE_Service_Object (void)
+ACE_Service_Object::~ACE_Service_Object ()
 {
   ACE_TRACE ("ACE_Service_Object::~ACE_Service_Object");
 }
 
 int
-ACE_Service_Object::suspend (void)
+ACE_Service_Object::suspend ()
 {
   ACE_TRACE ("ACE_Service_Object::suspend");
   return 0;
 }
 
 int
-ACE_Service_Object::resume (void)
+ACE_Service_Object::resume ()
 {
   ACE_TRACE ("ACE_Service_Object::resume");
   return 0;
diff --git a/ACE/ace/Service_Object.h b/ACE/ace/Service_Object.h
index 0fdbc13b91c..4f123319c2e 100644
--- a/ACE/ace/Service_Object.h
+++ b/ACE/ace/Service_Object.h
@@ -48,13 +48,13 @@ public:
   ACE_Service_Object (ACE_Reactor * = 0);
 
   /// Destructor.
-  virtual ~ACE_Service_Object (void);
+  virtual ~ACE_Service_Object ();
 
   /// Temporarily disable a service without removing it completely.
-  virtual int suspend (void);
+  virtual int suspend ();
 
   /// Re-enable a previously suspended service.
-  virtual int resume (void);
+  virtual int resume ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -99,33 +99,33 @@ public:
                     ACE_Service_Type_Impl *o,
                     ACE_SHLIB_HANDLE handle,
                     bool active);
-  ~ACE_Service_Type (void);
+  ~ACE_Service_Type ();
 
-  const ACE_TCHAR *name (void) const;
+  const ACE_TCHAR *name () const;
   void name (const ACE_TCHAR *);
 
-  const ACE_Service_Type_Impl *type (void) const;
+  const ACE_Service_Type_Impl *type () const;
   void type (const ACE_Service_Type_Impl *, bool active = true);
 
   /// Is this just a stub for the real thing?
-  bool is_forward_declaration (void) const;
+  bool is_forward_declaration () const;
 
-  int suspend (void) const;
-  int resume (void) const;
-  bool active (void) const;
+  int suspend () const;
+  int resume () const;
+  bool active () const;
   void active (bool turnon);
 
   /// Calls @c fini on @c type_
-  int fini (void);
+  int fini ();
 
   /// Check if the service has been fini'ed.
-  bool fini_called (void) const;
+  bool fini_called () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Get to the DLL's implentation
-  const ACE_DLL & dll (void) const;
+  const ACE_DLL & dll () const;
 
   /// Sets the DLL
   void dll (const ACE_DLL&);
@@ -170,7 +170,7 @@ public:
   ACE_Service_Object_Ptr (ACE_Service_Object *so);
 
   /// Release the held ACE_Service_Object by calling its fini() hook.
-  ~ACE_Service_Object_Ptr (void);
+  ~ACE_Service_Object_Ptr ();
 
   /// Smart pointer to access the underlying ACE_Service_Object.
   ACE_Service_Object *operator-> ();
diff --git a/ACE/ace/Service_Object.inl b/ACE/ace/Service_Object.inl
index e5c5099f061..e4a0a9f4f7a 100644
--- a/ACE/ace/Service_Object.inl
+++ b/ACE/ace/Service_Object.inl
@@ -6,7 +6,7 @@ ACE_INLINE ACE_Service_Object_Ptr::ACE_Service_Object_Ptr (ACE_Service_Object *s
 {
 }
 
-ACE_INLINE ACE_Service_Object_Ptr::~ACE_Service_Object_Ptr (void)
+ACE_INLINE ACE_Service_Object_Ptr::~ACE_Service_Object_Ptr ()
 {
   this->service_object_->fini ();
   delete this->service_object_;
@@ -19,14 +19,14 @@ ACE_Service_Object_Ptr::operator-> ()
 }
 
 ACE_INLINE const ACE_TCHAR *
-ACE_Service_Type::name (void) const
+ACE_Service_Type::name () const
 {
   ACE_TRACE ("ACE_Service_Type::name");
   return this->name_;
 }
 
 ACE_INLINE const ACE_Service_Type_Impl *
-ACE_Service_Type::type (void) const
+ACE_Service_Type::type () const
 {
   ACE_TRACE ("ACE_Service_Type::type");
   return this->type_;
@@ -41,7 +41,7 @@ ACE_Service_Type::type (const ACE_Service_Type_Impl *o, bool enabled)
 }
 
 ACE_INLINE bool
-ACE_Service_Type::active (void) const
+ACE_Service_Type::active () const
 {
   ACE_TRACE ("ACE_Service_Type::active");
   return this->active_;
@@ -55,7 +55,7 @@ ACE_Service_Type::active (bool turnon)
 }
 
 ACE_INLINE bool
-ACE_Service_Type::fini_called (void) const
+ACE_Service_Type::fini_called () const
 {
   ACE_TRACE ("ACE_Service_Type::fini_called");
   return this->fini_already_called_;
diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp
index bb0755853fe..6251fbd55f1 100644
--- a/ACE/ace/Service_Repository.cpp
+++ b/ACE/ace/Service_Repository.cpp
@@ -24,7 +24,7 @@ ACE_Service_Repository *ACE_Service_Repository::svc_rep_ = 0;
 bool ACE_Service_Repository::delete_svc_rep_ = false;
 
 void
-ACE_Service_Repository::dump (void) const
+ACE_Service_Repository::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Repository::dump");
@@ -73,7 +73,7 @@ ACE_Service_Repository::instance (ACE_Service_Repository *s)
 }
 
 void
-ACE_Service_Repository::close_singleton (void)
+ACE_Service_Repository::close_singleton ()
 {
   ACE_TRACE ("ACE_Service_Repository::close_singleton");
 
@@ -111,7 +111,7 @@ ACE_Service_Repository::ACE_Service_Repository (size_t size)
 /// Finalize (call fini() and possibly delete) all the services.
 
 int
-ACE_Service_Repository::fini (void)
+ACE_Service_Repository::fini ()
 {
   ACE_TRACE ("ACE_Service_Repository::fini");
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, -1);
@@ -206,7 +206,7 @@ ACE_Service_Repository::fini (void)
 
 /// Close down all the services.
 int
-ACE_Service_Repository::close (void)
+ACE_Service_Repository::close ()
 {
   ACE_TRACE ("ACE_Service_Repository::close");
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, -1);
@@ -252,7 +252,7 @@ ACE_Service_Repository::close (void)
   return 0;
 }
 
-ACE_Service_Repository::~ACE_Service_Repository (void)
+ACE_Service_Repository::~ACE_Service_Repository ()
 {
   ACE_TRACE ("ACE_Service_Repository::~ACE_Service_Repository");
 #ifndef ACE_NLOGGING
@@ -554,7 +554,7 @@ ACE_Service_Repository::remove_i (const ACE_TCHAR name[], ACE_Service_Type **ps)
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Repository_Iterator)
 
 void
-ACE_Service_Repository_Iterator::dump (void) const
+ACE_Service_Repository_Iterator::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Repository_Iterator::dump");
@@ -593,7 +593,7 @@ ACE_Service_Repository_Iterator::next (const ACE_Service_Type *&sr)
 /// skip over this entry.  Otherwise, we must advance the NEXT index to
 /// reference the next valid service entry.
 int
-ACE_Service_Repository_Iterator::advance (void)
+ACE_Service_Repository_Iterator::advance ()
 {
   ACE_TRACE ("ACE_Service_Repository_Iterator::advance");
 
@@ -605,7 +605,7 @@ ACE_Service_Repository_Iterator::advance (void)
 }
 
 bool
-ACE_Service_Repository_Iterator::valid (void) const
+ACE_Service_Repository_Iterator::valid () const
 {
   ACE_TRACE ("ACE_Service_Repository_Iterator::valid");
   if (!this->ignore_suspended_)
diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h
index 241e796d699..4ed680a955c 100644
--- a/ACE/ace/Service_Repository.h
+++ b/ACE/ace/Service_Repository.h
@@ -64,15 +64,15 @@ public:
 
   /// Close down the repository and free up dynamically allocated
   /// resources.
-  ~ACE_Service_Repository (void);
+  ~ACE_Service_Repository ();
 
   /// Close down the repository and free up dynamically allocated
   /// resources.
-  int close (void);
+  int close ();
 
   /// Finalize all the services by calling fini() and deleting
   /// dynamically allocated services.
-  int fini (void);
+  int fini ();
 
   /// Get pointer to a process-wide ACE_Service_Repository.
   static ACE_Service_Repository * instance
@@ -83,7 +83,7 @@ public:
   static ACE_Service_Repository *instance (ACE_Service_Repository *);
 
   /// Delete the dynamically allocated Singleton.
-  static void close_singleton (void);
+  static void close_singleton ();
 
   // = Search structure operations (all acquire locks as necessary).
 
@@ -126,13 +126,13 @@ public:
   int suspend (const ACE_TCHAR name[], const ACE_Service_Type **srp = 0);
 
   /// Return the current size of the repository.
-  size_t current_size (void) const;
+  size_t current_size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Returns a reference to the lock used by the ACE_Service_Repository
-  ACE_SYNCH_RECURSIVE_MUTEX &lock (void) const;
+  ACE_SYNCH_RECURSIVE_MUTEX &lock () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -224,7 +224,7 @@ public:
                                    bool ignored_suspended = true);
 
   /// Destructor.
-  ~ACE_Service_Repository_Iterator (void);
+  ~ACE_Service_Repository_Iterator ();
 
 
 public:
@@ -235,20 +235,20 @@ public:
   int next (const ACE_Service_Type *&next_item);
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Move forward by one element in the repository.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-  bool valid (void) const;
+  bool valid () const;
 
 private:
   ACE_Service_Repository_Iterator (const ACE_Service_Repository_Iterator&);
diff --git a/ACE/ace/Service_Repository.inl b/ACE/ace/Service_Repository.inl
index 9cbd388215e..09fcf738876 100644
--- a/ACE/ace/Service_Repository.inl
+++ b/ACE/ace/Service_Repository.inl
@@ -10,7 +10,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE size_t
-ACE_Service_Repository::current_size (void) const
+ACE_Service_Repository::current_size () const
 {
   ACE_TRACE ("ACE_Service_Repository::current_size");
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
@@ -20,13 +20,13 @@ ACE_Service_Repository::current_size (void) const
 }
 
 ACE_INLINE ACE_SYNCH_RECURSIVE_MUTEX&
-ACE_Service_Repository::lock (void) const
+ACE_Service_Repository::lock () const
 {
   return this->lock_;
 }
 
 ACE_INLINE int
-ACE_Service_Repository_Iterator::done (void) const
+ACE_Service_Repository_Iterator::done () const
 {
   ACE_TRACE ("ACE_Service_Repository_Iterator::done");
 
@@ -34,7 +34,7 @@ ACE_Service_Repository_Iterator::done (void) const
 }
 
 ACE_INLINE
-ACE_Service_Repository_Iterator::~ACE_Service_Repository_Iterator (void)
+ACE_Service_Repository_Iterator::~ACE_Service_Repository_Iterator ()
 {
 }
 
diff --git a/ACE/ace/Service_Types.cpp b/ACE/ace/Service_Types.cpp
index 1d835685e06..5a630e69d9f 100644
--- a/ACE/ace/Service_Types.cpp
+++ b/ACE/ace/Service_Types.cpp
@@ -11,14 +11,14 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-typedef ACE_Stream<ACE_SYNCH> MT_Stream;
-typedef ACE_Module<ACE_SYNCH> MT_Module;
-typedef ACE_Task<ACE_SYNCH> MT_Task;
+using MT_Stream = ACE_Stream<ACE_MT_SYNCH>;
+using MT_Module = ACE_Module<ACE_MT_SYNCH>;
+using MT_Task = ACE_Task<ACE_MT_SYNCH>;
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type_Impl)
 
 void
-ACE_Service_Type_Impl::dump (void) const
+ACE_Service_Type_Impl::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Type_Impl::dump");
@@ -40,7 +40,7 @@ ACE_Service_Type_Impl::ACE_Service_Type_Impl (void *so,
   this->name (s_name);
 }
 
-ACE_Service_Type_Impl::~ACE_Service_Type_Impl (void)
+ACE_Service_Type_Impl::~ACE_Service_Type_Impl ()
 {
   ACE_TRACE ("ACE_Service_Type_Impl::~ACE_Service_Type_Impl");
 
@@ -54,7 +54,7 @@ ACE_Service_Type_Impl::~ACE_Service_Type_Impl (void)
 }
 
 int
-ACE_Service_Type_Impl::fini (void) const
+ACE_Service_Type_Impl::fini () const
 {
   ACE_TRACE ("ACE_Service_Type_Impl::fini");
 
@@ -112,7 +112,7 @@ ACE_Service_Object_Type::init (int argc, ACE_TCHAR *argv[]) const
 }
 
 int
-ACE_Service_Object_Type::fini (void) const
+ACE_Service_Object_Type::fini () const
 {
   ACE_TRACE ("ACE_Service_Object_Type::fini");
 
@@ -121,7 +121,7 @@ ACE_Service_Object_Type::fini (void) const
   ACE_Service_Object * const so =
     static_cast<ACE_Service_Object *> (obj);
 
-  // Call fini() if an only if, the object was successfuly
+  // Call fini() if an only if, the object was successfully
   // initialized, i.e. init() returned 0. This is necessary to
   // maintain the ctor/dtor-like semantics for init/fini.
   if (so != 0 && this->initialized_ == 0)
@@ -130,20 +130,20 @@ ACE_Service_Object_Type::fini (void) const
   return ACE_Service_Type_Impl::fini ();
 }
 
-ACE_Service_Object_Type::~ACE_Service_Object_Type (void)
+ACE_Service_Object_Type::~ACE_Service_Object_Type ()
 {
   ACE_TRACE ("ACE_Service_Object_Type::~ACE_Service_Object_Type");
 }
 
 int
-ACE_Service_Object_Type::suspend (void) const
+ACE_Service_Object_Type::suspend () const
 {
   ACE_TRACE ("ACE_Service_Object_Type::suspend");
   return static_cast<ACE_Service_Object *> (this->object ())->suspend ();
 }
 
 int
-ACE_Service_Object_Type::resume (void) const
+ACE_Service_Object_Type::resume () const
 {
   ACE_TRACE ("ACE_Service_Object_Type::resume");
   return static_cast<ACE_Service_Object *> (this->object ())->resume ();
@@ -159,7 +159,7 @@ ACE_Service_Object_Type::info (ACE_TCHAR **str, size_t len) const
 ACE_ALLOC_HOOK_DEFINE(ACE_Module_Type)
 
 void
-ACE_Module_Type::dump (void) const
+ACE_Module_Type::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Module_Type::dump");
@@ -176,7 +176,7 @@ ACE_Module_Type::ACE_Module_Type (void *m,
   ACE_TRACE ("ACE_Module_Type::ACE_Module_Type");
 }
 
-ACE_Module_Type::~ACE_Module_Type (void)
+ACE_Module_Type::~ACE_Module_Type ()
 {
   ACE_TRACE ("ACE_Module_Type::~ACE_Module_Type");
 }
@@ -207,7 +207,7 @@ ACE_Module_Type::init (int argc, ACE_TCHAR *argv[]) const
 }
 
 int
-ACE_Module_Type::suspend (void) const
+ACE_Module_Type::suspend () const
 {
   ACE_TRACE ("ACE_Module_Type::suspend");
   void *obj = this->object ();
@@ -223,7 +223,7 @@ ACE_Module_Type::suspend (void) const
 }
 
 int
-ACE_Module_Type::resume (void) const
+ACE_Module_Type::resume () const
 {
   ACE_TRACE ("ACE_Module_Type::resume");
   void *obj = this->object ();
@@ -242,7 +242,7 @@ ACE_Module_Type::resume (void) const
 // implementation of ACE_Module and ACE_Module::close...
 
 int
-ACE_Module_Type::fini (void) const
+ACE_Module_Type::fini () const
 {
   ACE_TRACE ("ACE_Module_Type::fini");
   void *obj = this->object ();
@@ -287,7 +287,7 @@ ACE_Module_Type::link (ACE_Module_Type *n)
 }
 
 ACE_Module_Type *
-ACE_Module_Type::link (void) const
+ACE_Module_Type::link () const
 {
   ACE_TRACE ("ACE_Module_Type::link");
   return this->link_;
@@ -296,7 +296,7 @@ ACE_Module_Type::link (void) const
 ACE_ALLOC_HOOK_DEFINE(ACE_Stream_Type)
 
 void
-ACE_Stream_Type::dump (void) const
+ACE_Stream_Type::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream_Type::dump");
@@ -311,7 +311,7 @@ ACE_Stream_Type::init (int, ACE_TCHAR *[]) const
 }
 
 int
-ACE_Stream_Type::suspend (void) const
+ACE_Stream_Type::suspend () const
 {
   ACE_TRACE ("ACE_Stream_Type::suspend");
 
@@ -324,7 +324,7 @@ ACE_Stream_Type::suspend (void) const
 }
 
 int
-ACE_Stream_Type::resume (void) const
+ACE_Stream_Type::resume () const
 {
   ACE_TRACE ("ACE_Stream_Type::resume");
 
@@ -346,7 +346,7 @@ ACE_Stream_Type::ACE_Stream_Type (void *s,
   ACE_TRACE ("ACE_Stream_Type::ACE_Stream_Type");
 }
 
-ACE_Stream_Type::~ACE_Stream_Type (void)
+ACE_Stream_Type::~ACE_Stream_Type ()
 {
   ACE_TRACE ("ACE_Stream_Type::~ACE_Stream_Type");
 }
@@ -370,7 +370,7 @@ ACE_Stream_Type::info (ACE_TCHAR **str, size_t len) const
 }
 
 int
-ACE_Stream_Type::fini (void) const
+ACE_Stream_Type::fini () const
 {
   ACE_TRACE ("ACE_Stream_Type::fini");
   void *obj = this->object ();
diff --git a/ACE/ace/Service_Types.h b/ACE/ace/Service_Types.h
index 998cf16ed48..af7179ed4c3 100644
--- a/ACE/ace/Service_Types.h
+++ b/ACE/ace/Service_Types.h
@@ -42,29 +42,29 @@ public:
                          u_int flags = 0,
                          ACE_Service_Object_Exterminator gobbler = 0,
                          int stype = ACE_Service_Type::INVALID_TYPE);
-  virtual ~ACE_Service_Type_Impl (void);
+  virtual ~ACE_Service_Type_Impl ();
 
   // = Pure virtual interface (must be defined by the subclass).
-  virtual int suspend (void) const = 0;
-  virtual int resume (void) const = 0;
+  virtual int suspend () const = 0;
+  virtual int resume () const = 0;
   virtual int init (int argc, ACE_TCHAR *argv[]) const = 0;
-  virtual int fini (void) const;
+  virtual int fini () const;
   virtual int info (ACE_TCHAR **str, size_t len) const = 0;
 
   /// The pointer to the service.
-  void *object (void) const;
+  void *object () const;
 
   /// Get the name of the service.
-  const ACE_TCHAR *name (void) const;
+  const ACE_TCHAR *name () const;
 
   /// Set the name of the service.
   void name (const ACE_TCHAR *);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// get the service_type of this service
-  int service_type (void) const;
+  int service_type () const;
 
   /// set the service_type of this service
   void service_type (int stype);
@@ -107,13 +107,13 @@ public:
                            ACE_Service_Object_Exterminator gobbler = 0,
                            int stype = ACE_Service_Type::SERVICE_OBJECT);
 
-  ~ACE_Service_Object_Type (void);
+  ~ACE_Service_Object_Type ();
 
   // = Implement the hooks for <ACE_Service_Objects>.
-  virtual int suspend (void) const;
-  virtual int resume (void) const;
+  virtual int suspend () const;
+  virtual int resume () const;
   virtual int init (int argc, ACE_TCHAR *argv[]) const;
-  virtual int fini (void) const;
+  virtual int fini () const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
 private:
@@ -135,23 +135,23 @@ public:
                    u_int flags = 0,
                    int stype = ACE_Service_Type::MODULE);
 
-  ~ACE_Module_Type (void);
+  ~ACE_Module_Type ();
 
   // = Implement the hooks for <ACE_Modules>.
-  virtual int suspend (void) const;
-  virtual int resume (void) const;
+  virtual int suspend () const;
+  virtual int resume () const;
   virtual int init (int argc, ACE_TCHAR *argv[]) const;
-  virtual int fini (void) const;
+  virtual int fini () const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
   /// Get the link pointer.
-  ACE_Module_Type *link (void) const;
+  ACE_Module_Type *link () const;
 
   /// Set the link pointer.
   void link (ACE_Module_Type *);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -175,13 +175,13 @@ public:
                    u_int flags = 0,
                    int stype = ACE_Service_Type::STREAM);
 
-  ~ACE_Stream_Type (void);
+  ~ACE_Stream_Type ();
 
   // = Implement the hooks for <ACE_Streams>.
-  virtual int suspend (void) const;
-  virtual int resume (void) const;
+  virtual int suspend () const;
+  virtual int resume () const;
   virtual int init (int argc, ACE_TCHAR *argv[]) const;
-  virtual int fini (void) const;
+  virtual int fini () const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
   /// Add a new  ACE_Module to the top of the ACE_Stream.
@@ -194,7 +194,7 @@ public:
   ACE_Module_Type *find (const ACE_TCHAR *module_name) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Service_Types.inl b/ACE/ace/Service_Types.inl
index cb13c1c4ec4..f32aa55c9fd 100644
--- a/ACE/ace/Service_Types.inl
+++ b/ACE/ace/Service_Types.inl
@@ -4,14 +4,14 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void *
-ACE_Service_Type_Impl::object (void) const
+ACE_Service_Type_Impl::object () const
 {
   ACE_TRACE ("ACE_Service_Type_Impl::object");
   return this->obj_;
 }
 
 ACE_INLINE const ACE_TCHAR *
-ACE_Service_Type_Impl::name (void) const
+ACE_Service_Type_Impl::name () const
 {
   ACE_TRACE ("ACE_Service_Type_Impl::name");
   return this->name_;
@@ -27,7 +27,7 @@ ACE_Service_Type_Impl::name (const ACE_TCHAR *n)
 }
 
 ACE_INLINE int
-ACE_Service_Type_Impl::service_type (void) const
+ACE_Service_Type_Impl::service_type () const
 {
   return service_type_;
 }
diff --git a/ACE/ace/Shared_Memory.cpp b/ACE/ace/Shared_Memory.cpp
index 7b2cba500cf..d4dc8507087 100644
--- a/ACE/ace/Shared_Memory.cpp
+++ b/ACE/ace/Shared_Memory.cpp
@@ -4,7 +4,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Shared_Memory::~ACE_Shared_Memory (void)
+ACE_Shared_Memory::~ACE_Shared_Memory ()
 {
 }
 
diff --git a/ACE/ace/Shared_Memory_MM.cpp b/ACE/ace/Shared_Memory_MM.cpp
index c465fe0b163..feeba844ea9 100644
--- a/ACE/ace/Shared_Memory_MM.cpp
+++ b/ACE/ace/Shared_Memory_MM.cpp
@@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_MM)
 
 void
-ACE_Shared_Memory_MM::dump (void) const
+ACE_Shared_Memory_MM::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Shared_Memory_MM::dump");
@@ -49,7 +49,7 @@ ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (const ACE_TCHAR *file_name,
 
 // The "do-nothing" constructor.
 
-ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (void)
+ACE_Shared_Memory_MM::ACE_Shared_Memory_MM ()
 {
   ACE_TRACE ("ACE_Shared_Memory_MM::ACE_Shared_Memory_MM");
 }
@@ -57,7 +57,7 @@ ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (void)
 // The overall size of the segment.
 
 size_t
-ACE_Shared_Memory_MM::get_segment_size (void) const
+ACE_Shared_Memory_MM::get_segment_size () const
 {
   ACE_TRACE ("ACE_Shared_Memory_MM::get_segment_size");
   // This cast is legit since the original length in open() is an int.
@@ -67,7 +67,7 @@ ACE_Shared_Memory_MM::get_segment_size (void) const
 // Unmaps the shared memory segment.
 
 int
-ACE_Shared_Memory_MM::remove (void)
+ACE_Shared_Memory_MM::remove ()
 {
   ACE_TRACE ("ACE_Shared_Memory_MM::remove");
   return shared_memory_.remove ();
@@ -76,7 +76,7 @@ ACE_Shared_Memory_MM::remove (void)
 // Closes (unmaps) the shared memory segment.
 
 int
-ACE_Shared_Memory_MM::close (void)
+ACE_Shared_Memory_MM::close ()
 {
   ACE_TRACE ("ACE_Shared_Memory_MM::close");
   return shared_memory_.unmap ();
@@ -92,7 +92,7 @@ ACE_Shared_Memory_MM::malloc (size_t)
 }
 
 ACE_HANDLE
-ACE_Shared_Memory_MM::get_id (void) const
+ACE_Shared_Memory_MM::get_id () const
 {
   ACE_TRACE ("ACE_Shared_Memory_MM::get_id");
   return this->shared_memory_.handle ();
diff --git a/ACE/ace/Shared_Memory_MM.h b/ACE/ace/Shared_Memory_MM.h
index b0751136c6b..85c405dc6af 100644
--- a/ACE/ace/Shared_Memory_MM.h
+++ b/ACE/ace/Shared_Memory_MM.h
@@ -97,7 +97,7 @@ public:
   virtual ACE_HANDLE get_id (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Shared_Memory_Pool.cpp b/ACE/ace/Shared_Memory_Pool.cpp
index 845f595ad6a..42bf78718ea 100644
--- a/ACE/ace/Shared_Memory_Pool.cpp
+++ b/ACE/ace/Shared_Memory_Pool.cpp
@@ -27,7 +27,7 @@ ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (
 }
 
 void
-ACE_Shared_Memory_Pool::dump (void) const
+ACE_Shared_Memory_Pool::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Shared_Memory_Pool::dump");
@@ -283,7 +283,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (
                 ACE_TEXT ("ACE_Sig_Handler::register_handler")));
 }
 
-ACE_Shared_Memory_Pool::~ACE_Shared_Memory_Pool (void)
+ACE_Shared_Memory_Pool::~ACE_Shared_Memory_Pool ()
 {
 }
 
@@ -443,7 +443,7 @@ ACE_Shared_Memory_Pool::protect (void *, size_t, int)
 }
 
 void *
-ACE_Shared_Memory_Pool::base_addr (void) const
+ACE_Shared_Memory_Pool::base_addr () const
 {
   ACE_TRACE ("ACE_Shared_Memory_Pool::base_addr");
   return this->base_addr_;
diff --git a/ACE/ace/Shared_Memory_Pool.h b/ACE/ace/Shared_Memory_Pool.h
index d8872f18bbf..74125a74225 100644
--- a/ACE/ace/Shared_Memory_Pool.h
+++ b/ACE/ace/Shared_Memory_Pool.h
@@ -128,7 +128,7 @@ public:
   virtual void *base_addr (void) const;
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Shared_Memory_SV.cpp b/ACE/ace/Shared_Memory_SV.cpp
index 1a7e10b401d..aec9559e2f4 100644
--- a/ACE/ace/Shared_Memory_SV.cpp
+++ b/ACE/ace/Shared_Memory_SV.cpp
@@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_SV)
 
 void
-ACE_Shared_Memory_SV::dump (void) const
+ACE_Shared_Memory_SV::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Shared_Memory_SV::dump");
@@ -34,7 +34,7 @@ ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (key_t id,
 // The overall size of the segment.
 
 size_t
-ACE_Shared_Memory_SV::get_segment_size (void) const
+ACE_Shared_Memory_SV::get_segment_size () const
 {
   ACE_TRACE ("ACE_Shared_Memory_SV::get_segment_size");
   // This cast is ok since the 'open' method for this class allows only
@@ -45,7 +45,7 @@ ACE_Shared_Memory_SV::get_segment_size (void) const
 // Removes the shared memory segment.
 
 int
-ACE_Shared_Memory_SV::remove (void)
+ACE_Shared_Memory_SV::remove ()
 {
   ACE_TRACE ("ACE_Shared_Memory_SV::remove");
   return shared_memory_.remove ();
@@ -54,7 +54,7 @@ ACE_Shared_Memory_SV::remove (void)
 // Closes (detaches) the shared memory segment.
 
 int
-ACE_Shared_Memory_SV::close (void)
+ACE_Shared_Memory_SV::close ()
 {
   ACE_TRACE ("ACE_Shared_Memory_SV::close");
   return shared_memory_.detach ();
@@ -68,7 +68,7 @@ ACE_Shared_Memory_SV::malloc (size_t)
 }
 
 ACE_HANDLE
-ACE_Shared_Memory_SV::get_id (void) const
+ACE_Shared_Memory_SV::get_id () const
 {
   ACE_TRACE ("ACE_Shared_Memory_SV::get_id");
   return this->shared_memory_.get_id ();
diff --git a/ACE/ace/Shared_Memory_SV.h b/ACE/ace/Shared_Memory_SV.h
index a36f1a19614..0523bf6b49c 100644
--- a/ACE/ace/Shared_Memory_SV.h
+++ b/ACE/ace/Shared_Memory_SV.h
@@ -77,7 +77,7 @@ public:
   virtual ACE_HANDLE get_id (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Shared_Object.cpp b/ACE/ace/Shared_Object.cpp
index 117b32d47fe..f1d369e2ce9 100644
--- a/ACE/ace/Shared_Object.cpp
+++ b/ACE/ace/Shared_Object.cpp
@@ -23,7 +23,7 @@ ACE_Shared_Object::init (int, ACE_TCHAR *[])
 // Terminates object when dynamic unlinking occurs.
 
 int
-ACE_Shared_Object::fini (void)
+ACE_Shared_Object::fini ()
 {
   ACE_TRACE ("ACE_Shared_Object::fini");
   return 0;
@@ -40,7 +40,7 @@ ACE_Shared_Object::info (ACE_TCHAR **, size_t) const
 
 // Need to give a default implementation.
 
-ACE_Shared_Object::~ACE_Shared_Object (void)
+ACE_Shared_Object::~ACE_Shared_Object ()
 {
   ACE_TRACE ("ACE_Shared_Object::~ACE_Shared_Object");
 }
diff --git a/ACE/ace/Shared_Object.h b/ACE/ace/Shared_Object.h
index 6497f292e36..230bdad40da 100644
--- a/ACE/ace/Shared_Object.h
+++ b/ACE/ace/Shared_Object.h
@@ -33,16 +33,16 @@ class ACE_Export ACE_Shared_Object
 {
 public:
   /// Constructor
-  ACE_Shared_Object (void);
+  ACE_Shared_Object ();
 
   /// Destructor
-  virtual ~ACE_Shared_Object (void);
+  virtual ~ACE_Shared_Object ();
 
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Terminates object when dynamic unlinking occurs.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Returns information on a service object.
   virtual int info (ACE_TCHAR **info_string, size_t length = 0) const;
diff --git a/ACE/ace/Shared_Object.inl b/ACE/ace/Shared_Object.inl
index 358a3fb7a4e..ec85cdfbce0 100644
--- a/ACE/ace/Shared_Object.inl
+++ b/ACE/ace/Shared_Object.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Shared_Object::ACE_Shared_Object (void)
+ACE_Shared_Object::ACE_Shared_Object ()
 {
 }
 
diff --git a/ACE/ace/Sig_Adapter.cpp b/ACE/ace/Sig_Adapter.cpp
index 18a5cc9b952..2010f8a3e0a 100644
--- a/ACE/ace/Sig_Adapter.cpp
+++ b/ACE/ace/Sig_Adapter.cpp
@@ -37,7 +37,7 @@ ACE_Sig_Adapter::~ACE_Sig_Adapter ()
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Adapter)
 
 int
-ACE_Sig_Adapter::sigkey (void)
+ACE_Sig_Adapter::sigkey ()
 {
   ACE_TRACE ("ACE_Sig_Adapter::sigkey");
   return this->sigkey_;
diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp
index e91de0b4fb4..e87fb94f60d 100644
--- a/ACE/ace/Sig_Handler.cpp
+++ b/ACE/ace/Sig_Handler.cpp
@@ -46,7 +46,7 @@ sig_atomic_t ACE_Sig_Handler::sig_pending_ = 0;
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler)
 
-ACE_Sig_Handler::~ACE_Sig_Handler (void)
+ACE_Sig_Handler::~ACE_Sig_Handler ()
 {
   for (int s = 1; s < ACE_NSIG; ++s)
     if (ACE_Sig_Handler::signal_handlers_[s])
@@ -54,7 +54,7 @@ ACE_Sig_Handler::~ACE_Sig_Handler (void)
 }
 
 void
-ACE_Sig_Handler::dump (void) const
+ACE_Sig_Handler::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Handler::dump");
@@ -62,7 +62,7 @@ ACE_Sig_Handler::dump (void) const
 }
 
 int
-ACE_Sig_Handler::sig_pending (void)
+ACE_Sig_Handler::sig_pending ()
 {
   ACE_TRACE ("ACE_Sig_Handler::sig_pending");
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
@@ -289,8 +289,8 @@ int ACE_Sig_Handlers::sigkey_ = 0;
 bool ACE_Sig_Handlers::third_party_sig_handler_ = false;
 
 // Make life easier by defining typedefs...
-typedef ACE_Fixed_Set <ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS> ACE_SIG_HANDLERS_SET;
-typedef ACE_Fixed_Set_Iterator <ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS> ACE_SIG_HANDLERS_ITERATOR;
+using ACE_SIG_HANDLERS_SET = ACE_Fixed_Set<ACE_Event_Handler *, ((size_t)20)>;
+using ACE_SIG_HANDLERS_ITERATOR = ACE_Fixed_Set_Iterator<ACE_Event_Handler *, ((size_t)20)>;
 
 class ACE_Sig_Handlers_Set
 {
@@ -319,12 +319,12 @@ ACE_Sig_Handlers_Set::instance (int signum)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handlers)
 
-ACE_Sig_Handlers::ACE_Sig_Handlers (void)
+ACE_Sig_Handlers::ACE_Sig_Handlers ()
 {
 }
 
 void
-ACE_Sig_Handlers::dump (void) const
+ACE_Sig_Handlers::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Handlers::dump");
diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h
index 1bd2a66d464..3a9e08be45b 100644
--- a/ACE/ace/Sig_Handler.h
+++ b/ACE/ace/Sig_Handler.h
@@ -42,10 +42,10 @@ class ACE_Export ACE_Sig_Handler
 {
 public:
   /// Default constructor.
-  ACE_Sig_Handler (void);
+  ACE_Sig_Handler ();
 
   /// Destructor
-  virtual ~ACE_Sig_Handler (void);
+  virtual ~ACE_Sig_Handler ();
 
   // = Registration and removal methods.
   /**
@@ -75,7 +75,7 @@ public:
 
   // Set/get signal status.
   /// True if there is a pending signal.
-  static int sig_pending (void);
+  static int sig_pending ();
 
   /// Reset the value of <sig_pending_> so that no signal is pending.
   static void sig_pending (int);
@@ -98,7 +98,7 @@ public:
                         ucontext_t *);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -164,7 +164,7 @@ class ACE_Export ACE_Sig_Handlers : public ACE_Sig_Handler
 {
 public:
   /// Default constructor
-  ACE_Sig_Handlers (void);
+  ACE_Sig_Handlers ();
 
   // = Registration and removal methods.
   /**
@@ -215,7 +215,7 @@ public:
   static void dispatch (int signum, siginfo_t *, ucontext_t *);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Sig_Handler.inl b/ACE/ace/Sig_Handler.inl
index a2ad69de737..08531ab2cdd 100644
--- a/ACE/ace/Sig_Handler.inl
+++ b/ACE/ace/Sig_Handler.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 ACE_INLINE
-ACE_Sig_Handler::ACE_Sig_Handler (void)
+ACE_Sig_Handler::ACE_Sig_Handler ()
 {
 }
 
diff --git a/ACE/ace/Signal.cpp b/ACE/ace/Signal.cpp
index b04b8004296..2c285661a0b 100644
--- a/ACE/ace/Signal.cpp
+++ b/ACE/ace/Signal.cpp
@@ -17,7 +17,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Action)
 
 void
-ACE_Sig_Action::dump (void) const
+ACE_Sig_Action::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Action::dump");
@@ -26,20 +26,20 @@ ACE_Sig_Action::dump (void) const
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Set)
 
-ACE_Sig_Set::~ACE_Sig_Set (void)
+ACE_Sig_Set::~ACE_Sig_Set ()
 {
   ACE_TRACE ("ACE_Sig_Set::~ACE_Sig_Set");
   ACE_OS::sigemptyset (&this->sigset_);
 }
 
-ACE_Sig_Action::~ACE_Sig_Action (void)
+ACE_Sig_Action::~ACE_Sig_Action ()
 {
   ACE_TRACE ("ACE_Sig_Action::~ACE_Sig_Action");
 }
 
 // Restore the signal mask.
 
-ACE_Sig_Guard::~ACE_Sig_Guard (void)
+ACE_Sig_Guard::~ACE_Sig_Guard ()
 {
   //ACE_TRACE ("ACE_Sig_Guard::~ACE_Sig_Guard");
   if (!this->condition_)
@@ -59,7 +59,7 @@ ACE_Sig_Guard::~ACE_Sig_Guard (void)
 }
 
 void
-ACE_Sig_Set::dump (void) const
+ACE_Sig_Set::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Set::dump");
@@ -69,14 +69,14 @@ ACE_Sig_Set::dump (void) const
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Guard)
 
 void
-ACE_Sig_Guard::dump (void) const
+ACE_Sig_Guard::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Guard::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Sig_Action::ACE_Sig_Action (void)
+ACE_Sig_Action::ACE_Sig_Action ()
 {
   // ACE_TRACE ("ACE_Sig_Action::ACE_Sig_Action");
   this->sa_.sa_flags = 0;
diff --git a/ACE/ace/Signal.h b/ACE/ace/Signal.h
index 416722eb811..c4299437c51 100644
--- a/ACE/ace/Signal.h
+++ b/ACE/ace/Signal.h
@@ -55,13 +55,13 @@ public:
   /// full.
   ACE_Sig_Set (int fill = 0);
 
-  ~ACE_Sig_Set (void);
+  ~ACE_Sig_Set ();
 
   /// Create a set that excludes all signals defined by the system.
-  int empty_set (void);
+  int empty_set ();
 
   /// Create a set that includes all signals defined by the system.
-  int fill_set (void);
+  int fill_set ();
 
   /// Adds the individual signal specified by @a signo to the set.
   int sig_add (int signo);
@@ -76,10 +76,10 @@ public:
   operator sigset_t *();
 
   /// Returns a copy of the underlying @c sigset_t.
-  sigset_t sigset (void) const;
+  sigset_t sigset () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -98,7 +98,7 @@ class ACE_Export ACE_Sig_Action
 {
 public:
   /// Default constructor.  Initializes everything to 0.
-  ACE_Sig_Action (void);
+  ACE_Sig_Action ();
 
   /// Assigns the various fields of a @c sigaction struct but doesn't
   /// register for signal handling via the @c sigaction function.
@@ -152,15 +152,13 @@ public:
                   sigset_t *sigmask = 0,
                   int flags = 0);
 
-#if defined (ACE_HAS_CPP11)
   ACE_Sig_Action (const ACE_Sig_Action&) = default;
   ACE_Sig_Action (ACE_Sig_Action&&) = default;
   ACE_Sig_Action& operator = (ACE_Sig_Action const &) = default;
   ACE_Sig_Action &operator = (ACE_Sig_Action&&)  = default;
-#endif /* ACE_HAS_CPP11 */
 
   /// Default dtor.
-  ~ACE_Sig_Action (void);
+  ~ACE_Sig_Action ();
 
   // = Signal action management.
   /// Register @c this as the current disposition and store old
@@ -180,30 +178,30 @@ public:
   void set (struct sigaction *);
 
   /// Get current signal action.
-  struct sigaction *get (void);
+  struct sigaction *get ();
   operator struct sigaction *();
 
   /// Set current signal flags.
   void flags (int);
 
   /// Get current signal flags.
-  int flags (void);
+  int flags ();
 
   /// Set current signal mask.
   void mask (sigset_t *);
   void mask (ACE_Sig_Set &);
 
   /// Get current signal mask.
-  sigset_t *mask (void);
+  sigset_t *mask ();
 
   /// Set current signal handler (pointer to function).
   void handler (ACE_SignalHandler);
 
   /// Get current signal handler (pointer to function).
-  ACE_SignalHandler handler (void);
+  ACE_SignalHandler handler ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -228,10 +226,10 @@ public:
   ACE_Sig_Guard (ACE_Sig_Set *mask = 0, bool condition = true);
 
   /// Restore blocked signals.
-  ~ACE_Sig_Guard (void);
+  ~ACE_Sig_Guard ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Signal.inl b/ACE/ace/Signal.inl
index 64ac6c049e5..11fb1550967 100644
--- a/ACE/ace/Signal.inl
+++ b/ACE/ace/Signal.inl
@@ -45,14 +45,14 @@ ACE_Sig_Set::ACE_Sig_Set (ACE_Sig_Set *ss)
 }
 
 ACE_INLINE int
-ACE_Sig_Set::empty_set (void)
+ACE_Sig_Set::empty_set ()
 {
   ACE_TRACE ("ACE_Sig_Set::empty_set");
   return ACE_OS::sigemptyset (&this->sigset_);
 }
 
 ACE_INLINE int
-ACE_Sig_Set::fill_set (void)
+ACE_Sig_Set::fill_set ()
 {
   ACE_TRACE ("ACE_Sig_Set::fill_set");
   return ACE_OS::sigfillset (&this->sigset_);
@@ -80,21 +80,21 @@ ACE_Sig_Set::is_member (int signo) const
 }
 
 ACE_INLINE
-ACE_Sig_Set::operator sigset_t *(void)
+ACE_Sig_Set::operator sigset_t *()
 {
   ACE_TRACE ("ACE_Sig_Set::operator sigset_t *");
   return &this->sigset_;
 }
 
 ACE_INLINE sigset_t
-ACE_Sig_Set::sigset (void) const
+ACE_Sig_Set::sigset () const
 {
   ACE_TRACE ("ACE_Sig_Set::sigset");
   return this->sigset_;
 }
 
 ACE_INLINE int
-ACE_Sig_Action::flags (void)
+ACE_Sig_Action::flags ()
 {
   ACE_TRACE ("ACE_Sig_Action::flags");
   return this->sa_.sa_flags;
@@ -108,7 +108,7 @@ ACE_Sig_Action::flags (int flags)
 }
 
 ACE_INLINE sigset_t *
-ACE_Sig_Action::mask (void)
+ACE_Sig_Action::mask ()
 {
   ACE_TRACE ("ACE_Sig_Action::mask");
   return &this->sa_.sa_mask;
@@ -130,7 +130,7 @@ ACE_Sig_Action::mask (ACE_Sig_Set &ss)
 }
 
 ACE_INLINE ACE_SignalHandler
-ACE_Sig_Action::handler (void)
+ACE_Sig_Action::handler ()
 {
   ACE_TRACE ("ACE_Sig_Action::handler");
   return ACE_SignalHandler (this->sa_.sa_handler);
@@ -155,7 +155,7 @@ ACE_Sig_Action::set (struct sigaction *sa)
 }
 
 ACE_INLINE struct sigaction *
-ACE_Sig_Action::get (void)
+ACE_Sig_Action::get ()
 {
   ACE_TRACE ("ACE_Sig_Action::get");
   return &this->sa_;
diff --git a/ACE/ace/Singleton.cpp b/ACE/ace/Singleton.cpp
index 52ca2b53d36..758c647d10b 100644
--- a/ACE/ace/Singleton.cpp
+++ b/ACE/ace/Singleton.cpp
@@ -27,7 +27,7 @@ ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_DLL_Singleton_T)
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_DLL_Singleton_Adapter_T)
 
 template <class TYPE, class ACE_LOCK> void
-ACE_Singleton<TYPE, ACE_LOCK>::dump (void)
+ACE_Singleton<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::dump");
@@ -41,7 +41,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::dump (void)
 }
 
 template <class TYPE, class ACE_LOCK> ACE_Singleton<TYPE, ACE_LOCK> *&
-ACE_Singleton<TYPE, ACE_LOCK>::instance_i (void)
+ACE_Singleton<TYPE, ACE_LOCK>::instance_i ()
 {
 #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
   // Pointer to the Singleton instance.  This works around a bug with
@@ -55,7 +55,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance_i (void)
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
+ACE_Singleton<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::instance");
 
@@ -133,7 +133,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::cleanup (void *param)
 }
 
 template <class TYPE, class ACE_LOCK> void
-ACE_Singleton<TYPE, ACE_LOCK>::close (void)
+ACE_Singleton<TYPE, ACE_LOCK>::close ()
 {
   ACE_Singleton<TYPE, ACE_LOCK> *&singleton =
     ACE_Singleton<TYPE, ACE_LOCK>::instance_i ();
@@ -155,7 +155,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
 
 template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
+ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump");
@@ -170,7 +170,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
 
 template <class TYPE, class ACE_LOCK>
 ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i (void)
+ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ()
 {
 #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
   // Pointer to the Singleton instance.  This works around a bug with
@@ -184,7 +184,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i (void)
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance (void)
+ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance");
 
@@ -237,7 +237,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance (void)
 }
 
 template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close (void)
+ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close ()
 {
   ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&singleton =
     ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ();
@@ -250,7 +250,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close (void)
 }
 
 template <class TYPE, class ACE_LOCK> void
-ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
+ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump");
@@ -264,7 +264,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 }
 
 template <class TYPE, class ACE_LOCK> ACE_TSS_Singleton<TYPE, ACE_LOCK> *&
-ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
+ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()
 {
 #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
   // Pointer to the Singleton instance.  This works around a bug with
@@ -278,7 +278,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
+ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance");
 
@@ -343,7 +343,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
 }
 
 template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
+ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump");
@@ -358,7 +358,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 
 template <class TYPE, class ACE_LOCK>
 ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
+ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()
 {
 #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
   // Pointer to the Singleton instance.  This works around a bug with
@@ -372,7 +372,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
+ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance");
 
@@ -426,7 +426,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
 }
 
 template <class TYPE, class ACE_LOCK> void
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::close (void)
+ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::close ()
 {
   ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&singleton =
     ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ();
@@ -454,7 +454,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::singleton_ = 0;
 #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
 
 template <class TYPE, class ACE_LOCK> void
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump");
@@ -469,7 +469,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void)
 
 template <class TYPE, class ACE_LOCK>
 ACE_DLL_Singleton_T<TYPE, ACE_LOCK> *&
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i ()
 {
   ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i");
 
@@ -485,7 +485,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i (void)
 }
 
 template <class TYPE, class ACE_LOCK> TYPE *
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance ()
 {
   ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance");
 
@@ -541,7 +541,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance (void)
 }
 
 template <class TYPE, class ACE_LOCK> void
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close ()
 {
   ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close");
 
@@ -553,20 +553,20 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close (void)
 }
 
 template <class TYPE, class ACE_LOCK> void
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close_singleton (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close_singleton ()
 {
   ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close_singleton");
   ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close ();
 }
 
 template <class TYPE, class ACE_LOCK> const ACE_TCHAR *
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dll_name (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dll_name ()
 {
   return this->instance ()->dll_name ();
 }
 
 template <class TYPE, class ACE_LOCK> const ACE_TCHAR *
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::name (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::name ()
 {
   return this->instance ()->name ();
 }
@@ -575,7 +575,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::name (void)
 /**********************************************************************/
 
 template <class TYPE> const ACE_TCHAR*
-ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name (void)
+ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name ()
 {
   // @todo make this a constant somewhere (or it there already is one
   // then use it.
diff --git a/ACE/ace/Singleton.h b/ACE/ace/Singleton.h
index d0cd95f4ae0..68932be0fb7 100644
--- a/ACE/ace/Singleton.h
+++ b/ACE/ace/Singleton.h
@@ -78,24 +78,24 @@ class ACE_Singleton : public ACE_Cleanup
 {
 public:
   /// Global access point to the Singleton.
-  static TYPE *instance (void);
+  static TYPE *instance ();
 
   /// Cleanup method, used by @c ace_cleanup_destroyer to destroy the
   /// ACE_Singleton.
   virtual void cleanup (void *param = 0);
 
   /// Explicitly delete the Singleton instance.
-  static void close (void);
+  static void close ();
 
   /// Dump the state of the object.
-  static void dump (void);
+  static void dump ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Default constructor.
-  ACE_Singleton (void);
+  ACE_Singleton ();
 
   /// Contained instance.
   TYPE instance_;
@@ -106,7 +106,7 @@ protected:
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
   /// Get pointer to the Singleton instance.
-  static ACE_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
+  static ACE_Singleton<TYPE, ACE_LOCK> *&instance_i ();
 };
 
 /**
@@ -131,20 +131,20 @@ class ACE_Unmanaged_Singleton : public ACE_Singleton <TYPE, ACE_LOCK>
 {
 public:
   /// Global access point to the Singleton.
-  static TYPE *instance (void);
+  static TYPE *instance ();
 
   /// Explicitly delete the Singleton instance.
-  static void close (void);
+  static void close ();
 
   /// Dump the state of the object.
-  static void dump (void);
+  static void dump ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Default constructor.
-  ACE_Unmanaged_Singleton (void);
+  ACE_Unmanaged_Singleton ();
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
   /// Pointer to the Singleton (ACE_Cleanup) instance.
@@ -152,7 +152,7 @@ protected:
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
   /// Get pointer to the Singleton instance.
-  static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
+  static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&instance_i ();
 };
 
 /**
@@ -178,21 +178,21 @@ class ACE_TSS_Singleton : public ACE_Cleanup
 {
 public:
   /// Global access point to the singleton.
-  static TYPE *instance (void);
+  static TYPE *instance ();
 
   /// Cleanup method, used by <ace_cleanup_destroyer> to destroy the
   /// singleton.
   virtual void cleanup (void *param = 0);
 
   /// Dump the state of the object.
-  static void dump (void);
+  static void dump ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Default constructor.
-  ACE_TSS_Singleton (void);
+  ACE_TSS_Singleton ();
 
   /// Contained instance.
   ACE_TSS_TYPE (TYPE) instance_;
@@ -206,7 +206,7 @@ protected:
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
   /// Get pointer to the TSS Singleton instance.
-  static ACE_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
+  static ACE_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i ();
 };
 
 /**
@@ -227,20 +227,20 @@ class ACE_Unmanaged_TSS_Singleton : public ACE_TSS_Singleton <TYPE, ACE_LOCK>
 {
 public:
   /// Global access point to the singleton.
-  static TYPE *instance (void);
+  static TYPE *instance ();
 
   /// Explicitly delete the singleton instance.
-  static void close (void);
+  static void close ();
 
   /// Dump the state of the object.
-  static void dump (void);
+  static void dump ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Default constructor.
-  ACE_Unmanaged_TSS_Singleton (void);
+  ACE_Unmanaged_TSS_Singleton ();
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
   /// Pointer to the Singleton (ACE_Cleanup) instance.
@@ -248,7 +248,7 @@ protected:
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
   /// Get pointer to the Singleton instance.
-  static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
+  static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i ();
 };
 
 /**
@@ -282,29 +282,29 @@ public:
   //void cleanup (void *param = 0);
 
   /// Global access point to the Singleton.
-  static TYPE *instance (void);
+  static TYPE *instance ();
 
   /// Explicitly delete the Singleton instance.
-  static void close (void);
+  static void close ();
 
-  static void close_singleton (void);
+  static void close_singleton ();
 
   /// Dump the state of the object.
-  static void dump (void);
+  static void dump ();
 
-  const ACE_TCHAR *dll_name (void);
+  const ACE_TCHAR *dll_name ();
 
-  const ACE_TCHAR *name (void);
+  const ACE_TCHAR *name ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Default constructor.
-  ACE_DLL_Singleton_T (void);
+  ACE_DLL_Singleton_T ();
 
   /// Destructor.
-  ~ACE_DLL_Singleton_T (void);
+  ~ACE_DLL_Singleton_T ();
 
   /// Contained instance.
   TYPE instance_;
@@ -315,14 +315,14 @@ protected:
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
   /// Get pointer to the singleton instance.
-  static ACE_DLL_Singleton_T<TYPE, ACE_LOCK> *&instance_i (void);
+  static ACE_DLL_Singleton_T<TYPE, ACE_LOCK> *&instance_i ();
 };
 
 template <class TYPE>
 class ACE_DLL_Singleton_Adapter_T : public TYPE
 {
 public:
-  const ACE_TCHAR *dll_name (void);
+  const ACE_TCHAR *dll_name ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Singleton.inl b/ACE/ace/Singleton.inl
index 912271ba20f..479d38f7487 100644
--- a/ACE/ace/Singleton.inl
+++ b/ACE/ace/Singleton.inl
@@ -7,32 +7,32 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // have a default constructor.  Let the compiler figure it out . . .
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_Singleton<TYPE, ACE_LOCK>::ACE_Singleton (void)
+ACE_Singleton<TYPE, ACE_LOCK>::ACE_Singleton ()
 {
 }
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_Singleton (void)
+ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_Singleton ()
 {
 }
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_TSS_Singleton<TYPE, ACE_LOCK>::ACE_TSS_Singleton (void)
+ACE_TSS_Singleton<TYPE, ACE_LOCK>::ACE_TSS_Singleton ()
 {
 }
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_TSS_Singleton (void)
+ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_TSS_Singleton ()
 {
 }
 
 template <class TYPE, class ACE_LOCK> ACE_INLINE
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::ACE_DLL_Singleton_T (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::ACE_DLL_Singleton_T ()
 {
 }
 
 template <class TYPE, class ACE_LOCK>
-ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::~ACE_DLL_Singleton_T (void)
+ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::~ACE_DLL_Singleton_T ()
 {
 }
 
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 43606fa2f3c..e74b4e501ce 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1444,7 +1444,7 @@ return 0;
 // Routine to return a handle from which ioctl() requests can be made.
 
 ACE_HANDLE
-ACE::get_handle (void)
+ACE::get_handle ()
 {
   // Solaris 2.x
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
@@ -1508,7 +1508,7 @@ ip_check (int &ipvn_enabled, int pf)
 #endif /* ACE_HAS_IPV6 */
 
 bool
-ACE::ipv4_enabled (void)
+ACE::ipv4_enabled ()
 {
 #if defined (ACE_HAS_IPV6)
   return static_cast<bool> (ace_ipv4_enabled == -1 ?
@@ -1522,7 +1522,7 @@ ACE::ipv4_enabled (void)
 }
 
 int
-ACE::ipv6_enabled (void)
+ACE::ipv6_enabled ()
 {
 #if defined (ACE_HAS_IPV6)
   return ace_ipv6_enabled == -1 ?
diff --git a/ACE/ace/Sock_Connect.h b/ACE/ace/Sock_Connect.h
index 54011147474..394338d5800 100644
--- a/ACE/ace/Sock_Connect.h
+++ b/ACE/ace/Sock_Connect.h
@@ -74,7 +74,7 @@ namespace ACE
 
   /// Routine to return a handle from which @c ioctl requests can be
   /// made.  Caller must close the handle.
-  extern ACE_Export ACE_HANDLE get_handle (void);
+  extern ACE_Export ACE_HANDLE get_handle ();
 
   /// Returns @c true if IPv4 is enabled on the current host; @c false
   /// if not.
@@ -85,7 +85,7 @@ namespace ACE
    * succeeds, and @c false if it fails. Caches the result so it only
      gets checked once.
    */
-  extern ACE_Export bool ipv4_enabled (void);
+  extern ACE_Export bool ipv4_enabled ();
 
   /**
    * Returns 1 if IPv6 is enabled on the current host; 0 if not.
@@ -95,7 +95,7 @@ namespace ACE
    * returning 1 if it succeeds, and 0 if it fails. Caches the result
    * so it only gets checked once.
    */
-  extern ACE_Export int ipv6_enabled (void);
+  extern ACE_Export int ipv6_enabled ();
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Stack_Trace.cpp b/ACE/ace/Stack_Trace.cpp
index d4be2196252..2aa29079757 100644
--- a/ACE/ace/Stack_Trace.cpp
+++ b/ACE/ace/Stack_Trace.cpp
@@ -66,7 +66,7 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset, size_t num_frame
   ACE_OS::strcpy (&this->buf_[0], UNABLE_TO_GET_TRACE);
 }
 
-#elif (defined(__GLIBC__) || defined(ACE_HAS_EXECINFO_H)) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
+#elif (defined(__GLIBC__) || defined(ACE_HAS_EXECINFO_H))
 // This is the code for glibc
 #  include <execinfo.h>
 
diff --git a/ACE/ace/Static_Object_Lock.h b/ACE/ace/Static_Object_Lock.h
index fc167062f6e..0539e0052e2 100644
--- a/ACE/ace/Static_Object_Lock.h
+++ b/ACE/ace/Static_Object_Lock.h
@@ -40,11 +40,11 @@ class ACE_Export ACE_Static_Object_Lock
 {
 public:
   /// Static lock access point.
-  static ACE_Recursive_Thread_Mutex *instance (void);
+  static ACE_Recursive_Thread_Mutex *instance ();
 
   /// For use only by ACE_Object_Manager to clean up lock if it
   /// what dynamically allocated.
-  static void cleanup_lock (void);
+  static void cleanup_lock ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Stats.cpp b/ACE/ace/Stats.cpp
index b47c4857f0c..30d60338c40 100644
--- a/ACE/ace/Stats.cpp
+++ b/ACE/ace/Stats.cpp
@@ -12,7 +12,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_UINT32
-ACE_Stats_Value::fractional_field (void) const
+ACE_Stats_Value::fractional_field () const
 {
   if (precision () == 0)
     {
@@ -190,7 +190,7 @@ ACE_Stats::std_dev (ACE_Stats_Value &std_dev,
 
 
 void
-ACE_Stats::reset (void)
+ACE_Stats::reset ()
 {
   overflow_ = 0u;
   number_of_samples_ = 0u;
diff --git a/ACE/ace/Stats.h b/ACE/ace/Stats.h
index e3f16fdd573..17ac7127138 100644
--- a/ACE/ace/Stats.h
+++ b/ACE/ace/Stats.h
@@ -50,23 +50,23 @@ public:
   ACE_Stats_Value (const u_int precision);
 
   /// Accessor for precision.
-  u_int precision (void) const;
+  u_int precision () const;
 
   /// Set the whole_ field.
   void whole (const ACE_UINT32);
 
   /// Accessor for the whole_ field.
-  ACE_UINT32 whole (void) const;
+  ACE_UINT32 whole () const;
 
   /// Set the fractional_ field.
   void fractional (const ACE_UINT32);
 
   /// Accessor for the fractional_ field.
-  ACE_UINT32 fractional (void) const;
+  ACE_UINT32 fractional () const;
 
   /// Calculates the maximum value of the fractional portion, given its
   /// precision.
-  ACE_UINT32 fractional_field (void) const;
+  ACE_UINT32 fractional_field () const;
 
   /**
    * Access the value as an _unsigned_ 64 bit quantity.  It scales the
@@ -76,11 +76,10 @@ public:
   void scaled_value (ACE_UINT64 &) const;
 
   /// Print to stdout.
-  void dump (void) const;
+  void dump () const;
 
 private:
-
-  ACE_Stats_Value (void) {}
+  ACE_Stats_Value () = default;
 
 private:
   /// The integer portion of the value.
@@ -95,7 +94,6 @@ private:
    * is via the assignment operator.
    */
   u_int precision_;
-
 };
 
 /**
@@ -128,20 +126,20 @@ class ACE_Export ACE_Stats
 {
 public:
   /// Default constructor.
-  ACE_Stats (void);
+  ACE_Stats ();
 
   /// Provide a new sample.  Returns 0 on success, -1 if it fails due
   /// to running out of memory, or to rolling over of the sample count.
   int sample (const ACE_INT32 value);
 
   /// Access the number of samples provided so far.
-  ACE_UINT32 samples (void) const;
+  ACE_UINT32 samples () const;
 
   /// Value of the minimum sample provided so far.
-  ACE_INT32 min_value (void) const;
+  ACE_INT32 min_value () const;
 
   /// Value of the maximum sample provided so far.
-  ACE_INT32 max_value (void) const;
+  ACE_INT32 max_value () const;
 
   /**
    * Access the mean of all samples provided so far.  The fractional
@@ -195,7 +193,7 @@ public:
                            ACE_Stats_Value &square_root);
 
   /// Print summary statistics to stdout.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// Internal indication of whether there has been overflow.  Contains
diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp
index 723bc1e2749..4afcd174683 100644
--- a/ACE/ace/Strategies_T.cpp
+++ b/ACE/ace/Strategies_T.cpp
@@ -27,7 +27,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class SVC_HANDLER>
-ACE_Recycling_Strategy<SVC_HANDLER>::~ACE_Recycling_Strategy (void)
+ACE_Recycling_Strategy<SVC_HANDLER>::~ACE_Recycling_Strategy ()
 {
 }
 
@@ -47,7 +47,7 @@ ACE_Recycling_Strategy<SVC_HANDLER>::prepare_for_recycling (SVC_HANDLER *svc_han
 }
 
 template <class SVC_HANDLER>
-ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy (void)
+ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy ()
 {
   ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy");
   if (this->delete_svc_handler_)
@@ -505,7 +505,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX>
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cached_Connect_Strategy (void)
+ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cached_Connect_Strategy ()
 {
   if (this->delete_lock_)
     delete this->lock_;
@@ -1180,19 +1180,19 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::cleanup_h
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Creation_Strategy<SVC_HANDLER> *
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::creation_strategy (void) const
+ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::creation_strategy () const
 {
   return this->creation_strategy_;
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Recycling_Strategy<SVC_HANDLER> *
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycling_strategy (void) const
+ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycling_strategy () const
 {
   return this->recycling_strategy_;
 }
 
 template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Concurrency_Strategy<SVC_HANDLER> *
-ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::concurrency_strategy (void) const
+ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::concurrency_strategy () const
 {
   return this->concurrency_strategy_;
 }
@@ -1237,7 +1237,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find (
 }
 
 template <class SVC_HANDLER> void
-ACE_DLL_Strategy<SVC_HANDLER>::dump (void) const
+ACE_DLL_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DLL_Strategy<SVC_HANDLER>::dump");
@@ -1245,14 +1245,14 @@ ACE_DLL_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class SVC_HANDLER>
-ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy (void)
+ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy ()
 {
   ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy");
 }
 
 
 template <class SVC_HANDLER> void
-ACE_Concurrency_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Concurrency_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::dump");
@@ -1260,14 +1260,14 @@ ACE_Concurrency_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class SVC_HANDLER>
-ACE_Reactive_Strategy<SVC_HANDLER>::~ACE_Reactive_Strategy (void)
+ACE_Reactive_Strategy<SVC_HANDLER>::~ACE_Reactive_Strategy ()
 {
   ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::~ACE_Reactive_Strategy");
 }
 
 
 template <class SVC_HANDLER> void
-ACE_Reactive_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Reactive_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::dump");
@@ -1275,13 +1275,13 @@ ACE_Reactive_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class SVC_HANDLER>
-ACE_Thread_Strategy<SVC_HANDLER>::~ACE_Thread_Strategy (void)
+ACE_Thread_Strategy<SVC_HANDLER>::~ACE_Thread_Strategy ()
 {
   ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::~ACE_Thread_Strategy");
 }
 
 template <class SVC_HANDLER> void
-ACE_Thread_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Thread_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::dump");
@@ -1289,7 +1289,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy (void)
+ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy ()
 {
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy");
 
@@ -1298,21 +1298,21 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy (voi
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_HANDLE
-ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const
+ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle () const
 {
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle");
   return this->peer_acceptor_.get_handle ();
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR &
-ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const
+ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor () const
 {
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor");
   return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_;
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
-ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
+ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump");
@@ -1320,20 +1320,20 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1>
-ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connect_Strategy (void)
+ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connect_Strategy ()
 {
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connect_Strategy");
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_PEER_CONNECTOR &
-ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector (void) const
+ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector () const
 {
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector");
   return (ACE_PEER_CONNECTOR &) this->connector_;
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void
-ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const
+ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump");
@@ -1341,13 +1341,13 @@ ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const
 }
 
 template <class SVC_HANDLER>
-ACE_Process_Strategy<SVC_HANDLER>::~ACE_Process_Strategy (void)
+ACE_Process_Strategy<SVC_HANDLER>::~ACE_Process_Strategy ()
 {
   ACE_TRACE ("ACE_Process_Strategy<SVC_HANDLER>::~ACE_Process_Strategy");
 }
 
 template <class SVC_HANDLER> void
-ACE_Process_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Process_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Process_Strategy<SVC_HANDLER>::dump");
@@ -1355,27 +1355,27 @@ ACE_Process_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class SVC_HANDLER>
-ACE_Scheduling_Strategy<SVC_HANDLER>::~ACE_Scheduling_Strategy (void)
+ACE_Scheduling_Strategy<SVC_HANDLER>::~ACE_Scheduling_Strategy ()
 {
   ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::~ACE_Scheduling_Strategy");
 }
 
 template <class SVC_HANDLER> int
-ACE_Scheduling_Strategy<SVC_HANDLER>::suspend (void)
+ACE_Scheduling_Strategy<SVC_HANDLER>::suspend ()
 {
   ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::suspend");
   return -1;
 }
 
 template <class SVC_HANDLER> int
-ACE_Scheduling_Strategy<SVC_HANDLER>::resume (void)
+ACE_Scheduling_Strategy<SVC_HANDLER>::resume ()
 {
   ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::resume");
   return -1;
 }
 
 template <class SVC_HANDLER> void
-ACE_Scheduling_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Scheduling_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::dump");
@@ -1386,21 +1386,21 @@ ACE_Scheduling_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class SVC_HANDLER> int
-ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::suspend (void)
+ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::suspend ()
 {
   ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::suspend");
   return this->reactor_->suspend_handlers ();
 }
 
 template <class SVC_HANDLER> int
-ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::resume (void)
+ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::resume ()
 {
   ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::resume");
   return this->reactor_->resume_handlers ();
 }
 
 template <class SVC_HANDLER> void
-ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump");
@@ -1410,21 +1410,21 @@ ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class SVC_HANDLER> int
-ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::suspend (void)
+ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::suspend ()
 {
   ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::suspend");
   return this->thr_mgr_->suspend_all ();
 }
 
 template <class SVC_HANDLER> int
-ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::resume (void)
+ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::resume ()
 {
   ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::resume");
   return this->thr_mgr_->resume_all ();
 }
 
 template <class SVC_HANDLER> void
-ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump");
@@ -1434,12 +1434,12 @@ ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class T>
-ACE_Refcounted_Hash_Recyclable<T>::~ACE_Refcounted_Hash_Recyclable (void)
+ACE_Refcounted_Hash_Recyclable<T>::~ACE_Refcounted_Hash_Recyclable ()
 {
 }
 
 template <class SVC_HANDLER> void
-ACE_Singleton_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Singleton_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::dump");
@@ -1447,7 +1447,7 @@ ACE_Singleton_Strategy<SVC_HANDLER>::dump (void) const
 }
 
 template <class SVC_HANDLER>
-ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy (void)
+ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy ()
 {
   ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy");
 }
@@ -1467,7 +1467,7 @@ ACE_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
 }
 
 template <class SVC_HANDLER> void
-ACE_Creation_Strategy<SVC_HANDLER>::dump (void) const
+ACE_Creation_Strategy<SVC_HANDLER>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::dump");
diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h
index c505b413799..9e46fd5f228 100644
--- a/ACE/ace/Strategies_T.h
+++ b/ACE/ace/Strategies_T.h
@@ -47,14 +47,13 @@ template<class SVC_HANDLER>
 class ACE_Recycling_Strategy
 {
 public:
-
   // Useful STL-style traits.
   typedef typename SVC_HANDLER::addr_type    addr_type;
   typedef SVC_HANDLER                        handler_type;
   typedef typename SVC_HANDLER::stream_type  stream_type;
 
   /// Virtual Destructor
-  virtual ~ACE_Recycling_Strategy (void);
+  virtual ~ACE_Recycling_Strategy ();
 
   /// Tell the Svc_Handler something about the recycler, so that it can
   /// reach the recycler when necessary.
@@ -96,7 +95,7 @@ public:
   int open (ACE_Thread_Manager * = 0,
             ACE_Reactor * = ACE_Reactor::instance ());
 
-  virtual ~ACE_Creation_Strategy (void);
+  virtual ~ACE_Creation_Strategy ();
 
   // = Factory method.
   /**
@@ -108,7 +107,7 @@ public:
   virtual int make_svc_handler (SVC_HANDLER *&sh);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -143,7 +142,7 @@ public:
                           ACE_Thread_Manager * = 0);
   int open (SVC_HANDLER *,
             ACE_Thread_Manager * = 0);
-  virtual ~ACE_Singleton_Strategy (void);
+  virtual ~ACE_Singleton_Strategy ();
 
   // = Factory method.
   /// Create a Singleton SVC_HANDLER by always returning the same
@@ -151,7 +150,7 @@ public:
   virtual int make_svc_handler (SVC_HANDLER *&);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -181,7 +180,7 @@ public:
   // = Intialization and termination methods.
 
   /// "Do-nothing" constructor.
-  ACE_DLL_Strategy (void);
+  ACE_DLL_Strategy ();
 
   /// Initialize the DLL strategy based upon the service's DLL
   /// information contained in the <svc_dll_info> string.
@@ -205,7 +204,7 @@ public:
   virtual int make_svc_handler (SVC_HANDLER *&);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -263,10 +262,10 @@ public:
   virtual int activate_svc_handler (SVC_HANDLER *svc_handler,
                                     void *arg = 0);
 
-  virtual ~ACE_Concurrency_Strategy (void);
+  virtual ~ACE_Concurrency_Strategy ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -311,7 +310,7 @@ public:
                     int flags = 0);
 
   /// Destructor.
-  virtual ~ACE_Reactive_Strategy (void);
+  virtual ~ACE_Reactive_Strategy ();
 
   // = Factory method.
   /// Activate the @a svc_handler by registering it with the <Reactor>
@@ -320,7 +319,7 @@ public:
                                     void *arg = 0);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -372,7 +371,7 @@ public:
                     int n_threads = 1,
                     int flags = 0);
 
-  virtual ~ACE_Thread_Strategy (void);
+  virtual ~ACE_Thread_Strategy ();
 
   // = Factory method.
   /**
@@ -385,7 +384,7 @@ public:
                                     void *arg = 0);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -439,7 +438,7 @@ public:
                     ACE_Reactor * = 0,
                     int avoid_zombies = 0);
 
-  virtual ~ACE_Process_Strategy (void);
+  virtual ~ACE_Process_Strategy ();
 
   // = Factory method.
   /**
@@ -452,7 +451,7 @@ public:
                                     void *arg = 0);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -511,12 +510,12 @@ public:
                     bool reuse_addr = false);
 
   /// Return the underlying ACE_HANDLE of the <peer_acceptor_>.
-  virtual ACE_HANDLE get_handle (void) const;
+  virtual ACE_HANDLE get_handle () const;
 
   /// Return a reference to the <peer_acceptor_>.
-  virtual ACE_PEER_ACCEPTOR &acceptor (void) const;
+  virtual ACE_PEER_ACCEPTOR &acceptor () const;
 
-  virtual ~ACE_Accept_Strategy (void);
+  virtual ~ACE_Accept_Strategy ();
 
   // = Factory method.
   /// The default behavior delegates to the <accept> method of the
@@ -524,7 +523,7 @@ public:
   virtual int accept_svc_handler (SVC_HANDLER *);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -563,12 +562,12 @@ public:
   typedef typename SVC_HANDLER::stream_type  stream_type;
 
   /// Default constructor.
-  ACE_Connect_Strategy (void);
+  ACE_Connect_Strategy ();
 
   /// Return a reference to the <peer_connector_>.
-  virtual ACE_PEER_CONNECTOR &connector (void) const;
+  virtual ACE_PEER_CONNECTOR &connector () const;
 
-  virtual ~ACE_Connect_Strategy (void);
+  virtual ~ACE_Connect_Strategy ();
 
   // = Factory method.
   /// The default behavior delegates to the <connect> method of the
@@ -596,7 +595,7 @@ public:
                                    int perms);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -629,18 +628,18 @@ public:
   ACE_Scheduling_Strategy (SVC_HANDLER * = 0);
 
   /// Destructor
-  virtual ~ACE_Scheduling_Strategy (void);
+  virtual ~ACE_Scheduling_Strategy ();
 
   // = Scheduling methods
 
   /// Suspend hook.
-  virtual int suspend (void);
+  virtual int suspend ();
 
   /// Resume hook.
-  virtual int resume (void);
+  virtual int resume ();
 
   /// Dump the state of the object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 };
 
 /**
@@ -666,13 +665,13 @@ public:
   // = Scheduling methods
 
   /// Suspend hook.
-  virtual int suspend (void);
+  virtual int suspend ();
 
   /// Resume hook.
-  virtual int resume (void);
+  virtual int resume ();
 
   /// Dump the state of the object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
 protected:
 
@@ -703,13 +702,13 @@ public:
   // = Scheduling methods
 
   /// Suspend hook.
-  virtual int suspend (void);
+  virtual int suspend ();
 
   /// Resume hook.
-  virtual int resume (void);
+  virtual int resume ();
 
   /// Dump the state of the object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
 protected:
 
@@ -773,7 +772,7 @@ class ACE_Refcounted_Hash_Recyclable :  public ACE_Refcountable_T<ACE_Null_Mutex
 {
 public:
   /// Default constructor.
-  ACE_Refcounted_Hash_Recyclable (void);
+  ACE_Refcounted_Hash_Recyclable ();
 
   /// Constructor.
   ACE_Refcounted_Hash_Recyclable (const T &t,
@@ -781,7 +780,7 @@ public:
                                   ACE_Recyclable_State state = ACE_RECYCLABLE_UNKNOWN);
 
   /// Destructor
-  virtual ~ACE_Refcounted_Hash_Recyclable (void);
+  virtual ~ACE_Refcounted_Hash_Recyclable ();
 
   /// Compares two instances.
   bool operator== (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const;
@@ -791,7 +790,7 @@ public:
 
 protected:
   /// Computes and returns hash value.
-  u_long hash_i (void) const;
+  u_long hash_i () const;
 
   T t_;
 };
@@ -846,7 +845,7 @@ public:
                                bool delete_lock = false);
 
   /// Destructor
-  virtual ~ACE_Cached_Connect_Strategy (void);
+  virtual ~ACE_Cached_Connect_Strategy ();
 
   /// This methods allow you to change the strategies used by the
   /// cached connector.
@@ -936,9 +935,9 @@ public:
   typedef ACE_Reverse_Lock<MUTEX> REVERSE_MUTEX;
 
   // = Strategy accessors
-  virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const;
-  virtual ACE_Recycling_Strategy<SVC_HANDLER> *recycling_strategy (void) const;
-  virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy (void) const;
+  virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy () const;
+  virtual ACE_Recycling_Strategy<SVC_HANDLER> *recycling_strategy () const;
+  virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy () const;
 
 protected:
 
diff --git a/ACE/ace/Strategies_T.inl b/ACE/ace/Strategies_T.inl
index ef16da28447..8e249962d61 100644
--- a/ACE/ace/Strategies_T.inl
+++ b/ACE/ace/Strategies_T.inl
@@ -54,7 +54,7 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const ACE_TCHAR dll_name[],
 }
 
 template <class SVC_HANDLER> ACE_INLINE
-ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (void)
+ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy ()
 {
   ACE_TRACE ("ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy");
 }
@@ -125,7 +125,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy (ACE_
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_INLINE
-ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy (void)
+ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy ()
 {
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy");
 }
@@ -179,7 +179,7 @@ ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::ACE_Schedule_All_Threaded_Strat
 }
 
 template <class T> ACE_INLINE
-ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void)
+ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable ()
   : ACE_Refcountable_T<ACE_Null_Mutex> (0),
     ACE_Hashable (),
     ACE_Recyclable (ACE_RECYCLABLE_UNKNOWN),
@@ -199,13 +199,13 @@ ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (const T &t,
 }
 
 template <class T> ACE_INLINE u_long
-ACE_Refcounted_Hash_Recyclable<T>::hash_i (void) const
+ACE_Refcounted_Hash_Recyclable<T>::hash_i () const
 {
   return this->t_.hash ();
 }
 
 template <class T> ACE_INLINE T &
-ACE_Refcounted_Hash_Recyclable<T>::subject (void)
+ACE_Refcounted_Hash_Recyclable<T>::subject ()
 {
   return this->t_;
 }
diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h
index 181d35139c5..5e994704d26 100644
--- a/ACE/ace/Stream.h
+++ b/ACE/ace/Stream.h
@@ -84,7 +84,7 @@ public:
   virtual int close (int flags = M_DELETE);
 
   /// Close down the stream and release all the resources.
-  virtual ~ACE_Stream (void);
+  virtual ~ACE_Stream ();
 
   // = ACE_Stream plumbing operations
 
@@ -117,10 +117,10 @@ public:
                       int flags = M_DELETE);
 
   /// Return current stream head.
-  virtual ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *head (void);
+  virtual ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *head ();
 
   /// Return current stream tail.
-  virtual ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *tail (void);
+  virtual ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *tail ();
 
   /// Find a particular ACE_Module.
   virtual ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *find (const ACE_TCHAR *mod);
@@ -129,7 +129,7 @@ public:
   virtual int link (ACE_Stream<ACE_SYNCH_USE, TIME_POLICY> &);
 
   /// Remove a pipe formed between two Streams.
-  virtual int unlink (void);
+  virtual int unlink ();
 
   // = Blocking data transfer operations
   /**
@@ -157,7 +157,7 @@ public:
   virtual int wait (void);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Stream_Modules.cpp b/ACE/ace/Stream_Modules.cpp
index 4533d1b371b..2114de2f85f 100644
--- a/ACE/ace/Stream_Modules.cpp
+++ b/ACE/ace/Stream_Modules.cpp
@@ -14,19 +14,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Stream_Head)
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Head (void)
+ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Head ()
 {
   ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Head");
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Head (void)
+ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Head ()
 {
   ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Head");
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::dump");
@@ -50,7 +50,7 @@ ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::close (u_long)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::svc (void)
+ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::svc ()
 {
   ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::svc");
   return -1;
@@ -145,7 +145,7 @@ ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::info (ACE_TCHAR **strp, size_t leng
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::fini (void)
+ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::fini ()
 {
   ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::fini");
   return 0;
@@ -154,19 +154,19 @@ ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::fini (void)
 ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Stream_Tail)
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Tail (void)
+ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Tail ()
 {
   ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Tail");
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Tail (void)
+ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Tail ()
 {
   ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Tail");
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::dump");
@@ -188,7 +188,7 @@ ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::close (u_long)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::svc (void)
+ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::svc ()
 {
   ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::svc");
   return -1;
@@ -289,7 +289,7 @@ ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::info (ACE_TCHAR **strp, size_t leng
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::fini (void)
+ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::fini ()
 {
   ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::fini");
   return 0;
@@ -298,19 +298,19 @@ ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::fini (void)
 ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Thru_Task)
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::ACE_Thru_Task (void)
+ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::ACE_Thru_Task ()
 {
   ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::ACE_Thru_Task");
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Thru_Task (void)
+ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Thru_Task ()
 {
   ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Thru_Task");
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::dump");
@@ -332,7 +332,7 @@ ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::close (u_long)
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::svc (void)
+ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::svc ()
 {
   ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::svc");
   return -1;
@@ -368,7 +368,7 @@ ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::info (ACE_TCHAR **strp,
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
-ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::fini (void)
+ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::fini ()
 {
   ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::fini");
   return 0;
diff --git a/ACE/ace/Stream_Modules.h b/ACE/ace/Stream_Modules.h
index 1760e3b89e7..e3b12d8e06c 100644
--- a/ACE/ace/Stream_Modules.h
+++ b/ACE/ace/Stream_Modules.h
@@ -50,24 +50,24 @@ class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_USE, TIME_POLICY>
 {
 public:
   /// Construction
-  ACE_Stream_Head (void);
+  ACE_Stream_Head ();
 
   /// Destruction
-  virtual ~ACE_Stream_Head (void);
+  virtual ~ACE_Stream_Head ();
 
   // = ACE_Task hooks
   virtual int open (void *a = 0);
   virtual int close (u_long flags = 0);
   virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0);
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Dynamic linking hooks
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **info_string, size_t length) const;
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -88,24 +88,24 @@ class ACE_Stream_Tail : public ACE_Task<ACE_SYNCH_USE, TIME_POLICY>
 {
 public:
   /// Construction
-  ACE_Stream_Tail (void);
+  ACE_Stream_Tail ();
 
   /// Destruction
-  virtual ~ACE_Stream_Tail (void);
+  virtual ~ACE_Stream_Tail ();
 
   // = ACE_Task hooks
   virtual int open (void *a = 0);
   virtual int close (u_long flags = 0);
   virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0);
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Dynamic linking hooks
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **info_string, size_t length) const;
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -127,24 +127,24 @@ class ACE_Thru_Task : public ACE_Task<ACE_SYNCH_USE, TIME_POLICY>
 {
 public:
   /// Construction
-  ACE_Thru_Task (void);
+  ACE_Thru_Task ();
 
   /// Destruction
-  virtual ~ACE_Thru_Task (void);
+  virtual ~ACE_Thru_Task ();
 
   // = ACE_Task hooks
   virtual int open (void *a = 0);
   virtual int close (u_long flags = 0);
   virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0);
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Dynamic linking hooks
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **info_string, size_t length) const;
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp
index b12d8c4caaa..c98e0b760ab 100644
--- a/ACE/ace/String_Base.cpp
+++ b/ACE/ace/String_Base.cpp
@@ -113,7 +113,7 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (
 }
 
 template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::~ACE_String_Base (void)
+ACE_String_Base<ACE_CHAR_T>::~ACE_String_Base ()
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::~ACE_String_Base");
 
@@ -250,7 +250,7 @@ ACE_String_Base<ACE_CHAR_T>::append (const ACE_CHAR_T* s,
 }
 
 template <class ACE_CHAR_T> u_long
-ACE_String_Base<ACE_CHAR_T>::hash (void) const
+ACE_String_Base<ACE_CHAR_T>::hash () const
 {
   return
     ACE::hash_pjw (reinterpret_cast<char *> (
@@ -345,7 +345,7 @@ ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s, bool release)
 }
 
 template <class ACE_CHAR_T> void
-ACE_String_Base<ACE_CHAR_T>::fast_clear (void)
+ACE_String_Base<ACE_CHAR_T>::fast_clear ()
 {
   this->len_ = 0;
   if (this->release_)
@@ -365,7 +365,7 @@ ACE_String_Base<ACE_CHAR_T>::fast_clear (void)
 // Get a copy of the underlying representation.
 
 template <class ACE_CHAR_T> ACE_CHAR_T *
-ACE_String_Base<ACE_CHAR_T>::rep (void) const
+ACE_String_Base<ACE_CHAR_T>::rep () const
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::rep");
 
@@ -495,7 +495,7 @@ int ACE_String_Base_Iterator <ACE_CHAR_T>::next (ACE_CHAR_T * & ch) const
 }
 
 template <class ACE_CHAR_T>
-int ACE_String_Base_Iterator <ACE_CHAR_T>::advance (void)
+int ACE_String_Base_Iterator <ACE_CHAR_T>::advance ()
 {
   ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::advance");
 
@@ -545,7 +545,7 @@ int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::next (const ACE_CHAR_T * & ch)
 }
 
 template <class ACE_CHAR_T>
-int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::advance (void)
+int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::advance ()
 {
   ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::advance");
 
diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h
index 8005c34b768..b1915c8f2c0 100644
--- a/ACE/ace/String_Base.h
+++ b/ACE/ace/String_Base.h
@@ -164,7 +164,7 @@ public:
   /**
    *  Deletes the memory...
    */
-  ~ACE_String_Base (void);
+  ~ACE_String_Base ();
 
   /**
    * Return the <slot'th> character in the string (doesn't perform
@@ -278,7 +278,7 @@ public:
    *   and the next append() or +=() will cause a new buffer to be
    *   allocated internally.
    */
-  void fast_clear (void);
+  void fast_clear ();
 
   /**
    * Return a substring given an offset and length.
@@ -344,14 +344,14 @@ public:
    *
    *  @return Hash value of string
    */
-  u_long hash (void) const;
+  u_long hash () const;
 
   /**
    *  Return the length of the string.
    *
    *  @return Length of stored string
    */
-  size_type length (void) const;
+  size_type length () const;
 
   /**
    *  Return the number of allocated CHARs in the string object.
@@ -360,19 +360,19 @@ public:
    *  @return Maximum number of ACE_CHAR_T units that can be stored, including
    *          any terminating nul that may be needed.
    */
-  size_t capacity (void) const;
+  size_t capacity () const;
 
   /**
    * Return @c true if the length of the string is zero, else @c false.
    */
-  bool is_empty (void) const;
+  bool is_empty () const;
 
   /**
    * Return @c true if the length of the string is zero, else @c
    * false.  We recommend using @c is_empty() instead since it's more
    * consistent with the ACE container naming conventions.
    */
-  bool empty (void) const;
+  bool empty () const;
 
   /**
    * Get a copy of the underlying representation.
@@ -384,7 +384,7 @@ public:
    * @return Pointer reference to the string data. Returned string is
    *    zero terminated.
    */
-  ACE_CHAR_T *rep (void) const;
+  ACE_CHAR_T *rep () const;
 
   /**
    * Get at the underlying representation directly!
@@ -395,12 +395,12 @@ public:
    *    that the string is zero terminated.
    *
    */
-  const ACE_CHAR_T *fast_rep (void) const;
+  const ACE_CHAR_T *fast_rep () const;
 
   /**
    *  Same as STL String's c_str() and fast_rep().
    */
-  const ACE_CHAR_T *c_str (void) const;
+  const ACE_CHAR_T *c_str () const;
 
   /**
    *  Comparison operator that will match substrings.  Returns the
@@ -516,7 +516,7 @@ public:
   /**
    *  Dump the state of an object.
    */
-  void dump (void) const;
+  void dump () const;
 
   /**
    * This method is designed for high-performance. Please use with
@@ -546,11 +546,11 @@ public:
    */
   void swap (ACE_String_Base<ACE_CHAR_T> & str);
 
-  iterator begin (void);
-  const_iterator begin (void) const;
+  iterator begin ();
+  const_iterator begin () const;
 
-  iterator end (void);
-  const_iterator end (void) const;
+  iterator end ();
+  const_iterator end () const;
 
   /**
    *  Declare the dynamic allocation hooks.
@@ -627,7 +627,7 @@ public:
   ACE_String_Base_Iterator (const ACE_String_Base_Iterator <ACE_CHAR_T> & iter);
 
   /// Destructor.
-  ~ACE_String_Base_Iterator (void);
+  ~ACE_String_Base_Iterator ();
 
   /**
    * Test if the iterator has seen all characters.
@@ -635,7 +635,7 @@ public:
    * @retval          0         Characters still remain.
    * @retval          1         All characters have been seen.
    */
-  int done (void) const;
+  int done () const;
 
   /**
    * Get the current character.
@@ -652,7 +652,7 @@ public:
    * @retval         0          All characters have been seen.
    * @retval         1          Items still remain to be seen.
    */
-  int advance (void);
+  int advance ();
 
   /**
    * Assignment operator
@@ -667,12 +667,12 @@ public:
    *
    * @return          Reference to current character seen by iterator.
    */
-  ACE_CHAR_T & operator * (void);
+  ACE_CHAR_T & operator * ();
 
   /**
    * Prefix operator
    */
-  ACE_String_Base_Iterator <ACE_CHAR_T> & operator ++ (void);
+  ACE_String_Base_Iterator <ACE_CHAR_T> & operator ++ ();
 
   /**
    * Postfix operator
@@ -682,7 +682,7 @@ public:
   /**
    * Prefix operator
    */
-  ACE_String_Base_Iterator <ACE_CHAR_T> & operator -- (void);
+  ACE_String_Base_Iterator <ACE_CHAR_T> & operator -- ();
 
   /**
    * Postfix operator
@@ -754,7 +754,7 @@ public:
   ACE_String_Base_Const_Iterator (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & iter);
 
   /// Destructor.
-  ~ACE_String_Base_Const_Iterator (void);
+  ~ACE_String_Base_Const_Iterator ();
 
   /**
    * Test if the iterator has seen all characters.
@@ -762,7 +762,7 @@ public:
    * @retval          0         Characters still remain.
    * @retval          1         All characters have been seen.
    */
-  int done (void) const;
+  int done () const;
 
   /**
    * Get the current character.
@@ -779,7 +779,7 @@ public:
    * @retval         0          All characters have been seen.
    * @retval         1          Items still remain to be seen.
    */
-  int advance (void);
+  int advance ();
 
   /**
    * Assignment operator
@@ -794,12 +794,12 @@ public:
    *
    * @return          Reference to current character seen by iterator.
    */
-  const ACE_CHAR_T & operator * (void);
+  const ACE_CHAR_T & operator * ();
 
   /**
    * Prefix operator
    */
-  ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator ++ (void);
+  ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator ++ ();
 
   /**
    * Postfix operator
@@ -809,7 +809,7 @@ public:
   /**
    * Prefix operator
    */
-  ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator -- (void);
+  ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator -- ();
 
   /**
    * Postfix operator
diff --git a/ACE/ace/String_Base.inl b/ACE/ace/String_Base.inl
index 9e397d2d186..1ce4132a1e5 100644
--- a/ACE/ace/String_Base.inl
+++ b/ACE/ace/String_Base.inl
@@ -7,7 +7,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_CHAR_T> ACE_INLINE void
-ACE_String_Base<ACE_CHAR_T>::dump (void) const
+ACE_String_Base<ACE_CHAR_T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::dump");
@@ -24,27 +24,27 @@ ACE_String_Base<ACE_CHAR_T>::assign_nocopy (const ACE_String_Base<ACE_CHAR_T> &s
 }
 
 template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::size_type
-ACE_String_Base<ACE_CHAR_T>::length (void) const
+ACE_String_Base<ACE_CHAR_T>::length () const
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::length");
   return this->len_;
 }
 
 template <class ACE_CHAR_T> ACE_INLINE size_t
-ACE_String_Base<ACE_CHAR_T>::capacity (void) const
+ACE_String_Base<ACE_CHAR_T>::capacity () const
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::capacity");
   return this->buf_len_;
 }
 
 template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base<ACE_CHAR_T>::is_empty (void) const
+ACE_String_Base<ACE_CHAR_T>::is_empty () const
 {
   return this->len_ == 0;
 }
 
 template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base<ACE_CHAR_T>::empty (void) const
+ACE_String_Base<ACE_CHAR_T>::empty () const
 {
   return this->is_empty ();
 }
@@ -79,13 +79,13 @@ ACE_String_Base<ACE_CHAR_T>::operator[] (
 }
 
 template <class ACE_CHAR_T> ACE_INLINE const ACE_CHAR_T *
-ACE_String_Base<ACE_CHAR_T>::fast_rep (void) const
+ACE_String_Base<ACE_CHAR_T>::fast_rep () const
 {
   return this->rep_;
 }
 
 template <class ACE_CHAR_T> ACE_INLINE const ACE_CHAR_T *
-ACE_String_Base<ACE_CHAR_T>::c_str (void) const
+ACE_String_Base<ACE_CHAR_T>::c_str () const
 {
   return this->rep_;
 }
@@ -140,28 +140,28 @@ ACE_String_Base<ACE_CHAR_T>::strstr (const ACE_String_Base<ACE_CHAR_T> &s) const
 }
 
 template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::iterator
-ACE_String_Base<ACE_CHAR_T>::begin (void)
+ACE_String_Base<ACE_CHAR_T>::begin ()
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::begin");
   return iterator (*this);
 }
 
 template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::const_iterator
-ACE_String_Base<ACE_CHAR_T>::begin (void) const
+ACE_String_Base<ACE_CHAR_T>::begin () const
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::begin");
   return const_iterator (*this);
 }
 
 template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::iterator
-ACE_String_Base<ACE_CHAR_T>::end (void)
+ACE_String_Base<ACE_CHAR_T>::end ()
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::end");
   return iterator (*this, 1);
 }
 
 template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::const_iterator
-ACE_String_Base<ACE_CHAR_T>::end (void) const
+ACE_String_Base<ACE_CHAR_T>::end () const
 {
   ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::end");
   return const_iterator (*this, 1);
@@ -188,13 +188,13 @@ ACE_String_Base_Iterator (const ACE_String_Base_Iterator <ACE_CHAR_T> & iter)
 }
 
 template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Iterator <ACE_CHAR_T>::~ACE_String_Base_Iterator (void)
+ACE_String_Base_Iterator <ACE_CHAR_T>::~ACE_String_Base_Iterator ()
 {
   ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::~ACE_String_Base_Iterator");
 }
 
 template <class ACE_CHAR_T> ACE_INLINE
-int ACE_String_Base_Iterator <ACE_CHAR_T>::done (void) const
+int ACE_String_Base_Iterator <ACE_CHAR_T>::done () const
 {
   ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::done");
 
@@ -202,7 +202,7 @@ int ACE_String_Base_Iterator <ACE_CHAR_T>::done (void) const
 }
 
 template <class ACE_CHAR_T> ACE_INLINE
-ACE_CHAR_T & ACE_String_Base_Iterator <ACE_CHAR_T>::operator * (void)
+ACE_CHAR_T & ACE_String_Base_Iterator <ACE_CHAR_T>::operator * ()
 {
   ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator *");
 
@@ -211,7 +211,7 @@ ACE_CHAR_T & ACE_String_Base_Iterator <ACE_CHAR_T>::operator * (void)
 
 template <class ACE_CHAR_T> ACE_INLINE
 ACE_String_Base_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ (void)
+ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ ()
 {
   ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator ++");
 
@@ -237,7 +237,7 @@ ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ (int)
 
 template <class ACE_CHAR_T> ACE_INLINE
 ACE_String_Base_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Iterator <ACE_CHAR_T>::operator -- (void)
+ACE_String_Base_Iterator <ACE_CHAR_T>::operator -- ()
 {
   ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator --");
 
@@ -324,13 +324,13 @@ ACE_String_Base_Const_Iterator (const ACE_String_Base_Const_Iterator <ACE_CHAR_T
 }
 
 template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::~ACE_String_Base_Const_Iterator (void)
+ACE_String_Base_Const_Iterator <ACE_CHAR_T>::~ACE_String_Base_Const_Iterator ()
 {
   ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::~ACE_String_Base_Const_Iterator");
 }
 
 template <class ACE_CHAR_T> ACE_INLINE
-int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::done (void) const
+int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::done () const
 {
   ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::done");
 
@@ -338,7 +338,7 @@ int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::done (void) const
 }
 
 template <class ACE_CHAR_T> ACE_INLINE
-const ACE_CHAR_T & ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator * (void)
+const ACE_CHAR_T & ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator * ()
 {
   ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator *");
 
@@ -347,7 +347,7 @@ const ACE_CHAR_T & ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator * (void
 
 template <class ACE_CHAR_T> ACE_INLINE
 ACE_String_Base_Const_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ (void)
+ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ ()
 {
   ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator ++");
 
@@ -373,7 +373,7 @@ ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ (int)
 
 template <class ACE_CHAR_T> ACE_INLINE
 ACE_String_Base_Const_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator -- (void)
+ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator -- ()
 {
   ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator --");
 
diff --git a/ACE/ace/Svc_Conf_Lexer.cpp b/ACE/ace/Svc_Conf_Lexer.cpp
index 08d2f65d76b..321897c584e 100644
--- a/ACE/ace/Svc_Conf_Lexer.cpp
+++ b/ACE/ace/Svc_Conf_Lexer.cpp
@@ -48,7 +48,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 #define ACE_NO_STATE -1
 #define ACE_COMMENT 0
 
-#if defined (_MSC_VER) && (_MSC_VER >= 1400)
+#if defined (_MSC_VER)
 // Visual Studio .NET 2005 (VC8) issues warning C4351 for input_ in the
 // constructor initializer list below. Since we like the warned-of new
 // behavior (input_ elements will be default-initialized), squash the
@@ -59,7 +59,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 struct ace_yy_buffer_state
 {
-  ace_yy_buffer_state (void)
+  ace_yy_buffer_state ()
    : input_ (),
      index_ (0),
      size_ (0),
@@ -73,11 +73,11 @@ struct ace_yy_buffer_state
 #endif /* ACE_USES_WCHAR */
   {
   }
-#if defined (_MSC_VER) && (_MSC_VER >= 1400)
+#if defined (_MSC_VER)
 #  pragma warning (pop)
 #endif /* VC8 */
 
-  ~ace_yy_buffer_state (void)
+  ~ace_yy_buffer_state ()
   {
 #if defined (ACE_USES_WCHAR)
     delete converter_;
diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp
index 333682808d5..5e1265369d6 100644
--- a/ACE/ace/Svc_Conf_y.cpp
+++ b/ACE/ace/Svc_Conf_y.cpp
@@ -189,14 +189,14 @@ typedef int YYSTYPE;
 #ifdef YYTYPE_UINT8
 typedef YYTYPE_UINT8 ace_yytype_uint8;
 #else
-typedef unsigned char ace_yytype_uint8;
+using ace_yytype_uint8 = unsigned char;
 #endif
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 ace_yytype_int8;
 #elif (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
-typedef signed char ace_yytype_int8;
+using ace_yytype_int8 = signed char;
 #else
 typedef short int ace_yytype_int8;
 #endif
@@ -204,13 +204,13 @@ typedef short int ace_yytype_int8;
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 ace_yytype_uint16;
 #else
-typedef unsigned short int ace_yytype_uint16;
+using ace_yytype_uint16 = unsigned short;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 ace_yytype_int16;
 #else
-typedef short int ace_yytype_int16;
+using ace_yytype_int16 = short;
 #endif
 
 #ifndef YYSIZE_T
diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp
index 1774e0188da..c5779be5420 100644
--- a/ACE/ace/Svc_Handler.cpp
+++ b/ACE/ace/Svc_Handler.cpp
@@ -98,7 +98,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *p,
 #endif /* ACE_HAS_NEW_NOTHROW */
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> void
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy (void)
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy ()
 {
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy");
 
@@ -191,7 +191,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::open (void *)
 // Perform termination activities.
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> void
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown (void)
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown ()
 {
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown");
 
@@ -228,7 +228,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::cleanup_hint (void **act_holder)
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> void
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump");
@@ -250,7 +250,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> PEER_STREAM &
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer (void) const
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer () const
 {
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer");
   return (PEER_STREAM &) this->peer_;
@@ -259,7 +259,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer (void) const
 // Extract the underlying I/O descriptor.
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_HANDLE
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle (void) const
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle () const
 {
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle");
   return this->peer_.get_handle ();
@@ -275,7 +275,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::set_handle (ACE_HANDLE h)
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS>
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler (void)
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler ()
 {
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler");
 
@@ -329,7 +329,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::init (int /* argc */,
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> int
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini (void)
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini ()
 {
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini");
   return -1;
@@ -362,7 +362,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state (ACE_Recyclable_State
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_Recyclable_State
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state (void) const
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state () const
 {
   if (this->recycler ())
     return this->recycler ()->recycle_state (this->recycling_act_);
@@ -380,14 +380,14 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler (ACE_Connection_Recycling_S
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_Connection_Recycling_Strategy *
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler (void) const
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler () const
 {
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler");
   return this->recycler_;
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> const void *
-ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act (void) const
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act () const
 {
   ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act");
   return this->recycling_act_;
@@ -402,7 +402,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle (void *)
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS>
-ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Buffered_Svc_Handler (void)
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Buffered_Svc_Handler ()
 {
   this->flush ();
 }
@@ -455,7 +455,7 @@ ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::put (ACE_Message_Block *mb,
 // Flush the buffer.
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> int
-ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush (void)
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush ()
 {
   ACE_GUARD_RETURN (typename SYNCH_TRAITS::MUTEX, m, this->msg_queue ()->lock (), -1);
 
@@ -463,7 +463,7 @@ ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush (void)
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> int
-ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush_i (void)
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush_i ()
 {
   ACE_Message_Queue_Iterator<SYNCH_TRAITS> iterator (*this->msg_queue ());
   ACE_Message_Block *mblk = 0;
@@ -488,7 +488,7 @@ ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush_i (void)
 }
 
 template <typename PEER_STREAM, typename SYNCH_TRAITS> void
-ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump");
diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h
index 15ef09f795c..e1cfef9a878 100644
--- a/ACE/ace/Svc_Handler.h
+++ b/ACE/ace/Svc_Handler.h
@@ -83,7 +83,7 @@ public:
                    ACE_Reactor *reactor = ACE_Reactor::instance ());
 
   /// Destructor.
-  virtual ~ACE_Svc_Handler (void);
+  virtual ~ACE_Svc_Handler ();
 
   /// Activate the client handler.  This is typically called by the
   /// ACE_Acceptor or ACE_Connector, which passes "this" in as the
@@ -115,7 +115,7 @@ public:
    * will have no effect (and the accessor will return
    * ACE_RECYCLABLE_UNKNOWN).
    */
-  virtual ACE_Recyclable_State recycle_state (void) const;
+  virtual ACE_Recyclable_State recycle_state () const;
   virtual int recycle_state (ACE_Recyclable_State new_state);
 
   /**
@@ -132,7 +132,7 @@ public:
 
   /// Default version does no work and returns -1.  Must be overloaded
   /// by application developer to do anything meaningful.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Default version does no work and returns -1.  Must be overloaded
   /// by application developer to do anything meaningful.
@@ -155,14 +155,14 @@ public:
                               const void *);
 
   /// Get the underlying handle associated with the <peer_>.
-  virtual ACE_HANDLE get_handle (void) const;
+  virtual ACE_HANDLE get_handle () const;
 
   /// Set the underlying handle associated with the <peer_>.
   virtual void set_handle (ACE_HANDLE);
 
   /// Returns the underlying PEER_STREAM.  Used by
   /// <ACE_Acceptor::accept> and <ACE_Connector::connect> factories.
-  PEER_STREAM &peer (void) const;
+  PEER_STREAM &peer () const;
 
   /// Overloaded new operator.  This method unobtrusively records if a
   /// <Svc_Handler> is allocated dynamically, which allows it to clean
@@ -191,7 +191,7 @@ public:
    * whether or not the object was allocated dynamically, and can act
    * accordingly (i.e., deleting it if it was allocated dynamically).
    */
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /**
    * This really should be private so that users are forced to call
@@ -212,10 +212,10 @@ public:
 #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 
   /// Close down the descriptor and unregister from the Reactor
-  void shutdown (void);
+  void shutdown ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 public:
 
@@ -232,10 +232,10 @@ public:
                          const void *recycling_act);
 
   /// Get the recycler.
-  virtual ACE_Connection_Recycling_Strategy *recycler (void) const;
+  virtual ACE_Connection_Recycling_Strategy *recycler () const;
 
   /// Get the recycling act.
-  virtual const void *recycling_act (void) const;
+  virtual const void *recycling_act () const;
 
   /**
    * Upcall made by the recycler when it is about to recycle the
@@ -295,7 +295,7 @@ public:
                             ACE_Time_Value *relative_timeout = 0);
 
   /// Destructor, which calls <flush>.
-  virtual ~ACE_Buffered_Svc_Handler (void);
+  virtual ~ACE_Buffered_Svc_Handler ();
 
   /**
    * Insert the ACE_Message_Block chain rooted at @a message_block
@@ -309,7 +309,7 @@ public:
 
   /// Flush the ACE_Message_Queue, which writes all the queued
   /// ACE_Message_Blocks to the <PEER_STREAM>.
-  virtual int flush (void);
+  virtual int flush ();
 
   /// This method is not currently implemented -- this is where the
   /// integration with the <Reactor> would occur.
@@ -317,13 +317,13 @@ public:
                               const void *);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// Implement the flush operation on the ACE_Message_Queue, which
   /// writes all the queued ACE_Message_Blocks to the <PEER_STREAM>.
   /// Assumes that the caller holds the lock.
-  virtual int flush_i (void);
+  virtual int flush_i ();
 
   /// Maximum size the <Message_Queue> can be before we have to flush
   /// the buffer.
diff --git a/ACE/ace/Synch_Options.cpp b/ACE/ace/Synch_Options.cpp
index 91f5cd1f874..a407a4583b1 100644
--- a/ACE/ace/Synch_Options.cpp
+++ b/ACE/ace/Synch_Options.cpp
@@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE (ACE_Synch_Options)
 
 void
-ACE_Synch_Options::dump (void) const
+ACE_Synch_Options::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Synch_Options::dump");
@@ -74,7 +74,7 @@ ACE_Synch_Options::operator= (unsigned long option)
 }
 
 const ACE_Time_Value &
-ACE_Synch_Options::timeout (void) const
+ACE_Synch_Options::timeout () const
 {
   ACE_TRACE ("ACE_Synch_Options::timeout");
   return this->timeout_;
@@ -88,14 +88,14 @@ ACE_Synch_Options::timeout (const ACE_Time_Value &tv)
 }
 
 const ACE_Time_Value *
-ACE_Synch_Options::time_value (void) const
+ACE_Synch_Options::time_value () const
 {
   ACE_TRACE ("ACE_Synch_Options::time_value");
   return (*this)[USE_TIMEOUT] ? &this->timeout_ : 0;
 }
 
 const void *
-ACE_Synch_Options::arg (void) const
+ACE_Synch_Options::arg () const
 {
   ACE_TRACE ("ACE_Synch_Options::arg");
   return this->arg_;
diff --git a/ACE/ace/Synch_Options.h b/ACE/ace/Synch_Options.h
index 171f1e24c15..c0b2ff754e8 100644
--- a/ACE/ace/Synch_Options.h
+++ b/ACE/ace/Synch_Options.h
@@ -100,14 +100,14 @@ public:
   void operator= (unsigned long option);
 
   /// Returns the "magic cookie" argument.
-  const void *arg (void) const;
+  const void *arg () const;
 
   /// Set the "magic cookie" argument.
   void arg (const void *);
 
   /// Returns a reference to the ACE_Time_Value.  This value only makes
   /// sense if (*this)[USE_TIMEOUT] is true.
-  const ACE_Time_Value &timeout (void) const;
+  const ACE_Time_Value &timeout () const;
 
   /// Set the timeout value. This method does not alter the options; in
   /// particular, it doesn't add USE_TIMEOUT to the options when a non-zero
@@ -119,7 +119,7 @@ public:
    * This should be used with care, e.g., the timeout pointer should not
    * be stored in a manner that will lead to dangling pointers.
    */
-  const ACE_Time_Value *time_value (void) const;
+  const ACE_Time_Value *time_value () const;
 
   // = Static data members (singletons)
 
@@ -134,7 +134,7 @@ public:
   static ACE_Synch_Options asynch;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/System_Time.cpp b/ACE/ace/System_Time.cpp
index e7c3471049d..aa22dbd757f 100644
--- a/ACE/ace/System_Time.cpp
+++ b/ACE/ace/System_Time.cpp
@@ -51,7 +51,7 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname)
            ALLOCATOR (this->poolname_));
 }
 
-ACE_System_Time::~ACE_System_Time (void)
+ACE_System_Time::~ACE_System_Time ()
 {
   ACE_TRACE ("ACE_System_Time::~ACE_System_Time");
   delete this->shmem_;
diff --git a/ACE/ace/TLI.h b/ACE/ace/TLI.h
index 2f0695b1da6..d2091787c38 100644
--- a/ACE/ace/TLI.h
+++ b/ACE/ace/TLI.h
@@ -78,7 +78,7 @@ public:
   int get_local_addr (ACE_Addr &) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp
index 4b833578fd9..4014907521f 100644
--- a/ACE/ace/TLI_Acceptor.cpp
+++ b/ACE/ace/TLI_Acceptor.cpp
@@ -38,7 +38,7 @@ public:
   ACE_TLI_Request *alloc (void);
   void    free (ACE_TLI_Request *node);
 
-  void dump (void) const;
+  void dump () const;
   // Dump the state of an object.
 
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/TLI_Acceptor.h b/ACE/ace/TLI_Acceptor.h
index 506fbab0ac3..11a3856443f 100644
--- a/ACE/ace/TLI_Acceptor.h
+++ b/ACE/ace/TLI_Acceptor.h
@@ -46,7 +46,7 @@ public:
   friend class ACE_Request_Queue;
 
   /// Default constructor.
-  ACE_TLI_Acceptor (void);
+  ACE_TLI_Acceptor ();
 
   /// Initiate a passive mode socket.
   ACE_TLI_Acceptor (const ACE_Addr &remote_sap,
@@ -65,7 +65,7 @@ public:
                    const char device[] = ACE_TLI_TCP_DEVICE);
 
   /// Close down the acceptor and release resources.
-  int close (void);
+  int close ();
 
   // = Passive connection acceptance method.
 
@@ -88,7 +88,7 @@ public:
   typedef ACE_TLI_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h
index 16fbe687ebe..38b2e7d4b54 100644
--- a/ACE/ace/TLI_Connector.h
+++ b/ACE/ace/TLI_Connector.h
@@ -110,7 +110,7 @@ public:
   typedef ACE_TLI_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/TLI_Stream.h b/ACE/ace/TLI_Stream.h
index a323b788838..0df08505322 100644
--- a/ACE/ace/TLI_Stream.h
+++ b/ACE/ace/TLI_Stream.h
@@ -41,18 +41,18 @@ public:
   friend class ACE_TLI_Connector;
 
   /// Default constructor.
-  ACE_TLI_Stream (void);
+  ACE_TLI_Stream ();
 
   // = TLI-specific shutdown operations.
   /// Close down and release resources.
-  int close (void);
+  int close ();
 
   /// Send a release and then await the release from the other side.
-  int active_close (void);
+  int active_close ();
 
   /// Acknowledge the release from the other side and then send the
   /// release to the other side.
-  int passive_close (void);
+  int passive_close ();
 
   /// Return address of remotely connected peer.
   int get_remote_addr (ACE_Addr &) const;
@@ -111,7 +111,7 @@ public:
   typedef ACE_INET_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp
index f1bb31bf92f..724094bb23a 100644
--- a/ACE/ace/TP_Reactor.cpp
+++ b/ACE/ace/TP_Reactor.cpp
@@ -305,7 +305,7 @@ int
 ACE_TP_Reactor::handle_timer_events (int & /*event_count*/,
                                      ACE_TP_Token_Guard &guard)
 {
-  typedef ACE_Member_Function_Command<ACE_TP_Token_Guard> Guard_Release;
+  using Guard_Release = ACE_Member_Function_Command<ACE_TP_Token_Guard>;
 
   Guard_Release release(guard, &ACE_TP_Token_Guard::release_token);
   return this->timer_queue_->expire_single(release);
@@ -605,7 +605,7 @@ ACE_TP_Reactor::post_process_socket_event (ACE_EH_Dispatch_Info &dispatch_info,
 }
 
 int
-ACE_TP_Reactor::resumable_handler (void)
+ACE_TP_Reactor::resumable_handler ()
 {
   return 1;
 }
@@ -632,7 +632,7 @@ ACE_TP_Reactor::notify_handle (ACE_HANDLE,
 }
 
 ACE_HANDLE
-ACE_TP_Reactor::get_notify_handle (void)
+ACE_TP_Reactor::get_notify_handle ()
 {
   // Call the notify handler to get a handle on which we would have a
   // notify waiting
diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h
index c9be2cf15f5..0a8a326443c 100644
--- a/ACE/ace/TP_Reactor.h
+++ b/ACE/ace/TP_Reactor.h
@@ -66,9 +66,10 @@ public:
 private:
   bool dispatch_;
 
-  // Disallow copying and assignment.
-  ACE_EH_Dispatch_Info (const ACE_EH_Dispatch_Info &);
-  ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &);
+  ACE_EH_Dispatch_Info (const ACE_EH_Dispatch_Info &) = delete;
+  ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &) = delete;
+  ACE_EH_Dispatch_Info (ACE_EH_Dispatch_Info &&) = delete;
+  ACE_EH_Dispatch_Info &operator= (ACE_EH_Dispatch_Info &&) = delete;
 };
 
 
@@ -114,13 +115,13 @@ public:
   int acquire_token (ACE_Time_Value *max_wait_time = 0);
 
 private:
-
   // Disallow default construction.
   ACE_TP_Token_Guard (void);
 
-  // Disallow copying and assignment.
-  ACE_TP_Token_Guard (const ACE_TP_Token_Guard &);
-  ACE_TP_Token_Guard &operator= (const ACE_TP_Token_Guard &);
+  ACE_TP_Token_Guard (const ACE_TP_Token_Guard &) = delete;
+  ACE_TP_Token_Guard &operator= (const ACE_TP_Token_Guard &) = delete;
+  ACE_TP_Token_Guard (ACE_TP_Token_Guard &&) = delete;
+  ACE_TP_Token_Guard &operator= (ACE_TP_Token_Guard &&) = delete;
 
 private:
 
diff --git a/ACE/ace/TSS_Adapter.cpp b/ACE/ace/TSS_Adapter.cpp
index ee1f55fdcac..38a31872e30 100644
--- a/ACE/ace/TSS_Adapter.cpp
+++ b/ACE/ace/TSS_Adapter.cpp
@@ -23,7 +23,7 @@ ACE_TSS_Adapter::ACE_TSS_Adapter (void *object, ACE_THR_DEST f)
 ACE_ALLOC_HOOK_DEFINE(ACE_TSS_Adapter);
 
 void
-ACE_TSS_Adapter::cleanup (void)
+ACE_TSS_Adapter::cleanup ()
 {
   (*this->func_)(this->ts_obj_);  // call cleanup routine for ts_obj_
 }
diff --git a/ACE/ace/TSS_Adapter.h b/ACE/ace/TSS_Adapter.h
index 376f517924a..06abdac3803 100644
--- a/ACE/ace/TSS_Adapter.h
+++ b/ACE/ace/TSS_Adapter.h
@@ -41,7 +41,7 @@ public:
   ACE_TSS_Adapter (void *object, ACE_THR_DEST f);
 
   /// Perform the cleanup operation.
-  void cleanup (void);
+  void cleanup ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp
index bee8257b0ad..9d3444c0793 100644
--- a/ACE/ace/TSS_T.cpp
+++ b/ACE/ace/TSS_T.cpp
@@ -34,7 +34,7 @@ extern "C" ACE_Export void ACE_TSS_C_cleanup (void *);
 #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */
 
 template <class TYPE>
-ACE_TSS<TYPE>::~ACE_TSS (void)
+ACE_TSS<TYPE>::~ACE_TSS ()
 {
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
   if (this->once_)
@@ -71,13 +71,13 @@ ACE_TSS<TYPE>::operator-> () const
 }
 
 template <class TYPE>
-ACE_TSS<TYPE>::operator TYPE *(void) const
+ACE_TSS<TYPE>::operator TYPE *() const
 {
   return this->ts_get ();
 }
 
 template <class TYPE> TYPE *
-ACE_TSS<TYPE>::make_TSS_TYPE (void) const
+ACE_TSS<TYPE>::make_TSS_TYPE () const
 {
   TYPE *temp = 0;
   ACE_NEW_RETURN (temp,
@@ -87,7 +87,7 @@ ACE_TSS<TYPE>::make_TSS_TYPE (void) const
 }
 
 template <class TYPE> void
-ACE_TSS<TYPE>::dump (void) const
+ACE_TSS<TYPE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
@@ -110,7 +110,7 @@ ACE_TSS<TYPE>::cleanup (void *ptr)
 }
 
 template <class TYPE> int
-ACE_TSS<TYPE>::ts_init (void)
+ACE_TSS<TYPE>::ts_init ()
 {
   // Ensure that we are serialized!
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0);
@@ -188,7 +188,7 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj)
 }
 
 template <class TYPE> TYPE *
-ACE_TSS<TYPE>::ts_get (void) const
+ACE_TSS<TYPE>::ts_get () const
 {
   if (!this->once_)
     {
@@ -269,7 +269,7 @@ ACE_TSS<TYPE>::ts_get (void) const
 // otherwise returns a pointer to the ts_obj.
 
 template <class TYPE> TYPE *
-ACE_TSS<TYPE>::ts_object (void) const
+ACE_TSS<TYPE>::ts_object () const
 {
   if (!this->once_) // Return 0 if we've never been initialized.
     return 0;
@@ -342,7 +342,7 @@ ACE_TSS<TYPE>::ts_object (TYPE *new_ts_obj)
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_TSS_Guard)
 
 template <class ACE_LOCK> void
-ACE_TSS_Guard<ACE_LOCK>::dump (void) const
+ACE_TSS_Guard<ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -352,7 +352,7 @@ ACE_TSS_Guard<ACE_LOCK>::dump (void) const
 }
 
 template <class ACE_LOCK> void
-ACE_TSS_Guard<ACE_LOCK>::init_key (void)
+ACE_TSS_Guard<ACE_LOCK>::init_key ()
 {
   this->key_ = ACE_OS::NULL_key;
   ACE_Thread::keycreate (&this->key_,
@@ -365,13 +365,13 @@ ACE_TSS_Guard<ACE_LOCK>::init_key (void)
 }
 
 template <class ACE_LOCK>
-ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (void)
+ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard ()
 {
   this->init_key ();
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Guard<ACE_LOCK>::release (void)
+ACE_TSS_Guard<ACE_LOCK>::release ()
 {
   Guard_Type *guard = 0;
 
@@ -391,7 +391,7 @@ ACE_TSS_Guard<ACE_LOCK>::release (void)
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Guard<ACE_LOCK>::remove (void)
+ACE_TSS_Guard<ACE_LOCK>::remove ()
 {
   Guard_Type *guard = 0;
 
@@ -411,7 +411,7 @@ ACE_TSS_Guard<ACE_LOCK>::remove (void)
 }
 
 template <class ACE_LOCK>
-ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard (void)
+ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard ()
 {
   Guard_Type *guard = 0;
 
@@ -463,7 +463,7 @@ ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (ACE_LOCK &lock, bool block)
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Guard<ACE_LOCK>::acquire (void)
+ACE_TSS_Guard<ACE_LOCK>::acquire ()
 {
   Guard_Type *guard = 0;
 
@@ -483,7 +483,7 @@ ACE_TSS_Guard<ACE_LOCK>::acquire (void)
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Guard<ACE_LOCK>::tryacquire (void)
+ACE_TSS_Guard<ACE_LOCK>::tryacquire ()
 {
   Guard_Type *guard = 0;
 
@@ -523,7 +523,7 @@ ACE_TSS_Write_Guard<ACE_LOCK>::ACE_TSS_Write_Guard (ACE_LOCK &lock,
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Write_Guard<ACE_LOCK>::acquire (void)
+ACE_TSS_Write_Guard<ACE_LOCK>::acquire ()
 {
   Write_Guard_Type *guard = 0;
 
@@ -543,7 +543,7 @@ ACE_TSS_Write_Guard<ACE_LOCK>::acquire (void)
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire (void)
+ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire ()
 {
   Write_Guard_Type *guard = 0;
 
@@ -563,19 +563,19 @@ ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire (void)
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Write_Guard<ACE_LOCK>::acquire_write (void)
+ACE_TSS_Write_Guard<ACE_LOCK>::acquire_write ()
 {
   return this->acquire ();
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire_write (void)
+ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire_write ()
 {
   return this->tryacquire ();
 }
 
 template <class ACE_LOCK> void
-ACE_TSS_Write_Guard<ACE_LOCK>::dump (void) const
+ACE_TSS_Write_Guard<ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TSS_Guard<ACE_LOCK>::dump ();
@@ -603,7 +603,7 @@ ACE_TSS_Read_Guard<ACE_LOCK>::ACE_TSS_Read_Guard (ACE_LOCK &lock, bool block)
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Read_Guard<ACE_LOCK>::acquire (void)
+ACE_TSS_Read_Guard<ACE_LOCK>::acquire ()
 {
   Read_Guard_Type *guard = 0;
 
@@ -623,7 +623,7 @@ ACE_TSS_Read_Guard<ACE_LOCK>::acquire (void)
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire (void)
+ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire ()
 {
   Read_Guard_Type *guard = 0;
 
@@ -643,19 +643,19 @@ ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire (void)
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Read_Guard<ACE_LOCK>::acquire_read (void)
+ACE_TSS_Read_Guard<ACE_LOCK>::acquire_read ()
 {
   return this->acquire ();
 }
 
 template <class ACE_LOCK> int
-ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire_read (void)
+ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire_read ()
 {
   return this->tryacquire ();
 }
 
 template <class ACE_LOCK> void
-ACE_TSS_Read_Guard<ACE_LOCK>::dump (void) const
+ACE_TSS_Read_Guard<ACE_LOCK>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TSS_Guard<ACE_LOCK>::dump ();
diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h
index d3097d54439..f894912f50b 100644
--- a/ACE/ace/TSS_T.h
+++ b/ACE/ace/TSS_T.h
@@ -94,7 +94,7 @@ public:
 
   /// Deregister this object from thread-specific storage administration.
   /// Will cause all threads' copies of TYPE to be destroyed.
-  virtual ~ACE_TSS (void);
+  virtual ~ACE_TSS ();
 
   /**
    * Set the thread-specific object for the calling thread.
@@ -129,7 +129,7 @@ public:
    *          may be 0 under odd error conditions; check errno for further
    *          information.
    */
-  TYPE *ts_object (void) const;
+  TYPE *ts_object () const;
 
   /**
    * Use a "smart pointer" to get the thread-specific data associated
@@ -156,17 +156,17 @@ public:
    *          may be 0 under odd error conditions; check errno for further
    *          information.
    */
-  operator TYPE *(void) const;
+  operator TYPE *() const;
 
   //@}
 
   /// Hook for construction parameters.
-  virtual TYPE *make_TSS_TYPE (void) const;
+  virtual TYPE *make_TSS_TYPE () const;
 
   // = Utility methods.
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -174,11 +174,11 @@ public:
 protected:
   /// Actually implements the code that retrieves the object from
   /// thread-specific storage.
-  TYPE *ts_get (void) const;
+  TYPE *ts_get () const;
 
   /// Factors out common code for initializing TSS.  This must NOT be
   /// called with the lock held...
-  int ts_init (void);
+  int ts_init ();
 
 #if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)))
   /// This implementation only works for non-threading systems...
@@ -200,7 +200,7 @@ protected:
 # if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *ts_value (void) const;
 # else
-  TYPE *ts_value (void) const;
+  TYPE *ts_value () const;
 # endif /* ACE_HAS_THR_C_DEST */
 
   /// Stores a new plain value in the thread-specific storage.
diff --git a/ACE/ace/TSS_T.inl b/ACE/ace/TSS_T.inl
index 7e68976c88d..9d97fc374a4 100644
--- a/ACE/ace/TSS_T.inl
+++ b/ACE/ace/TSS_T.inl
@@ -53,7 +53,7 @@ ACE_TSS<TYPE>::ts_value (void) const
 }
 # else
 template <class TYPE> ACE_INLINE TYPE *
-ACE_TSS<TYPE>::ts_value (void) const
+ACE_TSS<TYPE>::ts_value () const
 {
   void *temp = 0;
   if (ACE_Thread::getspecific (this->key_, &temp) == -1)
diff --git a/ACE/ace/TTY_IO.cpp b/ACE/ace/TTY_IO.cpp
index 53c56baddab..b471555d1a8 100644
--- a/ACE/ace/TTY_IO.cpp
+++ b/ACE/ace/TTY_IO.cpp
@@ -24,11 +24,11 @@ namespace
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_TTY_IO::ACE_TTY_IO (void)
+ACE_TTY_IO::ACE_TTY_IO ()
 {
 }
 
-ACE_TTY_IO::Serial_Params::Serial_Params (void)
+ACE_TTY_IO::Serial_Params::Serial_Params ()
 {
   baudrate = 9600;
   xonlim = 0;
diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp
index 17acc652f27..ef7e702c089 100644
--- a/ACE/ace/Task.cpp
+++ b/ACE/ace/Task.cpp
@@ -23,13 +23,13 @@ ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man)
 #endif /* ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */
 }
 
-ACE_Task_Base::~ACE_Task_Base (void)
+ACE_Task_Base::~ACE_Task_Base ()
 {
 }
 
 /// Default ACE_Task service routine
 int
-ACE_Task_Base::svc (void)
+ACE_Task_Base::svc ()
 {
   ACE_TRACE ("ACE_Task_Base::svc");
   return 0;
@@ -54,7 +54,7 @@ ACE_Task_Base::close (u_long)
 /// Forward the call to close() so that existing applications don't
 /// break.
 int
-ACE_Task_Base::module_closed (void)
+ACE_Task_Base::module_closed ()
 {
   return this->close (1);
 }
@@ -69,7 +69,7 @@ ACE_Task_Base::put (ACE_Message_Block *, ACE_Time_Value *)
 
 /// Wait for all threads running in a task to exit.
 int
-ACE_Task_Base::wait (void)
+ACE_Task_Base::wait ()
 {
   ACE_TRACE ("ACE_Task_Base::wait");
 
@@ -83,7 +83,7 @@ ACE_Task_Base::wait (void)
 
 /// Suspend a task.
 int
-ACE_Task_Base::suspend (void)
+ACE_Task_Base::suspend ()
 {
   ACE_TRACE ("ACE_Task_Base::suspend");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
@@ -95,7 +95,7 @@ ACE_Task_Base::suspend (void)
 
 /// Resume a suspended task.
 int
-ACE_Task_Base::resume (void)
+ACE_Task_Base::resume ()
 {
   ACE_TRACE ("ACE_Task_Base::resume");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
diff --git a/ACE/ace/Task.h b/ACE/ace/Task.h
index 51218fe04e6..92a6e788f41 100644
--- a/ACE/ace/Task.h
+++ b/ACE/ace/Task.h
@@ -68,7 +68,7 @@ public:
   ACE_Task_Base (ACE_Thread_Manager * = 0);
 
   /// Destructor.
-  virtual ~ACE_Task_Base (void);
+  virtual ~ACE_Task_Base ();
 
   // These methods should be overridden by subclasses if you'd like to
   // provide <Task>-specific initialization and termination behavior.
@@ -97,7 +97,7 @@ public:
    * close(0) will be also called when a thread associated with the
    * ACE_Task instance exits.
    */
-  virtual int module_closed (void);
+  virtual int module_closed ();
 
   // = Immediate and deferred processing methods, respectively.
 
@@ -110,7 +110,7 @@ public:
   virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
 
   /// Run by a daemon thread to handle deferred processing.
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Active object activation method.
   /**
@@ -193,7 +193,7 @@ public:
    * @retval 0  Success.
    * @retval -1 Failure (consult errno for further information).
    */
-  virtual int wait (void);
+  virtual int wait ();
 
   // = Suspend/resume a Task.
 
@@ -201,34 +201,34 @@ public:
   // since they are inherently error-prone to use.  They are only here
   // for (the rare) applications that know how to use them correctly.
   /// Suspend a task.
-  virtual int suspend (void);
+  virtual int suspend ();
   /// Resume a suspended task.
-  virtual int resume (void);
+  virtual int resume ();
 
   /// Get the current group id.
-  int grp_id (void) const;
+  int grp_id () const;
 
   /// Set the current group id.
   void grp_id (int);
 
   /// Get the thread manager associated with this Task.
-  ACE_Thread_Manager *thr_mgr (void) const;
+  ACE_Thread_Manager *thr_mgr () const;
 
   /// Set the thread manager associated with this Task.
   void thr_mgr (ACE_Thread_Manager *);
 
   /// True if queue is a reader, else false.
-  int is_reader (void) const;
+  int is_reader () const;
 
   /// True if queue is a writer, else false.
-  int is_writer (void) const;
+  int is_writer () const;
 
   /**
    * Returns the number of threads currently running within a task.
    * If we're a passive object this value is 0, else it's greater than
    * 0.
    */
-  size_t thr_count (void) const;
+  size_t thr_count () const;
 
   /**
    * Returns the thread ID of the thread whose exit caused this object's
@@ -246,7 +246,7 @@ public:
    *          is not yet known; for example, if no threads are active, or if
    *          multiple threads are active.
    */
-  ACE_thread_t last_thread (void) const;
+  ACE_thread_t last_thread () const;
 
   /// Routine that runs the service routine as a daemon thread.
   static ACE_THR_FUNC_RETURN svc_run (void *);
diff --git a/ACE/ace/Task.inl b/ACE/ace/Task.inl
index 2d585d13b27..0481db6faeb 100644
--- a/ACE/ace/Task.inl
+++ b/ACE/ace/Task.inl
@@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Get the current group id.
 ACE_INLINE int
-ACE_Task_Base::grp_id (void) const
+ACE_Task_Base::grp_id () const
 {
   ACE_TRACE ("ACE_Task_Base::grp_id");
   return this->grp_id_;
@@ -25,7 +25,7 @@ ACE_Task_Base::grp_id (int identifier)
 }
 
 ACE_INLINE ACE_Thread_Manager *
-ACE_Task_Base::thr_mgr (void) const
+ACE_Task_Base::thr_mgr () const
 {
   ACE_TRACE ("ACE_Task_Base::thr_mgr");
   return this->thr_mgr_;
@@ -39,14 +39,14 @@ ACE_Task_Base::thr_mgr (ACE_Thread_Manager *thr_mgr)
 }
 
 ACE_INLINE int
-ACE_Task_Base::is_reader (void) const
+ACE_Task_Base::is_reader () const
 {
   ACE_TRACE ("ACE_Task_Base::is_reader");
   return (ACE_BIT_ENABLED (this->flags_, ACE_Task_Flags::ACE_READER));
 }
 
 ACE_INLINE int
-ACE_Task_Base::is_writer (void) const
+ACE_Task_Base::is_writer () const
 {
   ACE_TRACE ("ACE_Task_Base::is_writer");
   return (ACE_BIT_DISABLED (this->flags_, ACE_Task_Flags::ACE_READER));
@@ -54,7 +54,7 @@ ACE_Task_Base::is_writer (void) const
 
 // Return the count of the current number of threads.
 ACE_INLINE size_t
-ACE_Task_Base::thr_count (void) const
+ACE_Task_Base::thr_count () const
 {
   ACE_TRACE ("ACE_Task_Base::thr_count");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
@@ -64,7 +64,7 @@ ACE_Task_Base::thr_count (void) const
 
 // Return the thread ID of the last thread to exit svc().
 ACE_INLINE ACE_thread_t
-ACE_Task_Base::last_thread (void) const
+ACE_Task_Base::last_thread () const
 {
   ACE_TRACE ("ACE_Task_Base::last_thread");
   return this->last_thread_id_;
diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h
index 1f883dce7a9..20fdf2222d0 100644
--- a/ACE/ace/Task_Ex_T.h
+++ b/ACE/ace/Task_Ex_T.h
@@ -168,7 +168,7 @@ public: // Should be protected:
   ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next_;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Task_T.cpp b/ACE/ace/Task_T.cpp
index b28dd2ccefc..eb4363119cb 100644
--- a/ACE/ace/Task_T.cpp
+++ b/ACE/ace/Task_T.cpp
@@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Task)
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> void
-ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
+ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump");
@@ -66,7 +66,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::ACE_Task (ACE_Thread_Manager *thr_man,
 }
 
 template<ACE_SYNCH_DECL, class TIME_POLICY>
-ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Task (void)
+ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Task ()
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Task");
   if (this->delete_msg_queue_)
@@ -78,7 +78,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Task (void)
 }
 
 template<ACE_SYNCH_DECL, class TIME_POLICY> ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::sibling (void)
+ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::sibling ()
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::sibling");
   if (this->mod_ == 0)
@@ -88,7 +88,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::sibling (void)
 }
 
 template<ACE_SYNCH_DECL, class TIME_POLICY> const ACE_TCHAR *
-ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::name (void) const
+ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::name () const
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::name");
   if (this->mod_ == 0)
@@ -98,7 +98,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::name (void) const
 }
 
 template<ACE_SYNCH_DECL, class TIME_POLICY> ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::module (void) const
+ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::module () const
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::module");
   return this->mod_;
diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h
index 69611755870..708afff2256 100644
--- a/ACE/ace/Task_T.h
+++ b/ACE/ace/Task_T.h
@@ -54,17 +54,17 @@ public:
             ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *mq = 0);
 
   /// Destructor.
-  virtual ~ACE_Task (void);
+  virtual ~ACE_Task ();
 
   /// Gets the message queue associated with this task.
-  ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *msg_queue (void);
+  ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *msg_queue ();
 
   /// Sets the message queue associated with this task.
   void msg_queue (ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *);
 
   /// Get the current time of day according to the queue's TIME_POLICY.
   /// Allows users to initialize timeout values using correct time policy.
-  ACE_Time_Value_T<TIME_POLICY> gettimeofday (void) const;
+  ACE_Time_Value_T<TIME_POLICY> gettimeofday () const;
 
   /// Allows applications to control how the timer queue gets the time
   /// of day.
@@ -120,21 +120,21 @@ public: // Should be protected:
   // = ACE_Task utility routines to identify names et al.
   /// Return the name of the enclosing Module if there's one associated
   /// with the Task, else returns 0.
-  const ACE_TCHAR *name (void) const;
+  const ACE_TCHAR *name () const;
 
   // = Pointers to next ACE_Task_Base (if ACE is part of an ACE_Stream).
   /// Get next Task pointer.
-  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next (void);
+  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next ();
 
   /// Set next Task pointer.
   void next (ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *);
 
   /// Return the Task's sibling if there's one associated with the
   /// Task's Module, else returns 0.
-  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling (void);
+  ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling ();
 
   /// Return the Task's Module if there is one, else returns 0.
-  ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *module (void) const;
+  ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *module () const;
 
   /**
    * Flush the task's queue, i.e., free all of the enqueued
@@ -162,7 +162,7 @@ public: // Should be protected:
   ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next_;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Task_T.inl b/ACE/ace/Task_T.inl
index 99de01addef..6df293af94a 100644
--- a/ACE/ace/Task_T.inl
+++ b/ACE/ace/Task_T.inl
@@ -56,7 +56,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue (ACE_Message_Queue<ACE_SYNCH_USE
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue (void)
+ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue ()
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue");
   return this->msg_queue_;
@@ -64,7 +64,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue (void)
 
 template <ACE_SYNCH_DECL, class TIME_POLICY>
 ACE_Time_Value_T<TIME_POLICY>
-ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday (void) const
+ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday () const
 {
   if (this->msg_queue_ != 0)
     return this->msg_queue_->gettimeofday ();
@@ -88,7 +88,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::reply (ACE_Message_Block *mb, ACE_Time_Val
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::next (void)
+ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::next ()
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::next");
   return this->next_;
diff --git a/ACE/ace/Test_and_Set.cpp b/ACE/ace/Test_and_Set.cpp
index 4ba0dd61d36..4c089b6b0fc 100644
--- a/ACE/ace/Test_and_Set.cpp
+++ b/ACE/ace/Test_and_Set.cpp
@@ -18,7 +18,7 @@ ACE_Test_and_Set<ACE_LOCK, TYPE>::ACE_Test_and_Set (TYPE initial_value)
 
 // Returns true if we are done, else false.
 template <class ACE_LOCK, class TYPE> TYPE
-ACE_Test_and_Set<ACE_LOCK, TYPE>::is_set (void) const
+ACE_Test_and_Set<ACE_LOCK, TYPE>::is_set () const
 {
   ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->lock_, this->is_set_);
   return this->is_set_;
diff --git a/ACE/ace/Test_and_Set.h b/ACE/ace/Test_and_Set.h
index 6ec541a697e..d7351dd1cc3 100644
--- a/ACE/ace/Test_and_Set.h
+++ b/ACE/ace/Test_and_Set.h
@@ -37,7 +37,7 @@ public:
   ACE_Test_and_Set (TYPE initial_value = 0);
 
   /// Returns true if we are set, else false.
-  TYPE is_set (void) const;
+  TYPE is_set () const;
 
   /// Sets the <is_set_> status, returning the original value of
   /// <is_set_>.
diff --git a/ACE/ace/Thread.h b/ACE/ace/Thread.h
index 6290de52e9f..67a190dcc41 100644
--- a/ACE/ace/Thread.h
+++ b/ACE/ace/Thread.h
@@ -189,7 +189,7 @@ public:
   static int kill (ACE_thread_t, int signum);
 
   /// Yield the thread to another.
-  static void yield (void);
+  static void yield ();
 
   /**
    * Return the unique kernel handle of the thread.  Note that on
@@ -200,14 +200,14 @@ public:
   static void self (ACE_hthread_t &t_handle);
 
   /// Return the unique ID of the thread.
-  static ACE_thread_t self (void);
+  static ACE_thread_t self ();
 
   /// Exit the current thread and return "status".
   /// Should _not_ be called by main thread.
   static void exit (ACE_THR_FUNC_RETURN status = 0);
 
   /// Get the LWP concurrency level of the process.
-  static int getconcurrency (void);
+  static int getconcurrency ();
 
   /// Set the LWP concurrency level of the process.
   static int setconcurrency (int new_level);
@@ -262,11 +262,11 @@ public:
   static int cancel (ACE_thread_t t_id);
 
   /// Test the cancel.
-  static void testcancel (void);
+  static void testcancel ();
 
 private:
   /// Ensure that we don't get instantiated.
-  ACE_Thread (void);
+  ACE_Thread ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Thread.inl b/ACE/ace/Thread.inl
index 33f7fcf0b73..3313bdc53f9 100644
--- a/ACE/ace/Thread.inl
+++ b/ACE/ace/Thread.inl
@@ -50,7 +50,7 @@ ACE_Thread::getspecific (ACE_thread_key_t key, void **valuep)
 }
 
 ACE_INLINE ACE_thread_t
-ACE_Thread::self (void)
+ACE_Thread::self ()
 {
 //  ACE_TRACE ("ACE_Thread::self");
   return ACE_OS::thr_self ();
@@ -64,7 +64,7 @@ ACE_Thread::exit (ACE_THR_FUNC_RETURN status)
 }
 
 ACE_INLINE void
-ACE_Thread::yield (void)
+ACE_Thread::yield ()
 {
   ACE_TRACE ("ACE_Thread::yield");
   ACE_OS::thr_yield ();
@@ -135,7 +135,7 @@ ACE_Thread::join (ACE_hthread_t wait_for,
 }
 
 ACE_INLINE int
-ACE_Thread::getconcurrency (void)
+ACE_Thread::getconcurrency ()
 {
   ACE_TRACE ("ACE_Thread::getconcurrency");
   return ACE_OS::thr_getconcurrency ();
@@ -245,7 +245,7 @@ ACE_Thread::cancel (ACE_thread_t t_id)
 }
 
 ACE_INLINE void
-ACE_Thread::testcancel (void)
+ACE_Thread::testcancel ()
 {
   ACE_TRACE ("ACE_Thread::testcancel");
 
diff --git a/ACE/ace/Thread_Adapter.cpp b/ACE/ace/Thread_Adapter.cpp
index 905eefddcac..024827d01a3 100644
--- a/ACE/ace/Thread_Adapter.cpp
+++ b/ACE/ace/Thread_Adapter.cpp
@@ -38,14 +38,14 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
   ACE_OS_TRACE ("ACE_Thread_Adapter::ACE_Thread_Adapter");
 }
 
-ACE_Thread_Adapter::~ACE_Thread_Adapter (void)
+ACE_Thread_Adapter::~ACE_Thread_Adapter ()
 {
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Adapter);
 
 ACE_THR_FUNC_RETURN
-ACE_Thread_Adapter::invoke (void)
+ACE_Thread_Adapter::invoke ()
 {
   // Inherit the logging features if the parent thread has an
   // ACE_Log_Msg instance in thread-specific storage.
@@ -97,7 +97,7 @@ ACE_Thread_Adapter::invoke (void)
 }
 
 ACE_THR_FUNC_RETURN
-ACE_Thread_Adapter::invoke_i (void)
+ACE_Thread_Adapter::invoke_i ()
 {
   // Extract the arguments.
   ACE_THR_FUNC func = reinterpret_cast<ACE_THR_FUNC> (this->user_func_);
diff --git a/ACE/ace/Thread_Adapter.h b/ACE/ace/Thread_Adapter.h
index 660f120e646..a0e6fe6a5e4 100644
--- a/ACE/ace/Thread_Adapter.h
+++ b/ACE/ace/Thread_Adapter.h
@@ -62,21 +62,21 @@ public:
    * @c this, thereby rendering the object useless after the call
    * returns.
    */
-  virtual ACE_THR_FUNC_RETURN invoke (void);
+  virtual ACE_THR_FUNC_RETURN invoke ();
 
   /// Accessor for the optional ACE_Thread_Manager.
-  ACE_Thread_Manager *thr_mgr (void);
+  ACE_Thread_Manager *thr_mgr ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Ensure that this object must be allocated on the heap.
-  ~ACE_Thread_Adapter (void);
+  ~ACE_Thread_Adapter ();
 
 private:
   /// Called by invoke, mainly here to separate the SEH stuff because
   /// SEH on Win32 doesn't compile with local vars with destructors.
-  virtual ACE_THR_FUNC_RETURN invoke_i (void);
+  virtual ACE_THR_FUNC_RETURN invoke_i ();
 
 private:
   /// Optional thread manager.
diff --git a/ACE/ace/Thread_Adapter.inl b/ACE/ace/Thread_Adapter.inl
index 06751eecd9a..cd584c6f672 100644
--- a/ACE/ace/Thread_Adapter.inl
+++ b/ACE/ace/Thread_Adapter.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Thread_Manager *
-ACE_Thread_Adapter::thr_mgr (void)
+ACE_Thread_Adapter::thr_mgr ()
 {
   return this->thr_mgr_;
 }
diff --git a/ACE/ace/Thread_Control.cpp b/ACE/ace/Thread_Control.cpp
index c00234e5f05..4facda2d76f 100644
--- a/ACE/ace/Thread_Control.cpp
+++ b/ACE/ace/Thread_Control.cpp
@@ -8,7 +8,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-ACE_Thread_Control::dump (void) const
+ACE_Thread_Control::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_OS_TRACE ("ACE_Thread_Control::dump");
@@ -47,7 +47,7 @@ ACE_Thread_Control::ACE_Thread_Control (ACE_Thread_Manager *t,
 }
 
 // Automatically kill thread on exit.
-ACE_Thread_Control::~ACE_Thread_Control (void)
+ACE_Thread_Control::~ACE_Thread_Control ()
 {
   ACE_OS_TRACE ("ACE_Thread_Control::~ACE_Thread_Control");
 
diff --git a/ACE/ace/Thread_Control.h b/ACE/ace/Thread_Control.h
index a392d83a5a5..d22a21166ff 100644
--- a/ACE/ace/Thread_Control.h
+++ b/ACE/ace/Thread_Control.h
@@ -47,7 +47,7 @@ public:
 
   /// Remove the thread from its associated Thread_Manager and exit
   /// the thread if <do_thr_exit> is enabled.
-  ~ACE_Thread_Control (void);
+  ~ACE_Thread_Control ();
 
   /// Remove this thread from its associated ACE_Thread_Manager and exit
   /// the thread if @a do_thr_exit is enabled.
@@ -59,7 +59,7 @@ public:
   int insert (ACE_Thread_Manager *tm, bool insert = false);
 
   /// Returns the current Thread_Manager.
-  ACE_Thread_Manager *thr_mgr (void);
+  ACE_Thread_Manager *thr_mgr ();
 
   /// Atomically set a new Thread_Manager and return the old
   /// Thread_Manager.
@@ -69,10 +69,10 @@ public:
   ACE_THR_FUNC_RETURN status (ACE_THR_FUNC_RETURN status);
 
   /// Get the current exit status.
-  ACE_THR_FUNC_RETURN status (void);
+  ACE_THR_FUNC_RETURN status ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Thread_Control.inl b/ACE/ace/Thread_Control.inl
index 20d03fe78e6..1122f7e35a3 100644
--- a/ACE/ace/Thread_Control.inl
+++ b/ACE/ace/Thread_Control.inl
@@ -15,7 +15,7 @@ ACE_Thread_Control::status (ACE_THR_FUNC_RETURN s)
 // Get the exit status.
 
 ACE_INLINE ACE_THR_FUNC_RETURN
-ACE_Thread_Control::status (void)
+ACE_Thread_Control::status ()
 {
   ACE_OS_TRACE ("ACE_Thread_Control::status");
   return this->status_;
@@ -24,7 +24,7 @@ ACE_Thread_Control::status (void)
 // Returns the current <Thread_Manager>.
 
 ACE_INLINE ACE_Thread_Manager *
-ACE_Thread_Control::thr_mgr (void)
+ACE_Thread_Control::thr_mgr ()
 {
   ACE_OS_TRACE ("ACE_Thread_Control::thr_mgr");
   return this->tm_;
diff --git a/ACE/ace/Thread_Exit.cpp b/ACE/ace/Thread_Exit.cpp
index 0d35cdba213..75b340cd672 100644
--- a/ACE/ace/Thread_Exit.cpp
+++ b/ACE/ace/Thread_Exit.cpp
@@ -28,7 +28,7 @@ ACE_Thread_Exit::cleanup (void *instance)
 // from being defined.
 
 ACE_Thread_Exit *
-ACE_Thread_Exit::instance (void)
+ACE_Thread_Exit::instance ()
 {
 #if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)
   ACE_OS_TRACE ("ACE_Thread_Exit::instance");
@@ -66,7 +66,7 @@ ACE_Thread_Exit::instance (void)
 // Grab hold of the Task * so that we can close() it in the
 // destructor.
 
-ACE_Thread_Exit::ACE_Thread_Exit (void)
+ACE_Thread_Exit::ACE_Thread_Exit ()
 {
   ACE_OS_TRACE ("ACE_Thread_Exit::ACE_Thread_Exit");
 }
@@ -85,7 +85,7 @@ ACE_Thread_Exit::thr_mgr (ACE_Thread_Manager *tm)
 // When this object is destroyed the Task is automatically closed
 // down!
 
-ACE_Thread_Exit::~ACE_Thread_Exit (void)
+ACE_Thread_Exit::~ACE_Thread_Exit ()
 {
   ACE_OS_TRACE ("ACE_Thread_Exit::~ACE_Thread_Exit");
 }
@@ -101,19 +101,19 @@ ACE_Thread_Exit_Maybe::ACE_Thread_Exit_Maybe (int flag)
     }
 }
 
-ACE_Thread_Exit_Maybe::~ACE_Thread_Exit_Maybe (void)
+ACE_Thread_Exit_Maybe::~ACE_Thread_Exit_Maybe ()
 {
   delete this->instance_;
 }
 
 ACE_Thread_Exit *
-ACE_Thread_Exit_Maybe::operator -> (void) const
+ACE_Thread_Exit_Maybe::operator -> () const
 {
   return this->instance_;
 }
 
 ACE_Thread_Exit *
-ACE_Thread_Exit_Maybe::instance (void) const
+ACE_Thread_Exit_Maybe::instance () const
 {
   return this->instance_;
 }
diff --git a/ACE/ace/Thread_Exit.h b/ACE/ace/Thread_Exit.h
index a6ac6516ccd..daebbb4fe39 100644
--- a/ACE/ace/Thread_Exit.h
+++ b/ACE/ace/Thread_Exit.h
@@ -41,17 +41,17 @@ class ACE_Export ACE_Thread_Exit
 {
 public:
   /// Capture the Thread that will be cleaned up automatically.
-  ACE_Thread_Exit (void);
+  ACE_Thread_Exit ();
 
   /// Set the ACE_Thread_Manager.
   void thr_mgr (ACE_Thread_Manager *tm);
 
   /// Destructor calls the thread-specific exit hooks when a thread
   /// exits.
-  ~ACE_Thread_Exit (void);
+  ~ACE_Thread_Exit ();
 
   /// Singleton access point.
-  static ACE_Thread_Exit *instance (void);
+  static ACE_Thread_Exit *instance ();
 
   /// Cleanup method, used by the ACE_Object_Manager to destroy the
   /// singleton.
@@ -90,16 +90,15 @@ public:
   ACE_Thread_Exit_Maybe (int flag = 0);
 
   /// Destroys the underlying ACE_Thread_Exit instance if it exists.
-  ~ACE_Thread_Exit_Maybe (void);
+  ~ACE_Thread_Exit_Maybe ();
 
   /// Delegates to underlying instance.
-  ACE_Thread_Exit * operator -> (void) const;
+  ACE_Thread_Exit * operator -> () const;
 
   /// Returns the underlying instance.
-  ACE_Thread_Exit * instance (void) const;
+  ACE_Thread_Exit * instance () const;
 
 private:
-
   /// Holds the underlying instance.
   ACE_Thread_Exit *instance_;
 
diff --git a/ACE/ace/Thread_Hook.cpp b/ACE/ace/Thread_Hook.cpp
index f1b07e3925a..42e2396a0c0 100644
--- a/ACE/ace/Thread_Hook.cpp
+++ b/ACE/ace/Thread_Hook.cpp
@@ -24,7 +24,7 @@ ACE_Thread_Hook::thread_hook (ACE_Thread_Hook *hook)
 }
 
 ACE_Thread_Hook *
-ACE_Thread_Hook::thread_hook (void)
+ACE_Thread_Hook::thread_hook ()
 {
   return ACE_OS_Object_Manager::thread_hook ();
 }
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index 172e4a43af8..4b7042c1216 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -15,12 +15,12 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_At_Thread_Exit::~ACE_At_Thread_Exit (void)
+ACE_At_Thread_Exit::~ACE_At_Thread_Exit ()
 {
   this->do_apply ();
 }
 
-ACE_At_Thread_Exit_Func::~ACE_At_Thread_Exit_Func (void)
+ACE_At_Thread_Exit_Func::~ACE_At_Thread_Exit_Func ()
 {
   this->do_apply ();
 }
@@ -28,7 +28,7 @@ ACE_At_Thread_Exit_Func::~ACE_At_Thread_Exit_Func (void)
 ACE_ALLOC_HOOK_DEFINE(ACE_At_Thread_Exit_Func)
 
 void
-ACE_At_Thread_Exit_Func::apply (void)
+ACE_At_Thread_Exit_Func::apply ()
 {
   this->func_ (this->object_, this->param_);
 }
@@ -58,7 +58,7 @@ ACE_Thread_Manager::set_thr_exit (ACE_TSS_TYPE (ACE_Thread_Exit) *ptr)
 }
 
 void
-ACE_Thread_Manager::dump (void)
+ACE_Thread_Manager::dump ()
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thread_Manager::dump");
@@ -82,7 +82,7 @@ ACE_Thread_Manager::dump (void)
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Thread_Descriptor::~ACE_Thread_Descriptor (void)
+ACE_Thread_Descriptor::~ACE_Thread_Descriptor ()
 {
   delete this->sync_;
 }
@@ -242,7 +242,7 @@ ACE_Thread_Descriptor::at_exit (void *object,
 }
 
 void
-ACE_Thread_Descriptor::dump (void) const
+ACE_Thread_Descriptor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thread_Descriptor::dump");
@@ -258,7 +258,7 @@ ACE_Thread_Descriptor::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Thread_Descriptor::ACE_Thread_Descriptor (void)
+ACE_Thread_Descriptor::ACE_Thread_Descriptor ()
   : log_msg_ (0),
     at_exit_list_ (0),
     tm_ (0),
@@ -270,7 +270,7 @@ ACE_Thread_Descriptor::ACE_Thread_Descriptor (void)
 }
 
 void
-ACE_Thread_Descriptor::acquire_release (void)
+ACE_Thread_Descriptor::acquire_release ()
 {
   // Just try to acquire the lock then release it.
 #if defined (ACE_THREAD_MANAGER_USES_SAFE_SPAWN)
@@ -291,7 +291,7 @@ ACE_Thread_Descriptor::acquire_release (void)
 }
 
 void
-ACE_Thread_Descriptor::acquire (void)
+ACE_Thread_Descriptor::acquire ()
 {
   // Just try to acquire the lock then release it.
 #if defined (ACE_THREAD_MANAGER_USES_SAFE_SPAWN)
@@ -303,7 +303,7 @@ ACE_Thread_Descriptor::acquire (void)
 }
 
 void
-ACE_Thread_Descriptor::release (void)
+ACE_Thread_Descriptor::release ()
 {
   // Just try to acquire the lock then release it.
 #if defined (ACE_THREAD_MANAGER_USES_SAFE_SPAWN)
@@ -401,7 +401,7 @@ ACE_Thread_Manager::ACE_Thread_Manager (const ACE_Condition_Attributes &attribut
 
 #if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS)
 ACE_Thread_Manager *
-ACE_Thread_Manager::instance (void)
+ACE_Thread_Manager::instance ()
 {
   ACE_TRACE ("ACE_Thread_Manager::instance");
 
@@ -439,7 +439,7 @@ ACE_Thread_Manager::instance (ACE_Thread_Manager *tm)
 }
 
 void
-ACE_Thread_Manager::close_singleton (void)
+ACE_Thread_Manager::close_singleton ()
 {
   ACE_TRACE ("ACE_Thread_Manager::close_singleton");
 
@@ -479,7 +479,7 @@ ACE_Thread_Manager::close ()
   return 0;
 }
 
-ACE_Thread_Manager::~ACE_Thread_Manager (void)
+ACE_Thread_Manager::~ACE_Thread_Manager ()
 {
   ACE_TRACE ("ACE_Thread_Manager::~ACE_Thread_Manager");
   this->close ();
@@ -588,11 +588,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
   // Create a new thread running <func>.  *Must* be called with the
   // <lock_> held...
   // Get a "new" Thread Descriptor from the freelist.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ());
-#else
-  auto_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ());
-#endif /* ACE_HAS_CPP11 */
 
   // Reset thread descriptor status
   new_thr_desc->reset (this);
@@ -619,11 +615,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
                                       flags),
                   -1);
 # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
-#if defined ACE_HAS_CPP11
   std::unique_ptr <ACE_Base_Thread_Adapter> auto_thread_args (static_cast<ACE_Base_Thread_Adapter *> (thread_args));
-#else
-  auto_ptr <ACE_Base_Thread_Adapter> auto_thread_args (static_cast<ACE_Base_Thread_Adapter *> (thread_args));
-#endif
 
   ACE_TRACE ("ACE_Thread_Manager::spawn_i");
   ACE_hthread_t thr_handle;
@@ -981,7 +973,7 @@ ACE_Thread_Manager::remove_thr (ACE_Thread_Descriptor *td,
 // Repeatedly call remove_thr on all table entries until there
 // is no thread left.   Must be called with lock held.
 void
-ACE_Thread_Manager::remove_thr_all (void)
+ACE_Thread_Manager::remove_thr_all ()
 {
   ACE_Thread_Descriptor *td = 0;
 
@@ -1450,14 +1442,14 @@ ACE_Thread_Manager::apply_all (ACE_THR_MEMBER_FUNC func, int arg)
 // Resume all threads that are suspended.
 
 int
-ACE_Thread_Manager::resume_all (void)
+ACE_Thread_Manager::resume_all ()
 {
   ACE_TRACE ("ACE_Thread_Manager::resume_all");
   return this->apply_all (ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::resume_thr));
 }
 
 int
-ACE_Thread_Manager::suspend_all (void)
+ACE_Thread_Manager::suspend_all ()
 {
   ACE_TRACE ("ACE_Thread_Manager::suspend_all");
   return this->apply_all (ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::suspend_thr));
@@ -1496,14 +1488,14 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status)
       {
         if (ACE_OS::thr_equal (biter.next ()->thr_id_, tid))
           {
-            ACE_Thread_Descriptor_Base *tdbl = biter.advance_and_remove (false);
+            std::unique_ptr<ACE_Thread_Descriptor_Base> tdbl (biter.advance_and_remove (false));
+            ace_mon.release();
 #ifndef ACE_LACKS_PTHREAD_JOIN
             if (ACE_Thread::join (tdbl->thr_handle_, status) == -1)
               {
                 return -1;
               }
 #endif
-            delete tdbl;
 
             // return immediately if we've found the thread we want to join.
             return 0;
@@ -1511,7 +1503,7 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status)
       }
 #endif /* !ACE_HAS_VXTHREADS */
 
-    typedef ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter_t;
+    using iter_t = ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
     for (iter_t iter (this->thr_list_); !iter.done (); iter.advance ())
       {
         // If threads are created as THR_DETACHED or THR_DAEMON, we
@@ -1586,7 +1578,7 @@ ACE_Thread_Manager::wait_grp (int grp_id)
                     -1);
 #endif /* !ACE_HAS_VXTHREADS */
 
-    typedef ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter_t;
+    using iter_t = ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
     for (iter_t iter (this->thr_list_); !iter.done (); iter.advance ())
       {
         // If threads are created as THR_DETACHED or THR_DAEMON, we
@@ -1725,7 +1717,7 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout,
 
   ACE_Auto_Ptr<ACE_Time_Value> local_timeout;
   // Check to see if we're using absolute time or not.
-  if (use_absolute_time == false && timeout != 0)
+  if (!use_absolute_time && timeout != 0)
     {
       // create time value duplicate (preserves time policy)
       local_timeout.reset (timeout->duplicate ());
@@ -1876,7 +1868,7 @@ ACE_Thread_Manager::wait_task (ACE_Task_Base *task)
                     -1);
 #endif /* !ACE_HAS_VXTHREADS */
 
-    typedef ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter_t;
+    using iter_t = ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
     for (iter_t iter (this->thr_list_); !iter.done (); iter.advance ())
       {
         // If threads are created as THR_DETACHED or THR_DAEMON, we
diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h
index c169d0e152f..228b27711eb 100644
--- a/ACE/ace/Thread_Manager.h
+++ b/ACE/ace/Thread_Manager.h
@@ -90,19 +90,19 @@ class ACE_Export ACE_At_Thread_Exit
   friend class ACE_Thread_Manager;
 public:
   /// Default constructor
-  ACE_At_Thread_Exit (void);
+  ACE_At_Thread_Exit ();
 
   /// The destructor
-  virtual ~ACE_At_Thread_Exit (void);
+  virtual ~ACE_At_Thread_Exit ();
 
   /// At_Thread_Exit has the ownership?
-  bool is_owner (void) const;
+  bool is_owner () const;
 
   /// Set the ownership of the At_Thread_Exit.
   bool is_owner (bool owner);
 
   /// This At_Thread_Exit was applied?
-  bool was_applied (void) const;
+  bool was_applied () const;
 
   /// Set applied state of At_Thread_Exit.
   bool was_applied (bool applied);
@@ -112,10 +112,10 @@ protected:
   ACE_At_Thread_Exit *next_;
 
   /// Do the apply if necessary
-  void do_apply (void);
+  void do_apply ();
 
   /// The apply method.
-  virtual void apply (void) = 0;
+  virtual void apply () = 0;
 
   /// The Thread_Descriptor where this at is registered.
   ACE_Thread_Descriptor* td_;
@@ -135,7 +135,7 @@ public:
                             ACE_CLEANUP_FUNC func,
                             void *param = 0);
 
-  virtual ~ACE_At_Thread_Exit_Func (void);
+  virtual ~ACE_At_Thread_Exit_Func ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
@@ -150,7 +150,7 @@ protected:
    void *param_;
 
    /// The apply method
-   void apply (void);
+   void apply ();
 };
 
 /**
@@ -173,8 +173,8 @@ class ACE_Export ACE_Thread_Descriptor_Base : public ACE_OS_Thread_Descriptor
   friend class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>;
   friend class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
 public:
-  ACE_Thread_Descriptor_Base (void);
-  virtual ~ACE_Thread_Descriptor_Base (void);
+  ACE_Thread_Descriptor_Base ();
+  virtual ~ACE_Thread_Descriptor_Base ();
 
   // = We need the following operators to make Borland happy.
 
@@ -185,20 +185,20 @@ public:
   bool operator!= (const ACE_Thread_Descriptor_Base &rhs) const;
 
   /// Group ID.
-  int grp_id (void) const;
+  int grp_id () const;
 
   /// Current state of the thread.
-  ACE_UINT32 state (void) const;
+  ACE_UINT32 state () const;
 
   /// Return the pointer to an ACE_Task_Base or NULL if there's no
   /// ACE_Task_Base associated with this thread.;
-  ACE_Task_Base *task (void) const;
+  ACE_Task_Base *task () const;
 
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Reset this base thread descriptor.
-  void reset (void);
+  void reset ();
 
   /// Unique thread ID.
   ACE_thread_t thr_id_;
@@ -235,17 +235,17 @@ class ACE_Export ACE_Thread_Descriptor : public ACE_Thread_Descriptor_Base
   friend class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
   friend class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
 public:
-  ACE_Thread_Descriptor (void);
+  ACE_Thread_Descriptor ();
 
   // = Accessor methods.
   /// Unique thread id.
-  ACE_thread_t self (void) const;
+  ACE_thread_t self () const;
 
   /// Unique handle to thread (used by Win32 and AIX).
   void self (ACE_hthread_t &);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /**
    * This cleanup function must be called only for ACE_TSS_cleanup.
@@ -281,7 +281,7 @@ public:
                void *param);
 
   /// Do nothing destructor to keep some compilers happy
-  ~ACE_Thread_Descriptor (void);
+  ~ACE_Thread_Descriptor ();
 
   /**
    * Do nothing but to acquire the thread descriptor's lock and
@@ -292,23 +292,23 @@ public:
    * thread descriptor before it gets fully built.  This function is
    * only called from ACE_Log_Msg::thr_desc.
    */
-  void acquire_release (void);
-  void acquire (void);
-  void release (void);
+  void acquire_release ();
+  void acquire ();
+  void release ();
 
   /**
    * Set/get the @c next_ pointer.  These are required by the
    * ACE_Free_List.
    */
   void set_next (ACE_Thread_Descriptor *td);
-  ACE_Thread_Descriptor *get_next (void) const;
+  ACE_Thread_Descriptor *get_next () const;
 
 protected:
   /// Run the AT_Thread_Exit hooks.
-  void do_at_exit (void);
+  void do_at_exit ();
 
   /// Terminate realize the cleanup process to thread termination
-  void terminate (void);
+  void terminate ();
 
 private:
   /// Reset this thread descriptor.
@@ -445,18 +445,18 @@ public:
                       size_t lwm = ACE_DEFAULT_THREAD_MANAGER_LWM,
                       size_t inc = ACE_DEFAULT_THREAD_MANAGER_INC,
                       size_t hwm = ACE_DEFAULT_THREAD_MANAGER_HWM);
-  ~ACE_Thread_Manager (void);
+  ~ACE_Thread_Manager ();
 
 #if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS)
   /// Get pointer to a process-wide ACE_Thread_Manager.
-  static ACE_Thread_Manager *instance (void);
+  static ACE_Thread_Manager *instance ();
 
   /// Set pointer to a process-wide ACE_Thread_Manager and return
   /// existing pointer.
   static ACE_Thread_Manager *instance (ACE_Thread_Manager *);
 
   /// Delete the dynamically allocated Singleton
-  static void close_singleton (void);
+  static void close_singleton ();
 #endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */
 
   /// No-op.  Currently unused.
@@ -469,7 +469,7 @@ public:
    * are destroyed and thus, close() does not try to wait; it simply cleans
    * up internal thread records (the thread descriptor list).
    */
-  int close (void);
+  int close ();
 
   /**
    * Create a new thread, which executes @a func with argument @a arg.
@@ -766,14 +766,14 @@ public:
    * Return the unique ID of the calling thread.
    * Same as calling ACE_Thread::self().
    */
-  ACE_thread_t thr_self (void);
+  ACE_thread_t thr_self ();
 
   /**
    * Returns a pointer to the current ACE_Task_Base we're executing
    * in if this thread is indeed running in an ACE_Task_Base, else
    * return 0.
    */
-  ACE_Task_Base *task (void);
+  ACE_Task_Base *task ();
 
   /**
    * @name Suspend and resume methods
@@ -784,7 +784,7 @@ public:
   //@{
 
   /// Suspend all threads
-  int suspend_all (void);
+  int suspend_all ();
 
   /// Suspend a single thread.
   int suspend (ACE_thread_t);
@@ -799,7 +799,7 @@ public:
   int testsuspend (ACE_thread_t t_id);
 
   /// Resume all stopped threads
-  int resume_all (void);
+  int resume_all ();
 
   /// Resume a single thread.
   int resume (ACE_thread_t);
@@ -1037,7 +1037,7 @@ public:
 
   /// Return a count of the current number of threads active in the
   /// Thread_Manager.
-  size_t count_threads (void) const;
+  size_t count_threads () const;
 
   /// Get the state of the thread. Returns false if the thread is not
   /// managed by this thread manager.
@@ -1081,10 +1081,10 @@ public:
   /// Access function to determine whether the Thread_Manager will
   /// wait for its thread to exit or not when being closing down.
   void wait_on_exit (int dowait);
-  int wait_on_exit (void);
+  int wait_on_exit ();
 
   /// Dump the state of an object.
-  void dump (void);
+  void dump ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -1096,7 +1096,7 @@ protected:
    * This must be called from a spawn thread.  This function will
    * fetch the info from TSS.
    */
-  ACE_Thread_Descriptor *thread_desc_self (void);
+  ACE_Thread_Descriptor *thread_desc_self ();
 
   /// Return a pointer to the thread's Thread_Descriptor,
   /// 0 if fail.
@@ -1158,7 +1158,7 @@ protected:
                    int close_handler);
 
   /// Remove all threads from the table.
-  void remove_thr_all (void);
+  void remove_thr_all ();
 
   // = The following four methods implement a simple scheme for
   // operating on a collection of threads atomically.
diff --git a/ACE/ace/Thread_Manager.inl b/ACE/ace/Thread_Manager.inl
index e3ddda3a897..c6c93f270ee 100644
--- a/ACE/ace/Thread_Manager.inl
+++ b/ACE/ace/Thread_Manager.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_At_Thread_Exit::ACE_At_Thread_Exit (void)
+ACE_At_Thread_Exit::ACE_At_Thread_Exit ()
   : next_ (0),
     td_ (0),
     was_applied_ (false),
@@ -39,7 +39,7 @@ ACE_At_Thread_Exit::is_owner (bool owner)
 }
 
 ACE_INLINE void
-ACE_At_Thread_Exit::do_apply (void)
+ACE_At_Thread_Exit::do_apply ()
 {
   if (!this->was_applied_ && this->is_owner_)
     td_->at_pop();
@@ -56,7 +56,7 @@ ACE_At_Thread_Exit_Func::ACE_At_Thread_Exit_Func (void *object,
 }
 
 ACE_INLINE
-ACE_Thread_Descriptor_Base::ACE_Thread_Descriptor_Base (void)
+ACE_Thread_Descriptor_Base::ACE_Thread_Descriptor_Base ()
   : ACE_OS_Thread_Descriptor (),
     thr_id_ (ACE_OS::NULL_thread),
     thr_handle_ (ACE_OS::NULL_hthread),
@@ -69,7 +69,7 @@ ACE_Thread_Descriptor_Base::ACE_Thread_Descriptor_Base (void)
 }
 
 ACE_INLINE
-ACE_Thread_Descriptor_Base::~ACE_Thread_Descriptor_Base (void)
+ACE_Thread_Descriptor_Base::~ACE_Thread_Descriptor_Base ()
 {
 }
 
@@ -89,7 +89,7 @@ ACE_Thread_Descriptor_Base::operator!=(const ACE_Thread_Descriptor_Base &rhs) co
 }
 
 ACE_INLINE ACE_Task_Base *
-ACE_Thread_Descriptor_Base::task (void) const
+ACE_Thread_Descriptor_Base::task () const
 {
   ACE_TRACE ("ACE_Thread_Descriptor_Base::task");
   return this->task_;
@@ -98,7 +98,7 @@ ACE_Thread_Descriptor_Base::task (void) const
 // Group ID.
 
 ACE_INLINE int
-ACE_Thread_Descriptor_Base::grp_id (void) const
+ACE_Thread_Descriptor_Base::grp_id () const
 {
   ACE_TRACE ("ACE_Thread_Descriptor_Base::grp_id");
   return grp_id_;
@@ -106,7 +106,7 @@ ACE_Thread_Descriptor_Base::grp_id (void) const
 
 // Current state of the thread.
 ACE_INLINE ACE_UINT32
-ACE_Thread_Descriptor_Base::state (void) const
+ACE_Thread_Descriptor_Base::state () const
 {
   ACE_TRACE ("ACE_Thread_Descriptor_Base::state");
   return thr_state_;
@@ -114,7 +114,7 @@ ACE_Thread_Descriptor_Base::state (void) const
 
 // Reset this base descriptor.
 ACE_INLINE void
-ACE_Thread_Descriptor_Base::reset (void)
+ACE_Thread_Descriptor_Base::reset ()
 {
   ACE_TRACE ("ACE_Thread_Descriptor_Base::reset");
   this->thr_id_ = ACE_OS::NULL_thread;
@@ -127,7 +127,7 @@ ACE_Thread_Descriptor_Base::reset (void)
 
 // Unique thread id.
 ACE_INLINE ACE_thread_t
-ACE_Thread_Descriptor::self (void) const
+ACE_Thread_Descriptor::self () const
 {
   ACE_TRACE ("ACE_Thread_Descriptor::self");
   return this->thr_id_;
@@ -159,7 +159,7 @@ ACE_Thread_Descriptor::set_next (ACE_Thread_Descriptor *td)
 
 // Get the <next_> pointer
 ACE_INLINE ACE_Thread_Descriptor *
-ACE_Thread_Descriptor::get_next (void) const
+ACE_Thread_Descriptor::get_next () const
 {
   ACE_TRACE ("ACE_Thread_Descriptor::get_next");
   return static_cast<ACE_Thread_Descriptor * ACE_CAST_CONST> (this->next_);
@@ -180,7 +180,7 @@ ACE_Thread_Descriptor::reset (ACE_Thread_Manager *tm)
 }
 
 ACE_INLINE ACE_Thread_Descriptor *
-ACE_Thread_Manager::thread_desc_self (void)
+ACE_Thread_Manager::thread_desc_self ()
 {
   // This method must be called with lock held.
 
@@ -210,14 +210,14 @@ ACE_Thread_Manager::thread_desc_self (void)
 // Return the unique ID of the thread.
 
 ACE_INLINE ACE_thread_t
-ACE_Thread_Manager::thr_self (void)
+ACE_Thread_Manager::thr_self ()
 {
   ACE_TRACE ("ACE_Thread_Manager::thr_self");
   return ACE_Thread::self ();
 }
 
 ACE_INLINE ACE_Task_Base *
-ACE_Thread_Manager::task (void)
+ACE_Thread_Manager::task ()
 {
   ACE_TRACE ("ACE_Thread_Manager::task");
 
@@ -275,7 +275,7 @@ ACE_Thread_Manager::wait_on_exit (int do_wait)
 }
 
 ACE_INLINE int
-ACE_Thread_Manager::wait_on_exit (void)
+ACE_Thread_Manager::wait_on_exit ()
 {
   return this->automatic_wait_;
 }
@@ -294,7 +294,7 @@ ACE_Thread_Manager::register_as_terminated (ACE_Thread_Descriptor *td)
 }
 
 ACE_INLINE size_t
-ACE_Thread_Manager::count_threads (void) const
+ACE_Thread_Manager::count_threads () const
 {
   return this->thr_list_.size ();
 }
diff --git a/ACE/ace/Thread_Mutex.cpp b/ACE/ace/Thread_Mutex.cpp
index b51505f7ba3..1881d405579 100644
--- a/ACE/ace/Thread_Mutex.cpp
+++ b/ACE/ace/Thread_Mutex.cpp
@@ -24,7 +24,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex)
 
 void
-ACE_Thread_Mutex::dump (void) const
+ACE_Thread_Mutex::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Mutex::dump");
@@ -35,7 +35,7 @@ ACE_Thread_Mutex::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_Thread_Mutex::~ACE_Thread_Mutex (void)
+ACE_Thread_Mutex::~ACE_Thread_Mutex ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::~ACE_Thread_Mutex");
   this->remove ();
diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h
index 9270aa68aeb..72e1e5e6e37 100644
--- a/ACE/ace/Thread_Mutex.h
+++ b/ACE/ace/Thread_Mutex.h
@@ -53,17 +53,17 @@ public:
                     ACE_mutexattr_t *attributes = 0);
 
   /// Implicitly destroy the mutex.
-  ~ACE_Thread_Mutex (void);
+  ~ACE_Thread_Mutex ();
 
   /**
    * Explicitly destroy the mutex.  Note that only one thread should
    * call this method since it doesn't protect against race
    * conditions.
    */
-  int remove (void);
+  int remove ();
 
   /// Acquire lock ownership (wait on queue if necessary).
-  int acquire (void);
+  int acquire ();
 
   /**
    * Block the thread until we acquire the mutex or until @a tv times
@@ -89,24 +89,24 @@ public:
    * -1 on failure.  If we "failed" because someone else already had
    * the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire (void);
+  int tryacquire ();
 
   /// Release lock and unblock a thread at head of queue.
-  int release (void);
+  int release ();
 
   /**
    * Acquire mutex ownership.  This calls acquire() and is only here
    * to make the ACE_Thread_Mutex interface consistent with the
    * other synchronization APIs.
    */
-  int acquire_read (void);
+  int acquire_read ();
 
   /**
    * Acquire mutex ownership.  This calls acquire() and is only here
    * to make the ACE_Thread_Mutex interface consistent with the
    * other synchronization APIs.
    */
-  int acquire_write (void);
+  int acquire_write ();
 
   /**
    * Conditionally acquire mutex (i.e., won't block).  This calls
@@ -115,7 +115,7 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_read (void);
+  int tryacquire_read ();
 
   /**
    * Conditionally acquire mutex (i.e., won't block).  This calls
@@ -124,7 +124,7 @@ public:
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
    */
-  int tryacquire_write (void);
+  int tryacquire_write ();
 
   /**
    * This is only here to make the ACE_Thread_Mutex interface
@@ -132,14 +132,14 @@ public:
    * caller has already acquired the mutex using one of the above
    * calls, and returns 0 (success) always.
    */
-  int tryacquire_write_upgrade (void);
+  int tryacquire_write_upgrade ();
 
   /// Return the underlying mutex.
-  const ACE_thread_mutex_t &lock (void) const;
-  ACE_thread_mutex_t &lock (void);
+  const ACE_thread_mutex_t &lock () const;
+  ACE_thread_mutex_t &lock ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Thread_Mutex.inl b/ACE/ace/Thread_Mutex.inl
index e3d2719327e..e12b6829f49 100644
--- a/ACE/ace/Thread_Mutex.inl
+++ b/ACE/ace/Thread_Mutex.inl
@@ -2,56 +2,56 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE const ACE_thread_mutex_t &
-ACE_Thread_Mutex::lock (void) const
+ACE_Thread_Mutex::lock () const
 {
 // ACE_TRACE ("ACE_Thread_Mutex::lock");
   return this->lock_;
 }
 
 ACE_INLINE ACE_thread_mutex_t &
-ACE_Thread_Mutex::lock (void)
+ACE_Thread_Mutex::lock ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::lock");
   return this->lock_;
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::acquire_read (void)
+ACE_Thread_Mutex::acquire_read ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::acquire_read");
   return ACE_OS::thread_mutex_lock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::acquire_write (void)
+ACE_Thread_Mutex::acquire_write ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::acquire_write");
   return ACE_OS::thread_mutex_lock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::tryacquire_read (void)
+ACE_Thread_Mutex::tryacquire_read ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::tryacquire_read");
   return ACE_OS::thread_mutex_trylock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::tryacquire_write (void)
+ACE_Thread_Mutex::tryacquire_write ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::tryacquire_write");
   return ACE_OS::thread_mutex_trylock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::tryacquire_write_upgrade (void)
+ACE_Thread_Mutex::tryacquire_write_upgrade ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::tryacquire_write_upgrade");
   return 0;
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::acquire (void)
+ACE_Thread_Mutex::acquire ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::acquire");
   return ACE_OS::thread_mutex_lock (&this->lock_);
@@ -72,21 +72,21 @@ ACE_Thread_Mutex::acquire (ACE_Time_Value *tv)
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::tryacquire (void)
+ACE_Thread_Mutex::tryacquire ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::tryacquire");
   return ACE_OS::thread_mutex_trylock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::release (void)
+ACE_Thread_Mutex::release ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::release");
   return ACE_OS::thread_mutex_unlock (&this->lock_);
 }
 
 ACE_INLINE int
-ACE_Thread_Mutex::remove (void)
+ACE_Thread_Mutex::remove ()
 {
 // ACE_TRACE ("ACE_Thread_Mutex::remove");
   int result = 0;
diff --git a/ACE/ace/Thread_Semaphore.cpp b/ACE/ace/Thread_Semaphore.cpp
index 1fa0bf17893..a4a18d5e788 100644
--- a/ACE/ace/Thread_Semaphore.cpp
+++ b/ACE/ace/Thread_Semaphore.cpp
@@ -28,7 +28,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Semaphore)
 
 void
-ACE_Thread_Semaphore::dump (void) const
+ACE_Thread_Semaphore::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Semaphore::dump");
diff --git a/ACE/ace/Thread_Semaphore.h b/ACE/ace/Thread_Semaphore.h
index c59e25ba97c..f1d80beb55c 100644
--- a/ACE/ace/Thread_Semaphore.h
+++ b/ACE/ace/Thread_Semaphore.h
@@ -46,10 +46,10 @@ public:
                         int max = 0x7FFFFFFF);
 
   /// Default destructor.
-  ~ACE_Thread_Semaphore (void);
+  ~ACE_Thread_Semaphore ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Thread_Semaphore.inl b/ACE/ace/Thread_Semaphore.inl
index 9a2a0affed3..d81a013d68d 100644
--- a/ACE/ace/Thread_Semaphore.inl
+++ b/ACE/ace/Thread_Semaphore.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Thread_Semaphore::~ACE_Thread_Semaphore (void)
+ACE_Thread_Semaphore::~ACE_Thread_Semaphore ()
 {
 }
 
diff --git a/ACE/ace/Throughput_Stats.cpp b/ACE/ace/Throughput_Stats.cpp
index 6ecc4c8aad8..5db90f1d593 100644
--- a/ACE/ace/Throughput_Stats.cpp
+++ b/ACE/ace/Throughput_Stats.cpp
@@ -9,7 +9,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Throughput_Stats::ACE_Throughput_Stats (void)
+ACE_Throughput_Stats::ACE_Throughput_Stats ()
   : ACE_Basic_Stats ()
   , throughput_last_ (0)
 {
diff --git a/ACE/ace/Time_Policy.cpp b/ACE/ace/Time_Policy.cpp
index 4d2e6880b9d..98be1d5b52a 100644
--- a/ACE/ace/Time_Policy.cpp
+++ b/ACE/ace/Time_Policy.cpp
@@ -14,7 +14,7 @@ ACE_Dynamic_Time_Policy_Base::~ACE_Dynamic_Time_Policy_Base ()
 class NULL_Time_Policy : public ACE_Dynamic_Time_Policy_Base
 {
 protected:
-  virtual ACE_Time_Value_T<ACE_Delegating_Time_Policy> gettimeofday () const;
+  ACE_Time_Value_T<ACE_Delegating_Time_Policy> gettimeofday () const override;
 };
 
 ACE_Time_Value_T<ACE_Delegating_Time_Policy> NULL_Time_Policy::gettimeofday () const
diff --git a/ACE/ace/Time_Policy.h b/ACE/ace/Time_Policy.h
index 29ffa7d4ab6..b50d0594a4d 100644
--- a/ACE/ace/Time_Policy.h
+++ b/ACE/ace/Time_Policy.h
@@ -35,7 +35,7 @@ public:
   ACE_Time_Value_T<ACE_System_Time_Policy> operator() () const;
 
   /// Noop. Just here to satisfy backwards compatibility demands.
-  void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void));
+  void set_gettimeofday (ACE_Time_Value (*gettimeofday)());
 };
 
 /**
@@ -50,7 +50,7 @@ public:
   ACE_Time_Value_T<ACE_HR_Time_Policy> operator() () const;
 
   /// Noop. Just here to satisfy backwards compatibility demands.
-  void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void));
+  void set_gettimeofday (ACE_Time_Value (*gettimeofday)());
 };
 
 /**
@@ -92,7 +92,7 @@ public:
   ACE_Time_Value_T<ACE_FPointer_Time_Policy> operator()() const;
 
   /// Satisfy backwards compatibility demands.
-  void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void));
+  void set_gettimeofday (ACE_Time_Value (*gettimeofday)());
 private:
   FPtr function_;
 };
@@ -116,15 +116,13 @@ public:
   /// Set delegate
   void set_delegate (ACE_Dynamic_Time_Policy_Base const * delegate);
 
-#if defined (ACE_HAS_CPP11)
   ACE_Delegating_Time_Policy (const ACE_Delegating_Time_Policy&) = default;
   ACE_Delegating_Time_Policy (ACE_Delegating_Time_Policy&&) = default;
   ACE_Delegating_Time_Policy& operator = (ACE_Delegating_Time_Policy const &) = default;
   ACE_Delegating_Time_Policy &operator = (ACE_Delegating_Time_Policy&&)  = default;
-#endif /* ACE_HAS_CPP11 */
 
   /// Noop. Just here to satisfy backwards compatibility demands.
-  void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void));
+  void set_gettimeofday (ACE_Time_Value (*gettimeofday)());
 private:
   ACE_Dynamic_Time_Policy_Base const * delegate_;
 };
@@ -144,7 +142,7 @@ public:
   ACE_Time_Value_T<ACE_Delegating_Time_Policy> operator()() const;
 
   /// Noop. Just here to satisfy backwards compatibility demands.
-  void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void));
+  void set_gettimeofday (ACE_Time_Value (*gettimeofday)());
 protected:
   /// Return the current time according to policy implementation.
   virtual ACE_Time_Value_T<ACE_Delegating_Time_Policy> gettimeofday () const = 0;
diff --git a/ACE/ace/Time_Policy.inl b/ACE/ace/Time_Policy.inl
index 8ecea822490..f057ed3a0f7 100644
--- a/ACE/ace/Time_Policy.inl
+++ b/ACE/ace/Time_Policy.inl
@@ -11,7 +11,7 @@ ACE_System_Time_Policy::operator()() const
 }
 
 ACE_INLINE void
-ACE_System_Time_Policy::set_gettimeofday (ACE_Time_Value (*)(void))
+ACE_System_Time_Policy::set_gettimeofday (ACE_Time_Value (*)())
 {
 }
 
@@ -22,7 +22,7 @@ ACE_HR_Time_Policy::operator()() const
 }
 
 ACE_INLINE void
-ACE_HR_Time_Policy::set_gettimeofday (ACE_Time_Value (*)(void))
+ACE_HR_Time_Policy::set_gettimeofday (ACE_Time_Value (*)())
 {
 }
 
@@ -46,7 +46,7 @@ ACE_FPointer_Time_Policy::operator()() const
 }
 
 ACE_INLINE void
-ACE_FPointer_Time_Policy::set_gettimeofday (ACE_Time_Value (*f)(void))
+ACE_FPointer_Time_Policy::set_gettimeofday (ACE_Time_Value (*f)())
 {
   this->function_ = f;
 }
@@ -58,7 +58,7 @@ ACE_Dynamic_Time_Policy_Base::operator()() const
 }
 
 ACE_INLINE void
-ACE_Dynamic_Time_Policy_Base::set_gettimeofday (ACE_Time_Value (*)(void))
+ACE_Dynamic_Time_Policy_Base::set_gettimeofday (ACE_Time_Value (*)())
 {
 }
 
@@ -69,7 +69,7 @@ ACE_Delegating_Time_Policy::operator()() const
 }
 
 ACE_INLINE void
-ACE_Delegating_Time_Policy::set_gettimeofday (ACE_Time_Value (*)(void))
+ACE_Delegating_Time_Policy::set_gettimeofday (ACE_Time_Value (*)())
 {
 }
 
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp
index 77c151e135c..24b8ee58efe 100644
--- a/ACE/ace/Time_Value.cpp
+++ b/ACE/ace/Time_Value.cpp
@@ -19,10 +19,7 @@
 #endif /* ACE_HAS_CPP98_IOSTREAMS */
 
 #include <cstdlib>
-
-#ifdef ACE_HAS_CPP11
-# include <cmath>
-#endif /* ACE_HAS_CPP11 */
+#include <cmath>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -57,7 +54,7 @@ ACE_Time_Value::operator ++ (int)
 }
 
 ACE_Time_Value &
-ACE_Time_Value::operator ++ (void)
+ACE_Time_Value::operator ++ ()
 {
   // ACE_OS_TRACE ("ACE_Time_Value::operator ++ (void)");
   this->usec (this->usec () + 1);
@@ -77,7 +74,7 @@ ACE_Time_Value::operator -- (int)
 }
 
 ACE_Time_Value &
-ACE_Time_Value::operator -- (void)
+ACE_Time_Value::operator -- ()
 {
   // ACE_OS_TRACE ("ACE_Time_Value::operator -- (void)");
   this->usec (this->usec () - 1);
@@ -169,7 +166,7 @@ ACE_Time_Value::duplicate () const
 }
 
 void
-ACE_Time_Value::dump (void) const
+ACE_Time_Value::dump () const
 {
 }
 
@@ -235,9 +232,7 @@ ACE_Time_Value::operator *= (double d)
   // Since this is a costly operation, we try to detect as soon as
   // possible if we are having a saturation in order to abort the rest
   // of the computation.
-  typedef ACE::If_Then_Else<(sizeof (double) > sizeof (time_t)),
-    double,
-    long double>::result_type float_type;
+  using float_type = ACE::If_Then_Else<(sizeof(double) > sizeof(time_t)), double, long double>::result_type;
 
   float_type sec_total = static_cast<float_type> (this->sec());
   sec_total *= d;
@@ -324,11 +319,7 @@ ostream &operator<<(ostream &o, const ACE_Time_Value &v)
     {
       o << tv->tv_sec;
       if (tv->tv_usec)
-#ifdef ACE_HAS_CPP11
         o << '.' << std::setw (6) << std::labs (tv->tv_usec);
-#else
-        o << '.' << std::setw (6) << ACE_STD_NAMESPACE::labs (tv->tv_usec);
-#endif
     }
   else if (tv->tv_usec < 0)
     o << "-0." << std::setw (6) << - tv->tv_usec;
diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h
index 4c295c7399c..c543896ca90 100644
--- a/ACE/ace/Time_Value.h
+++ b/ACE/ace/Time_Value.h
@@ -19,12 +19,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-# include "ace/os_include/os_time.h"
-
-#if defined (ACE_HAS_CPP11)
-# include <chrono>
-# include "ace/Truncate.h"
-#endif /* ACE_HAS_CPP11 */
+#include "ace/os_include/os_time.h"
+#include <chrono>
+#include "ace/Truncate.h"
 
 // Define some helpful constants.
 // Not type-safe, and signed.  For backward compatibility.
@@ -67,7 +64,7 @@ public:
   static const ACE_Time_Value max_time;
 
   /// Default Constructor.
-  ACE_Time_Value (void);
+  ACE_Time_Value ();
 
   /// Constructor.
   explicit ACE_Time_Value (time_t sec, suseconds_t usec = 0);
@@ -80,7 +77,6 @@ public:
   /// Construct the ACE_Time_Value object from a timespec_t.
   explicit ACE_Time_Value (const timespec_t &t);
 
-#if defined (ACE_HAS_CPP11)
   ACE_Time_Value (const ACE_Time_Value&) = default;
   ACE_Time_Value (ACE_Time_Value&&) = default;
 
@@ -90,7 +86,6 @@ public:
   {
     this->set (duration);
   }
-#endif /* ACE_HAS_CPP11 */
 
   /// Destructor
   virtual ~ACE_Time_Value ();
@@ -121,7 +116,6 @@ public:
   void set (const FILETIME &ft);
 # endif /* ACE_WIN32 */
 
-#if defined (ACE_HAS_CPP11)
   /// Initializes the ACE_Time_Value object from a std::duration.
   template< class Rep, class Period >
   void set (const std::chrono::duration<Rep, Period>& duration)
@@ -134,7 +128,6 @@ public:
         duration % std::chrono::seconds (1))};
     this->set (s.count (), ACE_Utils::truncate_cast<suseconds_t>(usec.count ()));
   }
-#endif /* ACE_HAS_CPP11 */
 
   /// Converts from ACE_Time_Value format into milliseconds format.
   /**
@@ -147,7 +140,7 @@ public:
    *       usec() methods.  There is no analogous "millisecond"
    *       component in an ACE_Time_Value.
    */
-  unsigned long msec (void) const;
+  unsigned long msec () const;
 
   /// Converts from ACE_Time_Value format into milliseconds format.
   /**
@@ -233,7 +226,7 @@ public:
    * @note The semantics of this method differs from the msec()
    *       method.
    */
-  time_t sec (void) const;
+  time_t sec () const;
 
   /// Set seconds.
   void sec (time_t sec);
@@ -245,7 +238,7 @@ public:
    * @note The semantics of this method differs from the msec()
    *       method.
    */
-  suseconds_t usec (void) const;
+  suseconds_t usec () const;
 
   /// Set microseconds.
   void usec (suseconds_t usec);
@@ -264,11 +257,9 @@ public:
   /// Add @a tv to this.
   ACE_Time_Value &operator += (time_t tv);
 
-#if defined (ACE_HAS_CPP11)
   /// Assign @a tv to this
   ACE_Time_Value &operator = (const ACE_Time_Value &) = default;
   ACE_Time_Value &operator = (ACE_Time_Value &&)  = default;
-#endif /* ACE_HAS_CPP11 */
 
   /// Assign @a tv to this
   ACE_Time_Value &operator = (time_t tv);
@@ -279,7 +270,6 @@ public:
   /// Subtract @a tv to this.
   ACE_Time_Value &operator -= (time_t tv);
 
-#if defined (ACE_HAS_CPP11)
   /// Add @a std::duration to this.
   template< class Rep, class Period >
   ACE_Time_Value &operator += (const std::chrono::duration<Rep, Period>& duration)
@@ -309,8 +299,6 @@ public:
     this->normalize ();
     return *this;
   }
-#endif /* ACE_HAS_CPP11 */
-
 
   /**
     \brief Multiply the time value by the @a d factor.
@@ -332,7 +320,7 @@ public:
    * @note The only reason this is here is to allow the use of ACE_Atomic_Op
    * with ACE_Time_Value.
    */
-  ACE_Time_Value &operator++ (void);
+  ACE_Time_Value &operator++ ();
 
   /// Decrement microseconds as postfix.
   /**
@@ -346,7 +334,7 @@ public:
    * @note The only reason this is here is to allow the use of ACE_Atomic_Op
    * with ACE_Time_Value.
    */
-  ACE_Time_Value &operator-- (void);
+  ACE_Time_Value &operator-- ();
 
   /// Adds two ACE_Time_Value objects together, returns the sum.
   friend ACE_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1,
@@ -441,7 +429,7 @@ public:
    * violates layering restrictions in ACE because this class is part
    * of the OS layer and @c ACE_Log_Msg is at a higher level.
    */
-  void dump (void) const;
+  void dump () const;
 
 # if defined (ACE_WIN32)
   /// Const time difference between FILETIME and POSIX time.
@@ -478,10 +466,7 @@ extern ACE_Export ostream &operator<<( ostream &o, const ACE_Time_Value &v );
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_CPP11)
-
 // Additional chrono operators.
-
 namespace std
 {
   namespace chrono
@@ -536,8 +521,6 @@ namespace std
   }
 }
 
-#endif /* ACE_HAS_CPP11 */
-
 #if defined (__ACE_INLINE__)
 #include "ace/Time_Value.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl
index 581e348657b..ad683ae365d 100644
--- a/ACE/ace/Time_Value.inl
+++ b/ACE/ace/Time_Value.inl
@@ -57,7 +57,7 @@ ACE_Time_Value::set (time_t sec, suseconds_t usec)
   // ACE_OS_TRACE ("ACE_Time_Value::set");
   this->tv_.tv_sec = sec;
   this->tv_.tv_usec = usec;
-#if __GNUC__ && !(__GNUC__ == 3 && __GNUC_MINOR__ == 4)
+#ifdef __GNUC__
   if ((__builtin_constant_p(sec) &
        __builtin_constant_p(usec)) &&
       (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS))
@@ -101,7 +101,7 @@ ACE_Time_Value::set (const timespec_t &tv)
 }
 
 ACE_INLINE
-ACE_Time_Value::ACE_Time_Value (void)
+ACE_Time_Value::ACE_Time_Value ()
   // : tv_ ()
 {
   // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value");
@@ -117,7 +117,7 @@ ACE_Time_Value::ACE_Time_Value (time_t sec, suseconds_t usec)
 
 /// Returns number of seconds.
 ACE_INLINE time_t
-ACE_Time_Value::sec (void) const
+ACE_Time_Value::sec () const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::sec");
   return this->tv_.tv_sec;
@@ -133,7 +133,7 @@ ACE_Time_Value::sec (time_t sec)
 
 /// Converts from Time_Value format into milli-seconds format.
 ACE_INLINE unsigned long
-ACE_Time_Value::msec (void) const
+ACE_Time_Value::msec () const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::msec");
 
@@ -201,7 +201,7 @@ ACE_Time_Value::msec (int milliseconds)
 
 /// Returns number of micro-seconds.
 ACE_INLINE suseconds_t
-ACE_Time_Value::usec (void) const
+ACE_Time_Value::usec () const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::usec");
   return this->tv_.tv_usec;
@@ -397,10 +397,7 @@ operator - (const ACE_Time_Value &tv1,
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_CPP11)
-
 // Additional chrono streaming operators.
-
 namespace std
 {
   namespace chrono
@@ -552,5 +549,3 @@ namespace std
     }
   }
 }
-
-#endif /* ACE_HAS_CPP11 */
diff --git a/ACE/ace/Time_Value_T.h b/ACE/ace/Time_Value_T.h
index 3cbdf84e480..c6f9a55b87a 100644
--- a/ACE/ace/Time_Value_T.h
+++ b/ACE/ace/Time_Value_T.h
@@ -38,7 +38,7 @@ public:
   typedef TIME_POLICY time_policy_t;
 
   /// Default Constructor.
-  ACE_Time_Value_T (void) {}
+  ACE_Time_Value_T () {}
 
   /// Constructor.
   explicit ACE_Time_Value_T (time_t sec, suseconds_t usec = 0)
@@ -111,7 +111,7 @@ public:
    * @note The only reason this is here is to allow the use of ACE_Atomic_Op
    * with ACE_Time_Value.
    */
-  ACE_Time_Value_T<TIME_POLICY> &operator++ (void);
+  ACE_Time_Value_T<TIME_POLICY> &operator++ ();
 
   /// Decrement microseconds as postfix.
   /**
@@ -125,7 +125,7 @@ public:
    * @note The only reason this is here is to allow the use of ACE_Atomic_Op
    * with ACE_Time_Value.
    */
-  ACE_Time_Value_T<TIME_POLICY> &operator-- (void);
+  ACE_Time_Value_T<TIME_POLICY> &operator-- ();
 
   /// Get current time of day according to time policy.
   /**
diff --git a/ACE/ace/Time_Value_T.inl b/ACE/ace/Time_Value_T.inl
index 934bebf228c..707ad994872 100644
--- a/ACE/ace/Time_Value_T.inl
+++ b/ACE/ace/Time_Value_T.inl
@@ -67,7 +67,7 @@ ACE_Time_Value_T<TIME_POLICY> ACE_Time_Value_T<TIME_POLICY>::operator++ (int)
 }
 
 template <class TIME_POLICY>
-ACE_Time_Value_T<TIME_POLICY> &ACE_Time_Value_T<TIME_POLICY>::operator++ (void)
+ACE_Time_Value_T<TIME_POLICY> &ACE_Time_Value_T<TIME_POLICY>::operator++ ()
 {
   this->ACE_Time_Value::operator ++();
   return *this;
@@ -82,7 +82,7 @@ ACE_Time_Value_T<TIME_POLICY> ACE_Time_Value_T<TIME_POLICY>::operator-- (int)
 }
 
 template <class TIME_POLICY>
-ACE_Time_Value_T<TIME_POLICY> &ACE_Time_Value_T<TIME_POLICY>::operator-- (void)
+ACE_Time_Value_T<TIME_POLICY> &ACE_Time_Value_T<TIME_POLICY>::operator-- ()
 {
   this->ACE_Time_Value::operator --();
   return *this;
diff --git a/ACE/ace/Timeprobe.h b/ACE/ace/Timeprobe.h
index 872e274ee3f..2e4c1907667 100644
--- a/ACE/ace/Timeprobe.h
+++ b/ACE/ace/Timeprobe.h
@@ -143,7 +143,6 @@ typedef ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX, ACE_TIMEPROBE_ALLOCATOR>
 // in thread specific storage.  This allows multiple threads to use
 // their own instance of ACE_Timerprobe, without interfering with each
 // other.
-
 #  if defined (ACE_TSS_TIMEPROBES)
 #    define ACE_TIMEPROBE_SINGLETON_TYPE ACE_TSS_Singleton
 #    define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_NULL_MUTEX
diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h
index 89fef2079ee..b21b1e9d82d 100644
--- a/ACE/ace/Timer_Hash_T.h
+++ b/ACE/ace/Timer_Hash_T.h
@@ -49,7 +49,7 @@ public:
 
   /// Default constructor (creates an invalid object, but needs to be here
   /// so timer queues using this functor can be constructed)
-  ACE_Timer_Hash_Upcall (void);
+  ACE_Timer_Hash_Upcall ();
 
   /// Constructor that specifies a Timer_Hash to call up to
   ACE_Timer_Hash_Upcall (ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> *timer_hash);
@@ -125,16 +125,16 @@ public:
   virtual ~ACE_Timer_Hash_Iterator_T ();
 
   /// Positions the iterator at the earliest node in the Timer Queue
-  virtual void first (void);
+  virtual void first ();
 
   /// Positions the iterator at the next node in the Timer Queue
-  virtual void next (void);
+  virtual void next ();
 
   /// Returns true when there are no more nodes in the sequence
-  virtual bool isdone (void) const;
+  virtual bool isdone () const;
 
   /// Returns the node at the current position in the sequence
-  virtual ACE_Timer_Node_T<TYPE> *item (void);
+  virtual ACE_Timer_Node_T<TYPE> *item ();
 
 protected:
   /// Pointer to the ACE_Timer_Hash that we are iterating over.
@@ -196,14 +196,14 @@ public:
                     TIME_POLICY const & time_policy = TIME_POLICY());
 
   /// Destructor
-  virtual ~ACE_Timer_Hash_T (void);
+  virtual ~ACE_Timer_Hash_T ();
 
   /// True if queue is empty, else false.
-  virtual bool is_empty (void) const;
+  virtual bool is_empty () const;
 
   /// Returns the time of the earlier node in the <ACE_Timer_Hash>.
   /// Must be called on a non-empty queue.
-  virtual const ACE_Time_Value &earliest_time (void) const;
+  virtual const ACE_Time_Value &earliest_time () const;
 
   /**
    * Resets the interval of the timer represented by @a timer_id to
@@ -243,14 +243,14 @@ public:
   /**
    * Destroy timer queue. Cancels all timers.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Run the <functor> for all timers whose values are <=
    * gettimeofday.  Also accounts for <timer_skew>.  Returns
    * the number of timers canceled.
    */
-  virtual int expire (void);
+  virtual int expire ();
 
   /**
    * Run the <functor> for all timers whose values are <= @a current_time.
@@ -260,16 +260,16 @@ public:
   virtual int expire (const ACE_Time_Value &current_time);
 
   /// Returns a pointer to this ACE_Timer_Queue's iterator.
-  virtual ACE_Timer_Queue_Iterator_T<TYPE> &iter (void);
+  virtual ACE_Timer_Queue_Iterator_T<TYPE> &iter ();
 
   /// Removes the earliest node from the queue and returns it
-  virtual ACE_Timer_Node_T<TYPE> *remove_first (void);
+  virtual ACE_Timer_Node_T<TYPE> *remove_first ();
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Reads the earliest node from the queue and returns it.
-  virtual ACE_Timer_Node_T<TYPE> *get_first (void);
+  virtual ACE_Timer_Node_T<TYPE> *get_first ();
 
 protected:
   /// Factory method that frees a previously allocated node.
@@ -301,7 +301,7 @@ private:
   virtual void reschedule (ACE_Timer_Node_T<TYPE> *);
 
   /// Finds the earliest node
-  void find_new_earliest (void);
+  void find_new_earliest ();
 
   /// Keeps track of the size of the queue
   size_t size_;
diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp
index fa2704ed82c..b29d8bc7b7d 100644
--- a/ACE/ace/Timer_Heap_T.cpp
+++ b/ACE/ace/Timer_Heap_T.cpp
@@ -50,7 +50,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_Iterator_T (void)
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_Iterator_T ()
 {
 }
 
@@ -58,7 +58,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 void
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void)
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first ()
 {
   this->position_ = 0;
 }
@@ -67,7 +67,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void)
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 void
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void)
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next ()
 {
   if (this->position_ != this->timer_heap_.cur_size_)
     ++this->position_;
@@ -76,7 +76,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void)
 // Returns true the <position_> is at the end of the heap array
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> bool
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone (void) const
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const
 {
   return this->position_ == this->timer_heap_.cur_size_;
 }
@@ -84,7 +84,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone (void) c
 // Returns the node at the current position in the heap or 0 if at the end
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item (void)
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item ()
 {
   if (this->position_ != this->timer_heap_.cur_size_)
     return this->timer_heap_.heap_[this->position_];
@@ -222,7 +222,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_T (
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_T (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_T ()
 {
   ACE_TRACE ("ACE_Timer_Heap_T::~ACE_Timer_Heap_T");
 
@@ -258,7 +258,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_T (void)
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close ()
 {
   ACE_TRACE ("ACE_Timer_Heap_T::close");
 
@@ -284,7 +284,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void)
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 long
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::pop_freelist (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::pop_freelist ()
 {
   ACE_TRACE ("ACE_Timer_Heap_T::pop_freelist");
 
@@ -342,7 +342,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::push_freelist (long old_
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 long
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_id (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_id ()
 {
   ACE_TRACE ("ACE_Timer_Heap_T::timer_id");
 
@@ -354,7 +354,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_id (void)
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 bool
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty () const
 {
   ACE_TRACE ("ACE_Timer_Heap_T::is_empty");
 
@@ -363,7 +363,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 ACE_Timer_Queue_Iterator_T<TYPE> &
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter ()
 {
   this->iterator_->first ();
   return *this->iterator_;
@@ -372,7 +372,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void)
 // Returns earliest time in a non-empty queue.
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> const ACE_Time_Value &
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time (void) const
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time () const
 {
   ACE_TRACE ("ACE_Timer_Heap_T::earliest_time");
   return this->heap_[0]->get_timer_value ();
@@ -380,7 +380,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time (void) con
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 void
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Heap_T::dump");
@@ -562,7 +562,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::insert (
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 void
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::grow_heap (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::grow_heap ()
 {
   // All the containers will double in size from max_size_.
   size_t new_size = this->max_size_ * 2;
@@ -682,7 +682,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::reschedule (
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::alloc_node (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::alloc_node ()
 {
   ACE_Timer_Node_T<TYPE> *temp = 0;
 
@@ -920,7 +920,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::cancel (const TYPE &type
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 ACE_Timer_Node_T <TYPE> *
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first ()
 {
   ACE_TRACE ("ACE_Timer_Heap_T::remove_first");
 
@@ -932,7 +932,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first (void)
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
 ACE_Timer_Node_T <TYPE> *
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first ()
 {
   ACE_TRACE ("ACE_Timer_Heap_T::get_first");
 
diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h
index 433bb7b7442..eed63517e1c 100644
--- a/ACE/ace/Timer_Heap_T.h
+++ b/ACE/ace/Timer_Heap_T.h
@@ -45,19 +45,19 @@ public:
   ACE_Timer_Heap_Iterator_T (Heap &);
 
   /// Destructor.
-  virtual ~ACE_Timer_Heap_Iterator_T (void);
+  virtual ~ACE_Timer_Heap_Iterator_T ();
 
   /// Positions the iterator at the earliest node in the Timer Queue
-  virtual void first (void);
+  virtual void first ();
 
   /// Positions the iterator at the next node in the Timer Queue
-  virtual void next (void);
+  virtual void next ();
 
   /// Returns true when there are no more nodes in the sequence
-  virtual bool isdone (void) const;
+  virtual bool isdone () const;
 
   /// Returns the node at the current position in the sequence
-  virtual ACE_Timer_Node_T<TYPE> *item (void);
+  virtual ACE_Timer_Node_T<TYPE> *item ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -125,14 +125,14 @@ public:
                     TIME_POLICY const & time_policy = TIME_POLICY());
 
   /// Destructor.
-  virtual ~ACE_Timer_Heap_T (void);
+  virtual ~ACE_Timer_Heap_T ();
 
   /// True if heap is empty, else false.
-  virtual bool is_empty (void) const;
+  virtual bool is_empty () const;
 
   /// Returns the time of the earliest node in the Timer_Queue.
   /// Must be called on a non-empty queue.
-  virtual const ACE_Time_Value &earliest_time (void) const;
+  virtual const ACE_Time_Value &earliest_time () const;
 
   /**
    * Resets the interval of the timer represented by @a timer_id to
@@ -168,10 +168,10 @@ public:
   /**
    * Destroy timer queue. Cancels all timers.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /// Returns a pointer to this ACE_Timer_Queue's iterator.
-  virtual ACE_Timer_Queue_Iterator_T<TYPE> &iter (void);
+  virtual ACE_Timer_Queue_Iterator_T<TYPE> &iter ();
 
   /**
    * Removes the earliest node from the queue and returns it. Note that
@@ -181,13 +181,13 @@ public:
    * this function is for support of @c ACE_Timer_Queue::expire and
    * should not be used unadvisedly in other conditions.
    */
-  ACE_Timer_Node_T <TYPE> *remove_first (void);
+  ACE_Timer_Node_T <TYPE> *remove_first ();
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Reads the earliest node from the queue and returns it.
-  virtual ACE_Timer_Node_T<TYPE> *get_first (void);
+  virtual ACE_Timer_Node_T<TYPE> *get_first ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -220,7 +220,7 @@ protected:
 
   /// Factory method that allocates a new node (uses operator new if
   /// we're *not* preallocating, otherwise uses an internal freelist).
-  virtual ACE_Timer_Node_T<TYPE> *alloc_node (void);
+  virtual ACE_Timer_Node_T<TYPE> *alloc_node ();
 
   /**
    * Factory method that frees a previously allocated node (uses
@@ -242,7 +242,7 @@ private:
    * If preallocation is used, will also double the size of the
    * preallocated array of ACE_Timer_Nodes.
    */
-  void grow_heap (void);
+  void grow_heap ();
 
   /// Restore the heap property, starting at @a slot.
   void reheap_up (ACE_Timer_Node_T<TYPE> *new_node,
@@ -264,10 +264,10 @@ private:
    * timer id returned from this method will never == -1 to avoid
    * conflicts with other failure return values.
    */
-  long timer_id (void);
+  long timer_id ();
 
   /// Pops and returns a new timer id from the freelist.
-  long pop_freelist (void);
+  long pop_freelist ();
 
   /// Pushes @a old_id onto the freelist.
   void push_freelist (long old_id);
diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h
index 181174fb73a..25abceadf82 100644
--- a/ACE/ace/Timer_List_T.h
+++ b/ACE/ace/Timer_List_T.h
@@ -156,7 +156,7 @@ public:
   virtual ACE_Timer_Node_T<TYPE>* remove_first (void);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Reschedule an "interval" ACE_Timer_Node_T.  This should be private
   /// but for now it needs to be public for <ACE_Timer_Hash_T>
diff --git a/ACE/ace/Timer_Queue_Iterator.cpp b/ACE/ace/Timer_Queue_Iterator.cpp
index 2d16088b8d6..40965be1433 100644
--- a/ACE/ace/Timer_Queue_Iterator.cpp
+++ b/ACE/ace/Timer_Queue_Iterator.cpp
@@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Timer_Node_T)
 
 template <class TYPE> void
-ACE_Timer_Node_T<TYPE>::dump (void) const
+ACE_Timer_Node_T<TYPE>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Node_T::dump");
@@ -35,7 +35,7 @@ ACE_Timer_Node_T<TYPE>::dump (void) const
 }
 
 template <class TYPE>
-ACE_Timer_Node_T<TYPE>::ACE_Timer_Node_T (void)
+ACE_Timer_Node_T<TYPE>::ACE_Timer_Node_T ()
   : act_ (0),
     prev_ (0),
     next_ (0),
@@ -45,18 +45,18 @@ ACE_Timer_Node_T<TYPE>::ACE_Timer_Node_T (void)
 }
 
 template <class TYPE>
-ACE_Timer_Node_T<TYPE>::~ACE_Timer_Node_T (void)
+ACE_Timer_Node_T<TYPE>::~ACE_Timer_Node_T ()
 {
   ACE_TRACE ("ACE_Timer_Node_T::~ACE_Timer_Node_T");
 }
 
 template <class TYPE>
-ACE_Timer_Queue_Iterator_T<TYPE>::ACE_Timer_Queue_Iterator_T (void)
+ACE_Timer_Queue_Iterator_T<TYPE>::ACE_Timer_Queue_Iterator_T ()
 {
 }
 
 template <class TYPE>
-ACE_Timer_Queue_Iterator_T<TYPE>::~ACE_Timer_Queue_Iterator_T (void)
+ACE_Timer_Queue_Iterator_T<TYPE>::~ACE_Timer_Queue_Iterator_T ()
 {
 }
 
diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h
index 35dc274033a..51aa013518a 100644
--- a/ACE/ace/Timer_Queue_Iterator.h
+++ b/ACE/ace/Timer_Queue_Iterator.h
@@ -42,10 +42,10 @@ class ACE_Timer_Node_T
 {
 public:
   /// Default constructor
-  ACE_Timer_Node_T (void);
+  ACE_Timer_Node_T ();
 
   /// Destructor
-  ~ACE_Timer_Node_T (void);
+  ~ACE_Timer_Node_T ();
 
   /// Useful typedef ..
   typedef ACE_Timer_Node_Dispatch_Info_T <TYPE> DISPATCH_INFO;
@@ -70,43 +70,43 @@ public:
   // = Accessors
 
   /// Get the type.
-  TYPE &get_type (void);
+  TYPE &get_type ();
 
   /// Set the type.
   void set_type (TYPE &type);
 
   /// Get the asynchronous completion token.
-  const void *get_act (void);
+  const void *get_act ();
 
   /// Set the asynchronous completion token.
   void set_act (void *act);
 
   /// Get the timer value.
-  const ACE_Time_Value &get_timer_value (void) const;
+  const ACE_Time_Value &get_timer_value () const;
 
   /// Set the timer value.
   void set_timer_value (const ACE_Time_Value &timer_value);
 
   /// Get the timer interval.
-  const ACE_Time_Value &get_interval (void) const;
+  const ACE_Time_Value &get_interval () const;
 
   /// Set the timer interval.
   void set_interval (const ACE_Time_Value &interval);
 
   /// Get the previous pointer.
-  ACE_Timer_Node_T<TYPE> *get_prev (void);
+  ACE_Timer_Node_T<TYPE> *get_prev ();
 
   /// Set the previous pointer.
   void set_prev (ACE_Timer_Node_T<TYPE> *prev);
 
   /// Get the next pointer.
-  ACE_Timer_Node_T<TYPE> *get_next (void);
+  ACE_Timer_Node_T<TYPE> *get_next ();
 
   /// Set the next pointer.
   void set_next (ACE_Timer_Node_T<TYPE> *next);
 
   /// Get the timer_id.
-  long get_timer_id (void) const;
+  long get_timer_id () const;
 
   /// Set the timer_id.
   void set_timer_id (long timer_id);
@@ -119,7 +119,7 @@ public:
   void get_dispatch_info (ACE_Timer_Node_Dispatch_Info_T <TYPE> &info);
 
   /// Dump the state of an TYPE.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -163,22 +163,22 @@ class ACE_Timer_Queue_Iterator_T
 {
 public:
   /// Constructor.
-  ACE_Timer_Queue_Iterator_T (void);
+  ACE_Timer_Queue_Iterator_T ();
 
   /// Destructor.
-  virtual ~ACE_Timer_Queue_Iterator_T (void);
+  virtual ~ACE_Timer_Queue_Iterator_T ();
 
   /// Positions the iterator at the earliest node in the Timer Queue
-  virtual void first (void) = 0;
+  virtual void first () = 0;
 
   /// Positions the iterator at the next node in the Timer Queue
-  virtual void next (void) = 0;
+  virtual void next () = 0;
 
   /// Returns true when there are no more nodes in the sequence
-  virtual bool isdone (void) const = 0;
+  virtual bool isdone () const = 0;
 
   /// Returns the node at the current position in the sequence
-  virtual ACE_Timer_Node_T<TYPE> *item (void) = 0;
+  virtual ACE_Timer_Node_T<TYPE> *item () = 0;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Timer_Queue_Iterator.inl b/ACE/ace/Timer_Queue_Iterator.inl
index 556987e08ac..95e364ed50e 100644
--- a/ACE/ace/Timer_Queue_Iterator.inl
+++ b/ACE/ace/Timer_Queue_Iterator.inl
@@ -36,7 +36,7 @@ ACE_Timer_Node_T<TYPE>::set (const TYPE &type,
 }
 
 template <class TYPE> ACE_INLINE TYPE &
-ACE_Timer_Node_T<TYPE>::get_type (void)
+ACE_Timer_Node_T<TYPE>::get_type ()
 {
   return this->type_;
 }
@@ -48,7 +48,7 @@ ACE_Timer_Node_T<TYPE>::set_type (TYPE &type)
 }
 
 template <class TYPE> ACE_INLINE const void *
-ACE_Timer_Node_T<TYPE>::get_act (void)
+ACE_Timer_Node_T<TYPE>::get_act ()
 {
   return this->act_;
 }
@@ -60,7 +60,7 @@ ACE_Timer_Node_T<TYPE>::set_act (void *act)
 }
 
 template <class TYPE> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Node_T<TYPE>::get_timer_value (void) const
+ACE_Timer_Node_T<TYPE>::get_timer_value () const
 {
   return this->timer_value_;
 }
@@ -72,7 +72,7 @@ ACE_Timer_Node_T<TYPE>::set_timer_value (const ACE_Time_Value &timer_value)
 }
 
 template <class TYPE> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Node_T<TYPE>::get_interval (void) const
+ACE_Timer_Node_T<TYPE>::get_interval () const
 {
   return this->interval_;
 }
@@ -84,7 +84,7 @@ ACE_Timer_Node_T<TYPE>::set_interval (const ACE_Time_Value &interval)
 }
 
 template <class TYPE> ACE_INLINE ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Node_T<TYPE>::get_prev (void)
+ACE_Timer_Node_T<TYPE>::get_prev ()
 {
   return this->prev_;
 }
@@ -96,7 +96,7 @@ ACE_Timer_Node_T<TYPE>::set_prev (ACE_Timer_Node_T<TYPE> *prev)
 }
 
 template <class TYPE> ACE_INLINE ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Node_T<TYPE>::get_next (void)
+ACE_Timer_Node_T<TYPE>::get_next ()
 {
   return this->next_;
 }
@@ -108,7 +108,7 @@ ACE_Timer_Node_T<TYPE>::set_next (ACE_Timer_Node_T<TYPE> *next)
 }
 
 template <class TYPE> ACE_INLINE long
-ACE_Timer_Node_T<TYPE>::get_timer_id (void) const
+ACE_Timer_Node_T<TYPE>::get_timer_id () const
 {
   return this->timer_id_;
 }
diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp
index e5a5fbf1f91..94600bb5800 100644
--- a/ACE/ace/Timer_Queue_T.cpp
+++ b/ACE/ace/Timer_Queue_T.cpp
@@ -7,11 +7,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-/*
- * Hook to specialize to add includes
- */
-//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 #include "ace/Timer_Queue_T.h"
 #include "ace/Guard_T.h"
 #include "ace/Reverse_Lock_T.h"
@@ -67,7 +62,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday()
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday (ACE_Time_Value (*gettimeofday)(void))
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday (ACE_Time_Value (*gettimeofday)())
 {
   this->time_policy_.set_gettimeofday (gettimeofday);
 }
@@ -163,7 +158,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::current_time()
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Queue_T::dump");
@@ -193,7 +188,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Queue_T (FUNC
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Queue_T (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Queue_T ()
 {
   ACE_TRACE ("ACE_Timer_Queue_T::~ACE_Timer_Queue_T");
 
@@ -203,7 +198,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Queue_T (voi
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::alloc_node (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::alloc_node ()
 {
   return this->free_list_->remove ();
 }
@@ -215,7 +210,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::free_node (ACE_Timer_No
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_LOCK &
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::mutex (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::mutex ()
 {
   return this->mutex_;
 }
@@ -249,7 +244,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::schedule (const TYPE &t
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire ()
 {
   // We can't check here is the timer queue is empty, in some
   // implementations (like the timer heap) calling is_empty()
diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h
index e1ee3317de2..a28de49ee6f 100644
--- a/ACE/ace/Timer_Queue_T.h
+++ b/ACE/ace/Timer_Queue_T.h
@@ -46,10 +46,10 @@ public:
   explicit ACE_Timer_Queue_Upcall_Base(FUNCTOR * upcall_functor = 0);
 
   /// Destructor
-  virtual ~ACE_Timer_Queue_Upcall_Base (void);
+  virtual ~ACE_Timer_Queue_Upcall_Base ();
 
   /// Accessor to the upcall functor
-  FUNCTOR & upcall_functor (void);
+  FUNCTOR & upcall_functor ();
 
 protected:
   /// Upcall functor
@@ -88,7 +88,7 @@ public:
 
   /// Destructor - make virtual for proper destruction of inherited
   /// classes.
-  virtual ~ACE_Timer_Queue_T (void);
+  virtual ~ACE_Timer_Queue_T ();
 
   /**
    * Implement ACE_Abstract_Timer_Queue<TYPE>::schedule () with the right
@@ -105,7 +105,7 @@ public:
    * locking strategy.
    */
   virtual int expire (const ACE_Time_Value &current_time);
-  virtual int expire (void);
+  virtual int expire ();
   virtual int expire_single(ACE_Command_Base & pre_dispatch_command);
   //@}
 
@@ -121,7 +121,7 @@ public:
   /**
    * Implement the gettimeofday() virtual function
    */
-  virtual ACE_Time_Value gettimeofday (void);
+  virtual ACE_Time_Value gettimeofday ();
   //@}
 
   /**
@@ -132,7 +132,7 @@ public:
    *             is ACE_FPointer_Time_Policy. Other standard ACE time
    *             policies will ignore this.
    */
-  virtual void gettimeofday (ACE_Time_Value (*gettimeofday)(void));
+  virtual void gettimeofday (ACE_Time_Value (*gettimeofday)());
 
   /// Implement an inlined, non-abstract version of gettimeofday(),
   /// through this  member function the internals of the class can
@@ -160,13 +160,13 @@ public:
   void timer_skew (const ACE_Time_Value &skew);
 
   /// Get the timer skew for the Timer_Queue.
-  const ACE_Time_Value &timer_skew (void) const;
+  const ACE_Time_Value &timer_skew () const;
 
   /// Synchronization variable used by the queue
-  ACE_LOCK &mutex (void);
+  ACE_LOCK &mutex ();
 
   /// Dump the state of a object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Method used to return a timer node to the queue's ownership
   /// after it is returned by a method like <remove_first>.
@@ -197,7 +197,7 @@ protected:
   virtual void reschedule (ACE_Timer_Node_T<TYPE> *) = 0;
 
   /// Factory method that allocates a new node.
-  virtual ACE_Timer_Node_T<TYPE> *alloc_node (void);
+  virtual ACE_Timer_Node_T<TYPE> *alloc_node ();
 
   /// Factory method that frees a previously allocated node.
   virtual void free_node (ACE_Timer_Node_T<TYPE> *);
diff --git a/ACE/ace/Timer_Queue_T.inl b/ACE/ace/Timer_Queue_T.inl
index 64f2bf14c5a..15c0e8ef99d 100644
--- a/ACE/ace/Timer_Queue_T.inl
+++ b/ACE/ace/Timer_Queue_T.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TYPE, class FUNCTOR> ACE_INLINE FUNCTOR &
-ACE_Timer_Queue_Upcall_Base<TYPE, FUNCTOR>::upcall_functor (void)
+ACE_Timer_Queue_Upcall_Base<TYPE, FUNCTOR>::upcall_functor ()
 {
   return *this->upcall_functor_;
 }
@@ -14,7 +14,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_skew (const ACE_T
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_skew (void) const
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_skew () const
 {
   return timer_skew_;
 }
@@ -67,7 +67,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::postinvoke (ACE_Timer_N
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_INLINE ACE_Time_Value
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday_static (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday_static ()
 {
   // Get the current time according to the time policy.
   return this->time_policy_ ();
diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h
index be21c31c0c5..f02649e7ff7 100644
--- a/ACE/ace/Timer_Wheel_T.h
+++ b/ACE/ace/Timer_Wheel_T.h
@@ -46,19 +46,19 @@ public:
   ACE_Timer_Wheel_Iterator_T (Wheel &);
 
   /// Destructor
-  virtual ~ACE_Timer_Wheel_Iterator_T (void);
+  virtual ~ACE_Timer_Wheel_Iterator_T ();
 
   /// Positions the iterator at the earliest node in the Timer Queue
-  virtual void first (void);
+  virtual void first ();
 
   /// Positions the iterator at the next node in the Timer Queue
-  virtual void next (void);
+  virtual void next ();
 
   /// Returns true when there are no more nodes in the sequence
-  virtual bool isdone (void) const;
+  virtual bool isdone () const;
 
   /// Returns the node at the current position in the sequence
-  virtual ACE_Timer_Node_T<TYPE>* item (void);
+  virtual ACE_Timer_Node_T<TYPE>* item ();
 
 protected:
   /// Pointer to the ACE_Timer_List that we are iterating over.
@@ -114,14 +114,14 @@ public:
                      TIME_POLICY const & time_policy = TIME_POLICY());
 
   /// Destructor
-  virtual ~ACE_Timer_Wheel_T (void);
+  virtual ~ACE_Timer_Wheel_T ();
 
   /// True if queue is empty, else false.
-  virtual bool is_empty (void) const;
+  virtual bool is_empty () const;
 
   /// Returns the time of the earlier node in the ACE_Timer_Wheel.
   /// Must be called on a non-empty queue.
-  virtual const ACE_Time_Value& earliest_time (void) const;
+  virtual const ACE_Time_Value& earliest_time () const;
 
   /// Changes the interval of a timer (and can make it periodic or non
   /// periodic by setting it to ACE_Time_Value::zero or not).
@@ -157,16 +157,16 @@ public:
   int expire (const ACE_Time_Value& current_time);
 
   /// Returns a pointer to this <ACE_Timer_Queue_T>'s iterator.
-  virtual ACE_Timer_Queue_Iterator_T<TYPE> & iter (void);
+  virtual ACE_Timer_Queue_Iterator_T<TYPE> & iter ();
 
   /// Removes the earliest node from the queue and returns it
-  virtual ACE_Timer_Node_T<TYPE>* remove_first (void);
+  virtual ACE_Timer_Node_T<TYPE>* remove_first ();
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
   /// Reads the earliest node from the queue and returns it.
-  virtual ACE_Timer_Node_T<TYPE>* get_first (void);
+  virtual ACE_Timer_Node_T<TYPE>* get_first ();
 
 protected:
   /// Schedules a timer.
diff --git a/ACE/ace/Token.cpp b/ACE/ace/Token.cpp
index 86acaf07dd5..e142ea5e007 100644
--- a/ACE/ace/Token.cpp
+++ b/ACE/ace/Token.cpp
@@ -21,7 +21,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_Token)
 
 void
-ACE_Token::dump (void) const
+ACE_Token::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token::dump");
@@ -77,7 +77,7 @@ ACE_Token::ACE_Token_Queue_Entry::ACE_Token_Queue_Entry (ACE_Thread_Mutex &m,
   ACE_TRACE ("ACE_Token::ACE_Token_Queue_Entry::ACE_Token_Queue_Entry");
 }
 
-ACE_Token::ACE_Token_Queue::ACE_Token_Queue (void)
+ACE_Token::ACE_Token_Queue::ACE_Token_Queue ()
   : head_ (0),
     tail_ (0)
 {
@@ -173,7 +173,7 @@ ACE_Token::ACE_Token (const ACE_TCHAR *name, void *any)
 //  ACE_TRACE ("ACE_Token::ACE_Token");
 }
 
-ACE_Token::~ACE_Token (void)
+ACE_Token::~ACE_Token ()
 {
   ACE_TRACE ("ACE_Token::~ACE_Token");
 }
@@ -323,7 +323,7 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *),
 
 /* virtual */
 void
-ACE_Token::sleep_hook (void)
+ACE_Token::sleep_hook ()
 {
   ACE_TRACE ("ACE_Token::sleep_hook");
 }
@@ -472,7 +472,7 @@ ACE_Token::renew (int requeue_position,
 // better be the caller's thread!).
 
 int
-ACE_Token::release (void)
+ACE_Token::release ()
 {
   ACE_TRACE ("ACE_Token::release");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
@@ -498,7 +498,7 @@ ACE_Token::release (void)
 }
 
 void
-ACE_Token::wakeup_next_waiter (void)
+ACE_Token::wakeup_next_waiter ()
 {
   ACE_TRACE ("ACE_Token::wakeup_next_waiter");
 
diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h
index dc57e14af39..3191db3bb06 100644
--- a/ACE/ace/Token.h
+++ b/ACE/ace/Token.h
@@ -206,7 +206,7 @@ public:
   ACE_thread_t current_owner (void);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -354,7 +354,7 @@ public:
   int renew (int = 0, ACE_Time_Value * =0);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Token_Collection.h b/ACE/ace/Token_Collection.h
index c4b55ce4467..401cb4b23e8 100644
--- a/ACE/ace/Token_Collection.h
+++ b/ACE/ace/Token_Collection.h
@@ -186,7 +186,7 @@ public:
   ~ACE_Token_Collection (void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Return the name of the collection.  Not very functionally
   /// important, but sometimes a useful debugging tool.
diff --git a/ACE/ace/Token_Invariants.h b/ACE/ace/Token_Invariants.h
index 6fc5a0028c1..78603ced6a0 100644
--- a/ACE/ace/Token_Invariants.h
+++ b/ACE/ace/Token_Invariants.h
@@ -59,7 +59,7 @@ public:
   void operator= (const ACE_Mutex_Invariants &rhs);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
 private:
   /// Number of owners.  This had better be 0 >= owners_ <= 1;
@@ -101,7 +101,7 @@ public:
   void operator= (const ACE_RWLock_Invariants &rhs);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
 private:
   /// Number of owning writers.
@@ -162,7 +162,7 @@ public:
   void rwlock_releasing (const ACE_TCHAR *token_name);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   // = The following two method should be in the protected part of the
   //   class.  Bugs with certain compilers preclude this.
diff --git a/ACE/ace/Token_Manager.h b/ACE/ace/Token_Manager.h
index 3f0427799cd..39d57366f8e 100644
--- a/ACE/ace/Token_Manager.h
+++ b/ACE/ace/Token_Manager.h
@@ -93,7 +93,7 @@ public:
   ACE_TOKEN_CONST::MUTEX &mutex (void);
 
   /// Dump the state of the class.
-  void dump (void) const;
+  void dump () const;
 
   /// Turn debug mode on/off.
   void debug (bool d);
diff --git a/ACE/ace/Token_Request_Reply.h b/ACE/ace/Token_Request_Reply.h
index dd1a03bcd22..85987ff3861 100644
--- a/ACE/ace/Token_Request_Reply.h
+++ b/ACE/ace/Token_Request_Reply.h
@@ -134,7 +134,7 @@ public:
   int decode (void);
 
   /// Print out the values of the message for debugging purposes.
-  void dump (void) const;
+  void dump () const;
 
 private:
   // = The 5 fields in the <Transfer> struct are transmitted to the server.
@@ -231,7 +231,7 @@ public:
   int decode (void);
 
   /// Print out the values of the message for debugging purposes.
-  void dump (void) const;
+  void dump () const;
 
 private:
   // = The 2 fields in the <Transfer> struct are transmitted to the server.
diff --git a/ACE/ace/Trace.cpp b/ACE/ace/Trace.cpp
index 9259a8a1909..9d7397897a0 100644
--- a/ACE/ace/Trace.cpp
+++ b/ACE/ace/Trace.cpp
@@ -25,7 +25,7 @@ bool ACE_Trace::enable_tracing_ = ACE_Trace::DEFAULT_TRACING;
 ACE_ALLOC_HOOK_DEFINE(ACE_Trace)
 
 void
-ACE_Trace::dump (void) const
+ACE_Trace::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 #endif /* ACE_HAS_DUMP */
@@ -34,7 +34,7 @@ ACE_Trace::dump (void) const
 // Determine whether or not tracing is enabled
 
 bool
-ACE_Trace::is_tracing (void)
+ACE_Trace::is_tracing ()
 {
   return ACE_Trace::enable_tracing_;
 }
@@ -42,7 +42,7 @@ ACE_Trace::is_tracing (void)
 // Enable the tracing facility.
 
 void
-ACE_Trace::start_tracing (void)
+ACE_Trace::start_tracing ()
 {
   ACE_Trace::enable_tracing_ = true;
 }
@@ -50,7 +50,7 @@ ACE_Trace::start_tracing (void)
 // Disable the tracing facility.
 
 void
-ACE_Trace::stop_tracing (void)
+ACE_Trace::stop_tracing ()
 {
   ACE_Trace::enable_tracing_ = false;
 }
@@ -66,7 +66,7 @@ ACE_Trace::set_nesting_indent (int indent)
 // Get the nesting indentation level.
 
 int
-ACE_Trace::get_nesting_indent (void)
+ACE_Trace::get_nesting_indent ()
 {
   return ACE_Trace::nesting_indent_;
 }
@@ -109,7 +109,7 @@ ACE_Trace::ACE_Trace (const ACE_TCHAR *n,
 // Perform the second part of the trace, which prints out the NAME as
 // the function is exited.
 
-ACE_Trace::~ACE_Trace (void)
+ACE_Trace::~ACE_Trace ()
 {
   // If ACE has not yet been initialized, don't try to trace... there's
   // too much stuff not yet initialized.
diff --git a/ACE/ace/Trace.h b/ACE/ace/Trace.h
index dee73c6ed33..eb49cf2fdb0 100644
--- a/ACE/ace/Trace.h
+++ b/ACE/ace/Trace.h
@@ -42,29 +42,29 @@ public:
 
   /// Perform the second part of the trace, which prints out the NAME
   /// as the function is exited.
-  ~ACE_Trace (void);
+  ~ACE_Trace ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
   // = Control the tracing level.
   /// Determine if tracing is enabled or not
-  static bool is_tracing(void);
+  static bool is_tracing();
 
   /// Enable the tracing facility.
-  static void start_tracing (void);
+  static void start_tracing ();
 
   /// Disable the tracing facility.
-  static void stop_tracing (void);
+  static void stop_tracing ();
 
   /// Change the nesting indentation level.
   static void set_nesting_indent (int indent);
 
   /// Get the nesting indentation level.
-  static int get_nesting_indent (void);
+  static int get_nesting_indent ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 private:
   // Keeps track of how deeply the call stack is nested (this is
diff --git a/ACE/ace/Typed_SV_Message.h b/ACE/ace/Typed_SV_Message.h
index 193c462da4c..bbff937f2d2 100644
--- a/ACE/ace/Typed_SV_Message.h
+++ b/ACE/ace/Typed_SV_Message.h
@@ -66,7 +66,7 @@ public:
   void data (const T &data);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Typed_SV_Message_Queue.h b/ACE/ace/Typed_SV_Message_Queue.h
index 74a0cc14297..18c01cb5c6b 100644
--- a/ACE/ace/Typed_SV_Message_Queue.h
+++ b/ACE/ace/Typed_SV_Message_Queue.h
@@ -62,7 +62,7 @@ public:
   int control (int option, void *arg = 0);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/UNIX_Addr.cpp b/ACE/ace/UNIX_Addr.cpp
index 460c58fc4b1..bae284b79ca 100644
--- a/ACE/ace/UNIX_Addr.cpp
+++ b/ACE/ace/UNIX_Addr.cpp
@@ -29,7 +29,7 @@ ACE_UNIX_Addr::set_addr (const void *addr, int len)
 // Return a pointer to the underlying address.
 
 void *
-ACE_UNIX_Addr::get_addr (void) const
+ACE_UNIX_Addr::get_addr () const
 {
   return (void *) &this->unix_addr_;
 }
@@ -60,13 +60,13 @@ ACE_UNIX_Addr::addr_to_string (ACE_TCHAR s[], size_t len) const
 }
 
 u_long
-ACE_UNIX_Addr::hash (void) const
+ACE_UNIX_Addr::hash () const
 {
   return ACE::hash_pjw (this->unix_addr_.sun_path);
 }
 
 void
-ACE_UNIX_Addr::dump (void) const
+ACE_UNIX_Addr::dump () const
 {
 #if defined (ACE_HAS_DUMP)
 #endif /* ACE_HAS_DUMP */
@@ -74,7 +74,7 @@ ACE_UNIX_Addr::dump (void) const
 
 // Do nothing constructor.
 
-ACE_UNIX_Addr::ACE_UNIX_Addr (void)
+ACE_UNIX_Addr::ACE_UNIX_Addr ()
   : ACE_Addr (AF_UNIX,
               sizeof this->unix_addr_ - sizeof (this->unix_addr_.sun_path))
 {
diff --git a/ACE/ace/UNIX_Addr.h b/ACE/ace/UNIX_Addr.h
index d0851feb3ba..255832d51b3 100644
--- a/ACE/ace/UNIX_Addr.h
+++ b/ACE/ace/UNIX_Addr.h
@@ -91,7 +91,7 @@ public:
   virtual u_long hash (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/UPIPE_Acceptor.cpp b/ACE/ace/UPIPE_Acceptor.cpp
index 708c5037fe6..33d62eab73a 100644
--- a/ACE/ace/UPIPE_Acceptor.cpp
+++ b/ACE/ace/UPIPE_Acceptor.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor)
 
 void
-ACE_UPIPE_Acceptor::dump (void) const
+ACE_UPIPE_Acceptor::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_UPIPE_Acceptor::dump");
@@ -24,13 +24,13 @@ ACE_UPIPE_Acceptor::dump (void) const
 
 /* Do nothing routine for constructor. */
 
-ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (void)
+ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor ()
   : mb_ (sizeof (ACE_UPIPE_Stream *))
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor");
 }
 
-ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor (void)
+ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor ()
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor");
 }
@@ -46,7 +46,7 @@ ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr,
 }
 
 int
-ACE_UPIPE_Acceptor::close (void)
+ACE_UPIPE_Acceptor::close ()
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::close");
   return this->ACE_SPIPE_Acceptor::close ();
diff --git a/ACE/ace/UPIPE_Acceptor.h b/ACE/ace/UPIPE_Acceptor.h
index b5b13a048f7..6516ba45339 100644
--- a/ACE/ace/UPIPE_Acceptor.h
+++ b/ACE/ace/UPIPE_Acceptor.h
@@ -70,7 +70,7 @@ public:
               bool reset_new_handle = false);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/UPIPE_Connector.cpp b/ACE/ace/UPIPE_Connector.cpp
index 144c1502a33..48d854d7cd4 100644
--- a/ACE/ace/UPIPE_Connector.cpp
+++ b/ACE/ace/UPIPE_Connector.cpp
@@ -17,14 +17,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Connector)
 
 void
-ACE_UPIPE_Connector::dump (void) const
+ACE_UPIPE_Connector::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_UPIPE_Connector::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_UPIPE_Connector::ACE_UPIPE_Connector (void)
+ACE_UPIPE_Connector::ACE_UPIPE_Connector ()
 {
   ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector");
 }
diff --git a/ACE/ace/UPIPE_Connector.h b/ACE/ace/UPIPE_Connector.h
index ddfd3c07700..85f744468aa 100644
--- a/ACE/ace/UPIPE_Connector.h
+++ b/ACE/ace/UPIPE_Connector.h
@@ -93,7 +93,7 @@ public:
   typedef ACE_UPIPE_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/UPIPE_Stream.cpp b/ACE/ace/UPIPE_Stream.cpp
index 46d470ce792..69c7e6e3733 100644
--- a/ACE/ace/UPIPE_Stream.cpp
+++ b/ACE/ace/UPIPE_Stream.cpp
@@ -14,14 +14,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Stream)
 
-ACE_UPIPE_Stream::ACE_UPIPE_Stream (void)
+ACE_UPIPE_Stream::ACE_UPIPE_Stream ()
   : mb_last_ (0),
     reference_count_ (0)
 {
   ACE_TRACE ("ACE_UPIPE_Stream::ACE_UPIPE_STREAM");
 }
 
-ACE_UPIPE_Stream::~ACE_UPIPE_Stream (void)
+ACE_UPIPE_Stream::~ACE_UPIPE_Stream ()
 {
   if (this->mb_last_ != 0)
     {
@@ -41,7 +41,7 @@ ACE_UPIPE_Stream::control (int cmd,
 }
 
 void
-ACE_UPIPE_Stream::dump (void) const
+ACE_UPIPE_Stream::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_UPIPE_Stream::dump");
@@ -49,7 +49,7 @@ ACE_UPIPE_Stream::dump (void) const
 }
 
 int
-ACE_UPIPE_Stream::close (void)
+ACE_UPIPE_Stream::close ()
 {
   ACE_TRACE ("ACE_UPIPE_Stream::close");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
diff --git a/ACE/ace/UPIPE_Stream.h b/ACE/ace/UPIPE_Stream.h
index f81b76ae5f2..ca377e3e407 100644
--- a/ACE/ace/UPIPE_Stream.h
+++ b/ACE/ace/UPIPE_Stream.h
@@ -94,7 +94,7 @@ public:
   int get_remote_addr (ACE_UPIPE_Addr &remote_sap) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index dbac895fb8a..0b424fd3528 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -55,7 +55,7 @@ namespace ACE_Utils
     return *this;
   }
 
-  const ACE_CString * UUID::to_string (void) const
+  const ACE_CString * UUID::to_string () const
   {
     // Compute the string representation only once.
     if (0 != this->as_string_.get ())
@@ -319,7 +319,7 @@ namespace ACE_Utils
   }
 #endif // ACE_LACKS_SSCANF
 
-  UUID_Generator::UUID_Generator (void)
+  UUID_Generator::UUID_Generator ()
     : time_last_ (0),
       destroy_lock_ (true),
       is_init_ (false)
@@ -328,14 +328,14 @@ namespace ACE_Utils
     this->init ();
   }
 
-  UUID_Generator::~UUID_Generator (void)
+  UUID_Generator::~UUID_Generator ()
   {
     if (destroy_lock_)
       delete lock_;
   }
 
   void
-  UUID_Generator::init (void)
+  UUID_Generator::init ()
   {
     if (this->is_init_)
       return;
@@ -501,7 +501,7 @@ namespace ACE_Utils
   }
 
   ACE_SYNCH_MUTEX*
-  UUID_Generator::lock (void)
+  UUID_Generator::lock ()
   {
     return this->lock_;
   }
diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h
index 5ed3877da89..3745fc25fdf 100644
--- a/ACE/ace/UUID.h
+++ b/ACE/ace/UUID.h
@@ -43,12 +43,12 @@ namespace ACE_Utils
     typedef u_char Node_ID[NODE_ID_SIZE];
 
     /// Get the node id
-    Node_ID & node_ID (void);
+    Node_ID & node_ID ();
 
     /**
      * @overload
      */
-    const Node_ID & node_ID (void) const;
+    const Node_ID & node_ID () const;
 
     /// Test for equality.
     bool operator == (const UUID_Node & right) const;
@@ -86,7 +86,7 @@ namespace ACE_Utils
     enum { BINARY_SIZE = 16 };
 
     /// Constructor
-    UUID (void);
+    UUID ();
 
 #ifndef ACE_LACKS_SSCANF
     /// Constructs a UUID from a string representation.
@@ -96,36 +96,36 @@ namespace ACE_Utils
     UUID (const UUID &right);
 
     // Destructor
-    ~UUID (void);
+    ~UUID ();
 
-    ACE_UINT32 time_low (void) const;
+    ACE_UINT32 time_low () const;
     void time_low (ACE_UINT32);
 
-    ACE_UINT16 time_mid (void) const;
+    ACE_UINT16 time_mid () const;
     void time_mid (ACE_UINT16);
 
-    ACE_UINT16 time_hi_and_version (void) const;
+    ACE_UINT16 time_hi_and_version () const;
     void time_hi_and_version (ACE_UINT16);
 
-    u_char clock_seq_hi_and_reserved (void) const;
+    u_char clock_seq_hi_and_reserved () const;
     void clock_seq_hi_and_reserved (u_char);
 
-    u_char clock_seq_low (void) const;
+    u_char clock_seq_low () const;
     void clock_seq_low (u_char);
 
-    UUID_Node & node (void);
-    const UUID_Node & node (void) const;
+    UUID_Node & node ();
+    const UUID_Node & node () const;
 
     void node (const UUID_Node & node);
 
-    ACE_CString* thr_id (void);
+    ACE_CString* thr_id ();
     void thr_id (char*);
 
-    ACE_CString* pid (void);
+    ACE_CString* pid ();
     void pid (char*);
 
     /// Returns a string representation of the UUID
-    const ACE_CString* to_string (void) const;
+    const ACE_CString* to_string () const;
 
 #ifndef ACE_LACKS_SSCANF
     /// Set the value using a string
@@ -140,7 +140,7 @@ namespace ACE_Utils
     bool operator != (const UUID &right) const;
 
     /// Compute a hash value for the UUID.
-    unsigned long hash (void) const;
+    unsigned long hash () const;
 
     /// Assign an existing UUID to this UUID.
     const UUID & operator = (const UUID & rhs);
@@ -149,7 +149,7 @@ namespace ACE_Utils
 
   private:
     /// Initialize the UUID
-    void init (void);
+    void init ();
 
     /**
      * Helper method to convert from a string UUID.
@@ -203,14 +203,14 @@ namespace ACE_Utils
     enum {ACE_UUID_CLOCK_SEQ_MASK = 0x3FFF};
 
     /// Default constructor.
-    UUID_Generator(void);
+    UUID_Generator();
 
     /// Destructor.
     ~UUID_Generator();
 
     /// Initialize the UUID generator
     /// @deprecated This method may go away in some future release.
-    void init (void);
+    void init ();
 
     /// Format timestamp, clockseq, and nodeID into an UUID of the
     /// specified version and variant. For generating UUID's with
@@ -227,7 +227,7 @@ namespace ACE_Utils
 
     /// The locking strategy prevents multiple generators from accessing
     /// the UUID_state at the same time. Get the locking strategy.
-    ACE_SYNCH_MUTEX* lock (void);
+    ACE_SYNCH_MUTEX* lock ();
 
     /// Set a new locking strategy and return the old one.
     void lock (ACE_SYNCH_MUTEX* lock, bool release_lock);
diff --git a/ACE/ace/UUID.inl b/ACE/ace/UUID.inl
index cf3a3c150e9..12541cb543a 100644
--- a/ACE/ace/UUID.inl
+++ b/ACE/ace/UUID.inl
@@ -5,19 +5,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE_Utils
 {
   ACE_INLINE
-  const UUID_Node::Node_ID & UUID_Node::node_ID (void) const
+  const UUID_Node::Node_ID & UUID_Node::node_ID () const
   {
     return this->node_ID_;
   }
 
   ACE_INLINE
-  UUID_Node::Node_ID & UUID_Node::node_ID (void)
+  UUID_Node::Node_ID & UUID_Node::node_ID ()
   {
     return this->node_ID_;
   }
 
   ACE_INLINE
-  UUID::UUID (void)
+  UUID::UUID ()
   {
     this->init ();
   }
@@ -31,26 +31,26 @@ namespace ACE_Utils
   }
 
   ACE_INLINE
-  UUID::~UUID (void)
+  UUID::~UUID ()
   {
 
   }
 
   ACE_INLINE void
-  UUID::init (void)
+  UUID::init ()
   {
     ACE_OS::memset (&this->uuid_, 0, BINARY_SIZE);
   }
 
   ACE_INLINE unsigned long
-  UUID::hash (void) const
+  UUID::hash () const
   {
     return ACE::hash_pjw (reinterpret_cast <const char *> (&this->uuid_),
                           UUID::BINARY_SIZE);
   }
 
   ACE_INLINE ACE_UINT32
-  UUID::time_low (void) const
+  UUID::time_low () const
   {
     return this->uuid_.time_low_;
   }
@@ -62,7 +62,7 @@ namespace ACE_Utils
   }
 
   ACE_INLINE ACE_UINT16
-  UUID::time_mid (void) const
+  UUID::time_mid () const
   {
     return this->uuid_.time_mid_;
   }
@@ -74,7 +74,7 @@ namespace ACE_Utils
   }
 
   ACE_INLINE ACE_UINT16
-  UUID::time_hi_and_version (void) const
+  UUID::time_hi_and_version () const
   {
     return this->uuid_.time_hi_and_version_;
   }
@@ -86,7 +86,7 @@ namespace ACE_Utils
   }
 
   ACE_INLINE u_char
-  UUID::clock_seq_hi_and_reserved (void) const
+  UUID::clock_seq_hi_and_reserved () const
   {
     return this->uuid_.clock_seq_hi_and_reserved_;
   }
@@ -98,7 +98,7 @@ namespace ACE_Utils
   }
 
   ACE_INLINE u_char
-  UUID::clock_seq_low (void) const
+  UUID::clock_seq_low () const
   {
     return this->uuid_.clock_seq_low_;
   }
@@ -110,13 +110,13 @@ namespace ACE_Utils
   }
 
   ACE_INLINE const UUID_Node &
-  UUID::node (void) const
+  UUID::node () const
   {
     return this->uuid_.node_;
   }
 
   ACE_INLINE UUID_Node &
-  UUID::node (void)
+  UUID::node ()
   {
     return this->uuid_.node_;
   }
@@ -130,7 +130,7 @@ namespace ACE_Utils
   }
 
   ACE_INLINE ACE_CString*
-  UUID::thr_id (void)
+  UUID::thr_id ()
   {
     return &this->thr_id_;
   }
@@ -142,7 +142,7 @@ namespace ACE_Utils
   }
 
   ACE_INLINE ACE_CString*
-  UUID::pid (void)
+  UUID::pid ()
   {
     return &this->pid_;
   }
diff --git a/ACE/ace/Unbounded_Queue.cpp b/ACE/ace/Unbounded_Queue.cpp
index 02f96eeab5c..e12fd39327f 100644
--- a/ACE/ace/Unbounded_Queue.cpp
+++ b/ACE/ace/Unbounded_Queue.cpp
@@ -68,21 +68,21 @@ ACE_Unbounded_Queue<T>::operator= (const ACE_Unbounded_Queue<T> &us)
 }
 
 template <class T> ACE_Unbounded_Queue_Iterator<T>
-ACE_Unbounded_Queue<T>::begin (void)
+ACE_Unbounded_Queue<T>::begin ()
 {
   // ACE_TRACE ("ACE_Unbounded_Queue<T>::begin");
   return ACE_Unbounded_Queue_Iterator<T> (*this);
 }
 
 template <class T> ACE_Unbounded_Queue_Iterator<T>
-ACE_Unbounded_Queue<T>::end (void)
+ACE_Unbounded_Queue<T>::end ()
 {
   // ACE_TRACE ("ACE_Unbounded_Queue<T>::end");
   return ACE_Unbounded_Queue_Iterator<T> (*this, 1);
 }
 
 template <class T> void
-ACE_Unbounded_Queue<T>::dump (void) const
+ACE_Unbounded_Queue<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   //   ACE_TRACE ("ACE_Unbounded_Queue<T>::dump");
@@ -118,7 +118,7 @@ ACE_Unbounded_Queue<T>::copy_nodes (const ACE_Unbounded_Queue<T> &us)
 }
 
 template <class T> void
-ACE_Unbounded_Queue<T>::delete_nodes (void)
+ACE_Unbounded_Queue<T>::delete_nodes ()
 {
   for (ACE_Node<T> *curr = this->head_->next_;
        // Keep looking until we've hit the dummy node.
@@ -143,7 +143,7 @@ ACE_Unbounded_Queue<T>::delete_nodes (void)
 }
 
 template <class T>
-ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)
+ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue ()
 {
   //   ACE_TRACE ("ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)");
 
@@ -224,7 +224,7 @@ ACE_Unbounded_Queue<T>::dequeue_head (T &item)
 }
 
 template <class T> void
-ACE_Unbounded_Queue<T>::reset (void)
+ACE_Unbounded_Queue<T>::reset ()
 {
   ACE_TRACE ("reset");
 
@@ -319,7 +319,7 @@ ACE_Unbounded_Queue<T>::set (const T &item,
 // ****************************************************************
 
 template <class T> void
-ACE_Unbounded_Queue_Const_Iterator<T>::dump (void) const
+ACE_Unbounded_Queue_Const_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::dump");
@@ -335,7 +335,7 @@ ACE_Unbounded_Queue_Const_Iterator<T>::ACE_Unbounded_Queue_Const_Iterator (const
 }
 
 template <class T> int
-ACE_Unbounded_Queue_Const_Iterator<T>::advance (void)
+ACE_Unbounded_Queue_Const_Iterator<T>::advance ()
 {
   // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::advance");
   this->current_ = this->current_->next_;
@@ -343,7 +343,7 @@ ACE_Unbounded_Queue_Const_Iterator<T>::advance (void)
 }
 
 template <class T> int
-ACE_Unbounded_Queue_Const_Iterator<T>::first (void)
+ACE_Unbounded_Queue_Const_Iterator<T>::first ()
 {
   // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::first");
   this->current_ = this->queue_.head_->next_;
@@ -351,7 +351,7 @@ ACE_Unbounded_Queue_Const_Iterator<T>::first (void)
 }
 
 template <class T> int
-ACE_Unbounded_Queue_Const_Iterator<T>::done (void) const
+ACE_Unbounded_Queue_Const_Iterator<T>::done () const
 {
   ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::done");
 
@@ -374,7 +374,7 @@ ACE_Unbounded_Queue_Const_Iterator<T>::next (T *&item)
 // ****************************************************************
 
 template <class T> void
-ACE_Unbounded_Queue_Iterator<T>::dump (void) const
+ACE_Unbounded_Queue_Iterator<T>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::dump");
@@ -390,7 +390,7 @@ ACE_Unbounded_Queue_Iterator<T>::ACE_Unbounded_Queue_Iterator (ACE_Unbounded_Que
 }
 
 template <class T> int
-ACE_Unbounded_Queue_Iterator<T>::advance (void)
+ACE_Unbounded_Queue_Iterator<T>::advance ()
 {
   // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::advance");
   this->current_ = this->current_->next_;
@@ -398,7 +398,7 @@ ACE_Unbounded_Queue_Iterator<T>::advance (void)
 }
 
 template <class T> int
-ACE_Unbounded_Queue_Iterator<T>::first (void)
+ACE_Unbounded_Queue_Iterator<T>::first ()
 {
   // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::first");
   this->current_ = this->queue_.head_->next_;
@@ -406,7 +406,7 @@ ACE_Unbounded_Queue_Iterator<T>::first (void)
 }
 
 template <class T> int
-ACE_Unbounded_Queue_Iterator<T>::done (void) const
+ACE_Unbounded_Queue_Iterator<T>::done () const
 {
   ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::done");
 
diff --git a/ACE/ace/Unbounded_Queue.h b/ACE/ace/Unbounded_Queue.h
index cb0c748f9df..172f0b84319 100644
--- a/ACE/ace/Unbounded_Queue.h
+++ b/ACE/ace/Unbounded_Queue.h
@@ -46,17 +46,17 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the queue have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the queue.  Returns 0 if the
   /// queue is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -88,17 +88,17 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the queue have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the queue.  Returns 0 if the
   /// queue is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -175,7 +175,7 @@ public:
   /**
    * Clean up the memory for the queue.
    */
-  ~ACE_Unbounded_Queue (void);
+  ~ACE_Unbounded_Queue ();
 
   // = Check boundary conditions.
 
@@ -183,13 +183,13 @@ public:
   /**
    * Constant time check to see if the queue is empty.
    */
-  bool is_empty (void) const;
+  bool is_empty () const;
 
   /// Returns 0.
   /**
    * The queue cannot be full, so it always returns 0.
    */
-  bool is_full (void) const;
+  bool is_full () const;
 
   // = Classic queue operations.
 
@@ -221,7 +221,7 @@ public:
   /**
    * Delete the queue nodes.
    */
-  void reset (void);
+  void reset ();
 
   /// Get the @a slot th element in the set.  Returns -1 if the element
   /// isn't in the range {0..#cur_size_ - 1}, else 0.
@@ -244,21 +244,21 @@ public:
   /**
    * Return the size of the queue.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL-styled unidirectional iterator factory.
-  ACE_Unbounded_Queue_Iterator<T> begin (void);
-  ACE_Unbounded_Queue_Iterator<T> end (void);
+  ACE_Unbounded_Queue_Iterator<T> begin ();
+  ACE_Unbounded_Queue_Iterator<T> end ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Delete all the nodes in the queue.
-  void delete_nodes (void);
+  void delete_nodes ();
 
   /// Copy nodes into this queue.
   void copy_nodes (const ACE_Unbounded_Queue<T> &);
diff --git a/ACE/ace/Unbounded_Queue.inl b/ACE/ace/Unbounded_Queue.inl
index b3e76ad999d..0ff0cecc476 100644
--- a/ACE/ace/Unbounded_Queue.inl
+++ b/ACE/ace/Unbounded_Queue.inl
@@ -2,20 +2,20 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T> ACE_INLINE size_t
-ACE_Unbounded_Queue<T>::size (void) const
+ACE_Unbounded_Queue<T>::size () const
 {
   return this->cur_size_;
 }
 
 template <class T> ACE_INLINE bool
-ACE_Unbounded_Queue<T>::is_empty (void) const
+ACE_Unbounded_Queue<T>::is_empty () const
 {
   //  ACE_TRACE ("ACE_Unbounded_Queue<T>::is_empty");
   return this->head_ == this->head_->next_;
 }
 
 template <class T> ACE_INLINE bool
-ACE_Unbounded_Queue<T>::is_full (void) const
+ACE_Unbounded_Queue<T>::is_full () const
 {
   //  ACE_TRACE ("ACE_Unbounded_Queue<T>::is_full");
   return false; // We should implement a "node of last resort for this..."
diff --git a/ACE/ace/Unbounded_Set_Ex.cpp b/ACE/ace/Unbounded_Set_Ex.cpp
index d6460cef1c5..7e6ddafdc4a 100644
--- a/ACE/ace/Unbounded_Set_Ex.cpp
+++ b/ACE/ace/Unbounded_Set_Ex.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex)
 
 template <class T, class C> size_t
-ACE_Unbounded_Set_Ex<T, C>::size (void) const
+ACE_Unbounded_Set_Ex<T, C>::size () const
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::size");
   return this->cur_size_;
@@ -49,7 +49,7 @@ ACE_Unbounded_Set_Ex<T, C>::insert_tail (const T &item)
 }
 
 template <class T, class C> void
-ACE_Unbounded_Set_Ex<T, C>::reset (void)
+ACE_Unbounded_Set_Ex<T, C>::reset ()
 {
   ACE_TRACE ("reset");
 
@@ -57,7 +57,7 @@ ACE_Unbounded_Set_Ex<T, C>::reset (void)
 }
 
 template <class T, class C> void
-ACE_Unbounded_Set_Ex<T, C>::dump (void) const
+ACE_Unbounded_Set_Ex<T, C>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::dump");
@@ -92,7 +92,7 @@ ACE_Unbounded_Set_Ex<T, C>::copy_nodes (const ACE_Unbounded_Set_Ex<T, C> &us)
 }
 
 template <class T, class C> void
-ACE_Unbounded_Set_Ex<T, C>::delete_nodes (void)
+ACE_Unbounded_Set_Ex<T, C>::delete_nodes ()
 {
   NODE *curr = this->head_->next_;
 
@@ -114,7 +114,7 @@ ACE_Unbounded_Set_Ex<T, C>::delete_nodes (void)
 }
 
 template <class T, class C>
-ACE_Unbounded_Set_Ex<T, C>::~ACE_Unbounded_Set_Ex (void)
+ACE_Unbounded_Set_Ex<T, C>::~ACE_Unbounded_Set_Ex ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::~ACE_Unbounded_Set_Ex");
 
@@ -256,28 +256,28 @@ ACE_Unbounded_Set_Ex<T, C>::remove (const T &item)
 }
 
 template <class T, class C> typename ACE_Unbounded_Set_Ex<T, C>::iterator
-ACE_Unbounded_Set_Ex<T, C>::begin (void)
+ACE_Unbounded_Set_Ex<T, C>::begin ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::begin");
   return iterator (*this);
 }
 
 template <class T, class C> typename ACE_Unbounded_Set_Ex<T, C>::iterator
-ACE_Unbounded_Set_Ex<T, C>::end (void)
+ACE_Unbounded_Set_Ex<T, C>::end ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::end");
   return iterator (*this, 1);
 }
 
 template <class T, class C> typename ACE_Unbounded_Set_Ex<T, C>::const_iterator
-ACE_Unbounded_Set_Ex<T, C>::begin (void) const
+ACE_Unbounded_Set_Ex<T, C>::begin () const
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::begin");
   return const_iterator (*this);
 }
 
 template <class T, class C> typename ACE_Unbounded_Set_Ex<T, C>::const_iterator
-ACE_Unbounded_Set_Ex<T, C>::end (void) const
+ACE_Unbounded_Set_Ex<T, C>::end () const
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::end");
   return const_iterator (*this, 1);
@@ -286,7 +286,7 @@ ACE_Unbounded_Set_Ex<T, C>::end (void) const
 ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex_Iterator)
 
 template <class T, class C> void
-ACE_Unbounded_Set_Ex_Iterator<T, C>::dump (void) const
+ACE_Unbounded_Set_Ex_Iterator<T, C>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::dump");
@@ -304,7 +304,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::ACE_Unbounded_Set_Ex_Iterator (
 }
 
 template <class T, class C> int
-ACE_Unbounded_Set_Ex_Iterator<T, C>::advance (void)
+ACE_Unbounded_Set_Ex_Iterator<T, C>::advance ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::advance");
   this->current_ = this->current_->next_;
@@ -312,7 +312,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::advance (void)
 }
 
 template <class T, class C> int
-ACE_Unbounded_Set_Ex_Iterator<T, C>::first (void)
+ACE_Unbounded_Set_Ex_Iterator<T, C>::first ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::first");
   this->current_ = this->set_->head_->next_;
@@ -320,7 +320,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::first (void)
 }
 
 template <class T, class C> int
-ACE_Unbounded_Set_Ex_Iterator<T, C>::done (void) const
+ACE_Unbounded_Set_Ex_Iterator<T, C>::done () const
 {
   ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::done");
 
@@ -353,7 +353,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ (int)
 }
 
 template <class T, class C> ACE_Unbounded_Set_Ex_Iterator<T, C>&
-ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ (void)
+ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ (void)");
 
@@ -364,7 +364,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ (void)
 }
 
 template <class T, class C> T&
-ACE_Unbounded_Set_Ex_Iterator<T, C>::operator* (void)
+ACE_Unbounded_Set_Ex_Iterator<T, C>::operator* ()
 {
   //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::operator*");
   T *retv = 0;
@@ -393,7 +393,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::operator!= (const ACE_Unbounded_Set_Ex_Iter
 ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex_Const_Iterator)
 
 template <class T, class C> void
-ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::dump (void) const
+ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::dump () const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::dump");
@@ -411,7 +411,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::ACE_Unbounded_Set_Ex_Const_Iterator (
 }
 
 template <class T, class C> int
-ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::advance (void)
+ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::advance ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::advance");
   this->current_ = this->current_->next_;
@@ -419,7 +419,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::advance (void)
 }
 
 template <class T, class C> int
-ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::first (void)
+ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::first ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::first");
   this->current_ = this->set_->head_->next_;
@@ -427,7 +427,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::first (void)
 }
 
 template <class T, class C> int
-ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::done (void) const
+ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::done () const
 {
   ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::done");
 
@@ -460,7 +460,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ (int)
 }
 
 template <class T, class C> ACE_Unbounded_Set_Ex_Const_Iterator<T, C>&
-ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ (void)
+ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ ()
 {
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ (void)");
 
@@ -471,7 +471,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ (void)
 }
 
 template <class T, class C> T&
-ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator* (void)
+ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator* ()
 {
   //ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator*");
   T *retv = 0;
diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h
index 7d5a3a4b6e3..c59c1ec81ae 100644
--- a/ACE/ace/Unbounded_Set_Ex.h
+++ b/ACE/ace/Unbounded_Set_Ex.h
@@ -62,17 +62,17 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the set.  Returns 0 if the
   /// set is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
@@ -80,10 +80,10 @@ public:
   ACE_Unbounded_Set_Ex_Iterator<T, C> operator++ (int);
 
   /// Prefix advance.
-  ACE_Unbounded_Set_Ex_Iterator<T, C>& operator++ (void);
+  ACE_Unbounded_Set_Ex_Iterator<T, C>& operator++ ();
 
   /// Returns a reference to the internal element @c this is pointing to.
-  T& operator* (void);
+  T& operator* ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Unbounded_Set_Ex_Iterator<T, C> &) const;
@@ -129,17 +129,17 @@ public:
 
   /// Move forward by one element in the set.  Returns 0 when all the
   /// items in the set have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Move to the first element in the set.  Returns 0 if the
   /// set is empty, else 1.
-  int first (void);
+  int first ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
@@ -147,10 +147,10 @@ public:
   ACE_Unbounded_Set_Ex_Const_Iterator<T, C> operator++ (int);
 
   /// Prefix advance.
-  ACE_Unbounded_Set_Ex_Const_Iterator<T, C>& operator++ (void);
+  ACE_Unbounded_Set_Ex_Const_Iterator<T, C>& operator++ ();
 
   /// Returns a reference to the internal element @c this is pointing to.
-  T& operator* (void);
+  T& operator* ();
 
   /// Check if two iterators point to the same position
   bool operator== (const ACE_Unbounded_Set_Ex_Const_Iterator<T, C> &) const;
@@ -258,7 +258,7 @@ public:
   /**
    * Destroy the nodes of the set.
    */
-  ~ACE_Unbounded_Set_Ex (void);
+  ~ACE_Unbounded_Set_Ex ();
 
   // = Check boundary conditions.
 
@@ -266,13 +266,13 @@ public:
   /**
    * Constant time is_empty check.
    */
-  bool is_empty (void) const;
+  bool is_empty () const;
 
   /// Returns @c false.
   /**
    * Always returns @c false since the set can never fill up.
    */
-  bool is_full (void) const;
+  bool is_full () const;
 
   // = Classic unordered set operations.
 
@@ -310,29 +310,29 @@ public:
   /**
    * Access the size of the set.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Reset the ACE_Unbounded_Set_Ex to be empty.
   /**
    * Delete the nodes of the set.
    */
-  void reset (void);
+  void reset ();
 
   // = STL-styled unidirectional iterator factory.
-  iterator begin (void);
-  iterator end (void);
-  const_iterator begin (void) const;
-  const_iterator end (void) const;
+  iterator begin ();
+  iterator end ();
+  const_iterator begin () const;
+  const_iterator end () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
   /// Delete all the nodes in the Set.
-  void delete_nodes (void);
+  void delete_nodes ();
 
   /// Copy nodes into this set.
   void copy_nodes (const ACE_Unbounded_Set_Ex<T, C> &);
diff --git a/ACE/ace/Unbounded_Set_Ex.inl b/ACE/ace/Unbounded_Set_Ex.inl
index bbb8772d6fc..65e8b67913f 100644
--- a/ACE/ace/Unbounded_Set_Ex.inl
+++ b/ACE/ace/Unbounded_Set_Ex.inl
@@ -4,14 +4,14 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T, class C> ACE_INLINE bool
-ACE_Unbounded_Set_Ex<T,C>::is_empty (void) const
+ACE_Unbounded_Set_Ex<T,C>::is_empty () const
 {
   ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::is_empty");
   return this->head_ == this->head_->next_;
 }
 
 template <class T, class C> ACE_INLINE bool
-ACE_Unbounded_Set_Ex<T, C>::is_full (void) const
+ACE_Unbounded_Set_Ex<T, C>::is_full () const
 {
   ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::is_full");
   return 0; // We should implement a "node of last resort for this..."
diff --git a/ACE/ace/Value_Ptr.h b/ACE/ace/Value_Ptr.h
index 8d22e5e2bb1..f099bd6ebac 100644
--- a/ACE/ace/Value_Ptr.h
+++ b/ACE/ace/Value_Ptr.h
@@ -70,13 +70,13 @@ namespace ACE
     explicit Value_Ptr (T * p = 0) : p_ (p) { }
 
     /// Destructor.
-    ~Value_Ptr (void) { delete this->p_; }
+    ~Value_Ptr () { delete this->p_; }
 
     /// Deference operator.
-    T & operator* (void) const { return *this->p_; }
+    T & operator* () const { return *this->p_; }
 
     /// Pointer operator.
-    T * operator-> (void) const { return this->p_; }
+    T * operator-> () const { return this->p_; }
 
     /// Non-throwing swap operation used to make assignment strongly
     /// exception-safe.
diff --git a/ACE/ace/Vector_T.cpp b/ACE/ace/Vector_T.cpp
index 3cbec049a46..393ea530c63 100644
--- a/ACE/ace/Vector_T.cpp
+++ b/ACE/ace/Vector_T.cpp
@@ -44,7 +44,7 @@ void ACE_Vector<T, DEFAULT_SIZE>::push_back (const T& elem)
 }
 
 template <class T, size_t DEFAULT_SIZE>
-void ACE_Vector<T, DEFAULT_SIZE>::dump (void) const
+void ACE_Vector<T, DEFAULT_SIZE>::dump () const
 {
 }
 
diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h
index d88cb53d3f5..e132dd9851c 100644
--- a/ACE/ace/Vector_T.h
+++ b/ACE/ace/Vector_T.h
@@ -99,7 +99,7 @@ public:
    *
    * @return Current buffer size of the vector
    */
-  size_t capacity (void) const;
+  size_t capacity () const;
 
   /**
    * Returns the vector's dynamic size / actual current size of the
@@ -109,13 +109,13 @@ public:
    *
    * @return Dynamic size / actual current size of the vector.
    */
-  size_t size (void) const;
+  size_t size () const;
 
   /**
    * Clears out the vector.  It does not reallocate the vector's
    * buffer, it is just sets the vector's dynamic size to 0.
    */
-  void clear (void);
+  void clear ();
 
   /**
    * Resizes the vector to the new capacity.  If the vector's current
@@ -151,7 +151,7 @@ public:
    * vector.  The vector's buffer does not get reallocated for
    * performance.
    */
-  void pop_back (void);
+  void pop_back ();
 
   /**
    * This function dumps the content of the vector.  TO BE MOVED out
@@ -167,7 +167,7 @@ public:
    *
    * This function calls T::dump() for each element of the vector.
    */
-  void dump (void) const;
+  void dump () const;
 
   // = Compare operators
 
@@ -236,13 +236,13 @@ public:
 
   /// Move forward by one element in the vector.  Returns 0 when all the
   /// items in the vector have been seen, else 1.
-  int advance (void);
+  int advance ();
 
   /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
+  int done () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Vector_T.inl b/ACE/ace/Vector_T.inl
index 103bb93beec..9079375a5d6 100644
--- a/ACE/ace/Vector_T.inl
+++ b/ACE/ace/Vector_T.inl
@@ -18,25 +18,25 @@ ACE_Vector<T, DEFAULT_SIZE>::~ACE_Vector ()
 }
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE
-size_t ACE_Vector<T, DEFAULT_SIZE>::capacity (void) const
+size_t ACE_Vector<T, DEFAULT_SIZE>::capacity () const
 {
   return curr_max_size_;
 }
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE
-size_t ACE_Vector<T, DEFAULT_SIZE>::size (void) const
+size_t ACE_Vector<T, DEFAULT_SIZE>::size () const
 {
   return length_;
 }
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE
-void ACE_Vector<T, DEFAULT_SIZE>::clear (void)
+void ACE_Vector<T, DEFAULT_SIZE>::clear ()
 {
   length_ = 0;
 }
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE
-void ACE_Vector<T, DEFAULT_SIZE>::pop_back (void)
+void ACE_Vector<T, DEFAULT_SIZE>::pop_back ()
 {
   if (length_ > 0)
     {
@@ -76,7 +76,7 @@ ACE_Vector<T, DEFAULT_SIZE>::swap (ACE_Vector &rhs)
 // ****************************************************************
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE void
-ACE_Vector_Iterator<T, DEFAULT_SIZE>::dump (void) const
+ACE_Vector_Iterator<T, DEFAULT_SIZE>::dump () const
 {
   // ACE_TRACE ("ACE_Vector_Iterator<T>::dump");
 }
@@ -90,7 +90,7 @@ ACE_Vector_Iterator<T, DEFAULT_SIZE>::ACE_Vector_Iterator (ACE_Vector<T, DEFAULT
 }
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE int
-ACE_Vector_Iterator<T, DEFAULT_SIZE>::advance (void)
+ACE_Vector_Iterator<T, DEFAULT_SIZE>::advance ()
 {
   // ACE_TRACE ("ACE_Vector_Iterator<T>::advance");
 
@@ -105,7 +105,7 @@ ACE_Vector_Iterator<T, DEFAULT_SIZE>::advance (void)
 }
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE int
-ACE_Vector_Iterator<T, DEFAULT_SIZE>::done (void) const
+ACE_Vector_Iterator<T, DEFAULT_SIZE>::done () const
 {
   ACE_TRACE ("ACE_Vector_Iterator<T>::done");
 
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 9789be85f49..0d4635b824b 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,8 +4,8 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 11
-#define ACE_BETA_VERSION 11
-#define ACE_VERSION "6.5.11"
-#define ACE_VERSION_CODE 394507
+#define ACE_MICRO_VERSION 12
+#define ACE_BETA_VERSION 12
+#define ACE_VERSION "6.5.12"
+#define ACE_VERSION_CODE 394508
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index 5f901b14108..a835962f7ae 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/ACE/ace/WFMO_Reactor.cpp
@@ -1052,7 +1052,7 @@ ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &)
   ACE_NOTSUP_RETURN (-1);
 }
 
-#if defined (ACE_WIN32_VC8)
+#if defined (_MSC_VER)
 #  pragma warning (push)
 #  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
 #  endif
@@ -1121,7 +1121,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("WFMO_Reactor")));
 }
-#if defined (ACE_WIN32_VC8)
+#if defined (_MSC_VER)
 #  pragma warning (pop)
 #endif
 
@@ -1384,11 +1384,7 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
 
   long new_network_events = 0;
   bool delete_event = false;
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr <ACE_Auto_Event> event;
-#else
-  auto_ptr <ACE_Auto_Event> event;
-#endif /* ACE_HAS_CPP11 */
 
   // Look up the repository to see if the <event_handler> is already
   // there.
@@ -1405,15 +1401,8 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
   // need to create one
   if (event_handle == ACE_INVALID_HANDLE)
     {
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event);
       event = std::move(tmp);
-#else
-      // Note: don't change this since some C++ compilers have
-      // <auto_ptr>s that don't work properly...
-      auto_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event);
-      event = tmp;
-#endif /* ACE_HAS_CPP11 */
       event_handle = event->handle ();
       delete_event = true;
     }
diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h
index 4d4dccd151f..fb778aba0cf 100644
--- a/ACE/ace/WFMO_Reactor.h
+++ b/ACE/ace/WFMO_Reactor.h
@@ -172,7 +172,7 @@ public:
     void set (Common_Info &common_info);
 
     /// Dump the state of an object.
-    void dump (void) const;
+    void dump () const;
   };
 
   /**
@@ -249,7 +249,7 @@ public:
               bool suspend_entry = false);
 
     /// Dump the state of an object.
-    void dump (void) const;
+    void dump () const;
   };
 
   /**
@@ -290,7 +290,7 @@ public:
               bool resume_entry = false);
 
     /// Dump the state of an object.
-    void dump (void) const;
+    void dump () const;
   };
 
   /// Constructor.
@@ -427,7 +427,7 @@ public:
                               long &existing_masks);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// Reference to our WFMO_Reactor.
@@ -572,7 +572,7 @@ public:
                                            ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
 private:
   /// Pointer to the wfmo_reactor's timer queue.
@@ -1167,7 +1167,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Dump the state of an object.
-  virtual void dump (void) const;
+  virtual void dump () const;
 
 protected:
   /// Registration workhorse
diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp
index d914ccfc463..710db21683c 100644
--- a/ACE/ace/WIN32_Asynch_IO.cpp
+++ b/ACE/ace/WIN32_Asynch_IO.cpp
@@ -168,25 +168,25 @@ ACE_WIN32_Asynch_Operation::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
 int
 ACE_WIN32_Asynch_Operation::cancel (void)
 {
-#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+#if defined (ACE_HAS_CANCEL_IO)
   // All I/O operations that are canceled will complete with the error
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
   // operations will occur normally.
 
-  // @@ This API returns 0 on failure. So, I am returning -1 in that
-  //    case. Is that right? (Alex).
+#if (_WIN32_WINNT < 0x0600)
   int const result = (int) ::CancelIo (this->handle_);
-
+#else
+  int const result = (int) ::CancelIoEx (this->handle_, 0);
+#endif // < _WIN32_WINNT_VISTA
   if (result == 0)
     // Couldn't cancel the operations.
     return 2;
 
   // result is non-zero. All the operations are cancelled then.
   return 0;
-
-#else /* !ACE_HAS_WIN32_OVERLAPPED_IO */
+#else /* !ACE_HAS_CANCEL_IO */
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_AIO_CALLS */
+#endif /* ACE_HAS_CANCEL_IO */
 }
 
 ACE_Proactor *
diff --git a/ACE/ace/XML_Utils/XML_Error_Handler.h b/ACE/ace/XML_Utils/XML_Error_Handler.h
index 6d1b1987742..57d0835f998 100644
--- a/ACE/ace/XML_Utils/XML_Error_Handler.h
+++ b/ACE/ace/XML_Utils/XML_Error_Handler.h
@@ -43,9 +43,10 @@ namespace XML
     void resetErrors();
     bool getErrors (void) const;
   private :
-    // Disallow copying
-    XML_Error_Handler (const XML_Error_Handler&);
-    XML_Error_Handler& operator= (const XML_Error_Handler&);
+    XML_Error_Handler (const XML_Error_Handler&) = delete;
+    XML_Error_Handler& operator= (const XML_Error_Handler&) = delete;
+    XML_Error_Handler (XML_Error_Handler&&) = delete;
+    XML_Error_Handler& operator= (XML_Error_Handler&&) = delete;
 
     bool errors_;
   };
diff --git a/ACE/ace/XML_Utils/XML_Helper.h b/ACE/ace/XML_Utils/XML_Helper.h
index 001a575b947..9deeda5e94d 100644
--- a/ACE/ace/XML_Utils/XML_Helper.h
+++ b/ACE/ace/XML_Utils/XML_Helper.h
@@ -83,11 +83,7 @@ namespace XML
   private:
     bool initialized_;
     XERCES_CPP_NAMESPACE::DOMImplementation *impl_;
-#if defined (ACE_HAS_CPP11)
     mutable std::unique_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_;
-#else
-    mutable std::auto_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_;
-#endif /* ACE_HAS_CPP11 */
 
     Resolver *resolver_;
     bool release_resolver_;
diff --git a/ACE/ace/XML_Utils/XSCRT/Elements.hpp b/ACE/ace/XML_Utils/XSCRT/Elements.hpp
index 5395a2a930a..cb9cdec2d90 100644
--- a/ACE/ace/XML_Utils/XSCRT/Elements.hpp
+++ b/ACE/ace/XML_Utils/XSCRT/Elements.hpp
@@ -148,11 +148,7 @@ namespace XSCRT
     {
       if (map_.get () == 0)
       {
-#if defined (ACE_HAS_CPP11)
         map_ = std::unique_ptr<Map_> (new Map_);
-#else
-        map_ = std::auto_ptr<Map_> (new Map_);
-#endif /* ACE_HAS_CPP11 */
       }
 
       if (!map_->insert (std::pair<IdentityProvider const*, Type*> (&id, t)).second)
@@ -266,11 +262,7 @@ namespace XSCRT
     std::map<IdentityProvider const*, Type*, IdentityComparator>
     Map_;
 
-#if defined (ACE_HAS_CPP11)
     std::unique_ptr<Map_> map_;
-#else
-    std::auto_ptr<Map_> map_;
-#endif /* ACE_HAS_CPP11 */
   };
 
   // Fundamental types template.
diff --git a/ACE/ace/XTI_ATM_Mcast.h b/ACE/ace/XTI_ATM_Mcast.h
index 89f4ee11c99..b62ba08e67d 100644
--- a/ACE/ace/XTI_ATM_Mcast.h
+++ b/ACE/ace/XTI_ATM_Mcast.h
@@ -115,7 +115,7 @@ public:
   typedef ACE_TLI_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 7afc673328b..f6a73d9704f 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -150,10 +150,10 @@ public:
   ACE_Wide_To_Ascii (const wchar_t *s);
 
   /// Destructor will free up the memory.
-  ~ACE_Wide_To_Ascii (void);
+  ~ACE_Wide_To_Ascii ();
 
   /// Return the internal char* representation.
-  char *char_rep (void);
+  char *char_rep ();
 
   /// Converts an wchar_t string to ascii and returns a new string.
   static char *convert (const wchar_t *wstr);
@@ -167,7 +167,7 @@ private:
 #endif /* ACE_HAS_ICONV */
 
   /// Disallow these operation.
-  ACE_Wide_To_Ascii (void);
+  ACE_Wide_To_Ascii ();
   ACE_Wide_To_Ascii (ACE_Wide_To_Ascii &);
   ACE_Wide_To_Ascii& operator= (ACE_Wide_To_Ascii &);
 };
@@ -188,10 +188,10 @@ public:
   ACE_Ascii_To_Wide (const char *s);
 
   /// Destructor will free up the memory.
-  ~ACE_Ascii_To_Wide (void);
+  ~ACE_Ascii_To_Wide ();
 
   /// Return the internal wchar* representation.
-  wchar_t *wchar_rep (void);
+  wchar_t *wchar_rep ();
 
   /// Converts an char string to unicode/wide and returns a new string.
   static wchar_t *convert (const char *str);
@@ -205,7 +205,7 @@ private:
 #endif /* ACE_HAS_ICONV */
 
   /// Disallow these operation.
-  ACE_Ascii_To_Wide (void);
+  ACE_Ascii_To_Wide ();
   ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &);
   ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &);
 };
diff --git a/ACE/ace/ace_wchar.inl b/ACE/ace/ace_wchar.inl
index 438d6672dc8..752c177f680 100644
--- a/ACE/ace/ace_wchar.inl
+++ b/ACE/ace/ace_wchar.inl
@@ -11,13 +11,13 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 inline
-ACE_Wide_To_Ascii::~ACE_Wide_To_Ascii (void)
+ACE_Wide_To_Ascii::~ACE_Wide_To_Ascii ()
 {
   delete [] this->s_;
 }
 
 inline char *
-ACE_Wide_To_Ascii::char_rep (void)
+ACE_Wide_To_Ascii::char_rep ()
 {
   return this->s_;
 }
@@ -101,13 +101,13 @@ ACE_Wide_To_Ascii::ACE_Wide_To_Ascii (const wchar_t *s)
 }
 
 inline
-ACE_Ascii_To_Wide::~ACE_Ascii_To_Wide (void)
+ACE_Ascii_To_Wide::~ACE_Ascii_To_Wide ()
 {
   delete [] this->s_;
 }
 
 inline wchar_t *
-ACE_Ascii_To_Wide::wchar_rep (void)
+ACE_Ascii_To_Wide::wchar_rep ()
 {
   return this->s_;
 }
diff --git a/ACE/ace/checked_iterator.h b/ACE/ace/checked_iterator.h
index 473ca5c9db9..bdbe4e3cf2c 100644
--- a/ACE/ace/checked_iterator.h
+++ b/ACE/ace/checked_iterator.h
@@ -30,12 +30,12 @@
  * @author Ossama Othman
  */
 
-# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) && (!defined (_STLPORT_VERSION))
-// Checked iterators are currently only supported in MSVC++ 8 or better.
+# if defined (_MSC_VER) && (!defined (_STLPORT_VERSION))
+// Checked iterators are currently only supported in MSVC++
 #  include <iterator>
-# endif  /* _MSC_VER >= 1400 && !_STLPORT_VERSION */
+# endif  /* _MSC_VER && !_STLPORT_VERSION */
 
-# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) && (!defined (_STLPORT_VERSION))
+# if defined (_MSC_VER) && (!defined (_STLPORT_VERSION))
 template <typename PTR>
 stdext::checked_array_iterator<PTR>
 ACE_make_checked_array_iterator (PTR buf, size_t len)
@@ -51,6 +51,6 @@ ACE_make_checked_array_iterator (PTR buf, size_t /* len */)
   // the buffer itself.
   return buf;
 }
-# endif  /* _MSC_VER >= 1400 && !_STLPORT_VERSION */
+# endif  /* _MSC_VER && !_STLPORT_VERSION */
 
 #endif  /* ACE_CHECKED_ITERATOR_H */
diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h
index e9414226f7e..584dc2f762b 100644
--- a/ACE/ace/config-WinCE.h
+++ b/ACE/ace/config-WinCE.h
@@ -25,15 +25,6 @@
 # define ACE_HAS_WINCE 1
 #endif
 
-#if defined (_MSC_VER) && (_MSC_VER < 1400)
-// WinCE prior to Visual Studio 2005 integration doesn't have most of
-// the standard C library time functions. It also doesn't define struct tm.
-// SYSTEMTIME has pretty much the same info though, so we can map it when
-// needed. Define struct tm here and use it when needed. This is taken
-// from the standard C library.
-# define ACE_LACKS_STRUCT_TM
-#endif
-
 // We need these libraries to build:
 #if defined (_MSC_VER)
 #  pragma comment(lib,"corelibc.lib")
@@ -102,10 +93,10 @@
 #endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
 
 // FILE stuff isn't always defined in CE
-#if (_MSC_VER < 1400) && !defined (_FILE_DEFINED)
+#if !defined (_FILE_DEFINED)
   typedef void FILE;
 # define _FILE_DEFINED
-#endif  /* _MSC_VER < 1400 && !_FILE_DEFINED */
+#endif  /* !_FILE_DEFINED */
 
 // This was defined in previous versions of CE, but not 2.11
 #define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index 5969745ee4f..a21755e98ab 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -94,11 +94,6 @@
 
 # define ACE_HAS_SSIZE_T
 
-# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 0))
-// We have to explicitly instantiate static template members prior to g++ 4.1
-#   define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-#endif /* g++ prior to 4.1 */
-
 # if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
     // ACE_MT_SAFE is #defined below, for all compilers.
 #   if !defined (_REENTRANT)
@@ -312,7 +307,6 @@
 // AIX 5.1 has netinet/tcp.h
 #undef ACE_LACKS_NETINET_TCP_H
 
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_SCANDIR
 #define ACE_SCANDIR_CMP_USES_VOIDPTR
 #define ACE_SCANDIR_SEL_LACKS_CONST
diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h
index fd1b067ea81..c93e64b1fab 100644
--- a/ACE/ace/config-cygwin32.h
+++ b/ACE/ace/config-cygwin32.h
@@ -90,7 +90,6 @@
 #define ACE_HAS_POLL
 #define ACE_HAS_SOCKADDR_MSG_NAME 1
 #define ACE_LACKS_PRI_T 1
-#define ACE_HAS_3_PARAM_READDIR_R
 
 // Compiler/platform supports alloca().
 // Although ACE does have alloca() on this compiler/platform combination, it is
diff --git a/ACE/ace/config-face-conftest.h b/ACE/ace/config-face-conftest.h
index 4cf74e11318..17285562e35 100644
--- a/ACE/ace/config-face-conftest.h
+++ b/ACE/ace/config-face-conftest.h
@@ -16,7 +16,6 @@
 #define ACE_THREAD_T_IS_A_STRUCT
 #define ACE_DEFAULT_SEM_KEY {}
 
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_DIRENT
diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h
index 34fb9c2f7e4..0c1fa8e7c56 100644
--- a/ACE/ace/config-freebsd.h
+++ b/ACE/ace/config-freebsd.h
@@ -25,7 +25,6 @@
 # undef ACE_HAS_PENTIUM
 #endif /* ACE_HAS_PENTIUM */
 
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_3_PARAM_WCSTOK
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_ALLOCA
@@ -133,7 +132,6 @@
 # define ACE_LACKS_SIGSET
 # define ACE_LACKS_SIGSET_T
 # define ACE_LACKS_RWLOCK_T
-# define ACE_LACKS_READDIR_R
 # define ACE_LACKS_SETSCHED
 # define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 # define ACE_LACKS_UCONTEXT_H
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index 9bbc68d1d1c..50daf671852 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -20,16 +20,9 @@
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #define ACE_TEMPLATES_REQUIRE_SOURCE
-
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
-#endif /* __GNUC__ >= 3.4 */
-
+#define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
 #define ACE_NEW_THROWS_EXCEPTIONS
-#if (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
-// Versions of g++ prior to 3.3 had a buggy operator // new(nothrow)[]().
-#  define ACE_HAS_NEW_NOTHROW
-#endif /* __GNUC__ >= 3.3 */
+#define ACE_HAS_NEW_NOTHROW
 
 #if __cplusplus >= 201103L
 # define ACE_HAS_CPP11
@@ -94,15 +87,9 @@
    __attribute__ ((format (TYPE, STR_INDEX, FIRST_INDEX)))
 #endif
 
-// GNU g++ >= 4.x implements "#pragma once".
-#if (__GNUC__ < 4) && !defined (ACE_LACKS_PRAGMA_ONCE)
-// We define it with a -D with make depend.
-# define ACE_LACKS_PRAGMA_ONCE
-#endif /* ! ACE_LACKS_PRAGMA_ONCE */
-
-// Take advantage of G++ (>= 4.x) visibility attributes to generate
+// Take advantage of g++ visibility attributes to generate
 // improved shared library binaries.
-#if (__GNUC__ >= 4) && !defined (__MINGW32__) && !defined (ACE_HAS_CEGCC)
+#if !defined (__MINGW32__) && !defined (ACE_HAS_CEGCC)
 
 # if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0
 #  undef ACE_HAS_CUSTOM_EXPORT_MACROS
@@ -121,18 +108,8 @@
 #    define ACE_Proper_Import_Flag __attribute__ ((visibility("default")))
 #  endif /* !ACE_Proper_Import_Flag */
 
-#  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
-// Sadly, G++ 4.x silently ignores visibility attributes on
-// template instantiations, which breaks singletons.
-// As a workaround, we use the GCC visibility pragmas.
-// And to make them fit in a macro, we use C99's _Pragma()
-// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17470
-// This has been fixed in GCC 4.1.1 with FC6 but not with SuSE 10.2
-// that gets shipped with GCC 4.1.2 so we assume that with GCC 4.2
-// this will be fixed on the head. With FC6 just set this define yourself
-#   ifndef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS
-#     define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
-#   endif
+#  ifndef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS
+#    define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
 #  endif
 
 #  if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS) && ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS == 1
@@ -156,20 +133,12 @@
 # define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
 
 # endif  /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
-#endif  /* __GNU__ >= 4 */
+#endif  /* !__MINGW32__ && !ACE_HAS_CEGCC */
 
-// GCC >= 4.1 provides __sync_XXXX builtins for use in atomic operations
-// although the builtins are provided globally they are not supported on all platforms
 #if defined (ACE_HAS_THREADS)
-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1))
 # if defined (__powerpc__)
 // The builtins seem to be provided for all powerpc platforms
 #   define ACE_HAS_GCC_ATOMIC_BUILTINS 1
-# if ((__GNUC__ == 4) && (__GNUC_MINOR__ == 1) && (__GNUC_PATCHLEVEL__ == 1))
-// PPU GCC 4.1.1 doesn't have builtin atomic ops for size 1/2
-#  define ACE_LACKS_GCC_ATOMIC_BUILTINS_2
-#  define ACE_LACKS_GCC_ATOMIC_BUILTINS_1
-# endif
 # endif
 # if defined (__ia64)
 // The builtins seem to be provided for the IA64 platforms
@@ -179,8 +148,9 @@
 // The builtin's are provided also for 64bit linux
 #   define ACE_HAS_GCC_ATOMIC_BUILTINS 1
 # endif
-#endif
 #endif /* ACE_HAS_THREADS */
 
+#define ACE_GCC_NO_RETURN __attribute__ ((__noreturn__))
+
 #include /**/ "ace/post.h"
 #endif /* ACE_GNUG_COMMON_H */
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index 48829300ee3..23d754068db 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -340,8 +340,6 @@
 #  define ACE_HAS_3_PARAM_WCSTOK
 #endif
 
-#define ACE_HAS_3_PARAM_READDIR_R
-
 #define ACE_LACKS_STRUCT_LIFNUM
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ACE/ace/config-hurd.h b/ACE/ace/config-hurd.h
index 95e45c1ec2e..7659d7d3b33 100644
--- a/ACE/ace/config-hurd.h
+++ b/ACE/ace/config-hurd.h
@@ -119,8 +119,6 @@
 
 #define ACE_HAS_3_PARAM_WCSTOK
 
-#define ACE_HAS_3_PARAM_READDIR_R
-
 #if !defined (ACE_DEFAULT_BASE_ADDR)
 #  define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
 #endif /* ! ACE_DEFAULT_BASE_ADDR */
@@ -208,12 +206,12 @@
 
 #define ACE_HAS_DIRENT
 
-#define ACE_HAS_STRBUF_T
-
 #define ACE_SIZEOF_WCHAR 4
 
 #define ACE_LACKS_GETIPNODEBYADDR
 #define ACE_LACKS_GETIPNODEBYNAME
+#define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_STRRECVFD
 
 // Platform has POSIX terminal interface.
 #define ACE_HAS_TERMIOS
diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h
index 4bf08172167..4fab19823d6 100644
--- a/ACE/ace/config-icc-common.h
+++ b/ACE/ace/config-icc-common.h
@@ -23,18 +23,8 @@
 #  define ACE_Proper_Export_Flag __attribute__ ((visibility("default")))
 #  define ACE_Proper_Import_Flag __attribute__ ((visibility("default")))
 
-#  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
-// Sadly, G++ 4.x silently ignores visibility attributes on
-// template instantiations, which breaks singletons.
-// As a workaround, we use the GCC visibility pragmas.
-// And to make them fit in a macro, we use C99's _Pragma()
-// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17470
-// This has been fixed in GCC 4.1.1 with FC6 but not with SuSE 10.2
-// that gets shipped with GCC 4.1.2 so we assume that with GCC 4.2
-// this will be fixed on the head. With FC6 just set this define yourself
-#   ifndef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS
-#     define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
-#   endif
+#  ifndef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS
+#    define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
 #  endif
 
 #  if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS) && ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS == 1
@@ -92,17 +82,7 @@
 // We assume that Intel C++ 15 and higher do have correct C++11 support when
 // it runs with GCC 4.7 or higher emulation mode
 #if (__INTEL_COMPILER > 1400) && defined (__INTEL_CXX11_MODE__)
-# if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
 #  define ACE_HAS_CPP11
-# endif
-#endif
-
-// Intel C++ 14 Update 2 has correct C++11 support when it runs with GCC 4.7
-// or higher emulation mode
-#if (__INTEL_COMPILER == 1400) && (__INTEL_COMPILER_UPDATE >= 2) && defined (__INTEL_CXX11_MODE__)
-# if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
-#  define ACE_HAS_CPP11
-# endif
 #endif
 
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h
index 6d90672552e..1c043cf0cf5 100644
--- a/ACE/ace/config-kfreebsd.h
+++ b/ACE/ace/config-kfreebsd.h
@@ -11,9 +11,6 @@
 /* Uses ctime_r & asctime_r with only two parameters vs. three. */
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1
 
-/* Define to 1 if platform has 3 parameter readdir_r() */
-#define ACE_HAS_3_PARAM_READDIR_R 1
-
 /* Define to 1 if platform has 3 parameter wcstok() */
 #define ACE_HAS_3_PARAM_WCSTOK 1
 
@@ -90,17 +87,6 @@
 #define ACE_HAS_ICMP_SUPPORT 1
 
 /* Define to 1 if the system has the type `int16_t'. */
-#define ACE_HAS_INT16_T 1
-
-/* Define to 1 if the system has the type `int32_t'. */
-#define ACE_HAS_INT32_T 1
-
-/* Define to 1 if the system has the type `int64_t'. */
-#define ACE_HAS_INT64_T 1
-
-/* Define to 1 if the system has the type `int8_t'. */
-#define ACE_HAS_INT8_T 1
-
 /* Platform supports IPv6 */
 #define ACE_HAS_IPV6 1
 
@@ -328,18 +314,6 @@
 /* Define to 1 if the system has the type `ucontext_t'. */
 #define ACE_HAS_UCONTEXT_T 1
 
-/* Define to 1 if the system has the type `uint16_t'. */
-#define ACE_HAS_UINT16_T 1
-
-/* Define to 1 if the system has the type `uint32_t'. */
-#define ACE_HAS_UINT32_T 1
-
-/* Define to 1 if the system has the type `uint64_t'. */
-#define ACE_HAS_UINT64_T 1
-
-/* Define to 1 if the system has the type `uint8_t'. */
-#define ACE_HAS_UINT8_T 1
-
 /* Define to 1 if platform has vasprintf(). */
 #define ACE_HAS_VASPRINTF 1
 
@@ -368,9 +342,6 @@
 /* Platform has Xt Intrinsics Toolkit */
 #define ACE_HAS_XT 1
 
-/* Define to signed 64 bit integer type */
-#define ACE_INT64_TYPE signed long long
-
 /* Define to the type of arg 2 for `ioctl'. */
 #define ACE_IOCTL_TYPE_ARG2 int
 
@@ -459,9 +430,6 @@
 /* Size of the native "wchar_t" type */
 #define ACE_SIZEOF_WCHAR 4
 
-/* Define to unsigned 64 bit integer type */
-#define ACE_UINT64_TYPE unsigned long long
-
 /* Enable IPv6 support on platforms that don't have IPv6 turned on by default
    */
 #define ACE_USES_IPV4_IPV6_MIGRATION 1
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 06b9e3587f7..23e0f579594 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -101,8 +101,6 @@
 
 #define ACE_HAS_3_PARAM_WCSTOK
 
-#define ACE_HAS_3_PARAM_READDIR_R
-
 #define ACE_HAS_ALLOCA
 
 // Compiler/platform has <alloca.h>
diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h
index 55d11f9a46a..27a63cf6ca9 100644
--- a/ACE/ace/config-lite.h
+++ b/ACE/ace/config-lite.h
@@ -46,7 +46,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 // For use by <ACE_OS::exit>.
 extern "C"
 {
-  typedef void (*ACE_EXIT_HOOK) (void);
+  typedef void (*ACE_EXIT_HOOK) ();
 }
 
 // Signature for registering a cleanup function that is used by the
@@ -83,11 +83,11 @@ typedef void (*ACE_INIT_LOG_MSG_HOOK) (ACE_OS_Log_Msg_Attributes &attr
 typedef void (*ACE_INHERIT_LOG_MSG_HOOK) (ACE_OS_Thread_Descriptor*,
                                           ACE_OS_Log_Msg_Attributes &);
 
-typedef void (*ACE_CLOSE_LOG_MSG_HOOK) (void);
+typedef void (*ACE_CLOSE_LOG_MSG_HOOK) ();
 
 typedef void (*ACE_SYNC_LOG_MSG_HOOK) (const ACE_TCHAR *prog_name);
 
-typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (void);
+typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) ();
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
@@ -121,16 +121,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL
   // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below.
 # include <Cstd/stdcomp.h>
 #endif /* __SUNPRO_CC <= 0x5110 */
-#if (defined (_MSC_VER) && (_MSC_VER <= 1310) && defined (_WIN64)) \
-    || defined (ACE_HAS_BROKEN_STD_REVERSE_ITERATOR)
-  // VC 7.1 and the latest 64-bit platform SDK still don't define a standard
-  // compliant reverse_iterator adapter.
-# define ACE_DECLARE_STL_REVERSE_ITERATORS \
-  typedef std::reverse_iterator<iterator, value_type> reverse_iterator; \
-  typedef std::reverse_iterator<const_iterator, \
-                                value_type const> const_reverse_iterator;
-#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \
-      && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \
+    && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
 # define ACE_DECLARE_STL_REVERSE_ITERATORS \
   typedef std::reverse_iterator<iterator, \
                                 std::input_iterator_tag, \
@@ -150,7 +142,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
   typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 #endif  /* _MSC_VER && _WIN64 */
 
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_LITE_H */
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index 35d5be315f6..74edb63bd1d 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -32,7 +32,6 @@
 #endif /* __x86__ || __powerpc__ */
 
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_ALLOCA
 #define ACE_HAS_ALLOCA_H
diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h
index 722a0f3280c..be7627c39a3 100644
--- a/ACE/ace/config-macosx-leopard.h
+++ b/ACE/ace/config-macosx-leopard.h
@@ -16,13 +16,7 @@
 #endif /* ! __ACE_INLINE__ */
 
 #if !defined (ACE_SIZEOF_LONG_DOUBLE)
-# if (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
-   // Size of long double in GCC 3.3 is 8.
-#  define ACE_SIZEOF_LONG_DOUBLE 8
-# else // Else, the compiler is GCC4
-   // For GCC4, the size is 16.
 #  define ACE_SIZEOF_LONG_DOUBLE 16
-# endif // GCC 3.3
 #endif // ACE_SIZEOF_LONG_DOUBLE
 
 #if defined (__GNUG__)
diff --git a/ACE/ace/config-macosx-lion.h b/ACE/ace/config-macosx-lion.h
index bf03d4d264b..746374ea5c8 100644
--- a/ACE/ace/config-macosx-lion.h
+++ b/ACE/ace/config-macosx-lion.h
@@ -8,14 +8,6 @@
 #endif /* __clang__ */
 
 #if  defined (__x86_64__)
-// On 64 bit platforms, the "long" type is 64-bits.  Override the
-// default 32-bit platform-specific format specifiers appropriately.
-# if ! defined (ACE_HAS_CPP11)
-#   define ACE_INT64_FORMAT_SPECIFIER_ASCII "%ld"
-#   define ACE_INT64_FORMAT_SPECIFIER "%ld"
-#   define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu"
-#   define ACE_UINT64_FORMAT_SPECIFIER "%lu"
-# endif /* ACE_HAS_CPP11 */
 # define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld"
 # define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu"
 #endif /* __x86_64__ */
diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h
index 1e39c828392..24c6e2d3917 100644
--- a/ACE/ace/config-macosx-tiger.h
+++ b/ACE/ace/config-macosx-tiger.h
@@ -9,13 +9,7 @@
 #endif /* ! __ACE_INLINE__ */
 
 #if !defined (ACE_SIZEOF_LONG_DOUBLE)
-# if (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
-   // Size of long double in GCC 3.3 is 8.
-#  define ACE_SIZEOF_LONG_DOUBLE 8
-# else // Else, the compiler is GCC4
-   // For GCC4, the size is 16.
 #  define ACE_SIZEOF_LONG_DOUBLE 16
-# endif // GCC 3.3
 #endif // ACE_SIZEOF_LONG_DOUBLE
 
 #if defined (__GNUG__)
diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h
index 13a853a9318..6a7e6b6d34f 100644
--- a/ACE/ace/config-macosx.h
+++ b/ACE/ace/config-macosx.h
@@ -28,6 +28,8 @@
 #include "config-macosx-panther.h"
 #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100200
 #include "config-macosx-jaguar.h"
+#else
+#error Cannot detect MacOSX version
 #endif
 
 #endif // ACE_CONFIG_MACOSX_ALL_H
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 21659d80cff..528f4451497 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -78,7 +78,6 @@
 
 # if defined (ACE_HAS_VALGRIND)
 #   define ACE_INITIALIZE_MEMORY_BEFORE_USE
-#   define ACE_LACKS_DLCLOSE
 # endif /* ACE_HAS_VALGRIND */
 
 // =========================================================================
@@ -254,9 +253,9 @@
 // ============================================================================
 
 #if !defined (ACE_UNUSED_ARG)
-# if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) || (defined (__BORLANDC__) && defined (__clang__))
+# if defined (__GNUC__) || (defined (__BORLANDC__) && defined (__clang__))
 #   define ACE_UNUSED_ARG(a) (void) (a)
-# elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI)
+# elif defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI)
 // Some compilers complain about "statement with no effect" with (a).
 // This eliminates the warnings, and no code is generated for the null
 // conditional statement.  @note that may only be true if -O is enabled,
@@ -266,9 +265,9 @@
    #define ACE_UNUSED_ID(identifier)
    template <class T>
    inline void ACE_UNUSED_ARG(const T& ACE_UNUSED_ID(t)) { }
-# else /* ghs || __GNUC__ || ..... */
+# else /* ghs ..... */
 #  define ACE_UNUSED_ARG(a) (a)
-# endif /* ghs || __GNUC__ || ..... */
+# endif /* ghs ..... */
 #endif /* !ACE_UNUSED_ARG */
 
 #if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__)
@@ -718,4 +717,13 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \
 #  endif
 #endif
 
+#ifndef ACE_GCC_NO_RETURN
+#  define ACE_GCC_NO_RETURN
+#endif
+
+// ACE_OS::readdir_r was removed in ACE7
+#ifndef ACE_LACKS_READDIR_R
+#  define ACE_LACKS_READDIR_R
+#endif
+
 #endif /* ACE_CONFIG_MACROS_H */
diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h
index 406df338cb9..e07fa2b5e63 100644
--- a/ACE/ace/config-netbsd.h
+++ b/ACE/ace/config-netbsd.h
@@ -26,7 +26,6 @@
 #define ACE_HAS_GETTIMEOFDAY 1
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1
 #define ACE_HAS_3_PARAM_WCSTOK 1
-#define ACE_HAS_3_PARAM_READDIR_R 1
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG 1
 #define ACE_HAS_ALT_CUSERID 1
 #define ACE_HAS_AUTOMATIC_INIT_FINI 1
@@ -127,9 +126,6 @@
 #define ACE_SIZEOF_VOID_P 8
 #define ACE_SIZEOF_WCHAR 4
 
-typedef unsigned long ACE_UINT64;
-typedef   signed long ACE_INT64;
-
 #define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII  "%ld"
 #define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu"
 
@@ -145,9 +141,6 @@ typedef   signed long ACE_INT64;
 #define ACE_SIZEOF_VOID_P 4
 #define ACE_SIZEOF_WCHAR 4
 
-typedef unsigned long long ACE_UINT64;
-typedef   signed long long ACE_INT64;
-
 #else
 # error unknown CPU architecture
 #endif
diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h
index e928905ad6f..43a9364314a 100644
--- a/ACE/ace/config-openbsd.h
+++ b/ACE/ace/config-openbsd.h
@@ -17,7 +17,6 @@
 #include "ace/config-g++-common.h"
 
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_3_PARAM_WCSTOK
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_ALLOCA
diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h
index 6fd507bad03..4b9024b5c8e 100644
--- a/ACE/ace/config-qnx.h
+++ b/ACE/ace/config-qnx.h
@@ -45,7 +45,6 @@
 /////////////////////////////////////////////////////////////////
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #define ACE_HAS_3_PARAM_WCSTOK
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 // Although ACE does have alloca() on this compiler/platform combination, it is
 // disabled by default since it can be dangerous.  Uncomment the following line
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index 5943d8237b6..6c4c2995dfb 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -78,7 +78,6 @@
 
 #define ACE_HAS_ALT_CUSERID
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CLOCK_SETTIME
 #define ACE_HAS_DIRENT
@@ -108,7 +107,6 @@
 #define ACE_LACKS_MSYNC
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_LACKS_READDIR_R
 #define ACE_LACKS_READLINK
 #define ACE_LACKS_READV
 #define ACE_LACKS_RLIMIT
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index d6313d754b6..b738080b32f 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -109,10 +109,6 @@
 #   endif /* _REENTRANT */
 # endif /* !ACE_MT_SAFE */
 
-# if (__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 3))
-#   define ACE_LACKS_STD_WSTRING  1
-# endif
-
 #else  /* ! __SUNPRO_CC && ! __GNUG__ */
 #  ifdef __cplusplus  /* Let it slide for C compilers. */
 #    error unsupported compiler in ace/config-sunos5.5.h
@@ -348,10 +344,6 @@
 #undef ACE_HAS_PRUSAGE_T
 #endif /* (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) */
 
-#if defined (_POSIX_PTHREAD_SEMANTICS) || (_FILE_OFFSET_BITS == 64) || (_POSIX_C_SOURCE - 0 >= 199506L)
-#  define ACE_HAS_3_PARAM_READDIR_R
-#endif
-
 // Sum of the iov_len values can't be larger then SSIZE_MAX
 #define ACE_HAS_SOCK_BUF_SIZE_MAX
 
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index 260c559a563..5b5541e5d5a 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -87,7 +87,6 @@
 
 // OS-specific configuration
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_NET_IF_DL_H
 #define ACE_HAS_NONCONST_GETBY
 #define ACE_HAS_NONCONST_INET_ADDR
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 31b3bffd3f9..b771a6418dc 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -241,7 +241,6 @@
 #define ACE_HAS_WIN32_GETVERSION
 
 /* LACKS dir-related facilities */
-#define ACE_LACKS_READDIR_R
 #define ACE_LACKS_REWINDDIR
 #define ACE_LACKS_SEEKDIR
 #define ACE_LACKS_TELLDIR
@@ -335,16 +334,6 @@
 
 #define ACE_SIZEOF_LONG_LONG 8
 
-#if !defined (__MINGW32__)
-#define ACE_INT64_TYPE  signed __int64
-#define ACE_UINT64_TYPE unsigned __int64
-#endif
-
-#if defined (__MINGW32__)
-#define ACE_INT64_TYPE  signed long long
-#define ACE_UINT64_TYPE unsigned long long
-#endif
-
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h
index 2f603d55ef0..e3d54cb54e8 100644
--- a/ACE/ace/config-win32-interix.h
+++ b/ACE/ace/config-win32-interix.h
@@ -11,7 +11,6 @@
 
 #define ACE_HAS_SYS_SIGINFO_H
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#define ACE_HAS_3_PARAM_READDIR_R
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 #define ACE_HAS_BROKEN_T_ERROR
diff --git a/ACE/ace/config-win32-msvc-10.h b/ACE/ace/config-win32-msvc-10.h
deleted file mode 100644
index 62dcdae8dd3..00000000000
--- a/ACE/ace/config-win32-msvc-10.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   config-win32-msvc-10.h
- *
- *  @brief  Microsoft Visual C++ 10.0 configuration file.
- *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 10.
- *
- *  @note Do not include this file directly, include config-win32.h instead.
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_MSVC_10_H
-#define ACE_CONFIG_WIN32_MSVC_10_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#ifndef ACE_WIN32_VC10
-#  define ACE_WIN32_VC10
-#endif
-
-// Visual C++ 9.0 (.NET) deprecated the old iostreams
-#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#endif
-
-#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-#endif
-
-// Windows' timeval is non-conformant (defined in terms of long instead of
-// time_t) and VC8 changed time_t to a 64-bit value even when compiling a
-// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few
-// things for this compiler. See Time_Value.h for complete details.
-#if !defined (_USE_32BIT_TIME_T)
-#  define ACE_HAS_TIME_T_LONG_MISMATCH
-#endif
-
-#define ACE_HAS_ITOA
-#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE
-#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-
-#define ACE_ITOA_EQUIVALENT ::_itoa
-#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
-#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
-#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-#if defined (ACE_HAS_WINCE)
-# define ACE_FILENO_EQUIVALENT ::_fileno
-#else
-# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X)))
-#endif
-
-// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will.
-#  if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601)
-#    define ACE_HAS_SIG_ATOMIC_T
-#  endif /* !Win CE 6.0 or less */
-
-#define ACE_LACKS_STRPTIME
-
-// Evaluate this with a WinCE build; maybe things have improved since VC8.
-//#if !defined (ACE_HAS_WINCE)
-# define ACE_HAS_INTRIN_H
-# define ACE_HAS_INTRINSIC_INTERLOCKED
-//#endif
-
-#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501)
-#  define ACE_HAS_INTRINSIC_BYTESWAP
-#endif
-
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-#define ACE_LACKS_STRRECVFD
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-// Platform provides ACE_TLI function prototypes.
-// For Win32, this is not really true, but saves a lot of hassle!
-#define ACE_HAS_TLI_PROTOTYPES
-
-// Platform support linebuffered streaming is broken
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-
-// Platform has its Standard C++ library in the namespace std
-# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB       1
-# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
-// ace/iostream.h does not work with the standard cpp library (yet).
-# if !defined (ACE_USES_OLD_IOSTREAMS)
-# define ACE_LACKS_ACE_IOSTREAM
-# endif /* ! ACE_USES_OLD_IOSTREAMS */
-
-// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory.
-#define ACE_NEW_THROWS_EXCEPTIONS
-#define ACE_HAS_NEW_NOTHROW
-
-#else
-
-// iostream header lacks ipfx (), isfx (), etc., declarations
-#  define ACE_LACKS_IOSTREAM_FX
-
-#endif
-
-// There are too many instances of this warning to fix it right now.
-// Maybe in the future.
-
-// Disable warning of using Microsoft Extension.
-# pragma warning(disable:4231)
-
-// 'class1' : inherits 'class2::member' via dominance
-#pragma warning(disable:4250)
-
-// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT.
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT)
-#  define ACE_HAS_TR24731_2005_CRT
-#endif
-
-// On CE w/o MFC config-WinCE.h needs to declare a placement new. This
-// triggers a warning that there's no placement delete, which can be ignored.
-#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC)
-#  pragma warning(disable:4291)
-#endif
-
-// A template can not be exported. Only an instantiation may be exported.
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-
-// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to
-// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC.
-# define ACE_NEEDS_FUNC_DEFINITIONS
-
-// Windows Vista and Windows Server 2008 and newer do have native condition
-// variables, but this is commented out because the support in ACE hasn't
-// been completed
-// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
-// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE
-// # undef ACE_LACKS_COND_T
-// #endif
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_MSVC_10_H */
diff --git a/ACE/ace/config-win32-msvc-11.h b/ACE/ace/config-win32-msvc-11.h
deleted file mode 100644
index 8078ffa6040..00000000000
--- a/ACE/ace/config-win32-msvc-11.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   config-win32-msvc-11.h
- *
- *  @brief  Microsoft Visual C++ 11.0 configuration file.
- *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 11.
- *
- *  @note Do not include this file directly, include config-win32.h instead.
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_MSVC_11_H
-#define ACE_CONFIG_WIN32_MSVC_11_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#ifndef ACE_WIN32_VC11
-#  define ACE_WIN32_VC11
-#endif
-
-// Until we have specific msvc11 settings, include the msvc10 file
-#include "ace/config-win32-msvc-10.h"
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_MSVC_10_H */
diff --git a/ACE/ace/config-win32-msvc-12.h b/ACE/ace/config-win32-msvc-12.h
deleted file mode 100644
index 0b59cd44685..00000000000
--- a/ACE/ace/config-win32-msvc-12.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   config-win32-msvc-12.h
- *
- *  @brief  Microsoft Visual C++ 12.0 configuration file.
- *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 12.
- *
- *  @note Do not include this file directly, include config-win32.h instead.
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_MSVC_12_H
-#define ACE_CONFIG_WIN32_MSVC_12_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#ifndef ACE_WIN32_VC12
-#  define ACE_WIN32_VC12
-#endif
-
-// Until we have specific msvc12 settings, include the msvc11 file
-#include "ace/config-win32-msvc-11.h"
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_MSVC_10_H */
diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h
index dfa98d930bd..fbbc5fa15ec 100644
--- a/ACE/ace/config-win32-msvc-14.h
+++ b/ACE/ace/config-win32-msvc-14.h
@@ -23,8 +23,123 @@
 #  define ACE_WIN32_VC14
 #endif
 
-// Until we have specific msvc14 settings, include the msvc12 file
-#include "ace/config-win32-msvc-12.h"
+// Visual C++ 9.0 (.NET) deprecated the old iostreams
+#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY)
+#define ACE_HAS_STANDARD_CPP_LIBRARY 1
+#endif
+
+#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#endif
+
+// Windows' timeval is non-conformant (defined in terms of long instead of
+// time_t) and VC8 changed time_t to a 64-bit value even when compiling a
+// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few
+// things for this compiler. See Time_Value.h for complete details.
+#if !defined (_USE_32BIT_TIME_T)
+#  define ACE_HAS_TIME_T_LONG_MISMATCH
+#endif
+
+#define ACE_HAS_ITOA
+#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE
+#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
+
+#define ACE_ITOA_EQUIVALENT ::_itoa
+#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
+#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
+#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
+#if defined (ACE_HAS_WINCE)
+# define ACE_FILENO_EQUIVALENT ::_fileno
+#else
+# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X)))
+#endif
+
+// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will.
+#  if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601)
+#    define ACE_HAS_SIG_ATOMIC_T
+#  endif /* !Win CE 6.0 or less */
+
+#define ACE_LACKS_STRPTIME
+
+// Evaluate this with a WinCE build; maybe things have improved since VC8.
+//#if !defined (ACE_HAS_WINCE)
+# define ACE_HAS_INTRIN_H
+# define ACE_HAS_INTRINSIC_INTERLOCKED
+//#endif
+
+#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501)
+#  define ACE_HAS_INTRINSIC_BYTESWAP
+#endif
+
+#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+#define ACE_LACKS_STRRECVFD
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+#define ACE_TEMPLATES_REQUIRE_SOURCE
+
+// Platform provides ACE_TLI function prototypes.
+// For Win32, this is not really true, but saves a lot of hassle!
+#define ACE_HAS_TLI_PROTOTYPES
+
+// Platform support linebuffered streaming is broken
+#define ACE_LACKS_LINEBUFFERED_STREAMBUF
+
+#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
+
+// Platform has its Standard C++ library in the namespace std
+# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB       1
+# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+
+// ace/iostream.h does not work with the standard cpp library (yet).
+# if !defined (ACE_USES_OLD_IOSTREAMS)
+# define ACE_LACKS_ACE_IOSTREAM
+# endif /* ! ACE_USES_OLD_IOSTREAMS */
+
+#define ACE_NEW_THROWS_EXCEPTIONS
+#define ACE_HAS_NEW_NOTHROW
+
+#else
+
+// iostream header lacks ipfx (), isfx (), etc., declarations
+#  define ACE_LACKS_IOSTREAM_FX
+
+#endif
+
+// There are too many instances of this warning to fix it right now.
+// Maybe in the future.
+
+// Disable warning of using Microsoft Extension.
+# pragma warning(disable:4231)
+
+// 'class1' : inherits 'class2::member' via dominance
+#pragma warning(disable:4250)
+
+// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT.
+#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT)
+#  define ACE_HAS_TR24731_2005_CRT
+#endif
+
+// On CE w/o MFC config-WinCE.h needs to declare a placement new. This
+// triggers a warning that there's no placement delete, which can be ignored.
+#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC)
+#  pragma warning(disable:4291)
+#endif
+
+// A template can not be exported. Only an instantiation may be exported.
+#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+
+// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to
+// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC.
+# define ACE_NEEDS_FUNC_DEFINITIONS
+
+// Windows Vista and Windows Server 2008 and newer do have native condition
+// variables, but this is commented out because the support in ACE hasn't
+// been completed
+// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
+// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE
+// # undef ACE_LACKS_COND_T
+// #endif
 
 #define ACE_HAS_POSIX_TIME 1
 #define ACE_LACKS_TIMESPEC_T 1
diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h
deleted file mode 100644
index 9db4d39204b..00000000000
--- a/ACE/ace/config-win32-msvc-7.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   config-win32-msvc-7.h
- *
- *  @brief  Microsoft Visual C++ 7.0 configuration file.
- *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 7.
- *
- *  @note Do not include this file directly, include config-win32.h instead.
- *
- *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_MSVC_7_H
-#define ACE_CONFIG_WIN32_MSVC_7_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-// Visual C++ 7.0 (.NET) deprecated the old iostreams
-#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#endif
-
-#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-#endif
-
-// Win64 SDK compiler claims std::auto_ptr<>::reset not available.
-#if defined (_WIN64) || defined (WIN64)
-#define ACE_AUTO_PTR_LACKS_RESET
-#endif
-
-#define ACE_HAS_ITOA
-#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE
-#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-
-#define ACE_ITOA_EQUIVALENT ::_itoa
-#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
-#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
-#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-
-#define ACE_LACKS_STRPTIME
-
-#define ACE_LACKS_STRTOK_R
-
-#define ACE_HAS_SIG_ATOMIC_T
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-#define ACE_LACKS_STRRECVFD
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-// Platform provides ACE_TLI function prototypes.
-// For Win32, this is not really true, but saves a lot of hassle!
-#define ACE_HAS_TLI_PROTOTYPES
-
-// Platform support linebuffered streaming is broken
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-#if !defined (ACE_HAS_WINCE) && !(defined (__INTEL_COMPILER) && (__INTEL_COMPILER == 900))
-# define ACE_HAS_INTRINSIC_INTERLOCKED
-# define ACE_HAS_INTRINSIC_BYTESWAP
-#endif
-
-#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-
-// Platform has its Standard C++ library in the namespace std
-# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB       1
-# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
-// ace/iostream.h does not work with the standard cpp library (yet).
-# if !defined (ACE_USES_OLD_IOSTREAMS)
-# define ACE_LACKS_ACE_IOSTREAM
-# endif /* ! ACE_USES_OLD_IOSTREAMS */
-
-// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory.
-// Since we don't support MSVC 7.0, don't test for it.
-# define ACE_NEW_THROWS_EXCEPTIONS
-# define ACE_HAS_NEW_NOTHROW
-
-#else
-
-// iostream header lacks ipfx (), isfx (), etc., declarations
-#  define ACE_LACKS_IOSTREAM_FX
-
-#endif
-
-// There are too many instances of this warning to fix it right now.
-// Maybe in the future.
-// 'this' : used in base member initializer list
-#pragma warning(disable:4355)
-
-// 'class1' : inherits 'class2::member' via dominance
-#pragma warning(disable:4250)
-
-// C++ Exception Specification ignored
-#pragma warning(disable:4290)
-
-// Disable warning of using Microsoft Extension.
-#pragma warning(disable:4231)
-
-// 'function' : unreferenced local function has been removed
-#pragma warning(disable:4505)
-
-// A template can not be exported. Only an instantiation may be exported.
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-
-// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to
-// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC.
-# define ACE_NEEDS_FUNC_DEFINITIONS
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_MSVC_7_H */
diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h
deleted file mode 100644
index c2dfcfddd37..00000000000
--- a/ACE/ace/config-win32-msvc-8.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   config-win32-msvc-8.h
- *
- *  @brief  Microsoft Visual C++ 8.0 configuration file.
- *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 8.
- *
- *  @note Do not include this file directly, include config-win32.h instead.
- *
- *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_MSVC_8_H
-#define ACE_CONFIG_WIN32_MSVC_8_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#ifndef ACE_WIN32_VC8
-#  define ACE_WIN32_VC8
-#endif
-
-// Visual C++ 8.0 (.NET) deprecated the old iostreams
-#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#endif
-
-#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-#endif
-
-// Windows' timeval is non-conformant (defined in terms of long instead of
-// time_t) and VC8 changed time_t to a 64-bit value even when compiling a
-// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few
-// things for this compiler. See Time_Value.h for complete details.
-#if !defined (_USE_32BIT_TIME_T)
-#  define ACE_HAS_TIME_T_LONG_MISMATCH
-#endif
-
-#define ACE_HAS_ITOA
-#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE
-#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-
-#define ACE_ITOA_EQUIVALENT ::_itoa
-#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
-#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
-#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-#if defined (ACE_HAS_WINCE)
-# define ACE_FILENO_EQUIVALENT ::_fileno
-#else
-# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X)))
-#endif
-
-// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will.
-// This has been true up thrugh the versions. We don't have any indication
-// that this might be supported in the future, but it is an easy enough fix
-// to bump the wince revision number when a new version is released.
-#  if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601)
-#    define ACE_HAS_SIG_ATOMIC_T
-#  endif /* !Win CE 6.0 or less */
-
-#define ACE_LACKS_STRPTIME
-
-#if !defined (ACE_HAS_WINCE)
-# define ACE_HAS_INTRIN_H
-# define ACE_HAS_INTRINSIC_INTERLOCKED
-#endif
-
-#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501)
-#  define ACE_HAS_INTRINSIC_BYTESWAP
-#endif
-
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-#define ACE_LACKS_STRRECVFD
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-// Platform provides ACE_TLI function prototypes.
-// For Win32, this is not really true, but saves a lot of hassle!
-#define ACE_HAS_TLI_PROTOTYPES
-
-// Platform support linebuffered streaming is broken
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-
-// Platform has its Standard C++ library in the namespace std
-# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB       1
-# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
-// ace/iostream.h does not work with the standard cpp library (yet).
-# if !defined (ACE_USES_OLD_IOSTREAMS)
-# define ACE_LACKS_ACE_IOSTREAM
-# endif /* ! ACE_USES_OLD_IOSTREAMS */
-
-// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory.
-#define ACE_NEW_THROWS_EXCEPTIONS
-#define ACE_HAS_NEW_NOTHROW
-
-#else
-
-// iostream header lacks ipfx (), isfx (), etc., declarations
-#  define ACE_LACKS_IOSTREAM_FX
-
-#endif
-
-// There are too many instances of this warning to fix it right now.
-// Maybe in the future.
-
-// Disable warning of using Microsoft Extension.
-#pragma warning(disable:4231)
-
-// 'class1' : inherits 'class2::member' via dominance
-#pragma warning(disable:4250)
-
-// 'this' : used in base member initializer list
-#pragma warning(disable:4355)
-
-// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT.
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT)
-#  define ACE_HAS_TR24731_2005_CRT
-#endif
-
-// Detect Platform SDK 64-bit (AMD64) compiler using _MSC_FULL_VER
-#if (defined (_WIN64) || defined (WIN64)) && _MSC_FULL_VER < 140050000
-#  define ACE_AUTO_PTR_LACKS_RESET
-#  define ACE_MSVC_USES_DOUBLE_UNDERSCORE_STAT64
-#  define ACE_HAS_BROKEN_STD_REVERSE_ITERATOR
-#  define ACE_LACKS_NUMERIC_LIMITS_64_BIT_TYPES
-#  undef ACE_HAS_TR24731_2005_CRT
-#  undef ACE_HAS_INTRIN_H
-#endif
-
-// On CE w/o MFC config-WinCE.h needs to declare a placement new. This
-// triggers a warning that there's no placement delete, which can be ignored.
-#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC)
-#  pragma warning(disable:4291)
-#endif
-
-// A template can not be exported. Only an instantiation may be exported.
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-
-// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to
-// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC.
-# define ACE_NEEDS_FUNC_DEFINITIONS
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_MSVC_8_H */
diff --git a/ACE/ace/config-win32-msvc-9.h b/ACE/ace/config-win32-msvc-9.h
deleted file mode 100644
index 19865aa34b0..00000000000
--- a/ACE/ace/config-win32-msvc-9.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   config-win32-msvc-9.h
- *
- *  @brief  Microsoft Visual C++ 9.0 configuration file.
- *
- *  This file is the ACE configuration file for Microsoft Visual C++ version 9.
- *
- *  @note Do not include this file directly, include config-win32.h instead.
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_MSVC_9_H
-#define ACE_CONFIG_WIN32_MSVC_9_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#ifndef ACE_WIN32_VC9
-#  define ACE_WIN32_VC9
-#endif
-
-// Visual C++ 9.0 (.NET) deprecated the old iostreams
-#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#endif
-
-#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-#endif
-
-// Windows' timeval is non-conformant (defined in terms of long instead of
-// time_t) and VC9 changed time_t to a 64-bit value even when compiling a
-// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few
-// things for this compiler. See Time_Value.h for complete details.
-#if !defined (_USE_32BIT_TIME_T)
-#  define ACE_HAS_TIME_T_LONG_MISMATCH
-#endif
-
-#define ACE_HAS_ITOA
-#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE
-#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-
-#define ACE_ITOA_EQUIVALENT ::_itoa
-#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
-#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
-#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-#if defined (ACE_HAS_WINCE)
-# define ACE_FILENO_EQUIVALENT ::_fileno
-#else
-# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X)))
-#endif
-
-// Windows CE 7 doesn't do sig_atomic_t, but maybe future versions will.
-#  if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x700)
-#    define ACE_HAS_SIG_ATOMIC_T
-#  endif /* !Win CE 7.0 or less */
-
-#define ACE_LACKS_STRPTIME
-
-#if !defined (ACE_HAS_WINCE)
-# define ACE_HAS_INTRIN_H
-# define ACE_HAS_INTRINSIC_INTERLOCKED
-#endif
-
-#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501)
-#  define ACE_HAS_INTRINSIC_BYTESWAP
-#endif
-
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-#define ACE_LACKS_STRRECVFD
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-// Platform provides ACE_TLI function prototypes.
-// For Win32, this is not really true, but saves a lot of hassle!
-#define ACE_HAS_TLI_PROTOTYPES
-
-// Platform support linebuffered streaming is broken
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-
-// Platform has its Standard C++ library in the namespace std
-# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB       1
-# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
-// ace/iostream.h does not work with the standard cpp library (yet).
-# if !defined (ACE_USES_OLD_IOSTREAMS)
-# define ACE_LACKS_ACE_IOSTREAM
-# endif /* ! ACE_USES_OLD_IOSTREAMS */
-
-// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory.
-#define ACE_NEW_THROWS_EXCEPTIONS
-#define ACE_HAS_NEW_NOTHROW
-
-#else
-
-// iostream header lacks ipfx (), isfx (), etc., declarations
-#  define ACE_LACKS_IOSTREAM_FX
-
-#endif
-
-// There are too many instances of this warning to fix it right now.
-// Maybe in the future.
-
-// Disable warning of using Microsoft Extension.
-# pragma warning(disable:4231)
-
-// 'class1' : inherits 'class2::member' via dominance
-#pragma warning(disable:4250)
-
-// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT.
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT)
-#  define ACE_HAS_TR24731_2005_CRT
-#endif
-
-// On CE w/o MFC config-WinCE.h needs to declare a placement new. This
-// triggers a warning that there's no placement delete, which can be ignored.
-#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC)
-#  pragma warning(disable:4291)
-#endif
-
-// A template can not be exported. Only an instantiation may be exported.
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-
-// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to
-// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC.
-# define ACE_NEEDS_FUNC_DEFINITIONS
-
-// Windows Vista and Windows Server 2008 and newer do have native condition
-// variables, but this is commented out because the support in ACE hasn't
-// been completed
-// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
-// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE
-// # undef ACE_LACKS_COND_T
-// #endif
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_MSVC_9_H */
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index 5736e56913a..63004ef78ce 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -44,18 +44,6 @@
 # include "ace/config-win32-msvc-141.h"
 #elif (_MSC_VER >= 1900)
 # include "ace/config-win32-msvc-14.h"
-#elif (_MSC_VER >= 1800)
-# include "ace/config-win32-msvc-12.h"
-#elif (_MSC_VER >= 1700)
-# include "ace/config-win32-msvc-11.h"
-#elif (_MSC_VER >= 1600)
-# include "ace/config-win32-msvc-10.h"
-#elif (_MSC_VER >= 1500)
-# include "ace/config-win32-msvc-9.h"
-#elif (_MSC_VER >= 1400)
-# include "ace/config-win32-msvc-8.h"
-#elif (_MSC_VER >= 1310)
-# include "ace/config-win32-msvc-7.h"
 #else
 # error This version of Microsoft Visual C++ is not supported.
 #endif
@@ -103,9 +91,6 @@
 #define ACE_LACKS_NETDB_H
 #define ACE_LACKS_NET_IF_H
 #define ACE_LACKS_NETINET_IN_H
-#if !defined (ACE_WIN32_VC14)
-# define ACE_LACKS_STDINT_H
-#endif
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_SYS_IOCTL_H
 #define ACE_LACKS_SYS_IPC_H
diff --git a/ACE/ace/iosfwd.h b/ACE/ace/iosfwd.h
index fb38cf08319..2d29b38c43f 100644
--- a/ACE/ace/iosfwd.h
+++ b/ACE/ace/iosfwd.h
@@ -31,12 +31,6 @@
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
-#if defined (__APPLE_CC__)
-// Should this really be here?  dhinton
-// FUZZ: disable check_for_streams_include
-# include "ace/streams.h"
-#endif
-
 #if defined (ACE_HAS_STANDARD_CPP_LIBRARY)  && \
     (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
 
diff --git a/ACE/ace/os_include/os_dlfcn.h b/ACE/ace/os_include/os_dlfcn.h
index 5bba90e8200..d13d5ca5ce7 100644
--- a/ACE/ace/os_include/os_dlfcn.h
+++ b/ACE/ace/os_include/os_dlfcn.h
@@ -27,11 +27,7 @@
 #endif /* !ACE_LACKS_DLFCN_H */
 
 #if defined (__hpux)
-#  if defined(__GNUC__) || __cplusplus >= 199707L
-#    include /**/ <dl.h>
-#  else
-#    include /**/ <cxxdl.h>
-#  endif /* (g++ || HP aC++) vs. HP C++ */
+#  include /**/ <dl.h>
 #endif /* __hpux */
 
 #if defined (ACE_VXWORKS) && !defined (__RTP__)
diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.cpp b/ACE/apps/Gateway/Gateway/Event_Channel.cpp
index 34255b3fde2..45bece8d553 100644
--- a/ACE/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/ACE/apps/Gateway/Gateway/Event_Channel.cpp
@@ -9,7 +9,7 @@ Event_Channel::~Event_Channel (void)
 {
 }
 
-#if defined (ACE_WIN32_VC8)
+#if defined (_MSC_VER)
 #  pragma warning (push)
 #  pragma warning (disable:4355)  /* Use of 'this' in initializer list */
 #  endif
@@ -18,7 +18,7 @@ Event_Channel::Event_Channel (void)
     consumer_acceptor_ (*this, 'C')
 {
 }
-#if defined (ACE_WIN32_VC8)
+#if defined (_MSC_VER)
 #  pragma warning (pop)
 #endif
 
diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h
index 43993e928aa..dd2674d9bb7 100644
--- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h
+++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h
@@ -89,7 +89,7 @@ public:
   const char *buffer (void) const;
 
   /// Print out this object.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// Return the size of the buffer required to encode
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.h b/ACE/apps/JAWS/clients/Caching/URL_Properties.h
index b8d6c2c3a0e..727e013c949 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Properties.h
+++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.h
@@ -113,7 +113,7 @@ public:
   size_t decode (void *buf);
 
   /// Dump out this object for debug.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// Property name pointer.
@@ -184,7 +184,7 @@ public:
   size_t decode (void *buf);
 
   /// Dump this object for debug.
-  void dump (void) const;
+  void dump () const;
 
 protected:
   /// URL of this offer.
diff --git a/ACE/bin/ChangeLogEditor/CVSFileLocator.pm b/ACE/bin/ChangeLogEditor/CVSFileLocator.pm
deleted file mode 100644
index 8e478509f01..00000000000
--- a/ACE/bin/ChangeLogEditor/CVSFileLocator.pm
+++ /dev/null
@@ -1,125 +0,0 @@
-package CVSFileLocator;
-
-# ************************************************************
-# Description   : Use CVS to determine the list of modified files.
-# Author        : Chad Elliott
-# Create Date   : 11/29/2005
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-use FileHandle;
-
-use FileLocator;
-
-use vars qw(@ISA);
-@ISA = qw(FileLocator);
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub locate {
-  my($self)      = shift;
-  my(@dirs)      = @_;
-  my($fh)        = new FileHandle();
-  my(@modified)  = ();
-  my(@removed)   = ();
-  my(@conflicts) = ();
-  my(@unknown)   = ();
-  my($error)     = undef;
-  my($cvsroot)   = $self->obtainCVSROOT();
-  my($err)       = $self->tmpnam('cle_cvs.err');
-
-  if (open($fh, 'cvs -f -q ' . ($^O eq 'MSWin32' ? '-N ' : '') .
-                (defined $cvsroot ? "-d $cvsroot " : '') .
-                "-n update @dirs 2> $err |")) {
-    while(<$fh>) {
-      my($line) = $_;
-      if ($line =~ /^[AM]\s+(.*)/) {
-        push(@modified, $1);
-      }
-      elsif ($line =~ /^[R]\s+(.*)/) {
-        push(@removed, $1);
-      }
-      elsif ($line =~ /^[C]\s+(.*)/) {
-        push(@conflicts, $1);
-      }
-      elsif ($line =~ /^[\?]\s+(.*)/ && index($line, $err) == -1) {
-        push(@unknown, $1);
-      }
-    }
-    close($fh);
-
-    $error = $self->process_errors($err);
-  }
-  else {
-    $error = "Unable to run cvs with error redirection.";
-  }
-
-  return \@modified, \@removed, \@conflicts, \@unknown, $error;
-}
-
-
-sub obtainCVSROOT {
-  my($self)  = shift;
-  my($fh)    = new FileHandle();
-  my($croot) = undef;
-
-  if (open($fh, 'CVS/Root')) {
-    while(<$fh>) {
-      my($line) = $_;
-      $line =~ s/\s+$//;
-      if ($line =~ /^:pserver/ || $line =~ /^:ext/) {
-        if (defined $ENV{CVSROOT} && $line eq $ENV{CVSROOT}) {
-          last;
-        }
-        else {
-          my($check) = $line;
-          $check =~ s/:\w+\@/:\@/;
-          $check =~ s/\.\w+\.\w+:/:/;
-          my($clen) = length($check);
-          foreach my $key (keys %ENV) {
-            my($echeck) = $ENV{$key};
-            $echeck =~ s/:\w+\@/:\@/;
-            $echeck =~ s/\.\w+\.\w+:/:/;
-            if ($check eq $echeck) {
-              $croot = $ENV{$key};
-              last;
-            }
-            else {
-              my($len) = length($echeck);
-              if ($len > 0 &&
-                  substr($check, $clen - $len, $len) eq $echeck) {
-                $croot = $ENV{$key};
-                last;
-              }
-            }
-          }
-          if (defined $croot) {
-            last;
-          }
-        }
-        if (!defined $croot) {
-          $croot = $line;
-        }
-      }
-      else {
-        $croot = $line;
-        last;
-      }
-    }
-    close($fh);
-  }
-  else {
-    $croot = $ENV{CVSROOT};
-  }
-
-  return $croot;
-}
-
-
-1;
diff --git a/ACE/bin/ChangeLogEditor/ChangeLogEdit.pm b/ACE/bin/ChangeLogEditor/ChangeLogEdit.pm
deleted file mode 100644
index 1bbfee507b1..00000000000
--- a/ACE/bin/ChangeLogEditor/ChangeLogEdit.pm
+++ /dev/null
@@ -1,122 +0,0 @@
-package ChangeLogEdit;
-
-# ************************************************************
-# Description   : Edit the existing ChangeLog.
-# Author        : Chad Elliott
-# Create Date   : 9/10/2002
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-use FileHandle;
-use File::Copy;
-
-use ChangeLogEntry;
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub new {
-  my($class) = shift;
-  my($name)  = shift;
-  my($email) = shift;
-  my($self)  = bless {'name'  => $name,
-                      'email' => $email,
-                     }, $class;
-  return $self;
-}
-
-
-sub edit {
-  my($self)    = shift;
-  my($ofile)   = shift;
-  my(@dirs)    = @_;
-  my($tfile)   = "$ofile.$<.$$";
-  my($status)  = 0;
-  my($error)   = '';
-  my($rh)      = new FileHandle();
-  my($unknown) = undef;
-
-  if (open($rh, $ofile)) {
-    my($creator) = new ChangeLogEntry($self->{'name'},
-                                      $self->{'email'});
-    my($entry) = '';
-    ($entry, $unknown, $error) = $creator->create(@dirs);
-    if (defined $entry) {
-      if ($entry =~ /^ERROR:/) {
-        $error = $entry;
-      }
-      else {
-        my($oh) = new FileHandle();
-        if (open($oh, ">$tfile")) {
-          $status = print $oh $entry;
-          if ($status) {
-            while(<$rh>) {
-              my($line) = $_;
-              $line =~ s/\s+$//;
-              if ($line =~ /\t/) {
-                $line = $self->convertTabs($line);
-              }
-              $status = print $oh "$line\n";
-              if ($status == 0) {
-                $error = "Unable to copy $ofile";
-                last;
-              }
-            }
-          }
-          else {
-            $error = 'Unable to print the first entry';
-          }
-          close($oh);
-        }
-        else {
-          $error = "Unable to open $tfile for writing";
-        }
-        close($rh);
-
-        if ($status) {
-          $status = 0;
-          if (unlink($ofile)) {
-            if (rename($tfile, $ofile)) {
-              $status = 1;
-            }
-            else {
-              $error = "Unable to rename $tfile to $ofile";
-            }
-          }
-          else {
-            $error = "Unable to remove $ofile";
-          }
-        }
-      }
-    }
-    else {
-      $error = (defined $error ? "There is a revision control system " .
-                                 "problem:\n$error" :
-                                 'There are no modified/removed files.');
-    }
-  }
-  else {
-    $error = "Unable to open $ofile for reading";
-  }
-
-  return $status, $error, $unknown;
-}
-
-
-sub convertTabs {
-  my($self) = shift;
-  my($line) = shift;
-  while($line =~ /\t/) {
-    my($spaces) = 8 - (index($line, "\t") % 8);
-    $line =~ s/\t/sprintf("%${spaces}s", ' ')/e;
-  }
-  return $line;
-}
-
-
-1;
diff --git a/ACE/bin/ChangeLogEditor/ChangeLogEntry.pm b/ACE/bin/ChangeLogEditor/ChangeLogEntry.pm
deleted file mode 100644
index 1fdcf9d3da3..00000000000
--- a/ACE/bin/ChangeLogEditor/ChangeLogEntry.pm
+++ /dev/null
@@ -1,145 +0,0 @@
-package ChangeLogEntry;
-
-# ************************************************************
-# Description   : Create a ChangeLog entry based on modified files.
-# Author        : Chad Elliott
-# Create Date   : 6/18/2002
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-use File::Basename;
-
-use FileLocatorFactory;
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub new {
-  my($class) = shift;
-  my($name)  = shift;
-  my($email) = shift;
-  my($self)  = bless {'name'  => $name,
-                      'email' => $email,
-                     }, $class;
-  return $self;
-}
-
-
-sub escape_regex_special {
-  my($self) = shift;
-  my($name) = shift;
-
-  $name =~ s/([\+\-\\\$\[\]\(\)\.])/\\$1/g;
-  return $name;
-}
-
-
-sub sortFileList {
-  my($self) = shift;
-  return sort {
-           if ($a =~ /\.h$/) {
-             my($base) = $a;
-             $base =~ s/\.h//;
-             $base = $self->escape_regex_special($base);
-             if ($b =~ /^$base\./) {
-               return -1;
-             }
-             else {
-               return $a cmp $b;
-             }
-           }
-           elsif ($a =~ /\.i(nl)?$/) {
-             my($base) = $a;
-             $base =~ s/\.i(nl)?$//;
-             $base = $self->escape_regex_special($base);
-             if ($b =~ /^$base\.cpp/) {
-               return -1;
-             }
-             else {
-               return $a cmp $b;
-             }
-           }
-           elsif ($a =~ /\.cpp?$/) {
-             my($base) = $a;
-             $base =~ s/\.cpp?$//;
-             $base = $self->escape_regex_special($base);
-             if ($b =~ /^$base\./) {
-               return 1;
-             }
-             else {
-               return $a cmp $b;
-             }
-           }
-           return $a cmp $b;
-         } @_;
-}
-
-
-sub create {
-  my($self)  = shift;
-  my(@dirs)  = @_;
-  my($fl)    = FileLocatorFactory::create();
-  my($modif,
-     $remov,
-     $confl,
-     $unknown,
-     $error) = $fl->locate(@dirs);
-  my($entry) = scalar(gmtime());
-
-  if (defined $$confl[0]) {
-    $entry = "ERROR: The following files have conflicts:\n";
-    foreach my $file (@$confl) {
-      $entry .= "$file\n";
-    }
-  }
-  else {
-    my($prefix) = '        * ';
-
-    ## Correct the timezone (if there is any)
-    my($tz) = 'UTC';
-    $entry =~ s/(:\d\d\s+)(.*)(\d\d\d\d)$/$1$tz $3/;
-
-    ## Add the name and email address
-    $entry .= "  $self->{'name'}  <$self->{'email'}>\n\n";
-
-    my($previous) = undef;
-    foreach my $file ($self->sortFileList(@$modif)) {
-      my($directory) = dirname($file);
-      if (defined $previous && $previous ne $directory) {
-        $entry .= "\n";
-      }
-      $entry .= "$prefix$file:\n";
-      $previous = $directory;
-    }
-    $previous = '';
-    my($removed) = 0;
-    foreach my $file ($self->sortFileList(@$remov)) {
-      my($directory) = dirname($file);
-      if (defined $previous && $previous ne $directory) {
-        $entry .= "\n";
-      }
-      $entry   .= "$prefix$file:\n";
-      $previous = $directory;
-      $removed++;
-    }
-    if ($removed) {
-      $entry .= "\n          Removed " .
-                ($removed > 1 ? 'these files' : 'this file') . ".\n";
-    }
-    $entry .= "\n";
-  }
-
-  if (!defined $$modif[0] && !defined $$remov[0]) {
-    $entry = undef;
-  }
-
-  return $entry, $unknown, $error;
-}
-
-
-1;
diff --git a/ACE/bin/ChangeLogEditor/EmailTranslator.pm b/ACE/bin/ChangeLogEditor/EmailTranslator.pm
deleted file mode 100644
index eacbff22497..00000000000
--- a/ACE/bin/ChangeLogEditor/EmailTranslator.pm
+++ /dev/null
@@ -1,52 +0,0 @@
-package EmailTranslator;
-
-# ************************************************************
-# Description   : Translate the given user name and domain into
-#                 an email address.
-# Author        : Chad Elliott
-# Create Date   : 6/18/2002
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-use FileHandle;
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub new {
-  my($class)  = shift;
-  my($domain) = shift;
-  my($self)   = bless {'domain' => "\@$domain",
-                      }, $class;
-  return $self;
-}
-
-
-sub translate {
-  my($self)    = shift;
-  my($name)    = shift;
-  my($domain)  = $self->{'domain'};
-  my($email)   = "$name$domain";
-  my(%special) = ();
-
-  if (defined $ENV{REPLYTO}) {
-    $email = $ENV{REPLYTO};
-  }
-  elsif (defined $special{$name}) {
-    $email = $special{$name} . $domain;
-  }
-  elsif ($name =~ /([^\s]+)\s+([^\s]+)/) {
-    ## Last name underscore first initial
-    $email = lc($2 . '_' . substr($1, 0, 1)) . $domain;
-  }
-
-  return $email;
-}
-
-
-1;
diff --git a/ACE/bin/ChangeLogEditor/FileLocator.pm b/ACE/bin/ChangeLogEditor/FileLocator.pm
deleted file mode 100644
index 5707a84c345..00000000000
--- a/ACE/bin/ChangeLogEditor/FileLocator.pm
+++ /dev/null
@@ -1,77 +0,0 @@
-package FileLocator;
-
-# ************************************************************
-# Description   : Base class for file locators.
-# Author        : Chad Elliott
-# Create Date   : 6/18/2002
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-use FileHandle;
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub new {
-  my($class)  = shift;
-  my($self)   = bless {
-                      }, $class;
-  return $self;
-}
-
-
-sub tmpnam {
-  my($self) = shift;
-  my($file) = shift;
-  my(@def)  = ("/tmp", ".");
-
-  foreach my $possible ($ENV{TMPDIR}, $ENV{TEMP}, $ENV{TMP}, @def) {
-    if (defined $possible && -d $possible && -w $possible) {
-      $possible =~ s!\\!/!g;
-      return $possible . '/' . $$ . '_' . $> . '_' . $file;;
-    }
-  }
-
-  return $file;
-}
-
-
-sub process_errors {
-  my($self)  = shift;
-  my($file)  = shift;
-  my($error) = undef;
-
-  if (-s $file != 0) {
-    my($fh) = new FileHandle();
-    if (open($fh, $file)) {
-      $error = '';
-      while(<$fh>) {
-        $error .= $_;
-      }
-      close($fh);
-      $error =~ s/\s+$//;
-    }
-  }
-  unlink($file);
-
-  return $error;
-}
-
-
-sub locate {
-  my($self)      = shift;
-  my(@dirs)      = @_;
-  my(@modified)  = ();
-  my(@removed)   = ();
-  my(@conflicts) = ();
-  my(@unknown)   = ();
-  return \@modified, \@removed, \@conflicts, \@unknown;
-}
-
-
-1;
diff --git a/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm b/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm
deleted file mode 100644
index 39e124c4ca9..00000000000
--- a/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm
+++ /dev/null
@@ -1,61 +0,0 @@
-package FileLocatorFactory;
-
-# ************************************************************
-# Description   : Create FileLocator objects.
-# Author        : Chad Elliott
-# Create Date   : 11/29/2005
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-
-use Cwd;
-use CVSFileLocator;
-use SVNFileLocator;
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub create {
-  ## Check for Subversion first.  It is unlikely that the .svn directory
-  ## will exist when Subversion isn't the rcs being used.  However, that
-  ## is not the case for CVS directories.
-  switch: {
-    ((defined $ENV{SVN_ASP_DOT_NET_HACK} && -d '_svn') || searchParentDirectory('.svn'))
-      && do { return new SVNFileLocator(); };
-    -d 'CVS'  && do { return new CVSFileLocator(); };
-    print STDERR "WARNING: Unsupported revision control protocol\n";
-  }
-
-  return new FileLocator();
-}
-
-sub searchParentDirectory {
-  my($hidden)  = shift;
-  my($path)    = cwd();
-  my($index)   = -1;
-
-  # Search all parent directories for the specified hidden
-  # directory. We stop when we either found the hidden directory
-  # of there are no more parent directories let to search.
-  do {
-    if (-d $path . '/' . $hidden) {
-      return 1;
-    }
-
-    $index = rindex($path, '/');
-
-    if ($index != -1) {
-      $path = substr ($path, 0, $index);
-    }
-  } while ($index != -1);
-
-  return 0;
-}
-
-
-1;
diff --git a/ACE/bin/ChangeLogEditor/SVNFileLocator.pm b/ACE/bin/ChangeLogEditor/SVNFileLocator.pm
deleted file mode 100644
index 55a8674af81..00000000000
--- a/ACE/bin/ChangeLogEditor/SVNFileLocator.pm
+++ /dev/null
@@ -1,75 +0,0 @@
-package SVNFileLocator;
-
-# ************************************************************
-# Description   : Use SVN to determine the list of modified files.
-# Author        : Chad Elliott
-# Create Date   : 11/29/2005
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-use FileHandle;
-
-use FileLocator;
-
-use vars qw(@ISA);
-@ISA = qw(FileLocator);
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub locate {
-  my($self)      = shift;
-  my(@dirs)      = @_;
-  my($fh)        = new FileHandle();
-  my(@modified)  = ();
-  my(@removed)   = ();
-  my(@conflicts) = ();
-  my(@unknown)   = ();
-  my($error)     = undef;
-  my($err)       = $self->tmpnam('cle_svn.err');
-
-  if (open($fh, "svn status @dirs 2> $err |")) {
-    while(<$fh>) {
-      my($line) = $_;
-      if ($line =~ /^([A-Z\s\?])([A-Z\s])[A-Z\s][\+\*\s][A-Z\s][A-Z\s]\s+(.*)$/) {
-        my($content)  = $1;
-        my($property) = $2;
-        my($file)     = $3;
-
-        ## Subversion differs from CVS in that it will print paths with
-        ## windows style back-slashes instead of forward slashes.
-        $file =~ s!\\!/!g if ($^O eq 'MSWin32');
-
-        if ($property eq 'M' ||
-            $content eq 'M'  || $content eq 'A' || $content eq 'R') {
-          push(@modified, $file);
-        }
-        elsif ($content eq 'D') {
-          push(@removed, $file);
-        }
-        elsif ($content eq 'C' || $property eq 'C') {
-          push(@conflicts, $file);
-        }
-        elsif ($content eq '?' && index($line, $err) == -1) {
-          push(@unknown, $file);
-        }
-      }
-    }
-    close($fh);
-
-    $error = $self->process_errors($err);
-  }
-  else {
-    $error = "Unable to run svn with error redirection.";
-  }
-
-  return \@modified, \@removed, \@conflicts, \@unknown, $error;
-}
-
-
-1;
diff --git a/ACE/bin/FOCUS/FOCUS.pl b/ACE/bin/FOCUS/FOCUS.pl
deleted file mode 100755
index 9237976db27..00000000000
--- a/ACE/bin/FOCUS/FOCUS.pl
+++ /dev/null
@@ -1,184 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-#########################################################################
-# FOCUS: A Feature Oriented Customization tool for ACE+TAO.
-#
-# Usage:
-# ======
-# --prefix-path - gives the prefix to the place where ACE+TAO is installed
-# --reactor-spl - provide the component that needs to be specialized
-# --protocol-spl - provide the concrete protocol to specialize
-# --output-prefix-path -
-#                  (Optional) if specified, copies all the files to the
-#                  output prefix. The directory structure is maintained.
-#                  That is if foo/bar.h file was specialized. Then the
-#                  output will be <prefix_output>/foo/bar.h
-#
-# Adding New Specializations
-# ===========================
-# (1) Add a new command line option if the specialization belongs to a
-#     new family of components. For example, Concurrency strategy
-# (1.b) If not, then enhance exisiting option with a new value
-# (2) Associate a specialization file for the concrete component being
-#     specialized.
-# (3) Update the specializations directory appropriately to add the
-#     specializations file.
-#
-# @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
-#
-########################################################################
-use Getopt::Long;
-
-# This script can be invoked from anywhere. We need to add this to the
-# path
-use lib "$ENV{ACE_ROOT}/bin";
-
-use FOCUS::Parser::FOCUSParser;
-
-sub usage
-{
-
-  # How to use FOCUS
-  # Currently FOCUS supports the specialization of reactor and protocol
-  # families
-  my $usage = "usage: \n ./FOCUS "
-              . " \n --prefix-path=<path to module root>"
-              . " [\n --reactor-spl=<select-mt, select-st, tp-reactor>"
-              . " \n --protocol-spl=<iiop>"
-              . " \n --wait-strategy-spl=<rw, lf>"
-              . " \n --output-prefix=<output path>"
-              . " \n --context-specific-optimizations=<dispatch>"
-              . " \n ]"
-              . "\n";
-  print "$usage \n";
-}
-
-# Global Table that maps the specialization name to the file
-# select => "../specializations/Reactor_Family/Select_Reactor.spl
-# For each component that one needs to specialize add an entry in
-# this simple global table to execute the specializations.
-
-# Get the ACE_ROOT ENV variable. Then the specializations
-# can be accessed via $ACE_ROOT/bin/FOCUS/.....
-my $spl_prefix_path = "";
-if (defined $ENV{"ACE_ROOT"})
-{
-  $spl_prefix_path = $ENV{"ACE_ROOT"};
-
-  # Check if the prefix path ends with a / or not
-  # if it does not then manually add the / to it
-  my $last = substr ($spl_prefix_path, -1);
-  if ($last ne "/")
-  {
-    $spl_prefix_path = $spl_prefix_path . "/";
-  }
-
-  # Add the bin/FOCUS directory to the prefix path
-  $spl_prefix_path = $spl_prefix_path . "bin/FOCUS/";
-
-}
-else
-{
-  print "FOCUS: ACE_ROOT environment variable not defined. Exiting... \n";
-  exit 1;
-}
-
-my %specialization_table  = (
- "select-mt", $spl_prefix_path . "specializations/Reactor_Family/Select_Reactor_MT.spl",
- "select-st", $spl_prefix_path . "specializations/Reactor_Family/Select_Reactor_ST.spl",
- "tp-reactor",$spl_prefix_path . "specializations/Reactor_Family/TP_Reactor.spl",
- "iiop", $spl_prefix_path . "specializations/Protocol_Family/IIOP/iiop.spl",
- "rw",   $spl_prefix_path . "specializations/Wait_Strategy/Wait_On_Read.spl",
- "lf",   $spl_prefix_path . "specializations/Wait_Strategy/Wait_On_Leader_Follower.spl",
- "dispatch", $spl_prefix_path . "specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl");
-
-# Get the command line options
-my $ret = GetOptions ("prefix-path=s"   => \$prefix_path,
-                      "reactor-spl=s"   => \$reactor_type,
-                      "protocol-spl=s"  => \$protocol_type,
-                      "wait-strategy-spl=s" => \$wait_strat_type,
-                      "output-prefix:s" => \$output_prefix,
-                      "context-specific-optimizations=s" => \$context_opt);
-
-# Check if the prefix path is specified
-if (!$prefix_path)
-{
-  usage;
-  exit 1;
-}
-
-#
-# Check if the optional outputpath is specified
-# if it not specified then the output_prefix will
-# be same as the prefix_path.
-# So if the prefix is something like:
-# /build/arvindk/ACE_wrappers, then the output_prefix
-# will be the same.
-#
-# Upshot: The source files will be directly replaced.
-#
-if (! $output_prefix)
-{
-  $output_prefix = $prefix_path;
-}
-
-# Check if the type of each component specialized is valid!
-if ($reactor_type)
-{
-  my $spl_file = $specialization_table {$reactor_type};
-  if (! length ($spl_file))
-  {
-    print "Invalid reactor type specified \n";
-    usage;
-    exit 1;
-  }
-
-  # specialize the Reactor component
-  FOCUSParser::Specialize_Components ($prefix_path, $spl_file, $output_prefix);
-}
-
-# protocol specialization
-if ($protocol_type)
-{
-  my $spl_file = $specialization_table {$protocol_type};
-  if (! spl_file)
-  {
-    print "Invalid reactor type specified \n";
-    usage;
-    exit 1;
-  }
-
-  # specialize the Protocol component
-  FOCUSParser::Specialize_Components ($prefix_path, $spl_file, $output_prefix);
-}
-
-# Wait Strategy specialization
-if ($wait_strat_type)
-{
-  my $spl_file = $specialization_table {$wait_strat_type};
-  if (! spl_file)
-  {
-    print "Invalid specialization for the Wait strategy \n";
-    usage;
-    exit 1;
-  }
-
-  # specialize the wait strategy
-  FOCUSParser::Specialize_Components ($prefix_path, $spl_file, $output_prefix);
-}
-
-# Context specific optimizations present
-if ($context_opt)
-{
-  my $spl_file = $specialization_table {$context_opt};
-  if (! spl_file)
-  {
-    print "Invalid Context specialization optimization specified\n";
-    usage;
-    exit 1;
-  }
-
-  # specialize the wait strategy
-  FOCUSParser::Specialize_Components ($prefix_path, $spl_file, $output_prefix);
-}
diff --git a/ACE/bin/FOCUS/NEWS b/ACE/bin/FOCUS/NEWS
deleted file mode 100644
index 29dd15e6a3d..00000000000
--- a/ACE/bin/FOCUS/NEWS
+++ /dev/null
@@ -1,35 +0,0 @@
-USER VISIBLE CHANGES AND CAPABILITIES ADDED TO FOCUS:
-=====================================================
-
-. Support for specialization of ACE Reactor Framework
-  -- Specialization of ACE_Select_Reactor both st and mt
-  -- Specialization of ACE_TP_Reactor 
-
-. Support for specialization of Pluggable Messaging in TAO
-  -- Specialization of Pluggable Messaging Interface based on GIOP 
-
-. Support for specializing the Pluggable Protocol framework in TAO
-  -- Specialization for IIOP protocol implementation in TAO
-
-FUTURE CAPABILITIES and PLANNED CHANGES
-========================================
-ACE+TAO component specialization related capabilities
------------------------------------------------------
-. Support for specialization of the Messaging Framework based on GIOP_Lite
-. Support for specialization of Wait Strategy including Leader_Follower wait strategy
-. Support for specialization of Flushing Strategy components
-
-FOCUS Specialization Language Enhancements
------------------------------------------- 
-. Support for multi line search and replace capabilities
-. Support for ensuring source files are not corrupted when multiple 
-  specializations are grouped together when the specializations are 
-  added.
-
-FOCUS Transformation Related Enhancements
-----------------------------------------
-. Support for undo feature for the transformations. This is going to be 
-  really hard. I am not sure if this is doable
-. Specifying dependencies between the different specializations. If one 
-  is incompatible with the other, then this needs to be detected before
-  the specializations are executed.
diff --git a/ACE/bin/FOCUS/PROBLEM-REPORT-FORM b/ACE/bin/FOCUS/PROBLEM-REPORT-FORM
deleted file mode 100644
index 9538e1d58df..00000000000
--- a/ACE/bin/FOCUS/PROBLEM-REPORT-FORM
+++ /dev/null
@@ -1,45 +0,0 @@
-To: arvindk@dre.vanderbilt.edu
-Subject: [area]: [synopsis]
-
-    TAO VERSION:
-    ACE VERSION:
-
-    HOST MACHINE and OPERATING SYSTEM:
-
-
-    TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
-    COMPILER NAME AND VERSION (AND PATCHLEVEL):
-
-    FOCUS COMMAND LINE OPTION
-      [What command line option did you use for FOCUS?]
-
-    AREA/CLASS/EXAMPLE AFFECTED:
-[What example failed?  What module failed to compile?]
-
-    DOES THE PROBLEM AFFECT:
-        COMPILATION?
-         [ What compiler are you using? Please cut n paste the
-          compilation error.]
-
-        LINKING?
-         [   On Unix systems, did you run make realclean first?]
-        EXECUTION?
-        OTHER (please specify)?
-
-[Please indicate whether ACE/TAO, your application, or both are affected.]
-
-    SYNOPSIS:
-[Brief description of the problem]
-
-    DESCRIPTION:
-[Detailed description of problem.  Don't just say "<blah>
-doesn't work, here's a fix," explain what your program does
-to get to the <blah> state. ]
-
-    SAMPLE FIX/WORKAROUND:
-[If available ]
-
-    ACE+TAO INSTRUMENTED FILES:
-        Please if possible attach the ACE+TAO instrumented files (source
-        files) that affected your application. (Please use a compression
-        utility for sending the attachments)
diff --git a/ACE/bin/FOCUS/Parser/FOCUSParser.pm b/ACE/bin/FOCUS/Parser/FOCUSParser.pm
deleted file mode 100644
index 38758193f29..00000000000
--- a/ACE/bin/FOCUS/Parser/FOCUSParser.pm
+++ /dev/null
@@ -1,724 +0,0 @@
-#########################################################################
-# A Simple Parser for automating the specializations crated in FOCUS.
-#
-# @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
-#
-# This parser, parses the specialization file given as an input argument
-# and *individually* visits the tags in a pre-determined order to weave
-# in the specializations.
-# NOTE: This parser will make N passes over the file, where N equals
-# to the number of tags defined in the specialization file. This
-# approach is intentional as it servers current needs. Future versions
-# may enhance this parser and Visit methods to be more intelligent.
-###########################################################################
-package FOCUSParser;
-
-# for MY own preferences!
-use strict;
-
-# XML related operations
-use XML::DOM;
-
-# Generic file operations
-use FileHandle;
-
-# Creating files and renaming them
-use File::Copy;
-
-# Creating directories
-use File::Path;
-
-############################################
-# GLOBAL CONSTANTS
-###########################################
-my $FOCUS_PREPEND_TAG = "\/\/@@ ";
-
-####################################################################
-# banner: A function that returns the FOCUS banner transformation
-# for just clarity purpose only.
-###################################################################
-sub FOCUS_banner_start
-{
-  my $banner_str = "// Code woven by FOCUS:\n";
-  return $banner_str;
-}
-
-sub FOCUS_banner_end
-{
-  my $banner_str = "// END Code woven by FOCUS\n";
-  return $banner_str;
-}
-
-#########################################################################
-# Visit_ADD: Visit a add element defined in the transform.
-# In particular look for the hook defined: search it in the source file
-# and add the data in the <data> tags into the file starting from the
-# hook, but not including the hook.
-##########################################################################
-sub Visit_Add
-{
-  my ($add, $copy_file_name) = @_;
-
-  # Open the copy and transform it
-  open (IN, "+<". $copy_file_name) ||
-    die "cannot open file: " . $copy_file_name;
-
-  # To update a file in place, we use the temporary
-  # file idiom. Perl says this is the best way to
-  # do this!
-  my $copy_file_tmp = $copy_file_name . "tmp";
-  open (OUT, ">". $copy_file_tmp) ||
-    die "cannot open temporary file for modying file:" . $copy_file_name;
-
-  # get the hook element defined in the add element
-  my $hook = $add->getElementsByTagName ('hook');
-
-  # ensure length of hook == 1;
-  if ($hook->getLength != 1)
-  {
-    print "Assertion Error: An <add> element can have only \
-           one <hook> definition";
-
-    # clean up
-    close (IN);
-    close (OUT);
-
-    # Diagnostic comment
-    print " [failure]... Reverting changes \n";
-
-    unlink ($copy_file_name);
-    unlink ($copy_file_name . "tmp");
-    exit (1);
-  }
-
-  # Check if the hook is present in the file at all
-  my $hook_str = $hook->item(0)->getFirstChild->getNodeValue;
-  chomp ($hook_str);
-
-  #//@@ For now, due to problem with the hook string
-  my $search_str = $hook_str;
-
-  while (<IN>)
-  {
-    if (/$search_str/)
-    {
-      # Do not remove the hook! It needs to be present
-      print OUT $_;
-
-      # FOCUS banner start
-      print OUT FOCUS_banner_start;
-
-      # parse <data> ... </data> elements for this add tag
-      my @data_list = $add->getElementsByTagName ('data');
-      foreach my $data (@data_list)
-      {
-	my $data_item = $data->getFirstChild->getNodeValue;
-	chomp ($data_item);
-
-	# Insert the item
-	print OUT "$data_item \n";
-      }
-
-      # FOCUS banner end
-      print OUT FOCUS_banner_end;
-    }
-    else
-    {  print OUT $_; }
-  }
-
-  # Everything went well!
-  close (IN);
-  close (OUT);
-
-  # replace in place the old file with the new one
-  rename ($copy_file_tmp, $copy_file_name);
-}
-
-###########################################################################
-# Visit_Remove: Visit a <remove> element defined in the transform.
-# In particular look for the hook defined: search it in the source file
-# and remove the element's value from the source file being searched.
-############################################################################
-sub Visit_Remove
-{
-  my ($remove, $copy_file_name) = @_;
-
-  # obtain the data to be removed
-  my $search = $remove->getFirstChild->getNodeValue;
-  chomp ($search);
-
-  # Open the copy and transform it
-  open (IN, "+<" . $copy_file_name) ||
-    die "cannot open file: " . $copy_file_name;
-
-  # Update the file in place
-  my $copy_file_name_tmp = $copy_file_name . "tmp";
-  open (OUT, ">". $copy_file_name_tmp) ||
-    die "cannot open temporary file for modying file:" . $copy_file_name;;
-
-  # Removing something is same as search and replace. Replace with ""
-  my $replace = "";
-
-  foreach my $line (<IN>)
-  {
-    if ($line =~/$search/)
-    {
-      # We do not print the banner information
-      # as we have removed something and
-      # print the banner will be redundant!
-
-      # replace <search> with <replace>
-      $line =~ s/$search/$replace/;
-
-      print OUT $line;
-    }
-    else { print OUT $line; }
-  }
-
-  # Everything went well!
-  close (IN);
-  close (OUT);
-
-  # replace in place the old file with the new one
-  rename ($copy_file_name_tmp, $copy_file_name);
-}
-
-#########################################################################
-# Visit_Substitute: Visit a <substitute> element defined in the transform.
-# In particular look for the <search> element and replace it with the
-# <replace> element.
-#########################################################################
-sub Visit_Substitute
-{
-  my ($substitute, $copy_file_name) = @_;
-
-  # Open the copy and transform it
-  open (IN, "+<". $copy_file_name) ||
-    die "cannot open file: " . $copy_file_name;
-
-  # To update a file in place, we use the temporary
-  # file idiom. Perl says this is the best way to
-  # do this!
-  my $copy_file_name_tmp = $copy_file_name . "tmp";
-  open (OUT, ">". $copy_file_name . "tmp") ||
-    die "cannot open temporary file for modying file:" . $copy_file_name;;
-
-  # check if the match-line keyword is set or not
-  my $match_line = $substitute->getAttribute('match-line');
-
-  # <search> .... </search>
-  my $search_list = $substitute->getElementsByTagName ('search');
-
-  # ensure length of search == 1;
-  if ($search_list->getLength != 1 ||
-      $search_list->getLength == 0)
-  {
-    print "Assertion Error: A <substitute> element can have only \
-          one <search> element";
-    close (IN);
-    close (OUT);
-
-    # Dianostic comment
-    print " [failure] reverting changes \n";
-
-    unlink ($copy_file_name);
-    unlink ($copy_file_name_tmp);
-    exit (1);
-  }
-
-  # <replace> .... </replace>
-  my $replace_list = $substitute->getElementsByTagName ('replace');
-  if ($replace_list->getLength != 1 ||
-      $replace_list->getLength == 0)
-  {
-    print "Assertion Error: A <substitute> element can have only \
-           one <replace> element";
-    close (IN);
-    close (OUT);
-    unlink ($copy_file_name);
-    unlink ($copy_file_name_tmp);
-    exit (1);
-  }
-
-  # <search> and <replace> element values
-  my $search = $search_list->item(0)->getFirstChild->getNodeValue;
-  my $replace = $replace_list->item(0)->getFirstChild->getNodeValue;
-
-  # remove spaces
-  chomp ($search);
-  chomp ($replace);
-
-  # Search and replace string in the file
-  foreach my $line (<IN>)
-  {
-    # Check if the match line attribute is set. If so then
-    # ignore word boundaries. If not, honor word boundaries.
-    my $line_matched = 0;
-    if (! $match_line)
-    {
-      if ($line =~/\b$search\b/)
-      {
-        $line_matched = 1;
-      }
-    }
-    else
-    {
-      if ($line =~ /$search/)
-      {
-        $line_matched = 1;
-      }
-    }
-
-    # Check if the line matched
-    if ($line_matched)
-    {
-      # FOCUS banner start
-      print OUT FOCUS_banner_start;
-
-      # replace <search> with <replace>
-      # Caveat: What if <search> occures multiple
-      # times in the line? Here is how we handle
-      # it
-      $line =~ s/$search/$replace/g;
-
-      print OUT $line;
-
-      # FOCUS banner end
-      print OUT FOCUS_banner_end;
-    }
-    else { print OUT $line; }
-  }
-
-  # everything went well!
-  close (IN);
-  close (OUT);
-
-  # replace in place the old file with the new one
-  rename ($copy_file_name_tmp, $copy_file_name);
-}
-
-#########################################################################
-# Visit_Comment: Visit the comment-region hooks defined in the
-# source code and comment out all code between start and finish of that
-# region
-#########################################################################
-sub Visit_Comment
-{
-  my ($comment, $copy_file_name) = @_;
-
-  # check for the comment region tags and
-  # comment out the region
-  my $start_hook_tag = $comment->getElementsByTagName ('start-hook');
-  my $end_hook_tag   = $comment->getElementsByTagName ('end-hook');
-
-  if ($start_hook_tag->getLength != 1 ||
-      $end_hook_tag->getLength != 1)
-  {
-    print "Assertion Error: A <comment> element can have only \
-           one pair of <start-hook> and <end-hook> tags";
-    unlink ($copy_file_name);
-    exit (1);
-  }
-
-  my $start = $start_hook_tag->item(0)->getFirstChild->getNodeValue;
-  my $end =   $end_hook_tag->item(0)->getFirstChild->getNodeValue;
-
-  # What are we looking for:
-  # We need to start from "//" . FOCUS_PREPEND_TAG . $hook
-  # i.e. //[[@ <blah blah>
-  # This will be the format for both start and end
-  # //@@ Problems with the hook string
-  my $start_hook = $FOCUS_PREPEND_TAG . $start;
-  my $end_hook   = $FOCUS_PREPEND_TAG . $end;
-
-  # Open the copy and transform it
-  open (IN, "+<". $copy_file_name) ||
-    die "cannot open file: " . $copy_file_name;
-
-  my $copy_file_name_tmp = $copy_file_name . "tmp";
-  open (OUT, ">". $copy_file_name_tmp) ||
-    die "cannot open temporary file for modying file:" . $copy_file_name;
-
-  my $start_commenting = 0;
-  while (<IN>)
-  {
-    if (! /$start_hook/ &&
-        ! /$end_hook/)
-    {
-      if ($start_commenting)
-      { print OUT "// " . $_; }
-      else
-      { print OUT $_; }
-    }
-    else
-    {
-      if (/$start_hook/)
-      {
-        $start_commenting = 1;
-        print OUT $_; # print start hook!
-      }
-      else
-      {
-        $start_commenting = 0;
-        print OUT $_; # print end hook!
-      }
-    }
-  }
-
-  # everything went well!
-  close (IN);
-  close (OUT);
-
-  rename ($copy_file_name_tmp, $copy_file_name);
-}
-
-###############################################################
-# Visit_Copy: visit the <copy> tags and weave the code into the
-# source file. In particular, open the source file specified
-# in the file-source tag. Search for the start hook and
-# copy until the end hook is reached.
-###############################################################
-sub Visit_Copy
-{
-  my ($copy_tag, $copy_file_name, $default_module_name, $prefix_path) = @_;
-
-  # Check if a file name has been specified
-  my $dest_file_tag = $copy_tag->getElementsByTagName ('source');
-
-  if (! $dest_file_tag)
-  {
-    print "Error: <copy-from-source> does not have the <file> tag..";
-    print "aborting \n";
-    exit 1;
-  }
-
-  if ($dest_file_tag->getLength != 1)
-  {
-    print "Assertion Error: A <copy-from-source> element can have only \
-           one <source> tag from which to copy elements";
-    exit (1);
-  }
-
-  my $dest_file_name = $dest_file_tag->item(0)->getFirstChild->getNodeValue;
-
-  #Check if the file exists and one is able to access it
-  $dest_file_name = $prefix_path . "/" . $default_module_name . "/" . $dest_file_name;
-
-  open (DEST, "<". $dest_file_name) ||
-   die "cannot open $dest_file_name \n Wrong <file> tag within <copy-from-source> exiting" ;
-
-  # check for the start and end tags within the target file where
-  # one needs to start copying from
-  my $start_tag = $copy_tag->getElementsByTagName ('copy-hook-start');
-  my $end_tag   = $copy_tag->getElementsByTagName ('copy-hook-end');
-
-  if (! $start_tag || ! $end_tag)
-  {
-    print "Assertion Error: A <copy> element should have a \
-           <copy-hook-start> tag and <copy-hook-end> tag \n";
-    exit (1);
-  }
-
-  # Get the <dest-hook> tag that indicates the destination where the
-  # code between the start and end tags will be placed.
-  my $dest_hook_tag   = $copy_tag->getElementsByTagName ('dest-hook');
-  if (! $dest_hook_tag)
-  {
-    print "Assertion Error: <copy-from-source> should have a <dest-hook> \
-           tag that dictates where in the source file the code should be \
-           placed. \n";
-    exit (1);
-  }
-
-  # Remove any starting and trailing white spaces
-  chomp ($dest_hook_tag);
-
-  # We have everything we need! Do the copy
-  my $start_tag_name = $start_tag->item(0)->getFirstChild->getNodeValue;
-  my $end_tag_name   = $end_tag->item(0)->getFirstChild->getNodeValue;
-  my $dest_tag_name  = $dest_hook_tag->item(0)->getFirstChild->getNodeValue;
-
-  # First we add the FOCUS prepend tags
-  $start_tag_name = $FOCUS_PREPEND_TAG . $start_tag_name;
-  $end_tag_name   = $FOCUS_PREPEND_TAG . $end_tag_name;
-  $dest_tag_name  = $FOCUS_PREPEND_TAG . $dest_tag_name;
-
-  # Step 1: Iterate over the target file till the
-  # dest-hook is found in that file
-  my $copy_file_name_tmp = $copy_file_name . "tmp";
-  open (OUT, ">". $copy_file_name_tmp) ||
-    die "cannot open temporary file for modying file:" . $copy_file_name;
-  open (IN, "<" . $copy_file_name) ||
-    die "cannot open file $copy_file_name specified in the <file> tag \n";
-
-  my $dest_tag_found = 0; #check if tag matched
-  foreach my $line (<IN>)
-  {
-    if ($line =~ /$dest_tag_name/)
-    { $dest_tag_found = 1; print OUT $line; last; }
-
-    print OUT $line;
-  }
-  close (IN);
-
-  # If we reached the end of file before finding the tag!
-  if (! $dest_tag_found)
-  {
-    print "\n Error: <dest-hook> tag missing in file .. aborting \n";
-    close (DEST);
-    close (IN);
-    close (OUT);
-    unlink ($copy_file_name_tmp);
-    exit (1);
-  }
-
-  # Step 2: Now look in the destination file and look for the hooks
-  # where one needs to copy. There could be multiple places where the
-  # hook can be present. E.g.
-  # .......
-  # //@@ COPY_START_HOOK
-  # ....
-  # ....
-  # //@@ COPY_END_HOOK
-  # ....
-  # ....
-  # //@@ COPY_START_HOOK
-  # ....
-  # ....
-  # //@@ COPY_END_HOOK
-  # Handle this case
-
-  my $line_matched = 0;
-  my $start_copying = 0; # initially do not copy
-  foreach my $line (<DEST>)
-  {
-    # Check if the line matches the start tag
-    if ($line =~/$start_tag_name/)
-    {
-      $line_matched += 1;
-      $start_copying = 1;
-    }
-    else
-    {
-      # Check if the line matches the end tag
-      if ($line =~/$end_tag_name/)
-      {
-        # check if the start tag matched!
-        if (! $line_matched)
-        {
-          print "Assertion error: <copy-hook-end> tag misplaced with \
-                 the <copy-hoook-source> \n";
-          close (DEST);
-          close (IN);
-          close (OUT);
-          unlink ($copy_file_name_tmp);
-          exit (1);
-        }
-
-        # decrement the count for nested tags
-        $line_matched -= 1;
-        if (! $line_matched )
-          { $start_copying = 0; }
-      }
-      else
-      {
-        # Print out the line
-        if ($start_copying)
-          { print OUT $line; }
-      }
-    }
-  }
-
-  # At the end of this loop line_matched should be 0
-  if ($line_matched)
-  {
-    print "Error: in $dest_file_name, number of <copy-hook-source> tags \
-           did not match the number of <copy-hook-end> tags. Reverting \
-           changes. \n";
-    close (DEST);
-    close (IN);
-    close (OUT);
-    unlink ($copy_file_name_tmp);
-    exit (1);
-  }
-
-  # Step 3: Now copy data after the tag in the original file onto the destination
-  # file.
-  open (IN, "<" . $copy_file_name) ||
-    die "cannot open file $copy_file_name specified in the <file> tag \n";
-  $dest_tag_found = 0; #used as a flag
-  foreach my $line (<IN>)
-  {
-    if ($dest_tag_found)
-    { print OUT $line; }
-
-    # If the hook is found, then don't write the hook onto OUT
-    # as it would have been written earlier
-    if (! $dest_tag_found &&
-        $line =~ /$dest_tag_name/)
-      { $dest_tag_found = 1; }
-  }
-
-  # Normal exit path
-  close (IN);
-  close (OUT);
-  close (DEST);
-
-  # Rename the tmp file to the file modified
-  rename ($copy_file_name_tmp, $copy_file_name);
-}
-
-#################################################################
-# commit_files: A procedure to commit all the copy files that
-# were specialized back to the orginal files.
-#################################################################
-sub commit_files
-{
-  my ($path_name, $output_path_name, @files) = @_;
-
-  # iterate over the file_name_list
-  foreach my $file (@files)
-  {
-    # <file name="....">
-    my $file_name = $file->getAttribute('name');
-
-    # output_path == input_path then do an in place
-    # substitution.
-    if ($output_path_name eq $path_name)
-    {
-      rename ($path_name . "/" . $file_name . "copy",
-              $path_name . "/" . $file_name);
-    }
-    else
-    {
-      # Check if the path_name exists. The path name
-      # corresponds to a directory. So create it if it does
-      # not exist.
-      if (! -d $output_path_name)
-      {
-        #@@? Need to revert the *copy files?
-        mkpath ($output_path_name, 0, 0744) ||
-          die "cannot create $output_path_name: commit files failed! \n";
-      }
-
-      # move the specialized file to the output directory
-      rename ($path_name . "/" . $file_name . "copy",
-              $output_path_name . "/" . $file_name);
-    }
-  }
-}
-
-#### Main ########################################################
-# Specialize_Component
-# procedure to execute the transformations specified in the
-# specialization file
-##################################################################
-sub Specialize_Components
-{
-  # Get the command line arguments
-  my ($prefix_path, $spl_file, $output_prefix) = @_;
-
-  my $parser = XML::DOM::Parser->new();
-  my $doc = $parser->parsefile($spl_file);
-
-  # Check if the prefix path ends with a / or not
-  # if it does not then manually add the / to it
-  my $last = substr ($prefix_path, -1);
-  if ($last ne "/")
-  { $prefix_path = $prefix_path . "/"; }
-
-  # Entry Point: <transform> element
-  foreach my $transform ($doc->getElementsByTagName('transform'))
-  {
-    # <module tags>
-    foreach my $module ($transform->getElementsByTagName('module'))
-    {
-      # Complete path name to the module
-      my $module_name = $module->getAttribute('name');
-      my $path_name = $prefix_path . $module_name;
-
-      # <file tags>
-      my @files = $module->getElementsByTagName('file');
-      foreach my $file (@files)
-      {
-	# <file name="....">
-	my $file_name = $file->getAttribute('name');
-
-	# Rather than modifying the files directly, make a local
-	# copy of the files and then transform them and commit
-	# if there is a file called foo we make a file foo_copy
-	my $file_path_copy = $path_name . "/" . $file_name . "copy";
-	my $file_path_name = $path_name . "/" . $file_name;
-
-	copy ($file_path_name, $file_path_copy);
-
-	# Diagnostic comment
-	print "Instrumenting $file_name ..........";
-
-        # <comment> ... </comment>
-        my @comment_list = $file->getElementsByTagName ('comment');
-        foreach my $comment (@comment_list)
-        { Visit_Comment ($comment, $file_path_copy); }
-
-        # <copy-from-source> ... </copy-from-source>
-        my @copy_from_source_files =
-          $file->getElementsByTagName ('copy-from-source');
-        foreach my $copy_from_source (@copy_from_source_files)
-        {
-          Visit_Copy ($copy_from_source,
-                      $file_path_copy,
-                      $module_name,
-                      $prefix_path);
-        }
-
-	# <remove> ... </remove>
-	my @remove_list = $file->getElementsByTagName ('remove');
-        foreach my $remove (@remove_list)
-	{ Visit_Remove ($remove, $file_path_copy); }
-
-	# <substitute ... </substitute>
-	my @substitute_list = $file->getElementsByTagName ('substitute');
-	foreach my $substitute (@substitute_list)
-	{ Visit_Substitute ($substitute, $file_path_copy); }
-
-	# <add> <hook> ...... </hook> <add>
-	my @add_list = $file->getElementsByTagName ('add');
-	foreach my $add (@add_list)
-	{ Visit_Add ($add, $file_path_copy); }
-
-	# Everything went well.. Print success
-	print " [done] \n";
-      }
-    }
-
-    # At this point all the specializations in all the modules have
-    # succeeded. It is at this point that we need to commit the
-    # specializations in each of the modules. That is move the temporary
-    # file that we created to the main file that was specialized.
-    # This also means that we need another loop and do the same thing
-    # as above....
-    # <module tags>
-    foreach my $module ($transform->getElementsByTagName('module'))
-    {
-      # Complete path name to the module
-      my $module_name = $module->getAttribute('name');
-      my $path_name = $prefix_path . $module_name;
-
-      # Output path name: append output_prefix to the
-      # current module name. Append "/" to create a
-      # directory like /foo/bar/baz/
-      my $output_path = $output_prefix . "/" . $module_name;
-
-      # <file tags>
-      my @files = $module->getElementsByTagName('file');
-
-      # commit the files
-      commit_files ($path_name, $output_path, @files);
-    }
-  }
-}
-
-####
-# Requiured for a module
-####
-1;
diff --git a/ACE/bin/FOCUS/README b/ACE/bin/FOCUS/README
deleted file mode 100644
index 871299833f6..00000000000
--- a/ACE/bin/FOCUS/README
+++ /dev/null
@@ -1,76 +0,0 @@
-
-                          FOCUS README
-                          ============
-
-Motivation:
-----------
-Middleware is often developed as a set of frameworks that can be
-extended and configured with alternative implementations of key
-components, such as different types of transport protocols e.g.,
-TCP/IP, VME, or shared memory), event demultiplexing mechanisms
-e.g., reactive-, proactive-, or thread-based), request
-demultiplexing strategies (e.g., dynamic hashing, perfect
-hashing, or active demuxing), and concurrency models (e.g.,
-thread-per-connection, thread pool, or thread-pre-request).  A
-particular DRE application, however, may only use a small subset
-of the potential framework alternatives.  As a result, general-purpose
-middleware may be overly extensible, i.e., contain
-unnecessary overhead for indirection and dynamic dispatching that is
-not needed for use cases in a particular context.
-A challenge is to develop middleware specialization
-techniques that can eliminate unnecessary overhead associated with
-overly extensible middleware framework implementations for certain
-product variants or application-specific contexts.
-
-Example and Approach:
---------------------
-The reactor framework in ACE allows plug and play of different
-reactors such as Select, TP, Devpoll etc. The TAO middleware
-implementation and applications that run atop TAO typically use
-one particular implementation of the Reactor. For example, a
-single-threaded application might use select_* reactors. The
-Reactor framework uses the bridge pattern to transparently
-invoke operations on the right reactors. When the concrete
-Reactor is known, it should be possible to specialize the
-framework to use the concrete reactor directly rather than use
-the bridge.
-
-As a part of the Feature Oriented Customizer (FOCUS) tool being
-,we are trying to specialize frameworks
-when the concrete implementation type is known a priori. FOCUS
-provides an XML based transformation engine, where the
-specialization transformations are captured in XML file and a
-weaver specializes the code.
-
-To help in this transformation process, FOCUS applies markers
-within the source code. These markers are added as special
-comments. For example, //@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-represents a hook where forward declarations and include files are
-added by the weaver. As these markers are comments therefore should not
-affect normal applications in *any* manner. Additionally, applications
-that use multiple reactor implementations not be affected/do not need any
-change. Currently, these specializations are targeted for TAO middleware,
-where applications know the target reactor a priori and want to
-leverage the specialization to improve performance.
-
-FOCUS Installation
-------------------
-. FOCUS is written using Perl and does not require any compilation. Additionally
-  FOCUS does not depend on any external tools.
-
-Requirements
-------------
-. FOCUS has been tested on Perl version 5.8.0 and uses the following Perl
-  packages:
-   -- XML::DOM package --> Perl package for processing XML DTDs
-
-Sample Usage:
--------------
-FOCUS can be invoked from the command line in the following manner:
-cmd>$ACE_ROOT/bin/FOCUS/FOCUS.pl --reactor-spl=select-st
-                                 --prefix-path=/build/arvindk/ACE_wrappers
-                                 --output-prefix=/build/arvindk/spl-files
-
-More Information:
------------------
-More information about FOCUS should be available from the docs directory.
diff --git a/ACE/bin/FOCUS/VERSION b/ACE/bin/FOCUS/VERSION
deleted file mode 100644
index b41df4e4c7b..00000000000
--- a/ACE/bin/FOCUS/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-This is FOCUS version 0.0.1 alpha
diff --git a/ACE/bin/FOCUS/docs/FOCUS.html b/ACE/bin/FOCUS/docs/FOCUS.html
deleted file mode 100644
index d038a8765ab..00000000000
--- a/ACE/bin/FOCUS/docs/FOCUS.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--  -->
-  <title>FOCUS</title>
-</head>
-<body bgcolor="#ffffff" link="#000fff" vlink="#ff0f0f" text="#000000">
-<hr>
-<p></p>
-<h2 align="center">Feature Oriented Customizer for Middleware (FOCUS)</h2>
-<h3>Table of Contents</h3>
-<ul>
-  <li><a href="#MOT">Introduction</a> </li>
-  <li><a href="#FCS-OVR">FOCUS Options overview</a> </li>
-  <li><a href="#FCS-USAGE">FOCUS Sample Usage</a> </li>
-  <li><a href="#FCS-ORG">FOCUS Structure & Organization</a> </li>
-  <li><a href="#FCS-ORG">Extending FOCUS</a> </li>
-</ul>
-
-<hr>
-<h3><b><a name="MOT">Introduction</a></b></h3>
-TAO is a highly flexible ORB that contains a wide range of ORB
-configuration options. One or more of these options can be combined
-to meet various application requirements, such as low-latency,
-predictable real-time behavior, or small memory footprint. TAO's ORB
-configuration options are managed by an object-oriented framework
-within the ORB Core.  TAO ORB internally uses several objects called
-<b>Resources</b>, such
-as a <em>reactor</em> framework that demultiplexes new connection and
-data requests from a client or <em>pluggable protocol</em> framework
-to seamlessly work across different protocols.  <b>Strategies</b>, are
-objects that use the <b>Resource</b> entities to perform various ORB tasks,
-such as connection management, concurrency, and demultiplexing.
-The <b>Service Configurator</b> is a framework that can be used
-to statically and dynamically configure components into middleware and
-applications.
-
-Most often, applications that run on top of TAO use only one concrete type
-of each resource. For example, predominantly TAO applications use the IIOP
-protocol for communication.  In this case, the underlying framework that
-realizes the feature can be specialized to remove dynamic dispatching
-overheads. The Feature Oriented Customizer (FOCUS) tool provides a
-generic approach to enable middleware developers to specialize middleware
-Frameworks when the concrete resource type is known a priori.
-FOCUS provides an XML based transformation engine, where the
-specialization transformations are captured in XML file and a
-weaver specializes the code. Some important points to note about FOCUS
-and specialization:
-<ul>
- <li>It does not modify an interface. So no application level changes are
-     necessary.
- </li>
- <li>Once a framework has been customized using FOCUS for a concrete component,
-     other components do not work. For example, specializing the protocol
-     framework with IIOP, precludes the ability to plug-in other protocol
-     implementations.
- </li>
- <li>It provides a source-to-source transformations that require re-compiling
-     the source.
- </li>
-</ul>
-
-<hr>
-<h3><b><a name="FCS-OVR">FOCUS Options Usage</a></b></h3>
-<table border="2" cellpadding="0" cellspacing="2">
-  <tbody>
-    <tr>
-      <th>Option</th>
-      <th>Description</th>
-    </tr>
-    <tr>
-      <td>--prefix-path</td>
-      <td>prefix-path to the ACE+TAO source distribution location. For example,
-          in most situations this path is same as the ACE_ROOT environment
-          variable.
-       </td>
-    </tr>
-    <tr>
-       <td>--reactor-spl <em>select-st</em>, <em>select-mt</em>, <em>tp-reactor</em></td>
-       <td>Option to specialize the reactor framework with the
-           concrete reactor type.
-           <p>select-st: select reactor which no locking. Single threaded case.</p>
-           <p>select-mt: select reactor with locking enabled, multi-threaded case.
-           </p>
-           <p>tp-reactor: Thread-pool reactor</p>
-        </td>
-     </tr>
-     <tr>
-        <td>--protocol-spl <em>iiop</em></td>
-        <td>Option to specialize the pluggable protocol framework in TAO for the
-            IIOP protocol.
-     </tr>
-     <tr>
-        <td>--messaging-spl <em>giop</em></td>
-        <td>Option to specialize the messaging strategy in TAO with GIOP
-            messaging protocol.
-         </td>
-     </tr>
-     <tr>
-        <td>--wait-strategy <em>rw</em></td>
-        <td>Specialize the Wait Strategy with the concrete Wait Strategy in TAO.
-            This specialization corresponds to the <em>-ORBWaitStrategy</em>
-            option in TAO.
-         </td>
-     </tr>
-     <td>--output-prefix</td>
-     <td>Option to copy over the specialized files to an output directory. This
-         option works only when a single specialization is chose. If multiple
-         specializations are chosen, then this copies the files corresponding
-         to the last specialization.
-     </td>
-  </tbody>
-</table>
-
-<hr>
-<h3><b><a name="FCS-USAGE">FOCUS Sample Usage</a></b></h3>
-cmd>$ACE_ROOT/bin/FOCUS/FOCUS.pl --reactor-spl=select-st \
-                                 --prefix-path=/build/arvindk/ACE_wrappers
-                                 --output-prefix=/build/arvindk/spl-files
-
-<hr>
-<h3><b><a name="FCS-ORG">FOCUS Tool Organization</a></b></h3>
-FOCUS tool structure is organized as follows:
-<ul>
-  <li>Parser directory has all parser related modules</li>
-  <li>specializations: Rules data base that has the XML files required for
-      performing the individual specialization transformations. For each
-      specialization we have the following sub directories:
-      <ul>
-        <li>Reactor_Family: Specializations for ACE_Reactor family</li>
-        <li>Protocol_Family: Specializations for TAO's protocol family</li>
-        <li>Messaging_Strategy: Specializations for TAO's Messaging Strategy</li>
-        <li>Wait_Strategy: Specializations for TAO's Wait strategies</li>
-      </ul>
-  </li>
-</ul>
-
-A detailed overview of the FOCUS specialization language, that specifies the
-different types for specialization transformations supported in FOCUS is
-discussed here: {To be updated shortly!}
-
-<hr>
-<h3><b><a name="FCS-ORG">Extending FOCUS</a></b></h3>
-To add a new specializations, to FOCUS, one needs to do the following:
-<ol>
- <li>Use the FOCUS specification language to model the different specialization
-     Transformations required. Add this to the repository under
-     FOCUS/specializations. Current convention is to use a directory for each
-     family or specific type of specialization and add specialization files
-     for each type in the family.
- </li>
- <li>Annotate the middleware source code where ever applicable to perform the
-     transformations.
- </li>
- <li>Modify the FOCUS.pl script to add a specific option similar to --reactor-spl
-     option for executing the specializations. Also update the specialization
-     table that maps the command-line option to the appropriate specialization
-     file within the repository.
-  </li>
-</ol>
-
-<hr>
-
-</body>
-</html>
diff --git a/ACE/bin/FOCUS/specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl b/ACE/bin/FOCUS/specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl
deleted file mode 100644
index e59d369abd2..00000000000
--- a/ACE/bin/FOCUS/specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Dispatch Resolution Optimization
- *   ================================
- *   This optimization should be applied with the requests
- *   from a client are delivered to the same operation in
- *   an IDL interface. In general this optimization applies
- *   to IDL interfaces that have a single operation defined
- *   on them
- *
- *   @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
--->
-
-<transform>
-
-<module name="TAO/tao">
-
-<file name="Connection_Handler.h">
-
-<!-- Include file to be added for this specialization -->
-<add>
- <hook>CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-   class TAO_Servant_Base;
-   #include "tao/Abstract_Servant_Base.h"
- </data>
-</add>
-
-<!-- Add get and set operations to hold operation signature -->
-<add>
- <hook>CONNECTION_HANDLER_SPL_PRIVATE_DATA_ADD_HOOK</hook>
- <data>
-TAO_Skeleton op_signature_;
-TAO_Servant_Base *servant_;
- </data>
-</add>
-
-<!-- Add get and set public operations for the data -->
-<add>
-  <hook>CONNECTION_HANDLER_SPL_PUBLIC_METHODS_ADD_HOOK</hook>
-  <data>
-void set_op_signature (TAO_Skeleton &amp;skeleton,
-                       TAO_Servant_Base *&amp;servant);
-void get_op_signature (TAO_Skeleton &amp;operation_ptr,
-                       TAO_Servant_Base *&amp;servant);
-  </data>
-</add>
-
-</file>
-
-<file name="Connection_Handler.inl">
-
-<!-- Add operations to get and set the operation signature -->
-<add>
- <hook>CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK</hook>
- <data>
-  ACE_INLINE void
-  TAO_Connection_Handler::set_op_signature (TAO_Skeleton &amp;skeleton,
-                                            TAO_Servant_Base *&amp;servant)
-{
-  this->op_signature_ = skeleton;
-  this->servant_ = servant;
-}
-
-ACE_INLINE void
-TAO_Connection_Handler::get_op_signature (TAO_Skeleton &amp;operation_ptr,
-                                          TAO_Servant_Base *&amp;servant)
-{
-   operation_ptr = this->op_signature_;
-   servant = this->servant_;
-}
-
- </data>
-</add>
-</file>
-
-<file name="GIOP_Message_Base.h">
-
-<add>
-<hook>GIOP_MESSAGE_BASE_DATA_MEMBER_ADD_HOOK</hook>
-<data>bool once__;</data>
-</add>
-</file>
-
-<file name="GIOP_Message_Base.cpp">
-
-<add>
- <hook>GIOP_MESSAGE_BASE_INCLUDE_ADD_HOOK</hook>
- <data>#include "tao/Connection_Handler.h"</data>
-</add>
-
-<!-- Add a once__ data member to the class that will
-     only resolve the dispatch once -->
-<substitute match-line="yes">
- <search>TAO_DEF_GIOP_MINOR\)</search>
- <replace>TAO_DEF_GIOP_MINOR)
-          , once__ (1)
- </replace>
-</substitute>
-
-<!-- Comment code that resolves dispatch normally -->
-<comment>
- <start-hook>TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START</start-hook>
- <end-hook>TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Add the optimized path code -->
-<add>
- <hook>TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_END</hook>
- <data>
-  if (once__)
-  {
-    once__ = false;
-
-    // Normal path the first time
-    this->orb_core_->request_dispatcher ()->dispatch (
-      this->orb_core_,
-      request,
-      forward_to
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  else
-  {
-    // Dispatch directly to the skeleton
-    TAO_Connection_Handler *handler =
-      transport->connection_handler ();
-    TAO_Skeleton skel;
-    TAO_Servant_Base *skeleton_ptr;
-    handler->get_op_signature (skel, skeleton_ptr);
-
-    // Convert references to void *
-    void *upcall_ptr = 0;
-    skel (request,
-          upcall_ptr,
-          (void *)skeleton_ptr
-          ACE_ENV_ARG_PARAMETER);
-    if (response_required)
-      request.tao_send_reply ();
-  }
- </data>
-</add>
-</file>
-</module>
-
-<module name="TAO/tao/PortableServer">
-<file name="Servant_Base.cpp">
-
-<!-- Add necessary include files -->
-<add>
- <hook>TAO_SERVANT_BASE_INCLUDE_ADD_HOOK</hook>
- <data>#include "tao/Transport.h"</data>
- <data>#include "tao/Connection_Handler.h"</data>
-</add>
-
-<!-- After processing the first request, set the operation signature on
-     the connection handler for subsequent request processing -->
-<add>
- <hook>TAO_DISPATCH_RESOLUTION_OPT_ADD_HOOK</hook>
- <data>
-   TAO_Connection_Handler *handler =
-   req.transport ()->connection_handler ();
-   handler->set_op_signature (skel,
-                              static_cast&lt;TAO_Servant_Base *&gt; (derived_this));
- </data>
-</add>
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/FOCUS/specializations/Flushing_Strategy/Leader_Follower_Flushing_Strategy.spl b/ACE/bin/FOCUS/specializations/Flushing_Strategy/Leader_Follower_Flushing_Strategy.spl
deleted file mode 100644
index 1019274a5f2..00000000000
--- a/ACE/bin/FOCUS/specializations/Flushing_Strategy/Leader_Follower_Flushing_Strategy.spl
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Leader Follower Flushing Strategy Specializations
- *   =================================================
- *   Details all the specialization transformations necessary
- *   to specialize the Flushing Strategy with the concrete
- *   Leader_Follower flushing strategy.
- *
- *   @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
--->
-
-<transform>
-
-<module name="TAO/tao">
-
-<!-- Transformations to L/F Flushing Strategy -->
-<file name="Leader_Follower_Flushing_Strategy.h">
-
-<!-- Comment out Flushing_Strategy include -->
-<remove>#include "Flushing_Strategy.h"</remove>
-
-<!-- Add the forward declarations -->
-<add>
- <hook>FLUSHING_STRATEGY_SPL_INCLUDE_ADD_HOOK</hook>
- <data>
-class TAO_Transport;
-class TAO_Queued_Message;
-class ACE_Time_Value;
-
-#include "TAO_Export.h"
- </data>
-</add>
-
-<!-- Remove all virtual key words -->
-<remove>virtual</remove>
-
-<!-- Remove inheritance from Flushing strategy -->
-<remove>: public TAO_Flushing_Strategy</remove>
-
-</file>
-
-<!-- Do not build other Flushing Strategies -->
-<file name="tao.mpc">
-
- <substitute>
-  <search>Flushing_Strategy.h</search>
-  <replace>// Flushing_Strategy.h</replace>
- </substitute>
- <substitute>
-  <search>Flushing_Strategy.cpp</search>
-  <replace>// Flushing_Strategy.cpp</replace>
- </substitute>
-
- <substitute>
-  <search>Block_Flushing_Strategy.h</search>
-  <replace>// Block_Flushing_Strategy.h</replace>
- </substitute>
- <substitute>
-  <search>Block_Flushing_Strategy.cpp</search>
-  <replace>// Block_Flushing_Strategy.cpp</replace>
- </substitute>
-
- <substitute>
-  <search>Reactive_Flushing_Strategy.h</search>
-  <replace>// Reactive_Flushing_Strategy.h</replace>
- </substitute>
- <substitute>
-  <search>Reactive_Flushing_Strategy.cpp</search>
-  <replace>// Reactive_Flushing_Strategy.cpp</replace>
- </substitute>
-
-</file>
-
-<file name="default_resource.cpp">
-
-<substitute match-line="yes">
- <search>#include "tao/Reactive_Flushing_Strategy.h"</search>
- <replace> // #include "tao/Reactive_Flushing_Strategy.h"</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>#include "tao/Block_Flushing_Strategy.h"</search>
- <replace>// #include "tao/Block_Flushing_Strategy.h"</replace>
-</substitute>
-
-<!-- Replace all occurences of Flushing_Strategy with
-     L/F Flushing Strategy -->
-<substitute>
- <search>TAO_Flushing_Strategy</search>
- <replace>TAO_Leader_Follower_Flushing_Strategy</replace>
-</substitute>
-
-<!-- Comment out region specified by comment hooks -->
-<comment>
- <start-hook>FLUSHING_STRATEGY_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>FLUSHING_STRATEGY_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Add the L/F specialization after the hook -->
-<add>
- <hook>FLUSHING_STRATEGY_SPL_COMMENT_HOOK_END</end-hook>
- <data>this->flushing_strategy_type_ = TAO_LEADER_FOLLOWER_FLUSHING;
- </data>
-</add>
-
-<!-- Comment out creation of all other flushing strategies -->
-<comment>
- <start-hook>FLUSHING_STRATEGY_CREATION_SPL_HOOK_START</start-hook>
- <end-hook>FLUSHING_STRATEGY_CREATION_SPL_HOOK_END</end-hook>
-</comment>
-
-<!-- Create the L/F flushing strategy directly -->
-<add>
- <hook>FLUSHING_STRATEGY_CREATION_SPL_HOOK_END</hook>
- <data>ACE_NEW_RETURN (strategy,
-                       TAO_Leader_Follower_Flushing_Strategy,
-                      0);
- </data>
-</add>
-
-</file>
-
-<file name="default_resource.h">
-
-<!-- Replace all occurences of Flushing_Strategy with L/F strategy -->
-<substitute>
- <search>TAO_Flushing_Strategy</search>
- <replace>TAO_Leader_Follower_Flushing_Strategy</replace>
-</substitute>
-
-</file>
-
-<file name="ORB_Core.h">
-
-<!-- Replace all occurences of base strategy with most
-     derived strategy -->
-<substitute>
- <search>TAO_Flushing_Strategy</search>
- <replace>TAO_Leader_Follower_Flushing_Strategy</replace>
-</substitute>
-
-</file>
-
-<file name="ORB_Core.cpp">
-
-<!-- Replace the Flushing Strategy inclue with L/F
-     flushing include -->
-<substitute match-line="yes">
- <search>#include "Flushing_Strategy.h"</search>
- <replace>#include "Leader_Follower_Flushing_Strategy</replace>
-</substitute>
-
-</file>
-
-<file name="ORB_Core.i">
-
-<!-- Replace all occurences of base strategy with most
-     derived strategy -->
-<substitute>
- <search>TAO_Flushing_Strategy</search>
- <replace>TAO_Leader_Follower_Flushing_Strategy</replace>
-</substitute>
-
-</file>
-
-<file name="Transport.h">
-
-<!-- Remove the friend declaration of Reactive_Flushing -->
-<substitute match-line="yes">
- <search>friend class TAO_Reactive_Flushing_Strategy;</search>
- <replace>// friend class TAO_Reactive_Flushing_Strategy;</replace>
-</substitute>
-
-<!-- Remove friend declaration of Block Flushing -->
-<substitute match-line="yes">
- <search>friend class TAO_Block_Flushing_Strategy;</search>
- <replace>// friend class TAO_Block_Flushing_Strategy;</replace>
-</substitute>
-
-</file>
-
-<file name="Transport.cpp">
-
-<substitute match-line="yes">
-  <search>#include "Flushing_Strategy.h"</search>
-  <replace>#include "Leader_Follower_Flushing_Strategy.h</replace>
-</substitute>
-
-<!-- Replace all occurences of TAO_Flushing_Strategy with
-     TAO_Leader_Follower_Flushing -->
-<substitute>
- <search>TAO_Flushing_Strategy</search>
- <replace>TAO_Leader_Follower_Flushing_strategy</replace>
-</substitute>
-
-</file>
-
-<file name="Resource_Factor.h">
-
-<!-- Replace TAO_Flushing_Strategy with L/F version -->
-<substitute>
- <search>TAO_Flushing_Strategy</search>
- <replace>TAO_Leader_Follower_Flushing_Strategy</replace>
-</substitute>
-
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl b/ACE/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl
deleted file mode 100644
index 190eb3e4ed9..00000000000
--- a/ACE/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl
+++ /dev/null
@@ -1,994 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- IIOP Pluggable Protocol specialization
- *   ======================================
- *   This specializes the pluggable protocol framework within
- *   TAO for the IIOP concrete protocol implementation. This
- *   specialization encompasses specializations, such as
- *   specializations for the Transport, Profile, end-point,
- *   Acceptor and Connector implementations within ACE+TAO.
- *
- *   @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
--->
-<transform>
-
-<module name="TAO/tao">
-
-<!-- Transformations to Transport implementation in TAO -->
-<file name="Transport.h">
-
-<!-- Search for TAO_Connection_Handler -->
-<substitute match-line="yes">
- <search>class TAO_Connection_Handler;</search>
- <replace>#include "tao/Connection_Handler.h"</replace>
-</substitute>
-
-<!-- Add forward declarations and includes specific to
-     IIOP -->
-<add>
- <hook>TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-namespace IIOP
-{
-  class ListenPointList;
-}
-
-class TAO_Acceptor;
-class TAO_Adapter;
- </data>
-</add>
-
-<!-- Remove all virtual and pure virtual methods in this
-     class -->
-<remove>virtual</remove>
-
-<substitute match-line="yes">
- <search>= 0;</search>
- <replace>;</replace>
-</substitute>
-
-<!-- Replace the base class constructor with the derive
-     classes's constructor -->
-<substitute match-line="yes">
- <search>TAO_Transport \(CORBA::ULong tag,</search>
- <replace>TAO_Transport (TAO_IIOP_Connection_Handler *, CORBA::ULong tag,
-  </replace>
-</substitute>
-
-<!-- Add public methods defined in IIOP_Transport -->
-<add>
- <hook>TAO_TRANSPORT_SPL_PUBLIC_METHODS_ADD_HOOK</hook>
- <data>
-
- /// Bridge method to call a similar method on the connection handler
-  void update_protocol_properties (int send_buffer_size,
-                                   int recv_buffer_size,
-                                   int no_delay,
-                                   int enable_network_priority);
-
- /// Generate the request header
- int generate_request_header (TAO_Operation_Details &amp;opd,
-                              TAO_Target_Specification &amp;spec,
-                              TAO_OutputCDR &amp;msg);
- </data>
-</add>
-
-<!-- Add private methods from IIOP_Transport -->
-<add>
- <hook>TAO_TRANSPORT_SPL_PRIVATE_METHODS_ADD_HOOK</hook>
- <data>
-  void set_bidir_context_info (TAO_Operation_Details &amp;opdetails);
-  int get_listen_point (IIOP::ListenPointList &amp;listen_point_list,
-                        TAO_Acceptor *acceptor);
- </data>
-</add>
-
-<!-- Add private data from IIOP_Transport -->
-<add>
- <hook>TAO_TRANSPORT_SPL_DATA_MEMBERS_ADD_HOOK</hook>
- <data>
-  /// The connection service handler used for accessing lower layer
-  /// communication protocols.
-  TAO_IIOP_Connection_Handler *connection_handler_;
-
-  /// Our messaging object.
-  TAO_Pluggable_Messaging *messaging_object_;
- </data>
-</add>
-
-<!-- Typedef the TAO_Transport as IIOP_Transport -->
-<add>
- <hook>TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK</hook>
- <data>typedef TAO_Transport TAO_IIOP_Transport;</data>
-</add>
-
-<!-- This method is overridden in the derived class -->
-<substitute>
- <search>generate_request_header</search>
- <replace>generate_request_header_base__</replace>
-</substitute>
-
-</file>
-
-<file name="Transport.cpp">
-
-<!-- Add necessary includes -->
-<add>
- <hook>TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-#include "Transport_Acceptor.h"
-#include "IIOPC.h"
-#include "Acceptor_Registry.h"
-#include "operation_details.h"
-#include "GIOP_Message_Base.h"
-#include "Protocols_Hooks.h"
- </data>
-</add>
-
-<!-- Modify the TAO constructor adding the IIOP Transport's data -->
-<substitute match-line="yes">
- <search>TAO_Transport::TAO_Transport \(CORBA::ULong tag,</search>
- <replace>TAO_Transport::TAO_Transport (TAO_IIOP_Connection_Handler *handler,
-                                        CORBA::ULong tag,
- </replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>, partial_message_ \(0\)</search>
- <replace>  , partial_message_ (0)
-  , connection_handler_ (handler)
-  , messaging_object_ (0)
- </replace>
-</substitute>
-
-<!-- Within the constructor create/initialize the messaging object -->
-<add>
- <hook>TAO_TRANSPORT_SPL_CONSTRUCTOR_ADD_HOOK</hook>
- <data>
-  // Use the normal GIOP object
-  ACE_NEW (this->messaging_object_,
-           TAO_GIOP_Message_Base (orb_core));
- </data>
-</add>
-
-<add>
- <hook>TAO_TRANSPORT_SPL_DESTRUCTOR_ADD_HOOK</hook>
- <data>delete this->messaging_object_;</data>
-</add>
-
-<!-- comment out unimplemented base class methods -->
-<comment>
- <start-hook>TAO_TRANSPORT_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>TAO_TRANSPORT_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Add the concrete methods from IIOP_Transport implementation -->
-<copy-from-source>
- <source>IIOP_Transport.cpp</source>
-
- <copy-hook-start>TAO_TRANSPORT_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_TRANSPORT_SPL_COPY_HOOK_END</copy-hook-end>
-
- <dest-hook>TAO_TRANSPORT_SPL_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- The derived class calls this method. Override this -->
-<substitute>
- <search>TAO_Transport::generate_request_header</search>
- <replace>TAO_Transport::generate_request_header_base__</replace>
-</substitute>
-
-</file>
-
-<!-- Transformations to specialize Connection_Handler class -->
-<file name="Connection_Handler.h">
-
-<!-- Remove the default constructor, NOTE: we use regular expressions
-     to match the constructor but not the destructor  -->
-<remove>\s+TAO_Connection_Handler\s*\(void\);</remove>
-
-<!-- Make sure that Connection_Handler inherits from SVC_HANDLER -->
-<substitute match-line="yes">
- <search>: public TAO_LF_CH_Event</search>
- <replace>: public TAO_IIOP_SVC_HANDLER,
-            public TAO_LF_CH_Event
- </replace>
-</substitute>
-
-<!-- Forward declarations -->
-<add>
- <hook>CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Stream.h"
-
-typedef ACE_Svc_Handler &lt; ACE_SOCK_STREAM, ACE_NULL_SYNCH &gt;
-        TAO_IIOP_SVC_HANDLER;
-
-namespace IIOP
-{
-  class ListenPointList;
-}
- </data>
-</add>
-
-<!-- Public methods from IIOP_Connection_Handler class -->
-<add>
- <hook>CONNECTION_HANDLER_SPL_PUBLIC_METHODS_ADD_HOOK</hook>
- <data>
-  int open (void *);
-  int close (u_long = 0);
-
-  int resume_handler (void);
-  int handle_output (ACE_HANDLE);
-  int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  int handle_timeout (const ACE_Time_Value &amp;current_time,
-                      const void *act = 0);
-
-  /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
-
-  /// Process the @a listen_list
-  int process_listen_point_list (IIOP::ListenPointList &amp;listen_list);
-
-  /// Check if network priority needs to be enabled
-  int enable_network_priority (void);
-
-  TAO_Connection_Handler (ACE_Thread_Manager * = 0);
-
-  /// Constructor.
-  TAO_Connection_Handler (TAO_ORB_Core *orb_core,
-                          CORBA::Boolean flag);
- </data>
-</add>
-
-<!-- Private data members -->
-<add>
- <hook>CONNECTION_HANDLER_SPL_PRIVATE_DATA_ADD_HOOK</hook>
- <data>int dscp_codepoint_;</data>
-</add>
-
-<!-- Typedef the class -->
-<add>
- <hook>CONNECTION_HANDLER_SPL_EXTERN_ADD_HOOK</hook>
- <data>typedef TAO_Connection_Handler TAO_IIOP_Connection_Handler;</data>
-</add>
-
-<!-- Remove all virtuals and =0; from the code -->
-<remove>virtual</remove>
-
-<substitute match-line="yes">
-  <search>= 0;</search>
-  <replace>;</replace>
-</substitute>
-
-</file>
-
-<file name="Connection_Handler.cpp">
-
-<!-- Add the include hook -->
-<add>
- <hook>CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-  <data>
-#include "IIOPC.h"
-#include "Thread_Lane_Resources.h"
-#include "Base_Transport_Property.h"
-#include "Protocols_Hooks.h"
-#include "Wait_Strategy.h"
-
-#include "ace/os_include/netinet/os_tcp.h"
-#include "ace/os_include/os_netdb.h"
- </data>
-</add>
-
-<!-- IIOP_Connection_Handler constructors added -->
-<add>
-  <hook>CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK</hook>
-  <data>
-TAO_Connection_Handler::TAO_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_IIOP_SVC_HANDLER (t, 0 , 0),
-    orb_core_ (0),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT &lt;&lt; 2)
-{
-  ACE_ASSERT (0);
-}
-
-TAO_Connection_Handler::TAO_Connection_Handler (
-  TAO_ORB_Core *orb_core,
-  CORBA::Boolean flag)
-  : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    orb_core_ (orb_core),
-    transport_ (0),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT &lt;&lt; 2)
-{
-  TAO_IIOP_Transport* specific_transport = 0;
-  ACE_NEW (specific_transport,
-           TAO_IIOP_Transport (this, IOP::TAG_INTERNET_IOP, orb_core));
-
-  // store this pointer (indirectly increment ref count)
-  this->transport (specific_transport);
-
-  // @@todo: We need to have a distinct option/ method in the resource
-  // factory for this and TAO_Transport.
-  this->lock_ =
-    this->orb_core_->resource_factory ()->create_cached_connection_lock ();
-
-  // Put ourselves in the connection wait state as soon as we get
-  // created
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_WAIT,
-                       this->orb_core_->leader_follower ());
-}
- </data>
-</add>
-
-<!-- Replace all occurances of IIOP_Connection_Handler with that
-     of TAO_Connection_Handler -->
-<substitute>
-  <search>TAO_IIOP_Connection_Handler</search>
-  <replace>TAO_Connection_Handler</replace>
-</substitute>
-
-<!-- Comment out base class methods that are over-ridden in the
-     derived class -->
-<comment>
-  <start-hook>CONNECTION_HANDLER_SPL_COMMENT_HOOK_START</start-hook>
-  <end-hook>CONNECTION_HANDLER_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Copy operations from IIOP_Connection_Handler class and put them
-     in the Connection_Handler class -->
-
-<copy-from-source>
-
- <source>IIOP_Connection_Handler.cpp</source>
- <copy-hook-start>CONNECTION_HANDLER_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>CONNECTION_HANDLER_SPL_COPY_HOOK_END</copy-hook-end>
- <dest-hook>CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK</dest-hook>
-
-</copy-from-source>
-
-<add>
- <hook>CONNECTION_HANDLER_DESTRUCTOR_ADD_HOOK</hook>
- <data>delete this->transport ();</data>
-</add>
-
-</file>
-
-<!-- Modifications to Acceptor and Connector Components in TAO -->
-<file name="Transport_Acceptor.h">
-
-<!-- Forward declaration -->
-<add>
- <hook>TAO_ACCEPTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-#include "tao/Connection_Handler.h"
-#include "tao/Acceptor_Impl.h"
-#include "tao/GIOP_Message_Version.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
- </data>
-</add>
-
-<!-- Methods from IIOP_Acceptor components -->
-<copy-from-source>
- <source>IIOP_Acceptor.h</source>
- <copy-hook-start>TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END</copy-hook-end>
- <dest-hook>TAO_ACCEPTOR_SPL_PUBLIC_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- Typedef hook -->
-<add>
- <hook>TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK</hook>
- <data>typedef TAO_Acceptor TAO_IIOP_Acceptor;
- #if defined(__ACE_INLINE__)
- #include "tao/IIOP_Acceptor.i"
- #endif /* __ACE_INLINE__ */
- </data>
-</add>
-
-<!-- Private data memeber -->
-<copy-from-source>
- <source>IIOP_Acceptor.h</source>
-
- <copy-hook-start>TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END</copy-hook-end>
-
- <dest-hook>TAO_ACCEPTOR_SPL_DATA_MEMBERS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- Eliminate the virtual functions -->
-<remove>virtual</remove>
-<substitute match-line="yes">
- <search>= 0;</search>
- <replace>;</replace>
-</substitute>
-
-<!-- Remove destructor -->
-<remove>~TAO_IIOP_Acceptor \(void\);</remove>
-
-<substitute>
- <search>TAO_IIOP_Acceptor</search>
- <replace>TAO_Acceptor</replace>
-</substitute>
-
-</file>
-
-<!-- Transformations to Transport_Acceptor.cpp -->
-<file name="Transport_Acceptor.cpp">
-
-<copy-from-source>
- <source>IIOP_Acceptor.cpp</source>
-
- <copy-hook-start>TAO_ACCEPTOR_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_ACCEPTOR_SPL_COPY_HOOK_END</copy-hook-end>
-
- <dest-hook>TAO_ACCEPTOR_SPL_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- Modify the constructor -->
-<substitute match-line="yes">
- <search>: TAO_Acceptor \(IOP::TAG_INTERNET_IOP\),</search>
- <replace>: tag_ (IOP::TAG_INTERNET_IOP),
- </replace>
-</substitute>
-
-<!-- Add mthods to the destructor -->
-<add>
- <hook>TAO_ACCEPTOR_DESTRUCTOR_ADD_HOOK</hook>
- <data>
-  this->close ();
-  delete this->creation_strategy_;
-  delete this->concurrency_strategy_;
-  delete this->accept_strategy_;
-
-  delete [] this->addrs_;
-
-  for (CORBA::ULong i = 0; i &lt; this->endpoint_count_; ++i)
-    CORBA::string_free (this->hosts_[i]);
-
-  delete [] this->hosts_;
- </data>
-</add>
-
-<!-- Trasnform IIOP_Acceptor to TAO_Acceptor -->
-<substitute match-line="yes">
- <search>#include "tao/IIOP_Acceptor.h"</search>
- <replace> </replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>#include "tao/IIOP_Profile.h"</search>
- <replace>#include "tao/Profile.h"</replace>
-</substitute>
-
-<substitute>
- <search>TAO_IIOP_Acceptor::TAO_IIOP_Acceptor</search>
- <replace>TAO_Acceptor::TAO_Acceptor</replace>
-</substitute>
-
-</file>
-
-<file name="tao.mpc">
-
-<!-- Do not build all IIOP_* files as the specializations
-     are moved to the base classes -->
-
-<substitute>
- <search>IIOP_Transport.cpp</search>
- <replace>// IIOP_Transport.cpp </replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Transport.h</search>
- <replace>// IIOP_Transport.h</replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Connection_Handler.cpp</search>
- <replace>// IIOP_Connection_Handler.cpp</replace>
-</substitute>
-<substitute>
- <search>IIOP_Connection_Handler.h</search>
- <replace>// IIOP_Connection_Handler.h</replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Acceptor.cpp</search>
- <replace>// IIOP_Acceptor.cpp</replace>
-</substitute>
-<substitute>
- <search>IIOP_Acceptor.h</search>
- <replace>// IIOP_Acceptor.h</replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Connector.cpp</search>
- <replace>// IIOP_Connector.cpp</replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Endpoint.cpp</search>
- <replace>// IIOP_Endpoint.cpp</replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Connector.h</search>
- <replace>// IIOP_Connector.h</replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Endpoint.h</search>
- <replace>// IIOP_Endpoint.h</replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Profile.cpp</search>
- <replace>// IIOP_Profile.cpp</replace>
-</substitute>
-<substitute>
- <search>IIOP_Profile.h</search>
- <replace>// IIOP_Profile.h</replace>
-</substitute>
-
-</file>
-
-<file name="Endpoint.h">
-
-<!-- Include and forward declation add hook -->
-<add>
- <hook>TAO_ENDPOINT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-#include "tao/IIOP_EndpointsC.h"
-#include "ace/INET_Addr.h"
- </data>
-</add>
-
-<!-- Copy the private member declarations from IIOP_Endpoint
-     implementation -->
-
-<copy-from-source>
-  <source>IIOP_Endpoint.h</source>
-
-  <copy-hook-start>TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_START</copy-hook-start>
-  <copy-hook-end>TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_END</copy-hook-end>
-
-  <dest-hook>TAO_ENDPOINT_SPL_PRIVATE_DATA_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<copy-from-source>
- <source>IIOP_Endpoint.h</source>
- <copy-hook-start>TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_END</copy-hook-end>
- <dest-hook>TAO_ENDPOINT_SPL_PUBLIC_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- Remove the unimplemented copy constructor of the base class -->
-<remove>ACE_UNIMPLEMENTED_FUNC \(TAO_Endpoint \(const TAO_Endpoint&amp;\)\)</remove>
-
-<substitute>
- <search>TAO_IIOP_Endpoint</search>
- <replace>TAO_Endpoint</replace>
-</substitute>
-
-<substitute>
- <search>TAO_IIOP_Profile</search>
- <replace>TAO_Profile</replace>
-</substitute>
-
-<add>
- <hook>TAO_ENDPOINT_SPL_EXTERN_ADD_HOOK</hook>
- <data>typedef TAO_Endpoint TAO_IIOP_Endpoint;
-       #if defined (__ACE_INLINE__)
-       # include "tao/IIOP_Endpoint.i"
-       #endif /* __ACE_INLINE__ */
- </data>
-</add>
-
-<!-- Eliminate the virtual functions -->
-<remove>virtual</remove>
-<substitute match-line="yes">
- <search>= 0;</search>
- <replace>;</replace>
-</substitute>
-
-</file>
-
-<file name="Endpoint.cpp">
-
-  <copy-from-source>
-   <source>IIOP_Endpoint.cpp</source>
-   <copy-hook-start>TAO_ENDPOINT_SPL_COPY_HOOK_START</copy-hook-start>
-   <copy-hook-end>TAO_ENDPOINT_SPL_COPY_HOOK_END</copy-hook-end>
-   <dest-hook>TAO_ENDPOINT_SPL_METHODS_ADD_HOOK</dest-hook>
-  </copy-from-source>
-
-  <!-- In the constructors copied from the derived class, there is a
-       invocation of the base class constructor. Expand it -->
-  <substitute match-line="yes">
-    <search>: TAO_Endpoint \(IOP::TAG_INTERNET_IOP\)</search>
-    <replace>: addr_lookup_lock_ ()
-              , hash_val_ (0)
-              , tag_ (IOP::TAG_INTERNET_IOP)
-              , priority_ (TAO_INVALID_PRIORITY)
-    </replace>
-  </substitute>
-
-  <substitute match-line="yes">
-    <search>: TAO_Endpoint \(IOP::TAG_INTERNET_IOP, priority\)</search>
-    <replace>: addr_lookup_lock_ ()
-              , hash_val_ (0)
-              , tag_ (IOP::TAG_INTERNET_IOP)
-              , priority_ (priority)
-    </replace>
-  </substitute>
-
-  <substitute match-line="yes">
-   <search>: TAO_Endpoint \(rhs.tag_, rhs.priority_\)</search>
-   <replace>: addr_lookup_lock_ ()
-             , hash_val_ (0)
-             , tag_ (rhs.tag_)
-             , priority_ (rhs.priority_)
-   </replace>
- </substitute>
-
-<substitute>
- <search>TAO_IIOP_Endpoint</search>
- <replace>TAO_Endpoint</replace>
-</substitute>
-
-<remove>#include "IIOP_Endpoint.h"</remove>
-
-</file>
-
-<file name="Transport_Connector.h">
-
-<add>
- <hook>TAO_CONNECTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-#include "ace/SOCK_Connector.h"
-#include "ace/Connector.h"
-#include "tao/Connector_Impl.h"
-#include "tao/Connection_Handler.h"
- </data>
-</add>
-
-<copy-from-source>
- <source>IIOP_Connector.h</source>
- <copy-hook-start>TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_END</copy-hook-end>
- <dest-hook>TAO_CONNECTOR_SPL_PUBLIC_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- IIOP_Connector's constructor -->
-<add>
- <hook>TAO_CONNECTOR_SPL_PUBLIC_METHODS_ADD_HOOK</hook>
- <data>  TAO_Connector (CORBA::Boolean flag = 0);</data>
-</add>
-
-<copy-from-source>
- <source>IIOP_Connector.h</source>
- <copy-hook-start>TAO_CONNECTOR_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_CONNECTOR_SPL_COPY_HOOK_END</copy-hook-end>
- <dest-hook>TAO_CONNECTOR_SPL_PRIVATE_DATA_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<add>
- <hook>TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK</hook>
- <data>typedef TAO_Connector TAO_IIOP_Connector;</data>
-</add>
-
-<!-- eliminate all virtual methods -->
-<remove>virtual</remove>
-
-<substitute match-line="yes">
-  <search>= 0;</search>
-  <replace>;</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>class TAO_Endpoint;</search>
- <replace>#include "tao/Endpoint.h"</replace>
-</substitute>
-
-</file>
-
-<file name="Transport_Connector.cpp">
-
-<add>
- <hook>TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK</hook>
- <data>
-#include "ace/OS_NS_strings.h"
- </data>
-</add>
-
-<!-- Instrument the constructor -->
-<substitute match-line="yes">
- <search>: TAO_Connector \(IOP::TAG_INTERNET_IOP\)</search>
- <replace>: active_connect_strategy_ (0)
-          , tag_ (IOP::TAG_INTERNET_IOP)
-          , orb_core_ (0)
- </replace>
-</substitute>
-
-<copy-from-source>
- <source>IIOP_Connector.cpp</source>
-
- <copy-hook-start>TAO_CONNECTOR_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_CONNECTOR_SPL_COPY_HOOK_END</copy-hook-end>
-
- <dest-hook>TAO_CONNECTOR_SPL_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- replace all IIOP_Connector with TAO_Connector -->
-<substitute>
- <search>TAO_IIOP_Connector</search>
- <replace>TAO_Connector</replace>
-</substitute>
-
-</file>
-
-<file name="IIOP_Factory.cpp">
-
-<substitute match-line="yes">
-  <search>#include "IIOP_Acceptor.h"</search>
-  <replace>#include "Transport_Acceptor.h"</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>#include "IIOP_Connector.h"</search>
- <replace>#include "Transport_Connector.h"</replace>
-</substitute>
-</file>
-
-<file name="IIOP_Lite_Factory.cpp">
-
-<substitute match-line="yes">
-  <search>#include "IIOP_Acceptor.h"</search>
-  <replace>#include "Transport_Acceptor.h"</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>#include "IIOP_Connector.h"</search>
- <replace>#include "Transport_Connector.h"</replace>
-</substitute>
-</file>
-
-<!-- Transformations to Profile class to make it tailored for IIOP
-     Profile -->
-<file name="Profile.h">
-
-<!-- include and forward declarations -->
-<substitute match-line="yes">
- <search>class TAO_Endpoint;</search>
- <replace>#include "tao/Endpoint.h"</replace>
-</substitute>
-
-<!-- Remove all virtual methods -->
-<remove>virtual</remove>
-<substitute match-line="yes">
- <search>= 0;</search>
- <replace>;</replace>
-</substitute>
-
-<!-- Copy all public methods from IIOP_Profile.h -->
-<copy-from-source>
- <source>IIOP_Profile.h</source>
- <copy-hook-start>TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_END</copy-hook-end>
- <dest-hook>TAO_PROFILE_SPL_PUBLIC_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- Add proteccted data from IIOP_Profile class -->
-<copy-from-source>
- <source>IIOP_Profile.h</source>
- <copy-hook-start>TAO_PROFILE_SPL_PROTECTED_METHODS_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_PROFILE_SPL_PROTECTED_METHODS_COPY_HOOK_END</copy-hook-end>
- <dest-hook>TAO_PROFILE_SPL_PROTECTED_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- Add all the private data methods -->
-<copy-from-source>
- <source>IIOP_Profile.h</source>
- <copy-hook-start>TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_END</copy-hook-end>
- <dest-hook>TAO_PROFILE_SPL_PRIVATE_DATA_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- Typedef the Profile class as IIOP_Profile -->
-<add>
- <hook>TAO_PROFILE_SPL_EXTERN_ADD_HOOK</hook>
- <data>
-typedef TAO_Profile TAO_IIOP_Profile;
- </data>
-</add>
-
-<substitute>
- <search>TAO_IIOP_Profile</search>
- <replace>TAO_Profile</replace>
-</substitute>
-
-
-</file>
-
-<!-- Transformations to Profile.cpp file specialized with the
-     IIOP_Profile implementation -->
-<file name="Profile.cpp">
-
-<!-- comment out virtual methods in the base class that do nothing
-     but have implementations due to compiler issues -->
-<comment>
- <start-hook>TAO_PROFILE_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>TAO_PROFILE_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<copy-from-source>
- <source>IIOP_Profile.cpp</source>
-
- <copy-hook-start>TAO_PROFILE_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>TAO_PROFILE_SPL_COPY_HOOK_END</copy-hook-end>
-
- <dest-hook>TAO_PROFILE_SPL_METHODS_ADD_HOOK</dest-hook>
-</copy-from-source>
-
-<!-- Add methods to the constructor of the Profile -->
-<!-- Constructors are the exceptional case, we need to add
-     them specifically -->
-
-<add>
- <hook>TAO_PROFILE_SPL_METHODS_ADD_HOOK</hook>
- <data>
-TAO_Profile::TAO_Profile (const ACE_INET_Addr &amp;addr,
-                          const TAO::ObjectKey &amp;object_key,
-                          const TAO_GIOP_Message_Version &amp;version,
-                          TAO_ORB_Core *orb_core)
-  : version_ (version)
-  , are_policies_parsed_ (false)
-  , addressing_mode_ (0)
-  , tagged_profile_ (0)
-  , ref_object_key_ (0)
-  , tag_ (IOP::TAG_INTERNET_IOP)
-  , orb_core_ (orb_core)
-  , forward_to_ (0)
-  , refcount_lock_ (0)
-  , refcount_ (1)
-  , endpoint_ (addr,
-               orb_core->orb_params ()->use_dotted_decimal_addresses ())
-  , count_ (1)
-{
- // @@ NOTE: Need to probably use a different type of lock.
-  this->refcount_lock_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
-
-  (void) this->orb_core_->object_key_table ().bind (object_key,
-                                                    this->ref_object_key_);
-}
-
-TAO_Profile::TAO_Profile (const char* host,
-                          CORBA::UShort port,
-                          const TAO::ObjectKey &amp;object_key,
-                          const ACE_INET_Addr &amp;addr,
-                          const TAO_GIOP_Message_Version &amp;version,
-                          TAO_ORB_Core *orb_core)
-  : version_ (version)
-  , are_policies_parsed_ (false)
-  , addressing_mode_ (0)
-  , tagged_profile_ (0)
-  , ref_object_key_ (0)
-  , tag_ (IOP::TAG_INTERNET_IOP)
-  , orb_core_ (orb_core)
-  , forward_to_ (0)
-  , refcount_lock_ (0)
-  , refcount_ (1)
-  , endpoint_ (host, port, addr)
-  , count_ (1)
-{
-  // @@ NOTE: Need to probably use a different type of lock.
-  this->refcount_lock_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
-  (void) this->orb_core_->object_key_table ().bind (object_key,
-                                                    this->ref_object_key_);
-}
-
-TAO_Profile::TAO_Profile (TAO_ORB_Core *orb_core)
-  : version_ (TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR,
-                                        TAO_DEF_GIOP_MINOR))
-  , are_policies_parsed_ (false)
-  , addressing_mode_ (0)
-  , tagged_profile_ (0)
-  , ref_object_key_ (0)
-  , tag_ (IOP::TAG_INTERNET_IOP)
-  , orb_core_ (orb_core)
-  , forward_to_ (0)
-  , refcount_lock_ (0)
-  , refcount_ (1)
-  , endpoint_ ()
-  , count_ (1)
-{
-   this->refcount_lock_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
-}
-</data>
-</add>
-
-<add>
- <hook>TAO_PROFILE_SPL_DESTRUCTOR_ADD_HOOK</hook>
- <data>
-TAO_Endpoint *tmp = 0;
-for (TAO_Endpoint *next = this->endpoint ()->next ();
-     next != 0;
-     next = tmp)
-{
-    tmp = next->next ();
-    delete next;
-}
- </data>
-</add>
-
-<!-- Replace all occurances of IIOP_Profile
-     with TAO_Profile -->
-<substitute>
- <search>TAO_IIOP_Profile</search>
- <replace>TAO_Profile</replace>
-</substitute>
-
-<!-- remove the dynamic casts, as now there is no
-     inheritance hiearchy -->
-<substitute>
- <search>dynamic_cast</search>
- <replace>static_cast</replace>
-</substitute>
-
-</file>
-
-<file name="Invocation_Endpoint_Selectors.cpp">
-
-<substitute match-line="yes">
- <search>#include "tao/IIOP_Endpoint.h"</search>
- <replace>#include "tao/Endpoint.h"</replace>
-</substitute>
-</file>
-
-<file name="orbconf.h">
-
-<substitute match-line="yes">
- <search>TAO_HAS_UIOP 1</search>
- <replace>TAO_HAS_UIOP 0</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>TAO_HAS_SHMIOP 1</search>
- <replace>TAO_HAS_SHMIOP 0</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>TAO_HAS_MIOP 1</search>
- <replace>TAO_HAS_MIOP 0</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>TAO_HAS_DIOP 1</search>
- <replace>TAO_HAS_DIOP 0</replace>
-</substitute>
-</file>
-</module>
-
-<module name="/TAO/tao/RTPortableServer">
-
-<file name="RT_Servant_Dispatcher.cpp">
-
-<substitute>
- <search>IIOP_Transport.h</search>
- <replace>Transport.h</replace>
-</substitute>
-
-<substitute>
- <search>IIOP_Connection_Handler.h</search>
- <replace>Connection_Handler.h</replace>
-</substitute>
-
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/FOCUS/specializations/README b/ACE/bin/FOCUS/specializations/README
deleted file mode 100644
index 02b28b3351f..00000000000
--- a/ACE/bin/FOCUS/specializations/README
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-@file README
-============
-
-This file describes certain common conventions regarding how the
-specializations rules are integrated/added to this specialization
-database. This directory will serve as a repository that will host all
-the specialization rules for the different families/components. At the
-moment, all the specialization transformations are specific to the
-ACE+TAO middleware.
-
-For each component framework, the following are the rules for adding
-the specializations:
-
-. Create a directory with the name of the component family, e.g., Reactor_Family
-. Within this directory, create the <<Specific_Component>>.spl file that has the
-  individual transformations defined.
diff --git a/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl b/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl
deleted file mode 100644
index b4c0f762aa7..00000000000
--- a/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl
+++ /dev/null
@@ -1,451 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Select Reactor Specializations:
- *   ===============================
- *   Details all the specialization transformations necessary
- *   to specialize the Reactor framework when the target reactor
- *   is a select reactor.
- *
- *   @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
--->
-
-<transform>
-
-<!-- Define the module where there are multiple files -->
-<module name="ace">
-
-<!-- File where the transformations happen -->
-<file name="Select_Reactor_Base.h">
-
-<!-- Add the following lines based on a hook -->
-<add>
-  <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-  <data>class ACE_Sig_Handler;</data>
-  <data>class ACE_Sig_Action;</data>
-  <data>class ACE_Sig_Set;</data>
-</add>
-
-<add>
- <hook>REACTOR_SPL_PUBLIC_METHODS_ADD_HOOK</hook>
- <data>
-//--- How can we devirtualize these methods?
-virtual ~ACE_Select_Reactor_Impl () {}
-
-virtual int notify (ACE_Event_Handler *event_handler = 0,
-                    ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
-                    ACE_Time_Value * = 0) =0;
-
-virtual int remove_handler (ACE_Event_Handler *eh,
-                            ACE_Reactor_Mask mask) =0;
-
-virtual int register_handler (ACE_HANDLE handle,
-                              ACE_Event_Handler *eh,
-                              ACE_Reactor_Mask mask) =0;
-  </data>
-</add>
-
-<!-- Remove what ever is present in the tag from the file -->
-<remove>virtual</remove>
-<remove>: public ACE_Reactor_Impl</remove>
-<remove>#include "ace/Reactor_Impl.h"</remove>
-
-<!-- Replace a with b -->
-<substitute>
-  <search>public ACE_Reactor_Notify</search>
-  <replace>public ACE_Event_Handler</replace>
-</substitute>
-
-<!-- Replace the generic versions with the Select specialized versions -->
-<substitute>
-  <search>ACE_Reactor_Notify</search>
-  <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-<!-- After the specialization, the following functions are still virtual -->
-<substitute>
- <search>void renew</search>
- <replace>virtual void renew</replace>
-</substitute>
-<substitute>
- <search>int is_suspended_i</search>
- <replace>virtual int is_suspended_i</replace>
-</substitute>
-<substitute>
- <search>void clear_dispatch_mask</search>
- <replace>virtual void clear_dispatch_mask</replace>
-</substitute>
-
-</file>
-
-<file name="Select_Reactor_Base.cpp">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-</file>
-
-<file name="Select_Reactor_Base.inl">
-
-<remove>#include "ace/Reactor.h"</remove>
-
-</file>
-
-<!-- Transformations to Reactor_Token_T.h -->
-<file name="Reactor_Token_T.h">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>#include "ace/Reactor_Impl.h"</search>
- <replace>#include "ace/Select_Reactor_Base.h"</replace>
-</substitute>
-
-</file>
-
-<file name="Reactor_Token_T.cpp">
-
-<!-- Search for ACE_Reactor_Impl and replace it with
-     ACE_Select_Reactor_Impl -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-</file>
-
-<file name="Select_Reactor_T.h">
-
-<add>
-<hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-<data>class ACE_Sig_Handler;</data>
-<data>class ACE_Sig_Action;</data>
-<data>class ACE_Sig_Set;</data>
-</add>
-
-<substitute>
- <search>ACE_Reactor_Notify</search>
- <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-
-<remove>virtual</remove>
-
-</file>
-
-<file name="Select_Reactor_T.cpp">
-
-<add>
- <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>#include "ace/Countdown_Time.h"</data>
-</add>
-
-<substitute>
-  <search>ACE_Reactor_Notify</search>
-  <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-
-</file>
-
-<!--
-<file name="Select_Reactor_T.inl">
-
-<remove>#include "ace/Reactor.h"</remove>
-
-</file>
--->
-
-<file name="Reactor.h">
-
-<add>
-<hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-<data>#include "ace/Select_Reactor.h"</data>
-</add>
-
-<remove>class ACE_Reactor_Impl;</remove>
-<remove>virtual</remove>
-
-<substitute>
-<search>ACE_Reactor_Impl</search>
-<replace>ACE_Select_Reactor</replace>
-</substitute>
-
-<!-- Remove the Reactor_Timer interface include -->
-<remove>: public ACE_Reactor_Timer_Interface</remove>
-<remove>#include "ace/Reactor_Timer_Interface.h"</remove>
-
-</file>
-
-<file name="Event_Handler.h">
-
-<!-- remove the ACE_Event_Handler forware declaration -->
-<remove>class ACE_Reactor_Timer_Interface;</remove>
-
-<!-- substitute ACE_Reactor_Timer operations with ACE_Reactor -->
-<substitute>
- <search>ACE_Reactor_Timer_Interface</search>
- <replace>ACE_Reactor</replace>
-</substitute>
-</file>
-
-<file name="Event_Handler.cpp">
- <substitute>
-  <search>ACE_Reactor_Timer_Interface</search>
-  <replace>ACE_Reactor</replace>
- </substitute>
-</file>
-
-<file name="Timer_Queue_T.cpp">
-
-<!-- Remove the Reactor_Timer_Interface include -->
-<remove>#include "ace/Reactor_Timer_Interface.h"</remove>
-
-</file>
-
-
-<file name="Reactor.cpp">
-
-<!-- Comment the conditional includes in the file -->
-<comment>
- <start-hook>REACTOR_SPL_COMMENT_INCLUDE_START_HOOK</start-hook>
- <end-hook>REACTOR_SPL_COMMENT_INCLUDE_END_HOOK</end-hook>
-</comment>
-
-<!-- Comment out conditional includes files in the Reactor's
-     constructor
--->
-<comment>
-  <start-hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_START</start-hook>
-  <end-hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Within the constructor now create the right Reactor -->
-<add>
- <hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_END</hook>
- <data>
-    ACE_NEW (impl,
-             ACE_Select_Reactor);
- </data>
-</add>
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="Reactor.inl">
-
-<add>
- <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-// Check if this is necessary
-#include "ace/Select_Reactor.h"
- </data>
-</add>
-
-</file>
-
-<!-- Do not build the other reactors than the Select Reactor! -->
-<file name="ace.mpc">
-
-<!-- Here is where regular expressions can come handy. Such
-     a capability is not currently provided
- -->
-<substitute>
-  <search>TP_Reactor.h</search>
-  <replace>// TP_Reactor.h </replace>
-</substitute>
-<substitute>
-  <search>TP_Reactor.cpp</search>
-  <replace>// TP_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Msg_WFMO_Reactor -->
-<substitute>
-  <search>Msg_WFMO_Reactor.cpp</search>
-  <replace>// Msg_WFMO_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the WFMO Reactor -->
-<substitute>
-  <search>WFMO_Reactor.cpp</search>
-  <replace>// WFMO_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Reactor Impl -->
-<substitute>
-  <search>Reactor_Impl.cpp</search>
-  <replace>// Reactor_Impl.cpp</replace>
-</substitute>
-<substitute>
-  <search>Reactor_Impl.h</search>
-  <replace>// Reactor_Impl.h</replace>
-</substitute>
-
-<!-- Do not build the Dev Poll Reactor -->
-<substitute>
-  <search>Dev_Poll_Reactor.cpp</search>
-  <replace>// Dev_Poll_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the priority Reactor -->
-<substitute>
-  <search>Priority_Reactor.cpp</search>
-  <replace>// Priority_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Reactor_Timer_Interface -->
-<substitute>
- <search>Reactor_Timer_Interface.h</search>
- <replace>// Reactor_Timer_Interface.h</replace>
-</substitute>
-<substitute>
- <search>Reactor_Timer_Interface.cpp</search>
- <replace>// Reactor_Timer_Interface.cpp </replace>
-</substitute>
-
-</file>
-
-</module>
-
-<!-- transformations required in TAO to work with a select reactor -->
-<module name="TAO/tao">
-
-<!-- Changes to default_resource.h -->
-<file name="default_resource.h">
-
-<!-- Remove the forward declaration of ACE_Reactor_Impl -->
-<substitute match-line="yes">
-<search>class ACE_Reactor_Impl;</search>
-<replace>#include "ace/Reactor.h"</replace>
-</substitute>
-
-<!-- Replace all occurences of ACE_Reactor_Impl with
-     ACE_Select_Reactor -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-</file>
-
-<!-- Changes to default_resource.cpp -->
-<file name="default_resource.cpp">
-
-<!-- Remove the occurence of TP_Reactor -->
-<remove>#include "ace/TP_Reactor.h"</remove>
-
-<!-- Replace all occurences of ACE_Reactor_Impl with
-     ACE_Select_Reactor -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-<!-- Comment out the code that creates TP_Reactor -->
-<comment>
- <start-hook>TAO_REACTOR_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>TAO_REACTOR_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Add hook to add code that creates the select reactor
-     component -->
-<add>
- <!-- We use the same hook that signifies where the comment code
-      ended to add the concrete Reactor type -->
- <hook>TAO_REACTOR_SPL_COMMENT_HOOK_END</hook>
- <data>
-  ACE_NEW_RETURN (impl,
-                  TAO_REACTOR ((ACE_Sig_Handler*)0,
-                               (ACE_Timer_Queue*)0,
-                                0,
-                               (ACE_Select_Reactor_Notify*)0,
-                                this->reactor_mask_signals_),
-                  0);
- </data>
-</add>
-</file>
-
-<!-- changes to tao.mpc -->
-<file name="tao.mpc">
- <substitute>
-  <search>GUIResource_Factory.cpp</search>
-  <replace>// GUIResource_Factory.cpp</replace>
- </substitute>
- <substitute>
-  <search>GUIResource_Factory.h</search>
-  <replace>// GUIResource_Factory.h</replace>
- </substitute>
-</file>
-
-</module>
-
-<module name="TAO/tao/Strategies">
-
-<file name="advanced_resource.h">
-
-<!-- Replace all occurances of ACE_Reactor_Impl with
-     Select_Reactor
-  -->
-<substitute>
-  <search>ACE_Reactor_Impl</search>
-  <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="advanced_resource.cpp">
-
-<!-- Comment out all other reactor includes -->
-<remove>#include "ace/FlReactor.h"</remove>
-<remove>#include "ace/TkReactor.h"</remove>
-<remove>#include "ace/WFMO_Reactor.h"</remove>
-<remove>#include "ace/TP_Reactor.h"</remove>
-<remove>#include "ace/Msg_WFMO_Reactor.h"</remove>
-
-<substitute>
-  <search>ACE_Reactor_Impl</search>
-  <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-<!-- Replace Select_Reactor.h with Reactor.h -->
-<substitute>
- <search>ace/Select_Reactor.h</search>
- <replace>ace/Reactor.h</replace>
-</substitute>
-
-<!-- Comment out creation code for all other reactors -->
-<comment>
- <start-hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Use the end hook to insert code that will create right reactor -->
-<add>
-  <hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END</hook>
-  <data>
-     ACE_NEW_RETURN (impl,
-                     TAO_REACTOR ((ACE_Sig_Handler*)0,
-                                  (ACE_Timer_Queue*)0,
-                                   0,
-                                  (ACE_Select_Reactor_Notify*)0,
-                                  this->reactor_mask_signals_),
-                      0);
-  </data>
-</add>
-
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl b/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl
deleted file mode 100644
index 978055844cd..00000000000
--- a/ACE/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Select Reactor Specializations:
- *   ===============================
- *   Details all the specialization transformations necessary
- *   to specialize the Reactor framework when the target reactor
- *   is a select reactor.
- *
- *   @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
--->
-
-<transform>
-
-<!-- Define the module where there are multiple files -->
-<module name="ace">
-
-<!-- File where the transformations happen -->
-<file name="Select_Reactor_Base.h">
-
-<!-- Add the following lines based on a hook -->
-<add>
-  <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-  <data>class ACE_Sig_Handler;</data>
-  <data>class ACE_Sig_Action;</data>
-  <data>class ACE_Sig_Set;</data>
-</add>
-
-<add>
- <hook>REACTOR_SPL_PUBLIC_METHODS_ADD_HOOK</hook>
- <data>
-//These methods needs to be virtual as they are used by
-//Select_Reactor_Notify classes which use the base class
-virtual ~ACE_Select_Reactor_Impl () {}
-
-virtual int notify (ACE_Event_Handler *event_handler = 0,
-                    ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
-                    ACE_Time_Value * = 0) =0;
-
-virtual int remove_handler (ACE_Event_Handler *eh,
-                            ACE_Reactor_Mask mask) =0;
-
-virtual int register_handler (ACE_HANDLE handle,
-                              ACE_Event_Handler *eh,
-                              ACE_Reactor_Mask mask) =0;
-  </data>
-</add>
-
-<!-- Remove what ever is present in the tag from the file -->
-<remove>virtual</remove>
-<remove>: public ACE_Reactor_Impl</remove>
-<remove>#include "ace/Reactor_Impl.h"</remove>
-
-<!-- Replace a with b -->
-<substitute>
-  <search>public ACE_Reactor_Notify</search>
-  <replace>public ACE_Event_Handler</replace>
-</substitute>
-
-<!-- Replace the generic versions with the Select specialized versions -->
-<substitute>
-  <search>ACE_Reactor_Notify</search>
-  <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-<!-- After the specialization, the following functions are still virtual -->
-<substitute>
- <search>void renew</search>
- <replace>virtual void renew</replace>
-</substitute>
-<substitute>
- <search>int is_suspended_i</search>
- <replace>virtual int is_suspended_i</replace>
-</substitute>
-<substitute>
- <search>void clear_dispatch_mask</search>
- <replace>virtual void clear_dispatch_mask</replace>
-</substitute>
-
-</file>
-
-<file name="Select_Reactor_Base.cpp">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-</file>
-
-<file name="Select_Reactor_Base.inl">
-
-<remove>#include "ace/Reactor.h"</remove>
-
-</file>
-
-<file name="Select_Reactor_T.h">
-
-<add>
-<hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-<data>class ACE_Sig_Handler;</data>
-<data>class ACE_Sig_Action;</data>
-<data>class ACE_Sig_Set;</data>
-</add>
-
-<substitute>
- <search>ACE_Reactor_Notify</search>
- <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-
-<remove>virtual</remove>
-
-</file>
-
-<file name="Select_Reactor_T.cpp">
-
-<add>
- <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>#include "ace/Countdown_Time.h"</data>
-</add>
-
-<substitute>
-  <search>ACE_Reactor_Notify</search>
-  <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-
-</file>
-
-<!--
-<file name="Select_Reactor_T.inl">
-
-<remove>#include "ace/Reactor.h"</remove>
-
-</file>
--->
-
-<!-- Transformations to Reactor_Token_T.h -->
-<file name="Reactor_Token_T.h">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>#include "ace/Reactor_Impl.h"</search>
- <replace>#include "ace/Select_Reactor_Base.h"</replace>
-</substitute>
-
-</file>
-
-<file name="Reactor_Token_T.cpp">
-
-<!-- Search for ACE_Reactor_Impl and replace it with
-     ACE_Select_Reactor_Impl -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-</file>
-
-<file name="Reactor.h">
-
-<add>
-<hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-<data>#include "ace/Select_Reactor.h"</data>
-</add>
-
-<remove>class ACE_Reactor_Impl;</remove>
-<remove>virtual</remove>
-
-<substitute>
-<search>ACE_Reactor_Impl</search>
-<replace>ACE_Select_Reactor</replace>
-</substitute>
-
-<!-- Remove the Reactor_Timer interface include -->
-<remove>: public ACE_Reactor_Timer_Interface</remove>
-<remove>#include "ace/Reactor_Timer_Interface.h"</remove>
-
-</file>
-
-<file name="Event_Handler.h">
-
-<!-- remove the ACE_Event_Handler forware declaration -->
-<remove>class ACE_Reactor_Timer_Interface;</remove>
-
-<!-- substitute ACE_Reactor_Timer operations with ACE_Reactor -->
-<substitute>
- <search>ACE_Reactor_Timer_Interface</search>
- <replace>ACE_Reactor</replace>
-</substitute>
-</file>
-
-<file name="Event_Handler.cpp">
- <substitute>
-  <search>ACE_Reactor_Timer_Interface</search>
-  <replace>ACE_Reactor</replace>
- </substitute>
-</file>
-
-<file name="Timer_Queue_T.cpp">
-
-<!-- Remove the Reactor_Timer_Interface include -->
-<remove>#include "ace/Reactor_Timer_Interface.h"</remove>
-
-</file>
-
-<file name="Reactor.cpp">
-
-<!-- Comment the conditional includes in the file -->
-<comment>
- <start-hook>REACTOR_SPL_COMMENT_INCLUDE_START_HOOK</start-hook>
- <end-hook>REACTOR_SPL_COMMENT_INCLUDE_END_HOOK</end-hook>
-</comment>
-
-<!-- Comment out conditional includes files in the Reactor's
-     constructor
--->
-<comment>
-  <start-hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_START</start-hook>
-  <end-hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Within the constructor now create the right Reactor -->
-<add>
- <hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_END</hook>
- <data>
-    ACE_NEW (impl,
-             ACE_Select_Reactor);
- </data>
-</add>
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="Reactor.inl">
-
-<add>
- <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-// Check if this is necessary
-#include "ace/Select_Reactor.h"
- </data>
-</add>
-
-</file>
-
-<file name="Select_Reactor.h">
-
-<!-- comment out the lock based select reactor, which is a select_mt -->
-<comment>
-  <start-hook>TAO_REACTOR_SPL_COMMENT_HOOK_START</start-hook>
-  <end-hook>TAO_REACTOR_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<add>
-  <hook>TAO_REACTOR_SPL_COMMENT_HOOK_END</hook>
-  <data>
-  typedef ACE_Select_Reactor_T &lt;ACE_Reactor_Token_T &lt; ACE_Noop_Token &gt; &gt; ACE_Select_Reactor;
-  </data>
-</add>
-</file>
-
-<!-- Do not build the other reactors than the Select Reactor! -->
-<file name="ace.mpc">
-
-<!-- Here is where regular expressions can come handy. Such
-     a capability is not currently provided
- -->
-<substitute>
-  <search>TP_Reactor.h</search>
-  <replace>// TP_Reactor.h </replace>
-</substitute>
-<substitute>
-  <search>TP_Reactor.cpp</search>
-  <replace>// TP_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Msg_WFMO_Reactor -->
-<substitute>
-  <search>Msg_WFMO_Reactor.cpp</search>
-  <replace>// Msg_WFMO_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the WFMO Reactor -->
-<substitute>
-  <search>WFMO_Reactor.cpp</search>
-  <replace>// WFMO_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Reactor Impl -->
-<substitute>
-  <search>Reactor_Impl.cpp</search>
-  <replace>// Reactor_Impl.cpp</replace>
-</substitute>
-<substitute>
-  <search>Reactor_Impl.h</search>
-  <replace>// Reactor_Impl.h</replace>
-</substitute>
-
-<!-- Do not build the Dev Poll Reactor -->
-<substitute>
-  <search>Dev_Poll_Reactor.cpp</search>
-  <replace>// Dev_Poll_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the priority Reactor -->
-<substitute>
-  <search>Priority_Reactor.cpp</search>
-  <replace>// Priority_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Reactor_Timer_Interface -->
-<substitute>
- <search>Reactor_Timer_Interface.h</search>
- <replace>// Reactor_Timer_Interface.h</replace>
-</substitute>
-<substitute>
- <search>Reactor_Timer_Interface.cpp</search>
- <replace>// Reactor_Timer_Interface.cpp </replace>
-</substitute>
-
-</file>
-
-</module>
-
-<!-- transformations required in TAO to work with a select reactor -->
-<module name="TAO/tao">
-
-<!-- Changes to default_resource.h -->
-<file name="default_resource.h">
-
-<!-- Remove the forward declaration of ACE_Reactor_Impl -->
-<substitute match-line="yes">
-<search>class ACE_Reactor_Impl;</search>
-<replace>#include "ace/Reactor.h"</replace>
-</substitute>
-
-<!-- Replace all occurences of ACE_Reactor_Impl with
-     ACE_Select_Reactor -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-</file>
-
-<!-- Changes to default_resource.cpp -->
-<file name="default_resource.cpp">
-
-<!-- Remove the occurence of TP_Reactor -->
-<remove>#include "ace/TP_Reactor.h"</remove>
-
-<!-- Replace all occurences of ACE_Reactor_Impl with
-     ACE_Select_Reactor -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-<!-- Comment out the code that creates TP_Reactor -->
-<comment>
- <start-hook>TAO_REACTOR_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>TAO_REACTOR_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Add hook to add code that creates the select reactor
-     component -->
-<add>
- <!-- We use the same hook that signifies where the comment code
-      ended to add the concrete Reactor type -->
- <hook>TAO_REACTOR_SPL_COMMENT_HOOK_END</hook>
- <data>
-  ACE_NEW_RETURN (impl,
-                  TAO_NULL_LOCK_REACTOR ((ACE_Sig_Handler*)0,
-                                         (ACE_Timer_Queue*)0,
-                                         0,
-                                         (ACE_Select_Reactor_Notify*)0,
-                                         this->reactor_mask_signals_),
-                  0);
- </data>
-</add>
-</file>
-
-<!-- changes to tao.mpc -->
-<file name="tao.mpc">
- <substitute>
-  <search>GUIResource_Factory.cpp</search>
-  <replace>// GUIResource_Factory.cpp</replace>
- </substitute>
- <substitute>
-  <search>GUIResource_Factory.h</search>
-  <replace>// GUIResource_Factory.h</replace>
- </substitute>
-</file>
-
-</module>
-
-<module name="TAO/tao/Strategies">
-
-<file name="advanced_resource.h">
-
-<!-- Replace all occurances of ACE_Reactor_Impl with
-     Select_Reactor
-  -->
-<substitute>
-  <search>ACE_Reactor_Impl</search>
-  <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="advanced_resource.cpp">
-
-<!-- Comment out all other reactor includes -->
-<remove>#include "ace/FlReactor.h"</remove>
-<remove>#include "ace/TkReactor.h"</remove>
-<remove>#include "ace/WFMO_Reactor.h"</remove>
-<remove>#include "ace/TP_Reactor.h"</remove>
-<remove>#include "ace/Msg_WFMO_Reactor.h"</remove>
-
-<substitute>
-  <search>ACE_Reactor_Impl</search>
-  <replace>ACE_Select_Reactor</replace>
-</substitute>
-
-<!-- Replace Select_Reactor.h with Reactor.h -->
-<substitute>
- <search>ace/Select_Reactor.h</search>
- <replace>ace/Reactor.h</replace>
-</substitute>
-
-<!-- Comment out creation code for all other reactors -->
-<comment>
- <start-hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Use the end hook to insert code that will create right reactor -->
-<add>
-  <hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END</hook>
-  <data>
-     ACE_NEW_RETURN (impl,
-                     TAO_NULL_LOCK_REACTOR ((ACE_Sig_Handler*)0,
-                                            (ACE_Timer_Queue*)0,
-                                             0,
-                                            (ACE_Select_Reactor_Notify*)0,
-                                            this->reactor_mask_signals_),
-                      0);
-  </data>
-</add>
-
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl b/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl
deleted file mode 100644
index 0b539aefc3a..00000000000
--- a/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl
+++ /dev/null
@@ -1,448 +0,0 @@
-<?xml version="1.0"?>
-
-<!--  Thread Pool Reactor Specializations:
- *  ======================================
- *  Thread Pool reactor is a variation of the Select Reactor.
- *  This specialization includes all of the specializations
- *  that are present in Select_Reactor.spl
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
--->
-
-<transform>
-
-<module name="ace">
-
-<!-- File where the transformations happen -->
-<file name="Select_Reactor_Base.h">
-
-<!-- Add the following lines based on a hook -->
-<add>
-  <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-  <data>class ACE_Sig_Handler;</data>
-  <data>class ACE_Sig_Action;</data>
-  <data>class ACE_Sig_Set;</data>
-</add>
-
-<!-- Remove what ever is present in the tag from the file -->
-<remove>#include "ace/Reactor_Impl.h"</remove>
-<remove>virtual</remove>
-<remove>: public ACE_Reactor_Impl</remove>
-
-<!-- Replace a with b -->
-<substitute>
-  <search>public ACE_Reactor_Notify</search>
-  <replace>public ACE_Event_Handler</replace>
-</substitute>
-
-<add>
- <hook>REACTOR_SPL_PUBLIC_METHODS_ADD_HOOK</hook>
- <data>
-//--- How can we devirtualize these methods?
-virtual ~ACE_Select_Reactor_Impl () {}
-
-virtual int notify (ACE_Event_Handler *event_handler = 0,
-                    ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
-                    ACE_Time_Value * = 0) = 0;
-
-virtual int remove_handler (ACE_Event_Handler *eh,
-                            ACE_Reactor_Mask mask) = 0;
-
-virtual int register_handler (ACE_HANDLE handle,
-                              ACE_Event_Handler *eh,
-                              ACE_Reactor_Mask mask) =0;
-//--------------------------------------------
-  </data>
-</add>
-
-<substitute>
-  <search>ACE_Reactor_Notify</search>
-  <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-<!-- After the specialization, the following functions are still virtual -->
-<substitute>
- <search>void renew</search>
- <replace>virtual void renew</replace>
-</substitute>
-<substitute>
- <search>int is_suspended_i</search>
- <replace>virtual int is_suspended_i</replace>
-</substitute>
-<substitute>
- <search>void clear_dispatch_mask</search>
- <replace>virtual void clear_dispatch_mask</replace>
-</substitute>
-
-</file>
-
-<file name="Select_Reactor_Base.cpp">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-</file>
-
-<file name="Select_Reactor_Base.inl">
-
-<remove>#include "ace/Reactor.h"</remove>
-
-</file>
-
-<file name="Select_Reactor_T.h">
-
-<add>
-<hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
-<data>class ACE_Sig_Handler;</data>
-<data>class ACE_Sig_Action;</data>
-<data>class ACE_Sig_Set;</data>
-</add>
-
-<substitute>
- <search>ACE_Reactor_Notify</search>
- <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-</file>
-
-<file name="Select_Reactor_T.cpp">
-
-<add>
- <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>#include "ace/Countdown_Time.h"</data>
-</add>
-
-<substitute>
-  <search>ACE_Reactor_Notify</search>
-  <replace>ACE_Select_Reactor_Notify</replace>
-</substitute>
-
-</file>
-
-<!-- Transformations to Reactor_Token_T.h -->
-<file name="Reactor_Token_T.h">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-<substitute match-line="yes">
- <search>#include "ace/Reactor_Impl.h"</search>
- <replace>#include "ace/Select_Reactor_Base.h"</replace>
-</substitute>
-
-</file>
-
-<file name="Reactor_Token_T.cpp">
-
-<!-- Search for ACE_Reactor_Impl and replace it with
-     ACE_Select_Reactor_Impl -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_Select_Reactor_Impl</replace>
-</substitute>
-
-</file>
-
-<!-- Starting below is the specialization for TP_Reactor -->
-
-<!-- Transformations to Reactor.h -->
-<file name="Reactor.h">
-
-<!-- Replace all occurences of ACE_Reactor_Impl with TP_Reactor -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-<!-- Remove all occurences of the word virtual -->
-<remove>virtual</remove>
-
-<!-- Remove the Reactor_Timer interface include -->
-<remove>: public ACE_Reactor_Timer_Interface</remove>
-<remove>#include "ace/Reactor_Timer_Interface.h"</remove>
-
-</file>
-
-<file name="Event_Handler.h">
-
-<!-- remove the ACE_Event_Handler forware declaration -->
-<remove>class ACE_Reactor_Timer_Interface;</remove>
-
-<!-- substitute ACE_Reactor_Timer operations with ACE_Reactor -->
-<substitute>
- <search>ACE_Reactor_Timer_Interface</search>
- <replace>ACE_Reactor</replace>
-</substitute>
-</file>
-
-<file name="Event_Handler.cpp">
- <substitute>
-  <search>ACE_Reactor_Timer_Interface</search>
-  <replace>ACE_Reactor</replace>
- </substitute>
-</file>
-
-<file name="Timer_Queue_T.cpp">
-
-<!-- Remove the Reactor_Timer_Interface include -->
-<remove>#include "ace/Reactor_Timer_Interface.h"</remove>
-
-<add>
- <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>
-#include "ace/Reactor.h"
- </data>
-</add>
-
-</file>
-
-<file name="Reactor.cpp">
-
-<!-- Replace ACE_Reactor_Impl with ACE_TP_Reactor -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-<!-- Comment the conditional includes in the file -->
-<comment>
- <start-hook>REACTOR_SPL_COMMENT_INCLUDE_START_HOOK</start-hook>
- <end-hook>REACTOR_SPL_COMMENT_INCLUDE_END_HOOK</end-hook>
-</comment>
-
-<!-- Comment out conditional includes files in the Reactor's
-     constructor
--->
-<comment>
-  <start-hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_START</start-hook>
-  <end-hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Add the TP_Reactor include file -->
-<add>
-  <hook>REACTOR_SPL_COMMENT_INCLUDE_END_HOOK</hook>
-  <data>#include "ace/TP_Reactor.h"</data>
-</add>
-
-<!-- Within the constructor now create the right Reactor -->
-<add>
- <hook>REACTOR_SPL_CONSTRUCTOR_COMMENT_HOOK_END</hook>
- <data>
-    ACE_NEW (impl,
-             ACE_TP_Reactor);
- </data>
-</add>
-
-</file>
-
-<!-- Transformations to TP_Reactor.h -->
-<file name="TP_Reactor.h">
-
-<!-- Remove all occurances of virtual -->
-<remove>virtual</remove>
-
-</file>
-
-<!-- Transformations to TP_Reactor.cpp -->
-<file name="TP_Reactor.cpp">
-
-<!-- Comment hook -->
-<comment>
- <start-hook>REACTOR_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>REACTOR_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Add this function to the -->
-<add>
-  <hook>REACTOR_SPL_COMMENT_HOOK_END</hook>
-  <data>
-int
-ACE_TP_Reactor::register_handler (int signum,
-                                  ACE_Event_Handler *new_sh,
-                                  ACE_Sig_Action *new_disp,
-                                  ACE_Event_Handler **old_sh,
-                                  ACE_Sig_Action *old_disp)
-{
-  return ACE_Select_Reactor::register_handler (signum,
-                                               new_sh,
-                                               new_disp,
-                                               old_sh,
-                                               old_disp);
-}
-  </data>
-</add>
-
-</file>
-
-<!-- Transformations to Asynch_Pseudo_Task.h -->
-<file name="Asynch_Pseudo_Task.h">
-
-<!-- Remove the Select_Reacto.h include -->
-<remove>#include "ace/Select_Reactor.h"</remove>
-
-<substitute>
- <search>ACE_Select_Reactor</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-<!-- Add the TP_Reactor which is the concrete reactor -->
-<add>
- <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook>
- <data>#include "ace/TP_Reactor.h"</data>
-</add>
-
-</file>
-
-<file name="ace.mpc">
-
-<!-- Do not build the WFMO Reactor -->
-<substitute>
-  <search>WFMO_Reactor.cpp</search>
-  <replace>// WFMO_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Reactor Impl -->
-<substitute>
-  <search>Reactor_Impl.cpp</search>
-  <replace>// Reactor_Impl.cpp</replace>
-</substitute>
-<substitute>
-  <search>Reactor_Impl.h</search>
-  <replace>// Reactor_Impl.h</replace>
-</substitute>
-
-<!-- Do not build the Dev Poll Reactor -->
-<substitute>
-  <search>Dev_Poll_Reactor.cpp</search>
-  <replace>// Dev_Poll_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Msg_WFMO_Reactor -->
-<substitute>
-  <search>Msg_WFMO_Reactor.cpp</search>
-  <replace>// Msg_WFMO_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the priority Reactor -->
-<substitute>
-  <search>Priority_Reactor.cpp</search>
-  <replace>// Priority_Reactor.cpp</replace>
-</substitute>
-
-<!-- Do not build the Reactor_Timer_Interface -->
-<substitute>
- <search>Reactor_Timer_Interface.h</search>
- <replace>// Reactor_Timer_Interface.h</replace>
-</substitute>
-<substitute>
- <search>Reactor_Timer_Interface.cpp</search>
- <replace>// Reactor_Timer_Interface.cpp </replace>
-</substitute>
-
-</file>
-
-</module>
-<!-- end of Changes to ace -->
-
-<!-- Transformations to TAO module -->
-<module name="TAO/tao">
-
-<file name="default_resource.h">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="default_resource.cpp">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="GUIResource_Factory.cpp">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="GUIResource_Factory.h">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-</file>
-
-</module>
-
-<module name="TAO/tao/Strategies">
-
-<file name="advanced_resource.h">
-
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-</file>
-
-<file name="advanced_resource.cpp">
-
-<!-- Comment out all other reactor includes -->
-
-<remove>#include "ace/FlReactor.h"</remove>
-<remove>#include "ace/TkReactor.h"</remove>
-<remove>#include "ace/WFMO_Reactor.h"</remove>
-<!-- <remove>#include "ace/Select_Reactor.h"</remove> -->
-<remove>#include "ace/Msg_WFMO_Reactor.h"</remove>
-
-<!-- Substitute ACE_Reactor_Impl with ACE_TP_Reactor -->
-<substitute>
- <search>ACE_Reactor_Impl</search>
- <replace>ACE_TP_Reactor</replace>
-</substitute>
-
-<!-- Comment out creation code for all other reactors -->
-<comment>
- <start-hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<!-- Use the end hook to insert code that will create right reactor -->
-<add>
-  <hook>TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END</hook>
-  <data>
-      ACE_NEW_RETURN (impl,
-                      ACE_TP_Reactor (ACE::max_handles (),
-                                      1,
-                                      (ACE_Sig_Handler*)0,
-                                      (ACE_Timer_Queue*)0,
-                                      this->reactor_mask_signals_,
-                                      ACE_Select_Reactor_Token::LIFO),
-                       0);
-  </data>
-</add>
-
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl
deleted file mode 100644
index 98c7e5dcd7c..00000000000
--- a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Wait Strategy Specialization
- *   ===============================
- *   Details all the specialization transformations necessary
- *   to specialize the Wait_Strategy with the TAO_Wait_On_Leader_Follower strategy
- *
- *   @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
--->
-
-<transform>
-
-<module name="TAO/tao">
-
-<file name="Wait_Strategy.cpp">
-
-<!-- Copy specialized code from the Wait_On_Leader_Follower strategy
-     to this file -->
-
-<copy-from-source>
-
- <!-- Name of the source file from which to copy. In this case, this is
-      the Wait_On_Read source file -->
- <source>Wait_On_Leader_Follower.cpp</source>
-
- <!-- Copy data between the following hooks defined in the aforementioned
-      file -->
- <copy-hook-start>WAIT_STRATEGY_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>WAIT_STRATEGY_SPL_COPY_HOOK_END</copy-hook-end>
-
- <!-- Destination hook in the Wait_Strategy.h file where the code
-      should be placed -->
- <dest-hook>TAO_WAIT_STRATEGY_SPL_ADD_HOOK</dest-hook>
-
-</copy-from-source>
-
-<!-- Copy include files to the hook to get the necessary include files -->
-<add>
- <hook>WAIT_STRATEGY_SPL_COPY_HOOK_START</hook>
- <data>
-#include "tao/Wait_On_Leader_Follower.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-#include "tao/Transport.h"
-#include "tao/Synch_Reply_Dispatcher.h"
-#include "tao/ORB_Core.h"
- </data>
-</add>
-
-<!-- Once this is done, replace all occurences of TAO_Wait_On_Leader_Follower with
-     TAO_Wait_Strategy -->
-<substitute>
- <search>TAO_Wait_On_Leader_Follower</search>
- <replace>TAO_Wait_Strategy</replace>
-</substitute>
-
-<comment>
- <start-hook>LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<add>
- <hook>LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK</hook>
- <data>
-    return 0;
- </data>
-</add>
-
-</file>
-
-<file name="Wait_Strategy.h">
-
-<!-- Remove all occurances of virtual -->
-<remove>virtual</remove>
-<remove>= 0</remove>
-
-</file>
-
-<file name="default_client.cpp">
-
-<comment>
- <start-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<add>
- <hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</hook>
- <data>
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_Strategy (transport),
-                    0);
- </data>
-</add>
-
-</file>
-
-<file name="tao.mpc">
-
-<!-- Do not build the other Wait strategy classes -->
-<substitute>
- <search>Wait_On_Read.h</search>
- <replace>// Wait_On_Read.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Read.cpp</search>
- <replace>// Wait_On_Read.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_Reactor.h</search>
- <replace>// Wait_On_Reactor.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Reactor.cpp</search>
- <replace>// Wait_On_Reactor.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_Leader_Follower.h</search>
- <replace>// Wait_On_Leader_Follower.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Leader_Follower.cpp</search>
- <replace>// Wait_On_Leader_Follower.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_LF_No_Upcall.h</search>
- <replace>// Wait_On_LF_No_Upcall.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_LF_No_Upcall.cpp</search>
- <replace>// Wait_On_LF_No_Upcall.cpp</replace>
-</substitute>
-
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl
deleted file mode 100644
index 87362026710..00000000000
--- a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Wait Strategy Specialization
- *   ===============================
- *   Details all the specialization transformations necessary
- *   to specialize the Wait_Strategy with the Wait_On_Read strategy
- *
- *   @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
--->
-
-<transform>
-
-<module name="TAO/tao">
-
-<file name="Wait_Strategy.cpp">
-
-<!-- Copy specialized code from the Wait_On_Read strategy
-     to this file -->
-
-<copy-from-source>
-
- <!-- Name of the source file from which to copy. In this case, this is
-      the Wait_On_Read source file -->
- <source>Wait_On_Read.cpp</source>
-
- <!-- Copy data between the following hooks defined in the aforementioned
-      file -->
- <copy-hook-start>WAIT_STRATEGY_SPL_COPY_HOOK_START</copy-hook-start>
- <copy-hook-end>WAIT_STRATEGY_SPL_COPY_HOOK_END</copy-hook-end>
-
- <!-- Destination hook in the Wait_Strategy.h file where the code
-      should be placed -->
- <dest-hook>TAO_WAIT_STRATEGY_SPL_ADD_HOOK</dest-hook>
-
-</copy-from-source>
-
-<!-- Copy include files to the hook to get the necessary include files -->
-<add>
- <hook>WAIT_STRATEGY_SPL_COPY_HOOK_START</hook>
- <data>
-#include "tao/Wait_On_Read.h"
-#include "tao/Transport.h"
-#include "tao/Resume_Handle.h"
-#include "tao/Synch_Reply_Dispatcher.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Countdown_Time.h"
- </data>
-</add>
-
-<!-- Once this is done, replace all occurences of TAO_Wait_On_Read with
-     TAO_Wait_Strategy -->
-<substitute>
- <search>TAO_Wait_On_Read</search>
- <replace>TAO_Wait_Strategy</replace>
-</substitute>
-
-</file>
-
-<file name="Wait_Strategy.h">
-
-<!-- Remove all occurances of virtual -->
-<remove>virtual</remove>
-<remove>= 0</remove>
-
-</file>
-
-<file name="default_client.cpp">
-
-<comment>
- <start-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook>
- <end-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook>
-</comment>
-
-<add>
- <hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</hook>
- <data>
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_Strategy (transport),
-                    0);
- </data>
-</add>
-
-</file>
-
-<file name="tao.mpc">
-
-<!-- Do not build the other Wait strategy classes -->
-<substitute>
- <search>Wait_On_Read.h</search>
- <replace>// Wait_On_Read.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Read.cpp</search>
- <replace>// Wait_On_Read.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_Reactor.h</search>
- <replace>// Wait_On_Reactor.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Reactor.cpp</search>
- <replace>// Wait_On_Reactor.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_Leader_Follower.h</search>
- <replace>// Wait_On_Leader_Follower.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_Leader_Follower.cpp</search>
- <replace>// Wait_On_Leader_Follower.cpp</replace>
-</substitute>
-
-<substitute>
- <search>Wait_On_LF_No_Upcall.h</search>
- <replace>// Wait_On_LF_No_Upcall.cpp</replace>
-</substitute>
-<substitute>
- <search>Wait_On_LF_No_Upcall.cpp</search>
- <replace>// Wait_On_LF_No_Upcall.cpp</replace>
-</substitute>
-
-</file>
-
-</module>
-
-</transform>
diff --git a/ACE/bin/MakeProjectCreator/config/MPC.cfg b/ACE/bin/MakeProjectCreator/config/MPC.cfg
index bf62a8bd0f2..04f2c9a5439 100644
--- a/ACE/bin/MakeProjectCreator/config/MPC.cfg
+++ b/ACE/bin/MakeProjectCreator/config/MPC.cfg
@@ -1,3 +1,3 @@
 includes = $CIAO_ROOT/MPC/config, $DANCE_ROOT/MPC/config
-dynamic_types = $ACE_ROOT/bin/MakeProjectCreator, $?DDS_ROOT/MPC, $?TAO_ROOT/MPC, $?XSC_ROOT/MPC
+dynamic_types = $ACE_ROOT/bin/MakeProjectCreator, $?DDS_ROOT/MPC, $?TAO_ROOT/MPC
 main_functions = cplusplus:ACE_TMAIN
diff --git a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
index b2c03dd1a39..51a0e84575c 100644
--- a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
+++ b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
@@ -1,4 +1,3 @@
-// Current as of 2/27/2007
 // This defines the role of all the template variables specific to the
 // 'gnuace' project type.
 //
@@ -6,10 +5,6 @@
 //
 build_dir_per_project = Specifies to use per project object file output dirs (VDIR and VSHDIR) if set to '1'.
 ciao = Indicates whether or not this project contains CIAO code.
-cidlc = The full path to the cidl compiler.
-cidlc_dep = The full path to the cidl compiler as a dependency.
-cidlc_flags = The default flags for the cidl compiler.
-dds = Indicates whether or not this project contains DDS code.
 idl_files = When a Define_Custom(IDL) is used, they will be accessible through this variable name.
 install = This is a synonym for exeout.
 linkflags = Platform specific flags passed during the linking of dynamic libraries and executables.
@@ -22,6 +17,3 @@ tao_idlflags = The default flags for the idl compiler.
 targetoutdir = Specifies a location for all targets and intermediaries within the makefile.  It should always end in a slash.
 vpath = The value will be used as the VPATH setting within the makefile.
 xerceslib = The name of the Xerces library.
-xsc_bin = The full path of the XSC executable.
-xsc_dep = The full path of the XSC executable as a dependency.
-xsc_flags = The default flags to the XSC executable.
diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
index 635cd48bb7d..66faed32dd0 100644
--- a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
+++ b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
@@ -52,24 +52,6 @@ sub fill_value {
       return 'VPATH = .:' . $str . $self->crlf();
     }
   }
-  elsif ($name eq 'tao') {
-    my($incs) = $self->get_assignment('includes');
-    my($libs) = $self->get_assignment('libpaths');
-    return ((defined $incs && $incs =~ /tao/i) ||
-            (defined $libs && $libs =~ /tao/i));
-  }
-  elsif ($name eq 'ciao') {
-    my($incs) = $self->get_assignment('includes');
-    my($libs) = $self->get_assignment('libpaths');
-    return ((defined $incs && $incs =~ /ciao/i) ||
-            (defined $libs && $libs =~ /ciao/i));
-  }
-  elsif ($name eq 'dance') {
-    my($incs) = $self->get_assignment('includes');
-    my($libs) = $self->get_assignment('libpaths');
-    return ((defined $incs && $incs =~ /DAnCE/i) ||
-            (defined $libs && $libs =~ /DAnCE/i));
-  }
   elsif ($name eq 'genins') {
     my $ins = '';
     $self->get_install_info(sub { $ins .= '#' . $_[0] });
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index 57b40e9105a..4b70f754727 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -119,15 +119,6 @@ TAO_IDL_DEP = <%tao_idl_dep%>$(EXEEXT)
 <%if(tao_idlflags)%>
 TAO_IDLFLAGS = <%tao_idlflags%><%if(!compares(vms_old_make, 1))%>$(if $(ARCH), -g $(call ADD_QUOTE,$(call ADD_ARCH,$(ACE_ROOT)/bin/ace_gperf)))<%endif%>
 <%endif%>
-<%if(xsc_bin)%>
-XSC_BIN = <%xsc_bin%>
-<%endif%>
-<%if(xsc_dep)%>
-XSC_DEP = <%xsc_dep%>$(EXEEXT)
-<%endif%>
-<%if(xsc_flags)%>
-XSC_FLAGS = <%xsc_flags%>
-<%endif%>
 <%if(tao_idl3_to_idl2)%>
 TAO_IDL3_TO_IDL2 = <%tao_idl3_to_idl2%>
 <%endif%>
@@ -209,15 +200,6 @@ VSHDIR = <%targetoutdir%>.shobj/
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 <%marker(extension)%>
-<%if(ciao)%>
-include $(CIAO_ROOT)/rules.ciao.GNU
-<%endif%>
-<%if(dance)%>
-include $(DANCE_ROOT)/rules.dance.GNU
-<%endif%>
-<%if(tao)%>
-include $(TAO_ROOT)/rules.tao.GNU
-<%endif%>
 
 <%if(version)%>
 GNUACE_PROJECT_VERSION = <%version%>
@@ -579,6 +561,9 @@ export PATH              := $(PATH):<%custom_type->libpath%>$(if $(ARCH),:<%cust
 <%foreach(custom_type->input_files)%>
 <%if(custom_type->input_file->output_files)%>
 GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%>
+<%if(precious_files)%>
+PRECIOUS_FILES +=<%foreach(precious_files)%><%foreach(custom_type->input_file->output_files)%><%if(contains(custom_type->input_file->output_file, precious_file))%> <%custom_type->input_file->output_file%><%endif%><%endfor%><%endfor%>
+<%endif%>
 <%if(custom_type->input_file->non_source_output_files)%>
 OBJS_DEPEND_ON_GENERATED = 1
 <%endif%>
@@ -744,7 +729,7 @@ incremental_depend_idl::
 
 realclean: clean
 ifneq ($(GENERATED_DIRTY),)
-	-$(RM) -r $(GENERATED_DIRTY)
+	-$(RM) -r $(filter-out $(PRECIOUS_FILES),$(GENERATED_DIRTY))
 endif
 <%if(postclean)%>
 	-<%eval(postclean)%>
diff --git a/ACE/bin/PerlACE/ConfigList.pm b/ACE/bin/PerlACE/ConfigList.pm
index 612c94cb4c2..dad60082d39 100644
--- a/ACE/bin/PerlACE/ConfigList.pm
+++ b/ACE/bin/PerlACE/ConfigList.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::ConfigList;
 use strict;
diff --git a/ACE/bin/PerlACE/MSProject.pm b/ACE/bin/PerlACE/MSProject.pm
index 4c650069c98..1797a609e81 100644
--- a/ACE/bin/PerlACE/MSProject.pm
+++ b/ACE/bin/PerlACE/MSProject.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::MSProject;
 
diff --git a/ACE/bin/PerlACE/Process.pm b/ACE/bin/PerlACE/Process.pm
index 4bccbe7daa8..854ad19039d 100644
--- a/ACE/bin/PerlACE/Process.pm
+++ b/ACE/bin/PerlACE/Process.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::Process;
 
diff --git a/ACE/bin/PerlACE/ProcessAndroid.pm b/ACE/bin/PerlACE/ProcessAndroid.pm
index a00864a5804..d13491d6ed6 100644
--- a/ACE/bin/PerlACE/ProcessAndroid.pm
+++ b/ACE/bin/PerlACE/ProcessAndroid.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::ProcessAndroid;
 
diff --git a/ACE/bin/PerlACE/ProcessLVRT.pm b/ACE/bin/PerlACE/ProcessLVRT.pm
index f5ee2de444a..dec06b8b2e6 100644
--- a/ACE/bin/PerlACE/ProcessLVRT.pm
+++ b/ACE/bin/PerlACE/ProcessLVRT.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 #
 # ProcessLVRT - how to run ACE+TAO tests on a LabVIEW RT target.
 # Tests on LabVIEW RT are not executables - LabVIEW RT can't start plain
diff --git a/ACE/bin/PerlACE/ProcessVX.pm b/ACE/bin/PerlACE/ProcessVX.pm
index 808c6ace375..3bbbef245a4 100644
--- a/ACE/bin/PerlACE/ProcessVX.pm
+++ b/ACE/bin/PerlACE/ProcessVX.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::ProcessVX;
 
diff --git a/ACE/bin/PerlACE/ProcessVX_Unix.pm b/ACE/bin/PerlACE/ProcessVX_Unix.pm
index 56b5641c971..e254567de37 100644
--- a/ACE/bin/PerlACE/ProcessVX_Unix.pm
+++ b/ACE/bin/PerlACE/ProcessVX_Unix.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::ProcessVX;
 
diff --git a/ACE/bin/PerlACE/ProcessVX_Win32.pm b/ACE/bin/PerlACE/ProcessVX_Win32.pm
index d651d38a5cf..3b506b60504 100644
--- a/ACE/bin/PerlACE/ProcessVX_Win32.pm
+++ b/ACE/bin/PerlACE/ProcessVX_Win32.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::ProcessVX;
 
diff --git a/ACE/bin/PerlACE/ProcessWinCE.pm b/ACE/bin/PerlACE/ProcessWinCE.pm
index f0784e4590f..bd86b6a1e2f 100644
--- a/ACE/bin/PerlACE/ProcessWinCE.pm
+++ b/ACE/bin/PerlACE/ProcessWinCE.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::ProcessVX;
 
diff --git a/ACE/bin/PerlACE/ProcessWinCE_Unix.pm b/ACE/bin/PerlACE/ProcessWinCE_Unix.pm
index 570084af6cd..af82496e352 100644
--- a/ACE/bin/PerlACE/ProcessWinCE_Unix.pm
+++ b/ACE/bin/PerlACE/ProcessWinCE_Unix.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::ProcessVX;
 
diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm
index 6202626cce1..73b2b706665 100644
--- a/ACE/bin/PerlACE/Process_Unix.pm
+++ b/ACE/bin/PerlACE/Process_Unix.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::Process;
 
diff --git a/ACE/bin/PerlACE/Process_VMS.pm b/ACE/bin/PerlACE/Process_VMS.pm
index 9affb6d5ae2..6c89c3f9e9b 100644
--- a/ACE/bin/PerlACE/Process_VMS.pm
+++ b/ACE/bin/PerlACE/Process_VMS.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::Process;
 
diff --git a/ACE/bin/PerlACE/Process_Win32.pm b/ACE/bin/PerlACE/Process_Win32.pm
index 3fac8943491..b0e3c339f00 100644
--- a/ACE/bin/PerlACE/Process_Win32.pm
+++ b/ACE/bin/PerlACE/Process_Win32.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 use PerlACE::Run_Test;
 
diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm
index 4ae912f28ea..124fd111a0e 100644
--- a/ACE/bin/PerlACE/Run_Test.pm
+++ b/ACE/bin/PerlACE/Run_Test.pm
@@ -1,6 +1,6 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
-# This module contains a few miscellanous functions and some
+# This module contains a few miscellaneous functions and some
 # startup ARGV processing that is used by all tests.
 
 use PerlACE::Process;
diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm
index de838de5797..347c6cf3a2f 100644
--- a/ACE/bin/PerlACE/TestTarget.pm
+++ b/ACE/bin/PerlACE/TestTarget.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 #
 # The TestTarget class is for operations that are per-target while testing.
 # They can be overridden for specific needs like embedded systems, etc.
@@ -142,7 +142,7 @@ sub GetConfigSettings ($)
             $self->{tao_root} = $ENV{'TAO_ROOT'};
         }
     } else {
-        # fall back to assuming classic hierarchical struture
+        # fall back to assuming classic hierarchical structure
         $self->{tao_root} = "$self->{ace_root}/TAO";
     }
     $env_name = $env_prefix.'CIAO_ROOT';
@@ -162,7 +162,7 @@ sub GetConfigSettings ($)
             $self->{ciao_root} = $ENV{'CIAO_ROOT'};
         }
     } else {
-        # fall back to assuming classic hierarchical struture
+        # fall back to assuming classic hierarchical structure
         $self->{ciao_root} = "$self->{tao_root}/CIAO";
     }
 
@@ -183,7 +183,7 @@ sub GetConfigSettings ($)
             $self->{dance_root} = $ENV{'DANCE_ROOT'};
         }
     } else {
-        # fall back to assuming classic hierarchical struture
+        # fall back to assuming classic hierarchical structure
         $self->{dance_root} = "$self->{tao_root}/DAnCE";
     }
 
diff --git a/ACE/bin/PerlACE/TestTarget_Android.pm b/ACE/bin/PerlACE/TestTarget_Android.pm
index b6d0859b239..3c9ed08d59c 100644
--- a/ACE/bin/PerlACE/TestTarget_Android.pm
+++ b/ACE/bin/PerlACE/TestTarget_Android.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 package PerlACE::TestTarget_Android;
 
 # ******************************************************************
diff --git a/ACE/bin/PerlACE/TestTarget_LVRT.pm b/ACE/bin/PerlACE/TestTarget_LVRT.pm
index 79371d9800c..42c6cbd8615 100644
--- a/ACE/bin/PerlACE/TestTarget_LVRT.pm
+++ b/ACE/bin/PerlACE/TestTarget_LVRT.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 #
 # TestTarget_LVRT - how to manage the test environment on a LabVIEW RT target.
 #
diff --git a/ACE/bin/PerlACE/TestTarget_VxWorks.pm b/ACE/bin/PerlACE/TestTarget_VxWorks.pm
index c46eb88a57e..9780b80155b 100644
--- a/ACE/bin/PerlACE/TestTarget_VxWorks.pm
+++ b/ACE/bin/PerlACE/TestTarget_VxWorks.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 
 package PerlACE::TestTarget_VxWorks;
 
diff --git a/ACE/bin/PerlACE/TestTarget_WinCE.pm b/ACE/bin/PerlACE/TestTarget_WinCE.pm
index 2aba983da24..b4144b9c344 100644
--- a/ACE/bin/PerlACE/TestTarget_WinCE.pm
+++ b/ACE/bin/PerlACE/TestTarget_WinCE.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 package PerlACE::TestTarget_WinCE;
 
 # ******************************************************************
diff --git a/ACE/bin/Uniqueid.pm b/ACE/bin/Uniqueid.pm
index 5ff95403b0f..3e453a4695d 100644
--- a/ACE/bin/Uniqueid.pm
+++ b/ACE/bin/Uniqueid.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 sub uniqueid
 {
   if ($^O eq "MSWin32")
diff --git a/ACE/bin/cle.pl b/ACE/bin/cle.pl
deleted file mode 100755
index 26e2f35e90c..00000000000
--- a/ACE/bin/cle.pl
+++ /dev/null
@@ -1,296 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# ******************************************************************
-#      Author: Chad Elliott
-#        Date: 6/18/2002
-# ******************************************************************
-
-use strict;
-use Cwd;
-use File::Basename;
-use Sys::Hostname;
-
-if ( $^O eq 'VMS' ) {
-  require VMS::Filespec;
-  import VMS::Filespec qw(unixpath);
-}
-
-unshift(@INC, getExecutePath($0) . 'ChangeLogEditor');
-
-require ChangeLogEdit;
-require EmailTranslator;
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub which {
-  my($prog)   = shift;
-  my($exec)   = $prog;
-  my($part)   = '';
-  if ( $^O eq 'VMS' ) {
-    my($envSep) = ';';
-    if (defined $ENV{'PATH'}) {
-      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-        $part .= "$prog";
-        if ( -x $part ) {
-          $exec = $part;
-          last;
-        }
-      }
-    }
-  }
-  else  {
-    my($envSep) = ($^O eq 'MSWin32' ? ';' : ':');
-    if (defined $ENV{'PATH'}) {
-      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-        $part .= "/$prog";
-        if ( -x $part ) {
-          $exec = $part;
-          last;
-        }
-      }
-    }
-  }
-
-  return $exec;
-}
-
-
-sub getExecutePath {
-  my($prog) = shift;
-  my($loc)  = '';
-
-  if ( $^O eq 'VMS' ) {
-    if ($prog ne basename($prog)) {
-      my($dir) = unixpath( dirname($prog) );
-      if ($prog =~ /^[\/\\]/) {
-        $loc = $dir;
-      }
-      else {
-        $loc = unixpath(getcwd()) . $dir;
-      }
-    }
-    else {
-      $loc = unixpath( dirname(which($prog)) );
-    }
-
-    if ($loc eq '.') {
-      $loc = unixpath( getcwd() );
-    }
-  } else {
-    if ($prog ne basename($prog)) {
-      if ($prog =~ /^[\/\\]/ ||
-          $prog =~ /^[A-Za-z]:[\/\\]?/) {
-        $loc = dirname($prog);
-      }
-      else {
-        $loc = getcwd() . '/' . dirname($prog);
-      }
-    }
-    else {
-      $loc = dirname(which($prog));
-    }
-
-    $loc =~ s/\/\.$//;
-
-    if ($loc eq '.') {
-      $loc = getcwd();
-    }
-
-    if ($loc ne '') {
-      $loc .= '/';
-    }
-  }
-
-  return $loc;
-}
-
-sub getDefaultDomain {
-  my($domain) = undef;
-  my($host)   = hostname();
-
-  if (defined $host) {
-    ## First try the hostname
-    if ($host =~ /[^\.]+\.(.*)/) {
-      $domain = $1;
-    }
-    else {
-      ## Next try the hosts file
-      my($hosts) = ($^O eq 'MSWin32' ?
-                      "$ENV{SystemRoot}/system32/drivers/etc/hosts" :
-                      '/etc/hosts');
-      my($fh)    = new FileHandle();
-      if (open($fh, $hosts)) {
-        while(<$fh>) {
-          if (/$host\.([^\s]+)/) {
-            $domain = $1;
-            last;
-          }
-        }
-        close($fh);
-      }
-
-      if (!defined $domain) {
-        ## Next try ipconfig on Windows
-        if ($^O eq 'MSWin32') {
-          if (open($fh, 'ipconfig /all |')) {
-            while(<$fh>) {
-              if (/Primary\s+DNS\s+Suffix[^:]+:\s+(.*)/) {
-                $domain = $1;
-              }
-              elsif (/DNS\s+Suffix\s+Search[^:]+:\s+(.*)/) {
-                $domain = $1;
-              }
-            }
-            close($fh);
-          }
-        }
-        else {
-          ## Try /etc/resolv.conf on UNIX
-          if (open($fh, '/etc/resolv.conf')) {
-            while(<$fh>) {
-              if (/search\s+(.*)/) {
-                $domain = $1;
-                last;
-              }
-            }
-            close($fh);
-          }
-        }
-      }
-    }
-  }
-  return $domain;
-}
-
-
-sub usageAndExit {
-  my($arg)  = shift;
-  my($base) = basename($0);
-  if (defined $arg) {
-    print "$arg\n\n";
-  }
-  print "Usage: $base [ChangeLog File] [user name] [email address]\n" .
-        "        " . (' ' x length($base)) . "[-d <dir1 dir2 ... dirN>]\n\n" .
-        "       Uses cvs to determine which files are modified or added\n" .
-        "       and generates a bare ChangeLog entry based on those files.\n" .
-        "       This script should be run at the same directory level in\n" .
-        "       which the ChangeLog exists.  The entry is prepended to the\n" .
-        "       existing ChangeLog.\n" .
-        "\n" .
-        "       Email addresses are generated with a certain set of\n" .
-        "       defaults and can be modified using various environment\n" .
-        "       variables.  By default email addresses are generated\n" .
-        "       using the user last name followed by an underscore and\n" .
-        "       the first initial of the user first name followed by the\n" .
-        "       email domain.\n" .
-        "\n" .
-        "       REPLYTO      If this environment variable is set, the value\n" .
-        "                    is used as the email address.\n" .
-        "       CL_USERNAME  This environment variable is used to override\n" .
-        "                    the user name (obtained from the password file).\n" .
-        "       CL_CHANGELOG_FILE  This environment variable is used as the\n".
-        "                          [ChangeLog File] argument if none is given\n".
-        "                          on the command line.\n".
-        "\n" .
-        "       The user name and email address can be passed as a parameter to\n" .
-        "       this script.  If either is not passed, then the script will try\n" .
-        "       to determine it automatically.\n" .
-        "\n" .
-        "       If -d is used, everything on the command line after it is\n" .
-        "       considered a directory or file to be considered in the\n" .
-        "       ChangeLog entry.\n";
-  exit(0);
-}
-
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-my($file)     = undef;
-my($name)     = undef;
-my($email)    = undef;
-my(@dirs)     = ();
-my($restdirs) = 0;
-
-foreach my $arg (@ARGV) {
-  if ($restdirs) {
-    push(@dirs, $arg);
-  }
-  elsif ($arg eq '-h') {
-    usageAndExit();
-  }
-  elsif ($arg eq '-d') {
-    $restdirs = 1;
-  }
-  elsif ($arg =~ /^\-/) {
-    usageAndExit("Unrecognized parameter: $arg");
-  }
-  elsif (!defined $file) {
-    $file = $arg;
-  }
-  elsif (!defined $name) {
-    $name = $arg;
-  }
-  elsif (!defined $email) {
-    $email = $arg;
-  }
-}
-
-if (!defined $file) {
-  if (defined $ENV{CL_CHANGELOG_FILE}) {
-    $file = $ENV{CL_CHANGELOG_FILE};
-  }
-  else {
-    $file = 'ChangeLog';
-  }
-}
-if (!defined $name) {
-  my(@pwd)    = ();
-  if (defined $ENV{CL_USERNAME}) {
-    $pwd[6] = $ENV{CL_USERNAME};
-  }
-  else {
-    if ($^O eq 'MSWin32' || $^O eq 'cygwin') {
-      $pwd[6] = 'unknown';
-    }
-    else {
-      @pwd = getpwuid($<);
-      $pwd[6] =~ s/,//g;
-    }
-  }
-  $name = $pwd[6];
-}
-
-if (!defined $email) {
-  my($trans) = new EmailTranslator(getDefaultDomain());
-  $email = $trans->translate($name);
-}
-
-my($editor) = new ChangeLogEdit($name, $email);
-my($status, $error, $unknown) = $editor->edit($file, @dirs);
-
-if (defined $unknown) {
-  my(@uarray) = @$unknown;
-  if ($#uarray >= 0) {
-    print "WARNING: The following files are unknown to the ",
-          "revision control system:\n";
-    foreach my $unk (@uarray) {
-      print "$unk\n";
-    }
-    print "\n";
-  }
-}
-
-if ($status) {
-  print "You are now ready to edit the $file.\n";
-}
-else {
-  print "$error\n";
-}
-
-exit($status ? 0 : 1);
diff --git a/ACE/bin/depgen.pl b/ACE/bin/depgen.pl
index 2ebecf942a0..59a5dd05e82 100755
--- a/ACE/bin/depgen.pl
+++ b/ACE/bin/depgen.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
index 2d8da0fbb16..08e4422778f 100755
--- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -2,7 +2,7 @@
 
 if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi
 if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi
-if test -z $3; then olddate=2020_08_17; else olddate=$3; fi
+if test -z $3; then olddate=2020_10_27; else olddate=$3; fi
 if test -z $ACE_ROOT; then ACE_ROOT=..; fi
 if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi
 if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi
diff --git a/ACE/bin/doxygen-convert-h.pl b/ACE/bin/doxygen-convert-h.pl
index b8104f39f22..253e351e1a2 100755
--- a/ACE/bin/doxygen-convert-h.pl
+++ b/ACE/bin/doxygen-convert-h.pl
@@ -41,16 +41,14 @@ sub recursive_find {
 
   if (opendir($fh, $file)) {
     foreach my $f (grep(!/^\.\.?$/, readdir($fh))) {
-      if ($f ne '.svn') {
-        my($full) = "$file/$f";
-        if (-d $full) {
-          push(@rfiles, recursive_find($full));
-        }
-        else {
-          push(@rfiles, $full)
-          if ($f =~ /\.(h|hxx|hpp|hh|inl|idl|cpp|cxx|cc|c|C)$/)
-          ;
-        }
+      my($full) = "$file/$f";
+      if (-d $full) {
+        push(@rfiles, recursive_find($full));
+      }
+      else {
+        push(@rfiles, $full)
+        if ($f =~ /\.(h|hxx|hpp|hh|inl|idl|cpp|cxx|cc|c|C)$/)
+        ;
       }
     }
     closedir($fh);
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index cbe752d84a6..7cadf939bf1 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -68,25 +68,6 @@ $warnings = 0;
 
 ##############################################################################
 
-# Use 'svn -q st' to get a list of locally modified
-# files to look through
-sub find_mod_svn_files ()
-{
-    unless (open (SVN, "svn -q st |")) {
-        print STDERR "Error: Could not run svn\n";
-        return 0;
-    }
-
-    while (<SVN>) {
-        #        1234567   (see "svn help st" for column definitions)
-        if (/^[MA].....\s+(.*)$/) {
-            store_file ($1);
-        }
-    }
-    close (SVN);
-    return 1;
-}
-
 # Use 'git status -s' to get a list of locally modified
 # files to look through
 sub find_mod_git_files ()
@@ -107,8 +88,8 @@ sub find_mod_git_files ()
 
 sub find_mod_files ()
 {
-  if (!(find_mod_svn_files() && find_mod_git_files())) {
-    print "Could use neither svn nor git to find modified files\n";
+  if (!find_mod_git_files()) {
+    print "Could use git to find modified files\n";
     exit (1);
   }
 }
@@ -415,14 +396,14 @@ sub check_for_newline ()
 }
 
 
-# This test checks for files that are not allowed to be in svn
+# This test checks for files that are not allowed to be in version control
 sub check_for_noncvs_files ()
 {
     return if is_suppressed ();
 
-    print "Running non svn files check\n";
+    print "Running non versioned controlled files check\n";
     foreach $file (@files_noncvs, @files_dsp, @files_dsw, @files_makefile, @files_bor) {
-        print_error ("File $file should not be in svn!");
+        print_error ("File $file should not be in version control!");
     }
 }
 
@@ -1357,7 +1338,7 @@ sub check_for_dependency_file ()
                     $depend = $path . $depend;
                     unless (open (DFILE, $depend)) {
                         print_error ("DEPENDENCY_FILE \"$depend\" not found");
-                        print " Either add \"$depend\" to svn ";
+                        print " Either add \"$depend\" to git ";
                         print "or remove DEPENDENCY_FILE variable\n";
                         print " from $file\n\n";
                     }
@@ -1891,42 +1872,6 @@ sub check_for_bad_ace_trace()
     }
 }
 
-
-# This test checks for broken ChangeLog entries.
-sub check_for_changelog_errors ()
-{
-    return if is_suppressed ();
-
-    print "Running ChangeLog check\n";
-    foreach $file (@files_changelog) {
-        if (open (FILE, $file)) {
-            my $found_backslash = 0;
-            my $found_cvs_conflict = 0;
-
-            print "Looking at file $file\n" if $opt_d;
-            while (<FILE>) {
-
-                next if m/^\s*\/\//;
-                next if m/^\s*$/;
-
-                # Check for backslashes in paths.
-                if (m/\*.*\\[^ ]*:/) {
-                    print_error ("$file:$.: Backslashes in file path");
-                }
-
-                # Check for svn conflict tags
-                if (m/^<<<<</ || m/^=====/ || m/^>>>>>/) {
-                    print_error ("$file:$.: svn conflict markers");
-                }
-            }
-            close (FILE);
-        }
-        else {
-            print STDERR "Error: Could not open $file\n";
-        }
-    }
-}
-
 sub check_for_deprecated_macros ()
 {
     return if is_suppressed ();
@@ -2413,7 +2358,7 @@ if (!getopts ('cdx:hl:t:s:mv') || $opt_h) {
           "                       this will disable the run level setting\n";
     print "    -s test_names  specify comma-separated list of tests to suppress\n".
           "                       this will supplement the run level setting\n";
-    print "    -m             only check locally modified files (uses svn)\n";
+    print "    -m             only check locally modified files (uses git)\n";
     print "======================================================\n";
     print "list of the tests that could be run or suppressed:\n";
     print <<EOT;
@@ -2445,7 +2390,6 @@ if (!getopts ('cdx:hl:t:s:mv') || $opt_h) {
            check_for_bad_run_test
            check_for_absolute_ace_wrappers
            check_for_bad_ace_trace
-           check_for_changelog_errors
            check_for_ptr_arith_t
            check_for_include (disabled by default)
            check_for_non_bool_operators
@@ -2540,7 +2484,6 @@ check_for_versioned_namespace_begin_end () if ($opt_l >= 4);
 check_for_mismatched_filename () if ($opt_l >= 2);
 check_for_absolute_ace_wrappers () if ($opt_l >= 3);
 check_for_bad_ace_trace () if ($opt_l >= 4);
-check_for_changelog_errors () if ($opt_l >= 4);
 check_for_ptr_arith_t () if ($opt_l >= 4);
 check_for_non_bool_operators () if ($opt_l > 2);
 check_for_long_file_names () if ($opt_l >= 1);
diff --git a/ACE/bin/generate_export_file.pl b/ACE/bin/generate_export_file.pl
index 99b36d2caec..b857b067404 100755
--- a/ACE/bin/generate_export_file.pl
+++ b/ACE/bin/generate_export_file.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index c3f26cb9bb5..b7d4dc92961 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -221,7 +221,6 @@ def update_version_files (component):
 #define %s_MAJOR_VERSION %s
 #define %s_MINOR_VERSION %s
 #define %s_MICRO_VERSION %s
-#define %s_BETA_VERSION %s
 #define %s_VERSION \"%s\"
 #define %s_VERSION_CODE %s
 #define %s_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
@@ -469,7 +468,7 @@ def push_latest_branch (product, which):
     """Update one of the remote Latest_* branches to point to the new release.
     """
 
-    name = "Latest_" + which
+    name = "Latest_ACE7TAO3_" + which
 
     if opts.push:
         vprint ("Pushing branch", name)
@@ -481,15 +480,14 @@ def latest_branch_helper (fn, release_type):
     release_types = tuple(ReleaseType.__members__.values())
     do = release_types[release_types.index(release_type):]
     if ReleaseType.micro in do:
-        fn ("ACE_TAO", "Beta")
         fn ("ACE_TAO", "Micro")
-        fn ("MPC", "ACETAO_Micro")
+        fn ("MPC", "Micro")
     if ReleaseType.minor in do:
         fn ("ACE_TAO", "Minor")
-        fn ("MPC", "ACETAO_Minor")
+        fn ("MPC", "Minor")
     if ReleaseType.major in do:
         fn ("ACE_TAO", "Major")
-        fn ("MPC", "ACETAO_Major")
+        fn ("MPC", "Major")
 
 
 def tag ():
diff --git a/ACE/bin/mpc.pl b/ACE/bin/mpc.pl
index c1cfc2c7644..2d6cd0ed6ff 100755
--- a/ACE/bin/mpc.pl
+++ b/ACE/bin/mpc.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
diff --git a/ACE/bin/mwc.pl b/ACE/bin/mwc.pl
index c2afdb7fdf0..c745710c68f 100755
--- a/ACE/bin/mwc.pl
+++ b/ACE/bin/mwc.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
diff --git a/ACE/bin/split-cpp.pl b/ACE/bin/split-cpp.pl
index 19fee2ad708..ee68e71b56a 100755
--- a/ACE/bin/split-cpp.pl
+++ b/ACE/bin/split-cpp.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
diff --git a/ACE/debian/changelog b/ACE/debian/changelog
index c732a5fcbf7..062f21edefb 100644
--- a/ACE/debian/changelog
+++ b/ACE/debian/changelog
@@ -1,3 +1,40 @@
+ace (6.5.12+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Mark build dependency on libfltk1.3-dev. (Closes: #974633)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 05 Dec 2020 20:27:14 +0000
+
+ace (6.5.12+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 07 Nov 2020 09:28:59 +0000
+
+ace (6.5.12+dfsg-1) experimental; urgency=medium
+
+  * Team upload.
+  * Update to upstream v6.5.12
+    - Sync debian/* with upstream.
+    - Revert upstream shebang portability changes.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Fri, 30 Oct 2020 22:35:54 +0000
+
+ace (6.5.10+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fix build on hurd-i386.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Mon, 26 Oct 2020 21:45:06 +0000
+
+ace (6.5.10+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 01 Aug 2020 16:19:16 +0100
+
 ace (6.5.10+dfsg-1) experimental; urgency=medium
 
   * Team upload.
diff --git a/ACE/debian/control b/ACE/debian/control
index 37224766228..72c822b5c75 100644
--- a/ACE/debian/control
+++ b/ACE/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian ACE maintainers <team+ace@tracker.debian.org>
 Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Johnny Willemsen <jwillemsen@remedy.nl>
-Build-Depends: debhelper-compat (=12), libssl-dev, libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev
+Build-Depends: debhelper-compat (=12), libssl-dev, libxt-dev (>= 4.3.0), libfltk1.3-dev, tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/debian/ace.git
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.5.11
+Package: libace-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.5.11 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.12 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.5.11
+Package: libace-ssl-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.5.11
+Package: libace-rmcast-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.5.11
+Package: libace-tmcast-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.5.11
+Package: libace-htbp-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.5.11
+Package: libace-inet-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.5.11
+Package: libace-inet-ssl-6.5.12
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.11, libace-ssl-6.5.11, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.12, libace-ssl-6.5.12, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.5.11 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.12 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
  basically the same options and functionality. ace_gperf simply takes
  advantage of some of the features provided by the ACE library.
 
-Package: libacexml-6.5.11
+Package: libacexml-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -196,12 +196,12 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libace-xml-utils-6.5.11
+Package: libace-xml-utils-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
 Description: ACE XML utility classes and methods - development files
  This package contains the header files and static library for the ACE XML
  Utils library
 
-Package: libkokyu-6.5.11
+Package: libkokyu-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-xtreactor-6.5.11
+Package: libace-xtreactor-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.5.11
+Package: libace-tkreactor-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.5.11
+Package: libace-flreactor-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the ACE-FLTK
  reactor integration.
 
-Package: libace-foxreactor-6.5.11
+Package: libace-foxreactor-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
@@ -343,7 +343,7 @@ Description: ACE network service implementations
  files to link the various ACE network services together, either
  statically or dynamically, and form complete server programs.
 
-Package: libnetsvcs-6.5.11
+Package: libnetsvcs-6.5.12
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
 Package: libnetsvcs-dev
 Architecture: any
 Section: libdevel
-Depends: libnetsvcs-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE network service implementations - development files
  ACE network services provide reusable components for common
  distributed system tasks such as logging, naming, locking, and time
diff --git a/ACE/debian/patches/0001-Revert-Perl-shebang-portability-changes.patch b/ACE/debian/patches/0001-Revert-Perl-shebang-portability-changes.patch
new file mode 100644
index 00000000000..67a90358729
--- /dev/null
+++ b/ACE/debian/patches/0001-Revert-Perl-shebang-portability-changes.patch
@@ -0,0 +1,236 @@
+From a5c0e7bab44a19590d58d523eacccd3690373820 Mon Sep 17 00:00:00 2001
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Date: Fri, 30 Oct 2020 22:08:37 +0000
+Subject: [PATCH] Revert "Perl shebang portability changes"
+
+This reverts commit 7d1e5116b673b3655837e0ce549e7781702d309c.
+
+Ref: https://www.debian.org/doc/debian-policy/ch-files.html#scripts
+
+Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+---
+ bin/PerlACE/ConfigList.pm         | 2 +-
+ bin/PerlACE/MSProject.pm          | 2 +-
+ bin/PerlACE/Process.pm            | 2 +-
+ bin/PerlACE/ProcessAndroid.pm     | 2 +-
+ bin/PerlACE/ProcessLVRT.pm        | 2 +-
+ bin/PerlACE/ProcessVX.pm          | 2 +-
+ bin/PerlACE/ProcessVX_Unix.pm     | 2 +-
+ bin/PerlACE/ProcessVX_Win32.pm    | 2 +-
+ bin/PerlACE/ProcessWinCE.pm       | 2 +-
+ bin/PerlACE/ProcessWinCE_Unix.pm  | 2 +-
+ bin/PerlACE/Process_Unix.pm       | 2 +-
+ bin/PerlACE/Process_VMS.pm        | 2 +-
+ bin/PerlACE/Process_Win32.pm      | 2 +-
+ bin/PerlACE/Run_Test.pm           | 2 +-
+ bin/PerlACE/TestTarget.pm         | 2 +-
+ bin/PerlACE/TestTarget_Android.pm | 2 +-
+ bin/PerlACE/TestTarget_LVRT.pm    | 2 +-
+ bin/PerlACE/TestTarget_VxWorks.pm | 2 +-
+ bin/PerlACE/TestTarget_WinCE.pm   | 2 +-
+ bin/Uniqueid.pm                   | 2 +-
+ 20 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/bin/PerlACE/ConfigList.pm b/bin/PerlACE/ConfigList.pm
+index dad60082d39..612c94cb4c2 100644
+--- a/bin/PerlACE/ConfigList.pm
++++ b/bin/PerlACE/ConfigList.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ConfigList;
+ use strict;
+diff --git a/bin/PerlACE/MSProject.pm b/bin/PerlACE/MSProject.pm
+index 1797a609e81..4c650069c98 100644
+--- a/bin/PerlACE/MSProject.pm
++++ b/bin/PerlACE/MSProject.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::MSProject;
+ 
+diff --git a/bin/PerlACE/Process.pm b/bin/PerlACE/Process.pm
+index 854ad19039d..4bccbe7daa8 100644
+--- a/bin/PerlACE/Process.pm
++++ b/bin/PerlACE/Process.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::Process;
+ 
+diff --git a/bin/PerlACE/ProcessAndroid.pm b/bin/PerlACE/ProcessAndroid.pm
+index d13491d6ed6..a00864a5804 100644
+--- a/bin/PerlACE/ProcessAndroid.pm
++++ b/bin/PerlACE/ProcessAndroid.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessAndroid;
+ 
+diff --git a/bin/PerlACE/ProcessLVRT.pm b/bin/PerlACE/ProcessLVRT.pm
+index dec06b8b2e6..f5ee2de444a 100644
+--- a/bin/PerlACE/ProcessLVRT.pm
++++ b/bin/PerlACE/ProcessLVRT.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ #
+ # ProcessLVRT - how to run ACE+TAO tests on a LabVIEW RT target.
+ # Tests on LabVIEW RT are not executables - LabVIEW RT can't start plain
+diff --git a/bin/PerlACE/ProcessVX.pm b/bin/PerlACE/ProcessVX.pm
+index 3bbbef245a4..808c6ace375 100644
+--- a/bin/PerlACE/ProcessVX.pm
++++ b/bin/PerlACE/ProcessVX.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/ProcessVX_Unix.pm b/bin/PerlACE/ProcessVX_Unix.pm
+index e254567de37..56b5641c971 100644
+--- a/bin/PerlACE/ProcessVX_Unix.pm
++++ b/bin/PerlACE/ProcessVX_Unix.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/ProcessVX_Win32.pm b/bin/PerlACE/ProcessVX_Win32.pm
+index 3b506b60504..d651d38a5cf 100644
+--- a/bin/PerlACE/ProcessVX_Win32.pm
++++ b/bin/PerlACE/ProcessVX_Win32.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/ProcessWinCE.pm b/bin/PerlACE/ProcessWinCE.pm
+index bd86b6a1e2f..f0784e4590f 100644
+--- a/bin/PerlACE/ProcessWinCE.pm
++++ b/bin/PerlACE/ProcessWinCE.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/ProcessWinCE_Unix.pm b/bin/PerlACE/ProcessWinCE_Unix.pm
+index af82496e352..570084af6cd 100644
+--- a/bin/PerlACE/ProcessWinCE_Unix.pm
++++ b/bin/PerlACE/ProcessWinCE_Unix.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm
+index 73b2b706665..6202626cce1 100644
+--- a/bin/PerlACE/Process_Unix.pm
++++ b/bin/PerlACE/Process_Unix.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::Process;
+ 
+diff --git a/bin/PerlACE/Process_VMS.pm b/bin/PerlACE/Process_VMS.pm
+index 6c89c3f9e9b..9affb6d5ae2 100644
+--- a/bin/PerlACE/Process_VMS.pm
++++ b/bin/PerlACE/Process_VMS.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::Process;
+ 
+diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm
+index b0e3c339f00..3fac8943491 100644
+--- a/bin/PerlACE/Process_Win32.pm
++++ b/bin/PerlACE/Process_Win32.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ use PerlACE::Run_Test;
+ 
+diff --git a/bin/PerlACE/Run_Test.pm b/bin/PerlACE/Run_Test.pm
+index 124fd111a0e..712a0f9b2ae 100644
+--- a/bin/PerlACE/Run_Test.pm
++++ b/bin/PerlACE/Run_Test.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ # This module contains a few miscellaneous functions and some
+ # startup ARGV processing that is used by all tests.
+diff --git a/bin/PerlACE/TestTarget.pm b/bin/PerlACE/TestTarget.pm
+index 347c6cf3a2f..3a5477b87dc 100644
+--- a/bin/PerlACE/TestTarget.pm
++++ b/bin/PerlACE/TestTarget.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ #
+ # The TestTarget class is for operations that are per-target while testing.
+ # They can be overridden for specific needs like embedded systems, etc.
+diff --git a/bin/PerlACE/TestTarget_Android.pm b/bin/PerlACE/TestTarget_Android.pm
+index 3c9ed08d59c..b6d0859b239 100644
+--- a/bin/PerlACE/TestTarget_Android.pm
++++ b/bin/PerlACE/TestTarget_Android.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ package PerlACE::TestTarget_Android;
+ 
+ # ******************************************************************
+diff --git a/bin/PerlACE/TestTarget_LVRT.pm b/bin/PerlACE/TestTarget_LVRT.pm
+index 42c6cbd8615..79371d9800c 100644
+--- a/bin/PerlACE/TestTarget_LVRT.pm
++++ b/bin/PerlACE/TestTarget_LVRT.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ #
+ # TestTarget_LVRT - how to manage the test environment on a LabVIEW RT target.
+ #
+diff --git a/bin/PerlACE/TestTarget_VxWorks.pm b/bin/PerlACE/TestTarget_VxWorks.pm
+index 9780b80155b..c46eb88a57e 100644
+--- a/bin/PerlACE/TestTarget_VxWorks.pm
++++ b/bin/PerlACE/TestTarget_VxWorks.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::TestTarget_VxWorks;
+ 
+diff --git a/bin/PerlACE/TestTarget_WinCE.pm b/bin/PerlACE/TestTarget_WinCE.pm
+index b4144b9c344..2aba983da24 100644
+--- a/bin/PerlACE/TestTarget_WinCE.pm
++++ b/bin/PerlACE/TestTarget_WinCE.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ package PerlACE::TestTarget_WinCE;
+ 
+ # ******************************************************************
+diff --git a/bin/Uniqueid.pm b/bin/Uniqueid.pm
+index 3e453a4695d..5ff95403b0f 100644
+--- a/bin/Uniqueid.pm
++++ b/bin/Uniqueid.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ sub uniqueid
+ {
+   if ($^O eq "MSWin32")
+-- 
+2.11.0
+
diff --git a/ACE/debian/patches/series b/ACE/debian/patches/series
new file mode 100644
index 00000000000..118e900d13e
--- /dev/null
+++ b/ACE/debian/patches/series
@@ -0,0 +1 @@
+0001-Revert-Perl-shebang-portability-changes.patch
diff --git a/ACE/docs/ACE-bug-process.html b/ACE/docs/ACE-bug-process.html
index acb3281d4b4..b5ba03eb132 100644
--- a/ACE/docs/ACE-bug-process.html
+++ b/ACE/docs/ACE-bug-process.html
@@ -19,7 +19,7 @@ straining the resources of the researchers in the <A
 HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE-members-i.html">DOC
 group</A> at Washington
 University, UC Irvine, and <A
-HREF="http://www.dre.vanderbilt.edu">ISIS</A> to respond to all the
+HREF="https://www.dre.vanderbilt.edu">ISIS</A> to respond to all the
 traffic immediately.  Prompt bug fixes from the DOC group also
 discourage the creation of a larger community of <A
 HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE-members.html">users</A> and
diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html
index d95affef956..9beab7f240a 100644
--- a/ACE/docs/ACE-guidelines.html
+++ b/ACE/docs/ACE-guidelines.html
@@ -157,7 +157,7 @@ bgcolor="#ffffff">
         class ACE_Monitor_Control
         {
         public:
-          int read_monitor (void);
+          int read_monitor ();
           // ...
         };
         </PRE>
@@ -168,7 +168,7 @@ rather than
         class ACEMonitorControl
         {
         public:
-          int readMonitor (void);
+          int readMonitor ();
           // ...
         };
         </PRE>
@@ -181,21 +181,6 @@ rather than
         should consist of complete sentences, <em>i.e.</em>, start
         with a capital letter and end with a period.<p>
 
-    <li>Insert a svn keyword string at the top of every source file,
-        Makefile, config file, <em>etc</em>.  For C++ files, it is:
-        <pre>
-        // $<!-- -->Id$
-        </pre>
-        It is not necessary to fill in the fields of the keyword string,
-        or modify them when you edit a file that already has one. SVN
-        does that automatically when you checkout or update the file.<p>
-
-        To insert that string at the top of a file:
-        <pre>
-        perl -pi -e \
-          'if (! $o) {printf "// \$<!-- -->Id\$\n\n";}; $o = 1;' <em>file</em>
-        </pre><p>
-
     <li>Be sure to follow the guidelines and restrictions for use of the
         documentation tools for ACE
         header files, which must follow the
@@ -625,7 +610,7 @@ Foo::bar ()
         void object_addr (const ACE_INET_Addr &);
 
         /// Returns the ACE_INET_Addr for this profile.
-        const ACE_INET_Addr &object_addr const (void);
+        const ACE_INET_Addr &object_addr const ();
         </pre><p>
 
         instead of the "set_" and "get_" form.<p>
@@ -642,9 +627,9 @@ Foo::bar ()
         <strong><code>delete []</code></strong> to correspond to the
         allocation.<p>
 
-    <li>Don't check for a pointer being 0 before deleting it.  It's
-        always safe to delete a 0 pointer.  If the pointer is visible
-        outside the local scope, it's often a good idea to 0 it
+    <li>Don't check for a pointer being nullptr before deleting it.  It's
+        always safe to delete a nullptr.  If the pointer is visible
+        outside the local scope, it's often a good idea to nullptr it
         _after_ deleting it.  Note, the same argument applies to
         free().<p>
 
@@ -653,11 +638,8 @@ Foo::bar ()
         because they check for successful allocation and set errno
         appropriately if it fails.<p>
 
-    <li>Never compare or assign a pointer value with <strong>NULL</strong>;
-        use <strong>0</strong> instead.  The language allows any pointer to
-        be compared or assigned with <strong>0</strong>.  The definition
-        of <strong>NULL</strong> is implementation dependent, so it is
-        difficult to use portably without casting.<p>
+    <li>Never compare or assign a pointer value with <strong>NULL</strong> or <strong>0</strong>
+        use <strong>nullptr</strong> instead.<p>
 
     <li>Never cast a pointer to or from an <strong><code>int</code></strong>
         or a <strong><code>long</code></strong>.  On all currently supported
@@ -765,27 +747,16 @@ Foo::bar ()
 
     <li>In general, if instances of a class should not be copied,
         then a private copy constructor and assignment operator should
-        be declared for the class, but not implemented.  For example:
+        be deleted for the class
 
         <pre>
         // Disallow copying by not implementing the following . . .
-        ACE_Object_Manager (const ACE_Object_Manager &);
-        ACE_Object_Manager &operator= (const ACE_Object_Manager &);
-        </pre><p>
-
-        If the class is a template class, then the
-        <code>ACE_UNIMPLEMENTED_FUNC</code> macro should be used:
-
-        <pre>
-        // = Disallow copying...
-        ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS&lt;TYPE&gt; &))
-        ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS&lt;TYPE&gt; &))
+        ACE_Object_Manager (const ACE_Object_Manager &) = delete;
+        ACE_Object_Manager (ACE_Object_Manager &&) = delete;
+        ACE_Object_Manager &operator= (const ACE_Object_Manager &) = delete;
+        ACE_Object_Manager &operator= (ACE_Object_Manager &&) = delete;
         </pre><p>
 
-        <code>ACE_UNIMPLEMENTED_FUNC</code> can be used with non-template
-        classes as well.  Though for consistency and maximum safety, it
-        should be avoided for non-template classes.<p>
-
     <li>Never use <code>BOOL</code>, or similar types.
             (<code>ACE_CDR::Boolean</code> and
             <code>CORBA::Boolean</code> are acceptable).  Use the
@@ -1355,22 +1326,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
       is made then don't make it!<p>
 </ul>
 
-
-
 <hr>
-<h3><a href="http://www.cs.wustl.edu/~schmidt/rules.html">ACE
-  Design Rules</a></h3>
-
-
-<hr><p>
-  <font size=-1>
-<!-- hhmts start -->
-Last modified: Wed Nov 23 11:00:44 CST 2005
-<!-- hhmts end -->
-  </font><p>
-
-
-
 Back to <A HREF="index.html">ACE Documentation Home</A>.
 
 </body>
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index 5f1cb4a47cb..59ea20b7d04 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -92,81 +92,81 @@ Windows line feeds. For all other platforms download a .gz/.bz2 package.
 </P>
 
 <UL>
-<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 6.5.11 and TAO 2.5.11
-(ACE+TAO x.5.11), please use the links below to download it.<P>
+<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 6.5.12 and TAO 2.5.12
+(ACE+TAO x.5.12), please use the links below to download it.<P>
 
 <TABLE BORDER="4">
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
   <TR><TD>ACE+TAO.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE+TAO-6.5.11.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.11.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-6.5.12.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.12.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE+TAO-src-6.5.11.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.11.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-src-6.5.12.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.12.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE+TAO-6.5.11.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.11.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-6.5.12.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.12.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE+TAO-src-6.5.11.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.11.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-src-6.5.12.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.12.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE+TAO-6.5.11.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.11.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-6.5.12.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.12.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE+TAO-src-6.5.11.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.11.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-src-6.5.12.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.12.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-html-6.5.11.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.11.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-html-6.5.12.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.12.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-html-6.5.11.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.11.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-html-6.5.12.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.12.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-html-6.5.11.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.11.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-html-6.5.12.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.12.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-6.5.11.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.11.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-6.5.12.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.12.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-src-6.5.11.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.11.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-src-6.5.12.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.12.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-6.5.11.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.11.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-6.5.12.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.12.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-src-6.5.11.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.11.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-src-6.5.12.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.12.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-6.5.11.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.11.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-6.5.12.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.12.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_11/ACE-src-6.5.11.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.11.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-src-6.5.12.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.12.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
@@ -259,20 +259,20 @@ of the CIAO micro release is available for
   <TR><TH>Filename</TH><TH>Description</TH><TH>Sources only</TH></TR>
   <TR><TD>CIAO.tar.gz</TD>
       <TD>CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_9/CIAO-1_3_9-src.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_9-src.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_10/CIAO-1_3_10-src.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_10-src.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>CIAO.tar.bz2</TD>
       <TD>CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_9/CIAO-1_3_9-src.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_9-src.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_10/CIAO-1_3_10-src.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_10-src.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>CIAO.zip</TD>
       <TD>CIAO (zip format)</TD>
-      <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_9/CIAO-1_3_9-src.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_9-src.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_10/CIAO-1_3_10-src.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_10-src.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
@@ -286,20 +286,20 @@ of the DAnCE micro release is available for
   <TR><TH>Filename</TH><TH>Description</TH><TH>Sources only</TH></TR>
   <TR><TD>DAnCE.tar.gz</TD>
       <TD>DAnCE (tar+gzip format)</TD>
-      <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_9/DAnCE-1_3_9-src.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_9-src.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_10/DAnCE-1_3_10-src.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_10-src.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>DAnCE.tar.bz2</TD>
       <TD>DAnCE (tar+bzip2 format)</TD>
-      <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_9/DAnCE-1_3_9-src.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_9-src.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_10/DAnCE-1_3_10-src.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_10-src.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>DAnCE.zip</TD>
       <TD>DAnCE (zip format)</TD>
-      <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_9/DAnCE-1_3_9-src.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_9-src.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_10/DAnCE-1_3_10-src.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_10-src.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index 8b68b77a6bd..8ec83e50364 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -278,7 +278,7 @@
         rm -rf doxygen<br>
         mkdir doxygen<br>
         cd doxygen<br>
-        git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_5_11 ACE_TAO<br>
+        git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_5_12 ACE_TAO<br>
         cd ACE_TAO<br>
         export ACE_ROOT=$PWD/ACE<br>
         export TAO_ROOT=$PWD/TAO<br>
@@ -322,12 +322,12 @@
         scp bczar@download.dre.vanderbilt.edu:/export/www/download.dre/ACE+TAO-distribution/ACE-html.tar.bz2 .<br>
         bunzip2 ACE-html.tar.bz2;tar -xvf ACE-html.tar<br>
         cd ..<br>
-        mkdir 6.5.11<br>
-        cd 6.5.11<br>
+        mkdir 6.5.12<br>
+        cd 6.5.12<br>
         mv ../tmp/html .<br>
         cd ..<br>
         rm Micro<br>
-        ln -s 6.5.11/html Micro<br>
+        ln -s 6.5.12/html Micro<br>
         rm -rf tmp<br>
         </code>
 
@@ -382,6 +382,9 @@
         Make a new pull request to Microsoft vcpkg to update ACE to the new release, see https://github.com/Microsoft/vcpkg/tree/master/ports/ace
       </li>
       <li>
+        Make a new pull request to conda-forge to update ACE to the new release, see https://github.com/conda-forge/ace-feedstock/tree/master/recipe
+      </li>
+      <li>
         Make a new pull request to OpenDDS to update the configure script to use the new release, see https://github.com/objectcomputing/OpenDDS/blob/master/configure
       </li>
       <li>
diff --git a/ACE/docs/usage-bugzilla.html b/ACE/docs/usage-bugzilla.html
index 75b9d5fd070..e7f5876acfd 100644
--- a/ACE/docs/usage-bugzilla.html
+++ b/ACE/docs/usage-bugzilla.html
@@ -10,7 +10,7 @@
 
     <p>
       The
-      <a href="http://www.dre.vanderbilt.edu">
+      <a href="https://www.dre.vanderbilt.edu">
   Center for Distributed Object Computing</a> used the
       Bugzilla
       bug tracking system to keep track of existing problems and
@@ -21,9 +21,9 @@
       To streamline our development process, you can now use it to
       enter problem reports or make a request for a particular feature
       that you'd like to see integrated into
-      <a href="http://www.dre.vanderbilt.edu/ACE">ACE</a>,
-      <a href="http://www.dre.vanderbilt.edu/TAO">TAO</a> or <a
-      href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>.
+      <a href="https://www.dre.vanderbilt.edu/ACE">ACE</a>,
+      <a href="https://www.dre.vanderbilt.edu/TAO">TAO</a> or <a
+      href="https://www.dre.vanderbilt.edu/CIAO">CIAO</a>.
 
     <p>
       You can also use it to track the status of a particular bug or
diff --git a/ACE/etc/ace.doxygen b/ACE/etc/ace.doxygen
index df58ef05e92..81d97525be5 100644
--- a/ACE/etc/ace.doxygen
+++ b/ACE/etc/ace.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -849,8 +864,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.h \
                          *.cpp \
@@ -1226,9 +1243,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1334,7 +1351,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1496,6 +1513,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1516,8 +1544,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1545,7 +1579,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1587,7 +1621,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1784,9 +1818,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/ACE/etc/ace_inet.doxygen b/ACE/etc/ace_inet.doxygen
index a60a517e91a..4b5dc4548f4 100644
--- a/ACE/etc/ace_inet.doxygen
+++ b/ACE/etc/ace_inet.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/ACE/etc/ace_qos.doxygen b/ACE/etc/ace_qos.doxygen
index 5cf9d510a5a..47c4a5c0241 100644
--- a/ACE/etc/ace_qos.doxygen
+++ b/ACE/etc/ace_qos.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1216,9 +1233,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1324,7 +1341,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1486,6 +1503,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1506,8 +1534,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1535,7 +1569,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1577,7 +1611,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1774,9 +1808,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/ACE/etc/ace_rmcast.doxygen b/ACE/etc/ace_rmcast.doxygen
index 1f175053a83..7d704b863ad 100644
--- a/ACE/etc/ace_rmcast.doxygen
+++ b/ACE/etc/ace_rmcast.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/ACE/etc/ace_ssl.doxygen b/ACE/etc/ace_ssl.doxygen
index ed62812a216..b2a708ef97b 100644
--- a/ACE/etc/ace_ssl.doxygen
+++ b/ACE/etc/ace_ssl.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/ACE/etc/acexml.doxygen b/ACE/etc/acexml.doxygen
index d00405efd07..85aa5771c60 100644
--- a/ACE/etc/acexml.doxygen
+++ b/ACE/etc/acexml.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1216,9 +1233,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1324,7 +1341,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1486,6 +1503,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1506,8 +1534,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1535,7 +1569,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1577,7 +1611,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1774,9 +1808,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/ACE/etc/index.html b/ACE/etc/index.html
index 619fd7a7435..70feaa4caeb 100644
--- a/ACE/etc/index.html
+++ b/ACE/etc/index.html
@@ -30,6 +30,7 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
+      <LI><P><A HREF="6.5.12/html">6.5.12</A></P></LI>
       <LI><P><A HREF="6.5.11/html">6.5.11</A></P></LI>
       <LI><P><A HREF="6.5.10/html">6.5.10</A></P></LI>
       <LI><P><A HREF="6.5.9/html">6.5.9</A></P></LI>
diff --git a/ACE/examples/APG/Active_Objects/AO.cpp b/ACE/examples/APG/Active_Objects/AO.cpp
index 352075f1fca..857cb941725 100644
--- a/ACE/examples/APG/Active_Objects/AO.cpp
+++ b/ACE/examples/APG/Active_Objects/AO.cpp
@@ -92,11 +92,7 @@ public:
     while (1)
       {
         // Dequeue the next method object
-#if defined (ACE_HAS_CPP11)
         std::unique_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
-#else
-        auto_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
-#endif /* ACE_HAS_CPP11 */
 
         // Invoke the method request.
         if (request->call () == -1)
diff --git a/ACE/examples/APG/Active_Objects/AO2.cpp b/ACE/examples/APG/Active_Objects/AO2.cpp
index a0bc5594362..bd73fb10f7e 100644
--- a/ACE/examples/APG/Active_Objects/AO2.cpp
+++ b/ACE/examples/APG/Active_Objects/AO2.cpp
@@ -90,11 +90,7 @@ public:
     while (1)
       {
         // Dequeue the next method object
-#if defined (ACE_HAS_CPP11)
         std::unique_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
-#else
-        auto_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
-#endif /* ACE_HAS_CPP11 */
 
         // Invoke the method request.
         if (request->call () == -1)
diff --git a/ACE/examples/APG/Naming/Name_Binding.h b/ACE/examples/APG/Naming/Name_Binding.h
index a359600c634..0c21cde49e3 100644
--- a/ACE/examples/APG/Naming/Name_Binding.h
+++ b/ACE/examples/APG/Naming/Name_Binding.h
@@ -53,7 +53,7 @@ private:
   char *type_;
 };
 
-typedef auto_ptr<Name_Binding> Name_Binding_Ptr;
+typedef std::unique_ptr<Name_Binding> Name_Binding_Ptr;
 // Listing 1
 
 #endif /* NAME_BINDING_H */
diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp
index a36e5955393..f4d25a2e1dd 100644
--- a/ACE/examples/APG/Reactor/HAStatus.cpp
+++ b/ACE/examples/APG/Reactor/HAStatus.cpp
@@ -93,9 +93,9 @@ ClientAcceptor::open (const ACE_INET_Addr &listen_addr)
 int
 ClientAcceptor::handle_input (ACE_HANDLE)
 {
-  ClientService *client;
+  ClientService *client = 0;
   ACE_NEW_RETURN (client, ClientService, -1);
-  auto_ptr<ClientService> p (client);
+  std::unique_ptr<ClientService> p (client);
 
   if (this->acceptor_.accept (client->peer ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp b/ACE/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
index 8b2ac983310..1438c5e7148 100644
--- a/ACE/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
+++ b/ACE/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
@@ -2,7 +2,6 @@
 ** Copyright 2001 Addison Wesley. All Rights Reserved.
 */
 
-#include "ace/Auto_Ptr.h"
 #include "ace/FILE_IO.h"
 #include "ace/Log_Msg.h"
 #include "ace/Sched_Params.h"
@@ -13,6 +12,7 @@
 #include "Logging_Handler.h"
 
 #include <errno.h>
+#include <memory>
 
 namespace {
   extern "C" void sigterm_handler (int /* signum */) { /* No-op. */ }
@@ -59,7 +59,7 @@ RT_Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client)
 
 ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg)
 {
-  auto_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg));
+  std::unique_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg));
 
   thread_args->this_->handle_data (&thread_args->logging_peer_);
   thread_args->logging_peer_.close ();
@@ -70,7 +70,7 @@ ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg)
 int
 Thread_Per_Connection_Logging_Server::handle_connections ()
 {
-  auto_ptr<Thread_Args> thread_args (new Thread_Args (this));
+  std::unique_ptr<Thread_Args> thread_args (new Thread_Args (this));
 
   if (acceptor ().accept (thread_args->logging_peer_) == -1)
     return -1;
diff --git a/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp b/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
index d5d9196400c..6fc5d395049 100644
--- a/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
+++ b/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
@@ -2,7 +2,6 @@
 ** Copyright 2001 Addison Wesley. All Rights Reserved.
 */
 
-#include "ace/Auto_Ptr.h"
 #include "ace/FILE_IO.h"
 #include "ace/Log_Msg.h"
 #include "ace/Signal.h"
@@ -12,6 +11,7 @@
 #include "Logging_Handler.h"
 
 #include <errno.h>
+#include <memory>
 
 namespace {
   extern "C" void sigterm_handler (int /* signum */) { /* No-op. */ }
@@ -20,7 +20,7 @@ namespace {
 
 ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg)
 {
-  auto_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg));
+  std::unique_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg));
 
   thread_args->this_->handle_data (&thread_args->logging_peer_);
   thread_args->logging_peer_.close ();
@@ -31,7 +31,7 @@ ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg)
 int
 Thread_Per_Connection_Logging_Server::handle_connections ()
 {
-  auto_ptr<Thread_Args> thread_args (new Thread_Args (this));
+  std::unique_ptr<Thread_Args> thread_args (new Thread_Args (this));
 
   if (acceptor ().accept (thread_args->logging_peer_) == -1)
     return -1;
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl b/ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl
index c4c093570ce..aea2285cbb4 100755
--- a/ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/summarize.pl b/ACE/examples/IPC_SAP/SSL_SAP/summarize.pl
index c4c093570ce..aea2285cbb4 100755
--- a/ACE/examples/IPC_SAP/SSL_SAP/summarize.pl
+++ b/ACE/examples/IPC_SAP/SSL_SAP/summarize.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
 eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
     & eval 'exec perl -w -S $0 $argv:q'
     if 0;
diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
index 73374a72c5b..10b599142a9 100644
--- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -13,7 +13,6 @@
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Singleton.h"
 #include "ace/CDR_Stream.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Test_and_Set.h"
 
 // FUZZ: disable check_for_streams_include
@@ -23,6 +22,7 @@
 #include "ace/Test_and_Set.h"
 
 #include "server_loggerd.h"
+#include <memory>
 
 // ----------------------------------------
 
@@ -111,7 +111,7 @@ Logging_Handler::handle_input (ACE_HANDLE)
                   ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE),
                   -1);
 
-  auto_ptr <ACE_Message_Block> header (header_p);
+  std::unique_ptr <ACE_Message_Block> header (header_p);
 
   // Align the Message Block for a CDR stream
   ACE_CDR::mb_align (header.get ());
@@ -158,7 +158,7 @@ Logging_Handler::handle_input (ACE_HANDLE)
   ACE_NEW_RETURN (payload_p,
                   ACE_Message_Block (length),
                   -1);
-  auto_ptr <ACE_Message_Block> payload (payload_p);
+  std::unique_ptr <ACE_Message_Block> payload (payload_p);
 
   // Ensure there's sufficient room for log record payload.
   ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.cpp b/ACE/examples/Logger/simple-server/Logging_Handler.cpp
index b063bb4921f..a7776fcaf87 100644
--- a/ACE/examples/Logger/simple-server/Logging_Handler.cpp
+++ b/ACE/examples/Logger/simple-server/Logging_Handler.cpp
@@ -3,7 +3,7 @@
 #include "ace/Log_Record.h"
 #include "ace/OS_NS_string.h"
 #include "ace/CDR_Stream.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 #include "Logging_Handler.h"
 #include "Reactor_Singleton.h"
@@ -62,7 +62,7 @@ Logging_Handler::handle_input (ACE_HANDLE)
                   ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE),
                   -1);
 
-  auto_ptr <ACE_Message_Block> header (header_p);
+  std::unique_ptr <ACE_Message_Block> header (header_p);
 
   // Align the Message Block for a CDR stream
   ACE_CDR::mb_align (header.get ());
@@ -109,7 +109,7 @@ Logging_Handler::handle_input (ACE_HANDLE)
   ACE_NEW_RETURN (payload_p,
                   ACE_Message_Block (length),
                   -1);
-  auto_ptr <ACE_Message_Block> payload (payload_p);
+  std::unique_ptr <ACE_Message_Block> payload (payload_p);
 
   // Ensure there's sufficient room for log record payload.
   ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
diff --git a/ACE/examples/Reactor/Ntalker/README b/ACE/examples/Reactor/Ntalker/README
index 259ab1bc90c..191cef9256f 100644
--- a/ACE/examples/Reactor/Ntalker/README
+++ b/ACE/examples/Reactor/Ntalker/README
@@ -1,5 +1,3 @@
-
-
 This test program illustrates how the ACE datagram multicast feature
 works.  To run the test simply do the following on multiple machines:
 
diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp
index 96504624420..b80071185cb 100644
--- a/ACE/examples/Threads/future1.cpp
+++ b/ACE/examples/Threads/future1.cpp
@@ -218,11 +218,7 @@ Scheduler::svc (void)
     {
       // Dequeue the next method object (we use an auto pointer in
       // case an exception is thrown in the <call>).
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-#else
-      auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-#endif /* ACE_HAS_CPP11 */
 
       ACE_DEBUG ((LM_DEBUG, "(%t) calling method object\n"));
       // Call it.
diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp
index d435a7f6318..20f66f10188 100644
--- a/ACE/examples/Threads/future2.cpp
+++ b/ACE/examples/Threads/future2.cpp
@@ -215,11 +215,7 @@ Scheduler::svc (void)
     {
       // Dequeue the next method object (we use an auto pointer in
       // case an exception is thrown in the <call>).
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-#else
-      auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-#endif /* ACE_HAS_CPP11 */
 
       ACE_DEBUG ((LM_DEBUG, " (%t) calling method object\n"));
       // Call it.
@@ -273,11 +269,7 @@ Scheduler::name (void)
         {
           // This scheduler is inactive... so we execute the user
           // request right away...
-#if defined (ACE_HAS_CPP11)
           std::unique_ptr<ACE_Method_Request> mo (new Method_Request_name (this, new_future));
-#else
-          auto_ptr<ACE_Method_Request> mo (new Method_Request_name (this, new_future));
-#endif /* ACE_HAS_CPP11 */
 
           mo->call ();
           // Smart pointer destructor automatically deletes mo.
@@ -302,13 +294,8 @@ Scheduler::work (u_long newparam, int newcount)
 
       if (this->thr_count () == 0)
         {
-#if defined (ACE_HAS_CPP11)
           std::unique_ptr<ACE_Method_Request> mo
             (new Method_Request_work (this, newparam, newcount, new_future));
-#else
-          auto_ptr<ACE_Method_Request> mo
-            (new Method_Request_work (this, newparam, newcount, new_future));
-#endif /* ACE_HAS_CPP11 */
           mo->call ();
           // Smart pointer destructor automatically deletes it.
         }
diff --git a/ACE/html/Stats/img.html b/ACE/html/Stats/img.html
index d04159d461f..75490f101b7 100644
--- a/ACE/html/Stats/img.html
+++ b/ACE/html/Stats/img.html
@@ -2,7 +2,7 @@
  <CENTER>
 <TABLE cellpadding=10 cellspacing=10 border=10>
   <TD>
-  <A HREF="http://www.dre.vanderbilt.edu/ACE">
+  <A HREF="https://www.dre.vanderbilt.edu/ACE">
   <IMG SRC="/image/ACE.jpg"  width="150" height="125"></A>
   </TD>
 
@@ -15,7 +15,7 @@
   <IMG SRC="https://www.remedy.nl/assets/img/logo_large.png" width="164" height="106"></A>
   </TD>
   <TD>
-  <A HREF="http://www.dre.vanderbilt.edu/TAO">
+  <A HREF="https://www.dre.vanderbilt.edu/TAO">
   <IMG SRC="/image/TAO.jpg" width="150" height="125"></A>
   </TD>
 </TABLE>
diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU
index 96cb57ddc2a..b89b32297cf 100644
--- a/ACE/include/makeinclude/platform_clang_common.GNU
+++ b/ACE/include/makeinclude/platform_clang_common.GNU
@@ -70,7 +70,7 @@ gcc_template_instantiation_visibility ?= 0
 # Only modify LDFLAGS if DLD has been set.
 ifneq ($(DLD),)
   ifeq ($(DLD),$(CXX_FOR_VERSION_TEST)) # only try this is we are using ld through gcc
-    LD_FOR_VERSION_TEST = $(shell $(CXX_FOR_VERSION_TEST) -print-prog-name=ld)
+    LD_FOR_VERSION_TEST = $(subst \,/,$(shell $(CXX_FOR_VERSION_TEST) -print-prog-name=ld))
   else
     LD_FOR_VERSION_TEST = $(DLD)
   endif # DLD = CXX_FOR_VERSION_TEST
@@ -86,13 +86,9 @@ ifeq ($(no_strict_aliasing), 1)
   CCFLAGS += -fno-strict-aliasing
 endif
 
-ifeq ($(c++0x),1)
-  CCFLAGS += -std=c++0x
-else
-  ifeq ($(c++11),1)
-    CCFLAGS += -std=c++11
-  endif # c++11
-endif # c++0x
+ifeq ($(c++11),1)
+  CCFLAGS += -std=c++11
+endif # c++11
 
 ifeq ($(shared_libs), 1)
   ifneq ($(static_libs_only), 1)
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index 4a455c67996..6afda33beab 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -52,36 +52,6 @@ ifeq ($(gprof),1)
   LDFLAGS += -pg
 endif
 
-ifeq ($(c++17),1)
-  CCFLAGS += -std=c++17
-  # This is needed due to the use of the deprecated auto_ptr class
-  no_deprecated ?= 1
-else
-  ifeq ($(c++14),1)
-    CCFLAGS += -std=c++14
-    # This is needed due to the use of the deprecated auto_ptr class
-    no_deprecated ?= 1
-  else
-    ifeq ($(c++1y),1)
-      CCFLAGS += -std=c++1y
-      # This is needed due to the use of the deprecated auto_ptr class
-      no_deprecated ?= 1
-    else
-      ifeq ($(c++11),1)
-        CCFLAGS += -std=c++11
-        # This is needed due to the use of the deprecated auto_ptr class
-        no_deprecated ?= 1
-      else
-        ifeq ($(c++0x),1)
-          CCFLAGS += -std=c++0x
-          # This is needed due to the use of the deprecated auto_ptr class
-          no_deprecated ?= 1
-        endif # c++0x
-      endif # c++11
-    endif # c++1y
-  endif # c++14
-endif #c++17
-
 ifeq ($(no_deprecated),1)
   CCFLAGS += -Wno-deprecated
 endif
@@ -110,12 +80,28 @@ CXX_MINOR_VERSION := $(word 2,$(subst ., ,$(CXX_VERSION)))
 else
 CXX_MINOR_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/^[0-9]*\.//' | sed -e 's/\..*$$//')
 endif
-ifeq ($(findstring $(CXX_MAJOR_VERSION),1 2 3),$(CXX_MAJOR_VERSION))
-GXX_4_OR_BETTER := 0
-else
-GXX_4_OR_BETTER := 1
+
+# gcc 4 has C++03 as default C++ version, enable this to be C++11
+ifeq ($(findstring $(CXX_MAJOR_VERSION),4),$(CXX_MAJOR_VERSION))
+  c++11 ?= 1
 endif
 
+ifeq ($(c++20),1)
+  CCFLAGS += -std=c++20
+else
+  ifeq ($(c++17),1)
+    CCFLAGS += -std=c++17
+  else
+    ifeq ($(c++14),1)
+      CCFLAGS += -std=c++14
+    else
+      ifeq ($(c++11),1)
+        CCFLAGS += -std=c++11
+      endif # c++11
+    endif # c++14
+  endif #c++17
+endif #c++20
+
 # If no option has been specified, set templates to automatic
 # version of the compiler.
 #
@@ -178,10 +164,8 @@ else
     # for GCC >= 4.2; these checks and the resulting warnings are very controversial and
     # popular opinion on the web seems to be that it brings little practical value and a
     # lot of pain to attempt to solve code issues and the best way to deal is to suppress
-    ifeq ($(GXX_4_OR_BETTER), 1)
-      ifneq ($(findstring $(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION),4.1),$(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION))
-        FLAGS_C_CC += -fno-strict-aliasing
-      endif
+    ifneq ($(findstring $(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION),4.1),$(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION))
+      FLAGS_C_CC += -fno-strict-aliasing
     endif
   endif
 endif
@@ -209,33 +193,27 @@ ifeq ($(shared_libs), 1)
       endif # LD_EXPORT_DEFINED = 1
     endif # GNU ld
 
-    # Take advantage of G++ (>= 4.x) visibility attributes to generate
+    # Take advantage of g++ visibility attributes to generate
     # improved shared library binaries.
-    ifeq ($(GXX_4_OR_BETTER), 1)
-      ifneq ($(no_hidden_visibility),1)
-        CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-        ifeq ($(gcc_template_instantiation_visibility),1)
-          CCFLAGS += -DACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS=1
-        endif # gcc_template_instantiation_visibility
-      else
-        CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
-      endif # no_hidden_visibility
-    endif # GXX_4_OR_BETTER == 1
+    ifneq ($(no_hidden_visibility),1)
+      CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+      ifeq ($(gcc_template_instantiation_visibility),1)
+        CCFLAGS += -DACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS=1
+      endif # gcc_template_instantiation_visibility
+    else
+      CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+    endif # no_hidden_visibility
   else
-    # Explicitly disable G++ (>= 4.x) visibility attributes since
+    # Explicitly disable g++ visibility attributes since
     # they are only meant for use when building shared libraries.
-    ifeq ($(GXX_4_OR_BETTER), 1)
-      no_hidden_visibility = 1
-      CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
-    endif # GXX_4_OR_BETTER == 1
+    no_hidden_visibility = 1
+    CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
   endif # static_libs_only
 else
-  # Explicitly disable G++ (>= 4.x) visibility attributes since
+  # Explicitly disable g++ visibility attributes since
   # they are only meant for use when building shared libraries.
-  ifeq ($(GXX_4_OR_BETTER), 1)
-    no_hidden_visibility = 1
-    CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
-  endif # GXX_4_OR_BETTER == 1
+  no_hidden_visibility = 1
+  CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
 endif # shared_libs
 
 minimaltoc ?= 0
diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU
index 49905b45c98..5a6dbea96ff 100644
--- a/ACE/include/makeinclude/platform_hpux_aCC.GNU
+++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU
@@ -206,7 +206,7 @@ ifeq ($(64bitoffsets),1)
   endif
 endif
 
-ifeq ($(c++0x),1)
+ifeq ($(c++11),1)
   CCFLAGS += -Ax
 endif
 
diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU
index facabe30b10..f5d4da11398 100644
--- a/ACE/include/makeinclude/platform_linux_clang.GNU
+++ b/ACE/include/makeinclude/platform_linux_clang.GNU
@@ -10,7 +10,18 @@ ifeq ($(insure),0)
 endif
 
 ifndef CXX_VERSION
-  CXX_VERSION := $(shell $(CXX) --version)
+  CXX_VERSION := $(shell $(CXX) -dumpversion)
+endif
+ifeq (cmd,$(findstring cmd,$(SHELL)))
+CXX_MAJOR_VERSION := $(firstword $(subst ., ,$(CXX_VERSION)))
+else
+CXX_MAJOR_VERSION := $(shell $(CXX) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//')
+endif
+
+# clang5 has C++03 as default C++ version, enable this to be C++11
+# the older clang versions all return 4.2.1 as part of dumpversion
+ifeq ($(findstring $(CXX_MAJOR_VERSION),4),$(CXX_MAJOR_VERSION))
+  c++11 ?= 1
 endif
 
 CCFLAGS += $(CFLAGS)
@@ -30,14 +41,8 @@ ifeq ($(optimize),0)
   CPPFLAGS += -O0
 endif
 
-ifeq ($(c++0x),1)
-  CCFLAGS += -std=c++0x
-  no_deprecated ?= 1
-else
-  ifeq ($(c++11),1)
-    CCFLAGS += -std=c++11
-    no_deprecated ?= 1
-  endif
+ifeq ($(c++11),1)
+  CCFLAGS += -std=c++11
 endif
 
 ifeq ($(no_deprecated),1)
diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU
index 25df9607f40..ee8f728b21e 100644
--- a/ACE/include/makeinclude/platform_linux_icc.GNU
+++ b/ACE/include/makeinclude/platform_linux_icc.GNU
@@ -56,12 +56,6 @@ ifeq ($(ipo),1)
   CPPFLAGS += -ipo
 endif
 
-ifeq ($(c++0x),1)
-  CCFLAGS += -std=c++0x
-  # This is needed due to the use of the deprecated auto_ptr class
-  CCFLAGS += -Wno-deprecated
-endif
-
 ifeq ($(c++11),1)
   CCFLAGS += -std=c++11
   # This is needed due to the use of the deprecated auto_ptr class
diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU
index f318adace60..697967fd794 100644
--- a/ACE/include/makeinclude/platform_macosx.GNU
+++ b/ACE/include/makeinclude/platform_macosx.GNU
@@ -20,7 +20,9 @@ MACOS_CODENAME_VER_10_11  := elcapitan
 MACOS_CODENAME_VER_10_12  := sierra
 MACOS_CODENAME_VER_10_13  := highsierra
 MACOS_CODENAME_VER_10_14  := mojave
-MACOS_CODENAME_VER_latest := mojave
+MACOS_CODENAME_VER_10_latest := mojave
+MACOS_CODENAME_VER_11_0   := bigsur
+MACOS_CODENAME_VER_11_latest := bigsur
 
 MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION))
 
@@ -28,15 +30,20 @@ ifeq ($(MACOS_MAJOR_VERSION),10)
   ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 14; echo $$?),0)
     ## if the detected version is greater than the latest know version,
     ## just use the latest known version
-    MACOS_CODENAME = $(MACOS_CODENAME_VER_latest)
+    MACOS_CODENAME = $(MACOS_CODENAME_VER_10_latest)
   else ifeq ($(shell test $(MACOS_MINOR_VERSION) -lt 2; echo $$?),0)
     ## Unsupported minor version
     $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION))
   endif
+else ifeq ($(MACOS_MAJOR_VERSION),11)
+  ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 0; echo $$?),0)
+    ## if the detected version is greater than the latest know version,
+    ## just use the latest known version
+    MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest)
+  endif
 else
   ## Unsupported major version
   $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION))
 endif
 
 include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU
-
diff --git a/ACE/include/makeinclude/platform_macosx_bigsur.GNU b/ACE/include/makeinclude/platform_macosx_bigsur.GNU
new file mode 100644
index 00000000000..c8e8ef86ea5
--- /dev/null
+++ b/ACE/include/makeinclude/platform_macosx_bigsur.GNU
@@ -0,0 +1,2 @@
+include $(ACE_ROOT)/include/makeinclude/platform_macosx_mojave.GNU
+
diff --git a/ACE/include/makeinclude/platform_mingw32.GNU b/ACE/include/makeinclude/platform_mingw32.GNU
index 04b0eff8185..48f08d724e2 100644
--- a/ACE/include/makeinclude/platform_mingw32.GNU
+++ b/ACE/include/makeinclude/platform_mingw32.GNU
@@ -34,12 +34,4 @@ endif
 
 LIBS += -lwsock32 -lnetapi32
 
-ifeq ($(GXX_4_OR_BETTER),1)
-  ifeq ($(CXX_MAJOR_VERSION),4)
-    ifeq ($(findstring $(CXX_MINOR_VERSION),7 8 9),$(CXX_MINOR_VERSION))
-      CPPFLAGS += -Wno-unknown-pragmas
-    endif
-  else
-    CPPFLAGS += -Wno-unknown-pragmas
-  endif
-endif
+CPPFLAGS += -Wno-unknown-pragmas
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index 8627695fccd..0966a023d0e 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -315,7 +315,7 @@ endif # ! COMPSPEC
 
 ifdef COMSPEC
   #### Assume we're on a WIN32 host.
-  ACE_NUL = nul
+  ACE_NUL = $(if $(findstring /bin/sh,$(SHELL)),/dev/null,nul)
 else  # ! WIN32
   ACE_NUL = /dev/null
 endif # ! WIN32
@@ -704,6 +704,12 @@ valgrind ?=
 ifeq ($(valgrind),1)
   CPPFLAGS += -DACE_HAS_VALGRIND
 endif
+# Does the valgrind version support --keep-debug-info, if not
+# we disable dlclose in ACE to get complete callstacks
+valgrind_keep_debuginfo ?=
+ifeq ($(valgrind_keep_debuginfo),0)
+  CPPFLAGS += -DACE_LACKS_DLCLOSE
+endif
 
 profile ?=
 ifeq ($(profile),0)
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
index 20ff879b484..bbbb141a8bc 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
@@ -109,11 +109,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
                   ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE),
                   -1);
 
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr <ACE_Message_Block> header (header_p);
-#else
-  auto_ptr <ACE_Message_Block> header (header_p);
-#endif /* ACE_HAS_CPP11 */
 
   // Align the Message Block for a CDR stream
   ACE_CDR::mb_align (header.get ());
@@ -221,11 +217,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
   ACE_NEW_RETURN (payload_p,
                   ACE_Message_Block (length),
                   -1);
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr <ACE_Message_Block> payload (payload_p);
-#else
-  auto_ptr <ACE_Message_Block> payload (payload_p);
-#endif /* ACE_HAS_CPP11 */
 
   // Ensure there's sufficient room for log record payload.
   ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
index 5bc40c5ae3a..ab985a40324 100644
--- a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -65,11 +65,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
                   ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE),
                   -1);
 
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr <ACE_Message_Block> header (header_p);
-#else
-  auto_ptr <ACE_Message_Block> header (header_p);
-#endif /* ACE_HAS_CPP11 */
 
   // Align the Message Block for a CDR stream
   ACE_CDR::mb_align (header.get ());
@@ -126,11 +122,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
   ACE_NEW_RETURN (payload_p,
                   ACE_Message_Block (length),
                   -1);
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr <ACE_Message_Block> payload (payload_p);
-#else
-  auto_ptr <ACE_Message_Block> payload (payload_p);
-#endif /* ACE_HAS_CPP11 */
 
   // Ensure there's sufficient room for log record payload.
   ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
diff --git a/ACE/netsvcs/lib/Time_Request_Reply.h b/ACE/netsvcs/lib/Time_Request_Reply.h
index 227d2d8cd73..44be414b744 100644
--- a/ACE/netsvcs/lib/Time_Request_Reply.h
+++ b/ACE/netsvcs/lib/Time_Request_Reply.h
@@ -90,7 +90,7 @@ public:
   int decode (void);
 
   /// Print out the values of the message for debugging purposes.
-  void dump (void) const;
+  void dump () const;
 
 private:
   // = The 5 fields in the <Transfer> struct are transmitted to the server.
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.h b/ACE/protocols/ace/HTBP/HTBP_Channel.h
index 87f2dd7785a..d473bd58e66 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h
@@ -174,7 +174,7 @@ namespace ACE
       typedef ACE_INET_Addr PEER_ADDR;
 
       /// Dump the state of an object.
-      void dump (void) const;
+      void dump () const;
 
       /// Declare the dynamic allocation hooks.
       ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.h b/ACE/protocols/ace/HTBP/HTBP_Stream.h
index 3adc185ab42..5289e2577c5 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Stream.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Stream.h
@@ -227,7 +227,7 @@ namespace ACE
       typedef Addr PEER_ADDR;
 
       /// Dump the state of an object.
-      void dump (void) const;
+      void dump () const;
 
       /// Declare the dynamic allocation hooks.
       ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 28ed7c4ca4f..016f775e646 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  6.5.11
-%define TAOVER  2.5.11
+%define ACEVER  6.5.12
+%define TAOVER  2.5.12
 
 # Conditional build
 # Default values are
@@ -949,7 +949,6 @@ EOF
 
 cat > $ACE_ROOT/bin/MakeProjectCreator/config/default.features <<EOF
 ssl=1
-cidl=0
 EOF
 
 %if %{?_with_bzip2:1}%{!?_with_bzip2:0}
diff --git a/ACE/tests/ACE_Test.cpp b/ACE/tests/ACE_Test.cpp
index ade30523b91..95d55bdd56a 100644
--- a/ACE/tests/ACE_Test.cpp
+++ b/ACE/tests/ACE_Test.cpp
@@ -18,7 +18,7 @@
 #include "ace/OS_NS_stdlib.h"
 
 int
-log2_test (void)
+log2_test ()
 {
   u_long values[] = {1, 2, 4, 8, 1048576};
   u_long results[] = {0, 1, 2, 3, 20};
@@ -39,7 +39,7 @@ log2_test (void)
 }
 
 int
-ace_debug_test (void)
+ace_debug_test ()
 {
   int test_status = 0;
 
@@ -62,7 +62,7 @@ ace_debug_test (void)
 
 // Test ACE::execname to be sure it finds .exe without regard to case.
 int
-execname_test (void)
+execname_test ()
 {
   int error_count = 0;
 
diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp
index 59d72dab714..4f6f90e25cf 100644
--- a/ACE/tests/ARGV_Test.cpp
+++ b/ACE/tests/ARGV_Test.cpp
@@ -64,7 +64,7 @@ test_simple_argv (ACE_TCHAR *argv[])
 }
 
 static int
-test_argv_type_converter (void)
+test_argv_type_converter ()
 {
   char *argv[20];
   argv[0] = ACE_OS::strdup ("one");
@@ -108,7 +108,7 @@ test_argv_type_converter (void)
 }
 
 static int
-test_argv_type_converter2 (void)
+test_argv_type_converter2 ()
 {
   ACE_TCHAR *argv[20];
   argv[0] = ACE_OS::strdup (ACE_TEXT ("one"));
@@ -145,7 +145,7 @@ test_argv_type_converter2 (void)
 }
 
 static int
-test_argv_buf (void)
+test_argv_buf ()
 {
   pid_t parent_pid = ACE_OS::getpid ();
 
@@ -178,7 +178,7 @@ test_argv_buf (void)
 }
 
 static int
-test_argv_quotes (void)
+test_argv_quotes ()
 {
   const ACE_TCHAR *argv_const[] = { ACE_TEXT ("first without quotes"),
                                     ACE_TEXT ("'second in single quotes'"),
diff --git a/ACE/tests/Aio_Platform_Test.cpp b/ACE/tests/Aio_Platform_Test.cpp
index 077cc6f74fa..96f71dd66d2 100644
--- a/ACE/tests/Aio_Platform_Test.cpp
+++ b/ACE/tests/Aio_Platform_Test.cpp
@@ -18,7 +18,7 @@
 #include "ace/OS_NS_unistd.h"
 
 #if defined (_POSIX_ASYNCHRONOUS_IO)
-static int do_sysconf (void)
+static int do_sysconf ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Doing <sysconf> calls to know the run-time values of POSIX feature limits\n"));
@@ -101,7 +101,7 @@ static int do_sysconf (void)
 #endif /* _POSIX_ASYNCHRONOUS_IO */
 
 static int
-have_asynchio (void)
+have_asynchio ()
 {
 #if defined (_POSIX_ASYNCHRONOUS_IO)
 #if defined (_POSIX_ASYNC_IO)
diff --git a/ACE/tests/Array_Map_Test.cpp b/ACE/tests/Array_Map_Test.cpp
index 3a37624ce85..2e48f16b4d4 100644
--- a/ACE/tests/Array_Map_Test.cpp
+++ b/ACE/tests/Array_Map_Test.cpp
@@ -40,10 +40,10 @@ static size_t const words_len   = sizeof (words)   / sizeof (words[0]);
 // --------------------------------------------------------------
 
 bool
-insertion_removal_test (void)
+insertion_removal_test ()
 {
   // Instantiate the map.
-  typedef ACE_Array_Map<char, ACE_TString> Map;
+  using Map = ACE_Array_Map<char, ACE_TString>;
   Map phonetic[2];
 
   ACE_TEST_ASSERT (phonetic[0] == phonetic[1]);  // Sanity check.
@@ -220,10 +220,10 @@ insertion_removal_test (void)
 // --------------------------------------------------------------
 
 bool
-index_operator_test (void)
+index_operator_test ()
 {
   // Instantiate the map.
-  typedef ACE_Array_Map<char, ACE_TString> Map;
+  using Map = ACE_Array_Map<char, ACE_TString>;
   Map phonetic;
 
   ACE_TEST_ASSERT (phonetic.size () == 0 && phonetic.is_empty ());
@@ -250,7 +250,7 @@ index_operator_test (void)
 
       ACE_TEST_ASSERT (phonetic.size () == letters_len);
 
-      typedef Map::const_iterator         const_iterator;
+      using const_iterator = Map::const_iterator;
 
       // Access the elements that were inserted into the map.
       char const * letter = letters;
@@ -281,7 +281,7 @@ index_operator_test (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("... in reverse ...\n")));
 
-      typedef Map::const_reverse_iterator const_reverse_iterator;
+      using const_reverse_iterator = Map::const_reverse_iterator;
 
       letter = letters + letters_len - 1;
       word = words + words_len - 1;
@@ -337,7 +337,7 @@ class RefCounted
 {
 public:
 
-  RefCounted (void)
+  RefCounted ()
     : refcount_ (0)
   {
   }
@@ -347,7 +347,7 @@ public:
   {
   }
 
-  ~RefCounted (void)
+  ~RefCounted ()
   {
     if (this->refcount_)
       --(*this->refcount_);
@@ -370,13 +370,13 @@ public:
   }
 
   unsigned int *
-  refcount_ptr (void) const
+  refcount_ptr () const
   {
     return this->refcount_;
   }
 
   unsigned int
-  refcount (void) const
+  refcount () const
   {
     return *this->refcount_;
   }
@@ -390,9 +390,9 @@ private:
 // --------
 
 bool
-reference_count_test (void)
+reference_count_test ()
 {
-  typedef ACE_Array_Map<ACE_TString, RefCounted> Map;
+  using Map = ACE_Array_Map<ACE_TString, RefCounted>;
 
   static Map::size_type const CAPACITY = 30;
 
diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp
index de6fbc3c938..d48ef7aa9ff 100644
--- a/ACE/tests/Atomic_Op_Test.cpp
+++ b/ACE/tests/Atomic_Op_Test.cpp
@@ -34,11 +34,11 @@ class Exchange_Tester : public ACE_Task<ACE_NULL_SYNCH>
 {
 public:
   Exchange_Tester (unsigned int thr_count);
-  int result (void) const;
+  int result () const;
 
 private:
   Exchange_Tester () {}
-  int svc (void);
+  int svc () override;
 
   ACE_Barrier barrier_;
   ACE_Atomic_Op<ACE_SYNCH_MUTEX, T> op_;
@@ -55,14 +55,14 @@ Exchange_Tester<T>::Exchange_Tester (unsigned int thr_count)
 
 template <typename T>
 int
-Exchange_Tester<T>::result (void) const
+Exchange_Tester<T>::result () const
 {
   return this->claimed_ == 1 ? 0 : 1;
 }
 
 template <typename T>
 int
-Exchange_Tester<T>::svc (void)
+Exchange_Tester<T>::svc ()
 {
   this->barrier_.wait ();     // Want all threads to try to claim "at once"
   bool claimed = this->op_.exchange (1) == 0;
diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp
index 5f3b47f4348..e7449c740c0 100644
--- a/ACE/tests/Auto_Event_Test.cpp
+++ b/ACE/tests/Auto_Event_Test.cpp
@@ -53,7 +53,7 @@ static size_t test_timeout_count = 3;
 
 // Tests the amount of time spent in a timed wait.
 static int
-test_timeout (void)
+test_timeout ()
 {
   int status = 0;
 
@@ -105,7 +105,7 @@ test_timeout (void)
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-w n_workers] [-n iteration_count]\n")));
diff --git a/ACE/tests/Auto_IncDec_Test.cpp b/ACE/tests/Auto_IncDec_Test.cpp
index db61c42a77c..e075af5f713 100644
--- a/ACE/tests/Auto_IncDec_Test.cpp
+++ b/ACE/tests/Auto_IncDec_Test.cpp
@@ -24,7 +24,7 @@
 // Default number of threads.
 static size_t n_threads = 15;
 
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> INTERLOCKED_INT;
+using INTERLOCKED_INT = ACE_Atomic_Op<ACE_Thread_Mutex, int>;
 static INTERLOCKED_INT current_threads_in_first_section;
 static INTERLOCKED_INT current_threads_in_second_section;
 
diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp
index 7c8655ad8ba..93888ff3741 100644
--- a/ACE/tests/Based_Pointer_Test.cpp
+++ b/ACE/tests/Based_Pointer_Test.cpp
@@ -56,17 +56,16 @@ class Void_Pointer : public ACE_Based_Pointer<void>
 #endif /* ACE_WIN32 */
 
 // Declare the type of the DLL symbol:
-typedef void *(*Get_Bp_Repository_Inst)(void);
+using Get_Bp_Repository_Inst = void *(*)();
 
 // Declare an allocator based MMAP_Memory_Pool
-typedef ACE_Malloc_T< ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block
-                   > MMAP_Allocator;
+using MMAP_Allocator = ACE_Malloc_T<ACE_MMAP_Memory_Pool, ACE_Null_Mutex, ACE_PI_Control_Block>;
 
 
 // Check that the ACE_Based_Pointer_Repository can be accessed
 // from a Windows DLL
 // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1991)
-int singleton_test (void)
+int singleton_test ()
 {
     void* baddr1 = ACE_BASED_POINTER_REPOSITORY::instance();
     void* baddr2 = ACE_BASED_POINTER_REPOSITORY::instance();
@@ -148,7 +147,7 @@ int singleton_test (void)
 // Check that MMAP memory blocks are correctly mapped
 // into the Based_Pointer_Repository
 int
-mmap_map_test(void)
+mmap_map_test()
 {
     MMAP_Allocator* alloc = 0;
 
@@ -216,7 +215,7 @@ mmap_map_test(void)
 //  present in the filesystem)
 // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2216)
 int
-mmap_persistent_map_test(void)
+mmap_persistent_map_test()
 {
     MMAP_Allocator* alloc = 0;
 
@@ -283,7 +282,7 @@ mmap_persistent_map_test(void)
 // base address, in this case the Repository must be updated)
 // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2218)
 int
-mmap_remap_test(void)
+mmap_remap_test()
 {
     // Use a Position Independent memory segment
     // because this one is going to move
diff --git a/ACE/tests/Basic_Types_Test.cpp b/ACE/tests/Basic_Types_Test.cpp
index 1f312944ea0..b02e691577f 100644
--- a/ACE/tests/Basic_Types_Test.cpp
+++ b/ACE/tests/Basic_Types_Test.cpp
@@ -31,7 +31,7 @@
 #include "ace/Basic_Types.h"
 #include "ace/OS_NS_unistd.h"
 
-typedef void* (*a_function_pointer) (void*);
+using a_function_pointer = void *(*)(void *);
 
 static
 u_int
diff --git a/ACE/tests/Bound_Ptr_Test.cpp b/ACE/tests/Bound_Ptr_Test.cpp
index 9b663caafdb..a3eb060ebe5 100644
--- a/ACE/tests/Bound_Ptr_Test.cpp
+++ b/ACE/tests/Bound_Ptr_Test.cpp
@@ -26,10 +26,10 @@
 
 struct Child_Base
 {
-  virtual ~Child_Base (void);
+  virtual ~Child_Base ();
 
   // Perform some operation.
-  virtual void do_something (void) = 0;
+  virtual void do_something () = 0;
 };
 
 
@@ -37,8 +37,8 @@ struct Child_Base
 // abstract class, and the implementation would be elsewhere.
 struct Parent
 {
-  Parent (void);
-  ~Parent (void);
+  Parent ();
+  ~Parent ();
 
   // Weak pointer to this object used to hand out new references. Must be
   // weak since it can't own itself!
@@ -49,7 +49,7 @@ struct Parent
   ACE_Strong_Bound_Ptr<Child_Base, ACE_Null_Mutex> child_;
 
   // Called by the child to perform some operation.
-  void do_something (void);
+  void do_something ();
 
   static size_t instance_count_;
 };
@@ -59,26 +59,26 @@ struct Parent
 struct Child : public Child_Base
 {
   Child (ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent);
-  virtual ~Child (void);
+  ~Child () override;
 
   // Back pointer to the parent. The child does not own the parent so has no
   // effect on its lifetime.
   ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent_;
 
   // Perform some operation. Delegates the work to the parent.
-  virtual void do_something (void);
+  void do_something () override;
 
   static size_t instance_count_;
 };
 
-Child_Base::~Child_Base (void)
+Child_Base::~Child_Base ()
 {
 }
 
 
 size_t Parent::instance_count_ = 0;
 
-Parent::Parent (void)
+Parent::Parent ()
   : weak_self_(this),
     child_(new Child(weak_self_))
 {
@@ -87,14 +87,14 @@ Parent::Parent (void)
   ++Parent::instance_count_;
 }
 
-Parent::~Parent (void)
+Parent::~Parent ()
 {
   --Parent::instance_count_;
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Deleting Parent object\n")));
 }
 
-void Parent::do_something (void)
+void Parent::do_something ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Parent doing something\n")));
@@ -110,14 +110,14 @@ Child::Child (ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent)
   ++Child::instance_count_;
 }
 
-Child::~Child (void)
+Child::~Child ()
 {
   --Child::instance_count_;
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Deleting Child object\n")));
 }
 
-void Child::do_something (void)
+void Child::do_something ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Child doing something\n")));
@@ -152,7 +152,7 @@ Printer::Printer (const char *message)
   ++Printer::instance_count_;
 }
 
-Printer::~Printer (void)
+Printer::~Printer ()
 {
   --Printer::instance_count_;
   ACE_DEBUG ((LM_DEBUG,
@@ -160,7 +160,7 @@ Printer::~Printer (void)
 }
 
 void
-Printer::print (void)
+Printer::print ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) %C\n"),
@@ -178,10 +178,10 @@ class Method_Request_print : public ACE_Method_Request
 {
 public:
   explicit Method_Request_print (Printer_var &printer);
-  virtual ~Method_Request_print (void);
+  ~Method_Request_print () override;
 
   /// This is the entry point into the Active Object method.
-  virtual int call (void);
+  int call () override;
 
 private:
   Printer_var printer_;
@@ -194,14 +194,14 @@ Method_Request_print::Method_Request_print (Printer_var &printer)
               ACE_TEXT ("(%t) Method_Request_print created\n")));
 }
 
-Method_Request_print::~Method_Request_print (void)
+Method_Request_print::~Method_Request_print ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Method_Request_print will be deleted.\n")));
 }
 
 int
-Method_Request_print::call (void)
+Method_Request_print::call ()
 {
   // Dispatch the Servant's operation and store the result into the
   // Future.
@@ -221,8 +221,8 @@ class Method_Request_end : public ACE_Method_Request
 {
 public:
   Method_Request_end (Scheduler *new_Prime_Scheduler);
-  virtual ~Method_Request_end (void);
-  virtual int call (void);
+  ~Method_Request_end () override;
+  int call () override;
 
 private:
   Scheduler *scheduler_;
@@ -233,12 +233,12 @@ Method_Request_end::Method_Request_end (Scheduler *scheduler)
 {
 }
 
-Method_Request_end::~Method_Request_end (void)
+Method_Request_end::~Method_Request_end ()
 {
 }
 
 int
-Method_Request_end::call (void)
+Method_Request_end::call ()
 {
   // Shut down the scheduler by deactivating the activation queue's
   // underlying message queue - should pop all worker threads off their
@@ -251,7 +251,7 @@ Method_Request_end::call (void)
 // Associates the activation queue with this task's message queue,
 // allowing easy access to the message queue for shutting it down
 // when it's time to stop this object's service threads.
-Scheduler::Scheduler (void)
+Scheduler::Scheduler ()
   : activation_queue_ (msg_queue ())
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -260,7 +260,7 @@ Scheduler::Scheduler (void)
 
 // Destructor
 
-Scheduler::~Scheduler (void)
+Scheduler::~Scheduler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Scheduler will be destroyed\n")));
@@ -290,7 +290,7 @@ Scheduler::close (u_long)
 // Service..
 
 int
-Scheduler::svc (void)
+Scheduler::svc ()
 {
   for (;;)
     {
@@ -317,7 +317,7 @@ Scheduler::svc (void)
 }
 
 void
-Scheduler::end (void)
+Scheduler::end ()
 {
   this->activation_queue_.enqueue (new Method_Request_end (this));
 }
@@ -459,13 +459,7 @@ run_main (int, ACE_TCHAR *[])
                     Printer ("I am printer 2"),
                     -1);
 
-#if !defined (ACE_HAS_CPP11)
-    // Ownership is transferred from the auto_ptr to the strong pointer.
-    auto_ptr<Printer> a (printer2);
-    Printer_var r (a);
-#else
     Printer_var r (printer2);
-#endif /* !ACE_HAS_CPP11 */
 
     for (int i = 0; i < n_loops; i++)
       // Spawn off the methods, which run in a separate thread as
diff --git a/ACE/tests/Buffer_Stream_Test.cpp b/ACE/tests/Buffer_Stream_Test.cpp
index 5f543167bd6..254a60aa11d 100644
--- a/ACE/tests/Buffer_Stream_Test.cpp
+++ b/ACE/tests/Buffer_Stream_Test.cpp
@@ -28,9 +28,9 @@
 
 static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
 
-typedef ACE_Stream<ACE_MT_SYNCH> MT_Stream;
-typedef ACE_Module<ACE_MT_SYNCH> MT_Module;
-typedef ACE_Task<ACE_MT_SYNCH> MT_Task;
+using MT_Stream = ACE_Stream<ACE_MT_SYNCH>;
+using MT_Module = ACE_Module<ACE_MT_SYNCH>;
+using MT_Task = ACE_Task<ACE_MT_SYNCH>;
 
 /**
  * @class Common_Task
@@ -40,13 +40,13 @@ typedef ACE_Task<ACE_MT_SYNCH> MT_Task;
 class Common_Task : public MT_Task
 {
 public:
-  Common_Task (void) {}
+  Common_Task () {}
 
   //FUZZ: disable check_for_lack_ACE_OS
   // = ACE_Task hooks.
   ///FUZZ: enable check_for_lack_ACE_OS
-  virtual int open (void * = 0);
-  virtual int close (u_long = 0);
+  int open (void * = 0) override;
+  int close (u_long = 0) override;
 };
 
 /**
@@ -57,10 +57,10 @@ public:
 class Supplier : public Common_Task
 {
 public:
-  Supplier (void) {}
+  Supplier () {}
 
   /// Read data from stdin and pass to consumer.
-  virtual int svc (void);
+  int svc () override;
 };
 
 /**
@@ -71,14 +71,14 @@ public:
 class Consumer : public Common_Task
 {
 public:
-  Consumer (void) {}
+  Consumer () {}
 
   /// Enqueue the message on the ACE_Message_Queue for subsequent
   /// handling in the svc() method.
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
+  int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0) override;
 
   /// Receive message from Supplier and print to stdout.
-  virtual int svc (void);
+  int svc () override;
 private:
 
   /// Amount of time to wait for a timeout.
@@ -116,7 +116,7 @@ Common_Task::close (u_long exit_status)
 // know when to exit.
 
 int
-Supplier::svc (void)
+Supplier::svc ()
 {
   ACE_Message_Block *mb = 0;
 
@@ -161,7 +161,7 @@ Consumer::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 // reading and exit.
 
 int
-Consumer::svc (void)
+Consumer::svc ()
 {
   ACE_Message_Block *mb = 0;
   int result;
diff --git a/ACE/tests/Bug_1890_Regression_Test.cpp b/ACE/tests/Bug_1890_Regression_Test.cpp
index c49399f95d5..7445b5b819c 100644
--- a/ACE/tests/Bug_1890_Regression_Test.cpp
+++ b/ACE/tests/Bug_1890_Regression_Test.cpp
@@ -44,8 +44,8 @@ public:
     void send_dummy_data();
 
     /// Reactor callback
-    virtual ACE_HANDLE get_handle() const;
-    virtual int handle_input(ACE_HANDLE);
+    ACE_HANDLE get_handle() const override;
+    int handle_input(ACE_HANDLE) override;
 
 private:
     size_t handle_input_count_;
@@ -74,7 +74,7 @@ public:
 
     bool check_expected_results() const;
 
-    virtual int handle_timeout(ACE_Time_Value const &, void const*);
+    int handle_timeout(ACE_Time_Value const &, void const*) override;
 
 private:
     void send_data_through_handlers();
@@ -101,7 +101,7 @@ run_main (int, ACE_TCHAR *[])
   // regardless of platform.
   ACE_Select_Reactor *impl_ptr = 0;
   ACE_NEW_RETURN (impl_ptr, ACE_Select_Reactor, -1);
-  auto_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
+  std::unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
 
   ACE_Reactor reactor (impl_ptr);
 
diff --git a/ACE/tests/Bug_2368_Regression_Test.cpp b/ACE/tests/Bug_2368_Regression_Test.cpp
index 80479988006..0dbacfb4d07 100644
--- a/ACE/tests/Bug_2368_Regression_Test.cpp
+++ b/ACE/tests/Bug_2368_Regression_Test.cpp
@@ -19,8 +19,8 @@ static bool handleB_close_called = false;
 class My_HandlerA : public ACE_Event_Handler
 {
 public:
-  virtual int handle_close (ACE_HANDLE,
-                            ACE_Reactor_Mask)
+  int handle_close (ACE_HANDLE,
+                            ACE_Reactor_Mask) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Handle close called\n"));
@@ -29,9 +29,9 @@ public:
     return 0;
   }
 
-  virtual int handle_signal (int,
+  int handle_signal (int,
                              siginfo_t *,
-                             ucontext_t *)
+                             ucontext_t *) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Handle signal called\n"));
@@ -43,8 +43,8 @@ public:
 class My_HandlerB : public ACE_Event_Handler
 {
 public:
-  virtual int handle_close (ACE_HANDLE,
-                            ACE_Reactor_Mask)
+  int handle_close (ACE_HANDLE,
+                            ACE_Reactor_Mask) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Handle close called\n"));
@@ -53,9 +53,9 @@ public:
     return 0;
   }
 
-  virtual int handle_signal (int,
+  int handle_signal (int,
                              siginfo_t *,
-                             ucontext_t *)
+                             ucontext_t *) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Handle signal called\n"));
diff --git a/ACE/tests/Bug_2497_Regression_Test.cpp b/ACE/tests/Bug_2497_Regression_Test.cpp
index ebbf70afc34..b4f0e7a024e 100644
--- a/ACE/tests/Bug_2497_Regression_Test.cpp
+++ b/ACE/tests/Bug_2497_Regression_Test.cpp
@@ -15,12 +15,12 @@
 class Test_Task : public ACE_Task<ACE_SYNCH>
 {
 public:
-  Test_Task( void ) :
+  Test_Task( ) :
     _destructorCalled(0)
   {
   }
 
-  virtual ~Test_Task( void )
+  ~Test_Task( ) override
   {
     ++_destructorCalled;
     if (_destructorCalled > 1)
@@ -36,7 +36,7 @@ private:
 class Test_Module : public ACE_Module<ACE_SYNCH>
 {
 public:
-  Test_Module( void )
+  Test_Module( )
     {
       this->open( ACE_TEXT("Test module"),
                   &_writerTask,
diff --git a/ACE/tests/Bug_2540_Regression_Test.cpp b/ACE/tests/Bug_2540_Regression_Test.cpp
index d552fa453dc..6d624def926 100644
--- a/ACE/tests/Bug_2540_Regression_Test.cpp
+++ b/ACE/tests/Bug_2540_Regression_Test.cpp
@@ -47,8 +47,8 @@ public:
     void simulate_socket_closure();
 
     /// Reactor callback
-    virtual ACE_HANDLE get_handle() const;
-    virtual int handle_input(ACE_HANDLE);
+    ACE_HANDLE get_handle() const override;
+    int handle_input(ACE_HANDLE) override;
 
 private:
     bool auto_remove_flag_;
@@ -78,7 +78,7 @@ public:
 
     bool check_expected_results() const;
 
-    virtual int handle_timeout(ACE_Time_Value const &, void const*);
+    int handle_timeout(ACE_Time_Value const &, void const*) override;
 
 private:
     void send_data_through_handlers();
@@ -105,7 +105,7 @@ run_main (int, ACE_TCHAR *[])
   // happen with ACE_WFMO_Reactor.
   ACE_Select_Reactor *impl_ptr = 0;
   ACE_NEW_RETURN (impl_ptr, ACE_Select_Reactor, -1);
-  auto_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
+  std::unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
 
   ACE_Reactor reactor (impl_ptr);
 
diff --git a/ACE/tests/Bug_2609_Regression_Test.cpp b/ACE/tests/Bug_2609_Regression_Test.cpp
index a13de9874fb..dfdb8dc5884 100644
--- a/ACE/tests/Bug_2609_Regression_Test.cpp
+++ b/ACE/tests/Bug_2609_Regression_Test.cpp
@@ -29,7 +29,7 @@ ACE_Thread_Semaphore g_semaphore (0);
 class My_Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_NULL_SYNCH>
 {
 public:
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_NULL_SYNCH> super;
+  using super = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>;
   My_Svc_Handler()
   {
     TEST_TRACE ("My_Svc_Handler:My_Svc_Handler");
@@ -38,14 +38,14 @@ public:
       Reference_Counting_Policy::ENABLED);
   }
 
-  ~My_Svc_Handler()
+  ~My_Svc_Handler() override
   {
     TEST_TRACE ("My_Svc_Handler::~My_Svc_Handler");
     g_handler_deleted = true;
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  int open (void* pv)
+  int open (void* pv) override
   {
     TEST_TRACE ("open");
     g_semaphore.release (); // signal open completed
@@ -56,7 +56,7 @@ public:
   }
   //FUZZ: enable check_for_lack_ACE_OS
 
-  int handle_close (ACE_HANDLE, ACE_Reactor_Mask)
+  int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override
   {
     TEST_TRACE ("handle_close");
     if (g_handler_deleted)
@@ -72,7 +72,7 @@ public:
 
 struct My_Task : public ACE_Task_Base
 {
-   int svc()
+   int svc() override
    {
      TEST_TRACE ("My_Task::svc");
      ACE_Reactor *r = ACE_Reactor::instance ();
@@ -91,14 +91,14 @@ struct My_Task : public ACE_Task_Base
 // event handler used to signal when the reactor started
 struct Timer_Handler : public ACE_Event_Handler
 {
-   int handle_timeout (const ACE_Time_Value&, const void*)
+   int handle_timeout (const ACE_Time_Value&, const void*) override
    {
      g_semaphore.release (); // signal reactor started
      return 0;
    }
 };
 
-typedef ACE_Acceptor<My_Svc_Handler, ACE_SOCK_ACCEPTOR> My_Acceptor;
+using My_Acceptor = ACE_Acceptor<My_Svc_Handler, ACE_SOCK_Acceptor>;
 
 #endif
 
diff --git a/ACE/tests/Bug_2610_Regression_Test.cpp b/ACE/tests/Bug_2610_Regression_Test.cpp
index a3ddee974a3..c0f46ddcfc4 100644
--- a/ACE/tests/Bug_2610_Regression_Test.cpp
+++ b/ACE/tests/Bug_2610_Regression_Test.cpp
@@ -30,7 +30,7 @@ ACE_Thread_Semaphore g_semaphore (0);
 class My_Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_NULL_SYNCH>
 {
 public:
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_NULL_SYNCH> super;
+  using super = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>;
   My_Svc_Handler()
   {
     TEST_TRACE ("My_Svc_Handler:My_Svc_Handler");
@@ -39,13 +39,13 @@ public:
       Reference_Counting_Policy::ENABLED);
   }
 
-  ~My_Svc_Handler()
+  ~My_Svc_Handler() override
   {
     TEST_TRACE ("My_Svc_Handler::~My_Svc_Handler");
     --g_svc_handlers_leaked;
   }
 
-  int handle_close (ACE_HANDLE /*fd*/, ACE_Reactor_Mask /*mask*/)
+  int handle_close (ACE_HANDLE /*fd*/, ACE_Reactor_Mask /*mask*/) override
   {
     TEST_TRACE ("handle_close");
     g_semaphore.release();
@@ -58,11 +58,11 @@ bool g_acceptor_accept_fails;
 class My_Acceptor : public ACE_Acceptor<My_Svc_Handler, ACE_SOCK_ACCEPTOR>
 {
 public:
-  typedef ACE_Acceptor<My_Svc_Handler, ACE_SOCK_ACCEPTOR> super;
+  using super = ACE_Acceptor<My_Svc_Handler, ACE_SOCK_Acceptor>;
   My_Acceptor () : super (ACE_INET_Addr(9000)) {}
 
 protected:
-  int accept_svc_handler (My_Svc_Handler *svc_handler)
+  int accept_svc_handler (My_Svc_Handler *svc_handler) override
   {
     TEST_TRACE ("accept_svc_handler");
     int rv = super::accept_svc_handler(svc_handler);
@@ -73,7 +73,7 @@ protected:
       }
     return rv;
   }
-  int activate_svc_handler (My_Svc_Handler* /*svc_handler*/)
+  int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) override
   {
     TEST_TRACE ("My_Acceptor::activate_svc_handler");
     g_semaphore.release();
@@ -84,9 +84,9 @@ protected:
 class My_Connector : public ACE_Connector<My_Svc_Handler, ACE_SOCK_CONNECTOR>
 {
 public:
-  typedef ACE_Connector<My_Svc_Handler, ACE_SOCK_CONNECTOR> super;
+  using super = ACE_Connector<My_Svc_Handler, ACE_SOCK_Connector>;
 protected:
-  int activate_svc_handler (My_Svc_Handler* /*svc_handler*/)
+  int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) override
   {
     TEST_TRACE ("My_Connector::activate_svc_handler");
     g_semaphore.release();
@@ -96,7 +96,7 @@ protected:
 
 struct My_Task : public ACE_Task_Base
 {
-   int svc()
+   int svc() override
    {
      TEST_TRACE ("My_Task::svc");
      ACE_Reactor::instance()->owner(ACE_OS::thr_self());
@@ -114,7 +114,7 @@ struct My_Task : public ACE_Task_Base
 // event handler used to signal when the reactor started
 struct Timer_Handler : public ACE_Event_Handler
 {
-   int handle_timeout (const ACE_Time_Value&, const void*)
+   int handle_timeout (const ACE_Time_Value&, const void*) override
    {
      g_semaphore.release(); // signal reactor started
      return 0;
diff --git a/ACE/tests/Bug_2653_Regression_Test.cpp b/ACE/tests/Bug_2653_Regression_Test.cpp
index 8f8fe46943c..bd33cc00d3e 100644
--- a/ACE/tests/Bug_2653_Regression_Test.cpp
+++ b/ACE/tests/Bug_2653_Regression_Test.cpp
@@ -31,12 +31,12 @@ static const char *message =
 class Watchdog : public ACE_Task_Base
 {
 public:
-  int svc (void);
+  int svc () override;
   int my_grp_;
 };
 
 int
-Watchdog::svc (void)
+Watchdog::svc ()
 {
   ACE_OS::sleep (5);
   // If we make it through the sleep and haven't been canceled, that
@@ -52,11 +52,11 @@ class Handler : public ACE_Event_Handler
 public:
   Handler (ACE_Reactor &reactor, bool close_other);
 
-  ~Handler();
+  ~Handler() override;
 
-  int handle_input (ACE_HANDLE fd);
+  int handle_input (ACE_HANDLE fd) override;
 
-  int handle_output (ACE_HANDLE fd);
+  int handle_output (ACE_HANDLE fd) override;
 
   ACE_Pipe pipe_;
   ACE_Pipe other_pipe_;
@@ -95,7 +95,7 @@ Handler::Handler (ACE_Reactor &reactor, bool close_other)
     }
 }
 
-Handler::~Handler (void)
+Handler::~Handler ()
 {
   this->other_pipe_.close();
   this->pipe_.close ();
diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp
index ce6ac4f1301..f393e7626dd 100644
--- a/ACE/tests/Bug_2659_Regression_Test.cpp
+++ b/ACE/tests/Bug_2659_Regression_Test.cpp
@@ -80,12 +80,12 @@ class ReactorTask : public ACE_Task_Base
 {
 public:
 
-  virtual ~ReactorTask ()
+  ~ReactorTask () override
   {
     EE_DEBUG ("ReactorTask", "~ReactorTask", this);
   };
 
-  virtual int svc (void )
+  int svc ( ) override
   {
     EE_DEBUG ("ReactorTask", "svc", this);
 
diff --git a/ACE/tests/Bug_2740_Regression_Test.cpp b/ACE/tests/Bug_2740_Regression_Test.cpp
index fde25e15bf9..5c3f7fe54c0 100644
--- a/ACE/tests/Bug_2740_Regression_Test.cpp
+++ b/ACE/tests/Bug_2740_Regression_Test.cpp
@@ -41,13 +41,13 @@ public:
   // Each client will send/recv 'echo_cnt' times, close/reopen the socket,
   // then echo, etc. for ACE_MAX_ITERATIONS times.
   ClientSvcHandler (const ACE_INET_Addr &addr, int echo_cnt);
-  ~ClientSvcHandler ();
+  ~ClientSvcHandler () override;
 
-  int open (void* factory);
-  int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE);
-  int handle_timeout (const ACE_Time_Value &now, const void *act = 0);
+  int open (void* factory) override;
+  int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE) override;
+  int handle_timeout (const ACE_Time_Value &now, const void *act = 0) override;
   int handle_close (ACE_HANDLE handle = ACE_INVALID_HANDLE,
-                    ACE_Reactor_Mask mask = 0);
+                    ACE_Reactor_Mask mask = 0) override;
 
 protected:
   static const char *send_str;
@@ -68,10 +68,10 @@ const char *ClientSvcHandler::send_str =
 class ServerSvcHandler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
 public:
-  int open (void* factory);
-  int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE);
+  int open (void* factory) override;
+  int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE) override;
   int handle_close (ACE_HANDLE handle = ACE_INVALID_HANDLE,
-                    ACE_Reactor_Mask mask = 0);
+                    ACE_Reactor_Mask mask = 0) override;
 };
 
 
diff --git a/ACE/tests/Bug_2815_Regression_Test.cpp b/ACE/tests/Bug_2815_Regression_Test.cpp
index 04133884b86..23baade0054 100644
--- a/ACE/tests/Bug_2815_Regression_Test.cpp
+++ b/ACE/tests/Bug_2815_Regression_Test.cpp
@@ -43,7 +43,7 @@ public:
          char const *test_name);
 
   /// Run the test
-  void run (void);
+  void run ();
 
   /// One of the sub-handlers has received a notification
   void notification_received ();
@@ -63,12 +63,12 @@ private:
    * Each iteration of the test consists of sending multiple
    * notifications simultaneously.
    */
-  void send_notifications (void);
+  void send_notifications ();
 
   /**
    * @brief Return true if the test is finished.
    */
-  bool done (void) const;
+  bool done () const;
 
   /**
    * @brief Return true if there are more iterations to run.
@@ -84,7 +84,7 @@ private:
    * @brief Run one iteration of the test, each iteration doubles
    * the number of events.
    */
-  int run_one_iteration (void);
+  int run_one_iteration ();
 
   /**
    * @brief Initialize a bunch of One_Shot_Handlers
@@ -176,7 +176,7 @@ public:
 
   /// Receive the notifications, but remove itself from the reactor on
   /// on the first one.
-  virtual int handle_exception(ACE_HANDLE);
+  int handle_exception(ACE_HANDLE) override;
 
 private:
   /// The driver for this test, communicate results to it
@@ -251,7 +251,7 @@ Driver::Driver (
 }
 
 void
-Driver::run (void)
+Driver::run ()
 {
   while(more_iterations())
   {
@@ -292,7 +292,7 @@ Driver::reactor()
 }
 
 void
-Driver::send_notifications (void)
+Driver::send_notifications ()
 {
   int const nhandlers = 16;
   One_Shot_Handler * handlers[nhandlers];
@@ -305,7 +305,7 @@ Driver::send_notifications (void)
 }
 
 bool
-Driver::done (void) const
+Driver::done () const
 {
   return !more_iterations() && current_iteration_done();
 }
@@ -323,7 +323,7 @@ Driver::current_iteration_done() const
 }
 
 int
-Driver::run_one_iteration (void)
+Driver::run_one_iteration ()
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Running iteration with %d events for %C test\n"),
diff --git a/ACE/tests/Bug_2820_Regression_Test.cpp b/ACE/tests/Bug_2820_Regression_Test.cpp
index b0d54655dd0..9e61081c0e3 100644
--- a/ACE/tests/Bug_2820_Regression_Test.cpp
+++ b/ACE/tests/Bug_2820_Regression_Test.cpp
@@ -30,10 +30,10 @@ public:
   Simple_Handler(ACE_Reactor * reactor);
 
   /// Destructor
-  ~Simple_Handler();
+  ~Simple_Handler() override;
 
   /// Receive (and ignore) the notifications
-  virtual int handle_exception(ACE_HANDLE);
+  int handle_exception(ACE_HANDLE) override;
 };
 
 int
@@ -43,16 +43,9 @@ run_main (int, ACE_TCHAR *[])
 
   int result = 0;
 
-  auto_ptr<ACE_Reactor> reactor(
-      new ACE_Reactor(new ACE_Select_Reactor, 1));
-
-#if defined ACE_HAS_CPP11
+  std::unique_ptr<ACE_Reactor> reactor(new ACE_Reactor(new ACE_Select_Reactor, 1));
   ACE_Event_Handler_var v =
     ACE::make_event_handler<Simple_Handler> (reactor.get());
-#else
-  ACE_Event_Handler_var v(
-      new Simple_Handler(reactor.get()));
-#endif
 
   ACE_Event_Handler::Reference_Count pre_notify_count =
     v->add_reference();
diff --git a/ACE/tests/Bug_2980_Regression_Test.cpp b/ACE/tests/Bug_2980_Regression_Test.cpp
index 29a6261884f..1b4383d61ce 100644
--- a/ACE/tests/Bug_2980_Regression_Test.cpp
+++ b/ACE/tests/Bug_2980_Regression_Test.cpp
@@ -50,7 +50,7 @@ namespace {
 #endif
 
 
-typedef int (* voidfunction)(void);
+using voidfunction = int (*)();
 
 
 #if defined (CAN_RUN_TEST)
diff --git a/ACE/tests/Bug_3102_Regression_Test.cpp b/ACE/tests/Bug_3102_Regression_Test.cpp
index 755a69ffed4..724aa314af8 100644
--- a/ACE/tests/Bug_3102_Regression_Test.cpp
+++ b/ACE/tests/Bug_3102_Regression_Test.cpp
@@ -15,7 +15,7 @@
 
 #if defined (ACE_HAS_THREADS)
 
-void mutexTest(void)
+void mutexTest()
 {
   ACE_MT(ACE_Thread_Mutex *lock =
     ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
diff --git a/ACE/tests/Bug_3432_Regression_Test.cpp b/ACE/tests/Bug_3432_Regression_Test.cpp
index 4da4eb21c1e..c56d92c5ae7 100644
--- a/ACE/tests/Bug_3432_Regression_Test.cpp
+++ b/ACE/tests/Bug_3432_Regression_Test.cpp
@@ -21,7 +21,7 @@
 
 
 int
-strptime_test (void)
+strptime_test ()
 {
   // convert UTC time string to UTC ACE_Time_Value
   int error_count = 0;
diff --git a/ACE/tests/Bug_3744_Regression_Test.cpp b/ACE/tests/Bug_3744_Regression_Test.cpp
index b557fdd9710..66fac13b54a 100644
--- a/ACE/tests/Bug_3744_Regression_Test.cpp
+++ b/ACE/tests/Bug_3744_Regression_Test.cpp
@@ -9,7 +9,7 @@
    : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X)))
 
 int
-getmacaddress_test (void)
+getmacaddress_test ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing getmacaddress\n")));
 
diff --git a/ACE/tests/Bug_3758_Regression_Test.cpp b/ACE/tests/Bug_3758_Regression_Test.cpp
index af67c450089..0c4197cc8bc 100644
--- a/ACE/tests/Bug_3758_Regression_Test.cpp
+++ b/ACE/tests/Bug_3758_Regression_Test.cpp
@@ -23,7 +23,7 @@
 
 // Test ACE_OS::fileno()
 int
-fileno_test (void)
+fileno_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing fileno method\n")));
diff --git a/ACE/tests/Bug_3878_Regression_Test.cpp b/ACE/tests/Bug_3878_Regression_Test.cpp
index 685b8c450a2..4fe3c47e10c 100644
--- a/ACE/tests/Bug_3878_Regression_Test.cpp
+++ b/ACE/tests/Bug_3878_Regression_Test.cpp
@@ -19,7 +19,7 @@ class Worker;
 class IManager
 {
 public:
-  virtual ~IManager (void) { }
+  virtual ~IManager () { }
 
   virtual int return_to_work (Worker *worker) = 0;
 };
@@ -30,7 +30,7 @@ class Worker : public ACE_Task<ACE_MT_SYNCH>
 public:
   Worker (IManager *manager) : manager_(manager) { }
 
-  virtual int svc (void)
+  int svc () override
   {
     ACE_Thread_ID id;
     thread_id_ = id;
@@ -56,7 +56,7 @@ public:
     return 0;
   }
 
-  const ACE_Thread_ID& thread_id (void)
+  const ACE_Thread_ID& thread_id ()
   {
     return thread_id_;
   }
@@ -94,7 +94,7 @@ public:
     ACE_TRACE ("Manager::Manager");
   }
 
-  int svc (void)
+  int svc () override
   {
     ACE_TRACE ("Manager::svc");
 
@@ -135,11 +135,11 @@ public:
     return 0;
   }
 
-  int shut_down (void);
+  int shut_down ();
 
   const ACE_Thread_ID& thread_id (Worker *worker);
 
-  virtual int return_to_work (Worker *worker)
+  int return_to_work (Worker *worker) override
   {
     ACE_GUARD_RETURN (ACE_Mutex,
                       worker_mon, this->workers_lock_, -1);
@@ -152,7 +152,7 @@ public:
   }
 
 private:
-  int create_worker_pool (void)
+  int create_worker_pool ()
   {
     ACE_GUARD_RETURN (ACE_Mutex,
                       worker_mon,
@@ -169,7 +169,7 @@ private:
     return 0;
   }
 
-  int done (void);
+  int done ();
 
 private:
   int shutdown_;
@@ -179,13 +179,13 @@ private:
 };
 // Listing 1
 
-int Manager::done (void)
+int Manager::done ()
 {
   return (shutdown_ == 1);
 }
 
 int
-Manager::shut_down (void)
+Manager::shut_down ()
 {
   ACE_TRACE ("Manager::shut_down");
   ACE_Unbounded_Queue<Worker* >::ITERATOR iter =
diff --git a/ACE/tests/Bug_3912_Regression_Test.cpp b/ACE/tests/Bug_3912_Regression_Test.cpp
index 4624a585df1..c1c9fe0a321 100644
--- a/ACE/tests/Bug_3912_Regression_Test.cpp
+++ b/ACE/tests/Bug_3912_Regression_Test.cpp
@@ -22,8 +22,8 @@
 #include "ace/Task.h"
 #include "ace/Module.h"
 
-typedef ACE_Task<ACE_SYNCH> MT_Task;
-typedef ACE_Module<ACE_SYNCH> MT_Module;
+using MT_Task = ACE_Task<ACE_MT_SYNCH>;
+using MT_Module = ACE_Module<ACE_MT_SYNCH>;
 
 /**
  * We use this Task to track if close was called.
@@ -37,7 +37,7 @@ public:
   {
   }
 
-  virtual int close(u_long );
+  int close(u_long ) override;
 
 private:
   bool* close_called_;
diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp
index c0d1b0beaa7..8fdf4a0f98b 100644
--- a/ACE/tests/Bug_3943_Regression_Test.cpp
+++ b/ACE/tests/Bug_3943_Regression_Test.cpp
@@ -53,7 +53,7 @@
      typedef ACE_Null_Mutex ACCEPTOR_LOCKING;
 #  else
 #    include "ace/Process_Mutex.h"
-     typedef ACE_Process_Mutex ACCEPTOR_LOCKING;
+     using ACCEPTOR_LOCKING = ACE_Process_Mutex;
 #    define CLEANUP_PROCESS_MUTEX
 #  endif /* ACE_HAS_THREAD_SAFE_ACCEPT */
 #endif /* ACE_LACKS_FORK */
@@ -88,7 +88,7 @@ namespace {
 #if defined (ACE_LACKS_IOVEC)
   typedef u_long buffer_len;
 #else
-  typedef size_t buffer_len;
+  using buffer_len = size_t;
 #endif /* ACE_LACKS_IOVEC */
 
 #if defined (ACE_WIN32)
@@ -220,16 +220,16 @@ namespace {
     Svc_Handler (ACE_Thread_Manager * = 0);
     // Do-nothing constructor.
 
-    virtual int open (void *);
+    int open (void *) override;
     // Initialization hook.
 
-    void send_data (void);
+    void send_data ();
     // Send data to server.
 
-    void recv_data (void);
+    void recv_data ();
     // Recv data from client.
 
-    int close (u_long = 0);
+    int close (u_long = 0) override;
     // Shutdown the <Svc_Handler>.
 
   private:
@@ -248,10 +248,8 @@ namespace {
   };
 } // namespace ""
 
-typedef ACE_Oneshot_Acceptor<Svc_Handler,
-                             LOCK_SOCK_ACCEPTOR> ACCEPTOR;
-typedef ACE_Connector<Svc_Handler,
-                      ACE_SOCK_CONNECTOR> CONNECTOR;
+using ACCEPTOR = ACE_Oneshot_Acceptor<Svc_Handler, ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>>;
+using CONNECTOR = ACE_Connector<Svc_Handler, ACE_SOCK_Connector>;
 
 
 IovecGuard::IovecGuard(const int count, const int slot, const buffer_len max)
@@ -320,7 +318,7 @@ Svc_Handler::open (void *)
 }
 
 void
-Svc_Handler::send_data (void)
+Svc_Handler::send_data ()
 {
   bool successful = true;
   bool win32_test = false;
@@ -780,7 +778,7 @@ Svc_Handler::send (char send_char, const ACE_TCHAR * const send_desc)
 }
 
 void
-Svc_Handler::recv_data (void)
+Svc_Handler::recv_data ()
 {
   ACE_SOCK_Stream &new_stream = this->peer ();
 
diff --git a/ACE/tests/Bug_4055_Regression_Test.cpp b/ACE/tests/Bug_4055_Regression_Test.cpp
index 4aa1d30a3c3..1e427befaee 100644
--- a/ACE/tests/Bug_4055_Regression_Test.cpp
+++ b/ACE/tests/Bug_4055_Regression_Test.cpp
@@ -32,14 +32,11 @@
 
 // Create timer queue with hr support
 ACE_Timer_Queue *
-create_timer_queue (void)
+create_timer_queue ()
 {
   ACE_Timer_Queue * tmq = 0;
 
-  typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
-                           ACE_Event_Handler_Handle_Timeout_Upcall,
-                           ACE_SYNCH_RECURSIVE_MUTEX,
-                           ACE_HR_Time_Policy> timer_queue_type;
+  using timer_queue_type = ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall, ACE_MT_SYNCH::RECURSIVE_MUTEX, ACE_HR_Time_Policy>;
   ACE_NEW_RETURN (tmq, timer_queue_type (), 0);
 
   return tmq;
@@ -50,17 +47,17 @@ class MyTask : public ACE_Task<ACE_MT_SYNCH>
 public:
   MyTask () : my_reactor_ (0), my_tq_ (0) {}
 
-  virtual ~MyTask () { stop (); }
+  ~MyTask () override { stop (); }
 
-  virtual int svc (void);
+  int svc () override;
 
   int start (int num_threads);
-  int stop (void);
+  int stop ();
   ACE_Reactor* get_reactor ();
-  int create_reactor (void);
+  int create_reactor ();
 
 private:
-  int delete_reactor (void);
+  int delete_reactor ();
 
   ACE_SYNCH_RECURSIVE_MUTEX lock_;
   ACE_Reactor *my_reactor_;
@@ -74,7 +71,7 @@ MyTask::get_reactor ()
 }
 
 int
-MyTask::create_reactor (void)
+MyTask::create_reactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -101,7 +98,7 @@ MyTask::create_reactor (void)
 }
 
 int
-MyTask::delete_reactor (void)
+MyTask::delete_reactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -133,7 +130,7 @@ MyTask::start (int num_threads)
 
 
 int
-MyTask::stop (void)
+MyTask::stop ()
 {
   if (this->my_reactor_ != 0)
     {
@@ -157,7 +154,7 @@ MyTask::stop (void)
 }
 
 int
-MyTask::svc (void)
+MyTask::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask started\n")));
 
@@ -177,8 +174,8 @@ public:
       timeout_triggered_ (false)
   {}
 
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg);
+  int handle_timeout (const ACE_Time_Value &tv,
+                              const void *arg) override;
 
   bool trigger_in(const ACE_Time_Value &delay);
 
diff --git a/ACE/tests/Bug_4189_Regression_Test.cpp b/ACE/tests/Bug_4189_Regression_Test.cpp
index e55f3fa52f7..1ccd0e1a768 100644
--- a/ACE/tests/Bug_4189_Regression_Test.cpp
+++ b/ACE/tests/Bug_4189_Regression_Test.cpp
@@ -9,7 +9,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
@@ -25,7 +24,7 @@ const int SEC_TO_KEEP_SOCKET_OPEN = 2;
 
 #if defined (ACE_HAS_THREADS)
 
-int reuseAddr_test (void)
+int reuseAddr_test ()
 {
 # if defined ACE_WIN32 || !defined ACE_LACKS_IOCTL
   ACE_SOCK_Dgram_Bcast sock1;
diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp
index 6d44f5546a6..c10f0c2323a 100644
--- a/ACE/tests/CDR_File_Test.cpp
+++ b/ACE/tests/CDR_File_Test.cpp
@@ -48,7 +48,7 @@ class CDR_Test
 
 public:
   /// Default constructor.
-  CDR_Test (void);
+  CDR_Test ();
 
   /// Constructor.
   CDR_Test (ACE_CDR::Char o,
@@ -121,7 +121,7 @@ operator << (ostream &os,
   return os;
 }
 
-CDR_Test::CDR_Test (void)
+CDR_Test::CDR_Test ()
   : char_ (0),
     word2_ (0),
     word4_ (0),
diff --git a/ACE/tests/CDR_Fixed_Test.cpp b/ACE/tests/CDR_Fixed_Test.cpp
index f9611bbf529..96aa893e315 100644
--- a/ACE/tests/CDR_Fixed_Test.cpp
+++ b/ACE/tests/CDR_Fixed_Test.cpp
@@ -47,10 +47,10 @@ int run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("CDR_Fixed_Test"));
 
-  typedef ACE_CDR::Fixed Fixed;
-  typedef ACE_CDR::LongLong LongLong;
-  typedef ACE_CDR::ULongLong ULongLong;
-  typedef ACE_CDR::LongDouble LongDouble;
+  using Fixed = ACE_CDR::Fixed;
+  using LongLong = ACE_CDR::LongLong;
+  using ULongLong = ACE_CDR::ULongLong;
+  using LongDouble = ACE_CDR::LongDouble;
 
   const Fixed f1 = Fixed::from_integer (LongLong (-1234567890l)),
     f2 = Fixed::from_integer (ULongLong (987654321ul)),
diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp
index f07a7ea9928..283f5a9e1ae 100644
--- a/ACE/tests/CDR_Test.cpp
+++ b/ACE/tests/CDR_Test.cpp
@@ -28,7 +28,7 @@ static int nloops = 100;
 
 struct CDR_Test_Types
 {
-  CDR_Test_Types (void);
+  CDR_Test_Types ();
 
   ACE_CDR::Octet o;
   ACE_CDR::Short s;
@@ -65,7 +65,7 @@ struct CDR_Test_Types
   ACE_CDR::Short a[ARRAY_SIZE];
 };
 
-CDR_Test_Types::CDR_Test_Types (void)
+CDR_Test_Types::CDR_Test_Types ()
   : o (1),
     s (2),
     l (4),
@@ -95,7 +95,7 @@ CDR_Test_Types::CDR_Test_Types (void)
 }
 
 static int
-short_stream (void)
+short_stream ()
 {
   // counter
   u_int i;
diff --git a/ACE/tests/Cache_Map_Manager_Test.cpp b/ACE/tests/Cache_Map_Manager_Test.cpp
index b9028eab59d..51e9e765767 100644
--- a/ACE/tests/Cache_Map_Manager_Test.cpp
+++ b/ACE/tests/Cache_Map_Manager_Test.cpp
@@ -26,82 +26,52 @@
 #include "ace/Get_Opt.h"
 #include "Cache_Map_Manager_Test.h"     // Hash_Key class defined in here
 
-typedef size_t KEY;
-typedef size_t VALUE;
-typedef int ATTR;
-typedef std::pair<VALUE, ATTR> CACHE_VALUE;
-typedef ACE_Equal_To<KEY> COMPARE_KEYS;
-
-typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-        HASH_MAP_MANAGER;
-typedef ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-        HASH_MAP_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-        HASH_MAP_REVERSE_ITERATOR;
-
-typedef ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>
-        MAP_MANAGER;
-typedef ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
-        MAP_ITERATOR;
-typedef ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
-        MAP_REVERSE_ITERATOR;
-
-typedef ACE_Cleanup_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER>
-        HASH_MAP_CLEANUP;
-
-typedef ACE_Cleanup_Strategy<KEY, CACHE_VALUE, MAP_MANAGER>
-        MAP_CLEANUP;
-
-typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR>
-        HASH_MAP_CACHING_UTILITY;
-
-typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, ATTR>
-        MAP_CACHING_UTILITY;
+using KEY = size_t;
+using VALUE = size_t;
+using ATTR = int;
+using CACHE_VALUE = std::pair<VALUE, ATTR>;
+using COMPARE_KEYS = ACE_Equal_To<KEY>;
+
+using HASH_MAP_MANAGER = ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+using HASH_MAP_ITERATOR = ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+using HASH_MAP_REVERSE_ITERATOR = ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+
+using MAP_MANAGER = ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>;
+using MAP_ITERATOR = ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>;
+using MAP_REVERSE_ITERATOR = ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>;
+
+using HASH_MAP_CLEANUP = ACLE<KEY, CACHE_VALUE, HASH_MAP_MANAGER>;
+
+using MAP_CLEANUP = ACLE<KEY, CACHE_VALUE, MAP_MANAGER>;
+
+using HASH_MAP_CACHING_UTILITY = ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR>;
+
+using MAP_CACHING_UTILITY = ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, ATTR>;
 
 // = Hash_Map_Manager related
-typedef ACE_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_CACHING_STRATEGY;
-typedef ACE_LRU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_LRU;
-typedef ACE_LFU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_LFU;
-typedef ACE_FIFO_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_FIFO;
-typedef ACE_Null_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_NULL;
-typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>
-        HASH_MAP_LRU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>
-        HASH_MAP_LFU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>
-        HASH_MAP_FIFO_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>
-        HASH_MAP_NULL_ADAPTER;
+using HASH_MAP_CACHING_STRATEGY = ACS<ATTR, HASH_MAP_CACHING_UTILITY>;
+using HASH_MAP_LRU = ALRU<ATTR, HASH_MAP_CACHING_UTILITY>;
+using HASH_MAP_LFU = ALFU<ATTR, HASH_MAP_CACHING_UTILITY>;
+using HASH_MAP_FIFO = AFIFO<ATTR, HASH_MAP_CACHING_UTILITY>;
+using HASH_MAP_NULL = ANULL<ATTR, HASH_MAP_CACHING_UTILITY>;
+using HASH_MAP_LRU_ADAPTER = ACSA<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>;
+using HASH_MAP_LFU_ADAPTER = ACSA<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>;
+using HASH_MAP_FIFO_ADAPTER = ACSA<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>;
+using HASH_MAP_NULL_ADAPTER = ACSA<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>;
 
 // = Map_Manager related
-typedef ACE_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-        MAP_CACHING_STRATEGY;
-typedef ACE_LRU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-        MAP_LRU;
-typedef ACE_LFU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-        MAP_LFU;
-typedef ACE_FIFO_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-        MAP_FIFO;
-typedef ACE_Null_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
-        MAP_NULL;
-typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LRU>
-        MAP_LRU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LFU>
-        MAP_LFU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_FIFO>
-        MAP_FIFO_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_NULL>
-        MAP_NULL_ADAPTER;
-
-typedef ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>
-        HASH_MAP_CACHE;
-typedef ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
-        MAP_CACHE;
+using MAP_CACHING_STRATEGY = ACS<ATTR, MAP_CACHING_UTILITY>;
+using MAP_LRU = ALRU<ATTR, MAP_CACHING_UTILITY>;
+using MAP_LFU = ALFU<ATTR, MAP_CACHING_UTILITY>;
+using MAP_FIFO = AFIFO<ATTR, MAP_CACHING_UTILITY>;
+using MAP_NULL = ANULL<ATTR, MAP_CACHING_UTILITY>;
+using MAP_LRU_ADAPTER = ACSA<ATTR, MAP_CACHING_UTILITY, MAP_LRU>;
+using MAP_LFU_ADAPTER = ACSA<ATTR, MAP_CACHING_UTILITY, MAP_LFU>;
+using MAP_FIFO_ADAPTER = ACSA<ATTR, MAP_CACHING_UTILITY, MAP_FIFO>;
+using MAP_NULL_ADAPTER = ACSA<ATTR, MAP_CACHING_UTILITY, MAP_NULL>;
+
+using HASH_MAP_CACHE = ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>;
+using MAP_CACHE = ACMM<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>;
 
 enum Caching_Strategy_Type
 {
@@ -416,7 +386,7 @@ functionality_test_hash_cache (HASH_MAP_CACHING_STRATEGY &caching_strategy)
 }
 
 void
-test_caching_strategy_type (void)
+test_caching_strategy_type ()
 {
   HASH_MAP_CACHING_STRATEGY *hash_map_caching_strategy = 0;
   MAP_CACHING_STRATEGY *map_caching_strategy = 0;
diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp
index 909e5cf31cb..960816e3402 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.cpp
+++ b/ACE/tests/Cached_Accept_Conn_Test.cpp
@@ -112,7 +112,7 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_HANDL
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void)
+Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler ()
 {
   if (ACE::out_of_handles (errno))
     {
@@ -127,8 +127,7 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void)
   return -1;
 }
 
-typedef Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
-        ACCEPT_STRATEGY;
+using ACCEPT_STRATEGY = Accept_Strategy<Server_Svc_Handler, ACE_SOCK_Acceptor>;
 
 Client_Svc_Handler::Client_Svc_Handler (ACE_Thread_Manager *t)
   : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t)
@@ -230,7 +229,7 @@ cached_connect (STRATEGY_CONNECTOR &con,
 }
 
 static void
-server (void)
+server ()
 {
   int result = 1;
 
@@ -335,7 +334,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
 }
 
 void
-test_caching_strategy_type (void)
+test_caching_strategy_type ()
 {
   CACHING_STRATEGY *caching_strategy = 0;
 
diff --git a/ACE/tests/Cached_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp
index 4d4b7f8dbf1..d954c2980cd 100644
--- a/ACE/tests/Cached_Allocator_Test.cpp
+++ b/ACE/tests/Cached_Allocator_Test.cpp
@@ -20,7 +20,7 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
 
-typedef ACE_Dynamic_Cached_Allocator<ACE_SYNCH_NULL_MUTEX> DYNAMIC_ALLOCATOR;
+using DYNAMIC_ALLOCATOR = ACE_Dynamic_Cached_Allocator<ACE_MT_SYNCH::NULL_MUTEX>;
 
 static int
 speed_test (ACE_UINT32 loops)
@@ -71,7 +71,7 @@ speed_test (ACE_UINT32 loops)
 }
 
 typedef char MEMBLOCK[8];
-typedef ACE_Cached_Allocator<MEMBLOCK, ACE_SYNCH_NULL_MUTEX> STATIC_ALLOCATOR;
+using STATIC_ALLOCATOR = ACE_Cached_Allocator<MEMBLOCK, ACE_MT_SYNCH::NULL_MUTEX>;
 
 static int
 stdspeed_test (ACE_UINT32 loops)
diff --git a/ACE/tests/Cached_Conn_Test.cpp b/ACE/tests/Cached_Conn_Test.cpp
index f197be790af..9f6bb780237 100644
--- a/ACE/tests/Cached_Conn_Test.cpp
+++ b/ACE/tests/Cached_Conn_Test.cpp
@@ -40,60 +40,39 @@
 
 
 
-typedef size_t ATTRIBUTES;
-typedef std::pair<Svc_Handler *, ATTRIBUTES>
-        CACHED_HANDLER;
-typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-        ACE_ADDR;
-typedef ACE_Hash<ACE_ADDR> H_KEY;
-typedef ACE_Equal_To<ACE_ADDR> C_KEYS;
-
-typedef ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-        HASH_MAP;
-typedef ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-        HASH_MAP_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-        HASH_MAP_REVERSE_ITERATOR;
-
-typedef ACE_Recyclable_Handler_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>
-        CLEANUP_STRATEGY;
-typedef ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
-        CACHING_UTILITY;
-
-typedef ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        LRU_CACHING_STRATEGY;
-
-typedef ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        LFU_CACHING_STRATEGY;
-typedef ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        FIFO_CACHING_STRATEGY;
-typedef ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        NULL_CACHING_STRATEGY;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>
-        LRU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
-        LFU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
-        FIFO_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
-        NULL_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-        CACHING_STRATEGY;
-
-typedef ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>
-        ACCEPTOR;
-
-typedef ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
-        STRATEGY_CONNECTOR;
-
-typedef ACE_NOOP_Creation_Strategy<Svc_Handler>
-        NULL_CREATION_STRATEGY;
-
-typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler>
-        NULL_ACTIVATION_STRATEGY;
-
-typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
-        CACHED_CONNECT_STRATEGY;
+using ATTRIBUTES = size_t;
+using CACHED_HANDLER = std::pair<Svc_Handler *, ATTRIBUTES>;
+using ACE_ADDR = ARHR<ACE_INET_Addr>;
+using H_KEY = ACE_Hash<ACE_ADDR>;
+using C_KEYS = ACE_Equal_To<ACE_ADDR>;
+
+using HASH_MAP = ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+using HASH_MAP_ITERATOR = ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+using HASH_MAP_REVERSE_ITERATOR = ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+
+using CLEANUP_STRATEGY = ARHCLE<ACE_ADDR, CACHED_HANDLER, HASH_MAP>;
+using CACHING_UTILITY = ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>;
+
+using LRU_CACHING_STRATEGY = ALRU<ATTRIBUTES, CACHING_UTILITY>;
+
+using LFU_CACHING_STRATEGY = ALFU<ATTRIBUTES, CACHING_UTILITY>;
+using FIFO_CACHING_STRATEGY = AFIFO<ATTRIBUTES, CACHING_UTILITY>;
+using NULL_CACHING_STRATEGY = ANULL<ATTRIBUTES, CACHING_UTILITY>;
+using LRU_CACHING_STRATEGY_ADAPTER = ACSA<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>;
+using LFU_CACHING_STRATEGY_ADAPTER = ACSA<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>;
+using FIFO_CACHING_STRATEGY_ADAPTER = ACSA<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>;
+using NULL_CACHING_STRATEGY_ADAPTER = ACSA<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>;
+using CACHING_STRATEGY = ACS<ATTRIBUTES, CACHING_UTILITY>;
+
+using ACCEPTOR = ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_Acceptor>;
+
+using STRATEGY_CONNECTOR = ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_Connector>;
+
+using NULL_CREATION_STRATEGY = ACE_NOOP_Creation_Strategy<Svc_Handler>;
+
+using NULL_ACTIVATION_STRATEGY = ACE_NOOP_Concurrency_Strategy<Svc_Handler>;
+
+using CACHED_CONNECT_STRATEGY = ACCSE<Svc_Handler, ACE_SOCK_Connector, CACHING_STRATEGY, ATTRIBUTES, ACE_MT_SYNCH::NULL_MUTEX>;
 
 #endif /* CACHED_CONNECT_TEST */
 
@@ -154,7 +133,7 @@ static int iterations = 200;
 //====================================================================
 
 static void
-out_of_sockets_handler (void)
+out_of_sockets_handler ()
 {
   if (ACE::out_of_handles (errno))
     {
@@ -311,7 +290,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy)
 }
 
 void
-test_caching_strategy_type (void)
+test_caching_strategy_type ()
 {
   CACHING_STRATEGY *caching_strategy = 0;
 
diff --git a/ACE/tests/Capabilities_Test.cpp b/ACE/tests/Capabilities_Test.cpp
index fa1ce4b99e5..75951f39bbd 100644
--- a/ACE/tests/Capabilities_Test.cpp
+++ b/ACE/tests/Capabilities_Test.cpp
@@ -19,7 +19,7 @@
 static const ACE_TCHAR config[] = ACE_TEXT ("Capabilities_Test.cfg");
 
 static int
-load_config (void)
+load_config ()
 {
   ACE_Capabilities caps;
   if (caps.getent (config, ACE_TEXT ("Config")) == -1)
diff --git a/ACE/tests/Chrono_Test.cpp b/ACE/tests/Chrono_Test.cpp
index 6cde2a4a2d0..1c9e86c6857 100644
--- a/ACE/tests/Chrono_Test.cpp
+++ b/ACE/tests/Chrono_Test.cpp
@@ -18,8 +18,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Time_Value.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include "ace/Truncate.h"
 
 int
@@ -579,18 +577,3 @@ run_main (int, ACE_TCHAR *[])
   ACE_END_TEST;
   return errors;
 }
-
-#else
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("Chrono_Test"));
-
-  ACE_ERROR ((LM_INFO, ACE_TEXT ("std::chrono is not supported on this platform\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif /* ACE_HAS_CPP11 */
diff --git a/ACE/tests/Collection_Test.cpp b/ACE/tests/Collection_Test.cpp
index 09412f94791..5b92fbc35b4 100644
--- a/ACE/tests/Collection_Test.cpp
+++ b/ACE/tests/Collection_Test.cpp
@@ -27,14 +27,14 @@ UglyThing::operator== (const UglyThing& r) const
   return this->alloc_ == r.alloc_;
 }
 
-typedef UglyThing DATA;
-typedef ACE_Unbounded_Set<DATA> UNBOUNDED_SET;
-typedef ACE_Unbounded_Set_Iterator<DATA> UNBOUNDED_SET_ITERATOR;
-typedef ACE_Unbounded_Set_Const_Iterator<DATA> UNBOUNDED_SET_CONST_ITERATOR;
+using DATA = UglyThing;
+using UNBOUNDED_SET = ACE_Unbounded_Set<DATA>;
+using UNBOUNDED_SET_ITERATOR = ACE_Unbounded_Set_Iterator<DATA>;
+using UNBOUNDED_SET_CONST_ITERATOR = ACE_Unbounded_Set_Const_Iterator<DATA>;
 
-typedef int ARRAY_DATA;
-typedef ACE_Array<ARRAY_DATA> ARRAY;
-typedef ACE_Array_Iterator<ARRAY_DATA> ARRAY_ITERATOR;
+using ARRAY_DATA = int;
+using ARRAY = ACE_Array<ARRAY_DATA>;
+using ARRAY_ITERATOR = ACE_Array_Iterator<ARRAY_DATA>;
 
 void iterate_const(const UNBOUNDED_SET& set)
 {
@@ -59,7 +59,7 @@ void iterate_const(const UNBOUNDED_SET& set)
 
 struct DummyFunctor
 {
-  int operator() (void) { return 0; }
+  int operator() () { return 0; }
 };
 
 int
diff --git a/ACE/tests/Compiler_Features_01_Test.cpp b/ACE/tests/Compiler_Features_01_Test.cpp
index 9f23b27fe5a..ecf26f1b251 100644
--- a/ACE/tests/Compiler_Features_01_Test.cpp
+++ b/ACE/tests/Compiler_Features_01_Test.cpp
@@ -27,7 +27,7 @@ run_main (int, ACE_TCHAR *[])
   int status = 0;
 
   // Create a simple list ...
-  typedef std::list<int> collection;
+  using collection = std::list<int>;
   collection c;
 
   // ... insert some elements ...
diff --git a/ACE/tests/Compiler_Features_02_Test.cpp b/ACE/tests/Compiler_Features_02_Test.cpp
index f1e31f20b0d..42632f09d23 100644
--- a/ACE/tests/Compiler_Features_02_Test.cpp
+++ b/ACE/tests/Compiler_Features_02_Test.cpp
@@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[])
   int status = 0;
 
   // Create a simple list ...
-  typedef std::map<int,int> collection;
+  using collection = std::map<int, int>;
   collection c;
 
   // ... insert some elements ...
diff --git a/ACE/tests/Compiler_Features_03_Test.cpp b/ACE/tests/Compiler_Features_03_Test.cpp
index b34088bdd18..9363c337593 100644
--- a/ACE/tests/Compiler_Features_03_Test.cpp
+++ b/ACE/tests/Compiler_Features_03_Test.cpp
@@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[])
   int status = 0;
 
   // Create a simple list ...
-  typedef std::vector<int> collection;
+  using collection = std::vector<int>;
   collection c;
 
   // ... insert some elements ...
diff --git a/ACE/tests/Compiler_Features_04_Test.cpp b/ACE/tests/Compiler_Features_04_Test.cpp
index a8e24b74ead..7f4cdb4c373 100644
--- a/ACE/tests/Compiler_Features_04_Test.cpp
+++ b/ACE/tests/Compiler_Features_04_Test.cpp
@@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[])
   int status = 0;
 
   // Create a simple list ...
-  typedef std::set<int> collection;
+  using collection = std::set<int>;
   collection c;
 
   // ... insert some elements ...
diff --git a/ACE/tests/Compiler_Features_05_Test.cpp b/ACE/tests/Compiler_Features_05_Test.cpp
index 3caa89031f2..c67992ba4a3 100644
--- a/ACE/tests/Compiler_Features_05_Test.cpp
+++ b/ACE/tests/Compiler_Features_05_Test.cpp
@@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[])
   int status = 0;
 
   // Create a simple queue ...
-  typedef std::queue<int> collection;
+  using collection = std::queue<int>;
   // ... if the previous line compiles, the default template
   // parameters work.  The declaration of queue<> is something like:
   //   template<typename T, typename Sequence = deque<T> >
diff --git a/ACE/tests/Compiler_Features_06_Test.cpp b/ACE/tests/Compiler_Features_06_Test.cpp
index 2e68a987b72..3fde520fb71 100644
--- a/ACE/tests/Compiler_Features_06_Test.cpp
+++ b/ACE/tests/Compiler_Features_06_Test.cpp
@@ -30,7 +30,7 @@ run_main (int, ACE_TCHAR *[])
   int status = 0;
 
   // Create a simple list ...
-  typedef std::set<int,std::greater<int> > collection;
+  using collection = std::set<int, std::greater<int>>;
   collection c;
 
   // ... insert some elements ...
diff --git a/ACE/tests/Compiler_Features_07_Test.cpp b/ACE/tests/Compiler_Features_07_Test.cpp
index 854efe3ff82..bf4933326c3 100644
--- a/ACE/tests/Compiler_Features_07_Test.cpp
+++ b/ACE/tests/Compiler_Features_07_Test.cpp
@@ -26,7 +26,7 @@ run_main (int, ACE_TCHAR *[])
   int status = 0;
 
   // Create a simple list ...
-  typedef std::set<std::string> collection;
+  using collection = std::set<std::string>;
   collection c;
 
   // ... insert some elements ...
diff --git a/ACE/tests/Compiler_Features_09_Test.cpp b/ACE/tests/Compiler_Features_09_Test.cpp
index eb38413cd6e..c765724237a 100644
--- a/ACE/tests/Compiler_Features_09_Test.cpp
+++ b/ACE/tests/Compiler_Features_09_Test.cpp
@@ -14,6 +14,7 @@
 // The first part of the test is to compile this line.  If the program
 // does not compile the platform is just too broken.
 #include <memory>
+#include <utility>
 
 // For extra challenge, we use the anonymous namespace
 namespace
@@ -64,8 +65,8 @@ run_main (int, ACE_TCHAR *[])
 
   // ... this works with the ACE version of auto_ptr (well, the
   // namespace is broken, but you get the idea) ...
-  std::auto_ptr<Base> x(new Base);
-  std::auto_ptr<Derived> y(new Derived);
+  std::unique_ptr<Base> x(new Base);
+  std::unique_ptr<Derived> y(new Derived);
 
   // ... with a compliant implementation of std::auto_ptr<> you should be
   // able to write:
@@ -85,8 +86,8 @@ run_main (int, ACE_TCHAR *[])
                  Base::destructors));
     }
 
-  std::auto_ptr<Base> z;
-  z = x;
+  std::unique_ptr<Base> z;
+  z = std::move(x);
   if (Base::destructors != 1)
     {
       status = 1;
diff --git a/ACE/tests/Compiler_Features_10_Test.cpp b/ACE/tests/Compiler_Features_10_Test.cpp
index 6882b316315..5c5ed2a6b60 100644
--- a/ACE/tests/Compiler_Features_10_Test.cpp
+++ b/ACE/tests/Compiler_Features_10_Test.cpp
@@ -184,7 +184,7 @@ run_main (int, ACE_TCHAR *[])
     {
       // ... start the test fresh ...
       reset_counts();
-      std::auto_ptr<Aggregate> b(new Aggregate);
+      std::unique_ptr<Aggregate> b(new Aggregate);
       never_reached(__FILE__, __LINE__);
     }
   catch(...)
diff --git a/ACE/tests/Compiler_Features_15_Test.cpp b/ACE/tests/Compiler_Features_15_Test.cpp
index 6d09a395589..9f642e979a9 100644
--- a/ACE/tests/Compiler_Features_15_Test.cpp
+++ b/ACE/tests/Compiler_Features_15_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 class A
 {
 public:
@@ -27,18 +25,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_15_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_16_Test.cpp b/ACE/tests/Compiler_Features_16_Test.cpp
index b806b572929..b11ac999233 100644
--- a/ACE/tests/Compiler_Features_16_Test.cpp
+++ b/ACE/tests/Compiler_Features_16_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <limits>
 #include <stdint.h>
 #include <ostream>
@@ -51,18 +49,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_16_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_17_Test.cpp b/ACE/tests/Compiler_Features_17_Test.cpp
index df1220be936..e7a5f726813 100644
--- a/ACE/tests/Compiler_Features_17_Test.cpp
+++ b/ACE/tests/Compiler_Features_17_Test.cpp
@@ -4,8 +4,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <limits>
 #include <stdint.h>
 
@@ -34,18 +32,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_17_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_18_Test.cpp b/ACE/tests/Compiler_Features_18_Test.cpp
index 88ebdb2ab6a..ee48b20b80e 100644
--- a/ACE/tests/Compiler_Features_18_Test.cpp
+++ b/ACE/tests/Compiler_Features_18_Test.cpp
@@ -5,13 +5,11 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <array>
 namespace Test
 {
-  typedef std::array< float, 5 > arrayType;
-  typedef std::array< arrayType, 5 > array_array;
+  using arrayType = std::array<float, 5>;
+  using array_array = std::array<arrayType, 5>;
 };
 
 int
@@ -34,18 +32,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_18_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_19_Test.cpp b/ACE/tests/Compiler_Features_19_Test.cpp
index 99e17b84fab..19ba4cddd76 100644
--- a/ACE/tests/Compiler_Features_19_Test.cpp
+++ b/ACE/tests/Compiler_Features_19_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <string>
 #include <iostream>
 #include <cstdint>
@@ -18,7 +16,7 @@ namespace IDL
            typename _Alloc = std::allocator<_CharT> >
     class bounded_basic_string : public std::basic_string<_CharT, _Traits, _Alloc>
     {
-      typedef std::basic_string<_CharT, _Traits, _Alloc>  _String;
+      using _String = std::basic_string<_CharT, _Traits, _Alloc>;
 
     public:
       static const uint32_t                               bound_ = _Bound;
@@ -48,7 +46,7 @@ run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT("Compiler_Features_19_Test"));
 
-  typedef IDL::bounded_string<100> string100;
+  using string100 = IDL::bounded_string<100>;
   string100 s100("world");
 
   ACE_DEBUG ((LM_DEBUG,
@@ -61,18 +59,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_19_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_20_DLL.h b/ACE/tests/Compiler_Features_20_DLL.h
index dc6de763687..4dfc196d115 100644
--- a/ACE/tests/Compiler_Features_20_DLL.h
+++ b/ACE/tests/Compiler_Features_20_DLL.h
@@ -13,8 +13,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include "Compiler_Features_20_DLL_Export.h"
 
 class COMPILER_FEATURES_20_DLL_Export UtcT
@@ -23,6 +21,4 @@ public:
   ~UtcT (void) = default;
 };
 
-#endif
-
 #endif /* ACE_TESTS_COMPILER_FEATURES_20_DLL_H */
diff --git a/ACE/tests/Compiler_Features_21_Test.cpp b/ACE/tests/Compiler_Features_21_Test.cpp
index c8ad796e3a7..2dbd9d05a76 100644
--- a/ACE/tests/Compiler_Features_21_Test.cpp
+++ b/ACE/tests/Compiler_Features_21_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 template<class _T1>
 struct A
 {
@@ -41,18 +39,3 @@ run_main (int, ACE_TCHAR *[])
 
   return retval;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_21_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_23_Test.cpp b/ACE/tests/Compiler_Features_23_Test.cpp
index 688c0a37bd9..39fc0962ab9 100644
--- a/ACE/tests/Compiler_Features_23_Test.cpp
+++ b/ACE/tests/Compiler_Features_23_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <array>
 #include <string>
 #include <cstdint>
@@ -44,18 +42,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_23_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_24_Test.cpp b/ACE/tests/Compiler_Features_24_Test.cpp
index d4d0697ed26..895a28820ea 100644
--- a/ACE/tests/Compiler_Features_24_Test.cpp
+++ b/ACE/tests/Compiler_Features_24_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <type_traits>
 #include <memory>
 
@@ -18,7 +16,7 @@ namespace FOO
   template <typename T>
   struct o_t
   {
-    typedef o_r<T>       ref_type;
+    using ref_type = o_r<T>;
   };
   class T_base {};
 
@@ -34,7 +32,7 @@ namespace FOO
     template <typename _Tp1, typename, typename ...Args>
     friend o_r<_Tp1> make_f(Args&& ...args);
   protected:
-    typedef std::shared_ptr<T>    shared_ptr_type;
+    using shared_ptr_type = std::shared_ptr<T>;
     template<typename _Tp1, typename = typename
       std::enable_if<std::is_convertible<_Tp1*, T*>::value>::type>
     explicit o_r (_Tp1*)
@@ -92,18 +90,3 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 #endif
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_24_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_25_Test.cpp b/ACE/tests/Compiler_Features_25_Test.cpp
index fd3e13c49e0..e273b166224 100644
--- a/ACE/tests/Compiler_Features_25_Test.cpp
+++ b/ACE/tests/Compiler_Features_25_Test.cpp
@@ -5,14 +5,12 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <type_traits>
 
 struct Foo
 {
-  typedef std::true_type is_true;
-  typedef std::false_type is_false;
+  using is_true = std::true_type;
+  using is_false = std::false_type;
 };
 
 int
@@ -36,18 +34,3 @@ run_main (int, ACE_TCHAR *[])
 
   return retval;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_25_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_26_Test.cpp b/ACE/tests/Compiler_Features_26_Test.cpp
index e48b6709f40..46445558a23 100644
--- a/ACE/tests/Compiler_Features_26_Test.cpp
+++ b/ACE/tests/Compiler_Features_26_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <memory>
 
 int
@@ -74,18 +72,3 @@ run_main (int, ACE_TCHAR *[])
 
   return retval;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_26_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_27_Test.cpp b/ACE/tests/Compiler_Features_27_Test.cpp
index d8a58d0ee78..36781025044 100644
--- a/ACE/tests/Compiler_Features_27_Test.cpp
+++ b/ACE/tests/Compiler_Features_27_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <string>
 
 class Foo
@@ -34,18 +32,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_27_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_28_Test.cpp b/ACE/tests/Compiler_Features_28_Test.cpp
index 4ec46119ebc..a31da3380f4 100644
--- a/ACE/tests/Compiler_Features_28_Test.cpp
+++ b/ACE/tests/Compiler_Features_28_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <cstdint>
 
 enum class OPERATIONS
@@ -43,18 +41,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_28_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_29_Test.cpp b/ACE/tests/Compiler_Features_29_Test.cpp
index a74d2bcd212..9ff037ee2de 100644
--- a/ACE/tests/Compiler_Features_29_Test.cpp
+++ b/ACE/tests/Compiler_Features_29_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <cstdint>
 
 class A
@@ -27,18 +25,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_29_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_31_Test.cpp b/ACE/tests/Compiler_Features_31_Test.cpp
index e3202977d57..f0665819fad 100644
--- a/ACE/tests/Compiler_Features_31_Test.cpp
+++ b/ACE/tests/Compiler_Features_31_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 namespace A
 {
   namespace C
@@ -17,7 +15,7 @@ namespace A
     template <typename T>
     struct abstractbase_traits
     {
-      typedef abstractbase_reference<T> ref_type;
+      using ref_type = abstractbase_reference<T>;
       static ref_type narrow(abstractbase_reference<C::AbstractBase>);
       static ref_type narrow2(abstractbase_reference<C::AbstractBase>);
     };
@@ -56,18 +54,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_31_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp
index 186aa99c53d..cbba2e2cfe8 100644
--- a/ACE/tests/Compiler_Features_32_Test.cpp
+++ b/ACE/tests/Compiler_Features_32_Test.cpp
@@ -15,8 +15,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <string>
 
 class A
@@ -45,7 +43,7 @@ A::u_type_::~u_type_ ()
 void A::clear ()
 {
 #if defined __clang__ && \
-    (defined __apple_build_version__ && __apple_build_version__ <= 11030032 \
+    (defined __apple_build_version__ && __apple_build_version__ <= 12000322 \
      || __clang_major__ <= 10)
 #define CLANG_WORKAROUND
 #endif
@@ -86,18 +84,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_32_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_34_Test.cpp b/ACE/tests/Compiler_Features_34_Test.cpp
index 2e9629c04e1..ac398b4df77 100644
--- a/ACE/tests/Compiler_Features_34_Test.cpp
+++ b/ACE/tests/Compiler_Features_34_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 class B
 {
 public:
@@ -29,18 +27,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_34_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_35_Test.cpp b/ACE/tests/Compiler_Features_35_Test.cpp
index 490f2bf208d..3193b57dfd3 100644
--- a/ACE/tests/Compiler_Features_35_Test.cpp
+++ b/ACE/tests/Compiler_Features_35_Test.cpp
@@ -5,8 +5,6 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <memory>
 
 class foo_impl;
@@ -41,18 +39,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_35_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_36_Test.cpp b/ACE/tests/Compiler_Features_36_Test.cpp
index 7b9096e0bd4..9a4f81c3acc 100644
--- a/ACE/tests/Compiler_Features_36_Test.cpp
+++ b/ACE/tests/Compiler_Features_36_Test.cpp
@@ -5,14 +5,12 @@
 
 #include "test_config.h"
 
-#if defined (ACE_HAS_CPP11)
-
 #include <type_traits>
 
 template <typename T>
 struct non_instantiatable
 {
-  typedef typename T::THIS_TYPE_CANNOT_BE_INSTANTIATED type;
+  using type = typename T::THIS_TYPE_CANNOT_BE_INSTANTIATED;
 };
 
 int
@@ -30,18 +28,3 @@ run_main (int, ACE_TCHAR *[])
 
   return 0;
 }
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT("Compiler_Features_36_Test"));
-
-  ACE_DEBUG ((LM_INFO,
-              ACE_TEXT ("No C++11 support enabled\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif
diff --git a/ACE/tests/Compiler_Features_37_Test.cpp b/ACE/tests/Compiler_Features_37_Test.cpp
index 5d88aee0033..8fe14fda578 100644
--- a/ACE/tests/Compiler_Features_37_Test.cpp
+++ b/ACE/tests/Compiler_Features_37_Test.cpp
@@ -12,9 +12,9 @@ class my_map
 public:
   my_map () : capacity_ (0), nodes_(0) {}
   ~my_map ();
-  typedef key key_type;
-  typedef value data_type;
-  typedef std::pair<key, value> value_type;
+  using key_type = key;
+  using data_type = value;
+  using value_type = std::pair<key, value>;
   size_t capacity_;
   value_type* nodes_;
 };
diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp
index 1c2f901bb7d..402fdd4816e 100644
--- a/ACE/tests/Compiler_Features_38_Test.cpp
+++ b/ACE/tests/Compiler_Features_38_Test.cpp
@@ -11,7 +11,7 @@ class Foo_T
 {
 public:
   Foo_T () : member() {};
-  typedef T& T_elem;
+  using T_elem = T &;
   T_elem operator[] (ACE_CDR::ULong) { return member; }
 private:
   T member;
@@ -21,7 +21,7 @@ struct Foo2
 {
   long i;
 };
-typedef Foo_T<Foo2> Foo2Seq;
+using Foo2Seq = Foo_T<Foo2>;
 
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp
index 56d8b26b64c..510ce0a0d35 100644
--- a/ACE/tests/Config_Test.cpp
+++ b/ACE/tests/Config_Test.cpp
@@ -334,7 +334,7 @@ test_subkey_path (ACE_Configuration* config)
 }
 
 static int
-run_tests (void)
+run_tests ()
 {
   int status;
 
diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp
index 6a9c5f7f912..4986926a2a0 100644
--- a/ACE/tests/Conn_Test.cpp
+++ b/ACE/tests/Conn_Test.cpp
@@ -66,28 +66,17 @@ static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
      typedef ACE_Null_Mutex ACCEPTOR_LOCKING;
 #  else
 #    include "ace/Process_Mutex.h"
-     typedef ACE_Process_Mutex ACCEPTOR_LOCKING;
+     using ACCEPTOR_LOCKING = ACE_Process_Mutex;
 #    define CLEANUP_PROCESS_MUTEX
 #  endif /* ACE_HAS_THREAD_SAFE_ACCEPT */
 #endif /* ACE_LACKS_FORK */
 
-typedef ACE_Oneshot_Acceptor<Svc_Handler,
-                             ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING> >
-        ACCEPTOR;
-typedef ACE_Connector<Svc_Handler,
-                      ACE_SOCK_CONNECTOR>
-        CONNECTOR;
-typedef ACE_Strategy_Connector<Svc_Handler,
-                               ACE_SOCK_CONNECTOR>
-        STRAT_CONNECTOR;
-typedef ACE_NOOP_Creation_Strategy<Svc_Handler>
-        NULL_CREATION_STRATEGY;
-typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler>
-        NULL_ACTIVATION_STRATEGY;
-typedef ACE_Cached_Connect_Strategy<Svc_Handler,
-                                    ACE_SOCK_CONNECTOR,
-                                    ACE_SYNCH_MUTEX>
-        CACHED_CONNECT_STRATEGY;
+using ACCEPTOR = ACE_Oneshot_Acceptor<Svc_Handler, ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>>;
+using CONNECTOR = ACE_Connector<Svc_Handler, ACE_SOCK_Connector>;
+using STRAT_CONNECTOR = ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_Connector>;
+using NULL_CREATION_STRATEGY = ACE_NOOP_Creation_Strategy<Svc_Handler>;
+using NULL_ACTIVATION_STRATEGY = ACE_NOOP_Concurrency_Strategy<Svc_Handler>;
+using CACHED_CONNECT_STRATEGY = ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_Connector, ACE_MT_SYNCH::MUTEX>;
 
 #define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_MUTEX>
 #define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
@@ -136,7 +125,7 @@ Svc_Handler::recycle (void *)
 }
 
 void
-Svc_Handler::send_data (void)
+Svc_Handler::send_data ()
 {
   // Send data to server.
 
@@ -148,7 +137,7 @@ Svc_Handler::send_data (void)
 }
 
 void
-Svc_Handler::recv_data (void)
+Svc_Handler::recv_data ()
 {
   ACE_SOCK_Stream &new_stream = this->peer ();
 
diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp
index 6afb08ca341..25d4212468e 100644
--- a/ACE/tests/DLL_Test.cpp
+++ b/ACE/tests/DLL_Test.cpp
@@ -31,9 +31,8 @@
 #endif /* ACE_WIN32 */
 
 // Declare the type of the symbol:
-typedef Hello *(*Hello_Factory)(void);
-
-typedef int ( *PFN )( Parent* );
+using Hello_Factory = Hello *(*)();
+using PFN = int (*)(Parent *);
 
 int handle_test (ACE_DLL &dll)
 {
@@ -93,7 +92,7 @@ int basic_test (ACE_DLL &dll)
                        dll.error ()),
                       -1);
 
-  auto_ptr<Hello> my_hello (factory ());
+  std::unique_ptr<Hello> my_hello (factory ());
 
   // Make the method calls, as the object pointer is available.
   my_hello->say_hello ();
diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp
index 65319575d12..c99cb06fc8c 100644
--- a/ACE/tests/DLL_Test_Impl.cpp
+++ b/ACE/tests/DLL_Test_Impl.cpp
@@ -16,31 +16,31 @@
 #include "ace/svc_export.h"
 #include "ace/OS_NS_string.h"
 
-Hello_Impl::Hello_Impl (void)
+Hello_Impl::Hello_Impl ()
 {
   ACE_DEBUG ((LM_DEBUG, "Hello_Impl::Hello_Impl\n"));
 }
 
-Hello_Impl::~Hello_Impl (void)
+Hello_Impl::~Hello_Impl ()
 {
   ACE_DEBUG ((LM_DEBUG, "Hello_Impl::~Hello_Impl\n"));
 }
 
 void
-Hello_Impl::say_next (void)
+Hello_Impl::say_next ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("How are you?\n")));
 }
 
 ACE_TCHAR *
-Hello_Impl::new_info (void)
+Hello_Impl::new_info ()
 {
   return ACE::strnew (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE::strnew()"));
 }
 
 ACE_TCHAR *
-Hello_Impl::malloc_info (void)
+Hello_Impl::malloc_info ()
 {
   return ACE_OS::strdup (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE_OS::malloc()"));
 }
@@ -94,12 +94,12 @@ get_hello (void)
 class Static_Constructor_Test
 {
 public:
-  Static_Constructor_Test (void)
+  Static_Constructor_Test ()
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Static_Constructor_Test::Static_Constructor_Test\n"));
   }
-  ~Static_Constructor_Test (void)
+  ~Static_Constructor_Test ()
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Static_Constructor_Test::~Static_Constructor_Test\n"));
@@ -110,16 +110,16 @@ static Static_Constructor_Test the_instance;
 
 // --------------------------------------------------------
 
-Child::Child (void)
+Child::Child ()
 {
 }
 
-Child::~Child (void)
+Child::~Child ()
 {
 }
 
 void
-Child::test (void)
+Child::test ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("child called\n")));
 }
diff --git a/ACE/tests/DLL_Test_Parent.cpp b/ACE/tests/DLL_Test_Parent.cpp
index 26c533d5518..4788c88f868 100644
--- a/ACE/tests/DLL_Test_Parent.cpp
+++ b/ACE/tests/DLL_Test_Parent.cpp
@@ -1,12 +1,12 @@
 #include "DLL_Test_Parent.h"
 #include "ace/Log_Msg.h"
 
-Parent::~Parent (void)
+Parent::~Parent ()
 {
 }
 
 void
-Parent::test (void)
+Parent::test ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("parent called\n")));
 }
diff --git a/ACE/tests/DLList_Test.cpp b/ACE/tests/DLList_Test.cpp
index f55028d3dc1..182664be037 100644
--- a/ACE/tests/DLList_Test.cpp
+++ b/ACE/tests/DLList_Test.cpp
@@ -15,10 +15,10 @@
 #include "ace/SString.h"
 #include "ace/Malloc_T.h"
 
-typedef ACE_TCHAR *ACE_STRING;
-typedef ACE_DLList<ACE_STRING> STRLIST;
-typedef ACE_DLList_Iterator<ACE_STRING> STRLIST_ITERATOR;
-typedef ACE_DLList_Reverse_Iterator<ACE_STRING> STRLIST_REVERSE_ITERATOR;
+using ACE_STRING = ACE_TCHAR *;
+using STRLIST = ACE_DLList<ACE_STRING>;
+using STRLIST_ITERATOR = ACE_DLList_Iterator<ACE_STRING>;
+using STRLIST_REVERSE_ITERATOR = ACE_DLList_Reverse_Iterator<ACE_STRING>;
 
 static ACE_STRING string_table[] =
 {
@@ -67,7 +67,7 @@ run_reverse_iterate (STRLIST &list)
 }
 
 static int
-run_test (void)
+run_test ()
 {
   STRLIST list;
 
diff --git a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp
index e5d231dd903..f33a16646cd 100644
--- a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp
+++ b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp
@@ -30,7 +30,7 @@
 
 #include <queue>
 
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> SVC_HANDLER;
+using SVC_HANDLER = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>;
 
 // ----------------------------------------------------
 
@@ -38,21 +38,21 @@ class Client : public SVC_HANDLER
 {
 public:
 
-  Client (void);
+  Client ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  virtual int open (void * = 0);
+  int open (void * = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
-  virtual int handle_output (ACE_HANDLE handle);
+  int handle_output (ACE_HANDLE handle) override;
 
-  virtual int handle_input (ACE_HANDLE handle);
+  int handle_input (ACE_HANDLE handle) override;
 
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act);
+  int handle_timeout (const ACE_Time_Value &current_time,
+                              const void *act) override;
 
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask mask);
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask mask) override;
 
   std::string sent;
   std::string received;
@@ -66,14 +66,14 @@ class Server : public SVC_HANDLER
 {
 public:
 
-  Server (void);
+  Server ();
 
-  virtual int handle_input (ACE_HANDLE handle);
+  int handle_input (ACE_HANDLE handle) override;
 
-  virtual int handle_output (ACE_HANDLE handle);
+  int handle_output (ACE_HANDLE handle) override;
 
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask mask);
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask mask) override;
 
 private:
   int send_i (const char* buffer,
@@ -85,7 +85,7 @@ private:
 
 // ----------------------------------------------------
 
-Client::Client (void)
+Client::Client ()
   : call_count_ (0)
 {
 }
@@ -233,7 +233,7 @@ Client::handle_close (ACE_HANDLE handle,
 
 // ----------------------------------------------------
 
-Server::Server (void)
+Server::Server ()
   : offset_ (0)
 {
 }
@@ -361,8 +361,8 @@ Server::handle_close (ACE_HANDLE handle,
 
 // ----------------------------------------------------
 
-typedef ACE_Acceptor<Server, ACE_SOCK_ACCEPTOR>   ACCEPTOR;
-typedef ACE_Connector<Client, ACE_SOCK_CONNECTOR> CONNECTOR;
+using ACCEPTOR = ACE_Acceptor<Server, ACE_SOCK_Acceptor>;
+using CONNECTOR = ACE_Connector<Client, ACE_SOCK_Connector>;
 
 // ----------------------------------------------------
 
@@ -370,7 +370,7 @@ class TestAcceptor : public ACCEPTOR
 {
 public:
 
-  virtual int accept_svc_handler (Server * handler)
+  int accept_svc_handler (Server * handler) override
   {
     int result = this->ACCEPTOR::accept_svc_handler (handler);
 
@@ -400,14 +400,14 @@ class TestConnector : public CONNECTOR
 {
 public:
 
-  virtual int connect_svc_handler (
+  int connect_svc_handler (
     CONNECTOR::handler_type *& handler,
     const CONNECTOR::addr_type &remote_addr,
     ACE_Time_Value *timeout,
     const CONNECTOR::addr_type &local_addr,
     int reuse_addr,
     int flags,
-    int perms)
+    int perms) override
   {
     const int result = this->CONNECTOR::connect_svc_handler (handler,
                                                              remote_addr,
@@ -438,7 +438,7 @@ public:
     return result;
   }
 
-  virtual int connect_svc_handler (
+  int connect_svc_handler (
     CONNECTOR::handler_type *& handler,
     CONNECTOR::handler_type *& sh_copy,
     const CONNECTOR::addr_type &remote_addr,
@@ -446,7 +446,7 @@ public:
     const CONNECTOR::addr_type &local_addr,
     int reuse_addr,
     int flags,
-    int perms) {
+    int perms) override {
     sh_copy = handler;
     return this->connect_svc_handler (handler, remote_addr, timeout,
                                       local_addr, reuse_addr, flags,
diff --git a/ACE/tests/Dev_Poll_Reactor_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Test.cpp
index 3d023059334..14cfa9e27e8 100644
--- a/ACE/tests/Dev_Poll_Reactor_Test.cpp
+++ b/ACE/tests/Dev_Poll_Reactor_Test.cpp
@@ -36,7 +36,7 @@
 #include "ace/OS_NS_netdb.h"
 
 
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> SVC_HANDLER;
+using SVC_HANDLER = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>;
 
 // ----------------------------------------------------
 
@@ -44,19 +44,19 @@ class Client : public SVC_HANDLER
 {
 public:
 
-  Client (void);
+  Client ();
 
   //FUZZ: disable check_for_lack_ACE_OS
-  virtual int open (void * = 0);
+  int open (void * = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
-  virtual int handle_output (ACE_HANDLE handle);
+  int handle_output (ACE_HANDLE handle) override;
 
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act);
+  int handle_timeout (const ACE_Time_Value &current_time,
+                              const void *act) override;
 
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask mask);
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask mask) override;
 
 private:
 
@@ -69,15 +69,15 @@ class Server : public SVC_HANDLER
 {
 public:
 
-  Server (void);
+  Server ();
 
-  virtual int handle_input (ACE_HANDLE handle);
+  int handle_input (ACE_HANDLE handle) override;
 
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act);
+  int handle_timeout (const ACE_Time_Value &current_time,
+                              const void *act) override;
 
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask mask);
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask mask) override;
 
 private:
 
@@ -87,7 +87,7 @@ private:
 
 // ----------------------------------------------------
 
-Client::Client (void)
+Client::Client ()
   : call_count_ (0)
 {
 }
@@ -198,7 +198,7 @@ Client::handle_close (ACE_HANDLE handle,
 
 // ----------------------------------------------------
 
-Server::Server (void)
+Server::Server ()
   : call_count_ (0)
 {
 }
@@ -310,8 +310,8 @@ Server::handle_close (ACE_HANDLE handle,
 
 // ----------------------------------------------------
 
-typedef ACE_Acceptor<Server, ACE_SOCK_ACCEPTOR>   ACCEPTOR;
-typedef ACE_Connector<Client, ACE_SOCK_CONNECTOR> CONNECTOR;
+using ACCEPTOR = ACE_Acceptor<Server, ACE_SOCK_Acceptor>;
+using CONNECTOR = ACE_Connector<Client, ACE_SOCK_Connector>;
 
 // ----------------------------------------------------
 
@@ -319,7 +319,7 @@ class TestAcceptor : public ACCEPTOR
 {
 public:
 
-  virtual int accept_svc_handler (Server * handler)
+  int accept_svc_handler (Server * handler) override
   {
     int result = this->ACCEPTOR::accept_svc_handler (handler);
 
@@ -369,14 +369,14 @@ class TestConnector : public CONNECTOR
 {
 public:
 
-  virtual int connect_svc_handler (
+  int connect_svc_handler (
     CONNECTOR::handler_type *& handler,
     const CONNECTOR::addr_type &remote_addr,
     ACE_Time_Value *timeout,
     const CONNECTOR::addr_type &local_addr,
     int reuse_addr,
     int flags,
-    int perms)
+    int perms) override
   {
     const int result = this->CONNECTOR::connect_svc_handler (handler,
                                                              remote_addr,
@@ -423,7 +423,7 @@ public:
     return result;
   }
 
-  virtual int connect_svc_handler (
+  int connect_svc_handler (
     CONNECTOR::handler_type *& handler,
     CONNECTOR::handler_type *& sh_copy,
     const CONNECTOR::addr_type &remote_addr,
@@ -431,7 +431,7 @@ public:
     const CONNECTOR::addr_type &local_addr,
     int reuse_addr,
     int flags,
-    int perms) {
+    int perms) override {
     sh_copy = handler;
     return this->connect_svc_handler (handler, remote_addr, timeout,
                                       local_addr, reuse_addr, flags,
diff --git a/ACE/tests/Dirent_Test.cpp b/ACE/tests/Dirent_Test.cpp
index 550ede491a0..118675e3730 100644
--- a/ACE/tests/Dirent_Test.cpp
+++ b/ACE/tests/Dirent_Test.cpp
@@ -55,7 +55,7 @@ comparator (const ACE_DIRENT **d1, const ACE_DIRENT **d2)
 } /* extern "C" */
 
 static int
-dirent_selector_test (void)
+dirent_selector_test ()
 {
   int n;
   int error = 0;
@@ -156,7 +156,7 @@ dirent_selector_test (void)
 }
 
 static int
-dirent_test (void)
+dirent_test ()
 {
   ACE_Dirent dir;
 
@@ -315,7 +315,7 @@ dirent_count (const ACE_TCHAR *dir_path,
 }
 
 static int
-dirent_recurse_test (void)
+dirent_recurse_test ()
 {
   int total_dirs = 0;
   int total_files = 0;
diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp
index fa0cd5e7dba..ec9853d34ef 100644
--- a/ACE/tests/FIFO_Test.cpp
+++ b/ACE/tests/FIFO_Test.cpp
@@ -182,7 +182,7 @@ server (void *arg)
 }
 
 static int
-test_fifo_msg (void)
+test_fifo_msg ()
 {
   // Reader side opens first - it may fail if fifo not supported on this
   // platform.
diff --git a/ACE/tests/Framework_Component_DLL.cpp b/ACE/tests/Framework_Component_DLL.cpp
index 2d3f50c687b..b3ef6c457a6 100644
--- a/ACE/tests/Framework_Component_DLL.cpp
+++ b/ACE/tests/Framework_Component_DLL.cpp
@@ -19,18 +19,18 @@
 
 ACE_DLL_UNLOAD_POLICY (Framework_Component_DLL, ACE_DLL_UNLOAD_POLICY_LAZY)
 
-Simple_Service::Simple_Service (void)
+Simple_Service::Simple_Service ()
 {
   FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::Simple_Service");
 }
 
-Simple_Service::~Simple_Service (void)
+Simple_Service::~Simple_Service ()
 {
   FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::~Simple_Service");
 }
 
 const ACE_TCHAR *
-Simple_Service::name (void)
+Simple_Service::name ()
 {
   FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::dll_name");
   return ACE_TEXT ("Simple_Service");
@@ -42,7 +42,7 @@ template <int which>
 class Server_T : public ACE_Service_Object
 {
 public:
-  int init (int, ACE_TCHAR *[])
+  int init (int, ACE_TCHAR *[]) override
   {
     FRAMEWORK_COMPONENT_DLL_TRACE ("Server_T::init");
 
@@ -55,18 +55,18 @@ public:
     return 0;
   }
 
-  int fini (void)
+  int fini () override
   {
     FRAMEWORK_COMPONENT_DLL_TRACE ("Server_T::fini");
     return 0;
   }
 };
 
-typedef Server_T <1> Server_1;
+using Server_1 = Server_T<1>;
 FRAMEWORK_COMPONENT_DLL_SINGLETON_DECLARATION(Server_T<1>;)
 ACE_FACTORY_DEFINE (Framework_Component_DLL, Server_1)
 
-typedef Server_T <2> Server_2;
+using Server_2 = Server_T<2>;
 FRAMEWORK_COMPONENT_DLL_SINGLETON_DECLARATION(Server_T<2>;)
 ACE_FACTORY_DEFINE (Framework_Component_DLL, Server_2)
 
diff --git a/ACE/tests/Future_Set_Test.cpp b/ACE/tests/Future_Set_Test.cpp
index f2040536dfd..3648646a703 100644
--- a/ACE/tests/Future_Set_Test.cpp
+++ b/ACE/tests/Future_Set_Test.cpp
@@ -33,7 +33,7 @@
 
 #if defined (ACE_HAS_THREADS)
 
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT;
+using ATOMIC_INT = ACE_Atomic_Op<ACE_Thread_Mutex, int>;
 
 // A counter for the tasks..
 static ATOMIC_INT task_count (0);
@@ -59,28 +59,28 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Initializer.
-  virtual int open (void *args = 0);
+  int open (void *args = 0) override;
 
   /// Terminator.
   //FUZZ: enable check_for_lack_ACE_OS
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /// Destructor.
-  virtual ~Prime_Scheduler (void);
+  ~Prime_Scheduler () override;
 
   // = These methods are part of the Active Object Proxy interface.
   ACE_Future<u_long> work (u_long param, int count = 1);
-  ACE_Future<const ACE_TCHAR*> name (void);
-  void end (void);
+  ACE_Future<const ACE_TCHAR*> name ();
+  void end ();
 
 protected:
   /// Runs the Prime_Scheduler's event loop, which dequeues
   /// <Method_Requests> and dispatches them.
-  virtual int svc (void);
+  int svc () override;
 
   // = These are the Servant methods that do the actual work.
   u_long work_i (u_long, int);
-  const ACE_TCHAR *name_i (void);
+  const ACE_TCHAR *name_i ();
 
 private:
   // = These are the <Prime_Scheduler> implementation details.
@@ -101,10 +101,10 @@ public:
                        u_long,
                        int,
                        ACE_Future<u_long> &);
-  virtual ~Method_Request_work (void);
+  ~Method_Request_work () override;
 
   /// This is the entry point into the Active Object method.
-  virtual int call (void);
+  int call () override;
 
 private:
   Prime_Scheduler *scheduler_;
@@ -133,14 +133,14 @@ Method_Request_work::Method_Request_work (Prime_Scheduler *new_Prime_Scheduler,
               ACE_TEXT ("(%t) Method_Request_work created\n")));
 }
 
-Method_Request_work::~Method_Request_work (void)
+Method_Request_work::~Method_Request_work ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Method_Request_work will be deleted.\n")));
 }
 
 int
-Method_Request_work::call (void)
+Method_Request_work::call ()
 {
   // Dispatch the Servant's operation and store the result into the
   // Future.
@@ -159,10 +159,10 @@ class Method_Request_name : public ACE_Method_Request
 public:
   Method_Request_name (Prime_Scheduler *,
                        ACE_Future<const ACE_TCHAR*> &);
-  virtual ~Method_Request_name (void);
+  ~Method_Request_name () override;
 
   /// This is the entry point into the Active Object method.
-  virtual int call (void);
+  int call () override;
 
 private:
   Prime_Scheduler *scheduler_;
@@ -178,14 +178,14 @@ Method_Request_name::Method_Request_name (Prime_Scheduler *new_scheduler,
               ACE_TEXT ("(%t) Method_Request_name created\n")));
 }
 
-Method_Request_name::~Method_Request_name (void)
+Method_Request_name::~Method_Request_name ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Method_Request_name will be deleted.\n")));
 }
 
 int
-Method_Request_name::call (void)
+Method_Request_name::call ()
 {
   // Dispatch the Servant's operation and store the result into the
   // Future.
@@ -201,8 +201,8 @@ class Method_Request_end : public ACE_Method_Request
 {
 public:
   Method_Request_end (Prime_Scheduler *new_Prime_Scheduler);
-  virtual ~Method_Request_end (void);
-  virtual int call (void);
+  ~Method_Request_end () override;
+  int call () override;
 
 private:
   Prime_Scheduler *scheduler_;
@@ -213,12 +213,12 @@ Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler)
 {
 }
 
-Method_Request_end::~Method_Request_end (void)
+Method_Request_end::~Method_Request_end ()
 {
 }
 
 int
-Method_Request_end::call (void)
+Method_Request_end::call ()
 {
   // Shut down the scheduler.
   this->scheduler_->shutdown ();
@@ -241,7 +241,7 @@ Prime_Scheduler::Prime_Scheduler (const ACE_TCHAR *newname,
 
 // Destructor
 
-Prime_Scheduler::~Prime_Scheduler (void)
+Prime_Scheduler::~Prime_Scheduler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Prime_Scheduler %s will be destroyed\n"),
@@ -265,7 +265,7 @@ Prime_Scheduler::open (void *)
 // close
 
 int
-Prime_Scheduler::shutdown (void)
+Prime_Scheduler::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Prime_Scheduler %s shutdown\n"),
@@ -277,13 +277,13 @@ Prime_Scheduler::shutdown (void)
 // Service..
 
 int
-Prime_Scheduler::svc (void)
+Prime_Scheduler::svc ()
 {
   for (;;)
     {
       // Dequeue the next method request (we use an auto pointer in
       // case an exception is thrown in the <call>).
-      auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
+      std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) calling method request\n")));
@@ -298,7 +298,7 @@ Prime_Scheduler::svc (void)
 }
 
 void
-Prime_Scheduler::end (void)
+Prime_Scheduler::end ()
 {
   this->activation_queue_.enqueue (new Method_Request_end (this));
 }
@@ -316,13 +316,13 @@ Prime_Scheduler::work_i (u_long param,
 }
 
 const ACE_TCHAR *
-Prime_Scheduler::name_i (void)
+Prime_Scheduler::name_i ()
 {
   return this->name_;
 }
 
 ACE_Future<const ACE_TCHAR *>
-Prime_Scheduler::name (void)
+Prime_Scheduler::name ()
 {
   if (this->scheduler_)
     // Delegate to the Prime_Scheduler.
@@ -363,11 +363,11 @@ Prime_Scheduler::work (u_long newparam,
 // Total number of loops.
 static int n_loops = 100;
 
-typedef ACE_Future_Rep<u_long> *u_long_key;
-typedef ACE_Future_Holder<u_long> *u_long_value;
+using u_long_key = ACE_Future_Rep<u_long> *;
+using u_long_value = ACE_Future_Holder<u_long> *;
 
-typedef ACE_Future_Rep<const ACE_TCHAR *> *char_star_key;
-typedef ACE_Future_Holder<const ACE_TCHAR *> *char_star_value;
+using char_star_key = ACE_Future_Rep<const ACE_TCHAR *> *;
+using char_star_value = ACE_Future_Holder<const ACE_TCHAR *> *;
 
 #endif /* ACE_HAS_THREADS */
 
diff --git a/ACE/tests/Future_Test.cpp b/ACE/tests/Future_Test.cpp
index dc2b9e014f2..2340b684fe4 100644
--- a/ACE/tests/Future_Test.cpp
+++ b/ACE/tests/Future_Test.cpp
@@ -30,7 +30,7 @@
 
 #if defined (ACE_HAS_THREADS)
 
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT;
+using ATOMIC_INT = ACE_Atomic_Op<ACE_Thread_Mutex, int>;
 
 // A counter for the tasks..
 static ATOMIC_INT task_count (0);
@@ -65,28 +65,28 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Initializer.
-  virtual int open (void *args = 0);
+  int open (void *args = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
   /// Terminator.
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /// Destructor.
-  virtual ~Prime_Scheduler (void);
+  ~Prime_Scheduler () override;
 
   // = These methods are part of the Active Object Proxy interface.
   ACE_Future<u_long> work (u_long param, int count = 1);
-  ACE_Future<const ACE_TCHAR*> name (void);
-  void end (void);
+  ACE_Future<const ACE_TCHAR*> name ();
+  void end ();
 
 protected:
   /// Runs the Prime_Scheduler's event loop, which dequeues
   /// <Method_Requests> and dispatches them.
-  virtual int svc (void);
+  int svc () override;
 
   // = These are the Servant methods that do the actual work.
   u_long work_i (u_long, int);
-  const ACE_TCHAR *name_i (void);
+  const ACE_TCHAR *name_i ();
 
 private:
   // = These are the <Prime_Scheduler> implementation details.
@@ -107,10 +107,10 @@ public:
                        u_long,
                        int,
                        ACE_Future<u_long> &);
-  virtual ~Method_Request_work (void);
+  ~Method_Request_work () override;
 
   /// This is the entry point into the Active Object method.
-  virtual int call (void);
+  int call () override;
 
 private:
   Prime_Scheduler *scheduler_;
@@ -139,14 +139,14 @@ Method_Request_work::Method_Request_work (Prime_Scheduler *new_Prime_Scheduler,
               ACE_TEXT ("(%t) Method_Request_work created\n")));
 }
 
-Method_Request_work::~Method_Request_work (void)
+Method_Request_work::~Method_Request_work ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Method_Request_work will be deleted.\n")));
 }
 
 int
-Method_Request_work::call (void)
+Method_Request_work::call ()
 {
   // Dispatch the Servant's operation and store the result into the
   // Future.
@@ -165,10 +165,10 @@ class Method_Request_name : public ACE_Method_Request
 public:
   Method_Request_name (Prime_Scheduler *,
                        ACE_Future<const ACE_TCHAR*> &);
-  virtual ~Method_Request_name (void);
+  ~Method_Request_name () override;
 
   /// This is the entry point into the Active Object method.
-  virtual int call (void);
+  int call () override;
 
 private:
   Prime_Scheduler *scheduler_;
@@ -184,14 +184,14 @@ Method_Request_name::Method_Request_name (Prime_Scheduler *new_scheduler,
               ACE_TEXT ("(%t) Method_Request_name created\n")));
 }
 
-Method_Request_name::~Method_Request_name (void)
+Method_Request_name::~Method_Request_name ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Method_Request_name will be deleted.\n")));
 }
 
 int
-Method_Request_name::call (void)
+Method_Request_name::call ()
 {
   // Dispatch the Servant's operation and store the result into the
   // Future.
@@ -207,8 +207,8 @@ class Method_Request_end : public ACE_Method_Request
 {
 public:
   Method_Request_end (Prime_Scheduler *new_Prime_Scheduler);
-  virtual ~Method_Request_end (void);
-  virtual int call (void);
+  ~Method_Request_end () override;
+  int call () override;
 
 private:
   Prime_Scheduler *scheduler_;
@@ -219,12 +219,12 @@ Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler)
 {
 }
 
-Method_Request_end::~Method_Request_end (void)
+Method_Request_end::~Method_Request_end ()
 {
 }
 
 int
-Method_Request_end::call (void)
+Method_Request_end::call ()
 {
   // Shut down the scheduler.
   this->scheduler_->shutdown ();
@@ -247,7 +247,7 @@ Prime_Scheduler::Prime_Scheduler (const ACE_TCHAR *newname,
 
 // Destructor
 
-Prime_Scheduler::~Prime_Scheduler (void)
+Prime_Scheduler::~Prime_Scheduler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Prime_Scheduler %s will be destroyed\n"),
@@ -271,7 +271,7 @@ Prime_Scheduler::open (void *)
 // close
 
 int
-Prime_Scheduler::shutdown (void)
+Prime_Scheduler::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Prime_Scheduler %s shutdown\n"),
@@ -283,13 +283,13 @@ Prime_Scheduler::shutdown (void)
 // Service..
 
 int
-Prime_Scheduler::svc (void)
+Prime_Scheduler::svc ()
 {
   for (;;)
     {
       // Dequeue the next method request (we use an auto pointer in
       // case an exception is thrown in the <call>).
-      auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
+      std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) calling method request\n")));
@@ -304,7 +304,7 @@ Prime_Scheduler::svc (void)
 }
 
 void
-Prime_Scheduler::end (void)
+Prime_Scheduler::end ()
 {
   this->activation_queue_.enqueue (new Method_Request_end (this));
 }
@@ -322,13 +322,13 @@ Prime_Scheduler::work_i (u_long param,
 }
 
 const ACE_TCHAR *
-Prime_Scheduler::name_i (void)
+Prime_Scheduler::name_i ()
 {
   return this->name_;
 }
 
 ACE_Future<const ACE_TCHAR *>
-Prime_Scheduler::name (void)
+Prime_Scheduler::name ()
 {
   if (this->scheduler_)
     // Delegate to the Prime_Scheduler.
diff --git a/ACE/tests/Handle_Set_Test.cpp b/ACE/tests/Handle_Set_Test.cpp
index 27ecc58ee65..8444d495d6a 100644
--- a/ACE/tests/Handle_Set_Test.cpp
+++ b/ACE/tests/Handle_Set_Test.cpp
@@ -91,7 +91,7 @@ static ACE_HANDLE handle_vector[] =
 #endif /* ACE_WIN64 */
 
 static void
-test_boundaries (void)
+test_boundaries ()
 {
   ACE_Handle_Set handle_set;
   ACE_Unbounded_Set<ACE_HANDLE> set;
diff --git a/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp b/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp
index c1b0a5233e6..2f2f8ac5422 100644
--- a/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp
+++ b/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp
@@ -51,17 +51,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-typedef ACE_Hash_Map_Manager_Ex<ACE_UINT32,
-                                ACE_UINT32,
-                                ACE_Hash<ACE_UINT32>,
-                                ACE_Equal_To<ACE_UINT32>,
-                                ACE_SYNCH_NULL_MUTEX> HASH_MAP;
-
-typedef ACE_Hash_Map_Bucket_Iterator<ACE_UINT32,
-                                     ACE_UINT32,
-                                     ACE_Hash<ACE_UINT32>,
-                                     ACE_Equal_To<ACE_UINT32>,
-                                     ACE_SYNCH_NULL_MUTEX> HASH_MAP_BUCKET_ITERATOR;
+using HASH_MAP = ACE_Hash_Map_Manager_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_MT_SYNCH::NULL_MUTEX>;
+
+using HASH_MAP_BUCKET_ITERATOR = ACE_Hash_Map_Bucket_Iterator<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_MT_SYNCH::NULL_MUTEX>;
 
 int
 run_main (int argc, ACE_TCHAR *argv[])
diff --git a/ACE/tests/Hash_Map_Manager_Test.cpp b/ACE/tests/Hash_Map_Manager_Test.cpp
index ef9ffe69760..034c73e80ba 100644
--- a/ACE/tests/Hash_Map_Manager_Test.cpp
+++ b/ACE/tests/Hash_Map_Manager_Test.cpp
@@ -24,8 +24,7 @@
 static const size_t STRING_TABLE_ENTRIES = 3 * 2;
 static const size_t MAX_HASH = 6;
 
-typedef ACE_Hash_Map_Entry<const ACE_TCHAR *,
-                           const ACE_TCHAR *> HASH_STRING_ENTRY;
+using HASH_STRING_ENTRY = ACE_Hash_Map_Entry<const ACE_TCHAR *, const ACE_TCHAR *>;
 
 // @@ The following requires too much internal implementation
 // information about the <ACE_Hash_Map_Manager>.  We need to figure
@@ -35,29 +34,13 @@ static const size_t STRING_TABLE_SIZE =
 
 static ACE_Static_Allocator<STRING_TABLE_SIZE> ace_test_allocator;
 
-typedef ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *,
-                                const ACE_TCHAR *,
-                                ACE_Hash<const ACE_TCHAR *>,
-                                ACE_Equal_To<const ACE_TCHAR *>,
-                                ACE_Null_Mutex> HASH_STRING_MAP;
-
-typedef ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *,
-                                 const ACE_TCHAR *,
-                                 ACE_Hash<const ACE_TCHAR *>,
-                                 ACE_Equal_To<const ACE_TCHAR *>,
-                                 ACE_Null_Mutex> HASH_STRING_ITER;
-
-typedef ACE_Hash_Map_Const_Iterator_Ex<const ACE_TCHAR *,
-                                       const ACE_TCHAR *,
-                                       ACE_Hash<const ACE_TCHAR *>,
-                                       ACE_Equal_To<const ACE_TCHAR *>,
-                                       ACE_Null_Mutex> HASH_STRING_CONST_ITER;
-
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *,
-                                         const ACE_TCHAR *,
-                                         ACE_Hash<const ACE_TCHAR *>,
-                                         ACE_Equal_To<const ACE_TCHAR *>,
-                                         ACE_Null_Mutex> HASH_STRING_REVERSE_ITER;
+using HASH_STRING_MAP = ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+
+using HASH_STRING_ITER = ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+
+using HASH_STRING_CONST_ITER = ACE_Hash_Map_Const_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+
+using HASH_STRING_REVERSE_ITER = ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
 
 struct String_Table
 {
@@ -178,7 +161,7 @@ int test_two_allocators ()
 }
 
 static int
-run_test (void)
+run_test ()
 {
   ace_test_allocator.dump ();
 
diff --git a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp
index 8117f5763b7..144befd426b 100644
--- a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp
+++ b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp
@@ -17,18 +17,14 @@
 
 
 
-typedef ACE_Hash_Multi_Map_Manager<const ACE_TCHAR *,
-                                   const ACE_TCHAR *,
-                                   ACE_Hash<const ACE_TCHAR *>,
-                                   ACE_Equal_To<const ACE_TCHAR *>,
-                                   ACE_Null_Mutex> HASH_STRING_MAP;
-
-typedef HASH_STRING_MAP::ENTRY HASH_STRING_ENTRY;
-typedef HASH_STRING_ENTRY::VALUE_SET HASH_STRING_VALUE_SET;
-typedef HASH_STRING_ENTRY::VALUE_SET_ITERATOR HASH_STRING_VALUE_SET_ITERATOR;
-typedef HASH_STRING_MAP::ITERATOR HASH_STRING_ITERATOR;
-typedef HASH_STRING_MAP::CONST_ITERATOR HASH_STRING_CONST_ITERATOR;
-typedef HASH_STRING_MAP::REVERSE_ITERATOR HASH_STRING_REVERSE_ITERATOR;
+using HASH_STRING_MAP = ACE_Hash_Multi_Map_Manager<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+
+using HASH_STRING_ENTRY = HASH_STRING_MAP::ENTRY;
+using HASH_STRING_VALUE_SET = HASH_STRING_ENTRY::VALUE_SET;
+using HASH_STRING_VALUE_SET_ITERATOR = HASH_STRING_ENTRY::VALUE_SET_ITERATOR;
+using HASH_STRING_ITERATOR = HASH_STRING_MAP::ITERATOR;
+using HASH_STRING_CONST_ITERATOR = HASH_STRING_MAP::CONST_ITERATOR;
+using HASH_STRING_REVERSE_ITERATOR = HASH_STRING_MAP::REVERSE_ITERATOR;
 
 static const ACE_TCHAR *color_sorts[] = {ACE_TEXT ("warm"), ACE_TEXT ("cold"), ACE_TEXT ("neutral"), 0};
 static const ACE_TCHAR *warm_colors[] = {ACE_TEXT ("red"), ACE_TEXT ("yellow"), ACE_TEXT ("orange"), 0};
@@ -36,7 +32,7 @@ static const ACE_TCHAR *cold_colors[] = {ACE_TEXT ("blue"), ACE_TEXT ("cyan"), 0
 static const ACE_TCHAR *neutral_colors[] = {ACE_TEXT ("green"), ACE_TEXT ("purple"), 0};
 
 static int
-run_test (void)
+run_test ()
 {
   HASH_STRING_MAP colors;
 
diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp
index cfcc9dce132..ff1b5f8fe6e 100644
--- a/ACE/tests/INET_Addr_Test.cpp
+++ b/ACE/tests/INET_Addr_Test.cpp
@@ -51,7 +51,7 @@ static int check_type_consistency (const ACE_INET_Addr &addr)
   return 0;
 }
 
-static bool test_tao_use (void)
+static bool test_tao_use ()
 {
   char host[256];
   if (::gethostname (host, 255) != 0)
@@ -85,7 +85,7 @@ static bool test_tao_use (void)
   return true;
 }
 
-static bool test_port_assignment (void)
+static bool test_port_assignment ()
 {
 #if defined (ACE_HAS_IPV6)
   ACE_INET_Addr addr1 (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6);
@@ -110,7 +110,7 @@ static bool test_port_assignment (void)
   return true;
 }
 
-static bool test_multiple (void)
+static bool test_multiple ()
 {
   bool success = true;
 
diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp
index 61e5dc9d32e..0ba6b9fad83 100644
--- a/ACE/tests/Integer_Truncate_Test.cpp
+++ b/ACE/tests/Integer_Truncate_Test.cpp
@@ -21,7 +21,7 @@ using namespace ACE_Utils;
 // ----------------------------------------------------
 
 bool
-sizeof_from_lt_sizeof_to (void)
+sizeof_from_lt_sizeof_to ()
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Running sizeof(FROM) < sizeof(TO) test\n")));
@@ -30,8 +30,8 @@ sizeof_from_lt_sizeof_to (void)
 
   // signed from_type, unsigned to_type
   {
-    typedef signed char from_type;
-    typedef unsigned int to_type;
+    using from_type = signed char;
+    using to_type = unsigned int;
 
     ACE_TEST_ASSERT (sizeof (from_type) < sizeof (to_type));
 
@@ -50,8 +50,8 @@ sizeof_from_lt_sizeof_to (void)
 
   // unsigned from_type, signed to_type
   {
-    typedef unsigned char from_type;
-    typedef signed int to_type;
+    using from_type = unsigned char;
+    using to_type = int;
 
     ACE_TEST_ASSERT (sizeof (from_type) < sizeof (to_type));
 
@@ -70,8 +70,8 @@ sizeof_from_lt_sizeof_to (void)
 
   // signed from_type, signed to_type
   {
-    typedef signed char from_type;
-    typedef signed int to_type;
+    using from_type = signed char;
+    using to_type = int;
 
     ACE_TEST_ASSERT (sizeof (from_type) < sizeof (to_type));
 
@@ -92,8 +92,8 @@ sizeof_from_lt_sizeof_to (void)
 
   // unsigned from_type, unsigned to_type
   {
-    typedef unsigned char from_type;
-    typedef unsigned int to_type;
+    using from_type = unsigned char;
+    using to_type = unsigned int;
 
     ACE_TEST_ASSERT (sizeof (from_type) < sizeof (to_type));
 
@@ -120,7 +120,7 @@ sizeof_from_lt_sizeof_to (void)
 }
 
 bool
-sizeof_from_eq_sizeof_to (void)
+sizeof_from_eq_sizeof_to ()
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Running sizeof(FROM) == sizeof(TO) test\n")));
@@ -129,8 +129,8 @@ sizeof_from_eq_sizeof_to (void)
 
   // signed from_type, unsigned to_type
   {
-    typedef signed int from_type;
-    typedef unsigned int to_type;
+    using from_type = int;
+    using to_type = unsigned int;
 
     ACE_TEST_ASSERT (sizeof (from_type) == sizeof (to_type));
 
@@ -151,8 +151,8 @@ sizeof_from_eq_sizeof_to (void)
 
   // unsigned from_type, signed to_type
   {
-    typedef unsigned int from_type;
-    typedef signed int to_type;
+    using from_type = unsigned int;
+    using to_type = int;
 
     ACE_TEST_ASSERT (sizeof (from_type) == sizeof (to_type));
 
@@ -171,8 +171,8 @@ sizeof_from_eq_sizeof_to (void)
 
   // signed from_type, signed to_type
   {
-    typedef signed int from_type;
-    typedef signed int to_type;
+    using from_type = int;
+    using to_type = int;
 
     ACE_TEST_ASSERT (sizeof (from_type) == sizeof (to_type));
 
@@ -193,8 +193,8 @@ sizeof_from_eq_sizeof_to (void)
 
   // unsigned from_type, unsigned to_type
   {
-    typedef unsigned int from_type;
-    typedef unsigned int to_type;
+    using from_type = unsigned int;
+    using to_type = unsigned int;
 
     ACE_TEST_ASSERT (sizeof (from_type) == sizeof (to_type));
 
@@ -221,7 +221,7 @@ sizeof_from_eq_sizeof_to (void)
 }
 
 bool
-sizeof_from_gt_sizeof_to (void)
+sizeof_from_gt_sizeof_to ()
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Running sizeof(FROM) > sizeof(TO) test\n")));
@@ -230,8 +230,8 @@ sizeof_from_gt_sizeof_to (void)
 
   // signed from_type, unsigned to_type
   {
-    typedef signed int from_type;
-    typedef unsigned char to_type;
+    using from_type = int;
+    using to_type = unsigned char;
 
     ACE_TEST_ASSERT (sizeof (from_type) > sizeof (to_type));
 
@@ -250,8 +250,8 @@ sizeof_from_gt_sizeof_to (void)
 
   // unsigned from_type, signed to_type
   {
-    typedef unsigned int from_type;
-    typedef signed char to_type;
+    using from_type = unsigned int;
+    using to_type = signed char;
 
     ACE_TEST_ASSERT (sizeof (from_type) > sizeof (to_type));
 
@@ -270,8 +270,8 @@ sizeof_from_gt_sizeof_to (void)
 
   // signed from_type, signed to_type
   {
-    typedef signed int from_type;
-    typedef signed char to_type;
+    using from_type = int;
+    using to_type = signed char;
 
     ACE_TEST_ASSERT (sizeof (from_type) > sizeof (to_type));
 
@@ -292,8 +292,8 @@ sizeof_from_gt_sizeof_to (void)
 
   // unsigned from_type, unsigned to_type
   {
-    typedef unsigned int from_type;
-    typedef unsigned char to_type;
+    using from_type = unsigned int;
+    using to_type = unsigned char;
 
     ACE_TEST_ASSERT (sizeof (from_type) > sizeof (to_type));
 
@@ -332,7 +332,7 @@ template <typename T>
 struct Caller : public std::unary_function<T, void>
 {
   /// Constructor
-  Caller (void) : success (true) {}
+  Caller () : success (true) {}
 
   /// Function call operator overload.
   void operator() (T f)
@@ -352,7 +352,7 @@ run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Integer_Truncate_Test"));
 
-  typedef bool (*test_func) ();
+  using test_func = bool (*)();
 
   static test_func const tests[] =
     {
diff --git a/ACE/tests/Intrusive_Auto_Ptr_Test.cpp b/ACE/tests/Intrusive_Auto_Ptr_Test.cpp
index fd6e5bc72a3..68e665d0e13 100644
--- a/ACE/tests/Intrusive_Auto_Ptr_Test.cpp
+++ b/ACE/tests/Intrusive_Auto_Ptr_Test.cpp
@@ -36,7 +36,7 @@ public:
     return this->ref == howmany;
   }
 
-  static bool was_released (void)
+  static bool was_released ()
   {
     return released;
   }
diff --git a/ACE/tests/Lazy_Map_Manager_Test.cpp b/ACE/tests/Lazy_Map_Manager_Test.cpp
index 7af3f0b0675..22bae652ccc 100644
--- a/ACE/tests/Lazy_Map_Manager_Test.cpp
+++ b/ACE/tests/Lazy_Map_Manager_Test.cpp
@@ -19,7 +19,7 @@
 
 
 // Simple map manager.
-typedef ACE_Map_Manager<int, int, ACE_Null_Mutex> LAZY_MAP;
+using LAZY_MAP = ACE_Map_Manager<int, int, ACE_Null_Mutex>;
 
 // Displaying the contents of a map manager.
 
@@ -64,7 +64,7 @@ display_map (LAZY_MAP &map)
 // Test for map manager.
 
 void
-map_test (void)
+map_test ()
 {
   // Map of size 3.
   LAZY_MAP map (3);
@@ -163,7 +163,7 @@ map_test (void)
 }
 
 // Simple active map manager.
-typedef ACE_Active_Map_Manager<int> ACTIVE_MAP;
+using ACTIVE_MAP = ACE_Active_Map_Manager<int>;
 
 // Displaying the contents of an active map manager.
 
@@ -209,7 +209,7 @@ display_map (ACTIVE_MAP &map)
 // Test for active map manager.
 
 void
-active_map_test (void)
+active_map_test ()
 {
   // Map of size 3.
   ACTIVE_MAP map (3);
diff --git a/ACE/tests/Log_Msg_Backend_Test.cpp b/ACE/tests/Log_Msg_Backend_Test.cpp
index d4579da6044..8a37c7a118a 100644
--- a/ACE/tests/Log_Msg_Backend_Test.cpp
+++ b/ACE/tests/Log_Msg_Backend_Test.cpp
@@ -25,19 +25,19 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  virtual int open (const ACE_TCHAR *logger_key);
+  int open (const ACE_TCHAR *logger_key) override;
 
-  virtual int reset (void);
+  int reset () override;
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  virtual int close (void);
+  int close () override;
 
-  virtual ssize_t log (ACE_Log_Record &log_record);
+  ssize_t log (ACE_Log_Record &log_record) override;
 
   // Test probes to see if things worked as specified.
-  bool hooks_ok (void) const;
-  unsigned int log_count (void) const { return this->log_count_; }
+  bool hooks_ok () const;
+  unsigned int log_count () const { return this->log_count_; }
 
 private:
   bool reset_;
@@ -54,14 +54,14 @@ Backend::open (const ACE_TCHAR *)
 }
 
 int
-Backend::reset (void)
+Backend::reset ()
 {
   this->reset_ = true;
   return 0;
 }
 
 int
-Backend::close (void)
+Backend::close ()
 {
   return 0;
 }
@@ -75,7 +75,7 @@ Backend::log (ACE_Log_Record &)
 
 // Test probes to see if things worked as specified.
 bool
-Backend::hooks_ok (void) const
+Backend::hooks_ok () const
 {
   // Close should not have been called yet.
   const ACE_TCHAR *yes = ACE_TEXT ("yes");
diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp
index 3bc006c0113..66f725a61b6 100644
--- a/ACE/tests/Log_Msg_Test.cpp
+++ b/ACE/tests/Log_Msg_Test.cpp
@@ -32,14 +32,14 @@
 #include "ace/Thread.h"
 
 static void
-cleanup (void)
+cleanup ()
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("cleanup hook (%P)!\n")));
 }
 
 static void
-cause_error (void)
+cause_error ()
 {
   errno = EWOULDBLOCK;
   ACE_ERROR ((LM_DEBUG,
@@ -54,7 +54,7 @@ public:
   Logger (bool be_recursive = true);
 
   /// Logging callback
-  void log (ACE_Log_Record &log_record);
+  void log (ACE_Log_Record &log_record) override;
 
   void verbose (bool be_verbose);
 
@@ -138,7 +138,7 @@ Logger::log (ACE_Log_Record &log_record)
 }
 
 static void
-test_callbacks (void)
+test_callbacks ()
 {
   // This message should show up in stderr.
   ACE_DEBUG ((LM_DEBUG,
@@ -367,7 +367,7 @@ public:
   }
 
   /// Logging callback
-  void log (ACE_Log_Record &)
+  void log (ACE_Log_Record &) override
   {
     ++count_;
   }
@@ -459,7 +459,7 @@ test_acelib_category()
 }
 
 static int
-test_ostream (void)
+test_ostream ()
 {
   // This message should show up in the log file.
   ACE_DEBUG ((LM_DEBUG,
@@ -586,7 +586,7 @@ public:
   Log_Spec_Verify (bool be_recursive = true) : fail_ (0), tests_ (0), recursive_ (be_recursive) {};
 
   /// Logging callback
-  void log (ACE_Log_Record &log_record);
+  void log (ACE_Log_Record &log_record) override;
 
   int  result ();
 
@@ -704,7 +704,7 @@ Log_Spec_Verify::log (ACE_Log_Record &log_record)
 }
 
 int
-Log_Spec_Verify::result (void)
+Log_Spec_Verify::result ()
 {
   if (this->fail_ == 0)
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("All logging specifier tests passed.\n")));
@@ -722,7 +722,7 @@ Log_Spec_Verify::result (void)
 }
 
 static int
-test_format_specs (void)
+test_format_specs ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l1:%l\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l2:%5l\n")));
diff --git a/ACE/tests/Log_Thread_Inheritance_Test.cpp b/ACE/tests/Log_Thread_Inheritance_Test.cpp
index 78c4f687fba..7f35886b04c 100644
--- a/ACE/tests/Log_Thread_Inheritance_Test.cpp
+++ b/ACE/tests/Log_Thread_Inheritance_Test.cpp
@@ -19,7 +19,7 @@ int run_main (int, ACE_TCHAR *[])
 #ifdef ACE_HAS_PTHREADS
 struct Inheritor : ACE_Task_Base
 {
-  int svc ()
+  int svc () override
   {
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) - this test might crash ACE if it does not "
                           "have the fix for the second bug in #3480.\n"));
@@ -69,7 +69,7 @@ struct MyThread : ACE_Task_Base
   bool openfile_;
   static MyThread childthread_;
 
-  int svc ()
+  int svc () override
   {
     if (openfile_)
       {
diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp
index 700d697dbf2..7cf9d41bc17 100644
--- a/ACE/tests/Logging_Strategy_Test.cpp
+++ b/ACE/tests/Logging_Strategy_Test.cpp
@@ -95,7 +95,7 @@ run_reactor (void *)
 // Initiate the cycle of messages.
 
 static
-void print_till_death (void)
+void print_till_death ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "\n-> start generating messages...\n"));
@@ -125,7 +125,7 @@ void print_till_death (void)
 // Count the generated files.
 
 static void
-count_files (void)
+count_files ()
 {
   int i = 0;
   int error = 0;
@@ -217,7 +217,7 @@ get_statistics (ACE_TCHAR *f_name)
 
 // analyse the file order
 static void
-order (void)
+order ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n-> start testing order...\n")));
@@ -283,7 +283,7 @@ order (void)
 // remove log_files
 
 static void
-remove_files (void)
+remove_files ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("-> removing existent files...\n")));
diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp
index 0819d766df4..8cc11482e4a 100644
--- a/ACE/tests/MEM_Stream_Test.cpp
+++ b/ACE/tests/MEM_Stream_Test.cpp
@@ -63,14 +63,14 @@ static const int opt_wfmo_reactor = 1;
 static int opt_select_reactor = 1;
 static ACE_MEM_IO::Signal_Strategy client_strategy = ACE_MEM_IO::Reactive;
 
-typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX, u_short> WaitingCounter;
-typedef ACE_Singleton <WaitingCounter, ACE_SYNCH_RECURSIVE_MUTEX> Waiting;
+using WaitingCounter = ACE_Atomic_Op<ACE_MT_SYNCH::MUTEX, u_short>;
+using Waiting = ACE_Singleton<WaitingCounter, ACE_MT_SYNCH::RECURSIVE_MUTEX>;
 
 // Number of connections that are currently open
 static u_short connection_count = 0;
 
-typedef ACE_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR> ACCEPTOR;
-typedef ACE_Strategy_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR> S_ACCEPTOR;
+using ACCEPTOR = ACE_Acceptor<Echo_Handler, ACE_MEM_Acceptor>;
+using S_ACCEPTOR = ACE_Strategy_Acceptor<Echo_Handler, ACE_MEM_Acceptor>;
 
 void reset_handler (int conn)
 {
@@ -151,7 +151,7 @@ Echo_Handler::handle_close (ACE_HANDLE,
 }
 
 int
-Echo_Handler::svc (void)
+Echo_Handler::svc ()
 {
   while (this->handle_input (this->get_handle ()) >= 0)
     continue;
@@ -223,7 +223,7 @@ connect_client (void *arg)
 #endif
 
 void
-create_reactor (void)
+create_reactor ()
 {
   ACE_Reactor_Impl *impl = 0;
 
diff --git a/ACE/tests/MM_Shared_Memory_Test.cpp b/ACE/tests/MM_Shared_Memory_Test.cpp
index 74b4f1ec4f5..a291d1fa321 100644
--- a/ACE/tests/MM_Shared_Memory_Test.cpp
+++ b/ACE/tests/MM_Shared_Memory_Test.cpp
@@ -136,7 +136,7 @@ parent (void * = 0)
 }
 
 static int
-spawn (void)
+spawn ()
 {
   // Create the synchronizer before spawning the child process/thread,
   // to avoid race condition between the creation in the parent and
diff --git a/ACE/tests/MT_NonBlocking_Connect_Test.cpp b/ACE/tests/MT_NonBlocking_Connect_Test.cpp
index ef8a018dd66..93a0a8706c5 100644
--- a/ACE/tests/MT_NonBlocking_Connect_Test.cpp
+++ b/ACE/tests/MT_NonBlocking_Connect_Test.cpp
@@ -56,16 +56,16 @@ static const ACE_TCHAR* hosts[] = {
 class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
 public:
-  Svc_Handler (void)
+  Svc_Handler ()
   {
     ACE_TEST_ASSERT (0);
   }
 
   Svc_Handler (ACE_Thread_Manager *);
 
-  int open (void *);
+  int open (void *) override;
 
-  int close (u_long flags);
+  int close (u_long flags) override;
 
   bool connected_;
 };
@@ -98,7 +98,7 @@ class Concurrency_Strategy :
   public ACE_Concurrency_Strategy<SVC_HANDLER>
 {
 public:
-  virtual int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg);
+  int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg) override;
 };
 
 template<class SVC_HANDLER> int
@@ -121,12 +121,10 @@ Concurrency_Strategy<SVC_HANDLER>::
     }
 }
 
-typedef ACE_Creation_Strategy<Svc_Handler> CREATION_STRATEGY;
-typedef ACE_Connect_Strategy<Svc_Handler,
-                             ACE_SOCK_CONNECTOR> CONNECT_STRATEGY;
-typedef Concurrency_Strategy<Svc_Handler> CONCURRENCY_STRATEGY;
-typedef ACE_Strategy_Connector<Svc_Handler,
-                               ACE_SOCK_CONNECTOR> BASE_CONNECTOR;
+using CREATION_STRATEGY = ACE_Creation_Strategy<Svc_Handler>;
+using CONNECT_STRATEGY = ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_Connector>;
+using CONCURRENCY_STRATEGY = Concurrency_Strategy<Svc_Handler>;
+using BASE_CONNECTOR = ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_Connector>;
 
 class Connect_Thread : public ACE_Task_Base
 {
@@ -144,7 +142,7 @@ public:
                                 &this->cns_, &this->cts_, &this->cys_);
   }
 
-  int svc (void);
+  int svc () override;
 
 private:
   ACE_Reactor &reactor_;
@@ -159,7 +157,7 @@ private:
 };
 
 int
-Connect_Thread::svc (void)
+Connect_Thread::svc ()
 {
   size_t const nr_names = sizeof hosts / sizeof (char *);
   ACE_INET_Addr *addresses = new ACE_INET_Addr[nr_names];
diff --git a/ACE/tests/MT_Reactor_Timer_Test.cpp b/ACE/tests/MT_Reactor_Timer_Test.cpp
index d37f4a01e92..85cedf6f5c4 100644
--- a/ACE/tests/MT_Reactor_Timer_Test.cpp
+++ b/ACE/tests/MT_Reactor_Timer_Test.cpp
@@ -34,7 +34,7 @@
 // destructor for Time_Handler insures that everything happened
 // correctly.
 
-Time_Handler::Time_Handler (void)
+Time_Handler::Time_Handler ()
 {
   for (int i = 0;
        i < Time_Handler::TIMER_SLOTS;
@@ -49,7 +49,7 @@ Time_Handler::Time_Handler (void)
 // starts.
 
 void
-Time_Handler::setup (void)
+Time_Handler::setup ()
 {
   ACE_Reactor *r = ACE_Reactor::instance ();
 
@@ -66,7 +66,7 @@ Time_Handler::setup (void)
 }
 
 int
-Time_Handler::verify_results (void)
+Time_Handler::verify_results ()
 {
   ACE_TEST_ASSERT (this->timer_id_[0] == Time_Handler::TIMER_FIRED);
   ACE_TEST_ASSERT (this->timer_id_[1] == Time_Handler::TIMER_FIRED);
@@ -83,7 +83,7 @@ Time_Handler::verify_results (void)
 }
 
 int
-Time_Handler::svc (void)
+Time_Handler::svc ()
 {
   ACE_Reactor *r = ACE_Reactor::instance ();
 
@@ -145,7 +145,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv,
 
 #endif /* ACE_HAS_THREADS */
 
-Dispatch_Count_Handler::Dispatch_Count_Handler (void)
+Dispatch_Count_Handler::Dispatch_Count_Handler ()
 {
 
   ACE_Reactor *r = ACE_Reactor::instance ();
@@ -245,7 +245,7 @@ Dispatch_Count_Handler::handle_timeout (const ACE_Time_Value &tv,
 }
 
 int
-Dispatch_Count_Handler::verify_results (void)
+Dispatch_Count_Handler::verify_results ()
 {
   int result = 0;
 
diff --git a/ACE/tests/MT_Reactor_Upcall_Test.cpp b/ACE/tests/MT_Reactor_Upcall_Test.cpp
index 65aaa050b78..207233b05aa 100644
--- a/ACE/tests/MT_Reactor_Upcall_Test.cpp
+++ b/ACE/tests/MT_Reactor_Upcall_Test.cpp
@@ -42,7 +42,7 @@ public:
       lock.acquire ();
   }
 
-  ~Guard (void)
+  ~Guard ()
   {
     if (lock_upcall)
       this->lock_.release ();
@@ -68,7 +68,7 @@ class Handler : public ACE_Event_Handler
 {
 public:
   Handler (ACE_Reactor &reactor);
-  int handle_input (ACE_HANDLE fd);
+  int handle_input (ACE_HANDLE fd) override;
 
   ACE_Pipe pipe_;
   int number_of_messages_read_;
@@ -178,7 +178,7 @@ class Event_Loop_Task : public ACE_Task_Base
 {
 public:
   Event_Loop_Task (ACE_Reactor &reactor);
-  int svc (void);
+  int svc () override;
 
 private:
   ACE_Reactor &reactor_;
@@ -190,7 +190,7 @@ Event_Loop_Task::Event_Loop_Task (ACE_Reactor &reactor)
 }
 
 int
-Event_Loop_Task::svc (void)
+Event_Loop_Task::svc ()
 {
   return this->reactor_.run_reactor_event_loop ();
 }
diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp
index bae36ea9c0e..f9d2d2156c6 100644
--- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp
+++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp
@@ -139,22 +139,22 @@ class Pipe
 {
 public:
 
-  Pipe (void);
+  Pipe ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  int open (void);
+  int open ();
 
-  ACE_HANDLE read_handle (void) const;
+  ACE_HANDLE read_handle () const;
 
-  ACE_HANDLE write_handle (void) const;
+  ACE_HANDLE write_handle () const;
 
 private:
   ACE_HANDLE handles_[2];
 };
 
 int
-Pipe::open (void)
+Pipe::open ()
 {
   ACE_INET_Addr my_addr;
   ACE_SOCK_Acceptor acceptor;
@@ -200,20 +200,20 @@ Pipe::open (void)
   return 0;
 }
 
-Pipe::Pipe (void)
+Pipe::Pipe ()
 {
   this->handles_[0] = ACE_INVALID_HANDLE;
   this->handles_[1] = ACE_INVALID_HANDLE;
 }
 
 ACE_HANDLE
-Pipe::read_handle (void) const
+Pipe::read_handle () const
 {
   return this->handles_[0];
 }
 
 ACE_HANDLE
-Pipe::write_handle (void) const
+Pipe::write_handle () const
 {
   return this->handles_[1];
 }
@@ -230,15 +230,15 @@ public:
   Sender (ACE_HANDLE handle,
           Connection_Cache &connection_cache);
 
-  ~Sender (void);
+  ~Sender () override;
 
-  int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
-  ssize_t send_message (void);
+  ssize_t send_message ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  void close (void);
+  void close ();
 
   ACE_HANDLE handle_;
 
@@ -250,21 +250,21 @@ class Connection_Cache
 {
 public:
 
-  Connection_Cache (void);
+  Connection_Cache ();
 
-  ~Connection_Cache (void);
+  ~Connection_Cache ();
 
   void add_connection (Sender *sender);
 
   void remove_connection (Sender *sender);
 
-  Sender *acquire_connection (void);
+  Sender *acquire_connection ();
 
   void release_connection (Sender *sender);
 
   int find (Sender *sender);
 
-  ACE_SYNCH_MUTEX &lock (void);
+  ACE_SYNCH_MUTEX &lock ();
 
   enum State
     {
@@ -296,15 +296,15 @@ Sender::Sender (ACE_HANDLE handle,
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%t) Reference count in Sender::Sender() is %d\n"),
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 }
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%t) Reference count in ~Sender::Sender() is %d\n"),
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 
   // Close the socket that we are responsible for.
   ACE_OS::closesocket (this->handle_);
@@ -316,7 +316,7 @@ Sender::handle_input (ACE_HANDLE)
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%t) Reference count in Sender::handle_input() is %d\n"),
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 
   //
   // In this test, this method is only called when the connection has
@@ -334,7 +334,7 @@ Sender::handle_input (ACE_HANDLE)
 }
 
 void
-Sender::close (void)
+Sender::close ()
 {
   // Remove socket from Reactor (may fail if another thread has already
   // removed the handle from the Reactor).
@@ -348,7 +348,7 @@ Sender::close (void)
 }
 
 ssize_t
-Sender::send_message (void)
+Sender::send_message ()
 {
   ACE_Time_Value timeout (0, close_timeout * 1000);
 
@@ -365,7 +365,7 @@ public:
   Event_Loop_Thread (ACE_Thread_Manager &thread_manager,
                      ACE_Reactor &reactor);
 
-  int svc (void);
+  int svc () override;
 
   ACE_Reactor &reactor_;
 
@@ -379,17 +379,17 @@ public:
             ACE_HANDLE handle,
             int nested_upcalls);
 
-  ~Receiver (void);
+  ~Receiver () override;
 
-  int svc (void);
+  int svc () override;
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  int close (u_long flags);
+  int close (u_long flags) override;
 
-  int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
-  int resume_handler (void);
+  int resume_handler () override;
 
   ACE_HANDLE handle_;
 
@@ -417,22 +417,22 @@ Receiver::Receiver (ACE_Thread_Manager &thread_manager,
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%t) Reference count in Receiver::Receiver() is %d\n"),
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 }
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%t) Reference count in ~Receiver::Receiver() is %d\n"),
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 
   // Close the socket that we are responsible for.
   ACE_OS::closesocket (this->handle_);
 }
 
 int
-Receiver::svc (void)
+Receiver::svc ()
 {
   //
   // Continuously receive messages from the Sender.  On error, exit
@@ -522,7 +522,7 @@ Receiver::handle_input (ACE_HANDLE handle)
 }
 
 int
-Receiver::resume_handler (void)
+Receiver::resume_handler ()
 {
   /// The application takes responsibility of resuming the handler.
   return ACE_APPLICATION_RESUMES_HANDLER;
@@ -636,7 +636,7 @@ Connector::connect (ACE_HANDLE &client_handle,
   return 0;
 }
 
-Connection_Cache::Connection_Cache (void)
+Connection_Cache::Connection_Cache ()
 {
   // Initialize the connection cache.
   this->entries_ =
@@ -698,7 +698,7 @@ Connection_Cache::remove_connection (Sender *sender)
 }
 
 Sender *
-Connection_Cache::acquire_connection (void)
+Connection_Cache::acquire_connection ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
 
@@ -741,12 +741,12 @@ Connection_Cache::release_connection (Sender *sender)
 }
 
 ACE_SYNCH_MUTEX &
-Connection_Cache::lock (void)
+Connection_Cache::lock ()
 {
   return this->lock_;
 }
 
-Connection_Cache::~Connection_Cache (void)
+Connection_Cache::~Connection_Cache ()
 {
   for (int i = 0; i < number_of_connections; ++i)
     {
@@ -769,9 +769,9 @@ public:
                      int run_receiver_thread,
                      int nested_upcalls);
 
-  int svc (void);
+  int svc () override;
 
-  Sender *create_connection (void);
+  Sender *create_connection ();
 
   Connection_Cache &connection_cache_;
 
@@ -808,7 +808,7 @@ Invocation_Thread::Invocation_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 Sender *
-Invocation_Thread::create_connection (void)
+Invocation_Thread::create_connection ()
 {
   int result = 0;
 
@@ -867,7 +867,7 @@ Invocation_Thread::create_connection (void)
 }
 
 int
-Invocation_Thread::svc (void)
+Invocation_Thread::svc ()
 {
   int connection_counter = 0;
   ACE_DEBUG ((LM_DEBUG,
@@ -977,7 +977,7 @@ public:
                        int make_invocations,
                        int run_receiver_thread);
 
-  int svc (void);
+  int svc () override;
 
   ACE_Auto_Event &new_connection_event_;
 
@@ -1003,7 +1003,7 @@ Close_Socket_Thread::Close_Socket_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Close_Socket_Thread::svc (void)
+Close_Socket_Thread::svc ()
 {
   unsigned int seed = (unsigned int) ACE_OS::time ();
   ACE_Time_Value timeout (0, close_timeout * 1000);
@@ -1083,7 +1083,7 @@ Event_Loop_Thread::Event_Loop_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Event_Loop_Thread::svc (void)
+Event_Loop_Thread::svc ()
 {
   // Simply run the event loop.
   this->reactor_.owner (ACE_Thread::self ());
@@ -1110,7 +1110,7 @@ public:
                  ACE_Reactor &reactor,
                  Connection_Cache &connection_cache);
 
-  int svc (void);
+  int svc () override;
 
   ACE_Reactor &reactor_;
 
@@ -1128,7 +1128,7 @@ Purger_Thread::Purger_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Purger_Thread::svc (void)
+Purger_Thread::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT("(%t) Purger_Thread::svc commencing\n")));
diff --git a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp
index 6d6b67a9030..a1ba7346316 100644
--- a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp
+++ b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp
@@ -38,19 +38,19 @@ class Reference_Counted_Event_Handler : public ACE_Event_Handler
 {
 public:
 
-  Reference_Counted_Event_Handler (void);
+  Reference_Counted_Event_Handler ();
 
-  ~Reference_Counted_Event_Handler (void);
+  ~Reference_Counted_Event_Handler () override;
 
-  int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
-  ACE_Event_Handler::Reference_Count add_reference (void);
+  ACE_Event_Handler::Reference_Count add_reference () override;
 
-  ACE_Event_Handler::Reference_Count remove_reference (void);
+  ACE_Event_Handler::Reference_Count remove_reference () override;
 
 };
 
-Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (void)
+Reference_Counted_Event_Handler::Reference_Counted_Event_Handler ()
 {
   this->reference_counting_policy ().value
     (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
@@ -60,24 +60,24 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (void)
       ((LM_DEBUG,
         ACE_TEXT ("Reference count in Reference_Counted_Event_Handler() ")
         ACE_TEXT ("is %d\n"),
-        this->reference_count_.value ()));
+        this->reference_count_.load ()));
 }
 
-Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void)
+Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler ()
 {
   if (debug)
     ACE_DEBUG
       ((LM_DEBUG,
         ACE_TEXT ("Reference count in ~Reference_Counted_Event_Handler() ")
         ACE_TEXT ("is %d\n"),
-        this->reference_count_.value ()));
+        this->reference_count_.load ()));
 
-  if (0 != this->reference_count_.value ())
+  if (0 != this->reference_count_.load ())
     ACE_ERROR
       ((LM_ERROR,
         ACE_TEXT ("Reference count in ~Reference_Counted_Event_Handler() ")
         ACE_TEXT ("should be 0 but is %d\n"),
-        this->reference_count_.value ()));
+        this->reference_count_.load ()));
 }
 
 int
@@ -88,20 +88,20 @@ Reference_Counted_Event_Handler::handle_input (ACE_HANDLE)
       ((LM_DEBUG,
         ACE_TEXT ("Reference count in Reference_Counted_Event_Handler::")
         ACE_TEXT ("handle_input() is %d\n"),
-        this->reference_count_.value ()));
+        this->reference_count_.load ()));
 
-  if (2 != this->reference_count_.value ())
+  if (2 != this->reference_count_.load ())
     ACE_ERROR
       ((LM_ERROR,
         ACE_TEXT ("Reference count in Reference_Counted_Event_Handler::")
         ACE_TEXT ("handle_input() should be 2 but is %d\n"),
-        this->reference_count_.value ()));
+        this->reference_count_.load ()));
 
   return 0;
 }
 
 ACE_Event_Handler::Reference_Count
-Reference_Counted_Event_Handler::add_reference (void)
+Reference_Counted_Event_Handler::add_reference ()
 {
   ACE_Event_Handler::Reference_Count reference_count =
     this->ACE_Event_Handler::add_reference ();
@@ -109,13 +109,13 @@ Reference_Counted_Event_Handler::add_reference (void)
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("Reference count after add_reference() is %d\n"),
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 
   return reference_count;
 }
 
 ACE_Event_Handler::Reference_Count
-Reference_Counted_Event_Handler::remove_reference (void)
+Reference_Counted_Event_Handler::remove_reference ()
 {
   ACE_Event_Handler::Reference_Count reference_count =
     this->ACE_Event_Handler::remove_reference ();
@@ -134,9 +134,9 @@ public:
 
   Simple_Event_Handler (int notifies);
 
-  ~Simple_Event_Handler (void);
+  ~Simple_Event_Handler () override;
 
-  int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
   int notifies_;
 };
@@ -148,7 +148,7 @@ Simple_Event_Handler::Simple_Event_Handler (int notifies)
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Event_Handler()\n")));
 }
 
-Simple_Event_Handler::~Simple_Event_Handler (void)
+Simple_Event_Handler::~Simple_Event_Handler ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Simple_Event_Handler()\n")));
@@ -177,7 +177,7 @@ public:
                      ACE_Reactor &reactor,
                      int extra_iterations_needed);
 
-  int svc (void);
+  int svc () override;
 
   ACE_Reactor &reactor_;
 
@@ -194,7 +194,7 @@ Event_Loop_Thread::Event_Loop_Thread (ACE_Thread_Manager &thread_manager,
 }
 
 int
-Event_Loop_Thread::svc (void)
+Event_Loop_Thread::svc ()
 {
   int counter = 0;
 
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 02b6854d416..430e23c74f7 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -28,7 +28,7 @@
 #if defined (ACE_HAS_PROCESS_SPAWN)
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-typedef ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> MALLOC;
+using MALLOC = ACE_Malloc_T<ACE_MMAP_Memory_Pool, ACE_Process_Mutex, ACE_PI_Control_Block>;
 #else
 typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC;
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
@@ -87,7 +87,7 @@ static const void *CHILD_BASE_ADDR =
 static MALLOC *
 myallocator (const void *base_addr = 0)
 {
-  static auto_ptr<MALLOC> static_allocator;
+  static std::unique_ptr<MALLOC> static_allocator;
 
   if (static_allocator.get () == 0)
     {
@@ -279,7 +279,7 @@ parent (Test_Data *data)
 }
 
 static int
-child (void)
+child ()
 {
   void *bar = 0;
   // Perform "busy waiting" here until the parent stores data under a
diff --git a/ACE/tests/Manual_Event_Test.cpp b/ACE/tests/Manual_Event_Test.cpp
index 0653aa3db17..d8469469dfc 100644
--- a/ACE/tests/Manual_Event_Test.cpp
+++ b/ACE/tests/Manual_Event_Test.cpp
@@ -39,7 +39,7 @@ static ACE_Atomic_Op<ACE_SYNCH_MUTEX, long>   n_awoken2;
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-w n_workers] [-n iteration_count]\n")));
diff --git a/ACE/tests/Map_Manager_Test.cpp b/ACE/tests/Map_Manager_Test.cpp
index 2a52e40804b..d55135235f7 100644
--- a/ACE/tests/Map_Manager_Test.cpp
+++ b/ACE/tests/Map_Manager_Test.cpp
@@ -22,51 +22,31 @@
 #include "ace/Hash_Cache_Map_Manager_T.h"
 #include "ace/Caching_Strategies_T.h"
 
-typedef ACE_Null_Mutex MUTEX;
-typedef ACE_UINT32 TYPE;
-typedef ACE_Active_Map_Manager_Key
-        ACTIVE_KEY;
-typedef ACE_Hash<TYPE>
-        HASH_KEY;
-typedef ACE_Equal_To<TYPE>
-        COMPARE_KEYS;
-
-typedef ACE_Map_Manager <TYPE, TYPE, MUTEX>
-        MAP_MANAGER;
-typedef ACE_Map_Iterator <TYPE, TYPE, MUTEX>
-        ITERATOR;
-typedef ACE_Map_Reverse_Iterator <TYPE, TYPE, MUTEX>
-        REVERSE_ITERATOR;
-typedef ACE_Map_Entry <TYPE, TYPE>
-        MAP_ENTRY;
-typedef ACE_Hash_Map_Manager_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
-        HASH_MAP_MANAGER;
-typedef ACE_Hash_Map_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
-        HASH_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
-        HASH_REVERSE_ITERATOR;
-typedef ACE_Hash_Map_Entry <TYPE, TYPE>
-        HASH_ENTRY;
-typedef ACE_Active_Map_Manager <TYPE>
-        ACTIVE_MAP_MANAGER;
-
-typedef ACE_Hash_Map_Manager_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
-        CACHE_MAP_IMPL;
-typedef ACE_Hash_Map_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
-        CACHE_ITER_IMPL;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
-        CACHE_REV_ITER_IMPL;
-typedef int ATTR;
-typedef ACE_Null_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>
-        NULL_CLEANUP;
-typedef ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>
-        NULL_UTILITY;
-typedef ACE_Null_Caching_Strategy<ATTR, NULL_UTILITY>
-        NULL_CACHING_STRATEGY;
-typedef ACE_Cache_Map_Manager<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
-        CACHE_MAP_MANAGER;
-typedef ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>
-        HASH_CACHE_MAP_MANAGER;
+using MUTEX = ACE_Null_Mutex;
+using TYPE = ACE_UINT32;
+using ACTIVE_KEY = ACE_Active_Map_Manager_Key;
+using HASH_KEY = ACE_Hash<TYPE>;
+using COMPARE_KEYS = ACE_Equal_To<TYPE>;
+
+using MAP_MANAGER = ACE_Map_Manager<TYPE, TYPE, MUTEX>;
+using ITERATOR = ACE_Map_Iterator<TYPE, TYPE, MUTEX>;
+using REVERSE_ITERATOR = ACE_Map_Reverse_Iterator<TYPE, TYPE, MUTEX>;
+using MAP_ENTRY = ACE_Map_Entry<TYPE, TYPE>;
+using HASH_MAP_MANAGER = ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
+using HASH_ITERATOR = ACE_Hash_Map_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
+using HASH_REVERSE_ITERATOR = ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
+using HASH_ENTRY = ACE_Hash_Map_Entry<TYPE, TYPE>;
+using ACTIVE_MAP_MANAGER = ACE_Active_Map_Manager<TYPE>;
+
+using CACHE_MAP_IMPL = ACE_Hash_Map_Manager_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+using CACHE_ITER_IMPL = ACE_Hash_Map_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+using CACHE_REV_ITER_IMPL = ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+using ATTR = int;
+using NULL_CLEANUP = ANCLE<TYPE, TYPE, CACHE_MAP_IMPL>;
+using NULL_UTILITY = ACE_Null_Caching_Utility<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>;
+using NULL_CACHING_STRATEGY = ANULL<ATTR, NULL_UTILITY>;
+using CACHE_MAP_MANAGER = ACMM<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>;
+using HASH_CACHE_MAP_MANAGER = ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>;
 
 static int
 test_cache_map_manager (size_t table_size,
diff --git a/ACE/tests/Map_Test.cpp b/ACE/tests/Map_Test.cpp
index 6de7224501e..91c55896b43 100644
--- a/ACE/tests/Map_Test.cpp
+++ b/ACE/tests/Map_Test.cpp
@@ -25,19 +25,19 @@
    : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X)))
 
 // Value type.
-typedef size_t VALUE;
+using VALUE = size_t;
 
 // Generic map type.
-typedef ACE_Map<KEY, VALUE> TEST_MAP;
+using TEST_MAP = ACE_Map<KEY, VALUE>;
 
 // Manager Manager adapter.
-typedef ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator> MAP_MANAGER_ADAPTER;
+using MAP_MANAGER_ADAPTER = ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator>;
 
 // Hash Manager Manager adapter.
-typedef ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, Key_Generator> HASH_MAP_MANAGER_ADAPTER;
+using HASH_MAP_MANAGER_ADAPTER = ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, Key_Generator>;
 
 // Active Manager Manager adapter.
-typedef ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter> ACTIVE_MAP_MANAGER_ADAPTER;
+using ACTIVE_MAP_MANAGER_ADAPTER = ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter>;
 
 static void
 functionality_test (TEST_MAP &map,
diff --git a/ACE/tests/Message_Block_Test.cpp b/ACE/tests/Message_Block_Test.cpp
index 02e9d506805..2dd86736e0e 100644
--- a/ACE/tests/Message_Block_Test.cpp
+++ b/ACE/tests/Message_Block_Test.cpp
@@ -35,7 +35,7 @@ class User_Data : public ACE_Data_Block
 public:
   User_Data() {}
 
-  ~User_Data()
+  ~User_Data() override
   {
     ACE_DEBUG((LM_DEBUG, ACE_TEXT ("User_Data dtor\n")));
     user_data_dtor_called = true;
@@ -58,20 +58,20 @@ class Worker_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
   /// Activate the task.
-  Worker_Task (void);
+  Worker_Task ();
 
   /// Iterate <n_iterations> time printing off a message and "waiting"
   /// for all other threads to complete this iteration.
-  virtual int svc (void);
+  int svc () override;
 
   /// Allows the producer to pass messages to the <Message_Block>.
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
+  int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0) override;
 
 private:
   //FUZZ: disable check_for_lack_ACE_OS
   /// Close hook.
   ///FUZZ: enable check_for_lack_ACE_OS
-  virtual int close (u_long);
+  int close (u_long) override;
 };
 
 int
@@ -93,7 +93,7 @@ Worker_Task::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 // other threads to complete this iteration.
 
 int
-Worker_Task::svc (void)
+Worker_Task::svc ()
 {
   // The <ACE_Task::svc_run()> method automatically adds us to the
   // process-wide <ACE_Thread_Manager> when the thread begins.
@@ -238,7 +238,7 @@ Worker_Task::svc (void)
   return 0;
 }
 
-Worker_Task::Worker_Task (void)
+Worker_Task::Worker_Task ()
 {
   // Make us an Active Object.
   if (this->activate (THR_NEW_LWP) == -1)
diff --git a/ACE/tests/Message_Queue_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp
index 2040c18c301..91cb7138a5d 100644
--- a/ACE/tests/Message_Queue_Notifications_Test.cpp
+++ b/ACE/tests/Message_Queue_Notifications_Test.cpp
@@ -62,13 +62,13 @@ public:
   Message_Handler (ACE_Reactor &reactor);
 
   // = Demuxing hooks.
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE);
+  int handle_input (ACE_HANDLE) override;
+  int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE) override;
+  int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE) override;
 
 private:
-  int process_message (void);
-  void make_message (void);
+  int process_message ();
+  void make_message ();
 
   ACE_Reactor_Notification_Strategy notification_strategy_;
 };
@@ -82,15 +82,15 @@ private:
 class Watermark_Test : public ACE_Task<ACE_SYNCH>
 {
 public:
-  Watermark_Test (void);
+  Watermark_Test ();
 
-  virtual int svc (void);
+  int svc () override;
 
-  int consumer (void);
-  int producer (void);
+  int consumer ();
+  int producer ();
   int put_message (ACE_Time_Value* timeout = 0);
-  int get_message (void);
-  void print_producer_debug_message (void);
+  int get_message ();
+  void print_producer_debug_message ();
 
 private:
   const size_t len_;
@@ -152,7 +152,7 @@ Message_Handler::handle_exception (ACE_HANDLE fd)
 }
 
 int
-Message_Handler::process_message (void)
+Message_Handler::process_message ()
 {
   ACE_Message_Block *mb = 0;
 
@@ -175,7 +175,7 @@ Message_Handler::process_message (void)
 }
 
 void
-Message_Handler::make_message (void)
+Message_Handler::make_message ()
 {
   if (--iterations > 0)
     {
@@ -189,7 +189,7 @@ Message_Handler::make_message (void)
     }
 }
 
-Watermark_Test::Watermark_Test (void)
+Watermark_Test::Watermark_Test ()
   : len_ (ACE_OS::strlen (default_message) + 1),
     hwm_ (this->len_ * default_high_water_mark),
     lwm_ (this->len_ * default_low_water_mark),
@@ -206,7 +206,7 @@ Watermark_Test::Watermark_Test (void)
 }
 
 int
-Watermark_Test::producer (void)
+Watermark_Test::producer ()
 {
   int i = watermark_iterations;
 
@@ -244,7 +244,7 @@ Watermark_Test::producer (void)
 }
 
 int
-Watermark_Test::consumer (void)
+Watermark_Test::consumer ()
 {
   ACE_MT (this->mq_full_.wait ());
 
@@ -262,7 +262,7 @@ Watermark_Test::consumer (void)
 }
 
 int
-Watermark_Test::get_message (void)
+Watermark_Test::get_message ()
 {
   ACE_Message_Block *mb = 0;
 
@@ -298,7 +298,7 @@ Watermark_Test::put_message (ACE_Time_Value *timeout)
 }
 
 void
-Watermark_Test::print_producer_debug_message (void)
+Watermark_Test::print_producer_debug_message ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Producer: message size = %3d, ")
@@ -308,7 +308,7 @@ Watermark_Test::print_producer_debug_message (void)
 }
 
 int
-Watermark_Test::svc (void)
+Watermark_Test::svc ()
 {
   // this->role_ is an Atomic_Op object.
   int role = this->role_++;
diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp
index 391d73f284a..0e3768ab837 100644
--- a/ACE/tests/Message_Queue_Test.cpp
+++ b/ACE/tests/Message_Queue_Test.cpp
@@ -41,9 +41,9 @@
 
 const ACE_TCHAR usage[] = ACE_TEXT ("usage: Message_Queue_Test <number of messages>\n");
 
-typedef ACE_Message_Queue<ACE_NULL_SYNCH> QUEUE;
-typedef ACE_Message_Queue_Iterator<ACE_NULL_SYNCH> ITERATOR;
-typedef ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH> REVERSE_ITERATOR;
+using QUEUE = ACE_Message_Queue<ACE_NULL_SYNCH>;
+using ITERATOR = ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>;
+using REVERSE_ITERATOR = ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>;
 
 #if defined (ACE_HAS_WINCE)
 static const int MESSAGE_FACTOR = 10000;
@@ -60,7 +60,7 @@ static int max_messages = MAX_MESSAGES;
 static ACE_High_Res_Timer *timer = 0;
 
 #if defined (ACE_HAS_THREADS)
-typedef ACE_Message_Queue<ACE_MT_SYNCH> SYNCH_QUEUE;
+using SYNCH_QUEUE = ACE_Message_Queue<ACE_MT_SYNCH>;
 
 struct Queue_Wrapper
 {
@@ -77,7 +77,7 @@ struct Queue_Wrapper
   ACE_Message_Block **send_block_;
   // Pointer to messages blocks for sender to send to reciever.
 
-  Queue_Wrapper (void)
+  Queue_Wrapper ()
     : q_ (0), send_block_ (0)
   {
   }
@@ -91,7 +91,7 @@ class Counting_Test_Producer : public ACE_Task<ACE_MT_SYNCH>
 public:
   Counting_Test_Producer (ACE_Message_Queue<ACE_MT_SYNCH> *queue)
     : ACE_Task<ACE_MT_SYNCH> (0, queue), sequence_ (0), produced_ (0) {}
-  virtual int svc (void);
+  int svc () override;
 
   ACE_Atomic_Op<ACE_Thread_Mutex, long> sequence_;
   ACE_Atomic_Op<ACE_Thread_Mutex, long> produced_;
@@ -102,13 +102,13 @@ class Counting_Test_Consumer : public ACE_Task<ACE_MT_SYNCH>
 public:
   Counting_Test_Consumer (ACE_Message_Queue<ACE_MT_SYNCH> *queue)
     : ACE_Task<ACE_MT_SYNCH> (0, queue), consumed_ (0) {}
-  virtual int svc (void);
+  int svc () override;
 
   ACE_Atomic_Op<ACE_Thread_Mutex, long> consumed_;
 };
 
 int
-Counting_Test_Producer::svc (void)
+Counting_Test_Producer::svc ()
 {
   // Going to produce a lot of blocks. Since we don't necessarily want them
   // all consumed, there's no arrangement with the consumer to be sure that
@@ -200,7 +200,7 @@ Counting_Test_Producer::svc (void)
 }
 
 int
-Counting_Test_Consumer::svc (void)
+Counting_Test_Consumer::svc ()
 {
   // Consume lots of blocks and release them. To mimic a thread with work
   // to do, put a small random delay between dequeuing the blocks. Consume
@@ -252,7 +252,7 @@ Counting_Test_Consumer::svc (void)
 }
 
 static int
-counting_test (void)
+counting_test ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting counting test\n")));
 
@@ -314,7 +314,7 @@ counting_test (void)
 #endif /* ACE_HAS_THREADS */
 
 static int
-iterator_test (void)
+iterator_test ()
 {
   const int ITERATIONS = 5;
   ACE_TCHAR buffer[ITERATIONS][BUFSIZ];
@@ -407,7 +407,7 @@ iterator_test (void)
 #if defined (ACE_HAS_THREADS)
 
 static int
-chained_block_test (void)
+chained_block_test ()
 {
 
   QUEUE q;
@@ -768,7 +768,7 @@ performance_test (int queue_type = 0)
 // Ensure that the timedout dequeue_head() sets errno code properly.
 
 static int
-timeout_test (void)
+timeout_test ()
 {
   SYNCH_QUEUE mq;
   int status = 0;
@@ -814,7 +814,7 @@ timeout_test (void)
 // thorough check...
 
 static int
-prio_test (void)
+prio_test ()
 {
   const char S1[] = "first";
   const char S2[] = "second";
@@ -848,7 +848,7 @@ prio_test (void)
 }
 
 static int
-close_test (void)
+close_test ()
 {
   int status = 0;
 
diff --git a/ACE/tests/Message_Queue_Test_Ex.cpp b/ACE/tests/Message_Queue_Test_Ex.cpp
index ace1a10d227..3182d2c6d0b 100644
--- a/ACE/tests/Message_Queue_Test_Ex.cpp
+++ b/ACE/tests/Message_Queue_Test_Ex.cpp
@@ -34,7 +34,7 @@
 const ACE_TCHAR usage[] =
   ACE_TEXT ("usage: Message_Queue_Test_Ex <number of messages>\n");
 
-typedef ACE_Message_Queue_Ex<User_Class, ACE_NULL_SYNCH> QUEUE;
+using QUEUE = ACE_Message_Queue_Ex<User_Class, ACE_NULL_SYNCH>;
 
 static const int MAX_MESSAGES = 10000;
 static const char test_message[] = "ACE_Message_Queue_Ex Test Message";
@@ -61,7 +61,7 @@ print_message (const ACE_TCHAR *message)
 }
 
 #if defined (ACE_HAS_THREADS)
-typedef ACE_Message_Queue_Ex<User_Class, ACE_MT_SYNCH> SYNCH_QUEUE;
+using SYNCH_QUEUE = ACE_Message_Queue_Ex<User_Class, ACE_MT_SYNCH>;
 
 /**
  * Container for data passed to sender and receiver in
@@ -78,7 +78,7 @@ struct Queue_Wrapper
   User_Class **send_block_;
 
   /// Default constructor.
-  Queue_Wrapper (void)
+  Queue_Wrapper ()
     : q_ (0), send_block_ (0)
   {
   }
@@ -169,7 +169,7 @@ struct Receive_Messages
   {
   }
 
-  int create (void)
+  int create ()
   {
     ACE_NEW_RETURN (this->receive_block_,
                     User_Class *[this->number_of_messages_],
@@ -187,7 +187,7 @@ struct Receive_Messages
 };
 
 static int
-single_thread_performance_test (void)
+single_thread_performance_test ()
 {
   const char test_message[] =
     "ACE_Message_Queue_Ex Test Message";
@@ -253,7 +253,7 @@ single_thread_performance_test (void)
 }
 
 int
-MQ_Ex_N_Tester::single_thread_performance_test (void)
+MQ_Ex_N_Tester::single_thread_performance_test ()
 {
   // Create the messages.  Allocate off the heap in case messages is
   // large relative to the amount of stack space available.
@@ -268,7 +268,7 @@ MQ_Ex_N_Tester::single_thread_performance_test (void)
 }
 
 int
-MQ_Ex_N_Tester::test_enqueue_tail (void)
+MQ_Ex_N_Tester::test_enqueue_tail ()
 {
   const ACE_TCHAR *message =
     ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_NULL_SYNCH>, test_enqueue_tail");
@@ -320,7 +320,7 @@ MQ_Ex_N_Tester::test_enqueue_tail (void)
 }
 
 int
-MQ_Ex_N_Tester::test_enqueue_head (void)
+MQ_Ex_N_Tester::test_enqueue_head ()
 {
   const ACE_TCHAR *message =
     ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_NULL_SYNCH>, test_enqueue_head");
@@ -422,7 +422,7 @@ sender (void *arg)
 }
 
 static int
-performance_test (void)
+performance_test ()
 {
   Queue_Wrapper queue_wrapper;
   const ACE_TCHAR *message =
@@ -480,7 +480,7 @@ performance_test (void)
 }
 
 int
-MQ_Ex_N_Tester::performance_test (void)
+MQ_Ex_N_Tester::performance_test ()
 {
   const ACE_TCHAR *message =
     ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_SYNCH>");
diff --git a/ACE/tests/Monotonic_Manual_Event_Test.cpp b/ACE/tests/Monotonic_Manual_Event_Test.cpp
index f38def4bafb..c0c71a048ea 100644
--- a/ACE/tests/Monotonic_Manual_Event_Test.cpp
+++ b/ACE/tests/Monotonic_Manual_Event_Test.cpp
@@ -57,7 +57,7 @@ static long                                    n_awoken2;
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-w n_workers] [-s]\n")));
diff --git a/ACE/tests/Monotonic_Message_Queue_Test.cpp b/ACE/tests/Monotonic_Message_Queue_Test.cpp
index bbe1f5f594f..846761d312e 100644
--- a/ACE/tests/Monotonic_Message_Queue_Test.cpp
+++ b/ACE/tests/Monotonic_Message_Queue_Test.cpp
@@ -39,18 +39,15 @@
 #  endif
 
 #  if defined (ACE_HAS_THREADS)
-typedef ACE_Message_Queue<ACE_MT_SYNCH, ACE_Monotonic_Time_Policy> SYNCH_QUEUE;
+using SYNCH_QUEUE = ACE_Message_Queue<ACE_MT_SYNCH, ACE_Monotonic_Time_Policy>;
 
 // Create timer queue with hr support
 ACE_Timer_Queue *
-create_timer_queue (void)
+create_timer_queue ()
 {
   ACE_Timer_Queue * tmq = 0;
 
-  typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
-                           ACE_Event_Handler_Handle_Timeout_Upcall,
-                           ACE_SYNCH_RECURSIVE_MUTEX,
-                           ACE_HR_Time_Policy> timer_queue_type;
+  using timer_queue_type = ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall, ACE_MT_SYNCH::RECURSIVE_MUTEX, ACE_HR_Time_Policy>;
   ACE_NEW_RETURN (tmq, timer_queue_type (), 0);
 
   return tmq;
@@ -61,17 +58,17 @@ class MyTask : public ACE_Task<ACE_MT_SYNCH>
 public:
   MyTask () : my_reactor_ (0), my_tq_ (0) {}
 
-  virtual ~MyTask () { stop (); }
+  ~MyTask () override { stop (); }
 
-  virtual int svc (void);
+  int svc () override;
 
   int start (int num_threads);
-  int stop (void);
+  int stop ();
   ACE_Reactor* get_reactor ();
-  int  create_reactor (void);
+  int  create_reactor ();
 
 private:
-  int  delete_reactor (void);
+  int  delete_reactor ();
 
   ACE_SYNCH_RECURSIVE_MUTEX lock_;
   ACE_Reactor *my_reactor_;
@@ -85,7 +82,7 @@ MyTask::get_reactor ()
 }
 
 int
-MyTask::create_reactor (void)
+MyTask::create_reactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -113,7 +110,7 @@ MyTask::create_reactor (void)
 }
 
 int
-MyTask::delete_reactor (void)
+MyTask::delete_reactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -145,7 +142,7 @@ MyTask::start (int num_threads)
 
 
 int
-MyTask::stop (void)
+MyTask::stop ()
 {
   if (this->my_reactor_ != 0)
     {
@@ -169,7 +166,7 @@ MyTask::stop (void)
 }
 
 int
-MyTask::svc (void)
+MyTask::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask started\n")));
 
@@ -189,8 +186,8 @@ public:
       mq_ (mq)
   {}
 
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg);
+  int handle_timeout (const ACE_Time_Value &tv,
+                              const void *arg) override;
 
   bool trigger_in(const ACE_Time_Value &delay);
 
@@ -246,7 +243,7 @@ void set_system_time(const ACE_Time_Value& tv)
 // Ensure that the timedout dequeue_head() keeps working in case of timeshift when using monotonic timer.
 
 static bool
-timeout_test (void)
+timeout_test ()
 {
   bool status = true;
   SYNCH_QUEUE mq;
diff --git a/ACE/tests/Monotonic_Task_Test.cpp b/ACE/tests/Monotonic_Task_Test.cpp
index 755207ab16a..4e86cc27175 100644
--- a/ACE/tests/Monotonic_Task_Test.cpp
+++ b/ACE/tests/Monotonic_Task_Test.cpp
@@ -80,9 +80,9 @@ public:
     this->thr_mgr (&this->tm_);
   }
 
-  virtual ~MyTask () { stop (); }
+  ~MyTask () override { stop (); }
 
-  virtual int svc (void);
+  int svc () override;
 
   int start ();
 
@@ -179,7 +179,7 @@ MyTask::stop ()
 }
 
 int
-MyTask::svc (void)
+MyTask::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask::svc started\n")));
 
diff --git a/ACE/tests/Multicast_Interfaces_Test.cpp b/ACE/tests/Multicast_Interfaces_Test.cpp
index d3b75586661..5455277bc86 100644
--- a/ACE/tests/Multicast_Interfaces_Test.cpp
+++ b/ACE/tests/Multicast_Interfaces_Test.cpp
@@ -28,7 +28,7 @@
 
 #include <set>
 
-typedef std::set<ACE_TString> nameset;
+using nameset = std::set<ACE_TString>;
 
 #if defined (ACE_WIN32)
 void
diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp
index 12cbabc8cf5..f07d65e65c8 100644
--- a/ACE/tests/Multicast_Test.cpp
+++ b/ACE/tests/Multicast_Test.cpp
@@ -88,7 +88,7 @@ public:
       BOTH = PRODUCER | CONSUMER
     };
 
-  MCT_Config (void)
+  MCT_Config ()
     : group_start_ (MCT_START_PORT, MCT_START_GROUP),
       groups_ (0),
       debug_ (0),
@@ -103,26 +103,26 @@ public:
       else
         this->groups_ = ACE_MIN (IP_MAX_MEMBERSHIPS, MCT_GROUPS);
     }
-  ~MCT_Config (void)
+  ~MCT_Config ()
     {}
 
   //FUZZ: disable check_for_lack_ACE_OS
   int open (int argc, ACE_TCHAR *argv[]);
   //FUZZ: enable check_for_lack_ACE_OS
 
-  int debug (void) const { return this->debug_;}
-  void dump (void) const;
-  int groups (void) const { return this->groups_;}
-  const ACE_INET_Addr group_start (void) const { return this->group_start_;}
-  u_long role (void) const { return this->role_;}
-  int iterations (void) const { return this->iterations_;}
-  int ttl (void) const { return this->ttl_;}
+  int debug () const { return this->debug_;}
+  void dump () const;
+  int groups () const { return this->groups_;}
+  const ACE_INET_Addr group_start () const { return this->group_start_;}
+  u_long role () const { return this->role_;}
+  int iterations () const { return this->iterations_;}
+  int ttl () const { return this->ttl_;}
 
   //FUZZ: disable check_for_lack_ACE_OS
-  int wait (void) const { return this->wait_;}
+  int wait () const { return this->wait_;}
   //FUZZ: enable check_for_lack_ACE_OS
 
-  ACE_SOCK_Dgram_Mcast::options options (void) const
+  ACE_SOCK_Dgram_Mcast::options options () const
   {
     return static_cast<ACE_SOCK_Dgram_Mcast::options> (this->sdm_opts_);
   }
@@ -395,7 +395,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[])
 }
 
 void
-MCT_Config::dump (void) const
+MCT_Config::dump () const
 {
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Dumping MCT_Config\n")));
@@ -442,7 +442,7 @@ class MCT_Event_Handler : public ACE_Event_Handler
 public:
   MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options
                       = ACE_SOCK_Dgram_Mcast::DEFOPTS);
-  virtual ~MCT_Event_Handler (void);
+  ~MCT_Event_Handler () override;
 
   int join (const ACE_INET_Addr &mcast_addr,
             int reuse_addr = 1,
@@ -451,16 +451,16 @@ public:
              const ACE_TCHAR *net_if = 0);
 
   // = Event Handler hooks.
-  virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask);
+  int handle_input (ACE_HANDLE handle) override;
+  int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask) override;
 
-  virtual ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const override;
 
   // Turn loopback on/off. Must be called after at least 1 join() is performed.
   int loopback (bool on_off);
 
 protected:
-  ACE_SOCK_Dgram_Mcast *mcast (void);
+  ACE_SOCK_Dgram_Mcast *mcast ();
   int find (const char *buf);
 
 private:
@@ -484,7 +484,7 @@ MCT_Event_Handler::MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options)
   ++MCT_Event_Handler::active_handlers_;
 }
 
-MCT_Event_Handler::~MCT_Event_Handler (void)
+MCT_Event_Handler::~MCT_Event_Handler ()
 {
   size_t size = this->address_vec_.size ();
   for (size_t i = 0; i < size; ++i)
@@ -497,7 +497,7 @@ MCT_Event_Handler::~MCT_Event_Handler (void)
 
 
 ACE_SOCK_Dgram_Mcast *
-MCT_Event_Handler::mcast (void)
+MCT_Event_Handler::mcast ()
 {
   return &this->mcast_;
 }
@@ -627,7 +627,7 @@ MCT_Event_Handler::handle_close (ACE_HANDLE /*fd*/,
 }
 
 ACE_HANDLE
-MCT_Event_Handler::get_handle (void) const
+MCT_Event_Handler::get_handle () const
 {
   return this->mcast_.get_handle ();
 }
@@ -652,14 +652,14 @@ class MCT_Task : public ACE_Task<ACE_NULL_SYNCH>
 public:
   MCT_Task (const MCT_Config &config,
             ACE_Reactor *reactor = ACE_Reactor::instance ());
-  ~MCT_Task (void);
+  ~MCT_Task () override;
 
   //FUZZ: disable check_for_lack_ACE_OS
   // = Task hooks.
-  virtual int open (void *args = 0);
+  int open (void *args = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
-  virtual int svc (void);
+  int svc () override;
 
 private:
   const MCT_Config &config_;
@@ -672,7 +672,7 @@ MCT_Task::MCT_Task (const MCT_Config &config,
   this->reactor (reactor);
 }
 
-MCT_Task::~MCT_Task (void)
+MCT_Task::~MCT_Task ()
 {}
 
 int
@@ -742,7 +742,7 @@ MCT_Task::open (void *)
 }
 
 int
-MCT_Task::svc (void)
+MCT_Task::svc ()
 {
   // make sure this thread owns the reactor or handle_events () won't do
   // anything.
diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp
index e217fa7c497..0eda873a68c 100644
--- a/ACE/tests/Multicast_Test_IPV6.cpp
+++ b/ACE/tests/Multicast_Test_IPV6.cpp
@@ -94,7 +94,7 @@ public:
       BOTH = PRODUCER | CONSUMER
     };
 
-  MCT_Config (void)
+  MCT_Config ()
     : group_start_ (MCT_START_PORT, MCT_START_GROUP),
       groups_ (0),
       debug_ (0),
@@ -110,26 +110,26 @@ public:
         this->groups_ = ACE_MIN (IP_MAX_MEMBERSHIPS, MCT_GROUPS);
     }
 
-  ~MCT_Config (void)
+  ~MCT_Config ()
     {}
 
   //FUZZ: disable check_for_lack_ACE_OS
   int open (int argc, ACE_TCHAR *argv[]);
   //FUZZ: enable check_for_lack_ACE_OS
 
-  int debug (void) const { return this->debug_;}
-  void dump (void) const;
-  int groups (void) const { return this->groups_;}
-  const ACE_INET_Addr group_start (void) const { return this->group_start_;}
-  u_long role (void) const { return this->role_;}
-  int iterations (void) const { return this->iterations_;}
-  int ttl (void) const { return this->ttl_;}
+  int debug () const { return this->debug_;}
+  void dump () const;
+  int groups () const { return this->groups_;}
+  const ACE_INET_Addr group_start () const { return this->group_start_;}
+  u_long role () const { return this->role_;}
+  int iterations () const { return this->iterations_;}
+  int ttl () const { return this->ttl_;}
 
   //FUZZ: disable check_for_lack_ACE_OS
-  int wait (void) const { return this->wait_;}
+  int wait () const { return this->wait_;}
   //FUZZ: enable check_for_lack_ACE_OS
 
-  ACE_SOCK_Dgram_Mcast::options options (void) const
+  ACE_SOCK_Dgram_Mcast::options options () const
   {
     return static_cast<ACE_SOCK_Dgram_Mcast::options> (this->sdm_opts_);
   }
@@ -405,7 +405,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[])
 }
 
 void
-MCT_Config::dump (void) const
+MCT_Config::dump () const
 {
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Dumping MCT_Config\n")));
@@ -458,7 +458,7 @@ class MCT_Event_Handler : public ACE_Event_Handler
 public:
   MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options
                       = ACE_SOCK_Dgram_Mcast::DEFOPTS);
-  virtual ~MCT_Event_Handler (void);
+  ~MCT_Event_Handler () override;
 
   int join (const ACE_INET_Addr &mcast_addr,
             int reuse_addr = 1,
@@ -467,13 +467,13 @@ public:
              const ACE_TCHAR *net_if = 0);
 
   // = Event Handler hooks.
-  virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask);
+  int handle_input (ACE_HANDLE handle) override;
+  int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask) override;
 
-  virtual ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const override;
 
 protected:
-  ACE_SOCK_Dgram_Mcast *mcast (void);
+  ACE_SOCK_Dgram_Mcast *mcast ();
   int find (const char *buf);
 
 private:
@@ -497,7 +497,7 @@ MCT_Event_Handler::MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options)
   ++MCT_Event_Handler::active_handlers_;
 }
 
-MCT_Event_Handler::~MCT_Event_Handler (void)
+MCT_Event_Handler::~MCT_Event_Handler ()
 {
   size_t size = this->address_vec_.size ();
   for (size_t i = 0; i < size; ++i)
@@ -509,7 +509,7 @@ MCT_Event_Handler::~MCT_Event_Handler (void)
 
 
 ACE_SOCK_Dgram_Mcast *
-MCT_Event_Handler::mcast (void)
+MCT_Event_Handler::mcast ()
 {
   return &this->mcast_;
 }
@@ -639,7 +639,7 @@ MCT_Event_Handler::handle_close (ACE_HANDLE /*fd*/,
 }
 
 ACE_HANDLE
-MCT_Event_Handler::get_handle (void) const
+MCT_Event_Handler::get_handle () const
 {
   return this->mcast_.get_handle ();
 }
@@ -656,12 +656,12 @@ class MCT_Task : public ACE_Task<ACE_NULL_SYNCH>
 public:
   MCT_Task (const MCT_Config &config,
             ACE_Reactor *reactor = ACE_Reactor::instance ());
-  ~MCT_Task (void);
+  ~MCT_Task () override;
 
   //FUZZ: disable check_for_lack_ACE_OS
   // = Task hooks.
-  virtual int open (void *args = 0);
-  virtual int svc (void);
+  int open (void *args = 0) override;
+  int svc () override;
   //FUZZ: enable check_for_lack_ACE_OS
 
 private:
@@ -675,7 +675,7 @@ MCT_Task::MCT_Task (const MCT_Config &config,
   this->reactor (reactor);
 }
 
-MCT_Task::~MCT_Task (void)
+MCT_Task::~MCT_Task ()
 {}
 
 int
@@ -738,7 +738,7 @@ MCT_Task::open (void *)
 }
 
 int
-MCT_Task::svc (void)
+MCT_Task::svc ()
 {
   // make sure this thread owns the reactor or handle_events () won't do
   // anything.
diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp
index 395b49cf117..fd9c253479d 100644
--- a/ACE/tests/Network_Adapters_Test.cpp
+++ b/ACE/tests/Network_Adapters_Test.cpp
@@ -86,7 +86,7 @@
  * as not a ICMP_ECHOREPLY message and further ICMP_ECHOREPLY
  * received. Don't worry, be happy - it's ok.
  */
-Echo_Handler::Echo_Handler (void)
+Echo_Handler::Echo_Handler ()
   : ping_socket_ (),
     reply_wait_ (),
     remote_addrs_ (0),
@@ -99,7 +99,7 @@ Echo_Handler::Echo_Handler (void)
 {
 }
 
-Echo_Handler::~Echo_Handler (void)
+Echo_Handler::~Echo_Handler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Echo_Handler::~Echo_Handler - entered.\n")));
@@ -306,7 +306,7 @@ Echo_Handler::open (ACE_Reactor * const reactor,
 }
 
 ACE_Ping_Socket &
-Echo_Handler::ping_socket (void)
+Echo_Handler::ping_socket ()
 {
   return this->ping_socket_;
 }
@@ -378,7 +378,7 @@ Echo_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 }
 
 ACE_HANDLE
-Echo_Handler::get_handle (void) const
+Echo_Handler::get_handle () const
 {
   return ((ACE_ICMP_Socket &) this->ping_socket_).get_handle ();
 }
@@ -522,7 +522,7 @@ Echo_Handler::handle_timeout (ACE_Time_Value const &,
 }
 
 int
-Echo_Handler::does_echo_test_successful (void)
+Echo_Handler::does_echo_test_successful ()
 {
   for (size_t i = 0; i < this->number_remotes_; ++i)
     {
@@ -544,13 +544,13 @@ Stop_Handler::Stop_Handler (ACE_Reactor * const reactor)
                   sizeof this->handlers_to_stop_);
 }
 
-Stop_Handler::~Stop_Handler (void)
+Stop_Handler::~Stop_Handler ()
 {
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) Stop_Handler::~Stop_Handler.\n")));
 }
 
 int
-Stop_Handler::open (void)
+Stop_Handler::open ()
 {
   // Register the signal handler object to catch the signals.
 #if (SIGINT != 0)
@@ -747,14 +747,14 @@ Stop_Handler::unregister_handler (ACE_Event_Handler *handler)
 }
 
 
-Repeats_Handler::Repeats_Handler (void)
+Repeats_Handler::Repeats_Handler ()
   : check_handler_ (0),
     seconds_timer_ (60),
     counter_ (0)
 {
 }
 
-Repeats_Handler::~Repeats_Handler (void)
+Repeats_Handler::~Repeats_Handler ()
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("(%P|%t) Repeats_Handler::~Repeats_Handler.\n")));
@@ -1046,7 +1046,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   // to do it right in at least one test.  Notice the lack of
   // ACE_NEW_RETURN, that monstrosity has no business in proper C++
   // code ...
-  auto_ptr<ACE_Timer_Heap_Variable_Time_Source> tq(
+  std::unique_ptr<ACE_Timer_Heap_Variable_Time_Source> tq(
       new ACE_Timer_Heap_Variable_Time_Source);
   // ... notice how the policy is in the derived timer queue type.
   // The abstract timer queue does not have a time policy ...
diff --git a/ACE/tests/New_Fail_Test.cpp b/ACE/tests/New_Fail_Test.cpp
index 11d6bc12316..f542fed9f31 100644
--- a/ACE/tests/New_Fail_Test.cpp
+++ b/ACE/tests/New_Fail_Test.cpp
@@ -53,7 +53,7 @@ try_ace_new (char **p)
 }
 
 static char *
-try_ace_new_return (void)
+try_ace_new_return ()
 {
   char *p = 0;
   ACE_NEW_RETURN (p, char[BIG_BLOCK], 0);
@@ -61,7 +61,7 @@ try_ace_new_return (void)
 }
 
 static char *
-try_ace_new_noreturn (void)
+try_ace_new_noreturn ()
 {
   char *p = 0;
   ACE_NEW_NORETURN (p, char[BIG_BLOCK]);
diff --git a/ACE/tests/NonBlocking_Conn_Test.cpp b/ACE/tests/NonBlocking_Conn_Test.cpp
index 811ba8656be..8c1019093b7 100644
--- a/ACE/tests/NonBlocking_Conn_Test.cpp
+++ b/ACE/tests/NonBlocking_Conn_Test.cpp
@@ -78,7 +78,7 @@ Svc_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask)
   // handle_close() as it does plain 'delete this'.
   if (!this->is_ref_counted_)
     {
-      typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> super;
+      using super = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>;
 
       return super::handle_close (handle, mask);
     }
@@ -86,7 +86,7 @@ Svc_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask)
   return 0;
 }
 
-typedef ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> CONNECTOR;
+using CONNECTOR = ACE_Connector<Svc_Handler, ACE_SOCK_Connector>;
 
 static const char* hosts[] = {
   "www.russiantvguide.com:80",
diff --git a/ACE/tests/NonBlocking_Conn_Test.h b/ACE/tests/NonBlocking_Conn_Test.h
index a3cb165bae7..b31b9544cfc 100644
--- a/ACE/tests/NonBlocking_Conn_Test.h
+++ b/ACE/tests/NonBlocking_Conn_Test.h
@@ -24,7 +24,6 @@
 class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
 public:
-
   enum Connection_Status
     {
       Conn_SUCCEEDED,
@@ -50,7 +49,7 @@ public:
 
   Connection_Status *status_;
   int *completion_counter_;
-  bool is_ref_counted_;
+  bool const is_ref_counted_;
 };
 
 #endif /* NONBLOCKING_CONN_TEST_H */
diff --git a/ACE/tests/Notify_Performance_Test.cpp b/ACE/tests/Notify_Performance_Test.cpp
index 032fd219027..84f61e6ff43 100644
--- a/ACE/tests/Notify_Performance_Test.cpp
+++ b/ACE/tests/Notify_Performance_Test.cpp
@@ -13,6 +13,8 @@
 //=============================================================================
 
 
+#include <utility>
+
 #include "test_config.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
@@ -51,7 +53,7 @@ class Handler : public ACE_Event_Handler
 {
 public:
   /// The Handler callbacks.
-  virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE);
+  int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE) override;
 };
 
 int
@@ -90,7 +92,7 @@ client (void *arg)
 // Sets up the correct reactor (based on platform and options)
 
 static void
-create_reactor (void)
+create_reactor ()
 {
   ACE_Reactor_Impl *impl = 0;
 
@@ -191,15 +193,15 @@ run_main (int argc, ACE_TCHAR *argv[])
   create_reactor ();
 
   // Manage memory automagically.
-  auto_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ());
-  auto_ptr<ACE_Reactor_Impl> impl;
+  std::unique_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ());
+  std::unique_ptr<ACE_Reactor_Impl> impl;
 
   // If we are using other that the default implementation, we must
   // clean up.
   if (opt_select_reactor || opt_wfmo_reactor || opt_dev_poll_reactor)
     {
-      auto_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
-      impl = auto_impl;
+      std::unique_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
+      impl = std::move(auto_impl);
     }
 
   // Callback object
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index 65115e9b27b..abe20bdc17a 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -41,7 +41,7 @@
 
 // Test ACE_OS::access() to be sure a file's existence is correctly noted.
 int
-access_test (void)
+access_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing access method\n")));
@@ -67,7 +67,7 @@ access_test (void)
 
 // Test ACE_OS::rename to be sure the files come and go as expected.
 int
-rename_test (void)
+rename_test ()
 {
 #if defined (ACE_LACKS_RENAME) || defined (ACE_VXWORKS)
   // On VxWorks only some filesystem drivers support rename
@@ -181,7 +181,7 @@ rename_test (void)
 
 //
 int
-string_emulation_test (void)
+string_emulation_test ()
 {
   {
     // ========================================================================
@@ -578,7 +578,7 @@ string_emulation_test (void)
 }
 
 // Test ACE_OS::snprintf
-typedef int (*SNPrintF_t) (char *buf, size_t maxlen, const char *format, ...);
+using SNPrintF_t = int (*)(char *, size_t, const char *, ...);
 
 int
 snprintf_test (SNPrintF_t fn)
@@ -653,7 +653,7 @@ snprintf_test (SNPrintF_t fn)
 }
 
 static int
-getpwnam_r_test (void)
+getpwnam_r_test ()
 {
   int result = 0;
 
@@ -688,7 +688,7 @@ getpwnam_r_test (void)
 }
 
 static int
-compiler_test (void)
+compiler_test ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing compiler methods\n")));
 
@@ -702,7 +702,7 @@ compiler_test (void)
 }
 
 static int
-version_test (void)
+version_test ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing version macros\n")));
 
@@ -727,7 +727,7 @@ version_test (void)
 }
 
 static int
-ctime_r_test (void)
+ctime_r_test ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ctime_r\n")));
 
@@ -793,7 +793,7 @@ ctime_r_test (void)
 
 
 int
-string_strsncpy_test (void)
+string_strsncpy_test ()
 {
   {
     //FUZZ: disable check_for_lack_ACE_OS
@@ -941,7 +941,7 @@ string_strsncpy_test (void)
 
 // Test conversion between narrow and wide chars.
 int
-string_convert_test (void)
+string_convert_test ()
 {
 #if defined (ACE_HAS_WCHAR)
   ACE_DEBUG ((LM_DEBUG,
@@ -990,7 +990,7 @@ string_convert_test (void)
 
 // Test ACE_OS::strsignal()
 int
-strsignal_test (void)
+strsignal_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing strsignal method\n")));
@@ -1018,7 +1018,7 @@ strsignal_test (void)
 
 // Test the methods for getting cpu info
 int
-cpu_info_test (void)
+cpu_info_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing cpu info methods\n")));
@@ -1064,7 +1064,7 @@ cpu_info_test (void)
 }
 
 int
-last_error_test (void)
+last_error_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing last_error method\n")));
@@ -1085,7 +1085,7 @@ last_error_test (void)
 }
 
 int
-pagesize_test (void)
+pagesize_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing getpagesize method\n")));
@@ -1107,7 +1107,7 @@ pagesize_test (void)
 }
 
 int
-ace_ctype_test (void)
+ace_ctype_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing ace ctype methods\n")));
@@ -1216,7 +1216,7 @@ ace_ctype_test (void)
 }
 
 int
-ceilf_test (void)
+ceilf_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing ceilf method\n")));
@@ -1244,7 +1244,7 @@ ceilf_test (void)
 }
 
 int
-floorf_test (void)
+floorf_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing floorf method\n")));
@@ -1270,7 +1270,7 @@ floorf_test (void)
 }
 
 int
-ceil_test (void)
+ceil_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing ceil method\n")));
@@ -1298,7 +1298,7 @@ ceil_test (void)
 }
 
 int
-floor_test (void)
+floor_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing floor method\n")));
@@ -1326,7 +1326,7 @@ floor_test (void)
 }
 
 int
-ceill_test (void)
+ceill_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing ceill method\n")));
@@ -1354,7 +1354,7 @@ ceill_test (void)
 }
 
 int
-floorl_test (void)
+floorl_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing floorl method\n")));
@@ -1380,7 +1380,7 @@ floorl_test (void)
 }
 
 int
-log2_test (void)
+log2_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing log2 method\n")));
@@ -1588,7 +1588,7 @@ int snprintf_emulation_test ()
 #endif // ACE_HAS_VSNPRINTF_EMULATION
 
 int
-swab_test (void)
+swab_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing swab method\n")));
@@ -1611,7 +1611,7 @@ swab_test (void)
 }
 
 int
-gai_strerror_test (void)
+gai_strerror_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing gai_strerror method\n")));
diff --git a/ACE/tests/Pipe_Test.cpp b/ACE/tests/Pipe_Test.cpp
index b98d33d37e3..9b1a1120d4a 100644
--- a/ACE/tests/Pipe_Test.cpp
+++ b/ACE/tests/Pipe_Test.cpp
@@ -30,7 +30,7 @@ static int iterations = ACE_MAX_ITERATIONS;
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-d (don't close pipes)] ")
diff --git a/ACE/tests/Priority_Reactor_Test.cpp b/ACE/tests/Priority_Reactor_Test.cpp
index 37fd07c07da..0716cd080f4 100644
--- a/ACE/tests/Priority_Reactor_Test.cpp
+++ b/ACE/tests/Priority_Reactor_Test.cpp
@@ -28,8 +28,10 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Priority_Reactor.h"
 #include "Priority_Reactor_Test.h"
+
 #include "ace/OS_NS_sys_wait.h"
 #include "ace/OS_NS_unistd.h"
+#include <utility>
 
 
 
@@ -54,10 +56,8 @@ static int opt_max_duration = 60;
 // -m option.
 static int max_retries = 5;
 
-typedef ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR>
-        CONNECTOR;
-typedef ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR>
-        ACCEPTOR;
+using CONNECTOR = ACE_Connector<Write_Handler, ACE_SOCK_Connector>;
+using ACCEPTOR = ACE_Acceptor<Read_Handler, ACE_SOCK_Acceptor>;
 
 int Read_Handler::waiting_ = 0;
 int Read_Handler::started_ = 0;
@@ -69,7 +69,7 @@ Read_Handler::set_countdown (int nchildren)
 }
 
 int
-Read_Handler::get_countdown (void)
+Read_Handler::get_countdown ()
 {
   return Read_Handler::waiting_;
 }
@@ -150,7 +150,7 @@ Write_Handler::open (void *)
 }
 
 int
-Write_Handler::svc (void)
+Write_Handler::svc ()
 {
   // Send several short messages, doing pauses between each message.
   // The number of messages can be controlled from the command line.
@@ -271,19 +271,19 @@ run_main (int argc, ACE_TCHAR *argv[])
   // Note:  If opt_priority_reactor is false, the default ACE_Reactor is used
   // and we don't need to set one up.
   ACE_Reactor *orig_reactor = 0;
-  auto_ptr<ACE_Reactor> reactor;
+  std::unique_ptr<ACE_Reactor> reactor;
 
   if (opt_priority_reactor)
     {
       ACE_Select_Reactor *impl_ptr;
       ACE_NEW_RETURN (impl_ptr, ACE_Priority_Reactor, -1);
-      auto_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
+      std::unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
 
       ACE_Reactor *reactor_ptr;
       ACE_NEW_RETURN (reactor_ptr, ACE_Reactor (impl_ptr, 1), -1);
       auto_impl.release ();   // ACE_Reactor dtor will take it from here
-      auto_ptr<ACE_Reactor> auto_reactor (reactor_ptr);
-      reactor = auto_reactor;
+      std::unique_ptr<ACE_Reactor> auto_reactor (reactor_ptr);
+      reactor = std::move(auto_reactor);
       orig_reactor = ACE_Reactor::instance (reactor_ptr);
     }
 
diff --git a/ACE/tests/Priority_Task_Test.cpp b/ACE/tests/Priority_Task_Test.cpp
index 056dc2adae6..91a16596730 100644
--- a/ACE/tests/Priority_Task_Test.cpp
+++ b/ACE/tests/Priority_Task_Test.cpp
@@ -35,7 +35,7 @@ class Priority_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
   /// The constructor
-  Priority_Task (void);
+  Priority_Task ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /**
@@ -43,20 +43,20 @@ public:
    * priority.
    *FUZZ: enable check_for_lack_ACE_OS
    */
-  int open (void *);
+  int open (void *) override;
 
   /// Runs on a separate thread an checks the priority.
-  int svc (void);
+  int svc () override;
 
   /// Returns 1 if priority was set properly, 0 otherwise.
-  int succeeded (void) { return error_ == 0; }
+  int succeeded () { return error_ == 0; }
 
 private:
   int priority_;
   u_int error_;
 };
 
-Priority_Task::Priority_Task (void)
+Priority_Task::Priority_Task ()
   : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()),
     priority_ (0),
     error_ (0)
@@ -125,7 +125,7 @@ Priority_Task::open (void *arg)
 }
 
 int
-Priority_Task::svc (void)
+Priority_Task::svc ()
 {
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
diff --git a/ACE/tests/Proactor_File_Test.cpp b/ACE/tests/Proactor_File_Test.cpp
index 0181d114995..39614badfa5 100644
--- a/ACE/tests/Proactor_File_Test.cpp
+++ b/ACE/tests/Proactor_File_Test.cpp
@@ -46,24 +46,24 @@ class FileIOHandler : public ACE_Handler
 {
 public:
   FileIOHandler ();
-  virtual ~FileIOHandler ();
+  ~FileIOHandler () override;
 
   int
   Connect();
 
   // This method will be called when an asynchronous read
   // completes on a file.
-  virtual void
-  handle_read_file(const ACE_Asynch_Read_File::Result &result);
+  void
+  handle_read_file(const ACE_Asynch_Read_File::Result &result) override;
 
   // This method will be called when an asynchronous write
   // completes on a file.
-  virtual void
-  handle_write_file(const ACE_Asynch_Write_File::Result &result);
+  void
+  handle_write_file(const ACE_Asynch_Write_File::Result &result) override;
 
   // Callback hook invoked by the Proactor's Timer_Queue.
-  virtual void
-  handle_time_out(const ACE_Time_Value &tv, const void *arg);
+  void
+  handle_time_out(const ACE_Time_Value &tv, const void *arg) override;
 
   // Our I/O objects; they're public so others can access them
   ACE_Asynch_Read_File reader_;
diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp
index 6424635ae52..04bea2e7779 100644
--- a/ACE/tests/Proactor_Test.cpp
+++ b/ACE/tests/Proactor_Test.cpp
@@ -58,7 +58,7 @@
 
 
 // Proactor Type (UNIX only, Win32 ignored)
-typedef enum { DEFAULT = 0, AIOCB, SIG, SUN, CB } ProactorType;
+using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB };
 static ProactorType proactor_type = DEFAULT;
 
 // POSIX : > 0 max number aio operations  proactor,
@@ -164,28 +164,28 @@ disable_signal (int sigmin, int sigmax)
 class MyTask : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  MyTask (void):
+  MyTask ():
     lock_ (),
     sem_ ((unsigned int) 0),
     proactor_(0) {}
 
-  virtual ~MyTask()
+  ~MyTask() override
     {
       (void) this->stop ();
       (void) this->delete_proactor();
     }
 
-  virtual int svc (void);
+  int svc () override;
 
   int start (int num_threads,
              ProactorType type_proactor,
              size_t max_op );
-  int stop  (void);
+  int stop  ();
 
 private:
   int  create_proactor (ProactorType type_proactor,
                         size_t max_op);
-  int  delete_proactor (void);
+  int  delete_proactor ();
 
   ACE_SYNCH_RECURSIVE_MUTEX lock_;
   ACE_Thread_Semaphore sem_;
@@ -279,7 +279,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
 }
 
 int
-MyTask::delete_proactor (void)
+MyTask::delete_proactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -341,7 +341,7 @@ MyTask::stop ()
 }
 
 int
-MyTask::svc (void)
+MyTask::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n")));
 
@@ -364,13 +364,13 @@ class TestData
 {
 public:
   TestData ();
-  bool testing_done (void);
-  Server *server_up (void);
-  Client *client_up (void);
+  bool testing_done ();
+  Server *server_up ();
+  Client *client_up ();
   void server_done (Server *s);
   void client_done (Client *c);
-  void stop_all (void);
-  void report (void);
+  void stop_all ();
+  void report ();
 
 private:
   struct Local_Stats
@@ -403,7 +403,7 @@ TestData::TestData ()
 }
 
 bool
-TestData::testing_done (void)
+TestData::testing_done ()
 {
   int svr_up = this->servers_.sessions_up_.value ();
   int svr_dn = this->servers_.sessions_down_.value ();
@@ -417,7 +417,7 @@ TestData::testing_done (void)
 }
 
 Server *
-TestData::server_up (void)
+TestData::server_up ()
 {
   ++this->servers_.sessions_up_;
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
@@ -439,7 +439,7 @@ TestData::server_up (void)
 }
 
 Client *
-TestData::client_up (void)
+TestData::client_up ()
 {
   ++this->clients_.sessions_up_;
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
@@ -531,7 +531,7 @@ TestData::client_done (Client *c)
 }
 
 void
-TestData::stop_all (void)
+TestData::stop_all ()
 {
   int i;
 
@@ -568,7 +568,7 @@ TestData::stop_all (void)
 }
 
 void
-TestData::report (void)
+TestData::report ()
 {
   // Print statistics
   ACE_TCHAR bufs [256];
@@ -621,10 +621,10 @@ class Acceptor : public ACE_Asynch_Acceptor<Server>
 {
 public:
   Acceptor (TestData *tester);
-  virtual ~Acceptor (void);
+  ~Acceptor () override;
 
   // Virtual from ACE_Asynch_Acceptor
-  Server *make_handler (void);
+  Server *make_handler () override;
 
 private:
   TestData *tester_;
@@ -636,13 +636,13 @@ Acceptor::Acceptor (TestData *tester)
 {
 }
 
-Acceptor::~Acceptor (void)
+Acceptor::~Acceptor ()
 {
   this->cancel ();
 }
 
 Server *
-Acceptor::make_handler (void)
+Acceptor::make_handler ()
 {
   return this->tester_->server_up ();
 }
@@ -666,7 +666,7 @@ Server::Server (TestData *tester, int id)
 {
 }
 
-Server::~Server (void)
+Server::~Server ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Server %d dtor; %d sends (%B bytes); ")
@@ -776,7 +776,7 @@ Server::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Server::initiate_read_stream (void)
+Server::initiate_read_stream ()
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
@@ -1055,12 +1055,12 @@ class Connector : public ACE_Asynch_Connector<Client>
 {
 public:
   Connector (TestData *tester);
-  virtual ~Connector (void);
+  ~Connector () override;
 
   int  start (const ACE_INET_Addr &addr, int num);
 
   // Virtual from ACE_Asynch_Connector
-  Client *make_handler (void);
+  Client *make_handler () override;
 
 private:
   TestData *tester_;
@@ -1073,13 +1073,13 @@ Connector::Connector (TestData *tester)
 {
 }
 
-Connector::~Connector (void)
+Connector::~Connector ()
 {
   this->cancel ();
 }
 
 Client *
-Connector::make_handler (void)
+Connector::make_handler ()
 {
   return this->tester_->client_up ();
 }
@@ -1141,7 +1141,7 @@ Client::Client (TestData *tester, int id)
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Client %d dtor; %d sends (%B bytes); ")
@@ -1271,7 +1271,7 @@ Client::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Client::initiate_write_stream (void)
+Client::initiate_write_stream ()
 {
   if (this->flg_cancel_ != 0 ||
       this->stop_writing_ ||
@@ -1353,7 +1353,7 @@ Client::initiate_write_stream (void)
 }
 
 int
-Client::initiate_read_stream (void)
+Client::initiate_read_stream ()
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp
index 341c604c30d..c76eb0b62c9 100644
--- a/ACE/tests/Proactor_Test_IPV6.cpp
+++ b/ACE/tests/Proactor_Test_IPV6.cpp
@@ -59,7 +59,7 @@
 
 
 // Proactor Type (UNIX only, Win32 ignored)
-typedef enum { DEFAULT = 0, AIOCB, SIG, SUN, CB } ProactorType;
+using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB };
 static ProactorType proactor_type = DEFAULT;
 
 // POSIX : > 0 max number aio operations  proactor,
@@ -165,28 +165,28 @@ disable_signal (int sigmin, int sigmax)
 class MyTask : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  MyTask (void):
+  MyTask ():
     lock_ (),
     sem_ ((unsigned int) 0),
     proactor_(0) {}
 
-  virtual ~MyTask()
+  ~MyTask() override
     {
       (void) this->stop ();
       (void) this->delete_proactor();
     }
 
-  virtual int svc (void);
+  int svc () override;
 
   int start (int num_threads,
              ProactorType type_proactor,
              size_t max_op );
-  int stop  (void);
+  int stop  ();
 
 private:
   int  create_proactor (ProactorType type_proactor,
                         size_t max_op);
-  int  delete_proactor (void);
+  int  delete_proactor ();
 
   ACE_SYNCH_RECURSIVE_MUTEX lock_;
   ACE_Thread_Semaphore sem_;
@@ -280,7 +280,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
 }
 
 int
-MyTask::delete_proactor (void)
+MyTask::delete_proactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -342,7 +342,7 @@ MyTask::stop ()
 }
 
 int
-MyTask::svc (void)
+MyTask::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n")));
 
@@ -365,13 +365,13 @@ class TestData
 {
 public:
   TestData ();
-  bool testing_done (void);
-  Server *server_up (void);
-  Client *client_up (void);
+  bool testing_done ();
+  Server *server_up ();
+  Client *client_up ();
   void server_done (Server *s);
   void client_done (Client *c);
-  void stop_all (void);
-  void report (void);
+  void stop_all ();
+  void report ();
 
 private:
   struct Local_Stats
@@ -404,7 +404,7 @@ TestData::TestData ()
 }
 
 bool
-TestData::testing_done (void)
+TestData::testing_done ()
 {
   int svr_up = this->servers_.sessions_up_.value ();
   int svr_dn = this->servers_.sessions_down_.value ();
@@ -418,7 +418,7 @@ TestData::testing_done (void)
 }
 
 Server *
-TestData::server_up (void)
+TestData::server_up ()
 {
   ++this->servers_.sessions_up_;
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
@@ -440,7 +440,7 @@ TestData::server_up (void)
 }
 
 Client *
-TestData::client_up (void)
+TestData::client_up ()
 {
   ++this->clients_.sessions_up_;
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
@@ -532,7 +532,7 @@ TestData::client_done (Client *c)
 }
 
 void
-TestData::stop_all (void)
+TestData::stop_all ()
 {
   int i;
 
@@ -569,7 +569,7 @@ TestData::stop_all (void)
 }
 
 void
-TestData::report (void)
+TestData::report ()
 {
   // Print statistics
   ACE_TCHAR bufs [256];
@@ -622,10 +622,10 @@ class Acceptor : public ACE_Asynch_Acceptor<Server>
 {
 public:
   Acceptor (TestData *tester);
-  virtual ~Acceptor (void);
+  ~Acceptor () override;
 
   // Virtual from ACE_Asynch_Acceptor
-  Server *make_handler (void);
+  Server *make_handler () override;
 
 private:
   TestData *tester_;
@@ -637,13 +637,13 @@ Acceptor::Acceptor (TestData *tester)
 {
 }
 
-Acceptor::~Acceptor (void)
+Acceptor::~Acceptor ()
 {
   this->cancel ();
 }
 
 Server *
-Acceptor::make_handler (void)
+Acceptor::make_handler ()
 {
   return this->tester_->server_up ();
 }
@@ -667,7 +667,7 @@ Server::Server (TestData *tester, int id)
 {
 }
 
-Server::~Server (void)
+Server::~Server ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Server %d dtor; %d sends (%d bytes); ")
@@ -777,7 +777,7 @@ Server::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Server::initiate_read_stream (void)
+Server::initiate_read_stream ()
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
@@ -1056,12 +1056,12 @@ class Connector : public ACE_Asynch_Connector<Client>
 {
 public:
   Connector (TestData *tester);
-  virtual ~Connector (void);
+  ~Connector () override;
 
   int  start (const ACE_INET_Addr &addr, int num);
 
   // Virtual from ACE_Asynch_Connector
-  Client *make_handler (void);
+  Client *make_handler () override;
 
 private:
   TestData *tester_;
@@ -1074,13 +1074,13 @@ Connector::Connector (TestData *tester)
 {
 }
 
-Connector::~Connector (void)
+Connector::~Connector ()
 {
   this->cancel ();
 }
 
 Client *
-Connector::make_handler (void)
+Connector::make_handler ()
 {
   return this->tester_->client_up ();
 }
@@ -1143,7 +1143,7 @@ Client::Client (TestData *tester, int id)
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Client %d dtor; %d sends (%d bytes); ")
@@ -1312,7 +1312,7 @@ Client::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Client::initiate_write_stream (void)
+Client::initiate_write_stream ()
 {
   if (this->flg_cancel_ != 0 ||
       this->stop_writing_ ||
@@ -1394,7 +1394,7 @@ Client::initiate_write_stream (void)
 }
 
 int
-Client::initiate_read_stream (void)
+Client::initiate_read_stream ()
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
diff --git a/ACE/tests/Proactor_Timer_Test.cpp b/ACE/tests/Proactor_Timer_Test.cpp
index e13b01b9ff4..8fdc0af8a89 100644
--- a/ACE/tests/Proactor_Timer_Test.cpp
+++ b/ACE/tests/Proactor_Timer_Test.cpp
@@ -39,10 +39,10 @@ public:
   Time_Handler ();
 
   /// Handle the timeout.
-  virtual void handle_time_out (const ACE_Time_Value &tv, const void *arg);
+  void handle_time_out (const ACE_Time_Value &tv, const void *arg) override;
 
   /// Return our timer id.
-  long timer_id (void) const;
+  long timer_id () const;
 
   /// Set our timer id;
   void timer_id (long);
@@ -71,10 +71,10 @@ public:
   Repeat_Timer_Handler (const int repeat_time = REPEAT_INTERVAL)
     : repeat_secs_ (repeat_time), expirations_ (0) {};
 
-  ~Repeat_Timer_Handler ();
+  ~Repeat_Timer_Handler () override;
 
   // Handle the timeout.
-  virtual void handle_time_out (const ACE_Time_Value &tv, const void *arg);
+  void handle_time_out (const ACE_Time_Value &tv, const void *arg) override;
 
 private:
   int repeat_secs_;
@@ -82,7 +82,7 @@ private:
 };
 
 
-Time_Handler::Time_Handler (void)
+Time_Handler::Time_Handler ()
   : timer_id_ (-1)
 {
   // Nothing
@@ -118,7 +118,7 @@ Time_Handler::handle_time_out (const ACE_Time_Value &, const void *arg)
 }
 
 long
-Time_Handler::timer_id (void) const
+Time_Handler::timer_id () const
 {
   return this->timer_id_;
 }
@@ -168,7 +168,7 @@ Repeat_Timer_Handler::handle_time_out (const ACE_Time_Value &, const void *)
 }
 
 static void
-test_registering_all_handlers (void)
+test_registering_all_handlers ()
 {
   ACE_Trace t (ACE_TEXT ("test_registering_all_handler"),
                __LINE__,
@@ -194,7 +194,7 @@ test_registering_all_handlers (void)
 }
 
 static void
-test_registering_one_handler (void)
+test_registering_one_handler ()
 {
   ACE_Trace t (ACE_TEXT ("test_registering_one_handler"),
                __LINE__,
@@ -222,7 +222,7 @@ test_registering_one_handler (void)
 }
 
 static void
-test_canceling_odd_timers (void)
+test_canceling_odd_timers ()
 {
   ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"),
                __LINE__,
@@ -259,7 +259,7 @@ test_canceling_odd_timers (void)
 }
 
 static void
-test_cancel_repeat_timer (void)
+test_cancel_repeat_timer ()
 {
   Repeat_Timer_Handler *handler = new Repeat_Timer_Handler;
   ACE_Time_Value timeout (Repeat_Timer_Handler::REPEAT_INTERVAL);
@@ -308,9 +308,9 @@ run_main (int argc, ACE_TCHAR *[])
       // to do it right in at least one test.  Notice the lack of
       // ACE_NEW_RETURN, that monstrosity has no business in proper C++
       // code ...
-      typedef ACE_Timer_Heap_T<ACE_Handler*,ACE_Proactor_Handle_Timeout_Upcall,ACE_SYNCH_RECURSIVE_MUTEX,ACE_FPointer_Time_Policy> Timer_Queue;
+      using Timer_Queue = ACE_Timer_Heap_T<ACE_Handler *, ACE_Proactor_Handle_Timeout_Upcall, ACE_MT_SYNCH::RECURSIVE_MUTEX, ACE_FPointer_Time_Policy>;
 
-      auto_ptr<Timer_Queue> tq(new Timer_Queue);
+      std::unique_ptr<Timer_Queue> tq(new Timer_Queue);
       // ... notice how the policy is in the derived timer queue type.
       // The abstract timer queue does not have a time policy ...
       tq->set_time_policy(&ACE_High_Res_Timer::gettimeofday_hr);
diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp
index bb0ea4863cb..9f4cbd438fb 100644
--- a/ACE/tests/Proactor_UDP_Test.cpp
+++ b/ACE/tests/Proactor_UDP_Test.cpp
@@ -52,7 +52,7 @@
 #endif /* ACE_WIN32 */
 
 // Proactor Type (UNIX only, Win32 ignored)
-typedef enum { DEFAULT = 0, AIOCB, SIG, SUN, CB } ProactorType;
+using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB };
 static ProactorType proactor_type = DEFAULT;
 
 // POSIX : > 0 max number aio operations  proactor,
@@ -158,28 +158,28 @@ disable_signal (int sigmin, int sigmax)
 class MyTask : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  MyTask (void):
+  MyTask ():
     lock_ (),
     sem_ ((unsigned int) 0),
     proactor_(0) {}
 
-  virtual ~MyTask()
+  ~MyTask() override
     {
       (void) this->stop ();
       (void) this->delete_proactor();
     }
 
-  virtual int svc (void);
+  int svc () override;
 
   int start (int num_threads,
              ProactorType type_proactor,
              size_t max_op );
-  int stop  (void);
+  int stop  ();
 
 private:
   int  create_proactor (ProactorType type_proactor,
                         size_t max_op);
-  int  delete_proactor (void);
+  int  delete_proactor ();
 
   ACE_SYNCH_RECURSIVE_MUTEX lock_;
   ACE_Thread_Semaphore sem_;
@@ -273,7 +273,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
 }
 
 int
-MyTask::delete_proactor (void)
+MyTask::delete_proactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -335,7 +335,7 @@ MyTask::stop ()
 }
 
 int
-MyTask::svc (void)
+MyTask::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n")));
 
@@ -377,13 +377,13 @@ class Server : public ACE_Handler
 public:
   Server ();
   Server (TestData *tester, int id);
-  ~Server (void);
+  ~Server () override;
 
-  int id (void) { return this->id_; }
-  size_t get_total_snd (void) { return this->total_snd_; }
-  size_t get_total_rcv (void) { return this->total_rcv_; }
-  long get_total_w   (void) { return this->total_w_; }
-  long get_total_r   (void) { return this->total_r_; }
+  int id () { return this->id_; }
+  size_t get_total_snd () { return this->total_snd_; }
+  size_t get_total_rcv () { return this->total_rcv_; }
+  long get_total_w   () { return this->total_w_; }
+  long get_total_r   () { return this->total_r_; }
 
   /// This is called after the new session has been established.
   void go (ACE_HANDLE handle, const ACE_INET_Addr &client);
@@ -398,14 +398,14 @@ protected:
    */
   /// This is called when asynchronous <read> operation from the
   /// socket completes.
-  virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result);
+  void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override;
 
   /// This is called when an asynchronous <write> to the socket
   /// completes.
-  virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result);
+  void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result) override;
 
 private:
-  int initiate_read (void);
+  int initiate_read ();
   int initiate_write (ACE_Message_Block *mb, size_t nbytes);
 
   TestData *tester_;
@@ -434,28 +434,28 @@ class Client : public ACE_Handler
 public:
   Client ();
   Client (TestData *tester, int id);
-  ~Client (void);
+  ~Client () override;
 
   void go (ACE_HANDLE h, const ACE_INET_Addr &server);
-  int id (void) { return this->id_; }
-  size_t get_total_snd (void) { return this->total_snd_; }
-  size_t get_total_rcv (void) { return this->total_rcv_; }
-  int    get_total_w   (void) { return this->total_w_; }
-  int    get_total_r   (void) { return this->total_r_; }
+  int id () { return this->id_; }
+  size_t get_total_snd () { return this->total_snd_; }
+  size_t get_total_rcv () { return this->total_rcv_; }
+  int    get_total_w   () { return this->total_w_; }
+  int    get_total_r   () { return this->total_r_; }
 
   // This is called when asynchronous reads from the socket complete
-  virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result);
+  void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override;
 
   // This is called when asynchronous writes from the socket complete
-  virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result);
+  void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result) override;
 
-  void cancel (void);
+  void cancel ();
 
 private:
-  int initiate_read (void);
-  int initiate_write (void);
+  int initiate_read ();
+  int initiate_write ();
       // FUZZ: disable check_for_lack_ACE_OS
-  void close (void);
+  void close ();
       // FUZZ: enable check_for_lack_ACE_OS
 
   TestData *tester_;
@@ -482,13 +482,13 @@ class TestData
 {
 public:
   TestData ();
-  bool testing_done (void);
-  Server *server_up (void);
-  Client *client_up (void);
+  bool testing_done ();
+  Server *server_up ();
+  Client *client_up ();
   void server_done (Server *s);
   void client_done (Client *c);
-  void stop_all (void);
-  void report (void);
+  void stop_all ();
+  void report ();
 
 private:
   struct Local_Stats
@@ -521,7 +521,7 @@ TestData::TestData ()
 }
 
 bool
-TestData::testing_done (void)
+TestData::testing_done ()
 {
   int svr_up = this->servers_.sessions_up_.value ();
   int svr_dn = this->servers_.sessions_down_.value ();
@@ -535,7 +535,7 @@ TestData::testing_done (void)
 }
 
 Server *
-TestData::server_up (void)
+TestData::server_up ()
 {
   ++this->servers_.sessions_up_;
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
@@ -557,7 +557,7 @@ TestData::server_up (void)
 }
 
 Client *
-TestData::client_up (void)
+TestData::client_up ()
 {
   ++this->clients_.sessions_up_;
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
@@ -649,7 +649,7 @@ TestData::client_done (Client *c)
 }
 
 void
-TestData::stop_all (void)
+TestData::stop_all ()
 {
   int i;
 
@@ -686,7 +686,7 @@ TestData::stop_all (void)
 }
 
 void
-TestData::report (void)
+TestData::report ()
 {
   // Print statistics
   ACE_TCHAR bufs [256];
@@ -758,13 +758,13 @@ class Master : public ACE_Handler
 {
 public:
   Master (TestData *tester, const ACE_INET_Addr &recv_addr, int expected);
-  ~Master (void);
+  ~Master () override;
 
   // Called when dgram receive operation completes.
-  virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result);
+  void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override;
 
 private:
-  void start_recv (void);
+  void start_recv ();
 
   TestData *tester_;
   ACE_INET_Addr recv_addr_;
@@ -796,7 +796,7 @@ Master::Master (TestData *tester, const ACE_INET_Addr &recv_addr, int expected)
     }
 }
 
-Master::~Master (void)
+Master::~Master ()
 {
   if (this->recv_in_progress_)
     this->rd_.cancel ();
@@ -915,7 +915,7 @@ Master::handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result)
 }
 
 void
-Master::start_recv (void)
+Master::start_recv ()
 {
   if (this->mb_ == 0)
     return;
@@ -947,7 +947,7 @@ Server::Server (TestData *tester, int id)
 {
 }
 
-Server::~Server (void)
+Server::~Server ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Server %d dtor; %d sends (%B bytes); ")
@@ -1035,7 +1035,7 @@ Server::go (ACE_HANDLE handle, const ACE_INET_Addr &client)
 }
 
 int
-Server::initiate_read (void)
+Server::initiate_read ()
 {
   if (this->flg_cancel_ || this->handle () == ACE_INVALID_HANDLE)
     return -1;
@@ -1406,7 +1406,7 @@ Client::Client (TestData *tester, int id)
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Client %d dtor; %d sends (%B bytes); ")
@@ -1508,7 +1508,7 @@ Client::go (ACE_HANDLE handle, const ACE_INET_Addr &server)
 }
 
 int
-Client::initiate_write (void)
+Client::initiate_write ()
 {
   if (this->flg_cancel_ || this->handle () == ACE_INVALID_HANDLE)
     return -1;
@@ -1616,7 +1616,7 @@ Client::initiate_write (void)
 }
 
 int
-Client::initiate_read (void)
+Client::initiate_read ()
 {
   if (this->flg_cancel_ || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp
index 8334dbd15a3..ca8acbf66ce 100644
--- a/ACE/tests/Process_Env_Test.cpp
+++ b/ACE/tests/Process_Env_Test.cpp
@@ -14,8 +14,7 @@
 #include "ace/Process.h"
 #include "ace/SString.h"
 
-typedef void (*setenvfn_t) (const ACE_TCHAR *name, const ACE_TCHAR *value,
-                            void *ctx);
+using setenvfn_t = void (*)(const ACE_TCHAR *, const ACE_TCHAR *, void *);
 
 #if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE)
 
diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp
index d08152588d6..02d89c320c4 100644
--- a/ACE/tests/Process_Manager_Test.cpp
+++ b/ACE/tests/Process_Manager_Test.cpp
@@ -39,15 +39,15 @@ class Exit_Handler : public ACE_Event_Handler
 public:
   Exit_Handler (const char *msg): msg_ (msg) { }
 
-  virtual ~Exit_Handler (void) { }
+  ~Exit_Handler () override { }
 
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask)
+  int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override
   {
     delete this;
     return 0;
   }
 
-  virtual int handle_exit (ACE_Process *proc)
+  int handle_exit (ACE_Process *proc) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%P) Exit_Handler(%C) got %d: %d\n"),
@@ -176,7 +176,7 @@ public:
 
       // FUZZ: disable check_for_lack_ACE_OS
       /// FUZZ: enable check_for_lack_ACE_OS
-  int open (void*)
+  int open (void*) override
   {
     char tmp[10];
     order += ACE_OS::itoa (sleep_time_, tmp, 10);
@@ -185,7 +185,7 @@ public:
     return 0;
   }
 
-  int svc (void)
+  int svc () override
   {
     int result = 0;
     ACE_exitcode exitcode;
@@ -217,7 +217,7 @@ public:
 
       // FUZZ: disable check_for_lack_ACE_OS
       /// FUZZ: enable check_for_lack_ACE_OS
-  int close (u_long)
+  int close (u_long) override
   {
     --running_tasks;
     return 0;
@@ -231,7 +231,7 @@ private:
 
 #ifdef ACE_HAS_PROCESS_SPAWN
 static int
-command_line_test (void)
+command_line_test ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing for last character of command line\n")));
@@ -446,11 +446,7 @@ run_main (int argc, ACE_TCHAR *argv[])
                               mgr,
                               1,
                               4);
-#if defined (ACE_HAS_CPP11)
   result = mgr.wait (0, std::chrono::seconds (4), &exitcode);
-#else
-  result = mgr.wait (0, ACE_Time_Value (4), &exitcode);
-#endif
 
   if (result != child4)
     {
diff --git a/ACE/tests/Process_Manual_Event_Test.cpp b/ACE/tests/Process_Manual_Event_Test.cpp
index 7d1e55d0e01..10c2d9187a6 100644
--- a/ACE/tests/Process_Manual_Event_Test.cpp
+++ b/ACE/tests/Process_Manual_Event_Test.cpp
@@ -35,7 +35,7 @@ static const ACE_TCHAR *event_pong_name = ACE_TEXT ("ACE_Pong_Event");
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-i #iterations] [-c (child process)]\n")));
@@ -66,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 static void
-acquire_release (void)
+acquire_release ()
 {
   ACE_Manual_Event event_ping (0, USYNC_PROCESS, event_ping_name);
   ACE_Manual_Event event_pong (0, USYNC_PROCESS, event_pong_name);
diff --git a/ACE/tests/Process_Mutex_Test.cpp b/ACE/tests/Process_Mutex_Test.cpp
index 74d9aa65663..5d35c51bb7a 100644
--- a/ACE/tests/Process_Mutex_Test.cpp
+++ b/ACE/tests/Process_Mutex_Test.cpp
@@ -30,7 +30,7 @@ static const u_int n_processes = ACE_MAX_PROCESSES;
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-d (don't release mutex)] ")
@@ -65,7 +65,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 static void
-acquire_release (void)
+acquire_release ()
 {
   ACE_Process_Mutex mutex (mutex_name);
 
diff --git a/ACE/tests/Process_Semaphore_Test.cpp b/ACE/tests/Process_Semaphore_Test.cpp
index 80b7e1aa40b..af182297bcb 100644
--- a/ACE/tests/Process_Semaphore_Test.cpp
+++ b/ACE/tests/Process_Semaphore_Test.cpp
@@ -37,7 +37,7 @@ static const char *sema_pong_name = "ACE_Pong_Semaphore";
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-i #iterations] [-c (child process)]\n")));
@@ -68,7 +68,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 static void
-acquire_release (void)
+acquire_release ()
 {
 #if defined (ACE_WIN32) || \
       defined (ACE_USES_FIFO_SEM) || \
diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp
index aa0797fe6b7..8b29d634394 100644
--- a/ACE/tests/Process_Strategy_Test.cpp
+++ b/ACE/tests/Process_Strategy_Test.cpp
@@ -58,17 +58,17 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex);
 // Define a <Strategy_Acceptor> that's parameterized by the
 // <Counting_Service>.
 
-typedef ACE_Strategy_Acceptor <Counting_Service, ACE_SOCK_ACCEPTOR> ACCEPTOR;
+using ACCEPTOR = ACE_Strategy_Acceptor<Counting_Service, ACE_SOCK_Acceptor>;
 
 // Create an Options Singleton.
-typedef ACE_Singleton<Options, ACE_Null_Mutex> OPTIONS;
+using OPTIONS = ACE_Singleton<Options, ACE_Null_Mutex>;
 
 // counter for connections
 static size_t connections = 0;
 
 // Use this to show down the process gracefully.
 void
-connection_completed (void)
+connection_completed ()
 {
   // Increment connection counter.
   ++connections;
@@ -93,7 +93,7 @@ Process_Strategy::Process_Strategy (size_t n_processes,
 
 // Destructor.  g++ 2.7.2.3 gets very confused ("Internal compiler
 // error") without it.
-Process_Strategy::~Process_Strategy (void)
+Process_Strategy::~Process_Strategy ()
 {
 }
 
@@ -115,24 +115,24 @@ Process_Strategy::activate_svc_handler (Counting_Service *svc_handler,
 }
 
 ACE_File_Lock &
-Options::file_lock (void)
+Options::file_lock ()
 {
   return this->file_lock_;
 }
 
 ACE_Concurrency_Strategy <Counting_Service> *
-Options::concurrency_strategy (void)
+Options::concurrency_strategy ()
 {
   return this->concurrency_strategy_;
 }
 
 const ACE_TCHAR *
-Options::filename (void)
+Options::filename ()
 {
   return this->filename_;
 }
 
-Options::Options (void)
+Options::Options ()
   :
   // Choose to use processes by default.
 #if !defined (ACE_LACKS_FORK)
@@ -145,7 +145,7 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   delete this->concurrency_strategy_;
 }
@@ -261,7 +261,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 Options::Concurrency_Type
-Options::concurrency_type (void)
+Options::concurrency_type ()
 {
   return this->concurrency_type_;
 }
@@ -282,7 +282,7 @@ Counting_Service::Counting_Service (ACE_Thread_Manager *)
 // client.
 
 int
-Counting_Service::read (void)
+Counting_Service::read ()
 {
   ACE_READ_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1);
 
@@ -317,7 +317,7 @@ Counting_Service::read (void)
 // Increment the current value in the shared file by 1.
 
 int
-Counting_Service::inc (void)
+Counting_Service::inc ()
 {
   ACE_WRITE_GUARD_RETURN (ACE_File_Lock, ace_mon,
                           OPTIONS::instance ()->file_lock (), -1);
@@ -409,7 +409,7 @@ Counting_Service::handle_input (ACE_HANDLE)
 }
 
 int
-Counting_Service::svc (void)
+Counting_Service::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) handling thread\n")));
@@ -605,7 +605,7 @@ client (void *arg)
 // Have all connections been serviced?
 
 int
-done (void)
+done ()
 {
   return connections == ACE_MAX_ITERATIONS + 1;
 }
diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp
index 328702994b5..d18a5265af8 100644
--- a/ACE/tests/Process_Test.cpp
+++ b/ACE/tests/Process_Test.cpp
@@ -25,7 +25,7 @@
 static const char *proc_self_fd = "/proc/self/fd/";
 
 int
-test_setenv (void)
+test_setenv ()
 {
   int status = 0;
   ACE_Process_Options opts;
diff --git a/ACE/tests/RB_Tree_Test.cpp b/ACE/tests/RB_Tree_Test.cpp
index 481afb8cc21..f2568ce66bc 100644
--- a/ACE/tests/RB_Tree_Test.cpp
+++ b/ACE/tests/RB_Tree_Test.cpp
@@ -28,10 +28,10 @@
 // Type definitions for the four distinct parameterizations of the
 // test.
 
-typedef ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> INT_INT_RB_TREE_TEST;
-typedef ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex> INT_STR_RB_TREE_TEST;
-typedef ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex> STR_INT_RB_TREE_TEST;
-typedef ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex> STR_STR_RB_TREE_TEST;
+using INT_INT_RB_TREE_TEST = ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
+using INT_STR_RB_TREE_TEST = ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+using STR_INT_RB_TREE_TEST = ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+using STR_STR_RB_TREE_TEST = ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
 
 // Number of entries placed in each tree.
 static int RB_TREE_TEST_ENTRIES = 8;
@@ -523,14 +523,14 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Test
 // Destructor.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Test (void)
+ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Test ()
 {
 }
 
 // Run the interface and iteration tests.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test (void)
+ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test ()
 {
   // Run the individual portions of the test, in order.
 
@@ -545,7 +545,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test (void)
 // Tests stable and deprecated insertion interfaces.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (void)
+ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion ()
 {
   // Fill in each tree with the key and item from the appropriate
   // arrays, using the shuffle index to create the appropriate
@@ -588,7 +588,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (v
 // Tests forward and reverse iteration after insertion in both trees.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_iteration (void)
+ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_iteration ()
 {
   // Reset iterators.
 
@@ -662,7 +662,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it
 }
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration(void)
+ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration()
 {
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *tree_node = 0;
 
@@ -699,7 +699,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration
 // Tests stable and deprecated deletion interfaces.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (void)
+ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion ()
 {
   // Remove the even numbered entries from each of the trees.
 
@@ -725,7 +725,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (vo
 // Tests forward and reverse iteration after deletions in both trees.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_iteration (void)
+ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_iteration ()
 {
   // Reset iterators
 
diff --git a/ACE/tests/RW_Process_Mutex_Test.cpp b/ACE/tests/RW_Process_Mutex_Test.cpp
index 7c84597df70..36ba22dd187 100644
--- a/ACE/tests/RW_Process_Mutex_Test.cpp
+++ b/ACE/tests/RW_Process_Mutex_Test.cpp
@@ -126,7 +126,7 @@ Child::any_overlaps (const Child &other) const
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-c n (child number) -p n (port number)] [-n mutex name]\n")));
@@ -310,7 +310,7 @@ reader (int num)
 }
 
 static void
-writer (void)
+writer ()
 {
   ACE_RW_Process_Mutex mutex (mutex_name.c_str ());
 
diff --git a/ACE/tests/Reactor_Dispatch_Order_Test.cpp b/ACE/tests/Reactor_Dispatch_Order_Test.cpp
index b0032d4d36a..3046ae2294a 100644
--- a/ACE/tests/Reactor_Dispatch_Order_Test.cpp
+++ b/ACE/tests/Reactor_Dispatch_Order_Test.cpp
@@ -26,16 +26,16 @@ class Handler : public ACE_Event_Handler
 public:
   Handler (ACE_Reactor &reactor);
 
-  ~Handler();
+  ~Handler() override;
 
   int handle_timeout (const ACE_Time_Value &tv,
-                      const void *arg);
+                      const void *arg) override;
 
-  int handle_input (ACE_HANDLE fd);
+  int handle_input (ACE_HANDLE fd) override;
 
-  int handle_output (ACE_HANDLE fd);
+  int handle_output (ACE_HANDLE fd) override;
 
-  ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const override;
 
   // We need to add MSG_OOB data transfer to this test to check the
   // order of when <handle_exception> gets called.  I tried with
@@ -76,14 +76,14 @@ Handler::Handler (ACE_Reactor &reactor)
 }
 
 
-Handler::~Handler (void)
+Handler::~Handler ()
 {
   this->pipe_.close ();
 }
 
 
 ACE_HANDLE
-Handler::get_handle (void) const
+Handler::get_handle () const
 {
   return this->pipe_.read_handle ();
 }
diff --git a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp
index 849f544966f..0141e2394ba 100644
--- a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp
+++ b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp
@@ -28,16 +28,16 @@ class Handler : public ACE_Event_Handler
 public:
   Handler (ACE_Reactor &reactor);
 
-  ~Handler();
+  ~Handler() override;
 
   int handle_timeout (const ACE_Time_Value &tv,
-                      const void *arg);
+                      const void *arg) override;
 
-  int handle_input (ACE_HANDLE fd);
+  int handle_input (ACE_HANDLE fd) override;
 
-  int handle_output (ACE_HANDLE fd);
+  int handle_output (ACE_HANDLE fd) override;
 
-  ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const override;
 
   // We need to add MSG_OOB data transfer to this test to check the
   // order of when <handle_exception> gets called.  I tried with
@@ -78,14 +78,14 @@ Handler::Handler (ACE_Reactor &reactor)
 }
 
 
-Handler::~Handler (void)
+Handler::~Handler ()
 {
   this->pipe_.close ();
 }
 
 
 ACE_HANDLE
-Handler::get_handle (void) const
+Handler::get_handle () const
 {
   return this->pipe_.read_handle ();
 }
diff --git a/ACE/tests/Reactor_Exceptions_Test.cpp b/ACE/tests/Reactor_Exceptions_Test.cpp
index fe06d7813a9..99d19eef281 100644
--- a/ACE/tests/Reactor_Exceptions_Test.cpp
+++ b/ACE/tests/Reactor_Exceptions_Test.cpp
@@ -20,7 +20,7 @@
 class Except {};
 
 static void
-throw_exception (void)
+throw_exception ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) throw exception\n")));
@@ -32,8 +32,8 @@ class My_Handler : public ACE_Event_Handler, public ACE_SOCK_Dgram
 public:
   My_Handler (const ACE_INET_Addr &local_addr);
 
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE handle);
+  ACE_HANDLE get_handle () const override;
+  int handle_input (ACE_HANDLE handle) override;
 };
 
 My_Handler::My_Handler (const ACE_INET_Addr &local_addr)
@@ -42,7 +42,7 @@ My_Handler::My_Handler (const ACE_INET_Addr &local_addr)
 }
 
 ACE_HANDLE
-My_Handler::get_handle (void) const
+My_Handler::get_handle () const
 {
   return ACE_SOCK_Dgram::get_handle ();
 }
@@ -76,7 +76,7 @@ My_Handler::handle_input (ACE_HANDLE)
 class My_Reactor : public ACE_Select_Reactor
 {
 public:
-  virtual int handle_events (ACE_Time_Value *max_wait_time)
+  int handle_events (ACE_Time_Value *max_wait_time) override
   {
     int ret = 0;
 
@@ -94,7 +94,7 @@ public:
     return ret;
   }
 
-  virtual int handle_events (ACE_Time_Value &max_wait_time)
+  int handle_events (ACE_Time_Value &max_wait_time) override
   {
     return this->handle_events (&max_wait_time);
   }
@@ -102,7 +102,7 @@ public:
 
 #if defined (ACE_HAS_THREADS)
 static int
-worker (void)
+worker ()
 {
   ACE_Reactor::instance ()->owner (ACE_OS::thr_self ());
 
diff --git a/ACE/tests/Reactor_Fairness_Test.cpp b/ACE/tests/Reactor_Fairness_Test.cpp
index 3e71285e641..426adc3e269 100644
--- a/ACE/tests/Reactor_Fairness_Test.cpp
+++ b/ACE/tests/Reactor_Fairness_Test.cpp
@@ -51,7 +51,7 @@ namespace {
   // Class to collect and report on data handling for each test pass.
   struct Result_Set {
     int nr_conns;
-    typedef ACE_Array_Map<ACE_HANDLE, unsigned int> report_map;
+    using report_map = ACE_Array_Map<ACE_HANDLE, unsigned int>;
     report_map reports;
 
     void reset (int n_connections)   // Reset for next run
@@ -67,7 +67,7 @@ namespace {
     }
 
     // Return 1 if this looks like a failure wrt fairness.
-    int analyze_reports (void)
+    int analyze_reports ()
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Results (%d entries):\n"),
diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp
index dbe20b09708..47bdfe3c429 100644
--- a/ACE/tests/Reactor_Notification_Queue_Test.cpp
+++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp
@@ -28,10 +28,10 @@ public:
                 char const *test_name);
 
   /// Run the test
-  void run(void);
+  void run();
 
   /// Receive the notifications.
-  virtual int handle_exception(ACE_HANDLE);
+  int handle_exception(ACE_HANDLE) override;
 
 private:
   /**
@@ -40,12 +40,12 @@ private:
    * Each iteration of the test consists of sending multiple
    * notifications simultaneously.
    */
-  void send_notifications (void);
+  void send_notifications ();
 
   /**
    * @brief Return true if the test is finished.
    */
-  bool done (void) const;
+  bool done () const;
 
 private:
   /**
@@ -142,7 +142,7 @@ Event_Handler::Event_Handler (
 }
 
 void
-Event_Handler::run (void)
+Event_Handler::run ()
 {
   send_notifications ();
 
@@ -189,7 +189,7 @@ Event_Handler::handle_exception (ACE_HANDLE)
 }
 
 void
-Event_Handler::send_notifications (void)
+Event_Handler::send_notifications ()
 {
   for (int i = 0; i != notifications_curr_; ++i)
   {
@@ -210,7 +210,7 @@ Event_Handler::send_notifications (void)
 }
 
 bool
-Event_Handler::done (void) const
+Event_Handler::done () const
 {
   return (notifications_curr_ >= max_notifications_)
     && (notifications_sent_ == notifications_recv_);
diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp
index 38207bf6aff..08874f291c3 100644
--- a/ACE/tests/Reactor_Notify_Test.cpp
+++ b/ACE/tests/Reactor_Notify_Test.cpp
@@ -35,18 +35,18 @@ static const time_t SHORT_TIMEOUT = 2;
 class Quiet_Notify_Tester : public ACE_Task<ACE_NULL_SYNCH>
 {
 public:
-  Quiet_Notify_Tester (void) : result_ (0) {}
-  ~Quiet_Notify_Tester (void) { this->wait (); }
+  Quiet_Notify_Tester () : result_ (0) {}
+  ~Quiet_Notify_Tester () override { this->wait (); }
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Start the reactor event thread.
-  virtual int open (void * = 0);
+  int open (void * = 0) override;
 
   // Run the reactor event loop.
-  virtual int svc (void);
+  int svc () override;
 
   // Return the test result, 0 ok, -1 fail
-  int result (void) const { return this->result_; }
+  int result () const { return this->result_; }
 
 private:
   ACE_Reactor r_;
@@ -61,7 +61,7 @@ Quiet_Notify_Tester::open (void *)
 }
 
 int
-Quiet_Notify_Tester::svc (void)
+Quiet_Notify_Tester::svc ()
 {
   // Count on the main thread doing a notify in less than LONG_TIMEOUT
   // seconds. If we don't get it, report a failure.
@@ -87,7 +87,7 @@ Quiet_Notify_Tester::svc (void)
 }
 
 static int
-run_quiet_notify_test (void)
+run_quiet_notify_test ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) Starting quiet notify test\n"));
   Quiet_Notify_Tester t;
@@ -113,33 +113,33 @@ public:
                  const ACE_Time_Value &tv);
 
   /// Destructor.
-  ~Supplier_Task (void);
+  ~Supplier_Task () override;
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Make this an Active Object.
-  virtual int open (void * = 0);
+  int open (void * = 0) override;
 
   /// Close down the supplier.
   ///FUZZ: enable check_for_lack_ACE_OS
-  virtual int close (u_long);
+  int close (u_long) override;
 
   /// Generates events and sends them to the <Reactor>'s <notify>
   /// method.
-  virtual int svc (void);
+  int svc () override;
 
   /// Releases the <waiter_> semaphore when called by the <Reactor>'s
   /// notify handler.
-  virtual int handle_exception (ACE_HANDLE);
+  int handle_exception (ACE_HANDLE) override;
 
   /**
    * Called every time through the main <ACE_Reactor> event loop to
    * illustrate the difference between "limited" and "unlimited"
    * notification.
    */
-  virtual int handle_output (ACE_HANDLE);
+  int handle_output (ACE_HANDLE) override;
 
   /// Release the <waiter_>.
-  void release (void);
+  void release ();
 
 private:
   /// Perform the notifications.
@@ -169,7 +169,7 @@ private:
 };
 
 void
-Supplier_Task::release (void)
+Supplier_Task::release ()
 {
   this->waiter_.release ();
 }
@@ -235,7 +235,7 @@ Supplier_Task::close (u_long)
   return 0;
 }
 
-Supplier_Task::~Supplier_Task (void)
+Supplier_Task::~Supplier_Task ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) ~Supplier_Task\n")));
@@ -292,7 +292,7 @@ Supplier_Task::perform_notifications (int notifications)
 }
 
 int
-Supplier_Task::svc (void)
+Supplier_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) **** starting unlimited notifications test\n")));
@@ -364,7 +364,7 @@ run_test (int disable_notify_pipe,
                   -1);
 
   // Make sure this stuff gets cleaned up when this function exits.
-  auto_ptr<ACE_Reactor> r (reactor);
+  std::unique_ptr<ACE_Reactor> r (reactor);
 
   // Set the Singleton Reactor.
   ACE_Reactor *orig_reactor = ACE_Reactor::instance (reactor);
@@ -447,7 +447,7 @@ run_test (int disable_notify_pipe,
 class Purged_Notify : public ACE_Event_Handler
 {
 
-  virtual int handle_exception (ACE_HANDLE = ACE_INVALID_HANDLE)
+  int handle_exception (ACE_HANDLE = ACE_INVALID_HANDLE) override
   {
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Got a notify that should have been purged!\n")),
@@ -456,7 +456,7 @@ class Purged_Notify : public ACE_Event_Handler
 };
 
 static int
-run_notify_purge_test (void)
+run_notify_purge_test ()
 {
   int status;
   ACE_Reactor *r = ACE_Reactor::instance ();
@@ -465,7 +465,7 @@ run_notify_purge_test (void)
     Purged_Notify *n2;
 
     ACE_NEW_RETURN (n2, Purged_Notify, -1);
-    auto_ptr<Purged_Notify> ap (n2);
+    std::unique_ptr<Purged_Notify> ap (n2);
 
     // First test:
     // Notify EXCEPT, and purge ALL
diff --git a/ACE/tests/Reactor_Performance_Test.cpp b/ACE/tests/Reactor_Performance_Test.cpp
index c241ebfeb3c..0578aea9997 100644
--- a/ACE/tests/Reactor_Performance_Test.cpp
+++ b/ACE/tests/Reactor_Performance_Test.cpp
@@ -13,16 +13,18 @@
 
 #include "test_config.h"
 #include "Reactor_Performance_Test.h"
-#include "ace/Profile_Timer.h"
-#include "ace/Get_Opt.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"
+
 #include "ace/Acceptor.h"
+#include "ace/Auto_Ptr.h"
 #include "ace/Connector.h"
+#include "ace/Get_Opt.h"
+#include "ace/Profile_Timer.h"
 #include "ace/Reactor.h"
-#include "ace/WFMO_Reactor.h"
+#include "ace/SOCK_Acceptor.h"
+#include "ace/SOCK_Connector.h"
 #include "ace/Select_Reactor.h"
-#include "ace/Auto_Ptr.h"
+#include "ace/WFMO_Reactor.h"
+#include <utility>
 
 #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT
 
@@ -146,7 +148,7 @@ Write_Handler::open (void *)
 }
 
 int
-Write_Handler::send_data (void)
+Write_Handler::send_data ()
 {
   int send_size = sizeof (ACE_ALPHABET) - 1;
 
@@ -160,8 +162,8 @@ Write_Handler::send_data (void)
 }
 
 // Connection factories
-typedef ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR> CONNECTOR;
-typedef ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR;
+using CONNECTOR = ACE_Connector<Write_Handler, ACE_SOCK_Connector>;
+using ACCEPTOR = ACE_Acceptor<Read_Handler, ACE_SOCK_Acceptor>;
 
 // Execute the client tests.
 void *
@@ -245,7 +247,7 @@ client (void *arg)
 // Sets up the correct reactor (based on platform and options).
 
 void
-create_reactor (void)
+create_reactor ()
 {
   ACE_Reactor_Impl *impl = 0;
 
@@ -333,15 +335,15 @@ run_main (int argc, ACE_TCHAR *argv[])
   create_reactor ();
 
   // Manage memory automagically.
-  auto_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ());
-  auto_ptr<ACE_Reactor_Impl> impl;
+  std::unique_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ());
+  std::unique_ptr<ACE_Reactor_Impl> impl;
 
   // If we are using other that the default implementation, we must
   // clean up.
   if (opt_select_reactor || opt_wfmo_reactor)
     {
-      auto_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
-      impl = auto_impl;
+      std::unique_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
+      impl = std::move(auto_impl);
     }
 
   Read_Handler::set_countdown (opt_nconnections);
diff --git a/ACE/tests/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp
index 3f11928bfe0..f4d98da89e5 100644
--- a/ACE/tests/Reactor_Registration_Test.cpp
+++ b/ACE/tests/Reactor_Registration_Test.cpp
@@ -29,12 +29,12 @@ public:
                  ACE_HANDLE read,
                  ACE_HANDLE write);
 
-  ~Event_Handler (void);
+  ~Event_Handler () override;
 
-  int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
+  int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE) override;
 
   int handle_close (ACE_HANDLE handle,
-                    ACE_Reactor_Mask close_mask);
+                    ACE_Reactor_Mask close_mask) override;
 
   ACE_Pipe pipe_;
   bool ok_;
@@ -86,7 +86,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor,
   this->ok_ = true;
 }
 
-Event_Handler::~Event_Handler (void)
+Event_Handler::~Event_Handler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Event_Handler::~Event_Handler for %@\n"),
diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp
index 40a2334f103..16f23a6cbf1 100644
--- a/ACE/tests/Reactor_Remove_Resume_Test.cpp
+++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp
@@ -36,13 +36,13 @@ public:
 
 protected:
 
-  virtual ~Bogus_Handler (void);
+  ~Bogus_Handler () override;
 
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask);
-  virtual int resume_handler (void);
+  ACE_HANDLE get_handle () const override;
+  int handle_input (ACE_HANDLE handle) override;
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask) override;
+  int resume_handler () override;
 
 private:
 
@@ -65,12 +65,12 @@ Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor,
      ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 }
 
-Bogus_Handler::~Bogus_Handler (void)
+Bogus_Handler::~Bogus_Handler ()
 {
 }
 
 ACE_HANDLE
-Bogus_Handler::get_handle (void) const
+Bogus_Handler::get_handle () const
 {
   return this->read_handle_;
 }
@@ -102,7 +102,7 @@ Bogus_Handler::handle_close (ACE_HANDLE,
 }
 
 int
-Bogus_Handler::resume_handler (void)
+Bogus_Handler::resume_handler ()
 {
   // We don't want the reactor to resume this event handler.
   return ACE_APPLICATION_RESUMES_HANDLER;
@@ -119,20 +119,20 @@ public:
                bool & okay_to_close,
                bool suspension_test);
 
-  ACE_HANDLE write_handle (void) const;
+  ACE_HANDLE write_handle () const;
 
 protected:
 
-  virtual ~Bad_Handler (void);
+  ~Bad_Handler () override;
 
 private:
 
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask);
+  ACE_HANDLE get_handle () const override;
+  int handle_input (ACE_HANDLE handle) override;
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask) override;
 
-  int handle_input_result (void) const;
+  int handle_input_result () const;
 
 private:
 
@@ -164,12 +164,12 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor,
 
 }
 
-Bad_Handler::~Bad_Handler (void)
+Bad_Handler::~Bad_Handler ()
 {
 }
 
 ACE_HANDLE
-Bad_Handler::get_handle (void) const
+Bad_Handler::get_handle () const
 {
   return this->read_handle_;
 }
@@ -243,7 +243,7 @@ Bad_Handler::handle_close (ACE_HANDLE,
 }
 
 int
-Bad_Handler::handle_input_result (void) const
+Bad_Handler::handle_input_result () const
 {
   return
     (this->suspension_test_
@@ -362,15 +362,15 @@ handle_events (ACE_Reactor & reactor,
 
 // ------------------------------------------------------------
 
-typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void);
+using reactor_factory_type = std::unique_ptr<ACE_Reactor_Impl> (*)();
 
-auto_ptr<ACE_Reactor_Impl>
-tp_reactor_factory (void)
+std::unique_ptr<ACE_Reactor_Impl>
+tp_reactor_factory ()
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Creating ACE_TP_Reactor.\n")));
 
-  return auto_ptr<ACE_Reactor_Impl> (new ACE_TP_Reactor);
+  return std::unique_ptr<ACE_Reactor_Impl> (new ACE_TP_Reactor);
 }
 
 // ------------------------------------------------------------
@@ -412,7 +412,7 @@ struct Run_Test : public std::unary_function<reactor_factory_type, void>
                         ACE_TEXT ("** Running removal test **\n")));
           }
 
-        auto_ptr<ACE_Reactor_Impl> the_factory (factory ());
+        std::unique_ptr<ACE_Reactor_Impl> the_factory (factory ());
         ACE_Reactor reactor (the_factory.get ());
 
         // In this test, it's only okay to close the Bogus_Handler
@@ -461,7 +461,6 @@ run_main (int, ACE_TCHAR *[])
     ACE_ERROR ((LM_INFO,
                 ACE_TEXT ("Test passed.\n")));
 
-#if defined (ACE_HAS_CPP11)
   ACE_Event_Handler_var nullvar;
   if (!nullvar)
   {
@@ -496,7 +495,6 @@ run_main (int, ACE_TCHAR *[])
                 ACE_TEXT ("EH_var explicit operator!= nullptr FAILED\n")));
     ++overall_result;
   }
-#endif
 
   ACE_END_TEST;
 
diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp
index 083dda5e5ff..943304eaf49 100644
--- a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp
+++ b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp
@@ -40,13 +40,13 @@ public:
 
 protected:
 
-  virtual ~Bogus_Handler (void);
+  ~Bogus_Handler () override;
 
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask);
-  virtual int resume_handler (void);
+  ACE_HANDLE get_handle () const override;
+  int handle_input (ACE_HANDLE handle) override;
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask) override;
+  int resume_handler () override;
 
 private:
 
@@ -69,12 +69,12 @@ Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor,
      ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 }
 
-Bogus_Handler::~Bogus_Handler (void)
+Bogus_Handler::~Bogus_Handler ()
 {
 }
 
 ACE_HANDLE
-Bogus_Handler::get_handle (void) const
+Bogus_Handler::get_handle () const
 {
   return this->read_handle_;
 }
@@ -106,7 +106,7 @@ Bogus_Handler::handle_close (ACE_HANDLE,
 }
 
 int
-Bogus_Handler::resume_handler (void)
+Bogus_Handler::resume_handler ()
 {
   // We don't want the reactor to resume this event handler.
   return ACE_APPLICATION_RESUMES_HANDLER;
@@ -123,20 +123,20 @@ public:
                bool & okay_to_close,
                bool suspension_test);
 
-  ACE_HANDLE write_handle (void) const;
+  ACE_HANDLE write_handle () const;
 
 protected:
 
-  virtual ~Bad_Handler (void);
+  ~Bad_Handler () override;
 
 private:
 
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask);
+  ACE_HANDLE get_handle () const override;
+  int handle_input (ACE_HANDLE handle) override;
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask) override;
 
-  int handle_input_result (void) const;
+  int handle_input_result () const;
 
 private:
 
@@ -168,12 +168,12 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor,
 
 }
 
-Bad_Handler::~Bad_Handler (void)
+Bad_Handler::~Bad_Handler ()
 {
 }
 
 ACE_HANDLE
-Bad_Handler::get_handle (void) const
+Bad_Handler::get_handle () const
 {
   return this->read_handle_;
 }
@@ -247,7 +247,7 @@ Bad_Handler::handle_close (ACE_HANDLE,
 }
 
 int
-Bad_Handler::handle_input_result (void) const
+Bad_Handler::handle_input_result () const
 {
   return
     (this->suspension_test_
@@ -366,15 +366,15 @@ handle_events (ACE_Reactor & reactor,
 
 // ------------------------------------------------------------
 
-typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void);
+using reactor_factory_type = std::unique_ptr<ACE_Reactor_Impl> (*)();
 
-auto_ptr<ACE_Reactor_Impl>
-dev_poll_reactor_factory (void)
+std::unique_ptr<ACE_Reactor_Impl>
+dev_poll_reactor_factory ()
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Creating ACE_Dev_Poll_Reactor.\n")));
 
-  return auto_ptr<ACE_Reactor_Impl> (new ACE_Dev_Poll_Reactor);
+  return std::unique_ptr<ACE_Reactor_Impl> (new ACE_Dev_Poll_Reactor);
 }
 
 // ------------------------------------------------------------
@@ -416,7 +416,7 @@ struct Run_Test : public std::unary_function<reactor_factory_type, void>
                         ACE_TEXT ("** Running removal test **\n")));
           }
 
-        auto_ptr<ACE_Reactor_Impl> the_factory (factory ());
+        std::unique_ptr<ACE_Reactor_Impl> the_factory (factory ());
         ACE_Reactor reactor (the_factory.get ());
 
         // In this test, it's only okay to close the Bogus_Handler
diff --git a/ACE/tests/Reactor_Timer_Test.cpp b/ACE/tests/Reactor_Timer_Test.cpp
index 90d2f522bef..06158decf5c 100644
--- a/ACE/tests/Reactor_Timer_Test.cpp
+++ b/ACE/tests/Reactor_Timer_Test.cpp
@@ -33,15 +33,15 @@ public:
   Time_Handler ();
 
   /// Handle the timeout.
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg);
+  int handle_timeout (const ACE_Time_Value &tv,
+                              const void *arg) override;
 
   /// Called when <Time_Handler> is removed.
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask);
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask) override;
 
   /// Return our timer id.
-  long timer_id (void) const;
+  long timer_id () const;
 
   /// Set our timer id;
   void timer_id (long);
@@ -95,13 +95,8 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv,
     }
   else if (current_count == -1)
     {
-#if defined (ACE_HAS_CPP11)
       int result = ACE_Reactor::instance ()->reset_timer_interval (this->timer_id (),
                                                                    std::chrono::seconds {the_count + 1});
-#else
-      int result = ACE_Reactor::instance ()->reset_timer_interval (this->timer_id (),
-                                                                   ACE_Time_Value (the_count + 1));
-#endif
       if (result == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("Error resetting timer interval\n")));
@@ -111,7 +106,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv,
 }
 
 long
-Time_Handler::timer_id (void) const
+Time_Handler::timer_id () const
 {
   return this->timer_id_;
 }
@@ -123,7 +118,7 @@ Time_Handler::timer_id (long t)
 }
 
 static void
-test_registering_all_handlers (void)
+test_registering_all_handlers ()
 {
   ACE_Trace t (ACE_TEXT ("test_registering_all_handler"),
                __LINE__,
@@ -134,15 +129,9 @@ test_registering_all_handlers (void)
   for (size_t i = 0; i < ACE_MAX_TIMERS; i++)
     {
       t_id[i] =
-#if defined (ACE_HAS_CPP11)
         ACE_Reactor::instance ()->schedule_timer (&rt[i],
                                                   (const void *) i,
                                                   std::chrono::seconds {2 * i + 1});
-#else
-        ACE_Reactor::instance ()->schedule_timer (&rt[i],
-                                                  (const void *) i,
-                                                  ACE_Time_Value (2 * i + 1));
-#endif
       ACE_TEST_ASSERT (t_id[i] != -1);
       rt[i].timer_id (t_id[i]);
     }
@@ -152,7 +141,7 @@ test_registering_all_handlers (void)
 }
 
 static void
-test_registering_one_handler (void)
+test_registering_one_handler ()
 {
   ACE_Trace t (ACE_TEXT ("test_registering_one_handler"),
                __LINE__,
@@ -177,7 +166,7 @@ test_registering_one_handler (void)
 }
 
 static void
-test_canceling_odd_timers (void)
+test_canceling_odd_timers ()
 {
   ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"),
                __LINE__,
@@ -214,7 +203,7 @@ test_canceling_odd_timers (void)
 }
 
 static void
-test_resetting_timer_intervals (void)
+test_resetting_timer_intervals ()
 {
   ACE_Trace t (ACE_TEXT ("test_resetting_timer_intervals"),
                __LINE__,
@@ -266,7 +255,7 @@ run_main (int argc, ACE_TCHAR *[])
       // to do it right in at least one test.  Notice the lack of
       // ACE_NEW_RETURN, that monstrosity has no business in proper C++
       // code ...
-      auto_ptr<ACE_Timer_Heap_Variable_Time_Source> tq(
+      std::unique_ptr<ACE_Timer_Heap_Variable_Time_Source> tq(
           new ACE_Timer_Heap_Variable_Time_Source);
       // ... notice how the policy is in the derived timer queue type.
       // The abstract timer queue does not have a time policy ...
diff --git a/ACE/tests/Reactors_Test.cpp b/ACE/tests/Reactors_Test.cpp
index dad89ebb4a0..c174fce9773 100644
--- a/ACE/tests/Reactors_Test.cpp
+++ b/ACE/tests/Reactors_Test.cpp
@@ -32,20 +32,20 @@ static const int MAX_TASKS = 20;
 class Test_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  Test_Task (void);
-  ~Test_Task (void);
+  Test_Task ();
+  ~Test_Task () override;
 
   //FUZZ: disable check_for_lack_ACE_OS
   // = Task hooks.
   ///FUZZ: enable check_for_lack_ACE_OS
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int svc (void);
+  int open (void *args = 0) override;
+  int close (u_long flags = 0) override;
+  int svc () override;
 
   // = Event Handler hooks.
-  virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE fd,
-                            ACE_Reactor_Mask close_mask);
+  int handle_input (ACE_HANDLE handle) override;
+  int handle_close (ACE_HANDLE fd,
+                            ACE_Reactor_Mask close_mask) override;
 private:
   /// Number of iterations handled.
   size_t handled_;
@@ -60,7 +60,7 @@ int Test_Task::task_count_ = 0;
 static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2;
 static ACE_Recursive_Thread_Mutex recursive_lock;
 
-Test_Task::Test_Task (void)
+Test_Task::Test_Task ()
   : handled_ (0)
 {
   ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock);
@@ -72,7 +72,7 @@ Test_Task::Test_Task (void)
               Test_Task::task_count_));
 }
 
-Test_Task::~Test_Task (void)
+Test_Task::~Test_Task ()
 {
   ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock);
 
@@ -107,7 +107,7 @@ Test_Task::close (u_long)
 }
 
 int
-Test_Task::svc (void)
+Test_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) svc\n")));
diff --git a/ACE/tests/Reader_Writer_Test.cpp b/ACE/tests/Reader_Writer_Test.cpp
index a4cc9bad69c..a9c747f5f2f 100644
--- a/ACE/tests/Reader_Writer_Test.cpp
+++ b/ACE/tests/Reader_Writer_Test.cpp
@@ -57,7 +57,7 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, long> current_writers;
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n")));
diff --git a/ACE/tests/Recursive_Condition_Bug_Test.cpp b/ACE/tests/Recursive_Condition_Bug_Test.cpp
index 04e6224dca0..c2e4c9a6f8e 100644
--- a/ACE/tests/Recursive_Condition_Bug_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Bug_Test.cpp
@@ -27,14 +27,14 @@
 // Number of iterations for the performance tests.
 static int max_iterations = 30;
 
-typedef ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> Thread_Timer_Queue;
+using Thread_Timer_Queue = ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>;
 
 class Test_Handler;
 
 class Test_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  virtual int svc (void)
+  int svc () override
   {
     while (--max_iterations > 0)
       {
@@ -72,7 +72,7 @@ public:
   }
 
   //FUZZ: disable check_for_lack_ACE_OS
-  virtual int open (void * = 0)
+  int open (void * = 0) override
   {
   //FUZZ: enable check_for_lack_ACE_OS
     if (ACE_Task<ACE_MT_SYNCH>::activate (THR_NEW_LWP, 1) != 0)
@@ -95,8 +95,8 @@ private:
 class Test_Handler : public ACE_Event_Handler
 {
 public:
-  virtual int handle_timeout (const ACE_Time_Value &,
-                              const void *arg)
+  int handle_timeout (const ACE_Time_Value &,
+                              const void *arg) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%t) Test_Handler::handle_timeout\n")));
diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp
index e1e596edf71..b7b30248c4b 100644
--- a/ACE/tests/Recursive_Condition_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Test.cpp
@@ -22,16 +22,16 @@
 
 #if defined (ACE_HAS_THREADS)
 
-typedef ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> Thread_Timer_Queue;
+using Thread_Timer_Queue = ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>;
 
 class Test_Handler : public ACE_Event_Handler
 {
 public:
-  Test_Handler (void) : nr_expirations_ (0) {}
-  int nr_expirations (void) { return this->nr_expirations_; }
+  Test_Handler () : nr_expirations_ (0) {}
+  int nr_expirations () { return this->nr_expirations_; }
 
-  virtual int handle_timeout (const ACE_Time_Value &,
-                              const void *arg)
+  int handle_timeout (const ACE_Time_Value &,
+                              const void *arg) override
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Test_Handler::handle_timeout\n")));
     ++this->nr_expirations_;
@@ -87,7 +87,7 @@ waiter (void *)
 }
 
 static int
-test_1 (void)
+test_1 ()
 {
   protected_int = 1;
   if (ACE_Thread_Manager::instance()->spawn (waiter) == -1)
@@ -116,7 +116,7 @@ test_1 (void)
 }
 
 static int
-test_2 (void)
+test_2 ()
 {
   protected_int = 1;
   if (ACE_Thread_Manager::instance()->spawn (waiter) == -1)
@@ -146,7 +146,7 @@ test_2 (void)
 }
 
 static int
-test_3 (void)
+test_3 ()
 {
   protected_int = 1;
   if (ACE_Thread_Manager::instance()->spawn_n (4, waiter) == -1)
@@ -174,7 +174,7 @@ test_3 (void)
 }
 
 static int
-test_4 (void)
+test_4 ()
 {
   const int recurse_count = 3;
 
diff --git a/ACE/tests/Recursive_Mutex_Test.cpp b/ACE/tests/Recursive_Mutex_Test.cpp
index dab2e6658ab..891cf42b6df 100644
--- a/ACE/tests/Recursive_Mutex_Test.cpp
+++ b/ACE/tests/Recursive_Mutex_Test.cpp
@@ -35,7 +35,7 @@
   typedef ACE_Process_Mutex ACE_TEST_MUTEX;
 #else
 # include "ace/Thread_Mutex.h"
-  typedef ACE_Recursive_Thread_Mutex ACE_TEST_MUTEX;
+  using ACE_TEST_MUTEX = ACE_Recursive_Thread_Mutex;
 #endif
 
 #if !defined (ACE_HAS_MUTEX_TIMEOUTS)
diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
index a8b8049fdb7..5c79a13ef1b 100644
--- a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
+++ b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp
@@ -35,7 +35,7 @@ Printer::Printer (const char *message)
   ++Printer::instance_count_;
 }
 
-Printer::~Printer (void)
+Printer::~Printer ()
 {
   --Printer::instance_count_;
   ACE_DEBUG ((LM_DEBUG,
@@ -45,7 +45,7 @@ Printer::~Printer (void)
 }
 
 void
-Printer::print (void)
+Printer::print ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) %C\n"),
@@ -54,7 +54,7 @@ Printer::print (void)
 
 #if defined (ACE_HAS_THREADS)
 
-typedef ACE_Refcounted_Auto_Ptr<Printer, ACE_Thread_Mutex> Printer_var;
+using Printer_var = ACE_Refcounted_Auto_Ptr<Printer, ACE_Thread_Mutex>;
 
 /**
  * @class Scheduler
@@ -71,27 +71,27 @@ class Scheduler : public ACE_Task<ACE_SYNCH>
   friend class Method_Request_end;
 public:
   /// Constructor.
-  Scheduler (void);
+  Scheduler ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Initializer.
-  virtual int open (void *args = 0);
+  int open (void *args = 0) override;
 
   /// Terminator.
-  virtual int close (u_long flags = 0);
+  int close (u_long flags = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
   /// Destructor.
-  virtual ~Scheduler (void);
+  ~Scheduler () override;
 
   // = These methods are part of the Active Object Proxy interface.
   void print (Printer_var &printer);
-  void end (void);
+  void end ();
 
 protected:
   /// Runs the Scheduler's event loop, which dequeues <Method_Requests>
   /// and dispatches them.
-  virtual int svc (void);
+  int svc () override;
 
 private:
   // = These are the <Scheduler> implementation details.
@@ -107,10 +107,10 @@ class Method_Request_print : public ACE_Method_Request
 {
 public:
   explicit Method_Request_print (Printer_var &printer);
-  virtual ~Method_Request_print (void);
+  ~Method_Request_print () override;
 
   /// This is the entry point into the Active Object method.
-  virtual int call (void);
+  int call () override;
 
 private:
   Printer_var printer_;
@@ -126,7 +126,7 @@ Method_Request_print::Method_Request_print (Printer_var &printer)
               printer_.count ()));
 }
 
-Method_Request_print::~Method_Request_print (void)
+Method_Request_print::~Method_Request_print ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Method_Request_print will be deleted.\n")));
@@ -136,7 +136,7 @@ Method_Request_print::~Method_Request_print (void)
 }
 
 int
-Method_Request_print::call (void)
+Method_Request_print::call ()
 {
   // Dispatch the Servant's operation and store the result into the
   // Future.
@@ -156,8 +156,8 @@ class Method_Request_end : public ACE_Method_Request
 {
 public:
   Method_Request_end (Scheduler *new_Prime_Scheduler);
-  virtual ~Method_Request_end (void);
-  virtual int call (void);
+  ~Method_Request_end () override;
+  int call () override;
 
 private:
   Scheduler *scheduler_;
@@ -168,12 +168,12 @@ Method_Request_end::Method_Request_end (Scheduler *scheduler)
 {
 }
 
-Method_Request_end::~Method_Request_end (void)
+Method_Request_end::~Method_Request_end ()
 {
 }
 
 int
-Method_Request_end::call (void)
+Method_Request_end::call ()
 {
   // Shut down the scheduler by deactivating the activation queue's
   // underlying message queue - should pop all worker threads off their
@@ -186,7 +186,7 @@ Method_Request_end::call (void)
 // Associates the activation queue with this task's message queue,
 // allowing easy access to the message queue for shutting it down
 // when it's time to stop this object's service threads.
-Scheduler::Scheduler (void)
+Scheduler::Scheduler ()
   : activation_queue_ (msg_queue ())
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -195,7 +195,7 @@ Scheduler::Scheduler (void)
 
 // Destructor
 
-Scheduler::~Scheduler (void)
+Scheduler::~Scheduler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Scheduler will be destroyed\n")));
@@ -225,7 +225,7 @@ Scheduler::close (u_long)
 // Service..
 
 int
-Scheduler::svc (void)
+Scheduler::svc ()
 {
   for (;;)
     {
@@ -238,7 +238,7 @@ Scheduler::svc (void)
                       ACE_TEXT ("(%t) activation queue shut down\n")));
           break;
         }
-      auto_ptr<ACE_Method_Request> mo (mo_p);
+      std::unique_ptr<ACE_Method_Request> mo (mo_p);
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) calling method request\n")));
@@ -253,7 +253,7 @@ Scheduler::svc (void)
 }
 
 void
-Scheduler::end (void)
+Scheduler::end ()
 {
   this->activation_queue_.enqueue (new Method_Request_end (this));
 }
@@ -276,7 +276,7 @@ static int n_loops = 10;
 // This will be used in a single thread to test the reset and release
 // methods. See Bugzilla #1925 for history.
 
-typedef ACE_Refcounted_Auto_Ptr <Printer, ACE_Null_Mutex> Printer_Ptr;
+using Printer_Ptr = ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex>;
 
 static bool expect (const ACE_TCHAR *name,
                     const Printer_Ptr &ptr,
@@ -323,7 +323,7 @@ static bool expect (const ACE_TCHAR *name,
   return !fail;
 }
 
-static int test_reset_release (void)
+static int test_reset_release ()
 {
   int errors = 0;
 
@@ -381,7 +381,7 @@ static int test_reset_release (void)
   return errors;
 }
 
-static int test_operator(void)
+static int test_operator()
 {
   int errors = 0;
 
@@ -486,7 +486,7 @@ run_main (int, ACE_TCHAR *[])
                   Scheduler (),
                   -1);
 
-  auto_ptr<Scheduler> scheduler(scheduler_ptr);
+  std::unique_ptr<Scheduler> scheduler(scheduler_ptr);
 
   if (scheduler->open () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp
index d0f233993e8..92bad5dd0dd 100644
--- a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp
+++ b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp
@@ -32,16 +32,16 @@ class Handler : public ACE_Event_Handler
 public:
   Handler (ACE_Reactor &reactor);
 
-  ~Handler();
+  ~Handler() override;
 
   int handle_timeout (const ACE_Time_Value &tv,
-                      const void *arg);
+                      const void *arg) override;
 
-  int handle_input (ACE_HANDLE fd);
+  int handle_input (ACE_HANDLE fd) override;
 
-  int handle_output (ACE_HANDLE fd);
+  int handle_output (ACE_HANDLE fd) override;
 
-  ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const override;
 
   // We need to add MSG_OOB data transfer to this test to check the
   // order of when <handle_exception> gets called.  I tried with
@@ -82,14 +82,14 @@ Handler::Handler (ACE_Reactor &reactor)
 }
 
 
-Handler::~Handler (void)
+Handler::~Handler ()
 {
   this->pipe_.close ();
 }
 
 
 ACE_HANDLE
-Handler::get_handle (void) const
+Handler::get_handle () const
 {
   return this->pipe_.read_handle ();
 }
diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp
index 356fcacc7ae..61ab493c66c 100644
--- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp
+++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp
@@ -43,23 +43,23 @@ public:
 
   Reference_Counted_Event_Handler (int &events);
 
-  ~Reference_Counted_Event_Handler (void);
+  ~Reference_Counted_Event_Handler () override;
 
-  int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
-  int handle_output (ACE_HANDLE);
+  int handle_output (ACE_HANDLE) override;
 
   int handle_timeout (const ACE_Time_Value &,
-                      const void *);
+                      const void *) override;
 
-  int handle_signal (int, siginfo_t *, ucontext_t *);
+  int handle_signal (int, siginfo_t *, ucontext_t *) override;
 
   int handle_close (ACE_HANDLE,
-                    ACE_Reactor_Mask);
+                    ACE_Reactor_Mask) override;
 
-  ACE_Event_Handler::Reference_Count add_reference (void);
+  ACE_Event_Handler::Reference_Count add_reference () override;
 
-  ACE_Event_Handler::Reference_Count remove_reference (void);
+  ACE_Event_Handler::Reference_Count remove_reference () override;
 
   ACE_Pipe pipe_;
 
@@ -78,14 +78,14 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int &events)
 
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in Reference_Counted_Event_Handler() is %d\n",
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 }
 
-Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void)
+Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in ~Reference_Counted_Event_Handler() is %d\n",
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   this->pipe_.close ();
 }
@@ -95,7 +95,7 @@ Reference_Counted_Event_Handler::handle_input (ACE_HANDLE)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in Reference_Counted_Event_Handler::handle_input() is %d\n",
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   --this->events_;
 
@@ -126,7 +126,7 @@ Reference_Counted_Event_Handler::handle_output (ACE_HANDLE)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in Reference_Counted_Event_Handler::handle_output() is %d\n",
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   --this->events_;
 
@@ -152,7 +152,7 @@ Reference_Counted_Event_Handler::handle_timeout (const ACE_Time_Value &,
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in Reference_Counted_Event_Handler::handle_timeout() for arg = %C is %d\n",
               (const char *) arg,
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   --this->events_;
 
@@ -176,26 +176,26 @@ Reference_Counted_Event_Handler::handle_close (ACE_HANDLE handle,
               "Reference count is %d\n",
               handle,
               masks,
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   return 0;
 }
 
 ACE_Event_Handler::Reference_Count
-Reference_Counted_Event_Handler::add_reference (void)
+Reference_Counted_Event_Handler::add_reference ()
 {
   ACE_Event_Handler::Reference_Count reference_count =
     this->ACE_Event_Handler::add_reference ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Reference count after add_reference() is %d\n",
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   return reference_count;
 }
 
 ACE_Event_Handler::Reference_Count
-Reference_Counted_Event_Handler::remove_reference (void)
+Reference_Counted_Event_Handler::remove_reference ()
 {
   ACE_Event_Handler::Reference_Count reference_count =
     this->ACE_Event_Handler::remove_reference ();
@@ -474,19 +474,19 @@ public:
   Simple_Event_Handler (int &events,
                         int close_count);
 
-  ~Simple_Event_Handler (void);
+  ~Simple_Event_Handler () override;
 
-  int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
-  int handle_output (ACE_HANDLE);
+  int handle_output (ACE_HANDLE) override;
 
   int handle_timeout (const ACE_Time_Value &,
-                      const void *);
+                      const void *) override;
 
-  int handle_signal (int, siginfo_t *, ucontext_t *);
+  int handle_signal (int, siginfo_t *, ucontext_t *) override;
 
   int handle_close (ACE_HANDLE,
-                    ACE_Reactor_Mask);
+                    ACE_Reactor_Mask) override;
 
   ACE_Pipe pipe_;
 
@@ -509,7 +509,7 @@ Simple_Event_Handler::Simple_Event_Handler (int &events,
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Event_Handler()\n")));
 }
 
-Simple_Event_Handler::~Simple_Event_Handler (void)
+Simple_Event_Handler::~Simple_Event_Handler ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Simple_Event_Handler()\n")));
 
@@ -772,16 +772,16 @@ public:
 
   Closed_In_Upcall_Event_Handler (int &events);
 
-  ~Closed_In_Upcall_Event_Handler (void);
+  ~Closed_In_Upcall_Event_Handler () override;
 
-  int handle_input (ACE_HANDLE);
+  int handle_input (ACE_HANDLE) override;
 
   int handle_close (ACE_HANDLE,
-                    ACE_Reactor_Mask);
+                    ACE_Reactor_Mask) override;
 
-  ACE_Event_Handler::Reference_Count add_reference (void);
+  ACE_Event_Handler::Reference_Count add_reference () override;
 
-  ACE_Event_Handler::Reference_Count remove_reference (void);
+  ACE_Event_Handler::Reference_Count remove_reference () override;
 
   ACE_Pipe pipe_;
 
@@ -803,7 +803,7 @@ Closed_In_Upcall_Event_Handler::Closed_In_Upcall_Event_Handler (int &events)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Closed_In_Upcall_Event_Handler()\n")));
 }
 
-Closed_In_Upcall_Event_Handler::~Closed_In_Upcall_Event_Handler (void)
+Closed_In_Upcall_Event_Handler::~Closed_In_Upcall_Event_Handler ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Closed_In_Upcall_Event_Handler()\n")));
 
@@ -854,26 +854,26 @@ Closed_In_Upcall_Event_Handler::handle_close (ACE_HANDLE handle,
               ACE_TEXT ("Reference count is %d\n"),
               handle,
               masks,
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   return 0;
 }
 
 ACE_Event_Handler::Reference_Count
-Closed_In_Upcall_Event_Handler::add_reference (void)
+Closed_In_Upcall_Event_Handler::add_reference ()
 {
   ACE_Event_Handler::Reference_Count reference_count =
     this->ACE_Event_Handler::add_reference ();
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Reference count after add_reference() is %d\n"),
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   return reference_count;
 }
 
 ACE_Event_Handler::Reference_Count
-Closed_In_Upcall_Event_Handler::remove_reference (void)
+Closed_In_Upcall_Event_Handler::remove_reference ()
 {
   ACE_Event_Handler::Reference_Count reference_count =
     this->ACE_Event_Handler::remove_reference ();
@@ -940,11 +940,11 @@ template <class REACTOR_IMPLEMENTATION>
 class test
 {
 public:
-  test (void);
+  test ();
 };
 
 template <class REACTOR_IMPLEMENTATION>
-test<REACTOR_IMPLEMENTATION>::test (void)
+test<REACTOR_IMPLEMENTATION>::test ()
 {
   if (test_simple_event_handler)
     simple (new REACTOR_IMPLEMENTATION);
diff --git a/ACE/tests/Reverse_Lock_Test.cpp b/ACE/tests/Reverse_Lock_Test.cpp
index f9f8cefd2d6..fa8d5c32868 100644
--- a/ACE/tests/Reverse_Lock_Test.cpp
+++ b/ACE/tests/Reverse_Lock_Test.cpp
@@ -17,7 +17,7 @@
 #include "ace/Guard_T.h"
 #include "ace/Reverse_Lock_T.h"
 
-typedef ACE_Reverse_Lock<ACE_SYNCH_MUTEX> REVERSE_MUTEX;
+using REVERSE_MUTEX = ACE_Reverse_Lock<ACE_MT_SYNCH::MUTEX>;
 
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp
index cc878c5da5f..78cabecb0d0 100644
--- a/ACE/tests/SOCK_Connector_Test.cpp
+++ b/ACE/tests/SOCK_Connector_Test.cpp
@@ -142,7 +142,7 @@ find_another_host (ACE_TCHAR other_host[])
 }
 
 static int
-fail_no_listener_nonblocking (void)
+fail_no_listener_nonblocking ()
 {
   ACE_TCHAR test_host[MAXHOSTNAMELEN], test_addr[MAXHOSTNAMELEN + 8];
   int status;
@@ -224,7 +224,7 @@ fail_no_listener_nonblocking (void)
 // <ACE::handle_timed_complete> does checks on some systems.
 
 static int
-succeed_nonblocking (void)
+succeed_nonblocking ()
 {
   ACE_TCHAR test_host[MAXHOSTNAMELEN], test_addr[MAXHOSTNAMELEN + 8];
   int status;
diff --git a/ACE/tests/SOCK_Dgram_Bcast_Test.cpp b/ACE/tests/SOCK_Dgram_Bcast_Test.cpp
index 8951da96f1d..950aeeb67e9 100644
--- a/ACE/tests/SOCK_Dgram_Bcast_Test.cpp
+++ b/ACE/tests/SOCK_Dgram_Bcast_Test.cpp
@@ -197,7 +197,7 @@ int run_auto_test (const ACE_TCHAR *prog_name)
   return (receiver_exit_code);
 }
 
-void print_usage (void)
+void print_usage ()
 {
   ACE_OS::printf("Usage:SOCK_Dgram_Bast_Test [-p port] [-n dgrams_no] [-t timeout_ms] [-s] [-r]\n"
                  "\tp broadcast port [14521]\n"
diff --git a/ACE/tests/SOCK_Netlink_Test.cpp b/ACE/tests/SOCK_Netlink_Test.cpp
index decba0fbc08..d4c8e08bd2a 100644
--- a/ACE/tests/SOCK_Netlink_Test.cpp
+++ b/ACE/tests/SOCK_Netlink_Test.cpp
@@ -200,10 +200,10 @@ class Secondary_Ipaddr_Handler : public ACE_Event_Handler
 public:
 
   // Default constructor
-  Secondary_Ipaddr_Handler (void);
+  Secondary_Ipaddr_Handler ();
 
   // Destructor
-  virtual ~Secondary_Ipaddr_Handler (void);
+  ~Secondary_Ipaddr_Handler () override;
 
   //FUZZ: disable check_for_lack_ACE_OS
   // Initialization. Schedules a timer to run start the business.
@@ -214,21 +214,21 @@ public:
             const char *const if_name);
 
   // Returns reference to netlink socket. Necessary for reactor.
-  virtual ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const override;
 
   /**
    * Takes care of the input. Reads the incoming messages,
    * makes their processing.
    */
-  virtual int handle_input (ACE_HANDLE handle);
+  int handle_input (ACE_HANDLE handle) override;
 
   // Makes clean-up
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask);
+  int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask) override;
 
   // Runs a state machine. Controls adding/deleting of ip-address.
   int handle_timeout (ACE_Time_Value const & tv,
-                      void const * arg = 0);
+                      void const * arg = 0) override;
 
   // Sends to kernel a request to add secondary ip/mask to an
   // interface.
@@ -418,7 +418,7 @@ Secondary_Ipaddr_Handler::open (ACE_Reactor *const reactor,
 }
 
 ACE_HANDLE
-Secondary_Ipaddr_Handler::get_handle (void) const
+Secondary_Ipaddr_Handler::get_handle () const
 {
   return this->socket_.get_handle ();
 }
diff --git a/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp b/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp
index 28d9de04d4c..ef9d3e0812e 100644
--- a/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp
+++ b/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp
@@ -47,7 +47,7 @@ struct tdesc {
   bool ipv6_test;
 };
 
-typedef struct tdesc tdesc_t;
+using tdesc_t = struct tdesc;
 
 #ifdef ACE_WIN64
 // This arg is ignored on Windows and causes pointer truncation
@@ -328,7 +328,7 @@ spawn_test(bool ipv6_test)
 }
 
 int
-do_test(void)
+do_test()
 {
   spawn_test(false);
 
diff --git a/ACE/tests/SOCK_Send_Recv_Test.cpp b/ACE/tests/SOCK_Send_Recv_Test.cpp
index eeb406cb1cf..587750e5f66 100644
--- a/ACE/tests/SOCK_Send_Recv_Test.cpp
+++ b/ACE/tests/SOCK_Send_Recv_Test.cpp
@@ -372,7 +372,7 @@ server (void *arg)
 #endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */
 
 void
-spawn (void)
+spawn ()
 {
   // Acceptor
   ACE_SOCK_Acceptor peer_acceptor;
diff --git a/ACE/tests/SOCK_Test.cpp b/ACE/tests/SOCK_Test.cpp
index e3405eaeabe..a283827c9d2 100644
--- a/ACE/tests/SOCK_Test.cpp
+++ b/ACE/tests/SOCK_Test.cpp
@@ -180,7 +180,7 @@ server (void *arg)
 }
 
 void
-spawn (void)
+spawn ()
 {
   // Acceptor
   ACE_SOCK_Acceptor peer_acceptor;
diff --git a/ACE/tests/SV_Shared_Memory_Test.cpp b/ACE/tests/SV_Shared_Memory_Test.cpp
index ff0b2dc2d3c..ab3a6aba346 100644
--- a/ACE/tests/SV_Shared_Memory_Test.cpp
+++ b/ACE/tests/SV_Shared_Memory_Test.cpp
@@ -34,7 +34,7 @@
 
 static
 ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple> &
-myallocator (void)
+myallocator ()
 {
   static ACE_Malloc<ACE_SHARED_MEMORY_POOL,
                     ACE_SV_Semaphore_Simple> myallocator;
diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp
index 3f35395ed18..a2f240e4185 100644
--- a/ACE/tests/Semaphore_Test.cpp
+++ b/ACE/tests/Semaphore_Test.cpp
@@ -57,7 +57,7 @@ static size_t test_timeout_count = 3;
 
 // Tests the amount of time spent in a timed wait.
 static int
-test_timeout (void)
+test_timeout ()
 {
   int status = 0;
 
@@ -110,7 +110,7 @@ test_timeout (void)
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-s n_release_count] [-w n_workers] [-n iteration_count]\n")));
diff --git a/ACE/tests/Sendfile_Test.cpp b/ACE/tests/Sendfile_Test.cpp
index 509dea6359e..73ad0224c49 100644
--- a/ACE/tests/Sendfile_Test.cpp
+++ b/ACE/tests/Sendfile_Test.cpp
@@ -262,7 +262,7 @@ server (void *arg)
 #endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */
 
 void
-spawn (void)
+spawn ()
 {
   // Acceptor
   ACE_SOCK_Acceptor peer_acceptor;
diff --git a/ACE/tests/Service_Config_DLL.cpp b/ACE/tests/Service_Config_DLL.cpp
index 7befdeb437c..8b3e61d973b 100644
--- a/ACE/tests/Service_Config_DLL.cpp
+++ b/ACE/tests/Service_Config_DLL.cpp
@@ -35,7 +35,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));
@@ -107,13 +107,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)
@@ -243,7 +243,7 @@ Refuses_Init::init (int, ACE_TCHAR *[])
 
 /// Terminates object when dynamic unlinking occurs.
 int
-Refuses_Init::fini (void)
+Refuses_Init::fini ()
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("Refuses_Init::fini should not be called!\n")));
diff --git a/ACE/tests/Service_Config_Stream_DLL.cpp b/ACE/tests/Service_Config_Stream_DLL.cpp
index a31165cc425..c33e875e931 100644
--- a/ACE/tests/Service_Config_Stream_DLL.cpp
+++ b/ACE/tests/Service_Config_Stream_DLL.cpp
@@ -33,7 +33,7 @@ Test_Task::init (int, ACE_TCHAR *[])
 }
 
 int
-Test_Task::fini (void)
+Test_Task::fini ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("finalizing %s\n"),
diff --git a/ACE/tests/Service_Config_Stream_Test.cpp b/ACE/tests/Service_Config_Stream_Test.cpp
index 4d86597a457..9c490dff055 100644
--- a/ACE/tests/Service_Config_Stream_Test.cpp
+++ b/ACE/tests/Service_Config_Stream_Test.cpp
@@ -32,7 +32,7 @@
 class Static_Task : public ACE_Task<ACE_SYNCH>
 {
 public:
-  int open (void *)
+  int open (void *) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("opening %s\n"),
@@ -40,7 +40,7 @@ public:
     return 0;
   }
 
-  int close (u_long)
+  int close (u_long) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("closing %s\n"),
@@ -48,7 +48,7 @@ public:
     return 0;
   }
 
-  int init (int, ACE_TCHAR *[])
+  int init (int, ACE_TCHAR *[]) override
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("initializing %s\n"),
@@ -56,7 +56,7 @@ public:
     return 0;
   }
 
-  int fini (void)
+  int fini () override
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("finalizing %s\n"),
diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp
index 0f18dec845b..faecd5b834b 100644
--- a/ACE/tests/Service_Config_Test.cpp
+++ b/ACE/tests/Service_Config_Test.cpp
@@ -55,7 +55,7 @@ class Test_Singleton
 {
 public:
   static Test_Singleton *instance (u_short variety);
-  ~Test_Singleton (void);
+  ~Test_Singleton ();
 
 private:
   u_short variety_;
@@ -111,7 +111,7 @@ Test_Singleton::Test_Singleton (u_short variety)
 // We can't reliably use ACE_Log_Msg in a destructor that is called by
 // ACE_Object_Manager.  Yet.
 
-Test_Singleton::~Test_Singleton (void)
+Test_Singleton::~Test_Singleton ()
 {
   /* ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test_Singleton %u dtor\n"), variety_)); */
 
diff --git a/ACE/tests/Sig_Handlers_Test.cpp b/ACE/tests/Sig_Handlers_Test.cpp
index df5ff2e3929..495fc85aadc 100644
--- a/ACE/tests/Sig_Handlers_Test.cpp
+++ b/ACE/tests/Sig_Handlers_Test.cpp
@@ -38,12 +38,12 @@ public:
     Test_SIGINT_Handler::registration_count_++;
   }
 
-  ~Test_SIGINT_Handler()
+  ~Test_SIGINT_Handler() override
   {
     ACE_TEST_ASSERT (Test_SIGINT_Handler::handle_signal_count_ == Test_SIGINT_Handler::registration_count_);
   }
 
-  virtual int handle_signal (int signal, siginfo_t *, ucontext_t *)
+  int handle_signal (int signal, siginfo_t *, ucontext_t *) override
   {
     ACE_TEST_ASSERT (signal == SIGINT);
     ACE_DEBUG ((LM_DEBUG,
@@ -77,7 +77,7 @@ public:
                 result));
   }
 
-  virtual int handle_signal (int signal, siginfo_t *, ucontext_t *)
+  int handle_signal (int signal, siginfo_t *, ucontext_t *) override
   {
     ACE_TEST_ASSERT (signal == SIGINT);
     ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/tests/Singleton_Restart_Test.cpp b/ACE/tests/Singleton_Restart_Test.cpp
index 9d1e69b5ab9..f18966df030 100644
--- a/ACE/tests/Singleton_Restart_Test.cpp
+++ b/ACE/tests/Singleton_Restart_Test.cpp
@@ -23,8 +23,8 @@ void report_error (const ACE_TCHAR *lock)
               ACE_TEXT ("failed to allocate\n"), lock));
 }
 
-typedef ACE_Singleton<int, ACE_SYNCH_MUTEX> Singleton1;
-typedef ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX> Singleton2;
+using Singleton1 = ACE_Singleton<int, ACE_MT_SYNCH::MUTEX>;
+using Singleton2 = ACE_Singleton<int, ACE_MT_SYNCH::RECURSIVE_MUTEX>;
 
 int main ()
 {
diff --git a/ACE/tests/Svc_Handler_Test.cpp b/ACE/tests/Svc_Handler_Test.cpp
index 459900efb4a..0b1973d4f47 100644
--- a/ACE/tests/Svc_Handler_Test.cpp
+++ b/ACE/tests/Svc_Handler_Test.cpp
@@ -20,7 +20,7 @@
 #include "ace/Svc_Handler.h"
 #include "ace/Synch_Traits.h"
 
-typedef ACE_Buffered_Svc_Handler <ACE_FILE_IO, ACE_NULL_SYNCH> SVC_HANDLER;
+using SVC_HANDLER = ACE_Buffered_Svc_Handler<ACE_FILE_IO, ACE_NULL_SYNCH>;
 
 static void
 run_test (SVC_HANDLER &svc_handler,
diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp
index 50e34740ada..48691c478c4 100644
--- a/ACE/tests/TP_Reactor_Test.cpp
+++ b/ACE/tests/TP_Reactor_Test.cpp
@@ -124,19 +124,19 @@ public:
 class MyTask : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  MyTask (void): sem_ ((unsigned int) 0),
+  MyTask (): sem_ ((unsigned int) 0),
                  my_reactor_ (0) {}
 
-  virtual ~MyTask () { stop (); }
+  ~MyTask () override { stop (); }
 
-  virtual int svc (void);
+  int svc () override;
 
   int start (int num_threads);
-  int stop (void);
+  int stop ();
 
 private:
-  int  create_reactor (void);
-  int  delete_reactor (void);
+  int  create_reactor ();
+  int  delete_reactor ();
 
   ACE_SYNCH_RECURSIVE_MUTEX lock_;
   ACE_Thread_Semaphore sem_;
@@ -144,7 +144,7 @@ private:
 };
 
 int
-MyTask::create_reactor (void)
+MyTask::create_reactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -172,7 +172,7 @@ MyTask::create_reactor (void)
 }
 
 int
-MyTask::delete_reactor (void)
+MyTask::delete_reactor ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     monitor,
@@ -213,7 +213,7 @@ MyTask::start (int num_threads)
 
 
 int
-MyTask::stop (void)
+MyTask::stop ()
 {
   if (this->my_reactor_ != 0)
     {
@@ -237,7 +237,7 @@ MyTask::stop (void)
 }
 
 int
-MyTask::svc (void)
+MyTask::svc ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) MyTask started\n")));
 
@@ -255,7 +255,7 @@ MyTask::svc (void)
 
 // *************************************************************
 
-Acceptor::Acceptor (void)
+Acceptor::Acceptor ()
   : ACE_Acceptor<Receiver,ACE_SOCK_ACCEPTOR> ((ACE_Reactor *) 0),
     sessions_ (0),
     total_snd_(0),
@@ -269,14 +269,14 @@ Acceptor::Acceptor (void)
      this->list_receivers_[i] =0;
 }
 
-Acceptor::~Acceptor (void)
+Acceptor::~Acceptor ()
 {
   this->reactor (0);
   stop ();
 }
 
 void
-Acceptor::stop (void)
+Acceptor::stop ()
 {
   // this method can be called only after reactor event loop id done
   // in all threads
@@ -384,7 +384,7 @@ Receiver::Receiver (Acceptor * acceptor, size_t index)
 }
 
 
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
 {
   this->reactor (0);
   if (acceptor_ != 0)
@@ -405,7 +405,7 @@ Receiver::~Receiver (void)
 }
 
 int
-Receiver::check_destroy (void)
+Receiver::check_destroy ()
 {
   if (flg_mask_ == ACE_Event_Handler::NULL_MASK)
     return -1;
@@ -614,7 +614,7 @@ Receiver::handle_output (ACE_HANDLE h)
 
 // *************************************************************
 
-Connector::Connector (void)
+Connector::Connector ()
   : ACE_Connector<Sender,ACE_SOCK_CONNECTOR> ((ACE_Reactor *) 0),
     sessions_ (0),
     total_snd_(0),
@@ -628,7 +628,7 @@ Connector::Connector (void)
      this->list_senders_[i] = 0;
 }
 
-Connector::~Connector (void)
+Connector::~Connector ()
 {
   this->reactor (0);
   stop ();
@@ -763,7 +763,7 @@ Sender::Sender (Connector* connector, size_t index)
 }
 
 
-Sender::~Sender (void)
+Sender::~Sender ()
 {
   this->reactor (0);
   if (connector_ != 0)
@@ -784,7 +784,7 @@ Sender::~Sender (void)
 }
 
 int
-Sender::check_destroy (void)
+Sender::check_destroy ()
 {
   if (flg_mask_ == ACE_Event_Handler::NULL_MASK)
     return -1;
@@ -815,7 +815,7 @@ int Sender::open (void *)
 }
 
 int
-Sender::initiate_write (void)
+Sender::initiate_write ()
 {
   if ( this->msg_queue ()->message_count () < 20) // flow control
     {
diff --git a/ACE/tests/TSS_Leak_Test.cpp b/ACE/tests/TSS_Leak_Test.cpp
index 2b7bf87e453..e405fa2a216 100644
--- a/ACE/tests/TSS_Leak_Test.cpp
+++ b/ACE/tests/TSS_Leak_Test.cpp
@@ -20,7 +20,7 @@ struct Task : ACE_Task_Base
 {
   explicit Task (ACE_TSS<X> *tss) : tss_(tss) {}
 
-  int svc (void)
+  int svc () override
   {
     X *x = *tss_;
     ACE_UNUSED_ARG (x);
diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp
index d9d141aaaa9..b15d5bb57a6 100644
--- a/ACE/tests/Task_Ex_Test.cpp
+++ b/ACE/tests/Task_Ex_Test.cpp
@@ -40,10 +40,10 @@ public:
   //FUZZ: disable check_for_lack_ACE_OS
   /// activate/spawn the threads.
   ///FUZZ: enable check_for_lack_ACE_OS
-  int open (void*);
+  int open (void*) override;
 
   /// svc thread entry point
-  virtual int svc (void);
+  int svc () override;
 private:
 
 };
@@ -67,11 +67,7 @@ int Consumer::svc ()
   while(this->getq (pMsg)!=-1)
   {
     ACE_TEST_ASSERT (pMsg!=0);
-#if defined (ACE_HAS_CPP11)
     std::unique_ptr<User_Defined_Msg> pAuto(pMsg);
-#else
-    auto_ptr<User_Defined_Msg> pAuto(pMsg);
-#endif /* ACE_HAS_CPP11 */
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("Consumer::svc got msg id=%d\n"),
                pMsg->msg_id ()));
diff --git a/ACE/tests/Task_Group_Test.cpp b/ACE/tests/Task_Group_Test.cpp
index 93017948af8..d46c32597a1 100644
--- a/ACE/tests/Task_Group_Test.cpp
+++ b/ACE/tests/Task_Group_Test.cpp
@@ -28,11 +28,11 @@ class Waiter_Task : public ACE_Task_Base
 public:
   Waiter_Task (ACE_Thread_Manager* tm = 0)
     : ACE_Task_Base (tm) {}
-  virtual int svc(void);
+  int svc() override;
 };
 
 int
-Waiter_Task::svc(void)
+Waiter_Task::svc()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t|grp_id=%d) waiting for thread cancellation.\n"), this->grp_id ()));
diff --git a/ACE/tests/Task_Test.cpp b/ACE/tests/Task_Test.cpp
index 967fa03f5fb..29168a8a423 100644
--- a/ACE/tests/Task_Test.cpp
+++ b/ACE/tests/Task_Test.cpp
@@ -30,8 +30,8 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, int> close_cleanups (0);
 class My_Thread_Hook : public ACE_Thread_Hook
 {
 public:
-  virtual ACE_THR_FUNC_RETURN start (ACE_THR_FUNC func,
-                                     void *arg);
+  ACE_THR_FUNC_RETURN start (ACE_THR_FUNC func,
+                                     void *arg) override;
 };
 
 class Barrier_Task : public ACE_Task<ACE_MT_SYNCH>
@@ -43,11 +43,11 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   ///FUZZ: enable check_for_lack_ACE_OS
-  virtual int close (u_long flags = 0);
+  int close (u_long flags = 0) override;
 
   /// Iterate <n_iterations> time printing off a message and "waiting"
   /// for all other threads to complete this iteration.
-  virtual int svc (void);
+  int svc () override;
 
 private:
   /// Reference to the tester barrier.  This controls each iteration of
@@ -94,7 +94,7 @@ Barrier_Task::close (u_long)
 // Iterate <n_iterations> time printing off a message and "waiting"
 // for all other threads to complete this iteration.
 int
-Barrier_Task::svc (void)
+Barrier_Task::svc ()
 {
   for (int iterations = 1;
        iterations <= this->n_iterations_;
diff --git a/ACE/tests/Task_Wait_Test.cpp b/ACE/tests/Task_Wait_Test.cpp
index ba56ebc1737..0638e66ffae 100644
--- a/ACE/tests/Task_Wait_Test.cpp
+++ b/ACE/tests/Task_Wait_Test.cpp
@@ -33,9 +33,9 @@ static ACE_Event TaskDone;
 
 class Do_Nothing_Task : public ACE_Task_Base {
 public:
-  virtual int close (u_long flags = 0);
+  int close (u_long flags = 0) override;
 
-  virtual int svc (void);
+  int svc () override;
 };
 
 // close tries to wait for other threads. There aren't any, but as long as
@@ -54,7 +54,7 @@ Do_Nothing_Task::close (u_long)
 
 // svc just waits a second then exits.
 int
-Do_Nothing_Task::svc (void)
+Do_Nothing_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Task 0x%x, thread %t waiting to exit\n"),
diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp
index dc236ce0567..a886cfed6a3 100644
--- a/ACE/tests/Test_Output.cpp
+++ b/ACE/tests/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, 0);
@@ -59,7 +59,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   // the output_file_ is loaned to ACE_LOG_MSG
   // and something else might destroy and/or change the stream
@@ -160,7 +160,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 }
 
 void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
   if (this->output_file_ &&
       (this->output_file_ == ACE_LOG_MSG->msg_ostream ()))
@@ -199,19 +199,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/ACE/tests/Thread_Attrs_Test.cpp b/ACE/tests/Thread_Attrs_Test.cpp
index 8a6f4317e11..3f70624918c 100644
--- a/ACE/tests/Thread_Attrs_Test.cpp
+++ b/ACE/tests/Thread_Attrs_Test.cpp
@@ -23,11 +23,11 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   // Spawn the thread
-  virtual int open (void * = 0);
+  int open (void * = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
   // Check the cancel settings against what is expected then exit.
-  virtual int svc (void);
+  int svc () override;
 
   /// Returns true iff settings match what was requested.
   bool operator! ();
@@ -50,7 +50,7 @@ Cancel_Check::Cancel_Check (bool enable, bool async)
 }
 
 int
-Cancel_Check::svc (void)
+Cancel_Check::svc ()
 {
 #if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
   int state;
@@ -132,11 +132,11 @@ public:
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Spawn the thread
-  virtual int open (void * = 0);
+  int open (void * = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
   /// Check the stack size against what is expected then exit.
-  virtual int svc (void);
+  int svc () override;
 
   /// Returns true iff failed_ == false.
   bool operator! ();
@@ -160,7 +160,7 @@ Stack_Size_Check::Stack_Size_Check (size_t stack_size)
 }
 
 int
-Stack_Size_Check::svc (void)
+Stack_Size_Check::svc ()
 {
   size_t my_size = 0;
 
diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp
index 2a13f4a5aa7..04d501e1eb6 100644
--- a/ACE/tests/Thread_Creation_Threshold_Test.cpp
+++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp
@@ -57,11 +57,11 @@ public:
   Thread_Pool (int n_threads);
 
   /// Destructor...
-  ~Thread_Pool (void);
+  ~Thread_Pool () override;
 
   /// Iterate <n_iterations> time printing off a message and "waiting"
   /// for all other threads to complete this iteration.
-  virtual int svc (void);
+  int svc () override;
 
   /// Start the threads in the pool.
   void start();
@@ -80,11 +80,11 @@ public:
 private:
   //FUZZ: disable check_for_lack_ACE_OS
   /// Spawn the threads in the pool.
-  virtual int open (void * = 0);
+  int open (void * = 0) override;
 
   /// Close hook.
   ///FUZZ: enable check_for_lack_ACE_OS
-  virtual int close (u_long);
+  int close (u_long) override;
 
   /// Total number of threads activated through this thread pool ever.
   ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> total_activated_threads_;
@@ -103,7 +103,7 @@ Thread_Pool::operator!()
   return ! this->failed_;
 }
 
-Thread_Pool::~Thread_Pool (void)
+Thread_Pool::~Thread_Pool ()
 {
 }
 
@@ -139,7 +139,7 @@ Thread_Pool::start ()
 }
 
 int
-Thread_Pool::svc (void)
+Thread_Pool::svc ()
 {
   unsigned long t = ++this->total_activated_threads_;
   if (PRINT_DEBUG_MSGS) // change this to 'true' for debugging
diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp
index a31d7f1ee12..5a991655193 100644
--- a/ACE/tests/Thread_Manager_Test.cpp
+++ b/ACE/tests/Thread_Manager_Test.cpp
@@ -147,7 +147,7 @@ class ThrMgr_Task : public ACE_Task_Base {
 public:
   ThrMgr_Task (ACE_Thread_Manager *);
 
-  virtual int svc (void);
+  int svc () override;
 
   static int errors;
 };
@@ -162,7 +162,7 @@ ThrMgr_Task::ThrMgr_Task (ACE_Thread_Manager *mgr)
 
 // svc just waits til it's been cancelled, then exits.
 int
-ThrMgr_Task::svc (void)
+ThrMgr_Task::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Task 0x%x, thread %t waiting to be cancelled\n"),
diff --git a/ACE/tests/Thread_Mutex_Test.cpp b/ACE/tests/Thread_Mutex_Test.cpp
index de1bf1f59e9..b8b0485b56b 100644
--- a/ACE/tests/Thread_Mutex_Test.cpp
+++ b/ACE/tests/Thread_Mutex_Test.cpp
@@ -32,7 +32,7 @@
   typedef ACE_Process_Mutex ACE_TEST_MUTEX;
 #else
 # include "ace/Thread_Mutex.h"
-  typedef ACE_Thread_Mutex ACE_TEST_MUTEX;
+  using ACE_TEST_MUTEX = ACE_Thread_Mutex;
 #endif
 
 #if !defined (ACE_HAS_MUTEX_TIMEOUTS)
@@ -236,7 +236,7 @@ test (void *args)
 #endif /* ACE_HAS_THREADS */
 
 static void
-spawn (void)
+spawn ()
 {
 #if defined (ACE_HAS_THREADS)
   ACE_TEST_MUTEX mutex;
diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp
index 3770f3d63ec..16835222354 100644
--- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp
+++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp
@@ -43,7 +43,7 @@
 #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT
 
 #include "Thread_Pool_Reactor_Resume_Test.h"
-typedef ACE_Strategy_Acceptor <Request_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR;
+using ACCEPTOR = ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_Acceptor>;
 
 // Accepting end point.  This is actually "localhost:10010", but some
 // platform couldn't resolve the name so we use the IP address
@@ -149,12 +149,12 @@ Request_Handler::open (void *arg)
   return result;
 }
 
-Request_Handler::~Request_Handler (void)
+Request_Handler::~Request_Handler ()
 {
 }
 
 int
-Request_Handler::resume_handler (void)
+Request_Handler::resume_handler ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) resume_handler () called\n")));
diff --git a/ACE/tests/Thread_Pool_Reactor_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Test.cpp
index 15d718d6c1e..07c134f96fd 100644
--- a/ACE/tests/Thread_Pool_Reactor_Test.cpp
+++ b/ACE/tests/Thread_Pool_Reactor_Test.cpp
@@ -46,7 +46,7 @@
 #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT
 
 #include "Thread_Pool_Reactor_Test.h"
-typedef ACE_Strategy_Acceptor <Request_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR;
+using ACCEPTOR = ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_Acceptor>;
 
 // Accepting end point.  This is actually "localhost:10010", but some
 // platform couldn't resolve the name so we use the IP address
diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp
index 6e4d0a061bf..0a76061e31a 100644
--- a/ACE/tests/Thread_Pool_Test.cpp
+++ b/ACE/tests/Thread_Pool_Test.cpp
@@ -45,14 +45,14 @@ public:
   Thread_Pool (int n_threads);
 
   /// Destructor...
-  ~Thread_Pool (void);
+  ~Thread_Pool () override;
 
   /**
    * Activate the task's thread pool, produce the messages that are
    * consumed by the threads in the thread pool, and demonstate how to
    * shutdown using the <ACE_Message_Queue::deactivate> method.
    */
-  int test_queue_deactivation_shutdown (void);
+  int test_queue_deactivation_shutdown ();
 
   /**
    * Activate the task's thread pool, produce the messages that are,
@@ -60,24 +60,24 @@ public:
    * thread pool, and demonstrate how to shutdown by enqueueing
    * "empty" messages into the queue.
    */
-  int test_empty_message_shutdown (void);
+  int test_empty_message_shutdown ();
 
   /// Iterate <n_iterations> time printing off a message and "waiting"
   /// for all other threads to complete this iteration.
-  virtual int svc (void);
+  int svc () override;
 
   /// Allows the producer to pass messages to the <Thread_Pool>.
-  virtual int put (ACE_Message_Block *mb,
-                   ACE_Time_Value *tv = 0);
+  int put (ACE_Message_Block *mb,
+                   ACE_Time_Value *tv = 0) override;
 
 private:
   //FUZZ: disable check_for_lack_ACE_OS
   /// Spawn the threads in the pool.
-  virtual int open (void * = 0);
+  int open (void * = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
   /// Close hook.
-  virtual int close (u_long);
+  int close (u_long) override;
 
   /// Serialize access to <ACE_Message_Block> reference count, which
   /// will be decremented by multiple threads.
@@ -87,7 +87,7 @@ private:
   int n_threads_;
 };
 
-Thread_Pool::~Thread_Pool (void)
+Thread_Pool::~Thread_Pool ()
 {
 }
 
@@ -117,7 +117,7 @@ Thread_Pool::put (ACE_Message_Block *mb,
 // other threads to complete this iteration.
 
 int
-Thread_Pool::svc (void)
+Thread_Pool::svc ()
 {
   // Keep looping, reading a message out of the queue, until we get a
   // message with a length == 0, which signals us to quit.
@@ -195,7 +195,7 @@ Thread_Pool::open (void *)
 // shutdown using the <ACE_Message_Queue::deactivate> method.
 
 int
-Thread_Pool::test_queue_deactivation_shutdown (void)
+Thread_Pool::test_queue_deactivation_shutdown ()
 {
   if (this->open () == -1)
     return -1;
@@ -287,7 +287,7 @@ Thread_Pool::test_queue_deactivation_shutdown (void)
 // messages into the queue.
 
 int
-Thread_Pool::test_empty_message_shutdown (void)
+Thread_Pool::test_empty_message_shutdown ()
 {
   if (this->open () == -1)
     return -1;
diff --git a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp
index 600f9cba8d5..f932dbd2ad5 100644
--- a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp
+++ b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp
@@ -52,9 +52,7 @@ class CCustomEventHandlerUpcall
 {
     public:
 
-        typedef ACE_Timer_Queue_T<ICustomEventHandler*,
-                                  CCustomEventHandlerUpcall,
-                                  ACE_Null_Mutex> TTimerQueue;
+        using TTimerQueue = ACE_Timer_Queue_T<ICustomEventHandler *, CCustomEventHandlerUpcall, ACE_Null_Mutex>;
 
         /// Default constructor
         CCustomEventHandlerUpcall()
@@ -130,7 +128,7 @@ class CTestEventHandler : public ICustomEventHandler
         /// Default destructor.
         ///
         /// @return
-        virtual ~CTestEventHandler()
+        ~CTestEventHandler() override
         {
             ACE_DEBUG((LM_DEBUG, ACE_TEXT("%I(%t) Destroying test event handler.\n")));
         }
@@ -139,7 +137,7 @@ class CTestEventHandler : public ICustomEventHandler
         ///
         /// @return int
         /// @param p_vParameter
-        virtual int operator() (void* p_vParameter)
+        int operator() (void* p_vParameter) override
         {
             long iParameter = ACE_Utils::truncate_cast<long> ((intptr_t)p_vParameter);
 
@@ -162,14 +160,9 @@ class CTestEventHandler : public ICustomEventHandler
 };
 
 // Used for the actual timer queue thread adapter
-typedef ACE_Timer_Wheel_T <ICustomEventHandler*,
-                           CCustomEventHandlerUpcall,
-                           ACE_Null_Mutex> TTimerWheel;
-typedef ACE_Timer_Wheel_Iterator_T <ICustomEventHandler*,
-                                    CCustomEventHandlerUpcall,
-                                    ACE_Null_Mutex> TTimerWheelIterator;
-typedef ACE_Thread_Timer_Queue_Adapter<TTimerWheel,
-                                       ICustomEventHandler*> TTimerWheelThreadAdapter;
+using TTimerWheel = ACE_Timer_Wheel_T<ICustomEventHandler *, CCustomEventHandlerUpcall, ACE_Null_Mutex>;
+using TTimerWheelIterator = ACE_Timer_Wheel_Iterator_T<ICustomEventHandler *, CCustomEventHandlerUpcall, ACE_Null_Mutex>;
+using TTimerWheelThreadAdapter = ACE_Thread_Timer_Queue_Adapter<TTimerWheel, ICustomEventHandler *>;
 
 #endif /* ACE_HAS_THREADS */
 
diff --git a/ACE/tests/Timer_Cancellation_Test.cpp b/ACE/tests/Timer_Cancellation_Test.cpp
index b48f2a8849c..b4f3aa96d46 100644
--- a/ACE/tests/Timer_Cancellation_Test.cpp
+++ b/ACE/tests/Timer_Cancellation_Test.cpp
@@ -20,14 +20,14 @@ class Deadlock : public ACE_Task_Base
 {
 public:
 
-  int svc (void);
+  int svc () override;
 
   int handle_timeout (const ACE_Time_Value &current_time,
-                      const void *act);
+                      const void *act) override;
 };
 
 int
-Deadlock::svc (void)
+Deadlock::svc ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Deadlock starts accessing Reactor and Timer Queue....\n")));
@@ -59,10 +59,10 @@ public:
   Event_Handler (Deadlock &deadlock);
 
   int handle_timeout (const ACE_Time_Value &current_time,
-                      const void *act);
+                      const void *act) override;
 
   int handle_close (ACE_HANDLE handle,
-                    ACE_Reactor_Mask close_mask);
+                    ACE_Reactor_Mask close_mask) override;
 
   Deadlock &deadlock_;
 };
diff --git a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp
index 223681ccd20..94f7f395e85 100644
--- a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp
+++ b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp
@@ -48,13 +48,13 @@ public:
 
   Reference_Counted_Event_Handler (int expected_number_of_handle_close_calls);
 
-  ~Reference_Counted_Event_Handler (void);
+  ~Reference_Counted_Event_Handler () override;
 
   int handle_timeout (const ACE_Time_Value &,
-                      const void *);
+                      const void *) override;
 
   int handle_close (ACE_HANDLE handle,
-                    ACE_Reactor_Mask masks);
+                    ACE_Reactor_Mask masks) override;
 
   int expected_number_of_handle_close_calls_;
   int number_of_handle_close_calls_;
@@ -70,15 +70,15 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int expected_n
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 "Reference count in Reference_Counted_Event_Handler() is %d\n",
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 }
 
-Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void)
+Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 "Reference count in ~Reference_Counted_Event_Handler() is %d\n",
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 
   if (this->expected_number_of_handle_close_calls_ != -1)
     ACE_TEST_ASSERT (this->number_of_handle_close_calls_ ==
@@ -93,7 +93,7 @@ Reference_Counted_Event_Handler::handle_timeout (const ACE_Time_Value &,
     ACE_DEBUG ((LM_DEBUG,
                 "Reference count in Reference_Counted_Event_Handler::handle_timeout() for arg = %C is %d\n",
                 (const char *) arg,
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 
   return 0;
 }
@@ -108,7 +108,7 @@ Reference_Counted_Event_Handler::handle_close (ACE_HANDLE handle,
                 "Reference count is %d\n",
                 handle,
                 masks,
-                this->reference_count_.value ()));
+                this->reference_count_.load ()));
 
   ++this->number_of_handle_close_calls_;
 
@@ -249,7 +249,7 @@ cancellation_test<TIMER_QUEUE>::cancellation_test (const char *timer_queue_type)
     }
 }
 
-typedef int (*Expire_Function) (ACE_Timer_Queue &timer_queue);
+using Expire_Function = int (*)(ACE_Timer_Queue &);
 
 int
 invoke_expire (ACE_Timer_Queue &timer_queue)
@@ -350,25 +350,25 @@ class Simple_Event_Handler : public ACE_Event_Handler
 {
 public:
 
-  Simple_Event_Handler (void);
+  Simple_Event_Handler ();
 
-  ~Simple_Event_Handler (void);
+  ~Simple_Event_Handler () override;
 
   int handle_timeout (const ACE_Time_Value &,
-                      const void *);
+                      const void *) override;
 
   int handle_close (ACE_HANDLE,
-                    ACE_Reactor_Mask);
+                    ACE_Reactor_Mask) override;
 };
 
-Simple_Event_Handler::Simple_Event_Handler (void)
+Simple_Event_Handler::Simple_Event_Handler ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 "Simple_Event_Handler()\n"));
 }
 
-Simple_Event_Handler::~Simple_Event_Handler (void)
+Simple_Event_Handler::~Simple_Event_Handler ()
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/tests/Timer_Queue_Test.cpp b/ACE/tests/Timer_Queue_Test.cpp
index 563c988b984..dd78a5840a9 100644
--- a/ACE/tests/Timer_Queue_Test.cpp
+++ b/ACE/tests/Timer_Queue_Test.cpp
@@ -52,17 +52,17 @@ static long *timer_ids = 0;
 class Example_Handler : public ACE_Event_Handler
 {
 public:
-  Example_Handler (void): close_count_ (0) {}
+  Example_Handler (): close_count_ (0) {}
 
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask mask)
+  int handle_close (ACE_HANDLE, ACE_Reactor_Mask mask) override
   {
     ACE_TEST_ASSERT (mask == ACE_Event_Handler::TIMER_MASK);
     this->close_count_++;
     return 0;
   }
 
-  virtual int handle_timeout (const ACE_Time_Value &,
-                              const void *arg)
+  int handle_timeout (const ACE_Time_Value &,
+                              const void *arg) override
   {
     int *act = (int *) arg;
     ACE_TEST_ASSERT (*act == 42 || *act == 007);
@@ -82,9 +82,9 @@ public:
 
 struct Interval_Handler : public ACE_Event_Handler
 {
-  Interval_Handler (void) : trip_count_ (0) { }
+  Interval_Handler () : trip_count_ (0) { }
 
-  virtual int handle_timeout (const ACE_Time_Value & , const void *)
+  int handle_timeout (const ACE_Time_Value & , const void *) override
   {
     ++trip_count_;
     return 0;
@@ -521,7 +521,7 @@ test_performance (ACE_Timer_Queue *tq,
 // of ACE_Timer_Heap timer IDs around the boundary of having to enlarge
 // the heap.
 static void
-test_unique_timer_heap_ids (void)
+test_unique_timer_heap_ids ()
 {
   Example_Handler eh;
   ACE_Timer_Heap timer_heap (44);
@@ -684,11 +684,7 @@ run_main (int argc, ACE_TCHAR *argv[])
                   -1);
 
   // new (optimized) version
-  typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
-                           ACE_Event_Handler_Handle_Timeout_Upcall,
-                           ACE_SYNCH_RECURSIVE_MUTEX,
-                           ACE_HR_Time_Policy>
-          timer_heap_hr_type;
+  using timer_heap_hr_type = ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall, ACE_MT_SYNCH::RECURSIVE_MUTEX, ACE_HR_Time_Policy>;
   ACE_NEW_RETURN (tq_stack,
                   Timer_Queue_Stack (new timer_heap_hr_type,
                                      ACE_TEXT ("ACE_Timer_Heap (high-res timer)"),
diff --git a/ACE/tests/Token_Strategy_Test.cpp b/ACE/tests/Token_Strategy_Test.cpp
index ae53a319d69..be38354ffdf 100644
--- a/ACE/tests/Token_Strategy_Test.cpp
+++ b/ACE/tests/Token_Strategy_Test.cpp
@@ -33,13 +33,13 @@ public:
 
   Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy = ACE_Token::FIFO,
                        int threads = 5, int invocations = 10);
-  ~Token_Strategy_Test (void);
+  ~Token_Strategy_Test () override;
 
   //FUZZ: disable check_for_lack_ACE_OS
-  int open (void *a = 0);
+  int open (void *a = 0) override;
   //FUZZ: enable check_for_lack_ACE_OS
 
-  int svc (void);
+  int svc () override;
 
 private:
   // Number of threads for the test, must be 5 or more.
@@ -105,7 +105,7 @@ Token_Strategy_Test::Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy,
               this->invocations_));
 }
 
-Token_Strategy_Test::~Token_Strategy_Test (void)
+Token_Strategy_Test::~Token_Strategy_Test ()
 {}
 
 int
@@ -121,7 +121,7 @@ Token_Strategy_Test::open (void *)
 }
 
 int
-Token_Strategy_Test::svc (void)
+Token_Strategy_Test::svc ()
 {
   int current = this->active_.value ();
   ACE_Auto_IncDec<ACE_Atomic_Op<ACE_Thread_Mutex, int> > active_counter (this->active_);
diff --git a/ACE/tests/UUID_Test.cpp b/ACE/tests/UUID_Test.cpp
index 7585d6b173e..972464ed2ce 100644
--- a/ACE/tests/UUID_Test.cpp
+++ b/ACE/tests/UUID_Test.cpp
@@ -17,16 +17,16 @@
 class Tester
 {
 public:
-  int test (void);
+  int test ();
 };
 
 int
-Tester::test (void)
+Tester::test ()
 {
   int retval = 0;
 
   // Generate UUID
-  auto_ptr <ACE_Utils::UUID> uuid (ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID ());
+  std::unique_ptr <ACE_Utils::UUID> uuid (ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID ());
   ACE_CString uuid_str (uuid->to_string ()->c_str ());
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Generated UUID\n %C\n"),
@@ -107,7 +107,7 @@ Tester::test (void)
                        -1);
 
   // Generate UUID with process and thread ids.
-  auto_ptr <ACE_Utils::UUID>
+  std::unique_ptr <ACE_Utils::UUID>
     uuid_with_tp_id (ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID (0x0001, 0xc0));
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/tests/Unbounded_Set_Test.cpp b/ACE/tests/Unbounded_Set_Test.cpp
index b551735de33..8c9e18875f8 100644
--- a/ACE/tests/Unbounded_Set_Test.cpp
+++ b/ACE/tests/Unbounded_Set_Test.cpp
@@ -100,7 +100,7 @@ run_main (int, ACE_TCHAR *[])
 
   // Test assigment of sets.
   // To do that, we also test some of the iterator methods.
-  typedef ACE_Unbounded_Set<MyNode> MySet;
+  using MySet = ACE_Unbounded_Set<MyNode>;
   MySet ubs2 = ubs;              // Test a typedef of a set.
   if (ubs2.size() != ubs.size())
     {
diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp
index f7bf15892ca..e0f02830709 100644
--- a/ACE/tests/Upgradable_RW_Test.cpp
+++ b/ACE/tests/Upgradable_RW_Test.cpp
@@ -72,7 +72,7 @@ static Linked_List *linked_list_ptr;
 //         0 if not found,
 //        -1 on an error
 static int
-find_last (void)
+find_last ()
 {
   find_called++;
 
@@ -97,7 +97,7 @@ find_last (void)
 
 // Explain usage and exit.
 static void
-print_usage_and_die (void)
+print_usage_and_die ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("usage: %n [-r n_readers] [-w n_writers]\n")
@@ -144,7 +144,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 // while we have a read lock.
 
 int
-Reader_Task::svc (void)
+Reader_Task::svc ()
 {
   ACE_Profile_Timer timer;
   ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
@@ -219,7 +219,7 @@ Reader_Task::svc (void)
 // checking that nobody steps on it while we can write it.
 
 int
-Writer_Task::svc (void)
+Writer_Task::svc ()
 {
   ACE_Profile_Timer timer;
   ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
@@ -269,7 +269,7 @@ Time_Calculation::report_time (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time
 }
 
 void
-Time_Calculation ::print_stats (void)
+Time_Calculation ::print_stats ()
 {
   ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time = this->times_;
   u_int iterations = 1;
@@ -310,7 +310,7 @@ Time_Calculation ::print_stats (void)
 }
 
 static int
-init (void)
+init ()
 {
   char entry[MAX_STRING_SIZE];
   ACE_CString *cString_ptr = 0;
diff --git a/ACE/tests/Vector_Test.cpp b/ACE/tests/Vector_Test.cpp
index cac2f398faa..50b9a08f038 100644
--- a/ACE/tests/Vector_Test.cpp
+++ b/ACE/tests/Vector_Test.cpp
@@ -15,9 +15,9 @@
 
 #include "ace/Vector_T.h"
 
-typedef size_t DATA;
-typedef ACE_Vector<DATA> VECTOR;
-typedef ACE_Vector<DATA>::Iterator ITERATOR;
+using DATA = size_t;
+using VECTOR = ACE_Vector<DATA>;
+using ITERATOR = ACE_Vector<DATA>::Iterator;
 
 const size_t TOP = 100;
 const size_t LEFT = 10;
diff --git a/ACE/tests/WFMO_Reactor_Test.cpp b/ACE/tests/WFMO_Reactor_Test.cpp
index ee85fa70acb..e76d831ee6d 100644
--- a/ACE/tests/WFMO_Reactor_Test.cpp
+++ b/ACE/tests/WFMO_Reactor_Test.cpp
@@ -37,7 +37,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor)
 
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in Event_Handler() is %d\n",
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   this->reactor (&reactor);
 
@@ -62,7 +62,7 @@ Event_Handler::~Event_Handler (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in ~Event_Handler() is %d\n",
-              this->reference_count_.value ()));
+              this->reference_count_.load ()));
 
   ++number_of_closes;
 }
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index b989cb0f010..7277368fffb 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -63,7 +63,7 @@ Bug_3912_Regression_Test: !STATIC
 Bug_3943_Regression_Test: !ACE_FOR_TAO
 Bug_3974_Regression_Test
 Bug_4055_Regression_Test: !ST
-Bug_4189_Regression_Test: !ST
+Bug_4189_Regression_Test: !ST !ACE_FOR_TAO
 CDR_Array_Test: !ACE_FOR_TAO
 CDR_File_Test: !ACE_FOR_TAO
 CDR_Fixed_Test: !ACE_FOR_TAO
@@ -283,4 +283,4 @@ Wild_Match_Test
 SSL/Bug_2912_Regression_Test: SSL !ACE_FOR_TAO !BAD_AIO
 SSL/SSL_Asynch_Stream_Test: SSL !ACE_FOR_TAO !BAD_AIO !FIXED_BUGS_ONLY
 SSL/Thread_Pool_Reactor_SSL_Test: SSL
-UNIX_Addr_Test
+UNIX_Addr_Test: !ACE_FOR_TAO
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 3789283e13d..35feb43db0f 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -475,6 +475,7 @@ project(Bug_4055_Regression_Test) : acetest, threads {
 }
 
 project(Bug_4189_Regression_Test) : acetest, threads {
+  avoids += ace_for_tao
   exename = Bug_4189_Regression_Test
   Source_Files {
     Bug_4189_Regression_Test.cpp
@@ -2284,6 +2285,7 @@ project(Missing_Svc_Conf_Test) : acetest {
 }
 
 project(UNIX Addr Test) : acetest {
+  avoids += ace_for_tao
   exename = UNIX_Addr_Test
   Source_Files {
     UNIX_Addr_Test.cpp
diff --git a/README.md b/README.md
index 6cae93f9649..0c88ecd8381 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
 [![Lastest release](https://img.shields.io/github/release/docgroup/ace_tao.svg)](https://github.com/DOCGroup/ACE_TAO/releases/latest)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9a20abe6590a4b3ca946d7634d9f51af)](https://www.codacy.com/app/DOCGroup/ACE_TAO?utm_source=github.com&utm_medium=referral&utm_content=DOCGroup/ACE_TAO&utm_campaign=badger)
-[![Build Status](https://travis-ci.com/DOCGroup/ACE_TAO.svg?branch=master)](https://travis-ci.com/DOCGroup/ACE_TAO)
+[![Linux CI](https://github.com/DOCGroup/ACE_TAO/workflows/linux/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Alinux)
+[![Windows CI](https://github.com/DOCGroup/ACE_TAO/workflows/windows/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Awindows)
+[![Fuzz CI](https://github.com/DOCGroup/ACE_TAO/workflows/fuzz/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Afuzz)
+[![MacOSX CI](https://github.com/DOCGroup/ACE_TAO/workflows/macosx/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Amacosx)
+[![face CI](https://github.com/DOCGroup/ACE_TAO/workflows/face/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Aface)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/1/badge.svg)](https://scan.coverity.com/projects/1)
-[![Azure DevOps](https://dev.azure.com/docgroup/ACE_TAO/_apis/build/status/DOCGroup.ACE_TAO?branchName=master)](https://dev.azure.com/docgroup/ACE_TAO/_build/latest?definitionId=7&branchName=master)
 [![CodeFactor](https://www.codefactor.io/repository/github/docgroup/ace_tao/badge)](https://www.codefactor.io/repository/github/docgroup/ace_tao)
 
+
 # ACE/TAO #
 
 See [Douglas C. Schmidt website](https://www.dre.vanderbilt.edu/~schmidt)  for more information about ACE/TAO. The quality of ACE/TAO is monitored through our distributed [scoreboard](https://www.dre.vanderbilt.edu/scoreboard/)
diff --git a/TAO/ChangeLogs/ChangeLog-2000b b/TAO/ChangeLogs/ChangeLog-2000b
index e351ba06a04..41875495e5a 100644
--- a/TAO/ChangeLogs/ChangeLog-2000b
+++ b/TAO/ChangeLogs/ChangeLog-2000b
@@ -5757,7 +5757,7 @@ Tue Aug 29 20:28:30 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
         * orbsvcs/examples/Notify/Filter/Filter.cpp:
         * orbsvcs/examples/Notify/Subscribe/Subscribe.cpp:
-          Fix for http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=626
+          Fix for http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=626
 
 Tue Aug 29 20:09:44 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
diff --git a/TAO/ChangeLogs/ChangeLog-2001b b/TAO/ChangeLogs/ChangeLog-2001b
index 9b75444b16a..27d326a9411 100644
--- a/TAO/ChangeLogs/ChangeLog-2001b
+++ b/TAO/ChangeLogs/ChangeLog-2001b
@@ -6134,7 +6134,7 @@ Mon May  7 14:54:48 2001  Carlos O'Ryan  <coryan@uci.edu>
         * tao/Stub.h:
         * tao/Stub.i:
         * tao/Stub.cpp:
-          Bug 542 (http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=542)
+          Bug 542 (http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=542)
           has reared its ugly head once again.
           However, I think I finally nailed it: the ORB_Core was reference
           counted by each object reference (via TAO_Stub), but the
@@ -7071,7 +7071,7 @@ Tue Apr 24 22:58:00 2001  Carlos O'Ryan  <coryan@uci.edu>
           side it actually break things.
           After this change the IDL_Cubit regression test works, but there
           are some scenarios that may not, more detailed documentation in
-          http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=884
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=884
 
 Tue Apr 24 19:42:14 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
diff --git a/TAO/ChangeLogs/ChangeLog-2001c b/TAO/ChangeLogs/ChangeLog-2001c
index 290b798e6d1..1a65ce6adec 100644
--- a/TAO/ChangeLogs/ChangeLog-2001c
+++ b/TAO/ChangeLogs/ChangeLog-2001c
@@ -7984,11 +7984,11 @@ Wed Aug  1 16:05:36 2001  Carlos O'Ryan  <coryan@uci.edu>
         Thu Jul 26 16:50:46 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * Part of the fixes for
-          http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=886
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=886
 
           the changes also close the following bug:
 
-          http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=296
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=296
 
         * tao/Leader_Follower_Flushing_Strategy.h:
         * tao/Leader_Follower_Flushing_Strategy.cpp:
diff --git a/TAO/ChangeLogs/ChangeLog-2002a b/TAO/ChangeLogs/ChangeLog-2002a
index 2eb7ef21072..7c2b73bdbcc 100644
--- a/TAO/ChangeLogs/ChangeLog-2002a
+++ b/TAO/ChangeLogs/ChangeLog-2002a
@@ -126,8 +126,8 @@ Fri Jun 28 10:08:56 2002  Carlos O'Ryan  <coryan@atdesk.com>
 	  at run-time.  Check the following bugzilla entries for more
 	  info:
 
-	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1241
-	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=189
+	  http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1241
+	  http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=189
 
 Fri Jun 28 07:31:12 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -252,7 +252,7 @@ Thu Jun 27 10:28:29 2002  Carlos O'Ryan  <coryan@atdesk.com>
 	  multiple threads to them.
 	  This solves bug 1241:
 
-	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1241
+	  http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1241
 
 Thu Jun 27 07:30:12 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -563,7 +563,7 @@ Mon Jun 17 12:43:07 2002  Carlos O'Ryan  <coryan@atdesk.com>
 	  expertise or time to review/fix SHMIOP, UIOP, SSLIOP or UIPMC.
 	  I am considering this change another partial fix to:
 
-	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
+	  http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220
 
 Mon Jun 17 10:51:03 2002  Carlos O'Ryan  <coryan@atdesk.com>
 
@@ -592,7 +592,7 @@ Fri Jun 14 13:58:56 2002  Carlos O'Ryan  <coryan@atdesk.com>
 
 	* The following ChangeLog entry describe my fixes for bug 1222:
 
-	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1222
+	  http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1222
 
 	  The main changes to solve the problem were:
 
@@ -1199,7 +1199,7 @@ Tue May 28 20:24:16 CDT 2002 Pradeep Gore  <pradeep@oomworks.com>
 	* orbsvcs/orbsvcs/Notify/Notify_Event.h:
 	* orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp:
 
-	  Fix for bug: http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1134
+	  Fix for bug: http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1134
 	  Proxy Suppliers are subscribed for all events (special) by default.
 
 	* orbsvcs/tests/Notify/Basic/Events_Test.cpp:
@@ -1696,7 +1696,7 @@ Thu May 23 13:34:35 2002  Carlos O'Ryan  <coryan@atdesk.com>
 	* tests/Nested_Upcall_Crash/scavenger.cpp:
 	* tests/Nested_Upcall_Crash/server.cpp:
 	  Commit new regression test for
-	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1202
+	  http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1202
 
 Thu May 23 12:02:19 2002  Carlos O'Ryan  <coryan@atdesk.com>
 
diff --git a/TAO/ChangeLogs/ChangeLog-2002b b/TAO/ChangeLogs/ChangeLog-2002b
index e22bd2a7da7..de19d40d609 100644
--- a/TAO/ChangeLogs/ChangeLog-2002b
+++ b/TAO/ChangeLogs/ChangeLog-2002b
@@ -1220,7 +1220,7 @@ Thu Sep 26 11:55:05 2002  Carlos O'Ryan  <coryan@atdesk.com>
 	* tao/Connection_Handler.h:
 	* tao/Connection_Handler.inl:
 	  Remove unused IIOP-specific method.  This fixes:
-	    http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1314
+	    http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1314
 
 Tue Sep 26 05:32:22 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -1253,7 +1253,7 @@ Wed Sep 25 17:17:49 2002  Carlos O'Ryan  <coryan@atdesk.com>
 	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp:
 	  Do not use naked delete for reference counted objects.  This
 	  fixes:
-	    http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1313
+	    http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1313
 
 Wed Sep 25 17:58:03 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -2349,7 +2349,7 @@ Fri Sep 13 09:37:59 2002  Carlos O'Ryan  <coryan@atdesk.com>
 	  The routines affected are handle_input(), handle_output(),
 	  handle_close(), handle_close_i() and a couple others.
 	  This fixes:
-	    http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1309
+	    http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1309
 
 	* tao/Strategies/DIOP_Acceptor.cpp:
 	  The re-factoring eliminated some default arguments for
@@ -7822,7 +7822,7 @@ Tue Jul  2 15:46:14 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	This checkin is to prevent a problem that occurs unders certain
         circumstances as described in [Bug 1230]
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1230
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1230
 
 	The methodology used to solve the problem is pretty much similar
         to that described in the bug report.
diff --git a/TAO/ChangeLogs/ChangeLog-2002c b/TAO/ChangeLogs/ChangeLog-2002c
index d1768fb1f29..3e25734d36a 100644
--- a/TAO/ChangeLogs/ChangeLog-2002c
+++ b/TAO/ChangeLogs/ChangeLog-2002c
@@ -383,7 +383,7 @@ Sun Dec 22 11:26:30 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 
         Fix for Bug 1276. Please see
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1276 for more
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1276 for more
         details on this bug. The gist of the fix is this
 
           - If a follower thread timesout, it first tries to unbind the
@@ -1404,7 +1404,7 @@ Tue Dec  3 18:13:42 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 
         Fix for BUG 1382. Please see
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1382
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1382
 
         for details. The problem is basically that we didnt know when and
         how to do reference counting. The following fix addresses
@@ -1531,7 +1531,7 @@ Fri Nov 29 11:16:28 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 
         This set of fixes are for fixing BUG 1247. Please see
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1247
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1247
         for more details. The problem is that the server side connections
         never got purged. The cache manager was designed to purge
         connections in the client and server end.
@@ -2888,7 +2888,7 @@ Tue Nov 12 12:47:31 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 
         Fix for [BUG 1020]. Please see details of the bug at
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1020
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1020
 
         Please see the discussions in the above URL for details on
         the motivations for these changes. A very brief summary of the
@@ -4253,7 +4253,7 @@ Thu Oct 31 14:48:39 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 
         This is a fix for BUGID 1284. Please see
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1284 for more
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1284 for more
         details. This fix does the following
 
         - The invocation class selects a timeout from the two options that
diff --git a/TAO/ChangeLogs/ChangeLog-2003b b/TAO/ChangeLogs/ChangeLog-2003b
index 7099e3ee807..77d42a1b602 100644
--- a/TAO/ChangeLogs/ChangeLog-2003b
+++ b/TAO/ChangeLogs/ChangeLog-2003b
@@ -66,7 +66,7 @@ Wed Jun 11 15:58:39 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
         * tao/Transport_Cache_Manager.cpp (make_idle_i): Fixes for BUG
           1528. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1528
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1528
 
           for the motivation. This checkin just removes the call to find
           () on the map. It just changes the state of the map entry to
@@ -1337,7 +1337,7 @@ Mon May 19 13:02:16 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 Mon May 19 11:05:26 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        From Knut-Håvard Aksnes <knut@orion.no>
+        From Knut-H�vard Aksnes <knut@orion.no>
         * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp (parse_options):
 
           Fixed support for "hostname_in_ior" endpoint option.  [Bug 1370]
@@ -7585,7 +7585,7 @@ Thu Apr  3 13:13:24 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
         * tao/Muxed_TMS.cpp (connection_closed): Fix for bug 1482. Please
           refer to
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1482
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1482
 
           for details. The patch does the following
 
@@ -7620,7 +7620,7 @@ Thu Apr  3 10:57:23 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
         * tests/Bug_1482_Regression: A regression test for bug
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1482
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1482
 
           Please see the bugzilla entry for details.
 
diff --git a/TAO/ChangeLogs/ChangeLog-2003c b/TAO/ChangeLogs/ChangeLog-2003c
index 7e5b9115888..37f2e2256fd 100644
--- a/TAO/ChangeLogs/ChangeLog-2003c
+++ b/TAO/ChangeLogs/ChangeLog-2003c
@@ -663,7 +663,7 @@ Wed Oct 15 11:22:01 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 	* tao/Transport.cpp (send_connection_closed_notifications_i): The
 	  while loop could lead to possible crash. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1614
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1614
 
 	  for details of the problem and the nature of fixes applied. As
 	  usual, thanks to Carlos O'Ryan for digging this one up and
@@ -1705,14 +1705,14 @@ Wed Sep 24 09:02:19 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
         * tao/PortableServer/POA_Policies.cpp: Fix for [Bug 1587]. Please
           see  the documentation of the bug at
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1587
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1587
 
           for more details. Thanks to Carlos O'Ryan for the patches.
 
         * tao/MProfile.cpp: Fix for [BUG 1589]. Please see the
           documentation of the bug at
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1589
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1589
 
           Thanks to Huang-Ming Huang for the patch
 
diff --git a/TAO/ChangeLogs/ChangeLog-2003e b/TAO/ChangeLogs/ChangeLog-2003e
index f4a26be5aac..76eefe03bf0 100644
--- a/TAO/ChangeLogs/ChangeLog-2003e
+++ b/TAO/ChangeLogs/ChangeLog-2003e
@@ -539,7 +539,7 @@ Sun Dec 28 23:24:34 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1693
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1693
 
           for an outline of the problem. The problem showed up because the
           Any_Basic_Impl::extract () didn't handle alias TCKind's
@@ -1564,7 +1564,7 @@ Tue Dec 23 09:47:27 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
           Fixed incorrect dropping of _cxx_ prefix in parameter name (if
           it clashes with a C++ keyword) of AMI sendc_* operation. Thanks
-          to  Cyrille Chépélov <cyrille@softek.fr> for reporting the bug.
+          to  Cyrille Ch�p�lov <cyrille@softek.fr> for reporting the bug.
 
 Tue Dec 23 12:53:59 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -2327,7 +2327,7 @@ Thu Dec 11 14:03:16 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
           methods need a reply to be sent right away, and this is not
           handled under the hood in asynchronous_upcall_dispatch() as it
           is in synchronous_upcall_dispatch(). This fix closes
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1670. Thanks
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1670. Thanks
           to Carlos O'Ryan <coryan@atdesk.com> for pointing out the
           problem and suggesting the fix.
 
@@ -6030,7 +6030,7 @@ Sun Nov 16 16:49:33 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Fix for [BUG 1384]. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1384
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1384
 
           for details. The crux of the problem is whether the FTORB
           infrastructure should do a reinvocation when it receives a
@@ -6214,7 +6214,7 @@ Thu Nov 13 21:02:31 2003  Carlos O'Ryan  <coryan@atdesk.com>
         * tao/Queued_Message.cpp:
           Made the remove_from_list() operation safe if called multiple
           times.  This fixes:
-            http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1614
+            http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1614
 
 Fri Nov 14 00:26:46 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
@@ -9510,7 +9510,7 @@ Tue Oct 28 12:02:47 2003  Balachandran Natarajan <bala@dre.vanderbilt.edu>
         including the generated code. The design is outlined in the
         bugzilla. Please see
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1369
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1369
 
         This checkin only concentrates on the stub path. During the work
         we tried addressing the following additional problems
diff --git a/TAO/ChangeLogs/ChangeLog-2004a b/TAO/ChangeLogs/ChangeLog-2004a
index f65141d7d1c..aa94dcc0efe 100644
--- a/TAO/ChangeLogs/ChangeLog-2004a
+++ b/TAO/ChangeLogs/ChangeLog-2004a
@@ -3619,7 +3619,7 @@ Tue Apr 27 06:55:46 2004  Chad Elliott  <elliott_c@ociweb.com>
 Mon Apr 26 13:52:49 2004  Carlos O'Ryan  <coryan@atdesk.com>
 
         * Fixes for:
-            http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1779
+            http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1779
 
         * tao/params.i:
           The sock_{snd,rcv}buf_size were silently truncated to
@@ -7985,7 +7985,7 @@ Fri Feb 13 17:47:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
           Added a mutex around refcounting to address problems as outlined
           in
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1728
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1728
 
           Thanks to Torsten Kuepper for reporting the problem.
 
@@ -8479,7 +8479,7 @@ Sat Feb  7 20:32:06 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Fix for BUGID 1734. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1734
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1734
 
           for details.
 
diff --git a/TAO/ChangeLogs/ChangeLog-2004b b/TAO/ChangeLogs/ChangeLog-2004b
index a0a65244e4f..b816081526d 100644
--- a/TAO/ChangeLogs/ChangeLog-2004b
+++ b/TAO/ChangeLogs/ChangeLog-2004b
@@ -3705,7 +3705,7 @@ Sun Nov 14 05:01:28 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Fix for Bug 1535. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1535
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1535
 
           for details.
 
diff --git a/TAO/ChangeLogs/ChangeLog-2005a b/TAO/ChangeLogs/ChangeLog-2005a
index de32c344fd5..eee3fcf3db5 100644
--- a/TAO/ChangeLogs/ChangeLog-2005a
+++ b/TAO/ChangeLogs/ChangeLog-2005a
@@ -11894,7 +11894,7 @@ Thu Jan 27 20:01:21 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Fix for [BUGID 2038]. Please see
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2038
+          http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2038
 
           for details and thanks to Torsten Kuepper
           <torsten.kuepper@nokia.com> for reporting the problem.
@@ -13754,7 +13754,7 @@ Thu Jan  6 08:24:39 2005  Carlos O'Ryan  <coryan@atdesk.com>
         * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i:
           Use ACE_Unbounded_Set instead of ACE_Unbounded_Set_Ex.  The
           latter is not thread-safe, and the bugs attributed to the former
-          (see http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1465)
+          (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1465)
           are actually a user-configuration mistake.
 
 Thu Jan  6 12:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/TAO/ChangeLogs/ChangeLog-2005b b/TAO/ChangeLogs/ChangeLog-2005b
index 9e973bab5e9..9e196185095 100644
--- a/TAO/ChangeLogs/ChangeLog-2005b
+++ b/TAO/ChangeLogs/ChangeLog-2005b
@@ -12076,7 +12076,7 @@ Fri Aug 26 23:48:25 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
         Fix for bug
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2224
+        http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2224
 
         * tao/Client_Strategy_Factory.cpp:
         * tao/Client_Strategy_Factory.h:
diff --git a/TAO/ChangeLogs/TAO-2_5_12 b/TAO/ChangeLogs/TAO-2_5_12
new file mode 100644
index 00000000000..39f87a5b5e8
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_12
@@ -0,0 +1,349 @@
+commit 30dc9807c9d6c752e0bc0d528ae2e7c57c53f716
+Merge: d25bf627beb a5bb8cb886e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 6 13:05:15 2020 +0200
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit d25bf627bebf25507b2f4c7e3023ec2c1bd0ed7b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 6 13:05:07 2020 +0200
+
+    Use https
+    
+        * ACE/docs/ACE-bug-process.html:
+        * ACE/docs/usage-bugzilla.html:
+        * ACE/html/Stats/img.html:
+        * TAO/docs/TAO-metrics.html:
+        * TAO/docs/releasenotes/index.html:
+
+commit 28e4e2fbcd7b9b80ffb295ae469366c198c61d61
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 6 10:42:48 2020 +0200
+
+    Fixed typo and removed blank lines
+    
+        * TAO/tests/IDL_Test/README:
+        * TAO/tests/IDL_Test/enum_in_struct.idl:
+        * TAO/tests/IDL_Test/typecode.idl:
+
+commit f54ee35e7280cba29259b321cdaed3e32cec5609
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 6 10:34:48 2020 +0200
+
+    Also use Objects as part of an operation but as a result don't generate Any operations anymore in a separate file
+    
+        * TAO/tests/IDL_Test/IDL_Test.mpc:
+        * TAO/tests/IDL_Test/keywords.idl:
+
+commit d1e01360b3348b5df10def429aa4a3f3083efee5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Oct 6 09:53:27 2020 +0200
+
+    Add keyword escaping example and use that also for private/public
+    
+        * TAO/tests/IDL_Test/keywords.idl:
+
+commit ae13700f76493361f0c82ac49d87567f9ac18cf9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Oct 5 12:10:20 2020 +0200
+
+    Upgrade to latest doxygen
+    
+        * ACE/etc/ace.doxygen:
+        * ACE/etc/ace_inet.doxygen:
+        * ACE/etc/ace_qos.doxygen:
+        * ACE/etc/ace_rmcast.doxygen:
+        * ACE/etc/ace_ssl.doxygen:
+        * ACE/etc/acexml.doxygen:
+        * TAO/etc/tao.doxygen:
+        * TAO/etc/tao_anytypecode.doxygen:
+        * TAO/etc/tao_av.doxygen:
+        * TAO/etc/tao_compression.doxygen:
+        * TAO/etc/tao_cosevent.doxygen:
+        * TAO/etc/tao_cosnaming.doxygen:
+        * TAO/etc/tao_cosnotification.doxygen:
+        * TAO/etc/tao_costime.doxygen:
+        * TAO/etc/tao_costrader.doxygen:
+        * TAO/etc/tao_dynamicany.doxygen:
+        * TAO/etc/tao_dynamicinterface.doxygen:
+        * TAO/etc/tao_esf.doxygen:
+        * TAO/etc/tao_ifr.doxygen:
+        * TAO/etc/tao_implrepo.doxygen:
+        * TAO/etc/tao_iormanip.doxygen:
+        * TAO/etc/tao_iortable.doxygen:
+        * TAO/etc/tao_pi.doxygen:
+        * TAO/etc/tao_pi_server.doxygen:
+        * TAO/etc/tao_portablegroup.doxygen:
+        * TAO/etc/tao_portableserver.doxygen:
+        * TAO/etc/tao_rtcorba.doxygen:
+        * TAO/etc/tao_rtevent.doxygen:
+        * TAO/etc/tao_rtportableserver.doxygen:
+        * TAO/etc/tao_security.doxygen:
+        * TAO/etc/tao_smartproxies.doxygen:
+        * TAO/etc/tao_ssliop.doxygen:
+        * TAO/etc/tao_strategies.doxygen:
+        * TAO/etc/tao_transportcurrent.doxygen:
+        * TAO/etc/tao_ziop.doxygen:
+
+commit 0c65b800b02daee58d9f0187442bf829a3ff0a69
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Oct 2 18:24:09 2020 +0200
+
+    Perl shebang changes
+    
+        * TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl:
+        * TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl:
+        * TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl:
+        * TAO/tests/Bug_2702_Regression/fakeserver2.pl:
+
+commit ab4ee33c0aa8253f8d6f9ea03840a645f8ac8523
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Oct 2 16:24:16 2020 +0200
+
+    Fixed typo and layout issues
+    
+        * TAO/tests/AMH_Exceptions/server.cpp:
+        * TAO/tests/AMH_Oneway/server.cpp:
+        * TAO/tests/AlternateIIOP/README:
+        * TAO/tests/Big_Oneways/README:
+        * TAO/tests/Big_Oneways/Session.h:
+
+commit 6f78b0285ec9a20ccc8c626ff99e5df711a25e18
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 18 08:46:41 2020 +0200
+
+    Remove usage of narrow_from_decl/narrow_from_scope and replace them with dynamic_cast
+
+commit 0eff81cbdb5089fc417afd9aeddf20a626e7512a
+Merge: ad651b66893 3a00d263bcd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 18 08:21:19 2020 +0200
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit ad651b668932c63e66cdc4b6a29961059a802edf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 17 19:38:47 2020 +0200
+
+    Reduced indent of bullets in several readme files
+
+commit 7c83db6c282edbe68cd43e5cb7a21d2a121407bc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 17 19:22:35 2020 +0200
+
+    Removed old cidlc comments
+    
+        * TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/component_svth.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/component_svts.cpp:
+        * TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+        * TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp:
+        * TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp:
+        * TAO/TAO_IDL/be_include/be_global.h:
+
+commit 064720271e9e6c629aeba94bcf012bf4c77ebc7e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Aug 30 11:11:34 2020 +0200
+
+    Removed unnecessary semicolon after ACE_UNIMPLEMENTED_FUNC
+    
+        * TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+
+commit 8154ac1e47daf9cd93dadf61561d854b29f4f574
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 28 16:52:09 2020 +0200
+
+    Const change
+    
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp:
+
+commit ad42f8ce4169c55170a5aa6ff87ba7d76dd8ead5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 28 16:51:58 2020 +0200
+
+    Layout change
+    
+        * TAO/TAO_IDL/be/be_interface.cpp:
+
+commit e3c786e54c4aab48cf39949f69bc18fc3dee1055
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 28 16:51:47 2020 +0200
+
+    Generate also a private move constructor/assignment and use ACE_UNIMPLEMENTED_FUNC in order to get `= delete` with C++11 and newer
+    
+        * TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+
+commit 87008d7060ffffb9ee9c5c264c250dc90e48e1b2
+Merge: ce68efbcbd0 b4840dd0504
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 08:24:10 2020 +0200
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit 2f35a199f9d5c6074e8f6450c3973ea6a10af5ff
+Merge: 9c8bbd22dac 548012c88c8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 26 08:22:22 2020 +0200
+
+    Merge pull request #1214 from jwillemsen/jwi-githubactionwindows
+    
+    Replace azure pipelines with github actions for CI testing on Windows
+
+commit e0a6ada7a4296a0abc33cd98ba3e36df03eb9c5b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Aug 25 18:17:15 2020 +0200
+
+    Layout changes
+    
+        * TAO/tao/Strategies/SCIOP_Acceptor.h:
+
+commit ec41c7dc9431f851d4b9231f8fb7a1c54054a4cd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Aug 25 15:21:04 2020 +0200
+
+    Const changes and removed some unnessary casts
+    
+        * TAO/tao/IIOP_Acceptor.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/RTCORBA/RT_ORB_Loader.cpp:
+        * TAO/tao/Strategies/SCIOP_Acceptor.cpp:
+        * TAO/tao/default_resource.cpp:
+        * TAO/tao/default_server.cpp:
+
+commit bda85e4db023e38cf6f314e7c80698be40ee4bce
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Aug 25 14:32:50 2020 +0200
+
+    Use bool for found_a_port
+    
+        * TAO/tao/Strategies/SCIOP_Acceptor.cpp:
+
+commit c3c16c78dfec71183de20d1ec95e3cda0aeee557
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 24 17:29:22 2020 +0200
+
+    Fixed typo
+    
+        * ACE/ace/Obstack_T.h:
+        * TAO/docs/releasenotes/trader.html:
+        * TAO/orbsvcs/tests/Property/client.cpp:
+        * TAO/orbsvcs/tests/Simple_Naming/README:
+
+commit 69d236085b3493ec61ef3a092b9cfe7585629c66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Aug 22 15:37:33 2020 +0200
+
+    Windows only on pull request
+    
+        * .github/workflows/windows.yml:
+        * TAO/examples/Simple/Simple_util.h:
+
+commit 2e743e10ceb17abf3eeb02ed74bbe65839fff6b5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Aug 22 12:55:49 2020 +0200
+
+    Fixed typo in comment
+    
+        * TAO/tests/AMI/run_test.pl:
+
+commit c61b0db31cda9725e27e512b8a847651fb7708d0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 16:06:33 2020 +0200
+
+    Upgrade doxygen files to latest doxygen version
+
+commit bbe905207b94a34fb3000be67ba9c02e2de6dbd4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 15:24:36 2020 +0200
+
+    Layout changes
+    
+        * TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp:
+        * TAO/tao/AnyTypeCode/Any_Array_Impl_T.h:
+        * TAO/tao/AnyTypeCode/Any_Special_Impl_T.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode.cpp:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp:
+        * TAO/tao/AnyTypeCode/Union_TypeCode.cpp:
+        * TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp:
+        * TAO/tao/AnyTypeCode/Value_TypeCode.cpp:
+        * TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+        * TAO/tao/AnyTypeCode/append.cpp:
+        * TAO/tao/CORBANAME_Parser.cpp:
+        * TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+        * TAO/tao/CSD_Framework/CSD_POA.cpp:
+        * TAO/tao/Connector_Registry.cpp:
+        * TAO/tao/DynamicAny/DynCommon.cpp:
+        * TAO/tao/DynamicAny/DynStruct_i.cpp:
+        * TAO/tao/DynamicAny/DynUnion_i.cpp:
+        * TAO/tao/DynamicAny/DynValueBox_i.cpp:
+        * TAO/tao/DynamicAny/DynValue_i.cpp:
+        * TAO/tao/RTScheduling/RTScheduler_Initializer.cpp:
+        * TAO/tao/RTScheduling/RTScheduler_Manager.inl:
+        * TAO/tao/RTScheduling/Request_Interceptor.cpp:
+        * TAO/tao/Strategies/COIOP_Profile.h:
+        * TAO/tao/Strategies/SCIOP_Profile.cpp:
+        * TAO/tao/Strategies/SCIOP_Profile.h:
+        * TAO/tao/Strategies/SHMIOP_Profile.cpp:
+        * TAO/tao/Strategies/SHMIOP_Profile.h:
+        * TAO/tao/Strategies/UIOP_Connector.h:
+        * TAO/tao/Transport_Connector.cpp:
+        * TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+
+commit fefa0d5f1850d0f1e633c4182702698ce64f6eb8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 14:41:22 2020 +0200
+
+    Layout and true/false changes
+    
+        * ACE/ace/INET_Addr.cpp:
+        * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * TAO/tao/DynamicInterface/DII_Arguments.cpp:
+        * TAO/tao/DynamicInterface/Server_Request.cpp:
+
+commit 3568c72dc8476bc3a521150fff2e8bb6f193a7d8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 20 12:39:12 2020 +0200
+
+    Layout and docu changes
+    
+        * TAO/tao/Object.cpp:
+        * TAO/tao/Service_Callbacks.cpp:
+        * TAO/tao/Service_Callbacks.h:
+
+commit 4a682e2b0a5795e8c5812b7604d366f04f37e60d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 19 11:13:28 2020 +0200
+
+    Removed some empty lines
+    
+        * TAO/tao/On_Demand_Fragmentation_Strategy.h:
+
+commit fcdeaf9ba2ff504e3d3f4ac2f9c06657d498b39f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 17 11:05:51 2020 +0200
+
+    Add missing changelogs
+
+commit dbbd86832258985b5cf9533d85738e38df37ee66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 17 10:14:35 2020 +0200
+
+    Make ACE 6.5.11 and TAO 2.5.11 public available and prepare for next release
+    
+        * 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/MPC/config/tao_rules.mpb b/TAO/MPC/config/tao_rules.mpb
new file mode 100644
index 00000000000..e052c156cea
--- /dev/null
+++ b/TAO/MPC/config/tao_rules.mpb
@@ -0,0 +1,5 @@
+project {
+  verbatim(gnuace, extension, 1) {
+    include $(TAO_ROOT)/rules.tao.GNU
+  }
+}
diff --git a/TAO/MPC/config/taodefaults.mpb b/TAO/MPC/config/taodefaults.mpb
index 29fc8b6266e..89e08a6cee1 100644
--- a/TAO/MPC/config/taodefaults.mpb
+++ b/TAO/MPC/config/taodefaults.mpb
@@ -1,5 +1,5 @@
 // -*- MPC -*-
-project : tao_vc8warnings {
+project : tao_rules, tao_vc8warnings {
   staticflags += TAO_AS_STATIC_LIBS
   includes    += $(TAO_ROOT)
   libpaths    += $(ACE_ROOT)/lib
diff --git a/TAO/NEWS b/TAO/NEWS
index 0c3828c2eea..f8bc2bdb513 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,6 +1,17 @@
+USER VISIBLE CHANGES BETWEEN TAO-2.5.12 and TAO-3.0.0
+=====================================================
+
+. C++11 is now a mandatory compiler feature which is
+  required for TAO
+
 USER VISIBLE CHANGES BETWEEN TAO-2.5.11 and TAO-2.5.12
 ======================================================
 
+. Removed usage of narrow_from_decl and narrow_from_scope
+  from TAO_IDL, use dynamic_cast now that we have RTTI. Any
+  user that has a custom backend should make the similar
+  changes to their own TAO_IDL backend
+
 USER VISIBLE CHANGES BETWEEN TAO-2.5.10 and TAO-2.5.11
 ======================================================
 
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 6419f40bfbf..fcfe13e826b 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: 2.5.11
-    ACE VERSION: 6.5.11
+    TAO VERSION: 2.5.12
+    ACE VERSION: 6.5.12
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index a13c716489f..e824ed9a42b 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -31,7 +31,7 @@ to run TAO on:<P>
 <table width="100%" border=1>
   <tr valign=top>
     <td><b>Fully supported, i.e., continually tested and used daily</b></td>
-    <td>Windows (Microsoft Visual C++ 7.1, 9.0, 10.0, 11.0, 12, 14.0, 14.1, and 14.2),
+    <td>Windows (Microsoft Visual Studio 2015, 2017, and 2019),
         Linux/Intel (Redhat, Debian, and SuSe), Android
     </td>
   </tr>
@@ -148,8 +148,8 @@ bundle as a single piece instead of trying to mix and match things up.<P>
           <LI>Run MPC like this, $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc -type gnuace </LI>
           <LI>Run
           'make'.</LI> </OL></P><P> This will create all the required libraries for TAO
-          and TAO orbsvcs. In step 6, use -type vc71 if you want to
-          generate VC71 project and workspace files for Win32. Please
+          and TAO orbsvcs. In step 6, use -type vs2019 if you want to
+          generate Visual Studio 2019 project and workspace files for Win32. Please
           see <A href="../MPC/docs/USAGE"> MPC USAGE </A> document for
           details on how to generate build files for other compilers
           and tools.</P>
@@ -390,7 +390,7 @@ Make sure that you first build <code>$TAO_ROOT\TAO_IDL</code> and then <code>
 $TAO_ROOT\tao</code> because in order to compile the core TAO libraries
 you need to have <code>TAO_IDL</code> compiled.
 
-<H4>Visual C++ 7.1 and newer</H4>
+<H4>Visual Studio 2015 and newer</H4>
 
 <P>It works best if TAO is placed in ACE_wrappers so TAO ends up in
 <CODE>ACE_wrappers\TAO</CODE> because the Visual Studio Project files
@@ -402,7 +402,7 @@ href="../bin/MakeProjectCreator/config/acedefaults.mpb"> this base
 project </a> file.</P>
 
 <OL>
-  <LI>Make sure ACE is built (For Visual C++ 7.1, use ACE.sln). <P>
+  <LI>Make sure ACE is built (For Visual Studio 2015, use ACE.sln). <P>
 
   <LI>First make sure <CODE>ACE_wrappers\bin</CODE> is listed in the Executable
       Directories in Tools|Options.  This is needed if using the TAO_IDL
diff --git a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
index aed09a6c3cf..7ea25ceffe4 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
@@ -2,8 +2,8 @@
 #include "ast_annotation_member.h"
 
 AST_Annotation_Appl::Param::Param ()
-  : id (0),
-    expr (0),
+  : id (nullptr),
+    expr (nullptr),
     used (false)
 {
 }
@@ -30,7 +30,7 @@ AST_Annotation_Appl::delete_params (AST_Annotation_Appl::Params* params)
       Params::ITERATOR iter (*params);
       while (!iter.done ())
         {
-          Param **i = 0;
+          Param **i = nullptr;
           iter.next (i);
           delete *i;
           iter.advance ();
@@ -51,7 +51,7 @@ AST_Annotation_Appl::AST_Annotation_Appl (
     AST_Annotation_Decl (name),
     original_name_ (name->get_string_copy ()),
     params_ (params),
-    annotation_decl_ (0)
+    annotation_decl_ (nullptr)
 {
 }
 
@@ -71,7 +71,7 @@ void AST_Annotation_Appl::dump (ACE_OSTREAM_TYPE &o)
       Params::ITERATOR iter (*params_);
       while (!iter.done ())
         {
-          Param **i = 0;
+          Param **i = nullptr;
           iter.next (i);
           if ((*i)->id)
             {
@@ -103,9 +103,6 @@ const char *AST_Annotation_Appl::original_name () const
   return original_name_;
 }
 
-IMPL_NARROW_FROM_DECL (AST_Annotation_Appl)
-IMPL_NARROW_FROM_SCOPE (AST_Annotation_Appl)
-
 bool
 AST_Annotation_Appl::apply_from (AST_Annotation_Decl *decl)
 {
@@ -117,7 +114,7 @@ AST_Annotation_Appl::apply_from (AST_Annotation_Decl *decl)
     si.next ())
     {
       AST_Annotation_Member *member =
-        AST_Annotation_Member::narrow_from_decl (si.item ());
+        dynamic_cast<AST_Annotation_Member*> (si.item ());
       if (member)
         {
           AST_Annotation_Member *new_member = fe_add_annotation_member (
@@ -154,7 +151,7 @@ AST_Annotation_Appl::apply_from (AST_Annotation_Decl *decl)
       for (Param::Iterator it (*params_);
           !it.done (); it.advance ())
         {
-          Param **param = 0;
+          Param **param = nullptr;
           it.next (param);
           if ((*param) && !(*param)->used)
             {
@@ -190,18 +187,18 @@ AST_Annotation_Appl::find_param (const char *name)
       // Check for single nameless parameter
       if (params_->size () == 1)
         {
-          Param *top = 0;
+          Param *top = nullptr;
           params_->top (top);
           if (top && !top->id && top->expr)
             {
               // Don't reuse it if used
-              return top->used ? 0 : top;
+              return top->used ? nullptr : top;
             }
         }
       for (Param::Iterator it (*params_);
           !it.done (); it.advance ())
         {
-          Param **param = 0;
+          Param **param = nullptr;
           it.next (param);
           if ((*param) && (*param)->id && !ACE_OS::strcmp ((*param)->id->get_string (), name))
             {
@@ -210,5 +207,5 @@ AST_Annotation_Appl::find_param (const char *name)
         }
     }
 
-  return 0;
+  return nullptr;
 }
diff --git a/TAO/TAO_IDL/ast/ast_annotation_appls.cpp b/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
index 7f4949ddbd2..c943c2a641a 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
@@ -82,7 +82,7 @@ AST_Annotation_Appls::operator[] (size_t index)
 AST_Annotation_Appl *
 AST_Annotation_Appls::find (AST_Annotation_Decl *annotation)
 {
-  AST_Annotation_Appl *result = 0;
+  AST_Annotation_Appl *result = nullptr;
   for (iterator i = begin (); i != end (); ++i)
     {
       AST_Annotation_Appl *appl = i->get ();
@@ -99,20 +99,20 @@ AST_Annotation_Appls::find (const char *annotation)
 {
   if (!annotation)
     {
-      return 0;
+      return nullptr;
     }
 
   UTL_Scope* bottom = idl_global->scopes ().bottom ();
   if (!bottom)
     {
-      return 0;
+      return nullptr;
     }
 
   AST_Decl* decl = bottom->lookup_by_name (annotation);
   if (!decl)
     {
-      return 0;
+      return nullptr;
     }
 
-  return find (AST_Annotation_Decl::narrow_from_decl (decl));
+  return find (dynamic_cast<AST_Annotation_Decl*> (decl));
 }
diff --git a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp
index 45eab38d7d6..280c085a50f 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp
@@ -40,9 +40,6 @@ void AST_Annotation_Decl::destroy ()
   AST_Decl::destroy ();
 }
 
-IMPL_NARROW_FROM_DECL (AST_Annotation_Decl)
-IMPL_NARROW_FROM_SCOPE (AST_Annotation_Decl)
-
 void
 AST_Annotation_Decl::escape_name (Identifier *name)
 {
@@ -86,19 +83,19 @@ AST_Annotation_Decl::fe_add_annotation_member (
         }
     }
 
-  AST_Annotation_Decl *s = AST_Annotation_Decl::narrow_from_scope (this);
+  AST_Annotation_Decl *s = dynamic_cast<AST_Annotation_Decl*> (this);
   if (s)
     {
       s->fields ().enqueue_tail (annotation_member);
     }
 
-  return AST_Annotation_Member::narrow_from_decl (d);
+  return dynamic_cast<AST_Annotation_Member*> (d);
 }
 
 AST_Constant *
 AST_Annotation_Decl::fe_add_constant (AST_Constant *t)
 {
-  return AST_Constant::narrow_from_decl (fe_add_decl (t));
+  return dynamic_cast<AST_Constant*> (fe_add_decl (t));
 }
 
 int
diff --git a/TAO/TAO_IDL/ast/ast_annotation_member.cpp b/TAO/TAO_IDL/ast/ast_annotation_member.cpp
index d15d73b557a..4c6df635323 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_member.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_member.cpp
@@ -17,7 +17,7 @@ AST_Annotation_Member::AST_Annotation_Member (
   : AST_Decl (NT, name),
     AST_Field (type, name, vis_NA),
     expr_type_ (expr_type),
-    value_ (0)
+    value_ (nullptr)
 {
 }
 
@@ -27,7 +27,7 @@ AST_Annotation_Member::AST_Annotation_Member (
   : AST_Decl (nt, name),
     AST_Field (nt, type, name, vis_NA),
     expr_type_ (expr_type),
-    value_ (0)
+    value_ (nullptr)
 {
 }
 
@@ -38,7 +38,7 @@ AST_Annotation_Member::AST_Annotation_Member (
     AST_Field (name, dynamic_cast<AST_Field*>(other)),
     expr_type_ (other->expr_type ()),
     value_ (other->value () ?
-      new AST_Expression (other->value (), other->expr_type ()) : 0)
+      new AST_Expression (other->value (), other->expr_type ()) : nullptr)
 {
 }
 
@@ -57,9 +57,6 @@ AST_Annotation_Member::destroy ()
   AST_Field::destroy ();
 }
 
-IMPL_NARROW_FROM_DECL (AST_Annotation_Member);
-IMPL_NARROW_FROM_SCOPE (AST_Annotation_Member);
-
 void
 AST_Annotation_Member::dump (ACE_OSTREAM_TYPE &o)
 {
diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp
index 5867a6c0763..0fbe32d0656 100644
--- a/TAO/TAO_IDL/ast/ast_argument.cpp
+++ b/TAO/TAO_IDL/ast/ast_argument.cpp
@@ -87,7 +87,7 @@ direction_to_string (AST_Argument::Direction d)
       return "inout";
     }
 
-  return 0;
+  return nullptr;
 }
 
 AST_Decl::NodeType const
@@ -103,7 +103,7 @@ AST_Argument::AST_Argument (Direction d,
 {
 }
 
-AST_Argument::~AST_Argument (void)
+AST_Argument::~AST_Argument ()
 {
 }
 
@@ -123,15 +123,13 @@ AST_Argument::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Argument::destroy (void)
+AST_Argument::destroy ()
 {
   this->AST_Field::destroy ();
 }
 
 AST_Argument::Direction
-AST_Argument::direction (void)
+AST_Argument::direction ()
 {
   return this->pd_direction;
 }
-
-IMPL_NARROW_FROM_DECL(AST_Argument)
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp
index 110279a2411..c3fa96be0b2 100644
--- a/TAO/TAO_IDL/ast/ast_array.cpp
+++ b/TAO/TAO_IDL/ast/ast_array.cpp
@@ -96,14 +96,14 @@ AST_Array::AST_Array (UTL_ScopedName *n,
     AST_ConcreteType (AST_Decl::NT_array,
                       n),
     pd_n_dims (nd),
-    pd_base_type (0),
+    pd_base_type (nullptr),
     owns_base_type_ (false)
 {
   this->pd_dims = this->compute_dims (ds,
                                       nd);
 }
 
-AST_Array::~AST_Array (void)
+AST_Array::~AST_Array ()
 {
 }
 
@@ -115,15 +115,15 @@ AST_Expression **
 AST_Array::compute_dims (UTL_ExprList *ds,
                          ACE_CDR::ULong nds)
 {
-  if (ds == 0)
+  if (ds == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
-  AST_Expression **result = 0;
+  AST_Expression **result = nullptr;
   ACE_NEW_RETURN (result,
                   AST_Expression *[nds],
-                  0);
+                  nullptr);
 
   UTL_ExprlistActiveIterator iter (ds);
 
@@ -135,13 +135,13 @@ AST_Array::compute_dims (UTL_ExprList *ds,
       AST_Param_Holder *ph = orig->param_holder ();
 
       AST_Expression::ExprType ex_type =
-        (ph == 0 ? orig->ev ()->et : ph->info ()->const_type_);
+        (ph == nullptr ? orig->ev ()->et : ph->info ()->const_type_);
 
-      AST_Expression *copy = 0;
+      AST_Expression *copy = nullptr;
       ACE_NEW_RETURN (copy,
                       AST_Expression (orig,
                                       ex_type),
-                      0);
+                      nullptr);
 
       result[i] = copy;
     }
@@ -179,7 +179,7 @@ AST_Array::ast_accept (ast_visitor *visitor)
 
 // Compute the size type of the node in question.
 int
-AST_Array::compute_size_type (void)
+AST_Array::compute_size_type ()
 {
   AST_Type *type = this->base_type ();
 
@@ -201,19 +201,19 @@ AST_Array::compute_size_type (void)
 
 // Data accessors.
 ACE_CDR::ULong
-AST_Array::n_dims (void)
+AST_Array::n_dims ()
 {
   return this->pd_n_dims;
 }
 
 AST_Expression **
-AST_Array::dims (void)
+AST_Array::dims ()
 {
   return this->pd_dims;
 }
 
 AST_Type *
-AST_Array::base_type (void) const
+AST_Array::base_type () const
 {
   return this->pd_base_type;
 }
@@ -233,30 +233,30 @@ AST_Array::set_base_type (AST_Type *nbt)
 }
 
 bool
-AST_Array::legal_for_primary_key (void) const
+AST_Array::legal_for_primary_key () const
 {
   return this->base_type ()->legal_for_primary_key ();
 }
 
 void
-AST_Array::destroy (void)
+AST_Array::destroy ()
 {
   if (this->owns_base_type_)
     {
       this->pd_base_type->destroy ();
       delete this->pd_base_type;
-      this->pd_base_type = 0;
+      this->pd_base_type = nullptr;
     }
 
   for (ACE_CDR::ULong i = 0; i < this->pd_n_dims; ++i)
     {
       this->pd_dims[i]->destroy ();
       delete this->pd_dims[i];
-      this->pd_dims[i] = 0;
+      this->pd_dims[i] = nullptr;
     }
 
   delete [] this->pd_dims;
-  this->pd_dims = 0;
+  this->pd_dims = nullptr;
   this->pd_n_dims = 0;
 
   this->AST_ConcreteType::destroy ();
@@ -270,8 +270,6 @@ AST_Array::set_dims (AST_Expression **ds,
   this->pd_n_dims = nds;
 }
 
-IMPL_NARROW_FROM_DECL(AST_Array)
-
 AST_Annotation_Appls &
 AST_Array::base_type_annotations ()
 {
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
index 3dc8331d3a8..62d88dea065 100644
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ b/TAO/TAO_IDL/ast/ast_attribute.cpp
@@ -94,12 +94,12 @@ AST_Attribute::AST_Attribute (bool ro,
                ft,
                n),
     pd_readonly (ro),
-    pd_get_exceptions (0),
-    pd_set_exceptions (0)
+    pd_get_exceptions (nullptr),
+    pd_set_exceptions (nullptr)
 {
 }
 
-AST_Attribute::~AST_Attribute (void)
+AST_Attribute::~AST_Attribute ()
 {
 }
 
@@ -123,23 +123,23 @@ AST_Attribute::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Attribute::destroy (void)
+AST_Attribute::destroy ()
 {
   // No need to delete our exception lists, the
   // destroy() method does it. The UTL_ExceptList
   // destroy() method does NOT delete the contained
   // exception nodes.
 
-  if (this->pd_get_exceptions != 0)
+  if (this->pd_get_exceptions != nullptr)
     {
       this->pd_get_exceptions->destroy ();
-      this->pd_get_exceptions = 0;
+      this->pd_get_exceptions = nullptr;
     }
 
-  if (this->pd_set_exceptions != 0)
+  if (this->pd_set_exceptions != nullptr)
     {
       this->pd_set_exceptions->destroy ();
-      this->pd_set_exceptions = 0;
+      this->pd_set_exceptions = nullptr;
     }
 
   this->AST_Field::destroy ();
@@ -148,7 +148,7 @@ AST_Attribute::destroy (void)
 UTL_ExceptList *
 AST_Attribute::be_add_get_exceptions (UTL_ExceptList *t)
 {
-  if (this->pd_get_exceptions != 0)
+  if (this->pd_get_exceptions != nullptr)
     {
       idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                   this);
@@ -164,7 +164,7 @@ AST_Attribute::be_add_get_exceptions (UTL_ExceptList *t)
 UTL_ExceptList *
 AST_Attribute::be_add_set_exceptions (UTL_ExceptList *t)
 {
-  if (this->pd_set_exceptions != 0)
+  if (this->pd_set_exceptions != nullptr)
     {
       idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                   this);
@@ -180,19 +180,19 @@ AST_Attribute::be_add_set_exceptions (UTL_ExceptList *t)
 // Data accessors.
 
 bool
-AST_Attribute::readonly (void) const
+AST_Attribute::readonly () const
 {
   return this->pd_readonly;
 }
 
 UTL_ExceptList *
-AST_Attribute::get_get_exceptions (void) const
+AST_Attribute::get_get_exceptions () const
 {
   return this->pd_get_exceptions;
 }
 
 UTL_ExceptList *
-AST_Attribute::get_set_exceptions (void) const
+AST_Attribute::get_set_exceptions () const
 {
   return this->pd_set_exceptions;
 }
@@ -202,11 +202,11 @@ AST_Attribute::get_set_exceptions (void) const
 UTL_NameList *
 AST_Attribute::fe_add_get_exceptions (UTL_NameList *t)
 {
-  UTL_ScopedName *nl_n = 0;
-  AST_Type *fe = 0;
-  AST_Decl *d = 0;
+  UTL_ScopedName *nl_n = nullptr;
+  AST_Type *fe = nullptr;
+  AST_Decl *d = nullptr;
 
-  this->pd_get_exceptions = 0;
+  this->pd_get_exceptions = nullptr;
 
   for (UTL_NamelistActiveIterator nl_i (t);
        !nl_i.is_done ();
@@ -216,10 +216,10 @@ AST_Attribute::fe_add_get_exceptions (UTL_NameList *t)
 
       d = this->defined_in ()->lookup_by_name (nl_n, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (nl_n);
-          return 0;
+          return nullptr;
         }
 
       AST_Decl::NodeType nt = d->node_type ();
@@ -229,17 +229,17 @@ AST_Attribute::fe_add_get_exceptions (UTL_NameList *t)
         {
           idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                       this);
-          return 0;
+          return nullptr;
         }
 
-      fe = AST_Type::narrow_from_decl (d);
+      fe = dynamic_cast<AST_Type*> (d);
 
-      UTL_ExceptList *el = 0;
+      UTL_ExceptList *el = nullptr;
       ACE_NEW_RETURN (el,
-                      UTL_ExceptList (fe, 0),
-                      0);
+                      UTL_ExceptList (fe, nullptr),
+                      nullptr);
 
-      if (this->pd_get_exceptions == 0)
+      if (this->pd_get_exceptions == nullptr)
         {
           this->pd_get_exceptions = el;
         }
@@ -257,11 +257,11 @@ AST_Attribute::fe_add_get_exceptions (UTL_NameList *t)
 UTL_NameList *
 AST_Attribute::fe_add_set_exceptions (UTL_NameList *t)
 {
-  UTL_ScopedName *nl_n = 0;
-  AST_Type *fe = 0;
-  AST_Decl *d = 0;
+  UTL_ScopedName *nl_n = nullptr;
+  AST_Type *fe = nullptr;
+  AST_Decl *d = nullptr;
 
-  this->pd_set_exceptions = 0;
+  this->pd_set_exceptions = nullptr;
 
   for (UTL_NamelistActiveIterator nl_i (t); !nl_i.is_done (); nl_i.next ())
     {
@@ -269,10 +269,10 @@ AST_Attribute::fe_add_set_exceptions (UTL_NameList *t)
 
       d = this->defined_in ()->lookup_by_name (nl_n, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (nl_n);
-          return 0;
+          return nullptr;
         }
 
       AST_Decl::NodeType nt = d->node_type ();
@@ -282,17 +282,17 @@ AST_Attribute::fe_add_set_exceptions (UTL_NameList *t)
         {
           idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                       this);
-          return 0;
+          return nullptr;
         }
 
-      fe = AST_Type::narrow_from_decl (d);
+      fe = dynamic_cast<AST_Type*> (d);
 
-      UTL_ExceptList *el = 0;
+      UTL_ExceptList *el = nullptr;
       ACE_NEW_RETURN (el,
-                      UTL_ExceptList (fe, 0),
-                      0);
+                      UTL_ExceptList (fe, nullptr),
+                      nullptr);
 
-      if (this->pd_set_exceptions == 0)
+      if (this->pd_set_exceptions == nullptr)
         {
           this->pd_set_exceptions = el;
         }
@@ -310,5 +310,3 @@ AST_Attribute::annotatable () const
 {
   return true;
 }
-
-IMPL_NARROW_FROM_DECL(AST_Attribute)
diff --git a/TAO/TAO_IDL/ast/ast_check.cpp b/TAO/TAO_IDL/ast/ast_check.cpp
index e42960855fe..d02d58c2925 100644
--- a/TAO/TAO_IDL/ast/ast_check.cpp
+++ b/TAO/TAO_IDL/ast/ast_check.cpp
@@ -71,7 +71,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_scope.h"
 
 // Static storage for remembering nodes.
-static AST_Type  **ast_fwds = 0;
+static AST_Type  **ast_fwds = nullptr;
 static long  ast_n_fwds_used = 0;
 static long  ast_n_fwds_alloc = 0;
 
@@ -82,7 +82,7 @@ static long  ast_n_fwds_alloc = 0;
 void
 AST_record_fwd_decl (AST_Type *n)
 {
-  AST_Type **o_ast_fwds = 0;
+  AST_Type **o_ast_fwds = nullptr;
   long o_ast_n_fwds_alloc = 0;
 
   // Make sure there's space to store one more.
@@ -118,9 +118,9 @@ AST_record_fwd_decl (AST_Type *n)
 
 // Check that all forward declared structs and unions were also defined.
 TAO_IDL_FE_Export void
-AST_check_fwd_decls (void)
+AST_check_fwd_decls ()
 {
-  AST_Type *d = 0;
+  AST_Type *d = nullptr;
 
   for (long i = 0; i < ast_n_fwds_used; ++i)
     {
@@ -137,7 +137,7 @@ AST_check_fwd_decls (void)
             d->defined_in ()->lookup_by_name_local (d->local_name (),
                                                     true);
 
-          if (f == 0)
+          if (f == nullptr)
             {
               idl_global->err ()->fwd_decl_not_defined (d);
             }
@@ -148,7 +148,7 @@ AST_check_fwd_decls (void)
   // in between which the elements of ast_fwds are destroyed,
   // so we have to clean up.
   delete [] ast_fwds;
-  ast_fwds = 0;
+  ast_fwds = nullptr;
   ast_n_fwds_alloc = 0;
   ast_n_fwds_used = 0;
 }
diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp
index c1cbe1729b5..a090a6276a9 100644
--- a/TAO/TAO_IDL/ast/ast_component.cpp
+++ b/TAO/TAO_IDL/ast/ast_component.cpp
@@ -46,16 +46,16 @@ AST_Component::AST_Component (UTL_ScopedName *n,
     }
 }
 
-AST_Component::~AST_Component (void)
+AST_Component::~AST_Component ()
 {
 }
 
 void
 AST_Component::redefine (AST_Interface *from)
 {
-  AST_Component *c = AST_Component::narrow_from_decl (from);
+  AST_Component *c = dynamic_cast<AST_Component*> (from);
 
-  if (c == 0)
+  if (c == nullptr)
     {
       idl_global->err ()->redef_error (from->local_name ()->get_string (),
                                        this->local_name ()->get_string ());
@@ -72,9 +72,9 @@ AST_Decl *
 AST_Component::look_in_inherited (UTL_ScopedName *e,
                                   bool full_def_only)
 {
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
 
-  if (this->pd_base_component != 0)
+  if (this->pd_base_component != nullptr)
     {
       d =
         this->pd_base_component->lookup_by_name_r (
@@ -90,15 +90,15 @@ AST_Decl *
 AST_Component::look_in_supported (UTL_ScopedName *e,
                                   bool full_def_only)
 {
-  AST_Decl *d = 0;
-  AST_Type **is = 0;
+  AST_Decl *d = nullptr;
+  AST_Type **is = nullptr;
   long nis = -1;
 
   // Can't look in an interface which was not yet defined.
   if (!this->is_defined ())
     {
       idl_global->err ()->fwd_decl_lookup (this, e);
-      return 0;
+      return nullptr;
     }
 
   // OK, loop through supported interfaces.
@@ -113,11 +113,11 @@ AST_Component::look_in_supported (UTL_ScopedName *e,
         }
 
       AST_Interface *i =
-        AST_Interface::narrow_from_decl (*is);
+        dynamic_cast<AST_Interface*> (*is);
 
       d = (i)->lookup_by_name_r (e, full_def_only);
 
-      if (d != 0)
+      if (d != nullptr)
         {
           break;
         }
@@ -127,19 +127,19 @@ AST_Component::look_in_supported (UTL_ScopedName *e,
 }
 
 AST_Component *
-AST_Component::base_component (void) const
+AST_Component::base_component () const
 {
   return this->pd_base_component;
 }
 
 AST_Type **
-AST_Component::supports (void) const
+AST_Component::supports () const
 {
   return this->inherits ();
 }
 
 long
-AST_Component::n_supports (void) const
+AST_Component::n_supports () const
 {
   return this->n_inherits ();
 }
@@ -151,7 +151,7 @@ AST_Component::special_lookup (UTL_ScopedName *e,
 {
   AST_Decl *d = this->look_in_inherited (e, full_def_only);
 
-  if (d == 0)
+  if (d == nullptr)
     {
       d = this->look_in_supported (e, full_def_only);
     }
@@ -160,7 +160,7 @@ AST_Component::special_lookup (UTL_ScopedName *e,
 }
 
 void
-AST_Component::destroy (void)
+AST_Component::destroy ()
 {
   this->AST_Interface::destroy ();
 }
@@ -174,7 +174,7 @@ AST_Component::dump (ACE_OSTREAM_TYPE &o)
 
   this->dump_i (o, " ");
 
-  if (this->pd_base_component != 0)
+  if (this->pd_base_component != nullptr)
     {
       this->dump_i (o, ": ");
       this->pd_base_component->local_name ()->dump (o);
@@ -212,57 +212,43 @@ AST_Component::ast_accept (ast_visitor *visitor)
 AST_Provides *
 AST_Component::fe_add_provides (AST_Provides *p)
 {
-  return
-    AST_Provides::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  return dynamic_cast<AST_Provides*> (this->fe_add_ref_decl (p));
 }
 
 AST_Uses *
 AST_Component::fe_add_uses (AST_Uses *u)
 {
-  return
-    AST_Uses::narrow_from_decl (
-      this->fe_add_ref_decl (u));
+  return dynamic_cast<AST_Uses*> (this->fe_add_ref_decl (u));
 }
 
 AST_Publishes *
 AST_Component::fe_add_publishes (AST_Publishes *p)
 {
-  return
-    AST_Publishes::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  return dynamic_cast<AST_Publishes*> (this->fe_add_ref_decl (p));
 }
 
 AST_Emits *
 AST_Component::fe_add_emits (AST_Emits *e)
 {
-  return
-    AST_Emits::narrow_from_decl (
-      this->fe_add_ref_decl (e));
+  return dynamic_cast<AST_Emits*> (this->fe_add_ref_decl (e));
 }
 
 AST_Consumes *
 AST_Component::fe_add_consumes (AST_Consumes *c)
 {
-  return
-    AST_Consumes::narrow_from_decl (
-      this->fe_add_ref_decl (c));
+  return dynamic_cast<AST_Consumes*> (this->fe_add_ref_decl (c));
 }
 
 AST_Extended_Port *
 AST_Component::fe_add_extended_port (AST_Extended_Port *p)
 {
-  return
-    AST_Extended_Port::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  return dynamic_cast<AST_Extended_Port*> (this->fe_add_ref_decl (p));
 }
 
 AST_Mirror_Port *
 AST_Component::fe_add_mirror_port (AST_Mirror_Port *p)
 {
-  return
-    AST_Mirror_Port::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  return dynamic_cast<AST_Mirror_Port*> (this->fe_add_ref_decl (p));
 }
 
 int
@@ -282,5 +268,3 @@ AST_Component::be_add_uses (AST_Uses *i,
   return 0;
 }
 
-IMPL_NARROW_FROM_DECL (AST_Component)
-IMPL_NARROW_FROM_SCOPE (AST_Component)
diff --git a/TAO/TAO_IDL/ast/ast_component_fwd.cpp b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
index 597f6434d52..8388f9450c2 100644
--- a/TAO/TAO_IDL/ast/ast_component_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
@@ -18,7 +18,7 @@ AST_ComponentFwd::AST_ComponentFwd (AST_Interface *dummy,
 {
 }
 
-AST_ComponentFwd::~AST_ComponentFwd (void)
+AST_ComponentFwd::~AST_ComponentFwd ()
 {
 }
 
@@ -40,15 +40,13 @@ AST_ComponentFwd::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_ComponentFwd::destroy (void)
+AST_ComponentFwd::destroy ()
 {
   this->AST_InterfaceFwd::destroy ();
 }
 
 bool
-AST_ComponentFwd::is_fwd (void)
+AST_ComponentFwd::is_fwd ()
 {
   return true; // This is a fwd declared type
 }
-
-IMPL_NARROW_FROM_DECL (AST_ComponentFwd)
diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
index fb198cd9d89..913f6c668ce 100644
--- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
@@ -77,14 +77,13 @@ AST_ConcreteType::AST_ConcreteType (AST_Decl::NodeType nt,
 {
 }
 
-AST_ConcreteType::~AST_ConcreteType (void)
+AST_ConcreteType::~AST_ConcreteType ()
 {
 }
 
 void
-AST_ConcreteType::destroy (void)
+AST_ConcreteType::destroy ()
 {
   this->AST_Type::destroy ();
 }
 
-IMPL_NARROW_FROM_DECL(AST_ConcreteType)
diff --git a/TAO/TAO_IDL/ast/ast_connector.cpp b/TAO/TAO_IDL/ast/ast_connector.cpp
index e92a55de7d7..0e201e54f1a 100644
--- a/TAO/TAO_IDL/ast/ast_connector.cpp
+++ b/TAO/TAO_IDL/ast/ast_connector.cpp
@@ -19,17 +19,17 @@ AST_Connector::AST_Connector (
               n),
     UTL_Scope (AST_Decl::NT_connector),
     AST_Interface (n,
+                   nullptr,
                    0,
-                   0,
-                   0,
+                   nullptr,
                    0,
                    false,
                    false),
     AST_Component (n,
                    base_connector,
+                   nullptr,
                    0,
-                   0,
-                   0,
+                   nullptr,
                    0)
 {
   if (!this->imported ())
@@ -38,18 +38,18 @@ AST_Connector::AST_Connector (
     }
 }
 
-AST_Connector::~AST_Connector (void)
+AST_Connector::~AST_Connector ()
 {
 }
 
 AST_Connector *
-AST_Connector::base_connector (void) const
+AST_Connector::base_connector () const
 {
-  return AST_Connector::narrow_from_decl (this->pd_base_component);
+  return dynamic_cast<AST_Connector*> (this->pd_base_component);
 }
 
 void
-AST_Connector::destroy (void)
+AST_Connector::destroy ()
 {
   this->AST_Component::destroy ();
 }
@@ -63,7 +63,7 @@ AST_Connector::dump (ACE_OSTREAM_TYPE &o)
 
   this->dump_i (o, " ");
 
-  if (this->pd_base_component != 0)
+  if (this->pd_base_component != nullptr)
     {
       this->dump_i (o, ": ");
       this->pd_base_component->local_name ()->dump (o);
@@ -82,6 +82,3 @@ AST_Connector::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_connector (this);
 }
-
-IMPL_NARROW_FROM_DECL (AST_Connector)
-IMPL_NARROW_FROM_SCOPE (AST_Connector)
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index f3a51add81e..9a92df4f4fc 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -119,7 +119,7 @@ AST_Constant::exprtype_to_string (AST_Expression::ExprType et)
       break;
     }
 
-  return 0;
+  return nullptr;
 }
 
 AST_Decl::NodeType const
@@ -135,7 +135,7 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t,
               n),
     pd_constant_value (v),
     pd_et (t),
-    ifr_added_ (0)
+    ifr_added_ (false)
 {
 }
 
@@ -148,7 +148,7 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t,
               n),
     pd_constant_value (v),
     pd_et (t),
-    ifr_added_ (0)
+    ifr_added_ (false)
 {
   // Avoids a truncation warning on MSVC when assigning a decimal
   // literal to a float constant. Must also check that the input
@@ -171,7 +171,7 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t,
     }
 }
 
-AST_Constant::~AST_Constant (void)
+AST_Constant::~AST_Constant ()
 {
 }
 
@@ -199,13 +199,13 @@ AST_Constant::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Constant::destroy (void)
+AST_Constant::destroy ()
 {
-  if (this->pd_constant_value != 0)
+  if (this->pd_constant_value != nullptr)
     {
       this->pd_constant_value->destroy ();
       delete this->pd_constant_value;
-      this->pd_constant_value = 0;
+      this->pd_constant_value = nullptr;
     }
 
   this->AST_Decl::destroy ();
@@ -214,19 +214,19 @@ AST_Constant::destroy (void)
 // Data accessors.
 
 AST_Expression *
-AST_Constant::constant_value (void)
+AST_Constant::constant_value ()
 {
   return this->pd_constant_value;
 }
 
 AST_Expression::ExprType
-AST_Constant::et (void)
+AST_Constant::et ()
 {
   return this->pd_et;
 }
 
 bool
-AST_Constant::ifr_added (void)
+AST_Constant::ifr_added ()
 {
   return this->ifr_added_;
 }
@@ -238,7 +238,7 @@ AST_Constant::ifr_added (bool val)
 }
 
 const char *
-AST_Constant::exprtype_to_string (void)
+AST_Constant::exprtype_to_string ()
 {
   switch (this->pd_et)
     {
@@ -277,26 +277,24 @@ AST_Constant::exprtype_to_string (void)
     case AST_Expression::EV_fixed:
       return "Fixed";
     default:
-      return 0;
+      return nullptr;
     }
 
-  return 0;
+  return nullptr;
 }
 
 UTL_ScopedName *
-AST_Constant::enum_full_name (void)
+AST_Constant::enum_full_name ()
 {
   if (this->pd_et == AST_Expression::EV_enum)
     {
       UTL_Scope * const s = this->defined_in ();
       AST_Decl  * const d = s->lookup_by_name (this->pd_constant_value->n (),
-                                               1);
-      return (d ? (ScopeAsDecl (d->defined_in ()))->name () : 0);
+                                               true);
+      return (d ? (ScopeAsDecl (d->defined_in ()))->name () : nullptr);
     }
   else
     {
-      return 0;
+      return nullptr;
     }
 }
-
-IMPL_NARROW_FROM_DECL(AST_Constant)
diff --git a/TAO/TAO_IDL/ast/ast_consumes.cpp b/TAO/TAO_IDL/ast/ast_consumes.cpp
index 1a1308094aa..e2a4422bbeb 100644
--- a/TAO/TAO_IDL/ast/ast_consumes.cpp
+++ b/TAO/TAO_IDL/ast/ast_consumes.cpp
@@ -16,12 +16,12 @@ AST_Consumes::AST_Consumes (UTL_ScopedName *n,
 {
 }
 
-AST_Consumes::~AST_Consumes (void)
+AST_Consumes::~AST_Consumes ()
 {
 }
 
 AST_Type *
-AST_Consumes::consumes_type (void) const
+AST_Consumes::consumes_type () const
 {
   return this->field_type ();
 }
@@ -40,9 +40,7 @@ AST_Consumes::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Consumes::destroy (void)
+AST_Consumes::destroy ()
 {
   this->AST_Field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_Consumes)
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 96a46df6707..e2803ef69af 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -91,17 +91,17 @@ COMMON_Base::COMMON_Base (bool local,
 {
 }
 
-COMMON_Base::~COMMON_Base (void)
+COMMON_Base::~COMMON_Base ()
 {
 }
 
 void
-COMMON_Base::destroy (void)
+COMMON_Base::destroy ()
 {
 }
 
 bool
-COMMON_Base::is_local (void)
+COMMON_Base::is_local ()
 {
   return this->is_local_;
 }
@@ -113,7 +113,7 @@ COMMON_Base::is_local (bool val)
 }
 
 bool
-COMMON_Base::is_abstract (void) const
+COMMON_Base::is_abstract () const
 {
   return this->is_abstract_;
 }
@@ -128,28 +128,28 @@ AST_Decl::AST_Decl (NodeType nt,
                     UTL_ScopedName *n,
                     bool anonymous)
   : COMMON_Base (),
-    repoID_ (0),
-    flat_name_ (0),
+    repoID_ (nullptr),
+    flat_name_ (nullptr),
     contains_wstring_ (-1),
-    annotation_appls_ (0),
+    annotation_appls_ (nullptr),
     builtin_ (idl_global->in_eval_),
     pd_imported (idl_global->imported ()),
     pd_in_main_file (idl_global->in_main_file ()),
     pd_defined_in (idl_global->scopes ().depth () > 0
                      ? idl_global->scopes ().top ()
-                     : 0),
+                     : nullptr),
     pd_node_type (nt),
     pd_line (idl_global->lineno ()),
-    pd_name (0),
-    pd_local_name (n ? n->last_component ()->copy () : 0),
-    pd_original_local_name (0),
-    full_name_ (0),
-    prefix_ (0),
-    version_ (0),
+    pd_name (nullptr),
+    pd_local_name (n ? n->last_component ()->copy () : nullptr),
+    pd_original_local_name (nullptr),
+    full_name_ (nullptr),
+    prefix_ (nullptr),
+    version_ (nullptr),
     anonymous_ (anonymous),
     typeid_set_ (false),
-    last_referenced_as_ (0),
-    prefix_scope_ (0),
+    last_referenced_as_ (nullptr),
+    prefix_scope_ (nullptr),
     in_tmpl_mod_not_aliased_ (idl_global->in_tmpl_mod_no_alias ())
 {
   // If this is the root node, the filename won't have been set yet.
@@ -158,7 +158,7 @@ AST_Decl::AST_Decl (NodeType nt,
 
   this->compute_full_name (n);
 
-  char *prefix = 0;
+  char *prefix = nullptr;
   idl_global->pragma_prefixes ().top (prefix);
   this->prefix_ = ACE::strnew (prefix ? prefix : "");
 
@@ -175,28 +175,28 @@ AST_Decl::AST_Decl (
   UTL_ScopedName *name,
   AST_Decl *other)
   : COMMON_Base (),
-    repoID_ (0),
-    flat_name_ (0),
+    repoID_ (nullptr),
+    flat_name_ (nullptr),
     contains_wstring_ (-1),
-    annotation_appls_ (0),
+    annotation_appls_ (nullptr),
     builtin_ (idl_global->in_eval_),
     pd_imported (idl_global->imported ()),
     pd_in_main_file (idl_global->in_main_file ()),
     pd_defined_in (idl_global->scopes ().depth () > 0
                      ? idl_global->scopes ().top ()
-                     : 0),
+                     : nullptr),
     pd_node_type (other->node_type ()),
     pd_line (idl_global->lineno ()),
-    pd_name (0),
-    pd_local_name (name ? name->last_component ()->copy () : 0),
-    pd_original_local_name (0),
-    full_name_ (0),
-    prefix_ (0),
-    version_ (0),
+    pd_name (nullptr),
+    pd_local_name (name ? name->last_component ()->copy () : nullptr),
+    pd_original_local_name (nullptr),
+    full_name_ (nullptr),
+    prefix_ (nullptr),
+    version_ (nullptr),
     anonymous_ (other->anonymous ()),
     typeid_set_ (false),
-    last_referenced_as_ (0),
-    prefix_scope_ (0),
+    last_referenced_as_ (nullptr),
+    prefix_scope_ (nullptr),
     in_tmpl_mod_not_aliased_ (idl_global->in_tmpl_mod_no_alias ())
 {
   // If this is the root node, the filename won't have been set yet.
@@ -205,7 +205,7 @@ AST_Decl::AST_Decl (
 
   this->compute_full_name (name);
 
-  char *prefix = 0;
+  char *prefix = nullptr;
   idl_global->pragma_prefixes ().top (prefix);
   this->prefix_ = ACE::strnew (prefix ? prefix : "");
 
@@ -218,59 +218,59 @@ AST_Decl::AST_Decl (
   this->compute_repoID ();
 }
 
-AST_Decl::~AST_Decl (void)
+AST_Decl::~AST_Decl ()
 {
 }
 
 void
-AST_Decl::destroy (void)
+AST_Decl::destroy ()
 {
   // These are not set for the root node.
   if (this->pd_name)
     {
       this->pd_name->destroy ();
       delete this->pd_name;
-      this->pd_name = 0;
+      this->pd_name = nullptr;
     }
 
   if (this->pd_local_name)
     {
       this->pd_local_name->destroy ();
       delete this->pd_local_name;
-      this->pd_local_name = 0;
+      this->pd_local_name = nullptr;
     }
 
   if (this->pd_original_local_name)
     {
       this->pd_original_local_name->destroy ();
       delete this->pd_original_local_name;
-      this->pd_original_local_name = 0;
+      this->pd_original_local_name = nullptr;
     }
 
   if (this->last_referenced_as_)
     {
       this->last_referenced_as_->destroy ();
       delete this->last_referenced_as_;
-      this->last_referenced_as_ = 0;
+      this->last_referenced_as_ = nullptr;
     }
 
   delete [] this->full_name_;
-  this->full_name_ = 0;
+  this->full_name_ = nullptr;
 
   delete [] this->repoID_;
-  this->repoID_ = 0;
+  this->repoID_ = nullptr;
 
   delete [] this->prefix_;
-  this->prefix_ = 0;
+  this->prefix_ = nullptr;
 
   delete [] this->version_;
-  this->version_ = 0;
+  this->version_ = nullptr;
 
   delete [] this->flat_name_;
-  this->flat_name_ = 0;
+  this->flat_name_ = nullptr;
 
   delete annotation_appls_;
-  annotation_appls_ = 0;
+  annotation_appls_ = nullptr;
 }
 
 AST_Decl *
@@ -282,7 +282,7 @@ AST_Decl::adjust_found (
 }
 
 bool
-AST_Decl::is_fwd (void)
+AST_Decl::is_fwd ()
 {
   return false; // Not a fwd declared type (by default)
 }
@@ -309,11 +309,11 @@ AST_Decl::compute_full_name (UTL_ScopedName *n)
     }
 
   // Initialize this name to 0.
-  this->pd_name = 0;
+  this->pd_name = nullptr;
 
   // OK, not global. So copy name of containing scope, then
   // smash last cdr of copy with new component
-  UTL_ScopedName *cn = 0;
+  UTL_ScopedName *cn = nullptr;
   AST_Decl *d = ScopeAsDecl (this->defined_in ());
   if (d)
     {
@@ -328,15 +328,15 @@ AST_Decl::compute_full_name (UTL_ScopedName *n)
     {
       if (this->pd_name)
         {
-          UTL_ScopedName *conc_name = 0;
+          UTL_ScopedName *conc_name = nullptr;
           ACE_NEW (conc_name,
-                   UTL_ScopedName (this->pd_local_name->copy (), 0));
+                   UTL_ScopedName (this->pd_local_name->copy (), nullptr));
           this->pd_name->nconc (conc_name);
         }
       else
         {
           ACE_NEW (this->pd_name,
-                   UTL_ScopedName (this->pd_local_name->copy (), 0));
+                   UTL_ScopedName (this->pd_local_name->copy (), nullptr));
         }
     }
 }
@@ -362,7 +362,7 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value,
     }
 
   delete [] this->repoID_;
-  this->repoID_ = 0;
+  this->repoID_ = nullptr;
   this->prefix (value);
   this->prefix_scope_ = appeared_in;
 
@@ -385,7 +385,7 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value,
   // This will recursively catch all previous openings of a module.
   if (this->node_type () == AST_Decl::NT_module)
     {
-      AST_Module *m = AST_Module::narrow_from_decl (this);
+      AST_Module *m = dynamic_cast<AST_Module*> (this);
       while (!!(m = m->previous_opening ()))
         {
           for (UTL_ScopeActiveIterator si (m, UTL_Scope::IK_decls);
@@ -408,14 +408,14 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value,
 
 // Compute stringified fully scoped name.
 void
-AST_Decl::compute_full_name (void)
+AST_Decl::compute_full_name ()
 {
   if (!this->full_name_)
     {
       size_t namelen = 0;
       long first = true;
       long second = false;
-      char *name = 0;
+      char *name = nullptr;
 
       for (UTL_IdListActiveIterator i (this->name ());
            !i.is_done ();
@@ -486,7 +486,7 @@ AST_Decl::compute_full_name (void)
 
 // Compute stringified repository ID.
 void
-AST_Decl::compute_repoID (void)
+AST_Decl::compute_repoID ()
 {
   if (this->repoID_)
     {
@@ -496,10 +496,10 @@ AST_Decl::compute_repoID (void)
   size_t namelen = 4; // for the prefix "IDL:"
   long first = true;
   long second = false;
-  char *name = 0;
+  char *name = nullptr;
   const char *prefix = (this->prefix_ ? this->prefix_ : "");
   UTL_Scope *scope = this->defined_in ();
-  const char *parent_prefix = 0;
+  const char *parent_prefix = nullptr;
 
   // If our prefix is empty, we check to see if an ancestor has one.
   while (scope && !ACE_OS::strcmp (prefix, ""))
@@ -647,7 +647,7 @@ AST_Decl::compute_repoID (void)
 // Public operations.
 
 const char *
-AST_Decl::flat_name (void)
+AST_Decl::flat_name ()
 {
   if (!this->flat_name_)
     {
@@ -659,14 +659,14 @@ AST_Decl::flat_name (void)
 
 // Compute stringified flattened fully scoped name.
 void
-AST_Decl::compute_flat_name (void)
+AST_Decl::compute_flat_name ()
 {
-  if (this->flat_name_ == 0)
+  if (this->flat_name_ == nullptr)
     {
       size_t namelen = 0;
       long first = true;
       long second = false;
-      char *item_name = 0;
+      char *item_name = nullptr;
 
       // In the first loop, compute the total length.
       for (UTL_IdListActiveIterator i (this->name ());
@@ -704,7 +704,7 @@ AST_Decl::compute_flat_name (void)
 
           tmp->destroy ();
           delete tmp;
-          tmp = 0;
+          tmp = nullptr;
         }
 
       ACE_NEW (this->flat_name_, char [namelen + 1]);
@@ -747,7 +747,7 @@ AST_Decl::compute_flat_name (void)
 
           tmp->destroy ();
           delete tmp;
-          tmp = 0;
+          tmp = nullptr;
         }
     }
 }
@@ -867,7 +867,7 @@ AST_Decl::has_ancestor (AST_Decl *s)
           return true;
         }
 
-      AST_Module *m = AST_Module::narrow_from_decl (s);
+      AST_Module *m = dynamic_cast<AST_Module*> (s);
       if (m)
         {
           while (!!(m = m->previous_opening ()))
@@ -881,7 +881,7 @@ AST_Decl::has_ancestor (AST_Decl *s)
 
       work = work->pd_defined_in ?
              ScopeAsDecl (work->pd_defined_in) :
-             0;
+             nullptr;
     } while (work);
 
   return false;
@@ -895,20 +895,20 @@ AST_Decl::is_child (AST_Decl *s)
       AST_Decl *d = ScopeAsDecl (this->defined_in ());
       if (!d)
         {
-          return 0;
+          return false;
         }
 
       if (!ACE_OS::strcmp (d->full_name (), s->full_name ()))
         {
-          return 1;
+          return true;
         }
     }
 
-  return 0; // Not a child.
+  return false; // Not a child.
 }
 
 bool
-AST_Decl::is_nested (void)
+AST_Decl::is_nested ()
 {
   AST_Decl *d = ScopeAsDecl (this->defined_in ());
 
@@ -941,7 +941,7 @@ AST_Decl::ast_accept (ast_visitor *visitor)
 // Data accessors.
 
 const char *
-AST_Decl::full_name (void)
+AST_Decl::full_name ()
 {
   if (!this->full_name_)
     {
@@ -952,7 +952,7 @@ AST_Decl::full_name (void)
 }
 
 const char *
-AST_Decl::repoID (void)
+AST_Decl::repoID ()
 {
   if (this->pd_node_type == NT_root)
     {
@@ -976,7 +976,7 @@ AST_Decl::repoID (char *value)
 }
 
 const char *
-AST_Decl::prefix (void)
+AST_Decl::prefix ()
 {
   return this->prefix_;
 }
@@ -989,7 +989,7 @@ AST_Decl::prefix (const char *value)
 }
 
 const char *
-AST_Decl::version (void)
+AST_Decl::version ()
 {
   if (!this->version_)
     {
@@ -998,8 +998,8 @@ AST_Decl::version (void)
 
       // All forms of repo id should contain two colons, the
       // version coming after the second one.
-      const char *tail1 = 0;
-      const char *tail2 = 0;
+      const char *tail1 = nullptr;
+      const char *tail2 = nullptr;
 
       if (repo_id)
         {
@@ -1055,7 +1055,7 @@ AST_Decl::version (char *value)
 }
 
 bool
-AST_Decl::anonymous (void) const
+AST_Decl::anonymous () const
 {
   return this->anonymous_;
 }
@@ -1067,7 +1067,7 @@ AST_Decl::anonymous (bool val)
 }
 
 bool
-AST_Decl::typeid_set (void) const
+AST_Decl::typeid_set () const
 {
   return this->typeid_set_;
 }
@@ -1127,7 +1127,7 @@ AST_Decl::set_id_with_typeid (char *value)
     }
 
   delete [] this->repoID_;
-  this->repoID_ = 0;
+  this->repoID_ = nullptr;
   this->repoID (ACE::strnew (value));
   this->typeid_set_ = true;
 }
@@ -1157,7 +1157,7 @@ AST_Decl::set_prefix_with_typeprefix (const char *value)
 }
 
 bool
-AST_Decl::imported (void)
+AST_Decl::imported ()
 {
   return this->pd_imported;
 }
@@ -1169,7 +1169,7 @@ AST_Decl::set_imported (bool is_it)
 }
 
 bool
-AST_Decl::in_main_file (void)
+AST_Decl::in_main_file ()
 {
   return this->pd_in_main_file;
 }
@@ -1181,7 +1181,7 @@ AST_Decl::set_in_main_file (bool is_it)
 }
 
 UTL_Scope *
-AST_Decl::defined_in (void)
+AST_Decl::defined_in ()
 {
   return this->pd_defined_in;
 }
@@ -1193,13 +1193,13 @@ AST_Decl::set_defined_in (UTL_Scope *s)
 }
 
 AST_Decl::NodeType
-AST_Decl::node_type (void)
+AST_Decl::node_type ()
 {
   return this->pd_node_type;
 }
 
 long
-AST_Decl::line (void)
+AST_Decl::line ()
 {
   return this->pd_line;
 }
@@ -1211,7 +1211,7 @@ AST_Decl::set_line (long l)
 }
 
 ACE_CString &
-AST_Decl::file_name (void)
+AST_Decl::file_name ()
 {
   return this->pd_file_name;
 }
@@ -1223,7 +1223,7 @@ AST_Decl::set_file_name (ACE_CString s)
 }
 
 UTL_ScopedName *
-AST_Decl::name (void)
+AST_Decl::name ()
 {
   return this->pd_name;
 }
@@ -1239,7 +1239,7 @@ AST_Decl::compute_name (const char *prefix,
 {
   if (!prefix || !suffix)
     {
-      return 0;
+      return nullptr;
     }
 
   // Prepare prefix_<local_name>_suffix string.
@@ -1252,19 +1252,19 @@ AST_Decl::compute_name (const char *prefix,
   result_local_str += suffix_str;
 
   // Identifier for the resulting local name.
-  Identifier *result_local_id = 0;
+  Identifier *result_local_id = nullptr;
   ACE_NEW_RETURN (result_local_id,
                   Identifier (result_local_str.c_str ()),
-                  0);
+                  nullptr);
 
   // UTL_Scoped name for the resulting local name.
-  UTL_ScopedName *result_local_name = 0;
+  UTL_ScopedName *result_local_name = nullptr;
   ACE_NEW_RETURN (result_local_name,
-                  UTL_ScopedName (result_local_id, 0),
-                  0);
+                  UTL_ScopedName (result_local_id, nullptr),
+                  nullptr);
 
   // Global scope?
-  UTL_ScopedName *result_name = 0;
+  UTL_ScopedName *result_name = nullptr;
   if (!this->defined_in ())
     {
       result_name = result_local_name;
@@ -1333,18 +1333,18 @@ AST_Decl::set_name (UTL_ScopedName *n)
 
       // These will be recomputed on demand.
       delete [] this->flat_name_;
-      this->flat_name_ = 0;
+      this->flat_name_ = nullptr;
 
       delete [] this->full_name_;
-      this->full_name_ = 0;
+      this->full_name_ = nullptr;
 
       delete [] this->repoID_;
-      this->repoID_ = 0;
+      this->repoID_ = nullptr;
     }
 }
 
 Identifier *
-AST_Decl::local_name (void)
+AST_Decl::local_name ()
 {
   return this->pd_local_name;
 }
@@ -1367,7 +1367,7 @@ AST_Decl::compute_local_name (const char *prefix,
 {
   if (!prefix || !suffix)
     {
-      return 0;
+      return nullptr;
     }
 
   // Init the result with prefix.
@@ -1380,10 +1380,10 @@ AST_Decl::compute_local_name (const char *prefix,
   result_str += ACE_CString (suffix);
 
   // Identifier for the resulting local name.
-  Identifier *result_id = 0;
+  Identifier *result_id = nullptr;
   ACE_NEW_RETURN (result_id,
                   Identifier (result_str.c_str ()),
-                  0);
+                  nullptr);
 
   return result_id;
 }
@@ -1417,13 +1417,13 @@ AST_Decl::original_local_name (Identifier *local_name)
 }
 
 Identifier *
-AST_Decl::original_local_name (void)
+AST_Decl::original_local_name ()
 {
   return this->pd_original_local_name;
 }
 
 bool
-AST_Decl::is_defined (void)
+AST_Decl::is_defined ()
 {
   // AST_Interface, AST_Structure, and AST_Union will
   // override this, as will AST_InterfaceFwd, etc.
@@ -1431,7 +1431,7 @@ AST_Decl::is_defined (void)
 }
 
 UTL_ScopedName *
-AST_Decl::last_referenced_as (void) const
+AST_Decl::last_referenced_as () const
 {
   return this->last_referenced_as_;
 }
@@ -1449,7 +1449,7 @@ AST_Decl::last_referenced_as (UTL_ScopedName *n)
 }
 
 UTL_Scope *
-AST_Decl::prefix_scope (void)
+AST_Decl::prefix_scope ()
 {
   return this->prefix_scope_;
 }
@@ -1462,7 +1462,7 @@ AST_Decl::prefix_scope (UTL_Scope *s)
 
 // Container types will override this.
 int
-AST_Decl::contains_wstring (void)
+AST_Decl::contains_wstring ()
 {
   if (this->contains_wstring_ == -1)
     {
@@ -1470,7 +1470,7 @@ AST_Decl::contains_wstring (void)
         {
         case AST_Decl::NT_array:
           {
-            AST_Array *a = AST_Array::narrow_from_decl (this);
+            AST_Array *a = dynamic_cast<AST_Array*> (this);
             this->contains_wstring_ = a->base_type ()->contains_wstring ();
             break;
           }
@@ -1479,14 +1479,14 @@ AST_Decl::contains_wstring (void)
         case AST_Decl::NT_struct:
         case AST_Decl::NT_union:
           {
-            AST_Structure *s = AST_Structure::narrow_from_decl (this);
+            AST_Structure *s = dynamic_cast<AST_Structure*> (this);
             this->contains_wstring_ = s->contains_wstring ();
             break;
           }
 
         case AST_Decl::NT_sequence:
           {
-            AST_Sequence *s = AST_Sequence::narrow_from_decl (this);
+            AST_Sequence *s = dynamic_cast<AST_Sequence*> (this);
             this->contains_wstring_ = s->base_type ()->contains_wstring ();
             break;
           }
@@ -1495,14 +1495,14 @@ AST_Decl::contains_wstring (void)
         case AST_Decl::NT_field:
         case AST_Decl::NT_union_branch:
           {
-            AST_Field *f = AST_Field::narrow_from_decl (this);
+            AST_Field *f = dynamic_cast<AST_Field*> (this);
             this->contains_wstring_ = f->field_type ()->contains_wstring ();
             break;
           }
 
         case AST_Decl::NT_typedef:
           {
-            AST_Typedef *td = AST_Typedef::narrow_from_decl (this);
+            AST_Typedef *td = dynamic_cast<AST_Typedef*> (this);
             this->contains_wstring_ =
               td->primitive_base_type ()->contains_wstring ();
             break;
@@ -1536,11 +1536,11 @@ AST_Decl::masking_checks (AST_Decl *mod)
       return true;
     }
 
-  AST_Module *me_mod = AST_Module::narrow_from_decl (this);
+  AST_Module *me_mod = dynamic_cast<AST_Module*> (this);
 
-  if (me_mod != 0)
+  if (me_mod != nullptr)
     {
-      AST_Module *po_mod = AST_Module::narrow_from_decl (mod);
+      AST_Module *po_mod = dynamic_cast<AST_Module*> (mod);
       if (po_mod)
         {
           while (!!(po_mod = po_mod->previous_opening ()))
@@ -1557,7 +1557,7 @@ AST_Decl::masking_checks (AST_Decl *mod)
 }
 
 bool
-AST_Decl::in_tmpl_mod_not_aliased (void) const
+AST_Decl::in_tmpl_mod_not_aliased () const
 {
   return this->in_tmpl_mod_not_aliased_;
 }
@@ -1568,11 +1568,6 @@ AST_Decl::in_tmpl_mod_not_aliased (bool val)
   this->in_tmpl_mod_not_aliased_ = val;
 }
 
-//Narrowing methods for AST_Decl.
-
-IMPL_NARROW_FROM_DECL(AST_Decl)
-
-
 void
 AST_Decl::annotation_appls (const AST_Annotation_Appls &annotations)
 {
diff --git a/TAO/TAO_IDL/ast/ast_emits.cpp b/TAO/TAO_IDL/ast/ast_emits.cpp
index 581b557ec9b..e77f67efde7 100644
--- a/TAO/TAO_IDL/ast/ast_emits.cpp
+++ b/TAO/TAO_IDL/ast/ast_emits.cpp
@@ -15,12 +15,12 @@ AST_Emits::AST_Emits (UTL_ScopedName *n,
 {
 }
 
-AST_Emits::~AST_Emits (void)
+AST_Emits::~AST_Emits ()
 {
 }
 
 AST_Type *
-AST_Emits::emits_type (void) const
+AST_Emits::emits_type () const
 {
   return this->field_type ();
 }
@@ -39,9 +39,7 @@ AST_Emits::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Emits::destroy (void)
+AST_Emits::destroy ()
 {
   this->AST_Field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_Emits)
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
index 6ad9afb3fc9..8ac617c213b 100644
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum.cpp
@@ -91,13 +91,13 @@ AST_Enum::AST_Enum (UTL_ScopedName *n,
   this->size_type (AST_Type::FIXED);
 }
 
-AST_Enum::~AST_Enum (void)
+AST_Enum::~AST_Enum ()
 {
 }
 
 // Return the member count.
 int
-AST_Enum::member_count (void)
+AST_Enum::member_count ()
 {
   if (this->member_count_ == -1)
     {
@@ -111,13 +111,13 @@ AST_Enum::member_count (void)
 UTL_ScopedName *
 AST_Enum::value_to_name (const unsigned long v)
 {
-  AST_EnumVal *item = 0;
-  AST_Decl *d = 0;
+  AST_EnumVal *item = nullptr;
+  AST_Decl *d = nullptr;
 
   for (UTL_ScopeActiveIterator i (this, IK_decls); !i.is_done (); i.next ())
     {
       d = i.item  ();
-      item = AST_EnumVal::narrow_from_decl (d);
+      item = dynamic_cast<AST_EnumVal*> (d);
 
       if (item->constant_value ()->ev ()->u.ulval == v)
         {
@@ -125,22 +125,22 @@ AST_Enum::value_to_name (const unsigned long v)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Look up an enumerator by the value of the supplied expression.
 AST_EnumVal *
 AST_Enum::lookup_by_value (const AST_Expression *v)
 {
-  AST_EnumVal *item = 0;
-  AST_Decl *d = 0;
+  AST_EnumVal *item = nullptr;
+  AST_Decl *d = nullptr;
 
   for (UTL_ScopeActiveIterator i (this, IK_decls);
        !i.is_done ();
        i.next ())
     {
       d = i.item ();
-      item = AST_EnumVal::narrow_from_decl (d);
+      item = dynamic_cast<AST_EnumVal*> (d);
       AST_Expression *cv = item->constant_value ();
 
       if (cv == v)
@@ -153,7 +153,7 @@ AST_Enum::lookup_by_value (const AST_Expression *v)
       // string name to look up the enum value with.
       UTL_ScopedName *v_n = const_cast<AST_Expression *> (v)->n ();
 
-      if (v_n != 0)
+      if (v_n != nullptr)
         {
           Identifier *cv_i = item->local_name ();
           Identifier *v_i = v_n->last_component ();
@@ -165,13 +165,13 @@ AST_Enum::lookup_by_value (const AST_Expression *v)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Compute the value to be assigned to the next enumerator. Bump the
 // counter.
 unsigned long
-AST_Enum::next_enum_val (void)
+AST_Enum::next_enum_val ()
 {
   unsigned long i = pd_enum_counter++;
 
@@ -202,11 +202,11 @@ munge_name_for_enumval (UTL_ScopedName *n,
       n = (UTL_ScopedName *) n->tail ();
     }
 
-  UTL_IdList *id = 0;
+  UTL_IdList *id = nullptr;
   ACE_NEW_RETURN (id,
                   UTL_IdList (last_component->copy (),
-                              0),
-                  0);
+                              nullptr),
+                  nullptr);
 
   n->set_tail (id);
 
@@ -215,7 +215,7 @@ munge_name_for_enumval (UTL_ScopedName *n,
 
 // Compute total number of members.
 int
-AST_Enum::compute_member_count (void)
+AST_Enum::compute_member_count ()
 {
   this->member_count_ = 0;
 
@@ -237,8 +237,8 @@ AST_Enum::compute_member_count (void)
 AST_EnumVal *
 AST_Enum::fe_add_enum_val (AST_EnumVal *t)
 {
-  AST_Decl *d = 0;
-  AST_EnumVal *t1 = 0;
+  AST_Decl *d = nullptr;
+  AST_EnumVal *t1 = nullptr;
 
   AST_Expression::AST_ExprValue *ev =
     t->constant_value ()->coerce (AST_Expression::EV_ulong);
@@ -247,7 +247,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
                                             t->name ());
 
   delete ev;
-  ev = 0;
+  ev = nullptr;
 
   UTL_ScopedName *sn =
     munge_name_for_enumval ((UTL_IdList *) t->name ()->copy (),
@@ -261,7 +261,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
   t1->set_name (sn);
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t)) != 0)
+  if ((d = this->lookup_for_add (t)) != nullptr)
     {
       if (!FE_Utils::can_be_redefined (d, t))
         {
@@ -269,7 +269,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
                                       t,
                                       this,
                                       d);
-          return 0;
+          return nullptr;
         }
 
       if (this->referenced (d, t->local_name ()))
@@ -278,14 +278,14 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
                                       t,
                                       this,
                                       d);
-          return 0;
+          return nullptr;
         }
 
       if (t->has_ancestor (d))
         {
           idl_global->err ()->redefinition_in_scope (t,
                                                      d);
-          return 0;
+          return nullptr;
         }
     }
 
@@ -297,10 +297,10 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
                            false,
                            t->local_name ());
 
-  if (t1 == 0)
+  if (t1 == nullptr)
     {
       // Prevent dereferencing null pointer in nested calls.
-      return 0;
+      return nullptr;
     }
 
   // Add it to enclosing scope.
@@ -315,7 +315,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
 void
 AST_Enum::dump (ACE_OSTREAM_TYPE &o)
 {
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
 
   if (this->is_local ())
     {
@@ -366,14 +366,8 @@ AST_Enum::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Enum::destroy (void)
+AST_Enum::destroy ()
 {
   this->UTL_Scope::destroy ();
   this->AST_ConcreteType::destroy ();
 }
-
-
-
-
-IMPL_NARROW_FROM_DECL(AST_Enum)
-IMPL_NARROW_FROM_SCOPE(AST_Enum)
diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp
index eef74bb560a..6c5c26d9661 100644
--- a/TAO/TAO_IDL/ast/ast_enum_val.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp
@@ -80,11 +80,11 @@ AST_EnumVal::AST_EnumVal (ACE_CDR::ULong v,
                   AST_Decl::NT_enum_val,
                   new AST_Expression (v),
                   n),
-    enum_parent_ (0)
+    enum_parent_ (nullptr)
 {
 }
 
-AST_EnumVal::~AST_EnumVal (void)
+AST_EnumVal::~AST_EnumVal ()
 {
 }
 
@@ -103,8 +103,6 @@ AST_EnumVal::ast_accept (ast_visitor *visitor)
   return visitor->visit_enum_val (this);
 }
 
-IMPL_NARROW_FROM_DECL(AST_EnumVal)
-
 AST_Enum *
 AST_EnumVal::enum_parent ()
 {
diff --git a/TAO/TAO_IDL/ast/ast_eventtype.cpp b/TAO/TAO_IDL/ast/ast_eventtype.cpp
index 107dc1fc1b8..16e4b5fba32 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype.cpp
@@ -49,12 +49,12 @@ AST_EventType::AST_EventType (UTL_ScopedName *n,
 {
 }
 
-AST_EventType::~AST_EventType (void)
+AST_EventType::~AST_EventType ()
 {
 }
 
 void
-AST_EventType::destroy (void)
+AST_EventType::destroy ()
 {
   this->AST_ValueType::destroy ();
 }
@@ -121,9 +121,3 @@ AST_EventType::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_eventtype (this);
 }
-
-  // Narrowing.
-
-IMPL_NARROW_FROM_DECL(AST_EventType)
-IMPL_NARROW_FROM_SCOPE(AST_EventType)
-
diff --git a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
index 41690400f88..276c28a5795 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
@@ -21,7 +21,7 @@ AST_EventTypeFwd::AST_EventTypeFwd (AST_Interface *dummy,
 {
 }
 
-AST_EventTypeFwd::~AST_EventTypeFwd (void)
+AST_EventTypeFwd::~AST_EventTypeFwd ()
 {
 }
 
@@ -48,10 +48,6 @@ AST_EventTypeFwd::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_EventTypeFwd::destroy (void)
+AST_EventTypeFwd::destroy ()
 {
 }
-
-
-
-IMPL_NARROW_FROM_DECL (AST_EventTypeFwd)
diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp
index f2dddf6946b..c7b023cbfb2 100644
--- a/TAO/TAO_IDL/ast/ast_exception.cpp
+++ b/TAO/TAO_IDL/ast/ast_exception.cpp
@@ -100,7 +100,7 @@ AST_Exception::AST_Exception (UTL_ScopedName *n,
 {
 }
 
-AST_Exception::~AST_Exception (void)
+AST_Exception::~AST_Exception ()
 {
 }
 
@@ -137,9 +137,9 @@ AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
       // Continue until each element is visited.
       for (UTL_ScopeActiveIterator i (this, IK_decls);!i.is_done ();i.next ())
         {
-          AST_Field *field = AST_Field::narrow_from_decl (i.item ());
+          AST_Field *field = dynamic_cast<AST_Field*> (i.item ());
 
-          if (field == 0)
+          if (field == nullptr)
             // This will be an enum value or other legitimate non-field
             // member - in any case, no recursion.
             {
@@ -150,11 +150,11 @@ AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
           if (type->node_type () == AST_Decl::NT_typedef)
             {
-              AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+              AST_Typedef *td = dynamic_cast<AST_Typedef*> (type);
               type = td->primitive_base_type ();
             }
 
-          if (type == 0)
+          if (type == nullptr)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("(%N:%l) AST_Exception::")
@@ -176,7 +176,7 @@ AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
   // Not in recursion.
   if (self_test)
     this->in_recursion_ = 0;
-  return 0; //this->in_recursion_;
+  return false; //this->in_recursion_;
 }
 
 // Dump this AST_Exception node to the ostream o.
@@ -198,10 +198,7 @@ AST_Exception::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Exception::destroy (void)
+AST_Exception::destroy ()
 {
   this->AST_Structure::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_Exception)
-IMPL_NARROW_FROM_SCOPE(AST_Exception)
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 34014a58cc2..4471118069d 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -87,25 +87,25 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // Helper function to fill out the details of where this expression
 // is defined.
 void
-AST_Expression::fill_definition_details (void)
+AST_Expression::fill_definition_details ()
 {
   this->pd_defined_in = idl_global->scopes ().depth () > 0
                           ? idl_global->scopes().top ()
-                          : 0 ;
+                          : nullptr ;
   this->pd_line = idl_global->lineno ();
   this->pd_file_name = idl_global->filename ();
-  enum_parent (0);
+  enum_parent (nullptr);
 }
 
 // An AST_Expression denoting a symbolic name.
 AST_Expression::AST_Expression (UTL_ScopedName *nm)
   : pd_ec (EC_symbol),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
     pd_n (nm),
-    tdef (0),
-    param_holder_ (0)
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -116,7 +116,7 @@ AST_Expression::AST_Expression (UTL_ScopedName *nm)
   if (d->node_type () == AST_Decl::NT_param_holder)
     {
       this->param_holder_ =
-        AST_Param_Holder::narrow_from_decl (d);
+        dynamic_cast<AST_Param_Holder*> (d);
     }
 }
 
@@ -124,12 +124,12 @@ AST_Expression::AST_Expression (UTL_ScopedName *nm)
 AST_Expression::AST_Expression (AST_Expression *v,
                                 ExprType t)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   AST_Param_Holder *ph = v->param_holder_;
   this->fill_definition_details ();
@@ -158,11 +158,11 @@ AST_Expression::AST_Expression (AST_Expression *v,
     }
   else
     {
-      if (ph == 0)
+      if (ph == nullptr)
         {
           this->pd_ev = v->coerce (t);
 
-          if (this->pd_ev == 0)
+          if (this->pd_ev == nullptr)
             {
               idl_global->err ()->coercion_error (v, t);
             }
@@ -177,7 +177,7 @@ AST_Expression::AST_Expression (AST_Expression *v,
               const_cast<FE_Utils::T_Param_Info *> (ph->info ()));
         }
 
-      if (0 != v->pd_n)
+      if (nullptr != v->pd_n)
         {
           this->pd_n =
             dynamic_cast<UTL_ScopedName *> (v->pd_n->copy ());
@@ -191,12 +191,12 @@ AST_Expression::AST_Expression (ExprComb c,
                                 AST_Expression *ev1,
                                 AST_Expression *ev2)
   : pd_ec (c),
-    pd_ev (0),
+    pd_ev (nullptr),
     pd_v1 (ev1),
     pd_v2 (ev2),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 }
@@ -204,12 +204,12 @@ AST_Expression::AST_Expression (ExprComb c,
 // An AST_Expression denoting a short integer.
 AST_Expression::AST_Expression (ACE_CDR::Short sv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -223,12 +223,12 @@ AST_Expression::AST_Expression (ACE_CDR::Short sv)
 // An AST_Expression denoting an unsigned short integer.
 AST_Expression::AST_Expression (ACE_CDR::UShort usv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -242,12 +242,12 @@ AST_Expression::AST_Expression (ACE_CDR::UShort usv)
 // An AST_Expression denoting a long integer.
 AST_Expression::AST_Expression (ACE_CDR::Long lv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -261,12 +261,12 @@ AST_Expression::AST_Expression (ACE_CDR::Long lv)
 // An AST_Expression denoting a long integer.
 AST_Expression::AST_Expression (ACE_CDR::LongLong llv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -280,12 +280,12 @@ AST_Expression::AST_Expression (ACE_CDR::LongLong llv)
 // An AST_Expression denoting a boolean.
 AST_Expression::AST_Expression (ACE_CDR::Boolean b)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -299,12 +299,12 @@ AST_Expression::AST_Expression (ACE_CDR::Boolean b)
 // An AST_Expression denoting an unsigned long integer.
 AST_Expression::AST_Expression (ACE_CDR::ULong ulv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -318,12 +318,12 @@ AST_Expression::AST_Expression (ACE_CDR::ULong ulv)
 // An AST_Expression denoting an unsigned long long integer.
 AST_Expression::AST_Expression (ACE_CDR::ULongLong ulv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -338,12 +338,12 @@ AST_Expression::AST_Expression (ACE_CDR::ULongLong ulv)
 AST_Expression::AST_Expression (ACE_CDR::ULong ulv,
                                 ExprType t)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -357,12 +357,12 @@ AST_Expression::AST_Expression (ACE_CDR::ULong ulv,
 // An AST_Expression denoting a 32-bit floating point number.
 AST_Expression::AST_Expression (ACE_CDR::Float fv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -376,12 +376,12 @@ AST_Expression::AST_Expression (ACE_CDR::Float fv)
 // An AST_Expression denoting a 64-bit floating point number.
 AST_Expression::AST_Expression (ACE_CDR::Double dv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -395,12 +395,12 @@ AST_Expression::AST_Expression (ACE_CDR::Double dv)
 // An AST_Expression denoting a character.
 AST_Expression::AST_Expression (ACE_CDR::Char cv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -414,12 +414,12 @@ AST_Expression::AST_Expression (ACE_CDR::Char cv)
 // An AST_Expression denoting a wide character.
 AST_Expression::AST_Expression (ACE_OutputCDR::from_wchar wcv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -433,12 +433,12 @@ AST_Expression::AST_Expression (ACE_OutputCDR::from_wchar wcv)
 // An AST_Expression denoting an octet (unsigned char).
 AST_Expression::AST_Expression (ACE_CDR::Octet ov)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -452,19 +452,19 @@ AST_Expression::AST_Expression (ACE_CDR::Octet ov)
 // An AST_Expression denoting a string (char * encapsulated as a String).
 AST_Expression::AST_Expression (UTL_String *sv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
   ACE_NEW (this->pd_ev,
            AST_ExprValue);
 
-  UTL_String *new_str = 0;
+  UTL_String *new_str = nullptr;
   ACE_NEW (new_str,
            UTL_String (sv, true));
 
@@ -475,12 +475,12 @@ AST_Expression::AST_Expression (UTL_String *sv)
 // An AST_Expression denoting a wide string.
 AST_Expression::AST_Expression (char *sv)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -493,12 +493,12 @@ AST_Expression::AST_Expression (char *sv)
 
 AST_Expression::AST_Expression (const ACE_CDR::Fixed &f)
   : pd_ec (EC_none),
-    pd_ev (0),
-    pd_v1 (0),
-    pd_v2 (0),
-    pd_n (0),
-    tdef (0),
-    param_holder_ (0)
+    pd_ev (nullptr),
+    pd_v1 (nullptr),
+    pd_v2 (nullptr),
+    pd_n (nullptr),
+    tdef (nullptr),
+    param_holder_ (nullptr)
 {
   this->fill_definition_details ();
 
@@ -509,12 +509,12 @@ AST_Expression::AST_Expression (const ACE_CDR::Fixed &f)
   this->pd_ev->u.fixedval = f;
 }
 
-AST_Expression::~AST_Expression (void)
+AST_Expression::~AST_Expression ()
 {
   destroy ();
 }
 
-AST_Expression::AST_ExprValue::AST_ExprValue (void)
+AST_Expression::AST_ExprValue::AST_ExprValue ()
 {
   this->u.ulval = 0UL;
   this->et = AST_Expression::EV_none;
@@ -528,9 +528,9 @@ static AST_Expression::AST_ExprValue *
 coerce_value (AST_Expression::AST_ExprValue *ev,
               AST_Expression::ExprType t)
 {
-  if (ev == 0)
+  if (ev == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   switch (t)
@@ -543,7 +543,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ushort:
           if (ev->u.usval > (unsigned short) ACE_INT16_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.sval = (short) ev->u.usval;
@@ -553,7 +553,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.lval > (long) ACE_INT16_MAX
               || ev->u.lval < (long) ACE_INT16_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.sval = (short) ev->u.lval;
@@ -562,7 +562,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulong:
           if (ev->u.ulval > (unsigned long) ACE_INT16_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.sval = (short) ev->u.ulval;
@@ -572,7 +572,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.llval > (ACE_CDR::LongLong) ACE_INT16_MAX
               || ev->u.llval < (ACE_CDR::LongLong) ACE_INT16_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.sval = (short) ev->u.llval;
@@ -581,7 +581,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if ((ev->u.ullval & ACE_INT16_MAX) != ev->u.ullval)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.sval = (short) ev->u.ullval;
@@ -595,7 +595,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_INT16_MAX
               || ev->u.fval < (float) ACE_INT16_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.sval = (short) ev->u.fval;
@@ -605,7 +605,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_INT16_MAX
               || ev->u.dval < (double) ACE_INT16_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.sval = (short) ev->u.dval;
@@ -618,7 +618,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_wchar:
           if (ev->u.wcval > (ACE_CDR::WChar) ACE_INT16_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.sval = (short) ev->u.wcval;
@@ -629,7 +629,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_short;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_ushort:
       switch (ev->et)
@@ -637,7 +637,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_short:
           if (ev->u.sval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.usval = (unsigned short) ev->u.sval;
@@ -649,7 +649,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.lval > (long) ACE_UINT16_MAX
               || ev->u.lval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.usval = (unsigned short) ev->u.lval;
@@ -658,7 +658,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulong:
           if (ev->u.ulval > (unsigned long) ACE_UINT16_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.usval = (unsigned short) ev->u.ulval;
@@ -668,7 +668,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.llval > (ACE_CDR::LongLong) ACE_UINT16_MAX
               || ev->u.llval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.usval = (unsigned short) ev->u.llval;
@@ -677,7 +677,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if ((ev->u.ullval & ACE_UINT16_MAX) != ev->u.ullval)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.usval = (unsigned short) ev->u.ullval;
@@ -691,7 +691,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval < 0.0
               || ev->u.fval > (float) ACE_UINT16_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.usval = (unsigned short) ev->u.fval;
@@ -701,7 +701,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval < 0.0
               || ev->u.dval > (double) ACE_UINT16_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.usval = (unsigned short) ev->u.dval;
@@ -710,7 +710,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_char:
           if ((signed char) ev->u.cval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.usval = (unsigned short) ev->u.cval;
@@ -725,7 +725,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ushort;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_long:
       switch (ev->et)
@@ -743,7 +743,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulong:
           if (ev->u.ulval > (unsigned long) ACE_INT32_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.lval = (long) ev->u.ulval;
@@ -753,7 +753,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.llval > (ACE_CDR::LongLong) ACE_INT32_MAX
               || ev->u.llval < (ACE_CDR::LongLong) ACE_INT32_MIN)
             {
-              return 0;
+              return nullptr;
             }
           ev->u.lval = (long) ev->u.llval;
           ev->et = AST_Expression::EV_long;
@@ -761,7 +761,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if ((ev->u.ullval & ACE_INT32_MAX) != ev->u.ullval)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.lval = (long) ev->u.ullval;
@@ -775,7 +775,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) LONG_MAX
               || ev->u.fval < (float) ACE_INT32_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.lval = (long) ev->u.fval;
@@ -785,7 +785,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) LONG_MAX
               || ev->u.dval < (double) ACE_INT32_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.lval = (long) ev->u.dval;
@@ -804,7 +804,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_long;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_ulong:
       switch (ev->et)
@@ -812,7 +812,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_short:
           if (ev->u.sval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ulval = (unsigned long) ev->u.sval;
@@ -825,7 +825,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_long:
           if (ev->u.lval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ulval = (unsigned long) ev->u.lval;
@@ -837,7 +837,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.llval > (ACE_CDR::LongLong) ACE_UINT32_MAX
               || ev->u.llval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ulval = (unsigned long) ev->u.llval;
@@ -846,7 +846,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if ((ev->u.ullval & ACE_UINT32_MAX) != ev->u.ullval)
             {
-              return 0;
+              return nullptr;
             }
           ev->u.ulval = (unsigned long) ev->u.ullval;
           ev->et = AST_Expression::EV_ulong;
@@ -859,7 +859,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval < 0.0
               || ev->u.fval > (float) ACE_UINT32_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ulval = (unsigned long) ev->u.fval;
@@ -869,7 +869,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval < 0.0
               || ev->u.dval > (double) ACE_UINT32_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ulval = (unsigned long) ev->u.dval;
@@ -878,7 +878,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_char:
           if ((signed char) ev->u.cval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ulval = (unsigned long) ev->u.cval;
@@ -893,7 +893,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ulong;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_longlong:
       switch (ev->et)
@@ -919,7 +919,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if (ev->u.ullval > ACE_INT64_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.llval =
@@ -934,7 +934,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_INT64_MAX
               || ev->u.fval < (float) ACE_INT64_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.llval = (ACE_CDR::LongLong) ev->u.fval;
@@ -944,7 +944,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_INT64_MAX
               || ev->u.dval < (double) ACE_INT64_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.llval = (ACE_CDR::LongLong) ev->u.dval;
@@ -963,7 +963,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_longlong;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_ulonglong:
       switch (ev->et)
@@ -971,7 +971,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_short:
           if (ev->u.sval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ullval =  ev->u.sval;
@@ -984,7 +984,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_long:
           if (ev->u.lval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ullval = ev->u.lval;
@@ -997,7 +997,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_longlong:
           if (ev->u.llval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ullval =
@@ -1014,7 +1014,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval < 0.0
               || ev->u.fval > (float) ACE_UINT64_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ullval = static_cast<ACE_UINT64> (ev->u.fval);
@@ -1025,7 +1025,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval < 0.0
               || ev->u.dval > (double) ACE_UINT64_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ullval = static_cast<ACE_UINT64> (ev->u.dval);
@@ -1035,7 +1035,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_char:
           if ((signed char) ev->u.cval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.ullval = ev->u.cval;
@@ -1050,7 +1050,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ulonglong;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_bool:
       switch (ev->et)
@@ -1102,7 +1102,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_bool;
           return ev;
         default:
-         return 0;
+         return nullptr;
         }
     case AST_Expression::EV_float:
       switch (ev->et)
@@ -1127,7 +1127,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.llval > FLT_MAX
               || ev->u.llval < -(ACE_FLT_MAX))
             {
-              return 0;
+              return nullptr;
             }
           ev->u.fval = (float) ev->u.llval;
           ev->et = AST_Expression::EV_float;
@@ -1146,7 +1146,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > ACE_FLT_MAX
               || ev->u.dval < -(ACE_FLT_MAX))
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.fval = (float) ev->u.dval;
@@ -1165,7 +1165,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_float;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_double:
       switch (ev->et)
@@ -1195,7 +1195,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           // conversions, so we are stuck with the signed 64-bit max value.
           if (ev->u.ullval > ACE_INT64_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.dval = (double) ((ACE_CDR::LongLong) ev->u.ullval);
@@ -1224,7 +1224,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_double;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_char:
       switch (ev->et)
@@ -1233,7 +1233,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.sval > (short) ACE_CHAR_MAX
               || ev->u.sval < (short) ACE_CHAR_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.sval;
@@ -1242,7 +1242,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ushort:
           if (ev->u.usval > (unsigned short) ACE_CHAR_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.usval;
@@ -1252,7 +1252,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.lval > (long) ACE_CHAR_MAX
               || ev->u.lval < (long) ACE_CHAR_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.lval;
@@ -1261,7 +1261,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulong:
           if (ev->u.ulval > (unsigned long) ACE_CHAR_MAX)
             {
-                    return 0;
+                    return nullptr;
             }
 
           ev->u.cval = (char) ev->u.ulval;
@@ -1271,7 +1271,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.llval > (ACE_CDR::LongLong) ACE_CHAR_MAX
               || ev->u.llval < (ACE_CDR::LongLong) ACE_CHAR_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.llval;
@@ -1280,7 +1280,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
        case AST_Expression::EV_ulonglong:
           if (( ev->u.ullval & ACE_CHAR_MAX) != ev->u.ullval)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.ullval;
@@ -1294,7 +1294,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_CHAR_MAX
               || ev->u.fval < (float) ACE_CHAR_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.fval;
@@ -1304,7 +1304,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_CHAR_MAX
               || ev->u.dval < (double) ACE_CHAR_MIN)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.dval;
@@ -1315,7 +1315,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_wchar:
           if (ev->u.wcval > (ACE_CDR::WChar) ACE_CHAR_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.wcval;
@@ -1324,14 +1324,14 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_octet:
           if (ev->u.oval > (unsigned char) ACE_CHAR_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.cval = (char) ev->u.oval;
           ev->et = AST_Expression::EV_char;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_wchar:
       switch (ev->et)
@@ -1339,7 +1339,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_short:
           if (ev->u.sval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.sval;
@@ -1353,7 +1353,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.lval < 0
               || ev->u.lval > ACE_WCHAR_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.lval;
@@ -1362,7 +1362,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulong:
           if (ev->u.ulval > ACE_WCHAR_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.ulval;
@@ -1372,7 +1372,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.llval > (ACE_CDR::LongLong) ACE_WCHAR_MAX
               || ev->u.llval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.llval;
@@ -1381,7 +1381,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if ((ev->u.ullval & ACE_WCHAR_MAX) != ev->u.ullval )
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.ullval;
@@ -1395,7 +1395,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_WCHAR_MAX
               || ev->u.fval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.fval;
@@ -1405,7 +1405,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_WCHAR_MAX
               || ev->u.dval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.dval;
@@ -1414,7 +1414,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_char:
           if ((signed char) ev->u.cval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.cval;
@@ -1427,7 +1427,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_wchar;
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_octet:
       switch (ev->et)
@@ -1436,7 +1436,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.sval < 0
               || ev->u.sval > (short) ACE_OCTET_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.sval;
@@ -1445,7 +1445,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ushort:
           if (ev->u.usval > (unsigned short) ACE_OCTET_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.usval;
@@ -1455,7 +1455,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.lval < 0
               || ev->u.lval > (long) ACE_OCTET_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.lval;
@@ -1464,7 +1464,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulong:
           if (ev->u.ulval > (unsigned long) ACE_OCTET_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.ulval;
@@ -1474,7 +1474,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.llval < 0
               || ev->u.llval > (ACE_CDR::LongLong) ACE_OCTET_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.llval;
@@ -1483,7 +1483,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if ((ev->u.ullval & ACE_OCTET_MAX) != ev->u.ullval)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.ullval;
@@ -1497,7 +1497,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval < 0.0
               || ev->u.fval > (float) ACE_OCTET_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.fval;
@@ -1507,7 +1507,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval < 0.0
               || ev->u.dval > (double) ACE_OCTET_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.dval;
@@ -1516,7 +1516,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_char:
           if ((signed char) ev->u.cval < 0)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.cval;
@@ -1525,7 +1525,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_wchar:
           if (ev->u.wcval > (ACE_CDR::WChar) ACE_OCTET_MAX)
             {
-              return 0;
+              return nullptr;
             }
 
           ev->u.oval = (unsigned char) ev->u.wcval;
@@ -1534,7 +1534,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_octet:
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_enum:
       switch (ev->et)
@@ -1543,7 +1543,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulong:
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_void:
       switch (ev->et)
@@ -1551,17 +1551,17 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_void:
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_none:
-      return 0;
+      return nullptr;
     case AST_Expression::EV_string:
       switch (ev->et)
         {
         case AST_Expression::EV_string:
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     case AST_Expression::EV_fixed:
       switch (ev->et)
@@ -1569,13 +1569,13 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_fixed:
           return ev;
         default:
-          return 0;
+          return nullptr;
         }
     default:
-      return 0;
+      return nullptr;
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Integer literals may not be assigned to floating point constants,
@@ -1604,9 +1604,9 @@ incompatible_types (AST_Expression::ExprType t1,
         case AST_Expression::EV_ulonglong:
         case AST_Expression::EV_octet:
         case AST_Expression::EV_bool:
-          return 0;
+          return false;
         default:
-          return 1;
+          return true;
       }
     case AST_Expression::EV_float:
     case AST_Expression::EV_double:
@@ -1616,9 +1616,9 @@ incompatible_types (AST_Expression::ExprType t1,
         case AST_Expression::EV_float:
         case AST_Expression::EV_double:
         case AST_Expression::EV_longdouble:
-          return 0;
+          return false;
         default:
-          return 1;
+          return true;
       }
     case AST_Expression::EV_fixed:
       return t2 != AST_Expression::EV_fixed;
@@ -1632,7 +1632,7 @@ incompatible_types (AST_Expression::ExprType t1,
     case AST_Expression::EV_void:
     case AST_Expression::EV_none:
     default:
-      return 0;
+      return false;
   }
 }
 
@@ -1648,17 +1648,17 @@ static AST_Expression::AST_ExprValue *
 eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
 {
   // Make a copy to simplify the memory management logic.
-  AST_Expression::AST_ExprValue *newval = 0;
+  AST_Expression::AST_ExprValue *newval = nullptr;
   ACE_NEW_RETURN (newval,
                   AST_Expression::AST_ExprValue,
-                  0);
+                  nullptr);
 
-  if (ev != 0)
+  if (ev != nullptr)
     {
       *newval = *ev;
     }
 
-  AST_Expression::AST_ExprValue *retval = 0;
+  AST_Expression::AST_ExprValue *retval = nullptr;
 
   switch (ek)
   {
@@ -1706,7 +1706,7 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
   if (retval != newval)
     {
       delete newval;
-      newval = 0;
+      newval = nullptr;
     }
 
   return retval;
@@ -1728,24 +1728,24 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
 AST_Expression::AST_ExprValue *
 AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
 {
-  AST_ExprValue *retval = 0;
+  AST_ExprValue *retval = nullptr;
 
-  if (this->pd_v1 == 0 || this->pd_v2 == 0)
+  if (this->pd_v1 == nullptr || this->pd_v2 == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
   this->pd_v2->set_ev (this->pd_v2->eval_internal (ek));
 
-  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0)
+  if (this->pd_v1->ev () == nullptr || this->pd_v2->ev () == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   ACE_NEW_RETURN (retval,
                   AST_ExprValue,
-                  0);
+                  nullptr);
 
   if (ek == EK_ulonglong)
     {
@@ -1771,8 +1771,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
           if (this->pd_v2->ev ()->u.ullval == 0)
             {
               delete retval;
-              retval = 0;
-              return 0;
+              retval = nullptr;
+              return nullptr;
             }
 
           retval->u.ullval =
@@ -1780,8 +1780,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
     }
   else if (ek == EK_longlong)
@@ -1808,8 +1808,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
           if (this->pd_v2->ev ()->u.llval == 0)
             {
               delete retval;
-              retval = 0;
-              return 0;
+              retval = nullptr;
+              return nullptr;
             }
 
           retval->u.llval =
@@ -1817,8 +1817,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
     }
   else if (ek == EK_fixed_point)
@@ -1845,8 +1845,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
           if (!this->pd_v2->ev ()->u.fixedval)
             {
               delete retval;
-              retval = 0;
-              return 0;
+              retval = nullptr;
+              return nullptr;
             }
 
           retval->u.fixedval =
@@ -1854,8 +1854,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
     }
   else
@@ -1882,8 +1882,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
           if (ACE::is_equal (this->pd_v2->ev ()->u.dval, 0.0))
             {
               delete retval;
-              retval = 0;
-              return 0;
+              retval = nullptr;
+              return nullptr;
             }
 
           retval->u.dval =
@@ -1891,8 +1891,8 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
     }
 
@@ -1904,24 +1904,24 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
 AST_Expression::AST_ExprValue *
 AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
 {
-  AST_ExprValue *retval = 0;
+  AST_ExprValue *retval = nullptr;
 
-  if (this->pd_v1 == 0 || this->pd_v2 == 0)
+  if (this->pd_v1 == nullptr || this->pd_v2 == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
   this->pd_v2->set_ev (this->pd_v2->eval_internal (ek));
 
-  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0)
+  if (this->pd_v1->ev () == nullptr || this->pd_v2->ev () == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   ACE_NEW_RETURN (retval,
                   AST_ExprValue,
-                  0);
+                  nullptr);
 
   if (ek == EK_ulonglong)
     {
@@ -1932,8 +1932,8 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
       if (this->pd_v2->ev ()->u.ullval == 0)
         {
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
 
       retval->u.ullval =
@@ -1948,8 +1948,8 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
       if (this->pd_v2->ev ()->u.llval == 0)
         {
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
 
       retval->u.llval =
@@ -1965,8 +1965,8 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
       if (this->pd_v2->ev ()->u.ulval == 0)
         {
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
 
       retval->u.ulval =
@@ -1981,8 +1981,8 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
       if (this->pd_v2->ev ()->u.lval == 0)
         {
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
 
       retval->u.lval =
@@ -1991,8 +1991,8 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
   else
     {
       delete retval;
-      retval = 0;
-      return 0;
+      retval = nullptr;
+      return nullptr;
     }
 
   return retval;
@@ -2004,24 +2004,24 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
 AST_Expression::AST_ExprValue *
 AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
 {
-  AST_Expression::AST_ExprValue *retval = 0;
+  AST_Expression::AST_ExprValue *retval = nullptr;
 
-  if (this->pd_v1 == 0 || this->pd_v2 == 0)
+  if (this->pd_v1 == nullptr || this->pd_v2 == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
   this->pd_v2->set_ev (this->pd_v2->eval_internal (ek));
 
-  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0 )
+  if (this->pd_v1->ev () == nullptr || this->pd_v2->ev () == nullptr )
     {
-      return 0;
+      return nullptr;
     }
 
   ACE_NEW_RETURN (retval,
                   AST_ExprValue,
-                  0);
+                  nullptr);
 
   switch (ek)
   {
@@ -2055,8 +2055,8 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
     }
 
@@ -2091,8 +2091,8 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
     }
 
@@ -2127,8 +2127,8 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
     }
 
@@ -2163,8 +2163,8 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
     }
 
@@ -2199,8 +2199,8 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
     }
 
@@ -2235,8 +2235,8 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
     }
 
@@ -2271,8 +2271,8 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
     }
 
@@ -2316,16 +2316,16 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
     }
 
     break;
   default:
     delete retval;
-    retval = 0;
-    return 0;
+    retval = nullptr;
+    return nullptr;
   }
 
   return retval;
@@ -2337,28 +2337,28 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
 AST_Expression::AST_ExprValue *
 AST_Expression::eval_un_op (AST_Expression::EvalKind ek)
 {
-  AST_ExprValue *retval = 0;
+  AST_ExprValue *retval = nullptr;
 
-  if (this->pd_ev != 0)
+  if (this->pd_ev != nullptr)
     {
       return this->pd_ev;
     }
 
-  if (this->pd_v1 == 0)
+  if (this->pd_v1 == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
 
-  if (this->pd_v1->ev () == 0)
+  if (this->pd_v1->ev () == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   ACE_NEW_RETURN (retval,
                   AST_ExprValue,
-                  0);
+                  nullptr);
 
   if (this->pd_v1->ev ()->et == EV_fixed)
     {
@@ -2373,7 +2373,7 @@ AST_Expression::eval_un_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          return 0;
+          return nullptr;
         }
       return retval;
     }
@@ -2385,11 +2385,11 @@ AST_Expression::eval_un_op (AST_Expression::EvalKind ek)
     case EC_u_plus:
       this->pd_v1->set_ev (this->pd_v1->coerce (EV_double));
 
-      if (this->pd_v1->ev () == 0)
+      if (this->pd_v1->ev () == nullptr)
         {
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
 
       retval->u.dval = this->pd_v1->ev ()->u.dval;
@@ -2397,21 +2397,21 @@ AST_Expression::eval_un_op (AST_Expression::EvalKind ek)
     case EC_u_minus:
       this->pd_v1->set_ev (this->pd_v1->coerce (EV_double));
 
-      if (this->pd_v1->ev () == 0)
+      if (this->pd_v1->ev () == nullptr)
         {
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
 
       retval->u.dval = -(this->pd_v1->ev ()->u.dval);
       break;
     case EC_bit_neg:
-      if (this->pd_v1->ev () == 0)
+      if (this->pd_v1->ev () == nullptr)
         {
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
         }
 
       switch (this->pd_v1->ev ()->et)
@@ -2446,15 +2446,15 @@ AST_Expression::eval_un_op (AST_Expression::EvalKind ek)
           break;
         default:
           delete retval;
-          retval = 0;
-          return 0;
+          retval = nullptr;
+          return nullptr;
       }
 
       break;
     default:
       delete retval;
-      retval = 0;
-      return 0;
+      retval = nullptr;
+      return nullptr;
   }
 
   return retval;
@@ -2465,15 +2465,15 @@ AST_Expression::eval_un_op (AST_Expression::EvalKind ek)
 AST_Expression::AST_ExprValue *
 AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
 {
-  UTL_Scope     *s = 0;
-  AST_Decl *d = 0;
-  AST_Constant *c = 0;
+  UTL_Scope     *s = nullptr;
+  AST_Decl *d = nullptr;
+  AST_Constant *c = nullptr;
 
   // Is there a symbol stored?
-  if (this->pd_n == 0)
+  if (this->pd_n == nullptr)
     {
       idl_global->err ()->eval_error  (this);
-      return 0;
+      return nullptr;
     }
 
   // Get current scope for lookup.
@@ -2482,28 +2482,28 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
       s = idl_global->scopes ().top_non_null ();
     }
 
-  if (s == 0)
+  if (s == nullptr)
     {
       idl_global->err ()->lookup_error (this->pd_n);
-      return 0;
+      return nullptr;
     }
 
   // If we are a template parameter placeholder, just skip the
   // rest - nothing needs to be evaluated until instantiation
   // time.
-  if (this->param_holder_ != 0)
+  if (this->param_holder_ != nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   // Do lookup.
   d = s->lookup_by_name (this->pd_n,
                          true);
 
-  if (d == 0)
+  if (d == nullptr)
     {
       idl_global->err ()->lookup_error (this->pd_n);
-      return 0;
+      return nullptr;
     }
 
   // Is it a constant?
@@ -2512,21 +2512,21 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
     {
       idl_global->err ()->constant_expected (this->pd_n,
                                              d);
-      return 0;
+      return nullptr;
     }
 
   if (d->node_type () == AST_Decl::NT_enum_val)
     {
-      AST_EnumVal *enumval = AST_EnumVal::narrow_from_decl (d);
+      AST_EnumVal *enumval = dynamic_cast<AST_EnumVal*> (d);
       enum_parent (enumval->enum_parent ());
     }
 
   // OK, now evaluate the constant we just got, to produce its value.
-  c = AST_Constant::narrow_from_decl (d);
+  c = dynamic_cast<AST_Constant*> (d);
 
-  if (c == 0)
+  if (c == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   return c->constant_value ()->eval_internal (ek);
@@ -2535,20 +2535,20 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
 bool
 AST_Expression::type_mismatch (AST_Expression::ExprType t)
 {
-  if (this->pd_ev != 0)
+  if (this->pd_ev != nullptr)
     {
       return incompatible_types (this->pd_ev->et, t);
     }
 
-  bool v1_mismatch = 0;
-  bool v2_mismatch = 0;
+  bool v1_mismatch = false;
+  bool v2_mismatch = false;
 
-  if (this->pd_v1 != 0)
+  if (this->pd_v1 != nullptr)
     {
       v1_mismatch = this->pd_v1->type_mismatch (t);
     }
 
-  if (this->pd_v2 != 0)
+  if (this->pd_v2 != nullptr)
     {
       v2_mismatch = this->pd_v2->type_mismatch (t);
     }
@@ -2563,26 +2563,26 @@ AST_Expression::AST_ExprValue *
 AST_Expression::check_and_coerce (AST_Expression::ExprType t,
                                   AST_Decl *d)
 {
-  if (d != 0)
+  if (d != nullptr)
     {
       AST_Decl *enum_val =
         idl_global->scopes ().top_non_null ()->lookup_by_name (this->pd_n,
-                                                               1);
+                                                               true);
 
-      if (enum_val != 0)
+      if (enum_val != nullptr)
         {
           AST_Decl *enum_decl = ScopeAsDecl (enum_val->defined_in ());
 
           if (d->node_type () == AST_Decl::NT_typedef)
             {
-              AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+              AST_Typedef *td = dynamic_cast<AST_Typedef*> (d);
               d = td->primitive_base_type ();
             }
 
           if (d != enum_decl)
             {
               idl_global->err ()->incompatible_type_error (this);
-              return 0;
+              return nullptr;
             }
         }
     }
@@ -2590,10 +2590,10 @@ AST_Expression::check_and_coerce (AST_Expression::ExprType t,
   if (this->type_mismatch (t))
     {
       idl_global->err ()->incompatible_type_error (this);
-      return 0;
+      return nullptr;
     }
 
-  if (d != 0 && d->node_type () == AST_Decl::NT_typedef)
+  if (d != nullptr && d->node_type () == AST_Decl::NT_typedef)
     {
       this->tdef = d;
     }
@@ -2607,7 +2607,7 @@ AST_Expression::check_and_coerce (AST_Expression::ExprType t,
 AST_Expression::AST_ExprValue *
 AST_Expression::coerce (AST_Expression::ExprType t)
 {
-  AST_ExprValue *tmp = 0;
+  AST_ExprValue *tmp = nullptr;
 
   // First, evaluate it, then try to coerce result type.
   // If already evaluated, return the result.
@@ -2645,9 +2645,9 @@ AST_Expression::coerce (AST_Expression::ExprType t)
       break;
   }
 
-  if (tmp == 0)
+  if (tmp == nullptr)
     {
-      return 0;
+      return nullptr;
     }
   else
     {
@@ -2656,10 +2656,10 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     }
 
   // Create a copy to contain coercion result.
-  AST_ExprValue *copy = 0;
+  AST_ExprValue *copy = nullptr;
   ACE_NEW_RETURN (copy,
                   AST_ExprValue,
-                  0);
+                  nullptr);
 
   copy->et = this->pd_ev->et;
 
@@ -2669,8 +2669,8 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     case EV_void:
     case EV_none:
       delete copy;
-      copy = 0;
-      return 0;
+      copy = nullptr;
+      return nullptr;
     case EV_enum:
       copy->u.ulval = this->pd_ev->u.ulval;
       break;
@@ -2731,14 +2731,14 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     {
       AST_ExprValue *ev = coerce_value (copy, t);
 
-      if (ev == 0)
+      if (ev == nullptr)
         {
           // coerce_value() will either return 'copy' or
           // return 0 without freeing 'copy'. It's
           // deleted here instead of putting a zillion
           // delete statments inside coerce_value().
           delete copy;
-          copy = 0;
+          copy = nullptr;
         }
 
       return ev;
@@ -2750,7 +2750,7 @@ AST_Expression::AST_ExprValue *
 AST_Expression::eval_internal (AST_Expression::EvalKind ek)
 {
   // Already evaluated?
-  if (this->pd_ev != 0)
+  if (this->pd_ev != nullptr)
     {
       return eval_kind (this->pd_ev,
                         ek);
@@ -2789,10 +2789,10 @@ AST_Expression::eval_internal (AST_Expression::EvalKind ek)
       return eval_kind (this->pd_ev,
                         ek);
     case EC_none:
-      return 0;
+      return nullptr;
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Public operations.
@@ -2809,7 +2809,7 @@ AST_Expression::evaluate (EvalKind ek)
   // args. At this point, we have knowledge that we must be an
   // enum constant, so we set the expression type here, rather
   // than at the point of creation.
-  if (ek == AST_Expression::EK_const && this->pd_n != 0)
+  if (ek == AST_Expression::EK_const && this->pd_n != nullptr)
     {
       this->pd_ev->et = AST_Expression::EV_enum;
     }
@@ -2827,7 +2827,7 @@ AST_Expression::operator== (AST_Expression *vc)
   this->evaluate (EK_const);
   vc->evaluate (EK_const);
 
-  if (pd_ev == 0 || vc->ev() == 0)
+  if (pd_ev == nullptr || vc->ev() == nullptr)
     {
       return false;
     }
@@ -2894,7 +2894,7 @@ AST_Expression::compare (AST_Expression *vc)
   this->evaluate (EK_const);
   vc->evaluate (EK_const);
 
-  if (this->pd_ev == 0 || vc->ev () == 0)
+  if (this->pd_ev == nullptr || vc->ev () == nullptr)
     {
       return false;
     }
@@ -2927,11 +2927,11 @@ AST_Expression::compare (AST_Expression *vc)
     case EV_bool:
       return this->pd_ev->u.lval == vc->ev ()->u.lval;
     case EV_string:
-      if (this->pd_ev->u.strval == 0)
+      if (this->pd_ev->u.strval == nullptr)
         {
-          return vc->ev ()->u.strval == 0;
+          return vc->ev ()->u.strval == nullptr;
         }
-      else if (vc->ev ()->u.strval == 0)
+      else if (vc->ev ()->u.strval == nullptr)
         {
           return false;
         }
@@ -2960,13 +2960,13 @@ AST_Expression::compare (AST_Expression *vc)
 }
 
 AST_Decl *
-AST_Expression::get_tdef (void) const
+AST_Expression::get_tdef () const
 {
   return this->tdef;
 }
 
 AST_Param_Holder *
-AST_Expression::param_holder (void) const
+AST_Expression::param_holder () const
 {
   return this->param_holder_;
 }
@@ -2980,14 +2980,14 @@ dump_binary_expr (ACE_OSTREAM_TYPE &o,
                   AST_Expression *n1,
                   AST_Expression *n2)
 {
-  if (n1 != 0)
+  if (n1 != nullptr)
     {
       n1->dump (o);
     }
 
   o << " " << s << " ";
 
-  if (n2 != 0)
+  if (n2 != nullptr)
     {
       n2->dump (o);
     }
@@ -3040,7 +3040,7 @@ dump_expr_val (ACE_OSTREAM_TYPE &o, AST_Expression::AST_ExprValue *ev)
       o << (ev->u.bval == true ? "TRUE" : "FALSE");
       break;
     case AST_Expression::EV_string:
-      if (ev->u.strval != 0)
+      if (ev->u.strval != nullptr)
         {
           ev->u.strval->dump (o);
         }
@@ -3069,7 +3069,7 @@ void
 AST_Expression::dump (ACE_OSTREAM_TYPE &o)
 {
   // See if it was a constant or was evaluated already.
-  if (this->pd_ev != 0)
+  if (this->pd_ev != nullptr)
     {
       dump_expr_val (o, this->pd_ev);
       return;
@@ -3178,58 +3178,58 @@ AST_Expression::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Expression::destroy (void)
+AST_Expression::destroy ()
 {
-  if (0 != this->pd_ev)
+  if (nullptr != this->pd_ev)
     {
       if (EV_string == this->pd_ev->et)
         {
           this->pd_ev->u.strval->destroy ();
           delete this->pd_ev->u.strval;
-          this->pd_ev->u.strval = 0;
+          this->pd_ev->u.strval = nullptr;
         }
       else if (EV_wstring == this->pd_ev->et)
         {
           ACE::strdelete (this->pd_ev->u.wstrval);
-          this->pd_ev->u.wstrval = 0;
+          this->pd_ev->u.wstrval = nullptr;
         }
     }
   delete this->pd_ev;
-  this->pd_ev = 0;
+  this->pd_ev = nullptr;
 
-  if (this->pd_v1 != 0)
+  if (this->pd_v1 != nullptr)
     {
       this->pd_v1->destroy ();
     }
   delete this->pd_v1;
-  this->pd_v1 = 0;
+  this->pd_v1 = nullptr;
 
-  if (this->pd_v2 != 0)
+  if (this->pd_v2 != nullptr)
     {
       this->pd_v2->destroy ();
     }
   delete this->pd_v2;
-  this->pd_v2 = 0;
+  this->pd_v2 = nullptr;
 
-  if (this->pd_n != 0)
+  if (this->pd_n != nullptr)
     {
       this->pd_n->destroy ();
     }
   delete this->pd_n;
-  this->pd_n = 0;
+  this->pd_n = nullptr;
 
-  if (this->param_holder_ != 0)
+  if (this->param_holder_ != nullptr)
     {
       this->param_holder_->destroy ();
       delete this->param_holder_;
-      this->param_holder_ = 0;
+      this->param_holder_ = nullptr;
     }
 }
 
 // Data accessors.
 
 UTL_Scope *
-AST_Expression::defined_in (void)
+AST_Expression::defined_in ()
 {
   return this->pd_defined_in;
 }
@@ -3241,7 +3241,7 @@ AST_Expression::set_defined_in (UTL_Scope *d)
 }
 
 long
-AST_Expression::line (void)
+AST_Expression::line ()
 {
   return this->pd_line;
 }
@@ -3253,7 +3253,7 @@ AST_Expression::set_line (long l)
 }
 
 UTL_String *
-AST_Expression::file_name (void)
+AST_Expression::file_name ()
 {
   return this->pd_file_name;
 }
@@ -3265,13 +3265,13 @@ AST_Expression::set_file_name (UTL_String *f)
 }
 
 AST_Expression::ExprComb
-AST_Expression::ec (void)
+AST_Expression::ec ()
 {
   return this->pd_ec;
 }
 
 AST_Expression::AST_ExprValue   *
-AST_Expression::ev (void)
+AST_Expression::ev ()
 {
   return this->pd_ev;
 }
@@ -3284,7 +3284,7 @@ AST_Expression::set_ev (AST_Expression::AST_ExprValue *new_ev)
 }
 
 AST_Expression *
-AST_Expression::v1 (void)
+AST_Expression::v1 ()
 {
   return this->pd_v1;
 }
@@ -3296,7 +3296,7 @@ AST_Expression::set_v1 (AST_Expression *e)
 }
 
 AST_Expression *
-AST_Expression::v2 (void)
+AST_Expression::v2 ()
 {
   return this->pd_v2;
 }
@@ -3308,7 +3308,7 @@ AST_Expression::set_v2 (AST_Expression *e)
 }
 
 UTL_ScopedName *
-AST_Expression::n (void)
+AST_Expression::n ()
 {
   return this->pd_n;
 }
diff --git a/TAO/TAO_IDL/ast/ast_extended_port.cpp b/TAO/TAO_IDL/ast/ast_extended_port.cpp
index 66a755dcb0e..9ccf53c71c7 100644
--- a/TAO/TAO_IDL/ast/ast_extended_port.cpp
+++ b/TAO/TAO_IDL/ast/ast_extended_port.cpp
@@ -21,18 +21,18 @@ AST_Extended_Port::AST_Extended_Port (
 {
 }
 
-AST_Extended_Port::~AST_Extended_Port (void)
+AST_Extended_Port::~AST_Extended_Port ()
 {
 }
 
 AST_PortType *
-AST_Extended_Port::port_type (void) const
+AST_Extended_Port::port_type () const
 {
-  return AST_PortType::narrow_from_decl (this->field_type ());
+  return dynamic_cast<AST_PortType*> (this->field_type ());
 }
 
 void
-AST_Extended_Port::destroy (void)
+AST_Extended_Port::destroy ()
 {
   this->AST_Field::destroy ();
 }
@@ -50,6 +50,3 @@ AST_Extended_Port::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_extended_port (this);
 }
-
-IMPL_NARROW_FROM_DECL (AST_Extended_Port)
-
diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp
index 15b779fbd10..de340aaaea0 100644
--- a/TAO/TAO_IDL/ast/ast_factory.cpp
+++ b/TAO/TAO_IDL/ast/ast_factory.cpp
@@ -86,34 +86,34 @@ AST_Factory::AST_Factory (UTL_ScopedName *n)
     AST_Decl (AST_Decl::NT_factory,
               n),
     UTL_Scope (AST_Decl::NT_factory),
-    pd_exceptions (0),
+    pd_exceptions (nullptr),
     pd_n_exceptions (0),
     argument_count_ (-1),
     has_native_ (0)
 {
 }
 
-AST_Factory::~AST_Factory (void)
+AST_Factory::~AST_Factory ()
 {
 }
 
 // Public operations.
 
 UTL_ExceptList *
-AST_Factory::exceptions (void)
+AST_Factory::exceptions ()
 {
   return this->pd_exceptions;
 }
 
 int
-AST_Factory::n_exceptions (void)
+AST_Factory::n_exceptions ()
 {
   return this->pd_n_exceptions;
 }
 
 // Return the member count.
 int
-AST_Factory::argument_count (void)
+AST_Factory::argument_count ()
 {
   this->compute_argument_attr ();
 
@@ -122,7 +122,7 @@ AST_Factory::argument_count (void)
 
 // Return if any argument or the return type is a <native> type.
 int
-AST_Factory::has_native (void)
+AST_Factory::has_native ()
 {
   this->compute_argument_attr ();
 
@@ -130,12 +130,12 @@ AST_Factory::has_native (void)
 }
 
 void
-AST_Factory::destroy (void)
+AST_Factory::destroy ()
 {
-  if (0 != this->pd_exceptions)
+  if (nullptr != this->pd_exceptions)
     {
       this->pd_exceptions->destroy ();
-      this->pd_exceptions = 0;
+      this->pd_exceptions = nullptr;
     }
 
   this->AST_Decl::destroy ();
@@ -145,7 +145,7 @@ AST_Factory::destroy (void)
 UTL_ExceptList *
 AST_Factory::be_add_exceptions (UTL_ExceptList *t)
 {
-  if (this->pd_exceptions != 0)
+  if (this->pd_exceptions != nullptr)
     {
       idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                   this);
@@ -153,7 +153,7 @@ AST_Factory::be_add_exceptions (UTL_ExceptList *t)
   else
     {
       this->pd_exceptions = t;
-      this->pd_n_exceptions = (t == 0 ? 0 : t->length ());
+      this->pd_n_exceptions = (t == nullptr ? 0 : t->length ());
     }
 
   return this->pd_exceptions;
@@ -163,16 +163,16 @@ AST_Factory::be_add_exceptions (UTL_ExceptList *t)
 
 // Compute total number of members.
 int
-AST_Factory::compute_argument_attr (void)
+AST_Factory::compute_argument_attr ()
 {
   if (this->argument_count_ != -1)
     {
       return 0;
     }
 
-  AST_Decl *d = 0;
-  AST_Type *type = 0;
-  AST_Argument *arg = 0;
+  AST_Decl *d = nullptr;
+  AST_Type *type = nullptr;
+  AST_Argument *arg = nullptr;
 
   this->argument_count_ = 0;
 
@@ -190,9 +190,9 @@ AST_Factory::compute_argument_attr (void)
             {
               this->argument_count_++;
 
-              arg = AST_Argument::narrow_from_decl (d);
+              arg = dynamic_cast<AST_Argument*> (d);
 
-              type = AST_Type::narrow_from_decl (arg->field_type ());
+              type = dynamic_cast<AST_Type*> (arg->field_type ());
 
               if (type->node_type () == AST_Decl::NT_native)
                 {
@@ -208,19 +208,17 @@ AST_Factory::compute_argument_attr (void)
 AST_Argument *
 AST_Factory::fe_add_argument (AST_Argument *t)
 {
-  return
-    AST_Argument::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  return dynamic_cast<AST_Argument*> (this->fe_add_ref_decl (t));
 }
 
 UTL_NameList *
 AST_Factory::fe_add_exceptions (UTL_NameList *t)
 {
-  UTL_ScopedName *nl_n = 0;
-  AST_Type *fe = 0;
-  AST_Decl *d = 0;
+  UTL_ScopedName *nl_n = nullptr;
+  AST_Type *fe = nullptr;
+  AST_Decl *d = nullptr;
 
-  this->pd_exceptions = 0;
+  this->pd_exceptions = nullptr;
 
   for (UTL_NamelistActiveIterator nl_i (t);
        !nl_i.is_done ();
@@ -230,10 +228,10 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
 
       d = this->defined_in ()->lookup_by_name (nl_n, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (nl_n);
-          return 0;
+          return nullptr;
         }
 
       AST_Decl::NodeType nt = d->node_type ();
@@ -243,17 +241,17 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
         {
           idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                       this);
-          return 0;
+          return nullptr;
         }
 
-      fe = AST_Type::narrow_from_decl (d);
+      fe = dynamic_cast<AST_Type*> (d);
 
-      UTL_ExceptList *el = 0;
+      UTL_ExceptList *el = nullptr;
       ACE_NEW_RETURN (el,
-                      UTL_ExceptList (fe, 0),
-                      0);
+                      UTL_ExceptList (fe, nullptr),
+                      nullptr);
 
-      if (this->pd_exceptions == 0)
+      if (this->pd_exceptions == nullptr)
         {
           this->pd_exceptions = el;
         }
@@ -270,7 +268,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
   // each place it is passed in.
   t->destroy ();
   delete t;
-  t = 0;
+  t = nullptr;
 
   return t;
 }
@@ -279,7 +277,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
 void
 AST_Factory::dump (ACE_OSTREAM_TYPE &o)
 {
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
 
   this->dump_i (o, "factory ");
   this->local_name ()->dump (o);
@@ -307,7 +305,3 @@ AST_Factory::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_factory (this);
 }
-
-IMPL_NARROW_FROM_DECL(AST_Factory)
-IMPL_NARROW_FROM_SCOPE(AST_Factory)
-
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
index 15f5d97b957..bc0ea1e35c8 100644
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ b/TAO/TAO_IDL/ast/ast_field.cpp
@@ -107,8 +107,7 @@ AST_Field::AST_Field (AST_Type *ft,
 
   if (fnt == AST_Decl::NT_param_holder)
     {
-      AST_Param_Holder *ph =
-        AST_Param_Holder::narrow_from_decl (ft);
+      AST_Param_Holder *ph = dynamic_cast<AST_Param_Holder*> (ft);
 
       if (ph->info ()->type_ == AST_Decl::NT_const)
         {
@@ -140,8 +139,7 @@ AST_Field::AST_Field (AST_Decl::NodeType nt,
 
   if (fnt == AST_Decl::NT_param_holder)
     {
-      AST_Param_Holder *ph =
-        AST_Param_Holder::narrow_from_decl (ft);
+      AST_Param_Holder *ph = dynamic_cast<AST_Param_Holder*> (ft);
 
       if (ph->info ()->type_ == AST_Decl::NT_const)
         {
@@ -163,7 +161,7 @@ AST_Field::AST_Field (
   // be an issue here.
 }
 
-AST_Field::~AST_Field (void)
+AST_Field::~AST_Field ()
 {
 }
 
@@ -198,26 +196,26 @@ AST_Field::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Field::destroy (void)
+AST_Field::destroy ()
 {
   if (this->owns_base_type_ && this->ref_type_)
     {
       this->ref_type_->destroy ();
       delete this->ref_type_;
-      this->ref_type_ = 0;
+      this->ref_type_ = nullptr;
     }
 
   this->AST_Decl::destroy ();
 }
 
 AST_Type *
-AST_Field::field_type (void) const
+AST_Field::field_type () const
 {
   return this->ref_type_;
 }
 
 AST_Field::Visibility
-AST_Field::visibility (void) const
+AST_Field::visibility () const
 {
   return this->visibility_;
 }
@@ -229,13 +227,11 @@ AST_Field::visibility (AST_Field::Visibility val)
 }
 
 int
-AST_Field::contains_wstring (void)
+AST_Field::contains_wstring ()
 {
   return this->ref_type_->contains_wstring ();
 }
 
-IMPL_NARROW_FROM_DECL(AST_Field)
-
 bool AST_Field::annotatable () const
 {
   return true;
diff --git a/TAO/TAO_IDL/ast/ast_finder.cpp b/TAO/TAO_IDL/ast/ast_finder.cpp
index 5945fdb228c..f745c3362a5 100644
--- a/TAO/TAO_IDL/ast/ast_finder.cpp
+++ b/TAO/TAO_IDL/ast/ast_finder.cpp
@@ -16,12 +16,12 @@ AST_Finder::AST_Finder (UTL_ScopedName *n)
 {
 }
 
-AST_Finder::~AST_Finder (void)
+AST_Finder::~AST_Finder ()
 {
 }
 
 void
-AST_Finder::destroy (void)
+AST_Finder::destroy ()
 {
   this->AST_Factory::destroy ();
 }
@@ -30,7 +30,7 @@ AST_Finder::destroy (void)
 void
 AST_Finder::dump (ACE_OSTREAM_TYPE &o)
 {
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
 
   this->dump_i (o, "finder ");
   this->local_name ()->dump (o);
@@ -58,7 +58,3 @@ AST_Finder::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_finder (this);
 }
-
-IMPL_NARROW_FROM_DECL(AST_Finder)
-IMPL_NARROW_FROM_SCOPE(AST_Finder)
-
diff --git a/TAO/TAO_IDL/ast/ast_fixed.cpp b/TAO/TAO_IDL/ast/ast_fixed.cpp
index ded0d58b581..3048fd0f0bc 100644
--- a/TAO/TAO_IDL/ast/ast_fixed.cpp
+++ b/TAO/TAO_IDL/ast/ast_fixed.cpp
@@ -31,11 +31,11 @@ void AST_Fixed::destroy ()
 {
   pd_digits->destroy ();
   delete pd_digits;
-  pd_digits = 0;
+  pd_digits = nullptr;
 
   pd_scale->destroy ();
   delete pd_scale;
-  pd_scale = 0;
+  pd_scale = nullptr;
 
   AST_ConcreteType::destroy ();
 }
@@ -54,5 +54,3 @@ AST_Expression *AST_Fixed::scale ()
 {
   return pd_scale;
 }
-
-IMPL_NARROW_FROM_DECL(AST_Fixed)
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index 0c1c673aca6..0e08c14098d 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -118,10 +118,10 @@ AST_PredefinedType *
 AST_Generator::create_predefined_type (AST_PredefinedType::PredefinedType t,
                                        UTL_ScopedName *n)
 {
-  AST_PredefinedType *retval = 0;
+  AST_PredefinedType *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_PredefinedType (t, n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -130,7 +130,7 @@ AST_Module *
 AST_Generator::create_module (UTL_Scope *s,
                               UTL_ScopedName *n)
 {
-  AST_Module *retval = 0;
+  AST_Module *retval = nullptr;
 
   // Check for another module of the same name in the scope.
   for (UTL_ScopeActiveIterator iter (s, UTL_Scope::IK_decls);
@@ -139,12 +139,12 @@ AST_Generator::create_module (UTL_Scope *s,
     {
       // Can't just check node type here, since it could be a
       // template module or template module instantiation.
-      AST_Module *m = AST_Module::narrow_from_decl (iter.item ());
+      AST_Module *m = dynamic_cast<AST_Module*> (iter.item ());
       if (m && m->local_name ()->compare (n->last_component ()))
         {
           // Create this new module with referance to the
           // "first" previous module found in scope.
-          ACE_NEW_RETURN (retval, AST_Module (n, m), 0);
+          ACE_NEW_RETURN (retval, AST_Module (n, m), nullptr);
           retval->prefix (const_cast<char *> (m->prefix ()));
           return retval;
         }
@@ -155,8 +155,7 @@ AST_Generator::create_module (UTL_Scope *s,
   // is itself a module, and has been previously opened, any
   // of the previous openings may contain a previous opening
   // of the module we're creating.
-  //  AST_Module *prev_module = AST_Module::narrow_from_scope (s);
-  AST_Module *prev_module = AST_Module::narrow_from_scope (s);
+  AST_Module *prev_module = dynamic_cast<AST_Module*> (s);
   if (prev_module)
     {
       while (!!(prev_module= prev_module->previous_opening ()))
@@ -165,12 +164,12 @@ AST_Generator::create_module (UTL_Scope *s,
                !iter.is_done ();
                iter.next ())
             {
-              AST_Module *m = AST_Module::narrow_from_decl (iter.item ());
+              AST_Module *m = dynamic_cast<AST_Module*> (iter.item ());
               if (m && m->local_name ()->compare (n->last_component ()))
                 {
                   // Create this new module with referance to the
                   // "first" previous module found in scope.
-                  ACE_NEW_RETURN (retval, AST_Module (n, m), 0);
+                  ACE_NEW_RETURN (retval, AST_Module (n, m), nullptr);
                   return retval;
                 }
             }
@@ -178,17 +177,17 @@ AST_Generator::create_module (UTL_Scope *s,
     }
 
   // There is no previous module to this one
-  ACE_NEW_RETURN (retval, AST_Module (n), 0);
+  ACE_NEW_RETURN (retval, AST_Module (n), nullptr);
   return retval;
 }
 
 AST_Root *
 AST_Generator::create_root (UTL_ScopedName *n)
 {
-  AST_Root *retval = 0;
+  AST_Root *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Root (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -202,7 +201,7 @@ AST_Generator::create_interface (UTL_ScopedName *n,
                                  bool is_local,
                                  bool is_abstract)
 {
-  AST_Interface *retval = 0;
+  AST_Interface *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Interface (n,
                                  inherits,
@@ -211,7 +210,7 @@ AST_Generator::create_interface (UTL_ScopedName *n,
                                  n_inherits_flat,
                                  is_local,
                                  is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -223,16 +222,16 @@ AST_Generator::create_interface_fwd (UTL_ScopedName *n,
 {
   AST_Interface
     *full_defn = this->create_interface (n,
-                                         0,
+                                         nullptr,
                                          -1,
-                                         0,
+                                         nullptr,
                                          0,
                                          is_local,
                                          is_abstract);
-  AST_InterfaceFwd *retval = 0;
+  AST_InterfaceFwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_InterfaceFwd (full_defn, n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -252,7 +251,7 @@ AST_Generator::create_valuetype (UTL_ScopedName *n,
                                  bool is_truncatable,
                                  bool is_custom)
 {
-  AST_ValueType *retval = 0;
+  AST_ValueType *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_ValueType (n,
                                  inherits,
@@ -266,10 +265,10 @@ AST_Generator::create_valuetype (UTL_ScopedName *n,
                                  is_abstract,
                                  is_truncatable,
                                  is_custom),
-                  0);
+                  nullptr);
 
   // The following helps with OBV_ namespace generation.
-  AST_Module *m = AST_Module::narrow_from_scope (retval->defined_in ());
+  AST_Module *m = dynamic_cast<AST_Module*> (retval->defined_in ());
   if (m)
     {
       m->set_has_nested_valuetype ();
@@ -283,23 +282,23 @@ AST_Generator::create_valuetype_fwd (UTL_ScopedName *n,
                                      bool is_abstract)
 {
   AST_ValueType *full_defn = this->create_valuetype (n,
-                                                     0,
+                                                     nullptr,
                                                      -1,
+                                                     nullptr,
+                                                     nullptr,
                                                      0,
+                                                     nullptr,
                                                      0,
-                                                     0,
-                                                     0,
-                                                     0,
-                                                     0,
+                                                     nullptr,
                                                      is_abstract,
                                                      false,
                                                      false);
 
-  AST_ValueTypeFwd *retval = 0;
+  AST_ValueTypeFwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_ValueTypeFwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -319,7 +318,7 @@ AST_Generator::create_eventtype (UTL_ScopedName *n,
                                  bool is_truncatable,
                                  bool is_custom)
 {
-  AST_EventType *retval = 0;
+  AST_EventType *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_EventType (n,
                                  inherits,
@@ -333,12 +332,12 @@ AST_Generator::create_eventtype (UTL_ScopedName *n,
                                  is_abstract,
                                  is_truncatable,
                                  is_custom),
-                  0);
+                  nullptr);
 
   // The following helps with OBV_ namespace generation.
-  AST_Module *m = AST_Module::narrow_from_scope (retval->defined_in ());
+  AST_Module *m = dynamic_cast<AST_Module*> (retval->defined_in ());
 
-  if (m != 0)
+  if (m != nullptr)
     {
       m->set_has_nested_valuetype ();
     }
@@ -351,23 +350,23 @@ AST_Generator::create_eventtype_fwd (UTL_ScopedName *n,
                                      bool is_abstract)
 {
   AST_EventType *full_defn = this->create_eventtype (n,
-                                                     0,
+                                                     nullptr,
                                                      -1,
+                                                     nullptr,
+                                                     nullptr,
                                                      0,
+                                                     nullptr,
                                                      0,
-                                                     0,
-                                                     0,
-                                                     0,
-                                                     0,
+                                                     nullptr,
                                                      is_abstract,
                                                      false,
                                                      false);
 
-  AST_EventTypeFwd *retval = 0;
+  AST_EventTypeFwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_EventTypeFwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -381,7 +380,7 @@ AST_Generator::create_component (UTL_ScopedName *n,
                                  AST_Interface **supports_flat,
                                  long n_supports_flat)
 {
-  AST_Component *retval = 0;
+  AST_Component *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Component (n,
                                  base_component,
@@ -389,7 +388,7 @@ AST_Generator::create_component (UTL_ScopedName *n,
                                  n_supports,
                                  supports_flat,
                                  n_supports_flat),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -398,17 +397,17 @@ AST_ComponentFwd *
 AST_Generator::create_component_fwd (UTL_ScopedName *n)
 {
   AST_Component *full_defn = this->create_component (n,
-                                                     0,
-                                                     0,
+                                                     nullptr,
+                                                     nullptr,
                                                      -1,
-                                                     0,
+                                                     nullptr,
                                                      0);
 
-  AST_ComponentFwd *retval = 0;
+  AST_ComponentFwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_ComponentFwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -424,7 +423,7 @@ AST_Generator::create_home (UTL_ScopedName *n,
                             AST_Interface **supports_flat,
                             long n_supports_flat)
 {
-  AST_Home *retval = 0;
+  AST_Home *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Home (n,
                             base_home,
@@ -434,7 +433,7 @@ AST_Generator::create_home (UTL_ScopedName *n,
                             n_supports,
                             supports_flat,
                             n_supports_flat),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -444,12 +443,12 @@ AST_Generator::create_exception (UTL_ScopedName *n,
                                  bool is_local,
                                  bool is_abstract)
 {
-  AST_Exception *retval = 0;
+  AST_Exception *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Exception (n,
                                  is_local,
                                  is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -459,12 +458,12 @@ AST_Generator::create_structure (UTL_ScopedName *n,
                                  bool is_local,
                                  bool is_abstract)
 {
-  AST_Structure *retval = 0;
+  AST_Structure *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Structure (n,
                                  is_local,
                                  is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -475,11 +474,11 @@ AST_Generator::create_structure_fwd (UTL_ScopedName *n)
   AST_Structure *full_defn = this->create_structure  (n,
                                                       false,
                                                       false);
-  AST_StructureFwd *retval = 0;
+  AST_StructureFwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_StructureFwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -490,12 +489,12 @@ AST_Generator::create_enum (UTL_ScopedName *n,
                             bool is_local,
                             bool is_abstract)
 {
-  AST_Enum *retval = 0;
+  AST_Enum *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Enum (n,
                             is_local,
                             is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -507,14 +506,14 @@ AST_Generator::create_operation (AST_Type *rt,
                                  bool is_local,
                                  bool is_abstract)
 {
-  AST_Operation *retval = 0;
+  AST_Operation *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Operation (rt,
                                  fl,
                                  n,
                                  is_local,
                                  is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -524,12 +523,12 @@ AST_Generator::create_field (AST_Type *ft,
                              UTL_ScopedName *n,
                              AST_Field::Visibility vis)
 {
-  AST_Field *retval = 0;
+  AST_Field *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Field (ft,
                              n,
                              vis),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -539,12 +538,12 @@ AST_Generator::create_argument (AST_Argument::Direction d,
                                 AST_Type *ft,
                                 UTL_ScopedName *n)
 {
-  AST_Argument *retval = 0;
+  AST_Argument *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Argument (d,
                                 ft,
                                 n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -556,14 +555,14 @@ AST_Generator::create_attribute (bool ro,
                                  bool is_local,
                                  bool is_abstract)
 {
-  AST_Attribute *retval = 0;
+  AST_Attribute *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Attribute (ro,
                                  ft,
                                  n,
                                  is_local,
                                  is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -574,13 +573,13 @@ AST_Generator::create_union (AST_ConcreteType *dt,
                              bool is_local,
                              bool is_abstract)
 {
-  AST_Union *retval = 0;
+  AST_Union *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Union (dt,
                              n,
                              is_local,
                              is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -588,15 +587,15 @@ AST_Generator::create_union (AST_ConcreteType *dt,
 AST_UnionFwd *
 AST_Generator::create_union_fwd (UTL_ScopedName *n)
 {
-  AST_Union *full_defn = this->create_union (0,
+  AST_Union *full_defn = this->create_union (nullptr,
                                              n,
                                              false,
                                              false);
-  AST_UnionFwd *retval = 0;
+  AST_UnionFwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_UnionFwd (full_defn,
                                 n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -607,12 +606,12 @@ AST_Generator::create_union_branch (UTL_LabelList *ll,
                                     AST_Type *ft,
                                     UTL_ScopedName *n)
 {
-  AST_UnionBranch *retval = 0;
+  AST_UnionBranch *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_UnionBranch (ll,
                                    ft,
                                    n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -621,11 +620,11 @@ AST_UnionLabel *
 AST_Generator::create_union_label (AST_UnionLabel::UnionLabel ul,
                                    AST_Expression *v)
 {
-  AST_UnionLabel *retval = 0;
+  AST_UnionLabel *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_UnionLabel (ul,
                                   v),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -635,12 +634,12 @@ AST_Generator::create_constant (AST_Expression::ExprType et,
                                 AST_Expression *ev,
                                 UTL_ScopedName *n)
 {
-  AST_Constant *retval = 0;
+  AST_Constant *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Constant (et,
                                 ev,
                                 n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -648,10 +647,10 @@ AST_Generator::create_constant (AST_Expression::ExprType et,
 AST_Expression *
 AST_Generator::create_expr (UTL_ScopedName *n)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -660,11 +659,11 @@ AST_Expression *
 AST_Generator::create_expr (AST_Expression *v,
                             AST_Expression::ExprType t)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (v,
                                   t),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -674,12 +673,12 @@ AST_Generator::create_expr (AST_Expression::ExprComb c,
                             AST_Expression *v1,
                             AST_Expression *v2)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (c,
                                   v1,
                                   v2),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -687,10 +686,10 @@ AST_Generator::create_expr (AST_Expression::ExprComb c,
 AST_Expression *
 AST_Generator::create_expr (ACE_CDR::Long v)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (v),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -698,10 +697,10 @@ AST_Generator::create_expr (ACE_CDR::Long v)
 AST_Expression *
 AST_Generator::create_expr (ACE_CDR::LongLong l)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (l),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -709,10 +708,10 @@ AST_Generator::create_expr (ACE_CDR::LongLong l)
 AST_Expression *
 AST_Generator::create_expr (ACE_CDR::Boolean b)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (b),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -720,10 +719,10 @@ AST_Generator::create_expr (ACE_CDR::Boolean b)
 AST_Expression *
 AST_Generator::create_expr (ACE_CDR::ULong v)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (v),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -731,10 +730,10 @@ AST_Generator::create_expr (ACE_CDR::ULong v)
 AST_Expression *
 AST_Generator::create_expr (ACE_CDR::ULongLong l)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (l),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -743,10 +742,10 @@ AST_Expression *
 AST_Generator::create_expr (ACE_CDR::ULong v,
                             AST_Expression::ExprType t)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (v, t),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -754,10 +753,10 @@ AST_Generator::create_expr (ACE_CDR::ULong v,
 AST_Expression *
 AST_Generator::create_expr (UTL_String *s)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (s),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -765,10 +764,10 @@ AST_Generator::create_expr (UTL_String *s)
 AST_Expression *
 AST_Generator::create_expr (ACE_CDR::Char c)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (c),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -776,10 +775,10 @@ AST_Generator::create_expr (ACE_CDR::Char c)
 AST_Expression *
 AST_Generator::create_expr (ACE_OutputCDR::from_wchar wc)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (wc),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -787,10 +786,10 @@ AST_Generator::create_expr (ACE_OutputCDR::from_wchar wc)
 AST_Expression *
 AST_Generator::create_expr (char *s)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (s),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -798,10 +797,10 @@ AST_Generator::create_expr (char *s)
 AST_Expression *
 AST_Generator::create_expr (ACE_CDR::Double d)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (d),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -809,10 +808,10 @@ AST_Generator::create_expr (ACE_CDR::Double d)
 AST_Expression *
 AST_Generator::create_expr (const ACE_CDR::Fixed &f)
 {
-  AST_Expression *retval = 0;
+  AST_Expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Expression (f),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -821,11 +820,11 @@ AST_EnumVal *
 AST_Generator::create_enum_val (ACE_CDR::ULong v,
                                 UTL_ScopedName *n)
 {
-  AST_EnumVal *retval = 0;
+  AST_EnumVal *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_EnumVal (v,
                                n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -837,14 +836,14 @@ AST_Generator::create_array (UTL_ScopedName *n,
                              bool is_local,
                              bool is_abstract)
 {
-  AST_Array *retval = 0;
+  AST_Array *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Array (n,
                              ndims,
                              dims,
                              is_local,
                              is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -856,14 +855,14 @@ AST_Generator::create_sequence (AST_Expression *ms,
                                 bool is_local,
                                 bool is_abstract)
 {
-  AST_Sequence *retval = 0;
+  AST_Sequence *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Sequence (ms,
                                 bt,
                                 n,
                                 is_local,
                                 is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -873,14 +872,14 @@ AST_Generator::create_string (AST_Expression *ms)
 {
   Identifier id ("string");
   UTL_ScopedName n (&id,
-                    0);
+                    nullptr);
 
-  AST_String *retval = 0;
+  AST_String *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_String (AST_Decl::NT_string,
                               &n,
                               ms),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -892,18 +891,18 @@ AST_Generator::create_wstring (AST_Expression *ms)
                    ? "string"
                    : "wstring");
   UTL_ScopedName n (&id,
-                    0);
+                    nullptr);
   AST_Decl::NodeType nt = sizeof (ACE_CDR::WChar) == 1
                             ? AST_Decl::NT_string
                             : AST_Decl::NT_wstring;
 
-  AST_String *retval = 0;
+  AST_String *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_String (nt,
                               &n,
                               ms,
                               sizeof (ACE_OS::WChar)),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -913,9 +912,9 @@ AST_Generator::create_fixed (AST_Expression *digits,
                              AST_Expression *scale)
 {
   Identifier id ("fixed");
-  UTL_ScopedName name (&id, 0);
-  AST_Fixed *retval = 0;
-  ACE_NEW_RETURN (retval, AST_Fixed (&name, digits, scale), 0);
+  UTL_ScopedName name (&id, nullptr);
+  AST_Fixed *retval = nullptr;
+  ACE_NEW_RETURN (retval, AST_Fixed (&name, digits, scale), nullptr);
   return retval;
 }
 
@@ -925,13 +924,13 @@ AST_Generator::create_typedef (AST_Type *bt,
                                bool is_local,
                                bool is_abstract)
 {
-  AST_Typedef *retval = 0;
+  AST_Typedef *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Typedef (bt,
                                n,
                                is_local,
                                is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -939,10 +938,10 @@ AST_Generator::create_typedef (AST_Type *bt,
 AST_Native *
 AST_Generator::create_native (UTL_ScopedName *n)
 {
-  AST_Native *retval = 0;
+  AST_Native *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Native (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -950,10 +949,10 @@ AST_Generator::create_native (UTL_ScopedName *n)
 AST_Factory *
 AST_Generator::create_factory (UTL_ScopedName *n)
 {
-  AST_Factory *retval = 0;
+  AST_Factory *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Factory (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -961,10 +960,10 @@ AST_Generator::create_factory (UTL_ScopedName *n)
 AST_Finder *
 AST_Generator::create_finder (UTL_ScopedName *n)
 {
-  AST_Finder *retval = 0;
+  AST_Finder *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Finder (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -973,10 +972,10 @@ AST_ValueBox *
 AST_Generator::create_valuebox (UTL_ScopedName *n,
                                 AST_Type *boxed_type)
 {
-  AST_ValueBox *retval = 0;
+  AST_ValueBox *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_ValueBox (n, boxed_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -984,10 +983,10 @@ AST_Generator::create_valuebox (UTL_ScopedName *n,
 AST_PortType *
 AST_Generator::create_porttype (UTL_ScopedName *n)
 {
-  AST_PortType *retval = 0;
+  AST_PortType *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_PortType (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -996,11 +995,11 @@ AST_Provides *
 AST_Generator::create_provides (UTL_ScopedName *n,
                                 AST_Type *provides_type)
 {
-  AST_Provides *retval = 0;
+  AST_Provides *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Provides (n,
                                 provides_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1010,12 +1009,12 @@ AST_Generator::create_uses (UTL_ScopedName *n,
                             AST_Type *uses_type,
                             bool is_multiple)
 {
-  AST_Uses *retval = 0;
+  AST_Uses *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Uses (n,
                             uses_type,
                             is_multiple),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1024,11 +1023,11 @@ AST_Publishes *
 AST_Generator::create_publishes (UTL_ScopedName *n,
                                  AST_Type *publishes_type)
 {
-  AST_Publishes *retval = 0;
+  AST_Publishes *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Publishes (n,
                                  publishes_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1037,11 +1036,11 @@ AST_Emits *
 AST_Generator::create_emits (UTL_ScopedName *n,
                              AST_Type *emits_type)
 {
-  AST_Emits *retval = 0;
+  AST_Emits *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Emits (n,
                              emits_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1049,11 +1048,11 @@ AST_Consumes *
 AST_Generator::create_consumes (UTL_ScopedName *n,
                                 AST_Type *consumes_type)
 {
-  AST_Consumes *retval = 0;
+  AST_Consumes *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Consumes (n,
                                 consumes_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1063,11 +1062,11 @@ AST_Generator::create_extended_port (
   UTL_ScopedName *n,
   AST_PortType *porttype_ref)
 {
-  AST_Extended_Port *retval = 0;
+  AST_Extended_Port *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Extended_Port (n,
                                      porttype_ref),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1077,11 +1076,11 @@ AST_Generator::create_mirror_port (
   UTL_ScopedName *n,
   AST_PortType *porttype_ref)
 {
-  AST_Mirror_Port *retval = 0;
+  AST_Mirror_Port *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Mirror_Port (n,
                                    porttype_ref),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1091,11 +1090,11 @@ AST_Generator::create_connector (
   UTL_ScopedName *n,
   AST_Connector *base_connector)
 {
-  AST_Connector *retval = 0;
+  AST_Connector *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Connector (n,
                                  base_connector),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1105,11 +1104,11 @@ AST_Generator::create_template_module (
   UTL_ScopedName *n,
   FE_Utils::T_PARAMLIST_INFO *template_params)
 {
-  AST_Template_Module *retval = 0;
+  AST_Template_Module *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Template_Module (n,
                                        template_params),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1120,12 +1119,12 @@ AST_Generator::create_template_module_inst (
   AST_Template_Module *ref,
   FE_Utils::T_ARGLIST *template_args)
 {
-  AST_Template_Module_Inst *retval = 0;
+  AST_Template_Module_Inst *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Template_Module_Inst (n,
                                             ref,
                                             template_args),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1136,12 +1135,12 @@ AST_Generator::create_template_module_ref (
   AST_Template_Module *ref,
   UTL_StrList *param_refs)
 {
-  AST_Template_Module_Ref *retval = 0;
+  AST_Template_Module_Ref *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Template_Module_Ref (n,
                                            ref,
                                            param_refs),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1151,11 +1150,11 @@ AST_Generator::create_param_holder (
   UTL_ScopedName *parameter_name,
   FE_Utils::T_Param_Info *info)
 {
-  AST_Param_Holder *retval = 0;
+  AST_Param_Holder *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   AST_Param_Holder (parameter_name,
                                     info),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1164,8 +1163,8 @@ AST_Annotation_Decl *
 AST_Generator::create_annotation_decl (
   UTL_ScopedName *name)
 {
-  AST_Annotation_Decl *retval = 0;
-  ACE_NEW_RETURN (retval, AST_Annotation_Decl (name), 0);
+  AST_Annotation_Decl *retval = nullptr;
+  ACE_NEW_RETURN (retval, AST_Annotation_Decl (name), nullptr);
   return retval;
 }
 
@@ -1174,8 +1173,8 @@ AST_Generator::create_annotation_appl (
   UTL_ScopedName *name,
   AST_Annotation_Appl::Params *params)
 {
-  AST_Annotation_Appl *retval = 0;
-  ACE_NEW_RETURN (retval, AST_Annotation_Appl (name, params), 0);
+  AST_Annotation_Appl *retval = nullptr;
+  ACE_NEW_RETURN (retval, AST_Annotation_Appl (name, params), nullptr);
   return retval;
 }
 
@@ -1185,7 +1184,7 @@ AST_Generator::create_annotation_member (
   AST_Type *type,
   UTL_ScopedName *name)
 {
-  AST_Annotation_Member *retval = 0;
-  ACE_NEW_RETURN (retval, AST_Annotation_Member (expr_type, type, name), 0);
+  AST_Annotation_Member *retval = nullptr;
+  ACE_NEW_RETURN (retval, AST_Annotation_Member (expr_type, type, name), nullptr);
   return retval;
 }
diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp
index b7e773b1fdd..e4a5bd8c72a 100644
--- a/TAO/TAO_IDL/ast/ast_home.cpp
+++ b/TAO/TAO_IDL/ast/ast_home.cpp
@@ -43,21 +43,20 @@ AST_Home::AST_Home (UTL_ScopedName *n,
 {
   FE_Utils::tmpl_mod_ref_check (this, base_home);
 
-  AST_ValueType *pk =
-    AST_ValueType::narrow_from_decl (primary_key);
+  AST_ValueType *pk = dynamic_cast<AST_ValueType*> (primary_key);
 
-  if (pk != 0)
+  if (pk != nullptr)
     {
       idl_global->primary_keys ().enqueue_tail (pk);
     }
-  else if (primary_key != 0)
+  else if (primary_key != nullptr)
     {
       // If we are here, it's a param holder and we must destroy it.
       this->owns_primary_key_ = true;
     }
 }
 
-AST_Home::~AST_Home (void)
+AST_Home::~AST_Home ()
 {
 }
 
@@ -65,9 +64,9 @@ AST_Decl *
 AST_Home::look_in_inherited (UTL_ScopedName *e,
                              bool full_def_only)
 {
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
 
-  if (this->pd_base_home != 0)
+  if (this->pd_base_home != nullptr)
     {
       d =
         this->pd_base_home->lookup_by_name (e, full_def_only);
@@ -81,8 +80,8 @@ AST_Decl *
 AST_Home::look_in_supported (UTL_ScopedName *e,
                              bool full_def_only)
 {
-  AST_Decl *d = 0;
-  AST_Type **is = 0;
+  AST_Decl *d = nullptr;
+  AST_Type **is = nullptr;
   long nis = -1;
 
   // Can't look in an interface which was not yet defined.
@@ -90,7 +89,7 @@ AST_Home::look_in_supported (UTL_ScopedName *e,
     {
       idl_global->err ()->fwd_decl_lookup (this,
                                            e);
-      return 0;
+      return nullptr;
     }
 
   // OK, loop through supported interfaces.
@@ -107,12 +106,11 @@ AST_Home::look_in_supported (UTL_ScopedName *e,
           continue;
         }
 
-      AST_Interface *i =
-        AST_Interface::narrow_from_decl (*is);
+      AST_Interface *i = dynamic_cast<AST_Interface*> (*is);
 
       d = (i)->lookup_by_name_r (e, full_def_only);
 
-      if (d != 0)
+      if (d != nullptr)
         {
           break;
         }
@@ -128,7 +126,7 @@ AST_Home::special_lookup (UTL_ScopedName *e,
 {
   AST_Decl *d = this->look_in_inherited (e, full_def_only);
 
-  if (d == 0)
+  if (d == nullptr)
     {
       d = this->look_in_supported (e, full_def_only);
     }
@@ -137,7 +135,7 @@ AST_Home::special_lookup (UTL_ScopedName *e,
 }
 
 AST_Home *
-AST_Home::base_home (void) const
+AST_Home::base_home () const
 {
   return this->pd_base_home;
 }
@@ -146,28 +144,28 @@ AST_Home::base_home (void) const
 // create separate visitors for homes in the back end.
 
 AST_Type **
-AST_Home::supports (void) const
+AST_Home::supports () const
 {
   return
-    this->pd_base_home == 0
+    this->pd_base_home == nullptr
       ? this->inherits ()
       : this->inherits () + 1;
 }
 
 long
-AST_Home::n_supports (void) const
+AST_Home::n_supports () const
 {
   return this->n_inherits ();
 }
 
 AST_Component *
-AST_Home::managed_component (void) const
+AST_Home::managed_component () const
 {
   return this->pd_managed_component;
 }
 
 AST_Type *
-AST_Home::primary_key (void) const
+AST_Home::primary_key () const
 {
   return this->pd_primary_key;
 }
@@ -181,13 +179,13 @@ AST_Home::transfer_scope_elements (AST_Interface *dst)
     {
       AST_Decl *d = src_iter.item ();
 
-      Identifier *local_id = 0;
+      Identifier *local_id = nullptr;
       ACE_NEW (local_id,
                Identifier (d->local_name ()->get_string ()));
-      UTL_ScopedName *last_segment = 0;
+      UTL_ScopedName *last_segment = nullptr;
       ACE_NEW (last_segment,
                UTL_ScopedName (local_id,
-                               0));
+                               nullptr));
       UTL_ScopedName *full_name =
         static_cast<UTL_ScopedName *> (dst->name ()->copy ());
       full_name->nconc (last_segment);
@@ -201,20 +199,20 @@ AST_Home::transfer_scope_elements (AST_Interface *dst)
   long const end = this->pd_decls_used;
   for (long i = 0; i < end; ++i)
     {
-      this->pd_decls[i] = 0;
+      this->pd_decls[i] = nullptr;
       --this->pd_decls_used;
     }
 }
 
 void
-AST_Home::destroy (void)
+AST_Home::destroy ()
 {
   // If it's a param holder, it was created on the fly.
   if (owns_primary_key_)
     {
       this->pd_primary_key->destroy ();
       delete this->pd_primary_key;
-      this->pd_primary_key = 0;
+      this->pd_primary_key = nullptr;
     }
 
   this->AST_Interface::destroy ();
@@ -229,20 +227,20 @@ AST_Home::dump (ACE_OSTREAM_TYPE &o)
 
   this->dump_i (o, " ");
 
-  if (this->pd_base_home != 0)
+  if (this->pd_base_home != nullptr)
     {
       this->dump_i (o, ": ");
       this->pd_base_home->local_name ()->dump (o);
     }
 
-  if (this->pd_managed_component != 0)
+  if (this->pd_managed_component != nullptr)
     {
       this->dump_i (o, "\n");
       this->dump_i (o, "manages ");
       this->pd_managed_component->local_name ()->dump (o);
     }
 
-  if (this->pd_primary_key != 0)
+  if (this->pd_primary_key != nullptr)
     {
       this->dump_i (o, "\n");
       this->dump_i (o, "primary key ");
@@ -266,21 +264,11 @@ AST_Home::ast_accept (ast_visitor *visitor)
 AST_Factory *
 AST_Home::fe_add_factory (AST_Factory *f)
 {
-  return
-    AST_Factory::narrow_from_decl (
-      this->fe_add_decl (f));
+  return dynamic_cast<AST_Factory*> (this->fe_add_decl (f));
 }
 
 AST_Finder *
 AST_Home::fe_add_finder (AST_Finder *f)
 {
-  return
-    AST_Finder::narrow_from_decl (
-      this->fe_add_decl (f));
+  return dynamic_cast<AST_Finder*> (this->fe_add_decl (f));
 }
-
-  // Narrowing.
-
-IMPL_NARROW_FROM_DECL(AST_Home)
-IMPL_NARROW_FROM_SCOPE(AST_Home)
-
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 9e3d780b418..0ded8e138f0 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -121,10 +121,10 @@ AST_Interface::AST_Interface (UTL_ScopedName *n,
     pd_inherits_flat (ih_flat),
     pd_n_inherits_flat (nih_flat),
     home_equiv_ (false),
-    fwd_decl_ (0),
+    fwd_decl_ (nullptr),
     has_mixed_parentage_ (-1),
-    ami_handler_ (0),
-    ami4ccm_uses_ (0)
+    ami_handler_ (nullptr),
+    ami4ccm_uses_ (nullptr)
 {
   this->size_type (AST_Type::VARIABLE); // always the case
   this->has_constructor (true);      // always the case
@@ -145,7 +145,7 @@ AST_Interface::AST_Interface (UTL_ScopedName *n,
     }
 }
 
-AST_Interface::~AST_Interface (void)
+AST_Interface::~AST_Interface ()
 {
 }
 
@@ -167,7 +167,7 @@ AST_Interface::be_add_operation (AST_Operation *op)
 }
 
 bool
-AST_Interface::is_defined (void)
+AST_Interface::is_defined ()
 {
   // Each instance of a forward declared interface no
   // longer has a redefined full definition, so we
@@ -176,7 +176,7 @@ AST_Interface::is_defined (void)
   // is found, then we are defined for code generation
   // purposes. See AST_InterfaceFwd::destroy() to
   // see the difference for cleanup purposes.
-  return (0 == this->fwd_decl_
+  return (nullptr == this->fwd_decl_
           ? this->pd_n_inherits >= 0
           : this->fwd_decl_->is_defined ());
 }
@@ -184,33 +184,25 @@ AST_Interface::is_defined (void)
 AST_Constant *
 AST_Interface::fe_add_constant (AST_Constant *t)
 {
-  return
-    AST_Constant::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Constant*> (this->fe_add_decl (t));
 }
 
 AST_Exception *
 AST_Interface::fe_add_exception (AST_Exception *t)
 {
-  return
-    AST_Exception::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Exception*> (this->fe_add_decl (t));
 }
 
 AST_Attribute *
 AST_Interface::fe_add_attribute (AST_Attribute *t)
 {
-  return
-    AST_Attribute::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Attribute*> (this->fe_add_decl (t));
 }
 
 AST_Operation *
 AST_Interface::fe_add_operation (AST_Operation *t)
 {
-  return
-    AST_Operation::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Operation*> (this->fe_add_decl (t));
 }
 
 AST_Structure *
@@ -228,25 +220,19 @@ AST_Interface::fe_add_structure_fwd (AST_StructureFwd *t)
 AST_Enum *
 AST_Interface::fe_add_enum (AST_Enum *t)
 {
-  return
-    AST_Enum::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Enum*> (this->fe_add_decl (t));
 }
 
 AST_Union *
 AST_Interface::fe_add_union (AST_Union *t)
 {
-  return
-    AST_Union::narrow_from_decl (
-      this->fe_add_full_struct_type (t));
+  return dynamic_cast<AST_Union*> (this->fe_add_full_struct_type (t));
 }
 
 AST_UnionFwd *
 AST_Interface::fe_add_union_fwd (AST_UnionFwd *t)
 {
-  return
-    AST_UnionFwd::narrow_from_decl (
-      this->fe_add_fwd_struct_type (t));
+  return dynamic_cast<AST_UnionFwd*> (this->fe_add_fwd_struct_type (t));
 }
 
 // Add an AST_EnumVal node (an enumerator) to this scope.
@@ -256,26 +242,20 @@ AST_Interface::fe_add_union_fwd (AST_UnionFwd *t)
 AST_EnumVal *
 AST_Interface::fe_add_enum_val (AST_EnumVal *t)
 {
-  return
-    AST_EnumVal::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_EnumVal*> (this->fe_add_decl (t));
 }
 
 // Add an AST_Typedef (a typedef) to the current scope.
 AST_Typedef *
 AST_Interface::fe_add_typedef (AST_Typedef *t)
 {
-  return
-    AST_Typedef::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  return dynamic_cast<AST_Typedef*> (this->fe_add_ref_decl (t));
 }
 
 AST_Native *
 AST_Interface::fe_add_native (AST_Native *t)
 {
-  return
-    AST_Native::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Native*> (this->fe_add_decl (t));
 }
 
 // Dump this AST_Interface node to the ostream o.
@@ -324,22 +304,22 @@ void
 AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
                                         UTL_Scope *s)
 {
-  if (i == 0)
+  if (i == nullptr)
     {
       return;
     }
 
   UTL_Scope *scope = i->defined_in ();
-  const char *prefix_holder = 0;
+  const char *prefix_holder = nullptr;
 
   // If our prefix is empty, we check to see if an ancestor has one.
-  while (ACE_OS::strcmp (i->prefix (), "") == 0 && scope != 0)
+  while (ACE_OS::strcmp (i->prefix (), "") == 0 && scope != nullptr)
     {
       AST_Decl *parent = ScopeAsDecl (scope);
       prefix_holder = parent->prefix ();
 
       // We have reached global scope.
-      if (prefix_holder == 0)
+      if (prefix_holder == nullptr)
         {
           break;
         }
@@ -351,18 +331,18 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
   // Fwd redefinition should be in the same scope, so local
   // lookup is all that's needed.
   AST_Decl *d = s->lookup_by_name_local (i->local_name (), false);
-  if (d != 0)
+  if (d != nullptr)
     {
       scope = d->defined_in ();
 
       // If the lookup prefix is empty, we check to see if an ancestor has one.
-      while (ACE_OS::strcmp (d->prefix (), "") == 0 && scope != 0)
+      while (ACE_OS::strcmp (d->prefix (), "") == 0 && scope != nullptr)
         {
           AST_Decl *parent = ScopeAsDecl (scope);
           prefix_holder = parent->prefix ();
 
           // We have reached global scope.
-          if (prefix_holder == 0)
+          if (prefix_holder == nullptr)
             {
               break;
             }
@@ -372,7 +352,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
         }
 
       AST_Interface *fd = dynamic_cast<AST_Interface *> (d);
-      if (fd == 0)
+      if (fd == nullptr)
         {
           AST_Decl::NodeType nt = d->node_type ();
 
@@ -415,7 +395,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
               fd->redefine (i);
 
               AST_InterfaceFwd *fwd = fd->fwd_decl ();
-              if (fwd != 0)
+              if (fwd != nullptr)
                 {
                   fwd->set_as_defined ();
                 }
@@ -432,7 +412,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
 void
 AST_Interface::redef_clash_populate_r (AST_Type *t)
 {
-  if (this->insert_non_dup (t, 0) == 0)
+  if (this->insert_non_dup (t, false) == 0)
     {
       return;
     }
@@ -442,8 +422,7 @@ AST_Interface::redef_clash_populate_r (AST_Type *t)
 
   if (nt != AST_Decl::NT_param_holder)
     {
-      AST_Interface *i =
-        AST_Interface::narrow_from_decl (t);
+      AST_Interface *i = dynamic_cast<AST_Interface*> (t);
 
       AST_Type **parents = i->inherits ();
       long n_parents = i->n_inherits ();
@@ -456,7 +435,7 @@ AST_Interface::redef_clash_populate_r (AST_Type *t)
 
   if (nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype)
     {
-      AST_ValueType *v = AST_ValueType::narrow_from_decl (t);
+      AST_ValueType *v = dynamic_cast<AST_ValueType*> (t);
       AST_Type **supports = v->supports ();
       long n_supports = v->n_supports ();
 
@@ -467,7 +446,7 @@ AST_Interface::redef_clash_populate_r (AST_Type *t)
     }
   else if (nt == AST_Decl::NT_component)
     {
-      AST_Component *c = AST_Component::narrow_from_decl (t);
+      AST_Component *c = dynamic_cast<AST_Component*> (t);
       AST_Type **supports = c->supports ();
       long n_supports = c->n_supports ();
 
@@ -479,7 +458,7 @@ AST_Interface::redef_clash_populate_r (AST_Type *t)
 }
 
 bool
-AST_Interface::home_equiv (void) const
+AST_Interface::home_equiv () const
 {
   return this->home_equiv_;
 }
@@ -491,7 +470,7 @@ AST_Interface::home_equiv (bool val)
 }
 
 AST_InterfaceFwd *
-AST_Interface::fwd_decl (void) const
+AST_Interface::fwd_decl () const
 {
   return this->fwd_decl_;
 }
@@ -506,14 +485,13 @@ int
 AST_Interface::insert_non_dup (AST_Type *t,
                                bool abstract_paths_only)
 {
-  AST_Interface *f =
-    AST_Interface::narrow_from_decl (t);
+  AST_Interface *f = dynamic_cast<AST_Interface*> (t);
 
   // Now check if the dequeued element has any ancestors. If yes, insert
   // them inside the queue making sure that there are no duplicates.
   // If we are doing a component, the inheritance list is actually a
   // supports list.
-  if (f != 0)
+  if (f != nullptr)
     {
       for (long i = 0; i < f->n_inherits (); ++i)
         {
@@ -541,7 +519,7 @@ AST_Interface::insert_non_dup (AST_Type *t,
        (void) q_iter.advance ())
     {
       // Queue element.
-      AST_Type **temp = 0;
+      AST_Type **temp = nullptr;
 
       (void) q_iter.next (temp);
 
@@ -561,7 +539,7 @@ AST_Interface::insert_non_dup (AST_Type *t,
        (void) del_q_iter.advance ())
     {
       // Queue element.
-      AST_Type **temp = 0;
+      AST_Type **temp = nullptr;
 
       (void) del_q_iter.next (temp);
 
@@ -634,51 +612,51 @@ AST_Interface::redefine (AST_Interface *from)
 // Data accessors.
 
 AST_Type **
-AST_Interface::inherits (void) const
+AST_Interface::inherits () const
 {
   return this->pd_inherits;
 }
 
 long
-AST_Interface::n_inherits (void) const
+AST_Interface::n_inherits () const
 {
   return this->pd_n_inherits;
 }
 
 AST_Interface **
-AST_Interface::inherits_flat (void) const
+AST_Interface::inherits_flat () const
 {
   return this->pd_inherits_flat;
 }
 
 long
-AST_Interface::n_inherits_flat (void) const
+AST_Interface::n_inherits_flat () const
 {
   return pd_n_inherits_flat;
 }
 
 ACE_Unbounded_Queue<AST_Type *> &
-AST_Interface::get_insert_queue (void)
+AST_Interface::get_insert_queue ()
 {
   return this->insert_queue;
 }
 
 ACE_Unbounded_Queue<AST_Type *> &
-AST_Interface::get_del_queue (void)
+AST_Interface::get_del_queue ()
 {
   return this->del_queue;
 }
 
 bool
-AST_Interface::redef_clash (void)
+AST_Interface::redef_clash ()
 {
   this->insert_queue.reset ();
   this->redef_clash_populate_r (this);
 
-  AST_Type **group1_member = 0;
-  AST_Type **group2_member = 0;
-  AST_Decl *group1_member_item = 0;
-  AST_Decl *group2_member_item = 0;
+  AST_Type **group1_member = nullptr;
+  AST_Type **group2_member = nullptr;
+  AST_Decl *group1_member_item = nullptr;
+  AST_Decl *group2_member_item = nullptr;
 
   int i = 1;
 
@@ -693,7 +671,7 @@ AST_Interface::redef_clash (void)
       (void) group1_iter.next (group1_member);
       UTL_Scope *s = DeclAsScope (*group1_member);
 
-      if (s != 0)
+      if (s != nullptr)
         {
           for (UTL_ScopeActiveIterator group1_member_items (
                  s,
@@ -737,7 +715,7 @@ AST_Interface::redef_clash (void)
                   (void) group2_iter.next (group2_member);
                   UTL_Scope *ss = DeclAsScope (*group2_member);
 
-                  if (ss != 0)
+                  if (ss != nullptr)
                     {
                       for (UTL_ScopeActiveIterator group2_member_items (
                              ss,
@@ -808,15 +786,15 @@ AST_Decl *
 AST_Interface::look_in_inherited (UTL_ScopedName *e,
                                   bool full_def_only)
 {
-  AST_Decl *d = 0;
-  AST_Decl *d_before = 0;
-  AST_Type **is = 0;
+  AST_Decl *d = nullptr;
+  AST_Decl *d_before = nullptr;
+  AST_Type **is = nullptr;
   long nis = -1;
 
   // Can't look in an interface which was not yet defined.
   if (!this->is_defined ())
     {
-      return 0;
+      return nullptr;
     }
 
   // OK, loop through inherited interfaces.
@@ -828,18 +806,17 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e,
        nis > 0;
        nis--, is++)
     {
-      AST_Interface *i =
-        AST_Interface::narrow_from_decl (*is);
+      AST_Interface *i = dynamic_cast<AST_Interface*> (*is);
 
-      if (i == 0)
+      if (i == nullptr)
         {
           continue;
         }
 
       d = (i)->lookup_by_name_r (e, full_def_only);
-      if (d != 0)
+      if (d != nullptr)
         {
-          if (d_before == 0)
+          if (d_before == nullptr)
             {
               // First result found.
               d_before = d;
@@ -884,11 +861,11 @@ AST_Interface::look_in_inherited_local (Identifier *e,
   // Can't look in an interface which was not yet defined.
   if (!this->is_defined ())
     {
-      return 0;
+      return nullptr;
     }
 
-  AST_Decl *d = 0;
-  AST_Type **is = 0;
+  AST_Decl *d = nullptr;
+  AST_Type **is = nullptr;
   long nis = -1;
 
   /// OK, loop through inherited interfaces.
@@ -896,17 +873,16 @@ AST_Interface::look_in_inherited_local (Identifier *e,
        nis > 0;
        nis--, is++)
     {
-      AST_Interface *i =
-        AST_Interface::narrow_from_decl (*is);
+      AST_Interface *i = dynamic_cast<AST_Interface*> (*is);
 
-      if (i == 0)
+      if (i == nullptr)
         {
           continue;
         }
 
       d = i->lookup_by_name_local (e, full_def_only);
 
-      if (d != 0)
+      if (d != nullptr)
         {
           break;
         }
@@ -918,25 +894,25 @@ AST_Interface::look_in_inherited_local (Identifier *e,
 AST_Decl *
 AST_Interface::lookup_for_add (AST_Decl *d)
 {
-  if (d == 0)
+  if (d == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   Identifier *id = d->local_name ();
-  AST_Decl *prev = 0;
+  AST_Decl *prev = nullptr;
   AST_Decl::NodeType nt = NT_root;
   long nis = -1;
-  AST_Interface **is = 0;
+  AST_Interface **is = nullptr;
 
   if (this->idl_keyword_clash (id) != 0)
     {
-      return 0;
+      return nullptr;
     }
 
   prev = this->lookup_by_name_local (id, false);
 
-  if (prev != 0)
+  if (prev != nullptr)
     {
       nt = prev->node_type ();
 
@@ -952,7 +928,7 @@ AST_Interface::lookup_for_add (AST_Decl *d)
     {
       prev = (*is)->lookup_by_name_local (id, false);
 
-      if (prev != 0)
+      if (prev != nullptr)
         {
           nt = prev->node_type ();
 
@@ -963,11 +939,11 @@ AST_Interface::lookup_for_add (AST_Decl *d)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 int
-AST_Interface::has_mixed_parentage (void)
+AST_Interface::has_mixed_parentage ()
 {
   if (this->is_abstract_)
     {
@@ -992,7 +968,7 @@ AST_Interface::has_mixed_parentage (void)
 }
 
 void
-AST_Interface::analyze_parentage (void)
+AST_Interface::analyze_parentage ()
 {
   if (this->has_mixed_parentage_ != -1)
     {
@@ -1009,10 +985,9 @@ AST_Interface::analyze_parentage (void)
 
   for (long i = 0; i < this->pd_n_inherits; ++i)
     {
-      AST_Interface *parent =
-         AST_Interface::narrow_from_decl (this->pd_inherits[i]);
+      AST_Interface *parent = dynamic_cast<AST_Interface*> (this->pd_inherits[i]);
 
-      if (parent == 0)
+      if (parent == nullptr)
         {
           // The item is a template param holder.
           continue;
@@ -1032,12 +1007,11 @@ AST_Interface::analyze_parentage (void)
   bool in_tmpl_module = false;
   UTL_Scope *s = this->defined_in ();
 
-  while (s != 0)
+  while (s != nullptr)
     {
-      AST_Template_Module *m =
-        AST_Template_Module::narrow_from_scope (s);
+      AST_Template_Module *m = dynamic_cast<AST_Template_Module*> (s);
 
-      if (m != 0)
+      if (m != nullptr)
         {
           in_tmpl_module = true;
           break;
@@ -1056,7 +1030,7 @@ AST_Interface::analyze_parentage (void)
 }
 
 bool
-AST_Interface::legal_for_primary_key (void) const
+AST_Interface::legal_for_primary_key () const
 {
   return false;
 }
@@ -1069,22 +1043,22 @@ AST_Interface::special_lookup (UTL_ScopedName *e,
   AST_Decl *d = this->look_in_inherited_local (e->head (),
                                                full_def_only);
 
-  if (d != 0)
+  if (d != nullptr)
     {
       UTL_Scope *s = DeclAsScope (d);
       UTL_ScopedName *sn =
         static_cast<UTL_ScopedName *> (e->tail ());
 
-      return (s != 0 && sn != 0
+      return (s != nullptr && sn != nullptr
                 ? s->lookup_by_name_r (sn, full_def_only, final_parent_decl)
                 : d);
     }
 
-  return 0;
+  return nullptr;
 }
 
 AST_Interface *
-AST_Interface::ami_handler (void) const
+AST_Interface::ami_handler () const
 {
   return this->ami_handler_;
 }
@@ -1096,7 +1070,7 @@ AST_Interface::ami_handler (AST_Interface *handler)
 }
 
 AST_Interface *
-AST_Interface::ami4ccm_uses (void) const
+AST_Interface::ami4ccm_uses () const
 {
   return this->ami4ccm_uses_;
 }
@@ -1108,19 +1082,19 @@ AST_Interface::ami4ccm_uses (AST_Interface *implied)
 }
 
 void
-AST_Interface::destroy (void)
+AST_Interface::destroy ()
 {
   for (ACE_Unbounded_Queue_Iterator<AST_Type *> i (
          this->param_holders_);
        !i.done ();
        (void) i.advance ())
     {
-      AST_Type **tt = 0;
+      AST_Type **tt = nullptr;
       i.next (tt);
       AST_Type *t = *tt;
       t->destroy ();
       delete t;
-      t = 0;
+      t = nullptr;
     }
 
   // The destroy() we are in gets called twice if we start from
@@ -1129,11 +1103,11 @@ AST_Interface::destroy (void)
   this->param_holders_.reset ();
 
   delete [] this->pd_inherits;
-  this->pd_inherits = 0;
+  this->pd_inherits = nullptr;
   this->pd_n_inherits = 0;
 
   delete [] this->pd_inherits_flat;
-  this->pd_inherits_flat = 0;
+  this->pd_inherits_flat = nullptr;
   this->pd_n_inherits_flat = 0;
 
   this->UTL_Scope::destroy ();
@@ -1151,6 +1125,3 @@ AST_Interface::annotatable () const
 {
   return true;
 }
-
-IMPL_NARROW_FROM_DECL(AST_Interface)
-IMPL_NARROW_FROM_SCOPE(AST_Interface)
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index 655008fd030..ade2471f7f1 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -98,37 +98,37 @@ AST_InterfaceFwd::AST_InterfaceFwd (AST_Interface *dummy,
     }
 }
 
-AST_InterfaceFwd::~AST_InterfaceFwd (void)
+AST_InterfaceFwd::~AST_InterfaceFwd ()
 {
 }
 
 // Private operations.
 
 bool
-AST_InterfaceFwd::is_local (void)
+AST_InterfaceFwd::is_local ()
 {
   return this->full_definition ()->is_local ();
 }
 
 bool
-AST_InterfaceFwd::is_valuetype (void)
+AST_InterfaceFwd::is_valuetype ()
 {
   AST_Decl::NodeType nt = this->full_definition ()->node_type ();
   return nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype;
 }
 
 bool
-AST_InterfaceFwd::is_abstract_valuetype (void)
+AST_InterfaceFwd::is_abstract_valuetype ()
 {
   return (this->full_definition ()->is_abstract ()
           && this->is_valuetype ());
 }
 
 bool
-AST_InterfaceFwd::full_def_seen (void)
+AST_InterfaceFwd::full_def_seen ()
 {
   UTL_Scope *s = this->defined_in ();
-  AST_Interface *i = 0;
+  AST_Interface *i = nullptr;
 
   // If a full definition is seen in a previous module opening
   // or anywhere in the current scope (before or after our
@@ -136,16 +136,16 @@ AST_InterfaceFwd::full_def_seen (void)
 
   if (AST_Decl::NT_module == s->scope_node_type ())
     {
-      AST_Module *m = AST_Module::narrow_from_scope (s);
+      AST_Module *m = dynamic_cast<AST_Module*> (s);
       AST_Decl *d =
         m->look_in_prev_mods_local (this->local_name (),
                                     false);
 
-      if (0 != d)
+      if (nullptr != d)
         {
-          i = AST_Interface::narrow_from_decl (d);
+          i = dynamic_cast<AST_Interface*> (d);
 
-          if (0 != i && i->is_defined ())
+          if (nullptr != i && i->is_defined ())
             {
               return true;
             }
@@ -156,9 +156,9 @@ AST_InterfaceFwd::full_def_seen (void)
         !iter.is_done ();
         iter.next ())
     {
-      i = AST_Interface::narrow_from_decl (iter.item ());
+      i = dynamic_cast<AST_Interface*> (iter.item ());
 
-      if (0 != i && this->local_name ()->compare (i->local_name ()))
+      if (nullptr != i && this->local_name ()->compare (i->local_name ()))
         {
           if (i->is_defined ())
             {
@@ -199,7 +199,7 @@ AST_InterfaceFwd::ast_accept (ast_visitor *visitor)
 // Data accessors.
 
 AST_Interface *
-AST_InterfaceFwd::full_definition (void)
+AST_InterfaceFwd::full_definition ()
 {
   return this->pd_full_definition;
 }
@@ -217,32 +217,30 @@ AST_InterfaceFwd::set_full_definition (AST_Interface *nfd)
 }
 
 bool
-AST_InterfaceFwd::is_defined (void)
+AST_InterfaceFwd::is_defined ()
 {
   // Look for the one instance of the fwd decl
   // that may have a full definition.
   if (!this->is_defined_)
     {
-      AST_Module *m =
-        AST_Module::narrow_from_scope (this->defined_in ());
+      AST_Module *m = dynamic_cast<AST_Module*> (this->defined_in ());
 
-      if (0 != m)
+      if (nullptr != m)
         {
           AST_Decl *d =
             m->look_in_prev_mods_local (this->local_name ());
 
-          if (0 != d)
+          if (nullptr != d)
             {
               // We could be looking at a superfluous forward decl
               // of an interface already defined.
               AST_Interface *full = dynamic_cast<AST_Interface *> (d);
-              if (0 != full)
+              if (nullptr != full)
                 {
                   set_as_defined ();
                 }
 
-              AST_InterfaceFwd *fwd =
-                AST_InterfaceFwd::narrow_from_decl (d);
+              AST_InterfaceFwd *fwd = dynamic_cast<AST_InterfaceFwd*> (d);
 
               // Since fwd_redefinition_helper() is called
               // before fe_add_interface(), we can't check
@@ -250,7 +248,7 @@ AST_InterfaceFwd::is_defined (void)
               // is a sufficient way to tell if our full
               // definition has already gone through the
               // add_to_scope process.
-              if (0 != fwd && fwd->is_defined ())
+              if (nullptr != fwd && fwd->is_defined ())
                 {
                   set_as_defined ();
                 }
@@ -274,18 +272,18 @@ AST_InterfaceFwd::disown_full_definition ()
 }
 
 void
-AST_InterfaceFwd::destroy (void)
+AST_InterfaceFwd::destroy ()
 {
   if (has_ownership_)
     {
-      set_full_definition (0);
+      set_full_definition (nullptr);
     }
 
   this->AST_Type::destroy ();
 }
 
 bool
-AST_InterfaceFwd::is_fwd (void)
+AST_InterfaceFwd::is_fwd ()
 {
   return true; // This is a fwd declared type
 }
@@ -301,10 +299,8 @@ AST_InterfaceFwd::adjust_found (
   if (ignore_fwd)
     {
       AST_Interface *i = this->full_definition ();
-      return (full_def_only && !i->is_defined () ? 0 : i);
+      return (full_def_only && !i->is_defined () ? nullptr : i);
     }
 
   return this;
 }
-
-IMPL_NARROW_FROM_DECL (AST_InterfaceFwd)
diff --git a/TAO/TAO_IDL/ast/ast_mirror_port.cpp b/TAO/TAO_IDL/ast/ast_mirror_port.cpp
index 640e556d5ea..7739c36e2d4 100644
--- a/TAO/TAO_IDL/ast/ast_mirror_port.cpp
+++ b/TAO/TAO_IDL/ast/ast_mirror_port.cpp
@@ -24,12 +24,12 @@ AST_Mirror_Port::AST_Mirror_Port (
 {
 }
 
-AST_Mirror_Port::~AST_Mirror_Port (void)
+AST_Mirror_Port::~AST_Mirror_Port ()
 {
 }
 
 void
-AST_Mirror_Port::destroy (void)
+AST_Mirror_Port::destroy ()
 {
   this->AST_Extended_Port::destroy ();
 }
@@ -47,6 +47,3 @@ AST_Mirror_Port::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_mirror_port (this);
 }
-
-IMPL_NARROW_FROM_DECL (AST_Mirror_Port)
-
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index b428d3c5dd6..feb4facbaa5 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -105,11 +105,11 @@ AST_Decl::NodeType const
 AST_Module::AST_Module (UTL_ScopedName *n, AST_Module *previous)
   : AST_Decl (AST_Decl::NT_module, n),
     UTL_Scope (AST_Decl::NT_module),
-    pd_has_nested_valuetype_ (0),
+    pd_has_nested_valuetype_ (false),
     previous_opening_ (previous),
     last_in_same_parent_scope_ (this),
-    from_inst_ (0),
-    from_ref_ (0)
+    from_inst_ (nullptr),
+    from_ref_ (nullptr)
 {
   // NOTE previous passed into this constructor should be
   // the FIRST module that is a previous opening of this same
@@ -120,20 +120,17 @@ AST_Module::AST_Module (UTL_ScopedName *n, AST_Module *previous)
   // below.
 }
 
-AST_Module::~AST_Module (void)
+AST_Module::~AST_Module ()
 {
 }
 
 void
-AST_Module::destroy (void)
+AST_Module::destroy ()
 {
   this->UTL_Scope::destroy ();
   this->AST_Decl::destroy ();
 }
 
-IMPL_NARROW_FROM_DECL(AST_Module)
-IMPL_NARROW_FROM_SCOPE(AST_Module)
-
 // Dump this AST_Module node to the ostream o.
 void
 AST_Module::dump (ACE_OSTREAM_TYPE &o)
@@ -159,23 +156,23 @@ AST_Module::adjust_found (
 
 // Involved in OBV_ namespace generation.
 void
-AST_Module::set_has_nested_valuetype (void)
+AST_Module::set_has_nested_valuetype ()
 {
   UTL_Scope *parent = this->defined_in ();
   if (parent && !this->pd_has_nested_valuetype_)
     {
-      AST_Module *pm = AST_Module::narrow_from_scope (parent);
+      AST_Module *pm = dynamic_cast<AST_Module*> (parent);
       if (pm)
         {
           pm->set_has_nested_valuetype ();
         }
     }
 
-  this->pd_has_nested_valuetype_ = 1;
+  this->pd_has_nested_valuetype_ = true;
 }
 
 bool
-AST_Module::has_nested_valuetype (void)
+AST_Module::has_nested_valuetype ()
 {
   return this->pd_has_nested_valuetype_;
 }
@@ -226,7 +223,7 @@ AST_Module::referenced (AST_Decl *e,
       return false;
     }
 
-  AST_Type *t = AST_Type::narrow_from_decl (d);
+  AST_Type *t = dynamic_cast<AST_Type*> (d);
   return (!t || t->is_defined ());
 }
 
@@ -258,7 +255,7 @@ AST_Module::look_in_prev_mods_local (Identifier *e,
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 AST_Decl *
@@ -299,7 +296,7 @@ AST_Module::look_in_prev_mods (UTL_ScopedName *e,
         }
     }
 
-  return 0; // Not found.
+  return nullptr; // Not found.
 }
 
 int
@@ -309,7 +306,7 @@ AST_Module::ast_accept (ast_visitor *visitor)
 }
 
 AST_Template_Module_Inst *
-AST_Module::from_inst (void) const
+AST_Module::from_inst () const
 {
   return this->from_inst_;
 }
@@ -321,7 +318,7 @@ AST_Module::from_inst (AST_Template_Module_Inst *node)
 }
 
 AST_Template_Module_Ref *
-AST_Module::from_ref (void) const
+AST_Module::from_ref () const
 {
   return this->from_ref_;
 }
@@ -345,8 +342,7 @@ AST_Module::special_lookup (UTL_ScopedName *e,
 AST_PredefinedType *
 AST_Module::fe_add_predefined_type (AST_PredefinedType *t)
 {
-  return AST_PredefinedType::narrow_from_decl (
-    this->fe_add_decl (t));
+  return dynamic_cast<AST_PredefinedType*> (this->fe_add_decl (t));
 }
 
 AST_Module *
@@ -378,7 +374,7 @@ AST_Module::fe_add_module (AST_Module *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  AST_Module *m = 0;
+  AST_Module *m = nullptr;
   AST_Decl *d = this->lookup_for_add (t);
 
   if (d)
@@ -389,15 +385,15 @@ AST_Module::fe_add_module (AST_Module *t)
                                       t,
                                       this,
                                       d);
-          return 0;
+          return nullptr;
         }
 
       // has_ancestor() returns TRUE if both nodes are the same.
-      m = AST_Module::narrow_from_decl (d);
+      m = dynamic_cast<AST_Module*> (d);
       if (t != m && t->has_ancestor (d))
         {
           idl_global->err ()->redefinition_in_scope (t, d);
-          return 0;
+          return nullptr;
         }
 
       const char *prev_prefix = d->prefix ();
@@ -463,121 +459,97 @@ AST_Module::fe_add_module (AST_Module *t)
 AST_Template_Module_Inst *
 AST_Module::fe_add_template_module_inst (AST_Template_Module_Inst *t)
 {
-  return
-    AST_Template_Module_Inst::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  return dynamic_cast<AST_Template_Module_Inst*> (this->fe_add_ref_decl (t));
 }
 
 AST_Interface *
 AST_Module::fe_add_interface (AST_Interface *t)
 {
-  return
-    this->fe_add_full_intf_decl<AST_Interface> (t);
+  return this->fe_add_full_intf_decl<AST_Interface> (t);
 }
 
 AST_ValueBox *
 AST_Module::fe_add_valuebox (AST_ValueBox *t)
 {
-  return
-    AST_ValueBox::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_ValueBox*> (this->fe_add_decl (t));
 }
 
 AST_ValueType *
 AST_Module::fe_add_valuetype (AST_ValueType *t)
 {
-  return
-    this->fe_add_full_intf_decl<AST_ValueType> (t);
+  return this->fe_add_full_intf_decl<AST_ValueType> (t);
 }
 
 AST_EventType *
 AST_Module::fe_add_eventtype (AST_EventType *t)
 {
-  return
-    this->fe_add_full_intf_decl<AST_EventType> (t);
+  return this->fe_add_full_intf_decl<AST_EventType> (t);
 }
 
 AST_Component *
 AST_Module::fe_add_component (AST_Component *t)
 {
-  return
-    this->fe_add_full_intf_decl<AST_Component> (t);
+  return this->fe_add_full_intf_decl<AST_Component> (t);
 }
 
 AST_Connector *
 AST_Module::fe_add_connector (AST_Connector *t)
 {
-  return
-    AST_Connector::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Connector*> (this->fe_add_decl (t));
 }
 
 AST_Home *
 AST_Module::fe_add_home (AST_Home *t)
 {
-  return
-    AST_Home::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Home*> (this->fe_add_decl (t));
 }
 
 AST_InterfaceFwd *
 AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *t)
 {
-  return
-    this->fe_add_fwd_intf_decl<AST_Interface> (t);
+  return this->fe_add_fwd_intf_decl<AST_Interface> (t);
 }
 
 AST_ValueTypeFwd *
 AST_Module::fe_add_valuetype_fwd (AST_ValueTypeFwd *t)
 {
-  return
-    this->fe_add_fwd_intf_decl<AST_ValueType> (t);
+  return this->fe_add_fwd_intf_decl<AST_ValueType> (t);
 }
 
 AST_EventTypeFwd *
 AST_Module::fe_add_eventtype_fwd (AST_EventTypeFwd *t)
 {
-  return
-    this->fe_add_fwd_intf_decl<AST_EventType> (t);
+  return this->fe_add_fwd_intf_decl<AST_EventType> (t);
 }
 
 AST_ComponentFwd *
 AST_Module::fe_add_component_fwd (AST_ComponentFwd *t)
 {
-  return
-    this->fe_add_fwd_intf_decl<AST_Component> (t);
+  return this->fe_add_fwd_intf_decl<AST_Component> (t);
 }
 
 AST_Constant *
 AST_Module::fe_add_constant (AST_Constant *t)
 {
-  return
-    AST_Constant::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Constant*> (this->fe_add_decl (t));
 }
 
 AST_Exception *
 AST_Module::fe_add_exception (AST_Exception *t)
 {
-  return
-    AST_Exception::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Exception*> (this->fe_add_decl (t));
 }
 
 AST_Union *
 AST_Module::fe_add_union (AST_Union *t)
 {
-  return
-    AST_Union::narrow_from_decl (
-      this->fe_add_full_struct_type (t));
+  return dynamic_cast<AST_Union*> (this->fe_add_full_struct_type (t));
 }
 
 AST_UnionFwd *
 AST_Module::fe_add_union_fwd (AST_UnionFwd *t)
 {
-  return
-    AST_UnionFwd::narrow_from_decl (
-      this->fe_add_fwd_struct_type (t));
+  return dynamic_cast<AST_UnionFwd*> (this->fe_add_fwd_struct_type (t));
 }
 
 AST_Structure *
@@ -595,9 +567,7 @@ AST_Module::fe_add_structure_fwd (AST_StructureFwd *t)
 AST_Enum *
 AST_Module::fe_add_enum (AST_Enum *t)
 {
-  return
-    AST_Enum::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Enum*> (this->fe_add_decl (t));
 }
 
 // Add an AST_EnumVal node (an enumerator) to this scope.
@@ -607,37 +577,29 @@ AST_Module::fe_add_enum (AST_Enum *t)
 AST_EnumVal *
 AST_Module::fe_add_enum_val (AST_EnumVal *t)
 {
-  return
-    AST_EnumVal::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_EnumVal*> (this->fe_add_decl (t));
 }
 
 AST_Typedef *
 AST_Module::fe_add_typedef (AST_Typedef *t)
 {
-  return
-    AST_Typedef::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  return dynamic_cast<AST_Typedef*> (this->fe_add_ref_decl (t));
 }
 
 AST_Native *
 AST_Module::fe_add_native (AST_Native *t)
 {
-  return
-    AST_Native::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Native*> (this->fe_add_decl (t));
 }
 
 AST_PortType *
 AST_Module::fe_add_porttype (AST_PortType *t)
 {
-  return
-    AST_PortType::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_PortType*> (this->fe_add_decl (t));
 }
 
 void
-AST_Module::reset_last_in_same_parent_scope (void)
+AST_Module::reset_last_in_same_parent_scope ()
 {
   this->last_in_same_parent_scope_ = this;
 }
@@ -646,6 +608,5 @@ AST_Annotation_Decl *
 AST_Module::fe_add_annotation_decl (
   AST_Annotation_Decl *annotation_decl)
 {
-  return AST_Annotation_Decl::narrow_from_decl (
-    fe_add_decl (annotation_decl));
+  return dynamic_cast<AST_Annotation_Decl*> (fe_add_decl (annotation_decl));
 }
diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp
index db4cbca8c65..6eeb3410bc5 100644
--- a/TAO/TAO_IDL/ast/ast_native.cpp
+++ b/TAO/TAO_IDL/ast/ast_native.cpp
@@ -23,12 +23,12 @@ AST_Native::AST_Native (UTL_ScopedName *n)
 {
 }
 
-AST_Native::~AST_Native (void)
+AST_Native::~AST_Native ()
 {
 }
 
 void
-AST_Native::destroy (void)
+AST_Native::destroy ()
 {
   this->AST_Exception::destroy ();
 }
@@ -45,7 +45,3 @@ AST_Native::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_native (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL(AST_Native)
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index d82257840b4..6c293079ce0 100644
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO/TAO_IDL/ast/ast_operation.cpp
@@ -104,16 +104,16 @@ AST_Operation::AST_Operation (AST_Type *rt,
     UTL_Scope(AST_Decl::NT_op),
     pd_return_type (rt),
     pd_flags (fl),
-    pd_context (0),
-    pd_exceptions (0),
+    pd_context (nullptr),
+    pd_exceptions (nullptr),
     argument_count_ (-1),
     has_in_arguments_ (false),
     has_native_ (0)
 {
-  AST_PredefinedType *pdt = 0;
+  AST_PredefinedType *pdt = nullptr;
 
   // Check that if the operation is oneway, the return type must be void.
-  if (rt != 0 && pd_flags == OP_oneway)
+  if (rt != nullptr && pd_flags == OP_oneway)
     {
       if (rt->node_type () != AST_Decl::NT_pre_defined)
         {
@@ -122,9 +122,9 @@ AST_Operation::AST_Operation (AST_Type *rt,
         }
       else
         {
-          pdt = AST_PredefinedType::narrow_from_decl (rt);
+          pdt = dynamic_cast<AST_PredefinedType*> (rt);
 
-          if (pdt == 0 || pdt->pt () != AST_PredefinedType::PT_void)
+          if (pdt == nullptr || pdt->pt () != AST_PredefinedType::PT_void)
             {
               idl_global->err ()->error1 (UTL_Error::EIDL_NONVOID_ONEWAY,
                                           this);
@@ -133,25 +133,25 @@ AST_Operation::AST_Operation (AST_Type *rt,
     }
 }
 
-AST_Operation::~AST_Operation (void)
+AST_Operation::~AST_Operation ()
 {
 }
 
 // Public operations.
 
 bool
-AST_Operation::void_return_type (void)
+AST_Operation::void_return_type ()
 {
   AST_Type* type = this->return_type ();
 
   return (type->node_type () == AST_Decl::NT_pre_defined
-          && (AST_PredefinedType::narrow_from_decl (type)->pt ()
+          && (dynamic_cast<AST_PredefinedType*> (type)->pt ()
                 == AST_PredefinedType::PT_void));
 }
 
 // Return the member count.
 int
-AST_Operation::argument_count (void)
+AST_Operation::argument_count ()
 {
   this->compute_argument_attr ();
 
@@ -160,7 +160,7 @@ AST_Operation::argument_count (void)
 
 // Return the IN/INOUT member flag.
 bool
-AST_Operation::has_in_arguments (void)
+AST_Operation::has_in_arguments ()
 {
   this->compute_argument_attr ();
 
@@ -176,8 +176,7 @@ AST_Operation::count_arguments_with_direction (int direction_mask)
        !si.is_done ();
        si.next ())
     {
-      AST_Argument *arg =
-        AST_Argument::narrow_from_decl (si.item ());
+      AST_Argument *arg = dynamic_cast<AST_Argument*> (si.item ());
 
       if ((arg->direction () & direction_mask) != 0)
         {
@@ -191,7 +190,7 @@ AST_Operation::count_arguments_with_direction (int direction_mask)
 
 // Return if any argument or the return type is a <native> type.
 int
-AST_Operation::has_native (void)
+AST_Operation::has_native ()
 {
   this->compute_argument_attr ();
 
@@ -199,17 +198,17 @@ AST_Operation::has_native (void)
 }
 
 void
-AST_Operation::destroy (void)
+AST_Operation::destroy ()
 {
   // No need to delete our exception list, the
   // destroy() method does it. The UTL_ExceptList
   // destroy() method does NOT delete the contained
   // exception nodes.
 
-  if (this->pd_exceptions != 0)
+  if (this->pd_exceptions != nullptr)
     {
       this->pd_exceptions->destroy ();
-      this->pd_exceptions = 0;
+      this->pd_exceptions = nullptr;
     }
 
   this->UTL_Scope::destroy ();
@@ -219,7 +218,7 @@ AST_Operation::destroy (void)
 UTL_ExceptList *
 AST_Operation::be_add_exceptions (UTL_ExceptList *t)
 {
-  if (this->pd_exceptions != 0)
+  if (this->pd_exceptions != nullptr)
     {
       idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                   this);
@@ -236,16 +235,16 @@ AST_Operation::be_add_exceptions (UTL_ExceptList *t)
 
 // Compute total number of members.
 int
-AST_Operation::compute_argument_attr (void)
+AST_Operation::compute_argument_attr ()
 {
   if (this->argument_count_ != -1)
     {
       return 0;
     }
 
-  AST_Decl *d = 0;
-  AST_Type *type = 0;
-  AST_Argument *arg = 0;
+  AST_Decl *d = nullptr;
+  AST_Type *type = nullptr;
+  AST_Argument *arg = nullptr;
 
   this->argument_count_ = 0;
 
@@ -264,7 +263,7 @@ AST_Operation::compute_argument_attr (void)
             {
               this->argument_count_++;
 
-              arg = AST_Argument::narrow_from_decl (d);
+              arg = dynamic_cast<AST_Argument*> (d);
 
               if (arg->direction() == AST_Argument::dir_IN ||
                   arg->direction() == AST_Argument::dir_INOUT)
@@ -273,7 +272,7 @@ AST_Operation::compute_argument_attr (void)
                 }
 
 
-              type = AST_Type::narrow_from_decl (arg->field_type ());
+              type = dynamic_cast<AST_Type*> (arg->field_type ());
 
               if (type->node_type () == AST_Decl::NT_native)
                 {
@@ -283,7 +282,7 @@ AST_Operation::compute_argument_attr (void)
         }
     }
 
-  type = AST_Type::narrow_from_decl (this->return_type ());
+  type = dynamic_cast<AST_Type*> (this->return_type ());
 
   if (type->node_type () == AST_Decl::NT_native)
     {
@@ -312,26 +311,26 @@ AST_Operation::fe_add_context (UTL_StrList *t)
 UTL_NameList *
 AST_Operation::fe_add_exceptions (UTL_NameList *t)
 {
-  if (0 == t)
+  if (nullptr == t)
     {
-      return 0;
+      return nullptr;
     }
 
-  UTL_ScopedName *nl_n = 0;
-  AST_Type *fe = 0;
-  AST_Decl *d = 0;
+  UTL_ScopedName *nl_n = nullptr;
+  AST_Type *fe = nullptr;
+  AST_Decl *d = nullptr;
 
-  this->pd_exceptions = 0;
+  this->pd_exceptions = nullptr;
 
   for (UTL_NamelistActiveIterator nl_i (t); !nl_i.is_done (); nl_i.next ())
     {
       nl_n = nl_i.item ();
       d = this->lookup_by_name (nl_n, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (nl_n);
-          return 0;
+          return nullptr;
         }
 
       AST_Decl::NodeType nt = d->node_type ();
@@ -342,8 +341,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
             break;
           case AST_Decl::NT_param_holder:
             {
-              AST_Param_Holder *ph =
-                AST_Param_Holder::narrow_from_decl (d);
+              AST_Param_Holder *ph = dynamic_cast<AST_Param_Holder*> (d);
 
               nt = ph->info ()->type_;
 
@@ -358,8 +356,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
             }
           case AST_Decl::NT_typedef:
             {
-              AST_Typedef *td =
-                AST_Typedef::narrow_from_decl (d);
+              AST_Typedef *td = dynamic_cast<AST_Typedef*> (d);
 
               nt = td->primitive_base_type ()->node_type ();
 
@@ -399,35 +396,35 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
       bool oneway_op =
         (this->flags () == AST_Operation::OP_oneway);
 
-      fe = AST_Type::narrow_from_decl (d);
+      fe = dynamic_cast<AST_Type*> (d);
 
-      if (oneway_op && fe != 0)
+      if (oneway_op && fe != nullptr)
         {
           idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                       this);
         }
 
-      if (fe == 0)
+      if (fe == nullptr)
         {
           idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_RAISES,
                                       this);
-          return 0;
+          return nullptr;
         }
 
-      if (this->pd_exceptions == 0)
+      if (this->pd_exceptions == nullptr)
         {
           ACE_NEW_RETURN (this->pd_exceptions,
                           UTL_ExceptList (fe,
-                                          0),
-                          0);
+                                          nullptr),
+                          nullptr);
         }
       else
         {
-          UTL_ExceptList *el = 0;
+          UTL_ExceptList *el = nullptr;
           ACE_NEW_RETURN (el,
                           UTL_ExceptList (fe,
-                                          0),
-                          0);
+                                          nullptr),
+                          nullptr);
 
           this->pd_exceptions->nconc (el);
         }
@@ -438,25 +435,23 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
   // each place it is passed in.
   t->destroy ();
   delete t;
-  t = 0;
-  return 0;
+  t = nullptr;
+  return nullptr;
 }
 
 AST_Argument *
 AST_Operation::fe_add_argument (AST_Argument *t)
 {
-  return
-    AST_Argument::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Argument*> (this->fe_add_decl (t));
 }
 
 // Dump this AST_Operation node (an operation) to the ostream o.
 void
 AST_Operation::dump (ACE_OSTREAM_TYPE &o)
 {
-  AST_Decl *d = 0;
-  AST_Type *e = 0;
-  UTL_String *s = 0;
+  AST_Decl *d = nullptr;
+  AST_Type *e = nullptr;
+  UTL_String *s = nullptr;
 
   if (this->pd_flags == OP_oneway)
     {
@@ -487,7 +482,7 @@ AST_Operation::dump (ACE_OSTREAM_TYPE &o)
 
   this->dump_i (o, ")");
 
-  if (this->pd_exceptions != 0)
+  if (this->pd_exceptions != nullptr)
     {
       this->dump_i (o, " raises(");
 
@@ -508,7 +503,7 @@ AST_Operation::dump (ACE_OSTREAM_TYPE &o)
       this->dump_i (o, ")");
     }
 
-  if (this->pd_context != 0)
+  if (this->pd_context != nullptr)
     {
       this->dump_i (o, " context(");
 
@@ -538,25 +533,25 @@ AST_Operation::ast_accept (ast_visitor *visitor)
 // Data accessors
 
 AST_Type *
-AST_Operation::return_type (void)
+AST_Operation::return_type ()
 {
   return this->pd_return_type;
 }
 
 AST_Operation::Flags
-AST_Operation::flags (void)
+AST_Operation::flags ()
 {
   return this->pd_flags;
 }
 
 UTL_StrList *
-AST_Operation::context (void)
+AST_Operation::context ()
 {
   return this->pd_context;
 }
 
 UTL_ExceptList *
-AST_Operation::exceptions (void)
+AST_Operation::exceptions ()
 {
   return this->pd_exceptions;
 }
@@ -566,6 +561,3 @@ AST_Operation::annotatable () const
 {
   return true;
 }
-
-IMPL_NARROW_FROM_DECL(AST_Operation)
-IMPL_NARROW_FROM_SCOPE(AST_Operation)
diff --git a/TAO/TAO_IDL/ast/ast_param_holder.cpp b/TAO/TAO_IDL/ast/ast_param_holder.cpp
index a421873ba19..3a2f8959305 100644
--- a/TAO/TAO_IDL/ast/ast_param_holder.cpp
+++ b/TAO/TAO_IDL/ast/ast_param_holder.cpp
@@ -18,18 +18,18 @@ AST_Param_Holder::AST_Param_Holder (UTL_ScopedName *parameter_name,
 {
 }
 
-AST_Param_Holder::~AST_Param_Holder (void)
+AST_Param_Holder::~AST_Param_Holder ()
 {
 }
 
 FE_Utils::T_Param_Info const *
-AST_Param_Holder::info (void) const
+AST_Param_Holder::info () const
 {
   return this->info_;
 }
 
 void
-AST_Param_Holder::destroy (void)
+AST_Param_Holder::destroy ()
 {
   this->AST_Type::destroy ();
 }
@@ -44,6 +44,3 @@ void
 AST_Param_Holder::dump (ACE_OSTREAM_TYPE & /* o */)
 {
 }
-
-IMPL_NARROW_FROM_DECL (AST_Param_Holder)
-
diff --git a/TAO/TAO_IDL/ast/ast_porttype.cpp b/TAO/TAO_IDL/ast/ast_porttype.cpp
index 28e9cf634c0..3ad65bc45ae 100644
--- a/TAO/TAO_IDL/ast/ast_porttype.cpp
+++ b/TAO/TAO_IDL/ast/ast_porttype.cpp
@@ -22,12 +22,12 @@ AST_PortType::AST_PortType (UTL_ScopedName *n)
 {
 }
 
-AST_PortType::~AST_PortType (void)
+AST_PortType::~AST_PortType ()
 {
 }
 
 void
-AST_PortType::destroy (void)
+AST_PortType::destroy ()
 {
   this->UTL_Scope::destroy ();
   this->AST_Type::destroy ();
@@ -47,27 +47,17 @@ AST_PortType::ast_accept (ast_visitor *visitor)
 AST_Provides *
 AST_PortType::fe_add_provides (AST_Provides *p)
 {
-  return
-    AST_Provides::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  return dynamic_cast<AST_Provides*> (this->fe_add_ref_decl (p));
 }
 
 AST_Uses *
 AST_PortType::fe_add_uses (AST_Uses *u)
 {
-  return
-    AST_Uses::narrow_from_decl (
-      this->fe_add_ref_decl (u));
+  return dynamic_cast<AST_Uses*> (this->fe_add_ref_decl (u));
 }
 
 AST_Attribute *
 AST_PortType::fe_add_attribute (AST_Attribute *t)
 {
-  return
-    AST_Attribute::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Attribute*> (this->fe_add_decl (t));
 }
-
-IMPL_NARROW_FROM_DECL (AST_PortType)
-IMPL_NARROW_FROM_SCOPE (AST_PortType)
-
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
index db6d0923737..e52ee5f0ab7 100644
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
@@ -91,8 +91,8 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
                       n),
     pd_pt (t)
 {
-  UTL_ScopedName *new_name = 0;
-  Identifier *id = 0;
+  UTL_ScopedName *new_name = nullptr;
+  Identifier *id = nullptr;
 
   // Generate a new Scoped Name for us such that we belong to the CORBA
   // namespace.
@@ -103,7 +103,7 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
 
       ACE_NEW (new_name,
                UTL_ScopedName (id,
-                               0));
+                               nullptr));
     }
   else
     {
@@ -112,9 +112,9 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
 
       ACE_NEW (new_name,
                UTL_ScopedName (id,
-                               0));
+                               nullptr));
 
-      UTL_ScopedName *conc_name = 0;
+      UTL_ScopedName *conc_name = nullptr;
 
       switch (this->pt ())
         {
@@ -197,7 +197,7 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
 
       ACE_NEW (conc_name,
                UTL_ScopedName (id,
-                               0));
+                               nullptr));
 
       new_name->nconc (conc_name);
     }
@@ -221,7 +221,7 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
   this->set_name (new_name);
 }
 
-AST_PredefinedType::~AST_PredefinedType (void)
+AST_PredefinedType::~AST_PredefinedType ()
 {
 }
 
@@ -236,7 +236,7 @@ AST_PredefinedType::dump (ACE_OSTREAM_TYPE &o)
 
 // Compute the size type of the node in question.
 int
-AST_PredefinedType::compute_size_type (void)
+AST_PredefinedType::compute_size_type ()
 {
   switch (this->pd_pt)
   {
@@ -260,7 +260,7 @@ AST_PredefinedType::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_PredefinedType::destroy (void)
+AST_PredefinedType::destroy ()
 {
   this->AST_ConcreteType::destroy ();
 }
@@ -268,11 +268,7 @@ AST_PredefinedType::destroy (void)
 // Data accessors.
 
 AST_PredefinedType::PredefinedType
-AST_PredefinedType::pt (void)
+AST_PredefinedType::pt ()
 {
   return this->pd_pt;
 }
-
-
-
-IMPL_NARROW_FROM_DECL(AST_PredefinedType)
diff --git a/TAO/TAO_IDL/ast/ast_provides.cpp b/TAO/TAO_IDL/ast/ast_provides.cpp
index 07bfd679480..e2b65156668 100644
--- a/TAO/TAO_IDL/ast/ast_provides.cpp
+++ b/TAO/TAO_IDL/ast/ast_provides.cpp
@@ -16,12 +16,12 @@ AST_Provides::AST_Provides (UTL_ScopedName *n,
 {
 }
 
-AST_Provides::~AST_Provides (void)
+AST_Provides::~AST_Provides ()
 {
 }
 
 AST_Type *
-AST_Provides::provides_type (void) const
+AST_Provides::provides_type () const
 {
   return this->field_type ();
 }
@@ -40,9 +40,7 @@ AST_Provides::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Provides::destroy (void)
+AST_Provides::destroy ()
 {
   this->AST_Field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_Provides)
diff --git a/TAO/TAO_IDL/ast/ast_publishes.cpp b/TAO/TAO_IDL/ast/ast_publishes.cpp
index 07a31eb4d41..eef6365b304 100644
--- a/TAO/TAO_IDL/ast/ast_publishes.cpp
+++ b/TAO/TAO_IDL/ast/ast_publishes.cpp
@@ -15,12 +15,12 @@ AST_Publishes::AST_Publishes (UTL_ScopedName *n,
 {
 }
 
-AST_Publishes::~AST_Publishes (void)
+AST_Publishes::~AST_Publishes ()
 {
 }
 
 AST_Type *
-AST_Publishes::publishes_type (void) const
+AST_Publishes::publishes_type () const
 {
   return this->field_type ();
 }
@@ -39,9 +39,7 @@ AST_Publishes::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Publishes::destroy (void)
+AST_Publishes::destroy ()
 {
   this->AST_Field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_Publishes)
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
index d981d3cddb6..61f9204c416 100644
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ b/TAO/TAO_IDL/ast/ast_recursive.cpp
@@ -86,7 +86,7 @@ bool
 AST_illegal_interface_recursion (AST_Decl *t)
 {
   // Can't be 0 since we know we have an interface or valuetype.
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
 
   // If we encounter the argument in an enclosing scope, it's illegal.
   for (UTL_ScopeStackActiveIterator i (idl_global->scopes ());
@@ -114,15 +114,15 @@ AST_illegal_interface_recursion (AST_Decl *t)
 bool
 AST_illegal_recursive_type (AST_Decl *t)
 {
-  if (t == 0)
+  if (t == nullptr)
     {
       return false;
     }
 
   AST_Decl::NodeType nt;
-  AST_Type *ut = AST_Type::narrow_from_decl (t);
+  AST_Type *ut = dynamic_cast<AST_Type*> (t);
 
-  if (ut != 0)
+  if (ut != nullptr)
     {
       ut = ut->unaliased_type ();
       nt = ut->node_type ();
@@ -145,16 +145,16 @@ AST_illegal_recursive_type (AST_Decl *t)
 
   bool check_for_struct = false;
   bool check_for_union = false;
-  AST_Structure  *st1 = 0;
-  AST_Union  *un1 = 0;
+  AST_Structure  *st1 = nullptr;
+  AST_Union  *un1 = nullptr;
 
   // Narrow the type appropriately so comparison will work.
   if (t->node_type () == AST_Decl::NT_struct)
     {
       check_for_struct = true;
-      st1 = AST_Structure::narrow_from_decl (t);
+      st1 = dynamic_cast<AST_Structure*> (t);
 
-      if (st1 == 0)
+      if (st1 == nullptr)
         {
           return false;  // NOT ILLEGAL.
         }
@@ -162,17 +162,17 @@ AST_illegal_recursive_type (AST_Decl *t)
   else if (t->node_type () == AST_Decl::NT_union)
     {
       check_for_union = true;
-      un1 = AST_Union::narrow_from_decl (t);
+      un1 = dynamic_cast<AST_Union*> (t);
 
-      if (un1 == 0)
+      if (un1 == nullptr)
         {
           return false;  // NOT ILLEGAL.
         }
     }
 
-  UTL_Scope  *s = 0;
-  AST_Structure *st2 = 0;
-  AST_Union *un2 = 0;
+  UTL_Scope  *s = nullptr;
+  AST_Structure *st2 = nullptr;
+  AST_Union *un2 = nullptr;
 
   // OK, iterate up the stack.
   for (UTL_ScopeStackActiveIterator i (idl_global->scopes ());
@@ -183,7 +183,7 @@ AST_illegal_recursive_type (AST_Decl *t)
 
       // If we hit a NULL we're done since it means that we're nested inside
       // a sequence, where recursive types may be used.
-      if (s == 0)
+      if (s == nullptr)
         {
           return false;  // NOT ILLEGAL.
         }
@@ -192,9 +192,9 @@ AST_illegal_recursive_type (AST_Decl *t)
       if (s->scope_node_type () == AST_Decl::NT_struct
           && check_for_struct == true)
         {
-          st2 = AST_Structure::narrow_from_scope (s);
+          st2 = dynamic_cast<AST_Structure*> (s);
 
-          if (st2 != 0 && st2 == st1)
+          if (st2 != nullptr && st2 == st1)
             {
               return true;  // ILLEGAL RECURSIVE TYPE USE.
             }
@@ -202,9 +202,9 @@ AST_illegal_recursive_type (AST_Decl *t)
       else if (s->scope_node_type () == AST_Decl::NT_union
                && check_for_union == true)
         {
-          un2 = AST_Union::narrow_from_scope (s);
+          un2 = dynamic_cast<AST_Union*> (s);
 
-          if (un2 != 0 && un2 == un1)
+          if (un2 != nullptr && un2 == un1)
             {
               return true;  // ILLEGAL RECURSIVE TYPE USE.
             }
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
index 220b85babc3..dd4aa334b79 100644
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ b/TAO/TAO_IDL/ast/ast_root.cpp
@@ -88,14 +88,14 @@ AST_Root::AST_Root (UTL_ScopedName *n)
 {
 }
 
-AST_Root::~AST_Root (void)
+AST_Root::~AST_Root ()
 {
 }
 
 // Overrides the one in UTL_Scope - this one doesn't
 // count the predefined types.
 unsigned long
-AST_Root::nmembers (void)
+AST_Root::nmembers ()
 {
   unsigned long retval = 0;
 
@@ -118,9 +118,9 @@ AST_Root::nmembers (void)
 AST_Sequence *
 AST_Root::fe_add_sequence (AST_Sequence *t)
 {
-  if (t == 0)
+  if (t == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   this->add_to_local_types (t);
@@ -131,9 +131,9 @@ AST_Root::fe_add_sequence (AST_Sequence *t)
 AST_String *
 AST_Root::fe_add_string (AST_String *t)
 {
-  if (t == 0)
+  if (t == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   this->add_to_local_types (t);
@@ -144,9 +144,9 @@ AST_Root::fe_add_string (AST_String *t)
 AST_Array *
 AST_Root::fe_add_array (AST_Array *t)
 {
-  if (t == 0)
+  if (t == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   this->add_to_local_types (t);
@@ -169,10 +169,10 @@ AST_Root::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Root::destroy (void)
+AST_Root::destroy ()
 {
   long i = 0;
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
 
   // Just destroy and delete everything but the CORBA
   // module, and the 'void' keyword, in case we are
@@ -186,7 +186,7 @@ AST_Root::destroy (void)
 
       d->destroy ();
       delete d;
-      d = 0;
+      d = nullptr;
       --this->pd_decls_used;
     }
 
@@ -198,7 +198,7 @@ AST_Root::destroy (void)
   // up when AST_Root::fini() calls UTL_Scope::destroy ().
   for (i = 2; i < this->pd_referenced_used; ++i)
     {
-      this->pd_referenced[i] = 0;
+      this->pd_referenced[i] = nullptr;
     }
 
   this->pd_referenced_used = 2;
@@ -208,18 +208,15 @@ AST_Root::destroy (void)
       Identifier *id = this->pd_name_referenced[i];
       id->destroy ();
       delete id;
-      id = 0;
+      id = nullptr;
     }
 
   this->pd_name_referenced_used = 2;
 }
 
 void
-AST_Root::fini (void)
+AST_Root::fini ()
 {
   this->UTL_Scope::destroy ();
   this->AST_Decl::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_Root)
-IMPL_NARROW_FROM_SCOPE(AST_Root)
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index 0ab4820c2da..94dcbd97893 100644
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO/TAO_IDL/ast/ast_sequence.cpp
@@ -113,15 +113,14 @@ AST_Sequence::AST_Sequence (AST_Expression *ms,
 
   if (bnt == AST_Decl::NT_param_holder)
     {
-      AST_Param_Holder *ph =
-        AST_Param_Holder::narrow_from_decl (bt);
+      AST_Param_Holder *ph = dynamic_cast<AST_Param_Holder*> (bt);
 
       if (ph->info ()->type_ == AST_Decl::NT_const)
         {
           idl_global->err ()->not_a_type (bt);
           bt->destroy ();
           delete bt;
-          bt = 0;
+          bt = nullptr;
           throw Bailout ();
         }
     }
@@ -129,7 +128,7 @@ AST_Sequence::AST_Sequence (AST_Expression *ms,
   // Check if we are bounded or unbounded. An expression value of 0 means
   // unbounded. If our bound is a template parameter, skip the
   // check altogether, this node will trigger no code generation.
-  if (ms->param_holder () == 0)
+  if (ms->param_holder () == nullptr)
     {
       this->unbounded_ = (ms->ev ()->u.ulval == 0);
     }
@@ -145,7 +144,7 @@ AST_Sequence::AST_Sequence (AST_Expression *ms,
     || nt == AST_Decl::NT_param_holder;
 }
 
-AST_Sequence::~AST_Sequence (void)
+AST_Sequence::~AST_Sequence ()
 {
 }
 
@@ -159,9 +158,9 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
   list.enqueue_tail(this);
 
-  AST_Type *type = AST_Type::narrow_from_decl (this->base_type ());
+  AST_Type *type = dynamic_cast<AST_Type*> (this->base_type ());
 
-  if (type == 0)
+  if (type == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("AST_Sequence::in_recursion - ")
@@ -173,7 +172,7 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
   if (nt == AST_Decl::NT_typedef)
     {
-      AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+      AST_Typedef *td = dynamic_cast<AST_Typedef*> (type);
       type = td->primitive_base_type ();
       nt = type->node_type ();
     }
@@ -187,7 +186,7 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
     }
 
   bool recursion_found = false;
-  AST_Type** recursable_type = 0;
+  AST_Type** recursable_type = nullptr;
   list.get (recursable_type, 0);
   if (!ACE_OS::strcmp (type->full_name (),
                            (*recursable_type)->full_name ()))
@@ -235,54 +234,52 @@ AST_Sequence::ast_accept (ast_visitor *visitor)
 // Data accessors.
 
 AST_Expression *
-AST_Sequence::max_size (void)
+AST_Sequence::max_size ()
 {
   return this->pd_max_size;
 }
 
 AST_Type *
-AST_Sequence::base_type (void) const
+AST_Sequence::base_type () const
 {
   return this->pd_base_type;
 }
 
 bool
-AST_Sequence::unbounded (void) const
+AST_Sequence::unbounded () const
 {
   return this->unbounded_;
 }
 
 bool
-AST_Sequence::legal_for_primary_key (void) const
+AST_Sequence::legal_for_primary_key () const
 {
   return this->base_type ()->legal_for_primary_key ();
 }
 
 bool
-AST_Sequence::is_defined (void)
+AST_Sequence::is_defined ()
 {
   return this->pd_base_type->is_defined ();
 }
 
 void
-AST_Sequence::destroy (void)
+AST_Sequence::destroy ()
 {
   if (this->owns_base_type_)
     {
       this->pd_base_type->destroy ();
       delete this->pd_base_type;
-      this->pd_base_type = 0;
+      this->pd_base_type = nullptr;
     }
 
   this->pd_max_size->destroy ();
   delete this->pd_max_size;
-  this->pd_max_size = 0;
+  this->pd_max_size = nullptr;
 
   this->AST_ConcreteType::destroy ();
 }
 
-IMPL_NARROW_FROM_DECL(AST_Sequence)
-
 AST_Annotation_Appls &
 AST_Sequence::base_type_annotations ()
 {
diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp
index 18366d6d89f..def9fe8cf8f 100644
--- a/TAO/TAO_IDL/ast/ast_string.cpp
+++ b/TAO/TAO_IDL/ast/ast_string.cpp
@@ -94,9 +94,9 @@ AST_String::AST_String (AST_Decl::NodeType nt,
   // Always the case.
   this->size_type (AST_Type::VARIABLE);
 
-  Identifier *id = 0;
-  UTL_ScopedName *new_name = 0;
-  UTL_ScopedName *conc_name = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *new_name = nullptr;
+  UTL_ScopedName *conc_name = nullptr;
   bool narrow = this->width () == (ssize_t) sizeof (char);
 
   ACE_NEW (id,
@@ -104,7 +104,7 @@ AST_String::AST_String (AST_Decl::NodeType nt,
 
   ACE_NEW (conc_name,
            UTL_ScopedName (id,
-                           0));
+                           nullptr));
 
   if (narrow)
     {
@@ -148,7 +148,7 @@ AST_String::AST_String (AST_Decl::NodeType nt,
   this->flat_name_ = ACE::strnew (namebuf);
 }
 
-AST_String::~AST_String (void)
+AST_String::~AST_String ()
 {
 }
 
@@ -170,11 +170,11 @@ AST_String::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_String::destroy (void)
+AST_String::destroy ()
 {
   this->pd_max_size->destroy ();
   delete this->pd_max_size;
-  this->pd_max_size = 0;
+  this->pd_max_size = nullptr;
 
   this->AST_ConcreteType::destroy ();
 }
@@ -182,17 +182,13 @@ AST_String::destroy (void)
 // Data accessors.
 
 AST_Expression *
-AST_String::max_size (void)
+AST_String::max_size ()
 {
   return this->pd_max_size;
 }
 
 long
-AST_String::width (void)
+AST_String::width ()
 {
   return this->pd_width;
 }
-
-
-
-IMPL_NARROW_FROM_DECL(AST_String)
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
index 0bd62aa3c8c..ded678d4057 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -95,7 +95,7 @@ AST_Structure::AST_Structure (UTL_ScopedName *n,
     UTL_Scope (AST_Decl::NT_struct),
     member_count_ (-1),
     local_struct_ (-1),
-    fwd_decl_ (0)
+    fwd_decl_ (nullptr)
 {
 }
 
@@ -114,11 +114,11 @@ AST_Structure::AST_Structure (AST_Decl::NodeType nt,
     UTL_Scope (nt),
     member_count_ (-1),
     local_struct_ (-1),
-    fwd_decl_ (0)
+    fwd_decl_ (nullptr)
 {
 }
 
-AST_Structure::~AST_Structure (void)
+AST_Structure::~AST_Structure ()
 {
   destroy ();
 }
@@ -159,9 +159,9 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
            !si.is_done ();
            si.next ())
         {
-          AST_Field *field = AST_Field::narrow_from_decl (si.item ());
+          AST_Field *field = dynamic_cast<AST_Field*> (si.item ());
 
-          if (field == 0)
+          if (field == nullptr)
             // This will be an enum value or other legitimate non-field
             // member - in any case, no recursion.
             {
@@ -172,11 +172,11 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
           if (type->node_type () == AST_Decl::NT_typedef)
             {
-              AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+              AST_Typedef *td = dynamic_cast<AST_Typedef*> (type);
               type = td->primitive_base_type ();
             }
 
-          if (type == 0)
+          if (type == nullptr)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("(%N:%l) AST_Structure::")
@@ -202,7 +202,7 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 }
 
 int
-AST_Structure::member_count (void)
+AST_Structure::member_count ()
 {
   if (this->member_count_ == -1)
     {
@@ -213,7 +213,7 @@ AST_Structure::member_count (void)
 }
 
 ACE_CDR::ULong
-AST_Structure::nfields (void) const
+AST_Structure::nfields () const
 {
   return ACE_Utils::truncate_cast<ACE_CDR::ULong> (this->fields_.size ());
 }
@@ -226,7 +226,7 @@ AST_Structure::field (AST_Field **&result,
 }
 
 bool
-AST_Structure::is_local (void)
+AST_Structure::is_local ()
 {
   if (this->local_struct_ == -1)
     {
@@ -259,7 +259,7 @@ AST_Structure::is_local (void)
 }
 
 int
-AST_Structure::contains_wstring (void)
+AST_Structure::contains_wstring ()
 {
   if (this->contains_wstring_ == -1)
     {
@@ -281,13 +281,13 @@ AST_Structure::contains_wstring (void)
 }
 
 bool
-AST_Structure::is_defined (void)
+AST_Structure::is_defined ()
 {
-  return 0 == this->fwd_decl_ || this->fwd_decl_->is_defined ();
+  return nullptr == this->fwd_decl_ || this->fwd_decl_->is_defined ();
 }
 
 bool
-AST_Structure::legal_for_primary_key (void) const
+AST_Structure::legal_for_primary_key () const
 {
   bool retval = true;
 
@@ -300,9 +300,9 @@ AST_Structure::legal_for_primary_key (void) const
           !si.is_done ();
           si.next ())
         {
-          AST_Field *f = AST_Field::narrow_from_decl (si.item ());
+          AST_Field *f = dynamic_cast<AST_Field*> (si.item ());
 
-          if (f != 0 && !f->field_type ()->legal_for_primary_key ())
+          if (f != nullptr && !f->field_type ()->legal_for_primary_key ())
             {
               retval = false;
               break;
@@ -316,7 +316,7 @@ AST_Structure::legal_for_primary_key (void) const
 }
 
 AST_StructureFwd *
-AST_Structure::fwd_decl (void) const
+AST_Structure::fwd_decl () const
 {
   return this->fwd_decl_;
 }
@@ -328,7 +328,7 @@ AST_Structure::fwd_decl (AST_StructureFwd *node)
 }
 
 ACE_Unbounded_Queue<AST_Field *> &
-AST_Structure::fields (void)
+AST_Structure::fields ()
 {
   return this->fields_;
 }
@@ -350,17 +350,13 @@ AST_Structure::fe_add_structure (AST_Structure *t)
 AST_Union *
 AST_Structure::fe_add_union (AST_Union *t)
 {
-  return
-    AST_Union::narrow_from_decl (
-      this->fe_add_full_struct_type (t));
+  return dynamic_cast<AST_Union*> (this->fe_add_full_struct_type (t));
 }
 
 AST_Enum *
 AST_Structure::fe_add_enum (AST_Enum *t)
 {
-  return
-    AST_Enum::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Enum*> (this->fe_add_decl (t));
 }
 
 // Add this AST_EnumVal node (an enumerator declaration) to this scope.
@@ -370,14 +366,12 @@ AST_Structure::fe_add_enum (AST_Enum *t)
 AST_EnumVal *
 AST_Structure::fe_add_enum_val (AST_EnumVal *t)
 {
-  return
-    AST_EnumVal::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_EnumVal*> (this->fe_add_decl (t));
 }
 
 // Compute total number of members.
 int
-AST_Structure::compute_member_count (void)
+AST_Structure::compute_member_count ()
 {
   this->member_count_ = 0;
 
@@ -418,7 +412,7 @@ void
 AST_Structure::fwd_redefinition_helper (AST_Structure *&i,
                                         UTL_Scope *s)
 {
-  if (i == 0)
+  if (i == nullptr)
     {
       return;
     }
@@ -428,9 +422,9 @@ AST_Structure::fwd_redefinition_helper (AST_Structure *&i,
   AST_Decl *d =
     s->lookup_by_name_local (i->local_name (), false);
 
-  AST_Structure *fd = 0;
+  AST_Structure *fd = nullptr;
 
-  if (d != 0)
+  if (d != nullptr)
     {
       // Full definition must have the same prefix as the forward declaration.
       if (ACE_OS::strcmp (i->prefix (), d->prefix ()) != 0)
@@ -450,7 +444,7 @@ AST_Structure::fwd_redefinition_helper (AST_Structure *&i,
           || nt == AST_Decl::NT_union_fwd)
         {
           AST_StructureFwd *fwd_def =
-            AST_StructureFwd::narrow_from_decl (d);
+            dynamic_cast<AST_StructureFwd*> (d);
 
           fd = fwd_def->full_definition ();
         }
@@ -458,11 +452,11 @@ AST_Structure::fwd_redefinition_helper (AST_Structure *&i,
       else if (nt == AST_Decl::NT_struct
                || nt == AST_Decl::NT_union)
         {
-          fd = AST_Structure::narrow_from_decl (d);
+          fd = dynamic_cast<AST_Structure*> (d);
         }
 
       // Successful?
-      if (fd == 0)
+      if (fd == nullptr)
         {
           // Should we give an error here?
           // No, look in fe_add_interface.
@@ -498,7 +492,7 @@ AST_Structure::fwd_redefinition_helper (AST_Structure *&i,
               fd->redefine (i);
               AST_StructureFwd *fwd = fd->fwd_decl ();
 
-              if (0 != fwd)
+              if (nullptr != fwd)
                 {
                   // So the fwd decl won't destroy us at cleanup time.
                   // Unlike interfaces, valuetypes and components, it's
@@ -538,7 +532,7 @@ AST_Structure::redefine (AST_Structure *from)
 
 // Compute the size type of the node in question.
 int
-AST_Structure::compute_size_type (void)
+AST_Structure::compute_size_type ()
 {
   for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
        !si.is_done ();
@@ -552,10 +546,10 @@ AST_Structure::compute_size_type (void)
           continue;
         }
 
-      AST_Field *f = AST_Field::narrow_from_decl (d);
+      AST_Field *f = dynamic_cast<AST_Field*> (d);
       AST_Type *t = f->field_type ();
 
-      if (t != 0)
+      if (t != nullptr)
         {
           this->size_type (t->size_type ());
 
@@ -566,7 +560,7 @@ AST_Structure::compute_size_type (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "WARNING (%N:%l) be_structure::compute_size_type - "
-                      "narrow_from_decl returned 0\n"));
+                      "dynamic_cast returned 0\n"));
         }
     }
 
@@ -580,15 +574,12 @@ AST_Structure::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Structure::destroy (void)
+AST_Structure::destroy ()
 {
   this->AST_ConcreteType::destroy ();
   this->UTL_Scope::destroy ();
 }
 
-IMPL_NARROW_FROM_DECL(AST_Structure)
-IMPL_NARROW_FROM_SCOPE(AST_Structure)
-
 bool AST_Structure::annotatable () const
 {
   return true;
@@ -600,7 +591,7 @@ AST_Structure::operator[] (const size_t index)
   size_t count = member_count_ <= 0 ? 0 : member_count_;
   if (index >= count)
     {
-      return 0;
+      return nullptr;
     }
   size_t i = 0;
   for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
@@ -613,7 +604,7 @@ AST_Structure::operator[] (const size_t index)
         }
       i++;
     }
-  return 0;
+  return nullptr;
 }
 
 AST_Decl *
@@ -629,5 +620,5 @@ AST_Structure::operator[] (const char* name)
         return field;
       }
     }
-  return 0;
+  return nullptr;
 }
diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
index 6f444e67dae..86543660d4c 100644
--- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
@@ -23,7 +23,7 @@ AST_StructureFwd::AST_StructureFwd (AST_Structure *full_defn,
 {
 }
 
-AST_StructureFwd::~AST_StructureFwd (void)
+AST_StructureFwd::~AST_StructureFwd ()
 {
 }
 
@@ -46,7 +46,7 @@ AST_StructureFwd::ast_accept (ast_visitor *visitor)
 // Data accessors.
 
 AST_Structure *
-AST_StructureFwd::full_definition (void)
+AST_StructureFwd::full_definition ()
 {
   return this->pd_full_definition;
 }
@@ -63,32 +63,32 @@ AST_StructureFwd::set_full_definition (AST_Structure *nfd)
 }
 
 bool
-AST_StructureFwd::is_defined (void)
+AST_StructureFwd::is_defined ()
 {
   return this->is_defined_;
 }
 
 void
-AST_StructureFwd::set_as_defined (void)
+AST_StructureFwd::set_as_defined ()
 {
   this->is_defined_ = true;
 }
 
 void
-AST_StructureFwd::destroy (void)
+AST_StructureFwd::destroy ()
 {
-  if (!this->is_defined_ && 0 != this->pd_full_definition)
+  if (!this->is_defined_ && nullptr != this->pd_full_definition)
     {
       this->pd_full_definition->destroy ();
       delete this->pd_full_definition;
-      this->pd_full_definition = 0;
+      this->pd_full_definition = nullptr;
     }
 
   this->AST_Type::destroy ();
 }
 
 bool
-AST_StructureFwd::is_fwd (void)
+AST_StructureFwd::is_fwd ()
 {
   return true; // This is a fwd declared type
 }
@@ -104,10 +104,8 @@ AST_StructureFwd::adjust_found (
   if (ignore_fwd)
     {
       AST_Structure *s = this->full_definition ();
-      return (full_def_only && !s->is_defined () ? 0 : s);
+      return (full_def_only && !s->is_defined () ? nullptr : s);
     }
 
   return this;
 }
-
-IMPL_NARROW_FROM_DECL (AST_StructureFwd)
diff --git a/TAO/TAO_IDL/ast/ast_template_module.cpp b/TAO/TAO_IDL/ast/ast_template_module.cpp
index 364040dc4ca..6383e2167bf 100644
--- a/TAO/TAO_IDL/ast/ast_template_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module.cpp
@@ -29,12 +29,12 @@ AST_Template_Module::AST_Template_Module (
 {
 }
 
-AST_Template_Module::~AST_Template_Module (void)
+AST_Template_Module::~AST_Template_Module ()
 {
 }
 
 FE_Utils::T_PARAMLIST_INFO *
-AST_Template_Module::template_params (void) const
+AST_Template_Module::template_params () const
 {
   return this->template_params_;
 }
@@ -55,30 +55,28 @@ AST_Template_Module::match_arg_names (FE_Utils::T_ARGLIST *args)
        !i.done ();
        i.advance (), ++slot)
     {
-      AST_Decl **item = 0;
+      AST_Decl **item = nullptr;
       i.next (item);
       AST_Decl *d = *item;
 
       if (d->node_type () == AST_Decl::NT_typedef)
         {
-          AST_Typedef *td =
-            AST_Typedef::narrow_from_decl (d);
+          AST_Typedef *td = dynamic_cast<AST_Typedef*> (d);
 
           d = td->primitive_base_type ();
         }
 
-      FE_Utils::T_Param_Info *param = 0;
+      FE_Utils::T_Param_Info *param = nullptr;
       (void) this->template_params_->get (param, slot);
-      const char *s = 0;
+      const char *s = nullptr;
 
       if (! this->match_one_param (param, d))
         {
           UTL_ScopedName *n = d->name ();
 
-          if (n == 0)
+          if (n == nullptr)
             {
-              AST_Constant *c =
-                AST_Constant::narrow_from_decl (d);
+              AST_Constant *c = dynamic_cast<AST_Constant*> (d);
 
               s = c->exprtype_to_string ();
             }
@@ -101,15 +99,15 @@ AST_Template_Module::match_param_refs (UTL_StrList *refs,
                                        UTL_Scope *decl_scope)
 {
   UTL_Scope *s = decl_scope;
-  AST_Template_Module *enclosing = 0;
+  AST_Template_Module *enclosing = nullptr;
 
-  while (enclosing == 0 && s != 0)
+  while (enclosing == nullptr && s != nullptr)
     {
-      enclosing = AST_Template_Module::narrow_from_scope (s);
+      enclosing = dynamic_cast<AST_Template_Module*> (s);
       s = ScopeAsDecl (s)->defined_in ();
     }
 
-  if (enclosing == 0)
+  if (enclosing == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("AST_Template_Module::")
@@ -126,7 +124,7 @@ AST_Template_Module::match_param_refs (UTL_StrList *refs,
       FE_Utils::T_Param_Info *enclosing_param =
         enclosing->find_param (i.item ());
 
-      if (enclosing_param == 0)
+      if (enclosing_param == nullptr)
         {
           // Enclosing param not found
           return false;
@@ -143,10 +141,10 @@ AST_Template_Module::match_param_refs (UTL_StrList *refs,
 }
 
 void
-AST_Template_Module::destroy (void)
+AST_Template_Module::destroy ()
 {
   delete this->template_params_;
-  this->template_params_ = 0;
+  this->template_params_ = nullptr;
 
   this->AST_Module::destroy ();
 }
@@ -161,9 +159,7 @@ AST_Template_Module_Ref *
 AST_Template_Module::fe_add_template_module_ref (
   AST_Template_Module_Ref *m)
 {
-  return
-    AST_Template_Module_Ref::narrow_from_decl (
-      this->fe_add_ref_decl (m));
+  return dynamic_cast<AST_Template_Module_Ref*> (this->fe_add_ref_decl (m));
 }
 
 void
@@ -182,7 +178,7 @@ AST_Template_Module::match_one_param (FE_Utils::T_Param_Info *param,
 
   if (d->node_type () == AST_Decl::NT_typedef)
     {
-      AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+      AST_Typedef *td = dynamic_cast<AST_Typedef*> (d);
       d = td->primitive_base_type ();
     }
 
@@ -190,8 +186,7 @@ AST_Template_Module::match_one_param (FE_Utils::T_Param_Info *param,
 
   if (other_type == AST_Decl::NT_const)
     {
-      AST_Constant *c =
-        AST_Constant::narrow_from_decl (d);
+      AST_Constant *c = dynamic_cast<AST_Constant*> (d);
 
       AST_Expression *ex = c->constant_value ();
 
@@ -199,15 +194,15 @@ AST_Template_Module::match_one_param (FE_Utils::T_Param_Info *param,
         ex->check_and_coerce (param->const_type_,
                               param->enum_const_type_decl_);
 
-      if (ev == 0)
+      if (ev == nullptr)
         {
           idl_global->err ()->coercion_error (ex,
                                               param->const_type_);
         }
 
-      bool retval = (ev != 0);
+      bool retval = (ev != nullptr);
       delete ev;
-      ev = 0;
+      ev = nullptr;
       return retval;
     }
 
@@ -222,7 +217,7 @@ AST_Template_Module::find_param (UTL_String *name)
        !i.done ();
        i.advance ())
     {
-      FE_Utils::T_Param_Info *param = 0;
+      FE_Utils::T_Param_Info *param = nullptr;
       i.next (param);
 
       if (param->name_ == name->get_string ())
@@ -231,7 +226,7 @@ AST_Template_Module::find_param (UTL_String *name)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 bool
@@ -243,7 +238,7 @@ AST_Template_Module::match_param_by_type (
        !i.done ();
        i.advance ())
     {
-      FE_Utils::T_Param_Info *my_param = 0;
+      FE_Utils::T_Param_Info *my_param = nullptr;
       i.next (my_param);
 
       if (param->type_ == my_param->type_)
@@ -278,7 +273,3 @@ AST_Template_Module::match_param_by_type (
 
   return false;
 }
-
-IMPL_NARROW_FROM_DECL (AST_Template_Module)
-IMPL_NARROW_FROM_SCOPE (AST_Template_Module)
-
diff --git a/TAO/TAO_IDL/ast/ast_template_module_inst.cpp b/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
index 1156d1b020d..cc973cd8e82 100644
--- a/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
@@ -20,19 +20,18 @@ AST_Template_Module_Inst::AST_Template_Module_Inst (
 {
 }
 
-AST_Template_Module_Inst::~AST_Template_Module_Inst (void)
+AST_Template_Module_Inst::~AST_Template_Module_Inst ()
 {
 }
 
 AST_Template_Module *
-AST_Template_Module_Inst::ref (void) const
+AST_Template_Module_Inst::ref () const
 {
-  return
-    AST_Template_Module::narrow_from_decl (this->field_type ());
+  return dynamic_cast<AST_Template_Module*> (this->field_type ());
 }
 
 FE_Utils::T_ARGLIST const *
-AST_Template_Module_Inst::template_args (void) const
+AST_Template_Module_Inst::template_args () const
 {
   return this->template_args_;
 }
@@ -44,11 +43,11 @@ AST_Template_Module_Inst::dump (ACE_OSTREAM_TYPE &)
 }
 
 void
-AST_Template_Module_Inst::destroy (void)
+AST_Template_Module_Inst::destroy ()
 {
   this->template_args_->destroy ();
   delete this->template_args_;
-  this->template_args_ = 0;
+  this->template_args_ = nullptr;
 
   this->AST_Field::destroy ();
 }
@@ -58,6 +57,3 @@ AST_Template_Module_Inst::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_template_module_inst (this);
 }
-
-IMPL_NARROW_FROM_DECL (AST_Template_Module_Inst)
-
diff --git a/TAO/TAO_IDL/ast/ast_template_module_ref.cpp b/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
index 4110fe518d6..b12bc7100e6 100644
--- a/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
@@ -23,19 +23,18 @@ AST_Template_Module_Ref::AST_Template_Module_Ref (
 {
 }
 
-AST_Template_Module_Ref::~AST_Template_Module_Ref (void)
+AST_Template_Module_Ref::~AST_Template_Module_Ref ()
 {
 }
 
 AST_Template_Module *
-AST_Template_Module_Ref::ref (void) const
+AST_Template_Module_Ref::ref () const
 {
-  return
-    AST_Template_Module::narrow_from_decl (this->field_type ());
+  return dynamic_cast<AST_Template_Module*> (this->field_type ());
 }
 
 UTL_StrList *
-AST_Template_Module_Ref::param_refs (void) const
+AST_Template_Module_Ref::param_refs () const
 {
   return this->param_refs_;
 }
@@ -47,11 +46,11 @@ AST_Template_Module_Ref::dump (ACE_OSTREAM_TYPE &)
 }
 
 void
-AST_Template_Module_Ref::destroy (void)
+AST_Template_Module_Ref::destroy ()
 {
   this->param_refs_->destroy ();
   delete this->param_refs_;
-  this->param_refs_ = 0;
+  this->param_refs_ = nullptr;
 
   this->AST_Field::destroy ();
 }
@@ -73,11 +72,11 @@ AST_Template_Module_Ref::adjust_found (
   bool ignore_fwd,
   bool /*full_def_only*/)
 {
-  return ignore_fwd ? 0 : this;
+  return ignore_fwd ? nullptr : this;
 }
 
 bool
-AST_Template_Module_Ref::processed (void) const
+AST_Template_Module_Ref::processed () const
 {
   return this->processed_;
 }
@@ -87,6 +86,3 @@ AST_Template_Module_Ref::processed (bool val)
 {
   this->processed_ = val;
 }
-
-IMPL_NARROW_FROM_DECL (AST_Template_Module_Ref)
-
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 899ab6257ca..282635fe6f9 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -81,17 +81,17 @@ AST_Type::AST_Type (AST_Decl::NodeType nt,
   : COMMON_Base (),
     AST_Decl (nt,
               n),
-    ifr_added_ (0),
-    ifr_fwd_added_ (0),
+    ifr_added_ (false),
+    ifr_fwd_added_ (false),
     size_type_ (AST_Type::SIZE_UNKNOWN),
-    has_constructor_ (0),
-    nested_type_name_ (0),
+    has_constructor_ (false),
+    nested_type_name_ (nullptr),
     in_recursion_ (-1),
     recursing_in_legal_pk_ (false)
 {
 }
 
-AST_Type::~AST_Type (void)
+AST_Type::~AST_Type ()
 {
   destroy ();
 }
@@ -100,7 +100,7 @@ AST_Type::~AST_Type (void)
 
 // Return our size type.
 AST_Type::SIZE_TYPE
-AST_Type::size_type (void)
+AST_Type::size_type ()
 {
   if (this->size_type_ == AST_Type::SIZE_UNKNOWN)
     {
@@ -131,7 +131,7 @@ AST_Type::size_type (AST_Type::SIZE_TYPE st)
 
 // Compute the size type of the node in question
 int
-AST_Type::compute_size_type (void)
+AST_Type::compute_size_type ()
 {
   return 0;
 }
@@ -140,11 +140,11 @@ bool
 AST_Type::in_recursion (ACE_Unbounded_Queue<AST_Type *> & /*list*/)
 {
   // By default we are not involved in recursion.
-  return 0;
+  return false;
 }
 
 bool
-AST_Type::ifr_added (void)
+AST_Type::ifr_added ()
 {
   return this->ifr_added_;
 }
@@ -156,7 +156,7 @@ AST_Type::ifr_added (bool val)
 }
 
 bool
-AST_Type::ifr_fwd_added (void)
+AST_Type::ifr_fwd_added ()
 {
   return this->ifr_fwd_added_;
 }
@@ -168,7 +168,7 @@ AST_Type::ifr_fwd_added (bool val)
 }
 
 bool
-AST_Type::has_constructor (void)
+AST_Type::has_constructor ()
 {
   return this->has_constructor_;
 }
@@ -209,15 +209,15 @@ AST_Type::nested_type_name (AST_Decl *use_scope,
 }
 
 AST_Type *
-AST_Type::unaliased_type (void)
+AST_Type::unaliased_type ()
 {
   AST_Type *t = this;
-  AST_Typedef *td = 0;
+  AST_Typedef *td = nullptr;
   AST_Decl::NodeType nt = this->node_type ();
 
   while (nt == AST_Decl::NT_typedef)
     {
-      td = AST_Typedef::narrow_from_decl (t);
+      td = dynamic_cast<AST_Typedef*> (t);
       t = td->base_type ();
       nt = t->node_type ();
     }
@@ -226,7 +226,7 @@ AST_Type::unaliased_type (void)
 }
 
 bool
-AST_Type::legal_for_primary_key (void) const
+AST_Type::legal_for_primary_key () const
 {
   return true;
 }
@@ -252,11 +252,11 @@ AST_Type::nested_name (const char* local_name,
 
   // Thus we need some sort of relative name to be generated.
 
-  if (this->nested_type_name_ == 0)
+  if (this->nested_type_name_ == nullptr)
     {
       ACE_NEW_RETURN (this->nested_type_name_,
                       char[NAMEBUFSIZE],
-                      0);
+                      nullptr);
     }
 
   // Hold the fully scoped name.
@@ -265,9 +265,9 @@ AST_Type::nested_name (const char* local_name,
 
   // These point to the prev, curr and next component in the scope.
   char *def_curr = def_name;
-  char *def_next = 0;
+  char *def_next = nullptr;
   char *use_curr = use_name;
-  char *use_next = 0;
+  char *use_next = nullptr;
 
   // How many chars to compare.
   int len_to_match = 0;
@@ -296,12 +296,12 @@ AST_Type::nested_name (const char* local_name,
   // CORBA namespace, replacing the ad hoc spot
   // generations of "::" here and there, which have now been removed.
   UTL_Scope *s = this->defined_in ();
-  AST_Decl *def_scope = s != 0 ? ScopeAsDecl (s) : 0;
+  AST_Decl *def_scope = s != nullptr ? ScopeAsDecl (s) : nullptr;
 
   // TypeCode is a special case for predefined types, since it's
   // defined in the CORBA module.
   bool in_root =
-    (def_scope != 0 && def_scope->node_type () == AST_Decl::NT_root)
+    (def_scope != nullptr && def_scope->node_type () == AST_Decl::NT_root)
     || ((this->node_type () == AST_Decl::NT_pre_defined
         && ACE_OS::strcmp (this->flat_name (), "CORBA_TypeCode") == 0));
 
@@ -313,7 +313,7 @@ AST_Type::nested_name (const char* local_name,
       ACE_OS::strcat (this->nested_type_name_, "::");
     }
 
-  if (def_scope != 0 && !in_root && use_scope != 0)
+  if (def_scope != nullptr && !in_root && use_scope != nullptr)
     // If both scopes exist and that we are not in the root scope.
     {
       ACE_OS::strcpy (def_name,
@@ -330,7 +330,7 @@ AST_Type::nested_name (const char* local_name,
       // If the scopes are identical, don't supply them.
       if  (ACE_OS::strcmp (def_name, use_name) == 0)
         {
-          if (prefix != 0)
+          if (prefix != nullptr)
             {
               ACE_OS::strcat (this->nested_type_name_,
                               prefix);
@@ -338,7 +338,7 @@ AST_Type::nested_name (const char* local_name,
 
           ACE_OS::strcat (this->nested_type_name_,
                           local_name);
-          if (suffix != 0)
+          if (suffix != nullptr)
             {
               ACE_OS::strcat (this->nested_type_name_,
                               suffix);
@@ -347,7 +347,7 @@ AST_Type::nested_name (const char* local_name,
           return this->nested_type_name_;
         }
 
-      if (def_next != 0)
+      if (def_next != nullptr)
         {
           len_to_match =
             static_cast<int> (ACE_OS::strlen (def_curr)) -
@@ -358,7 +358,7 @@ AST_Type::nested_name (const char* local_name,
           len_to_match = static_cast<int> (ACE_OS::strlen (def_curr));
         }
 
-      if (use_next != 0)
+      if (use_next != nullptr)
         {
           const int len =
             static_cast<int> (ACE_OS::strlen (use_curr)) -
@@ -390,8 +390,8 @@ AST_Type::nested_name (const char* local_name,
                            len_to_match);
 
           // Shift the current scopes to the next level.
-          def_curr = (def_next ? (def_next + 2) : 0); // Skip the ::
-          use_curr = (use_next ? (use_next + 2) : 0); // Skip the ::
+          def_curr = (def_next ? (def_next + 2) : nullptr); // Skip the ::
+          use_curr = (use_next ? (use_next + 2) : nullptr); // Skip the ::
 
           while (def_curr && use_curr)
             {
@@ -400,7 +400,7 @@ AST_Type::nested_name (const char* local_name,
               def_next = ACE_OS::strstr (def_curr, "::");
               use_next = ACE_OS::strstr (use_curr, "::");
 
-              if (def_next != 0)
+              if (def_next != nullptr)
                 {
                   len_to_match =
                     static_cast<int> (ACE_OS::strlen (def_curr)) -
@@ -411,7 +411,7 @@ AST_Type::nested_name (const char* local_name,
                   len_to_match = static_cast<int> (ACE_OS::strlen (def_curr));
                 }
 
-              if (use_next != 0)
+              if (use_next != nullptr)
                 {
                   int len  =
                     static_cast<int> (ACE_OS::strlen (use_curr)) -
@@ -445,8 +445,8 @@ AST_Type::nested_name (const char* local_name,
                                    def_curr,
                                    len_to_match);
 
-                  def_curr = (def_next ? (def_next + 2) : 0); // Skip the ::
-                  use_curr = (use_next ? (use_next + 2) : 0); // Skip the ::
+                  def_curr = (def_next ? (def_next + 2) : nullptr); // Skip the ::
+                  use_curr = (use_next ? (use_next + 2) : nullptr); // Skip the ::
                 }
               else
                 {
@@ -460,7 +460,7 @@ AST_Type::nested_name (const char* local_name,
           ACE_OS::strcat (this->nested_type_name_, "::");
 
           // Copy the remaining def_name (if any are left).
-          if (def_curr != 0)
+          if (def_curr != nullptr)
             {
               ACE_OS::strcat (this->nested_type_name_,
                               def_curr);
@@ -470,7 +470,7 @@ AST_Type::nested_name (const char* local_name,
             }
 
           // Append our local name.
-          if (prefix != 0)
+          if (prefix != nullptr)
             {
               ACE_OS::strcat (this->nested_type_name_, prefix);
             }
@@ -478,7 +478,7 @@ AST_Type::nested_name (const char* local_name,
           ACE_OS::strcat (this->nested_type_name_,
                           local_name);
 
-          if (suffix != 0)
+          if (suffix != nullptr)
             {
               ACE_OS::strcat (this->nested_type_name_,
                               suffix);
@@ -489,7 +489,7 @@ AST_Type::nested_name (const char* local_name,
     }
 
   // Otherwise just emit our full_name.
-  if (prefix != 0)
+  if (prefix != nullptr)
     {
       ACE_OS::strcat (this->nested_type_name_, prefix);
     }
@@ -497,7 +497,7 @@ AST_Type::nested_name (const char* local_name,
   ACE_OS::strcat (this->nested_type_name_,
                   full_name);
 
-  if (suffix != 0)
+  if (suffix != nullptr)
     {
       ACE_OS::strcat (this->nested_type_name_,
                       suffix);
@@ -514,7 +514,7 @@ AST_Type::match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list)
        (void) iter.advance ())
     {
       // Queue element.
-      AST_Type **temp = 0;
+      AST_Type **temp = nullptr;
 
       (void) iter.next (temp);
 
@@ -535,12 +535,10 @@ AST_Type::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Type::destroy (void)
+AST_Type::destroy ()
 {
   delete [] this->nested_type_name_;
-  this->nested_type_name_ = 0;
+  this->nested_type_name_ = nullptr;
 
   this->AST_Decl::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_Type)
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
index 4d682812334..4e5bca93988 100644
--- a/TAO/TAO_IDL/ast/ast_typedef.cpp
+++ b/TAO/TAO_IDL/ast/ast_typedef.cpp
@@ -97,22 +97,22 @@ AST_Typedef::AST_Typedef (AST_Type *bt,
 {
 }
 
-AST_Typedef::~AST_Typedef (void)
+AST_Typedef::~AST_Typedef ()
 {
 }
 
 // Given a typedef node, traverse the chain of base types until they are no
 // more typedefs, and return that most primitive base type.
 AST_Type *
-AST_Typedef::primitive_base_type (void) const
+AST_Typedef::primitive_base_type () const
 {
   AST_Type *d = const_cast<AST_Typedef *> (this);
-  AST_Typedef *temp = 0;
+  AST_Typedef *temp = nullptr;
 
   while (d && d->node_type () == AST_Decl::NT_typedef)
     {
-      temp = AST_Typedef::narrow_from_decl (d);
-      d = AST_Type::narrow_from_decl (temp->base_type ());
+      temp = dynamic_cast<AST_Typedef*> (d);
+      d = dynamic_cast<AST_Type*> (temp->base_type ());
     }
 
   return d;
@@ -121,25 +121,25 @@ AST_Typedef::primitive_base_type (void) const
 // Redefinition of inherited virtual operations.
 
 AST_Type *
-AST_Typedef::base_type (void) const
+AST_Typedef::base_type () const
 {
   return this->ref_type_;
 }
 
 bool
-AST_Typedef::legal_for_primary_key (void) const
+AST_Typedef::legal_for_primary_key () const
 {
   return this->primitive_base_type ()->legal_for_primary_key ();
 }
 
 bool
-AST_Typedef::is_local (void)
+AST_Typedef::is_local ()
 {
   return this->ref_type_->is_local ();
 }
 
 bool
-AST_Typedef::owns_base_type (void) const
+AST_Typedef::owns_base_type () const
 {
   return this->owns_base_type_;
 }
@@ -162,11 +162,11 @@ AST_Typedef::dump (ACE_OSTREAM_TYPE &o)
 
 // Compute the size type of the node in question.
 int
-AST_Typedef::compute_size_type (void)
+AST_Typedef::compute_size_type ()
 {
   AST_Type *type = this->ref_type_;
 
-  if (type == 0)
+  if (type == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_typedef::compute_size_type - "
@@ -190,14 +190,12 @@ AST_Typedef::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Typedef::destroy (void)
+AST_Typedef::destroy ()
 {
   this->AST_Field::destroy ();
   this->AST_Type::destroy ();
 }
 
-IMPL_NARROW_FROM_DECL(AST_Typedef)
-
 AST_Annotation_Appls &
 AST_Typedef::annotations ()
 {
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
index ba352d8d7e6..08606bab3db 100644
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ b/TAO/TAO_IDL/ast/ast_union.cpp
@@ -109,11 +109,11 @@ AST_Union::AST_Union (AST_ConcreteType *dt,
 {
   this->default_value_.computed_ = -2;
 
-  AST_PredefinedType *pdt = 0;
+  AST_PredefinedType *pdt = nullptr;
 
-  if (dt == 0)
+  if (dt == nullptr)
     {
-      this->pd_disc_type = 0;
+      this->pd_disc_type = nullptr;
       this->pd_udisc_type = AST_Expression::EV_none;
       return;
     }
@@ -123,11 +123,11 @@ AST_Union::AST_Union (AST_ConcreteType *dt,
   // the pd_udisc_type field.
   if (dt->node_type () == AST_Decl::NT_pre_defined)
     {
-      pdt = AST_PredefinedType::narrow_from_decl (dt);
+      pdt = dynamic_cast<AST_PredefinedType*> (dt);
 
-      if (pdt == 0)
+      if (pdt == nullptr)
         {
-          this->pd_disc_type = 0;
+          this->pd_disc_type = nullptr;
           this->pd_udisc_type = AST_Expression::EV_none;
           return;
         }
@@ -168,7 +168,7 @@ AST_Union::AST_Union (AST_ConcreteType *dt,
           break;
         default:
           this->pd_udisc_type = AST_Expression::EV_none;
-          this->pd_disc_type = 0;
+          this->pd_disc_type = nullptr;
           break;
         }
     }
@@ -180,10 +180,10 @@ AST_Union::AST_Union (AST_ConcreteType *dt,
   else
     {
       this->pd_udisc_type = AST_Expression::EV_none;
-      this->pd_disc_type = 0;
+      this->pd_disc_type = nullptr;
     }
 
-  if (this->pd_disc_type == 0)
+  if (this->pd_disc_type == nullptr)
     {
       idl_global->err ()->error2 (UTL_Error::EIDL_DISC_TYPE,
                                   this,
@@ -191,7 +191,7 @@ AST_Union::AST_Union (AST_ConcreteType *dt,
     }
 }
 
-AST_Union::~AST_Union (void)
+AST_Union::~AST_Union ()
 {
 }
 
@@ -200,9 +200,9 @@ AST_Union::~AST_Union (void)
 void
 AST_Union::redefine (AST_Structure *from)
 {
-  AST_Union *u = AST_Union::narrow_from_decl (from);
+  AST_Union *u = dynamic_cast<AST_Union*> (from);
 
-  if (u == 0)
+  if (u == nullptr)
     {
       idl_global->err ()->redef_error (from->local_name ()->get_string (),
                                        this->local_name ()->get_string ());
@@ -220,7 +220,7 @@ AST_Union::redefine (AST_Structure *from)
 
 // Return the default_index.
 int
-AST_Union::default_index (void)
+AST_Union::default_index ()
 {
   if (this->default_index_ == -2)
     {
@@ -265,10 +265,9 @@ AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
            !si.is_done ();
            si.next ())
         {
-          AST_UnionBranch *field =
-            AST_UnionBranch::narrow_from_decl (si.item ());
+          AST_UnionBranch *field = dynamic_cast<AST_UnionBranch*> (si.item ());
 
-          if (field == 0)
+          if (field == nullptr)
             // This will be an enum value or other legitimate non-field
             // member - in any case, no recursion.
             {
@@ -279,11 +278,11 @@ AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
           if (type->node_type () == AST_Decl::NT_typedef)
             {
-              AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+              AST_Typedef *td = dynamic_cast<AST_Typedef*> (type);
               type = td->primitive_base_type ();
             }
 
-          if (type == 0)
+          if (type == nullptr)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("(%N:%l) AST_Union::")
@@ -305,15 +304,15 @@ AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
   // Not in recursion.
   if (self_test)
     this->in_recursion_ = 0;
-  return 0;
+  return false;
 }
 
 // Look up the default branch in union.
 AST_UnionBranch *
-AST_Union::lookup_default (void)
+AST_Union::lookup_default ()
 {
-  AST_UnionBranch *b = 0;
-  AST_Decl *d = 0;
+  AST_UnionBranch *b = nullptr;
+  AST_Decl *d = nullptr;
 
   for (UTL_ScopeActiveIterator i (this, UTL_Scope::IK_both);
        !i.is_done();
@@ -323,14 +322,14 @@ AST_Union::lookup_default (void)
 
       if (d->node_type () == AST_Decl::NT_union_branch)
         {
-          b = AST_UnionBranch::narrow_from_decl (d);
+          b = dynamic_cast<AST_UnionBranch*> (d);
 
-          if (b == 0)
+          if (b == nullptr)
             {
               continue;
             }
 
-          if (b->label () != 0
+          if (b->label () != nullptr
               && b->label ()->label_kind () == AST_UnionLabel::UL_default)
             {
               idl_global->err ()->error2 (UTL_Error::EIDL_MULTIPLE_BRANCH,
@@ -341,7 +340,7 @@ AST_Union::lookup_default (void)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Look up a branch by label.
@@ -351,17 +350,17 @@ AST_Union::lookup_label (AST_UnionBranch *b)
   AST_UnionLabel *label = b->label ();
   AST_Expression *lv = label->label_val ();
 
-  if (label->label_val () == 0)
+  if (label->label_val () == nullptr)
     {
       return b;
     }
 
-  AST_Decl *d = 0;
-  AST_UnionBranch *fb = 0;
+  AST_Decl *d = nullptr;
+  AST_UnionBranch *fb = nullptr;
 
   lv->set_ev (lv->coerce (this->pd_udisc_type));
 
-  if (lv->ev () == 0)
+  if (lv->ev () == nullptr)
     {
       idl_global->err ()->eval_error (lv);
       return b;
@@ -375,14 +374,14 @@ AST_Union::lookup_label (AST_UnionBranch *b)
 
       if (d->node_type () == AST_Decl::NT_union_branch)
         {
-          fb = AST_UnionBranch::narrow_from_decl (d);
+          fb = dynamic_cast<AST_UnionBranch*> (d);
 
-          if (fb == 0)
+          if (fb == nullptr)
             {
               continue;
             }
 
-          if (fb->label() != 0
+          if (fb->label() != nullptr
               && fb->label ()->label_kind () == AST_UnionLabel::UL_label
               && fb->label ()->label_val ()->compare (lv))
             {
@@ -394,7 +393,7 @@ AST_Union::lookup_label (AST_UnionBranch *b)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Look up a branch in an enum which is the discriminator type for this
@@ -405,16 +404,16 @@ AST_Union::lookup_enum (AST_UnionBranch *b)
 {
   AST_UnionLabel *label = b->label();
   AST_Expression *lv = label->label_val ();
-  AST_Enum *e = AST_Enum::narrow_from_decl (this->pd_disc_type);
-  AST_Decl *d = 0;
-  AST_UnionBranch       *fb = 0;
+  AST_Enum *e = dynamic_cast<AST_Enum*> (this->pd_disc_type);
+  AST_Decl *d = nullptr;
+  AST_UnionBranch       *fb = nullptr;
 
-  if (e == 0)
+  if (e == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
-  if (lv == 0)
+  if (lv == nullptr)
     {
       return b;
     }
@@ -432,7 +431,7 @@ AST_Union::lookup_enum (AST_UnionBranch *b)
   d = e->lookup_by_name (sn,
                          true);
 
-  if (d == 0 || d->defined_in () != e)
+  if (d == nullptr || d->defined_in () != e)
     {
       idl_global->err ()->enum_val_lookup_failure (this,
                                                    e,
@@ -450,14 +449,14 @@ AST_Union::lookup_enum (AST_UnionBranch *b)
 
       if (d->node_type () == AST_Decl::NT_union_branch)
         {
-          fb = AST_UnionBranch::narrow_from_decl (d);
+          fb = dynamic_cast<AST_UnionBranch*> (d);
 
-          if (fb == 0)
+          if (fb == nullptr)
             {
               continue;
             }
 
-          if (fb->label() != 0
+          if (fb->label() != nullptr
               && fb->label ()->label_kind () == AST_UnionLabel::UL_label
               && fb->label ()->label_val ()->compare (lv))
             {
@@ -469,7 +468,7 @@ AST_Union::lookup_enum (AST_UnionBranch *b)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Look up a branch by value. This is the top level branch label resolution
@@ -478,14 +477,14 @@ AST_Union::lookup_enum (AST_UnionBranch *b)
 AST_UnionBranch *
 AST_Union::lookup_branch (AST_UnionBranch *branch)
 {
-  AST_UnionLabel *label = 0;
+  AST_UnionLabel *label = nullptr;
 
-  if (branch != 0)
+  if (branch != nullptr)
     {
       label = branch->label ();
     }
 
-  if (label != 0)
+  if (label != nullptr)
     {
       if (label->label_kind () == AST_UnionLabel::UL_default)
         {
@@ -501,7 +500,7 @@ AST_Union::lookup_branch (AST_UnionBranch *branch)
       return this->lookup_label (branch);
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Return the default value.
@@ -528,7 +527,7 @@ AST_Union::default_value (AST_Union::DefaultValue &dv)
 
 // Determine the default value (if any).
 int
-AST_Union::compute_default_value (void)
+AST_Union::compute_default_value ()
 {
   // Check if we really need a default value. This will be true if there is an
   // explicit default case OR if an implicit default exists because not all
@@ -548,10 +547,9 @@ AST_Union::compute_default_value (void)
        si.next ())
     {
       // Get the next AST decl node.
-      AST_UnionBranch *ub =
-        AST_UnionBranch::narrow_from_decl (si.item ());
+      AST_UnionBranch *ub = dynamic_cast<AST_UnionBranch*> (si.item ());
 
-      if (ub != 0)
+      if (ub != nullptr)
         {
           // If the label is a case label, increment by 1.
           for (unsigned long i = 0; i < ub->label_list_length (); ++i)
@@ -688,7 +686,7 @@ AST_Union::compute_default_value (void)
       this->default_value_.u.wchar_val = 0;
       break;
     case AST_Expression::EV_bool:
-      this->default_value_.u.bool_val = 0;
+      this->default_value_.u.bool_val = false;
       break;
     case AST_Expression::EV_enum:
       this->default_value_.u.enum_val = 0;
@@ -715,10 +713,9 @@ AST_Union::compute_default_value (void)
            si.next ())
         {
           // Get the next AST decl node
-          AST_UnionBranch *ub =
-            AST_UnionBranch::narrow_from_decl (si.item ());
+          AST_UnionBranch *ub = dynamic_cast<AST_UnionBranch*> (si.item ());
 
-          if (ub != 0)
+          if (ub != nullptr)
             {
               for (unsigned long i = 0;
                    i < ub->label_list_length () && !break_loop;
@@ -729,7 +726,7 @@ AST_Union::compute_default_value (void)
                       // Not a default.
                       AST_Expression *expr = ub->label (i)->label_val ();
 
-                      if (expr == 0)
+                      if (expr == nullptr)
                         {
                           // Error.
                           this->default_value_.computed_ = -1;
@@ -865,10 +862,10 @@ AST_Union::compute_default_value (void)
 
 // Compute the default index.
 int
-AST_Union::compute_default_index (void)
+AST_Union::compute_default_index ()
 {
-  AST_Decl *d = 0;
-  AST_UnionBranch *ub = 0;
+  AST_Decl *d = nullptr;
+  AST_UnionBranch *ub = nullptr;
   int i = 0;
 
   // If default case does not exist, it will have a value of -1 according to
@@ -895,7 +892,7 @@ AST_Union::compute_default_index (void)
 
           if (!d->imported ())
             {
-              ub = AST_UnionBranch::narrow_from_decl (d);
+              ub = dynamic_cast<AST_UnionBranch*> (d);
 
               for (unsigned long j = 0; j < ub->label_list_length (); ++j)
                 {
@@ -924,17 +921,13 @@ AST_Union::compute_default_index (void)
 AST_UnionBranch *
 AST_Union::fe_add_union_branch (AST_UnionBranch *t)
 {
-  return
-    AST_UnionBranch::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  return dynamic_cast<AST_UnionBranch*> (this->fe_add_ref_decl (t));
 }
 
 AST_Union *
 AST_Union::fe_add_union (AST_Union *t)
 {
-  return
-    AST_Union::narrow_from_decl (
-      this->fe_add_full_struct_type (t));
+  return dynamic_cast<AST_Union*> (this->fe_add_full_struct_type (t));
 }
 
 AST_Structure *
@@ -946,9 +939,7 @@ AST_Union::fe_add_structure (AST_Structure *t)
 AST_Enum *
 AST_Union::fe_add_enum (AST_Enum *t)
 {
-  return
-    AST_Enum::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_Enum*> (this->fe_add_decl (t));
 }
 
 // Add this AST_EnumVal node (enumerator declaration) to this scope.
@@ -958,9 +949,7 @@ AST_Union::fe_add_enum (AST_Enum *t)
 AST_EnumVal *
 AST_Union::fe_add_enum_val (AST_EnumVal *t)
 {
-  return
-    AST_EnumVal::narrow_from_decl (
-      this->fe_add_decl (t));
+  return dynamic_cast<AST_EnumVal*> (this->fe_add_decl (t));
 }
 
 // Dump this AST_Union node to the ostream o.
@@ -987,7 +976,7 @@ AST_Union::dump (ACE_OSTREAM_TYPE &o)
 
 // Compute the size type of the node in question.
 int
-AST_Union::compute_size_type (void)
+AST_Union::compute_size_type ()
 {
   for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
        !si.is_done ();
@@ -1001,9 +990,9 @@ AST_Union::compute_size_type (void)
           continue;
         }
 
-      AST_Field *f = AST_Field::narrow_from_decl (d);
+      AST_Field *f = dynamic_cast<AST_Field*> (d);
 
-      if (f != 0)
+      if (f != nullptr)
         {
           AST_Type *t = f->field_type ();
           // Our sizetype depends on the sizetype of our members. Although
@@ -1016,7 +1005,7 @@ AST_Union::compute_size_type (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "WARNING (%N:%l) be_union::compute_size_type - "
-                      "narrow_from_decl returned 0\n"));
+                      "dynamic_cast returned 0\n"));
         }
     }
 
@@ -1032,20 +1021,17 @@ AST_Union::ast_accept (ast_visitor *visitor)
 // Data accessors.
 
 AST_ConcreteType *
-AST_Union::disc_type (void)
+AST_Union::disc_type ()
 {
   return this->pd_disc_type;
 }
 
 AST_Expression::ExprType
-AST_Union::udisc_type (void)
+AST_Union::udisc_type ()
 {
   return this->pd_udisc_type;
 }
 
-IMPL_NARROW_FROM_DECL(AST_Union)
-IMPL_NARROW_FROM_SCOPE(AST_Union)
-
 AST_Annotation_Appls &
 AST_Union::disc_annotations ()
 {
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
index e0a205b9a87..e3748740404 100644
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp
@@ -94,7 +94,7 @@ AST_UnionBranch::AST_UnionBranch (UTL_LabelList *ll,
 {
 }
 
-AST_UnionBranch::~AST_UnionBranch (void)
+AST_UnionBranch::~AST_UnionBranch ()
 {
 }
 
@@ -130,17 +130,17 @@ AST_UnionBranch::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_UnionBranch::destroy (void)
+AST_UnionBranch::destroy ()
 {
   this->pd_ll->destroy ();
   delete this->pd_ll;
-  this->pd_ll = 0;
+  this->pd_ll = nullptr;
 
   this->AST_Field::destroy ();
 }
 
 UTL_LabelList *
-AST_UnionBranch::labels (void) const
+AST_UnionBranch::labels () const
 {
   return this->pd_ll;
 }
@@ -162,11 +162,11 @@ AST_UnionBranch::label (unsigned long index)
       ++i;
     }
 
-  return 0;
+  return nullptr;
 }
 
 unsigned long
-AST_UnionBranch::label_list_length (void)
+AST_UnionBranch::label_list_length ()
 {
   if (this->pd_ll)
     {
@@ -211,10 +211,10 @@ AST_UnionBranch::add_labels (AST_Union *u)
       if (enum_labels)
         {
           ex->ev ()->et = AST_Expression::EV_enum;
-          AST_Enum *disc = AST_Enum::narrow_from_decl (u->disc_type ());
+          AST_Enum *disc = dynamic_cast<AST_Enum*> (u->disc_type ());
           AST_EnumVal *dval = disc->lookup_by_value (ex);
 
-          if (dval == 0)
+          if (dval == nullptr)
             {
               idl_global->err ()->incompatible_disc_error (disc, ex);
               throw Bailout ();
@@ -241,5 +241,3 @@ AST_UnionBranch::coerce_labels (AST_Union *u)
       lv->set_ev (lv->coerce (u->udisc_type ()));
     }
 }
-
-IMPL_NARROW_FROM_DECL(AST_UnionBranch)
diff --git a/TAO/TAO_IDL/ast/ast_union_fwd.cpp b/TAO/TAO_IDL/ast/ast_union_fwd.cpp
index df21ba3993a..26b00ec7e71 100644
--- a/TAO/TAO_IDL/ast/ast_union_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_fwd.cpp
@@ -23,7 +23,7 @@ AST_UnionFwd::AST_UnionFwd (AST_Union *dummy,
 {
 }
 
-AST_UnionFwd::~AST_UnionFwd (void)
+AST_UnionFwd::~AST_UnionFwd ()
 {
 }
 
@@ -44,11 +44,7 @@ AST_UnionFwd::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_UnionFwd::destroy (void)
+AST_UnionFwd::destroy ()
 {
   this->AST_StructureFwd::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (AST_UnionFwd)
diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp
index 5dc0ee1ffb3..e84e554fe26 100644
--- a/TAO/TAO_IDL/ast/ast_union_label.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_label.cpp
@@ -79,13 +79,13 @@ AST_UnionLabel::AST_UnionLabel (UnionLabel lk,
   : pd_label_kind (lk),
     pd_label_val (lv)
 {
-    if (lv != 0)
+    if (lv != nullptr)
       {
         lv->evaluate (AST_Expression::EK_const);
       }
 }
 
-AST_UnionLabel::~AST_UnionLabel (void)
+AST_UnionLabel::~AST_UnionLabel ()
 {
 }
 
@@ -112,27 +112,27 @@ AST_UnionLabel::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_UnionLabel::destroy (void)
+AST_UnionLabel::destroy ()
 {
   // Otherwise (default label) our label value is 0.
   if (UL_label == this->pd_label_kind)
     {
       this->pd_label_val->destroy ();
       delete this->pd_label_val;
-      this->pd_label_val = 0;
+      this->pd_label_val = nullptr;
     }
 }
 
 // Data accessors.
 
 AST_UnionLabel::UnionLabel
-AST_UnionLabel::label_kind (void)
+AST_UnionLabel::label_kind ()
 {
   return this->pd_label_kind;
 }
 
 AST_Expression *
-AST_UnionLabel::label_val (void)
+AST_UnionLabel::label_val ()
 {
   return this->pd_label_val;
 }
diff --git a/TAO/TAO_IDL/ast/ast_uses.cpp b/TAO/TAO_IDL/ast/ast_uses.cpp
index 630a313f9ff..14c36fcf911 100644
--- a/TAO/TAO_IDL/ast/ast_uses.cpp
+++ b/TAO/TAO_IDL/ast/ast_uses.cpp
@@ -18,18 +18,18 @@ AST_Uses::AST_Uses (UTL_ScopedName *n,
 {
 }
 
-AST_Uses::~AST_Uses (void)
+AST_Uses::~AST_Uses ()
 {
 }
 
 AST_Type *
-AST_Uses::uses_type (void) const
+AST_Uses::uses_type () const
 {
   return this->field_type ();
 }
 
 bool
-AST_Uses::is_multiple (void) const
+AST_Uses::is_multiple () const
 {
   return this->is_multiple_;
 }
@@ -48,9 +48,7 @@ AST_Uses::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_Uses::destroy (void)
+AST_Uses::destroy ()
 {
   this->AST_Field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_Uses)
diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp
index 9502a41a4ae..f0e70503289 100644
--- a/TAO/TAO_IDL/ast/ast_valuebox.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp
@@ -17,12 +17,12 @@ AST_ValueBox::AST_ValueBox (UTL_ScopedName *n,
 {
 }
 
-AST_ValueBox::~AST_ValueBox (void)
+AST_ValueBox::~AST_ValueBox ()
 {
 }
 
 AST_Type *
-AST_ValueBox::boxed_type (void) const
+AST_ValueBox::boxed_type () const
 {
   return this->pd_boxed_type;
 }
@@ -45,11 +45,7 @@ AST_ValueBox::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_ValueBox::destroy (void)
+AST_ValueBox::destroy ()
 {
   this->AST_ConcreteType::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL(AST_ValueBox)
-
-
diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp
index 2f27d8ed3e6..5bce86c9f98 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp
@@ -68,7 +68,7 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n,
       FE_Utils::tmpl_mod_ref_check (this, supports[i]);
     }
 
-  if (inherits_concrete != 0)
+  if (inherits_concrete != nullptr)
     {
       if (inherits_concrete->node_type () == AST_Decl::NT_param_holder)
         {
@@ -77,7 +77,7 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n,
     }
 }
 
-AST_ValueType::~AST_ValueType (void)
+AST_ValueType::~AST_ValueType ()
 {
 }
 
@@ -109,7 +109,7 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
       else
       {
         // get the head element which is the type being tested
-        AST_Type** recursable_type = 0;
+        AST_Type** recursable_type = nullptr;
         list.get (recursable_type, 0);
         // Check if we are the possibly recursive type being tested
         if (!ACE_OS::strcmp (this->full_name (),
@@ -143,16 +143,16 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
                             0);
         }
 
-      AST_Field *field = AST_Field::narrow_from_decl (d);
+      AST_Field *field = dynamic_cast<AST_Field*> (d);
 
-      if (field == 0)
+      if (field == nullptr)
         {
           continue;
         }
 
       AST_Type *type = field->field_type ();
 
-      if (type == 0)
+      if (type == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_valuetype::in_recursion - "
@@ -162,7 +162,7 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
       if (type->node_type () == AST_Decl::NT_typedef)
         {
-          AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+          AST_Typedef *td = dynamic_cast<AST_Typedef*> (type);
           type = td->primitive_base_type ();
         }
 
@@ -186,9 +186,9 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 void
 AST_ValueType::redefine (AST_Interface *from)
 {
-  AST_ValueType *vt = AST_ValueType::narrow_from_decl (from);
+  AST_ValueType *vt = dynamic_cast<AST_ValueType*> (from);
 
-  if (vt == 0)
+  if (vt == nullptr)
     {
       idl_global->err ()->redef_error (from->local_name ()->get_string (),
                                        this->local_name ()->get_string ());
@@ -204,43 +204,43 @@ AST_ValueType::redefine (AST_Interface *from)
 }
 
 AST_Type **
-AST_ValueType::supports (void) const
+AST_ValueType::supports () const
 {
   return this->pd_supports;
 }
 
 long
-AST_ValueType::n_supports (void) const
+AST_ValueType::n_supports () const
 {
   return this->pd_n_supports;
 }
 
 AST_Type *
-AST_ValueType::inherits_concrete (void) const
+AST_ValueType::inherits_concrete () const
 {
   return this->pd_inherits_concrete;
 }
 
 AST_Type *
-AST_ValueType::supports_concrete (void) const
+AST_ValueType::supports_concrete () const
 {
   return this->pd_supports_concrete;
 }
 
 bool
-AST_ValueType::truncatable (void) const
+AST_ValueType::truncatable () const
 {
   return this->pd_truncatable;
 }
 
 bool
-AST_ValueType::custom (void) const
+AST_ValueType::custom () const
 {
   return this->pd_custom;
 }
 
 bool
-AST_ValueType::will_have_factory (void)
+AST_ValueType::will_have_factory ()
 {
   return false;
 }
@@ -250,15 +250,15 @@ AST_Decl *
 AST_ValueType::look_in_supported (UTL_ScopedName *e,
                                   bool full_def_only)
 {
-  AST_Decl *d = 0;
-  AST_Decl *d_before = 0;
-  AST_Type **is = 0;
+  AST_Decl *d = nullptr;
+  AST_Decl *d_before = nullptr;
+  AST_Type **is = nullptr;
   long nis = -1;
 
   // Can't look in an interface which was not yet defined.
   if (!this->is_defined ())
     {
-      return 0;
+      return nullptr;
     }
 
   // OK, loop through supported interfaces.
@@ -275,14 +275,13 @@ AST_ValueType::look_in_supported (UTL_ScopedName *e,
           continue;
         }
 
-      AST_Interface *i =
-        AST_Interface::narrow_from_decl (*is);
+      AST_Interface *i = dynamic_cast<AST_Interface*> (*is);
 
       d = (i)->lookup_by_name_r (e, full_def_only);
 
-      if (d != 0)
+      if (d != nullptr)
         {
-          if (d_before == 0)
+          if (d_before == nullptr)
             {
               // First result found.
               d_before = d;
@@ -327,7 +326,7 @@ AST_ValueType::special_lookup (UTL_ScopedName *e,
 {
   AST_Decl *d = this->look_in_inherited (e, full_def_only);
 
-  if (d == 0)
+  if (d == nullptr)
     {
       d = this->look_in_supported (e, full_def_only);
     }
@@ -336,7 +335,7 @@ AST_ValueType::special_lookup (UTL_ScopedName *e,
 }
 
 bool
-AST_ValueType::legal_for_primary_key (void) const
+AST_ValueType::legal_for_primary_key () const
 {
   AST_ValueType *pk_base = this->lookup_primary_key_base ();
 
@@ -357,10 +356,10 @@ AST_ValueType::legal_for_primary_key (void) const
           !i.is_done ();
           i.next ())
         {
-          AST_Field *f = AST_Field::narrow_from_decl (i.item ());
+          AST_Field *f = dynamic_cast<AST_Field*> (i.item ());
 
           // We're not interested in any valuetype decls that aren't fields.
-          if (f == 0)
+          if (f == nullptr)
             {
               continue;
             }
@@ -396,12 +395,12 @@ AST_ValueType::legal_for_primary_key (void) const
 }
 
 void
-AST_ValueType::destroy (void)
+AST_ValueType::destroy ()
 {
   this->AST_Interface::destroy ();
 
   delete [] this->pd_supports;
-  this->pd_supports = 0;
+  this->pd_supports = nullptr;
   this->pd_n_supports = 0;
 }
 
@@ -477,16 +476,14 @@ AST_ValueType::fe_add_field (AST_Field *t)
 AST_Factory *
 AST_ValueType::fe_add_factory (AST_Factory *f)
 {
-  return
-    AST_Factory::narrow_from_decl (
-      this->fe_add_decl (f));
+  return dynamic_cast<AST_Factory*> (this->fe_add_decl (f));
 }
 
 bool
 AST_ValueType::derived_from_primary_key_base (const AST_ValueType *node,
                                               const AST_ValueType *pk_base) const
 {
-  if (0 == node)
+  if (nullptr == node)
     {
       return false;
     }
@@ -496,8 +493,7 @@ AST_ValueType::derived_from_primary_key_base (const AST_ValueType *node,
       return true;
     }
 
-  AST_ValueType *concrete_parent =
-    AST_ValueType::narrow_from_decl (node->inherits_concrete ());
+  AST_ValueType *concrete_parent = dynamic_cast<AST_ValueType*> (node->inherits_concrete ());
 
   if (this->derived_from_primary_key_base (concrete_parent, pk_base))
     {
@@ -508,7 +504,7 @@ AST_ValueType::derived_from_primary_key_base (const AST_ValueType *node,
 
   for (long i = 0; i < node->pd_n_inherits; ++i)
     {
-      AST_ValueType *tmp = AST_ValueType::narrow_from_decl (v[i]);
+      AST_ValueType *tmp = dynamic_cast<AST_ValueType*> (v[i]);
 
       if (this->derived_from_primary_key_base (tmp, pk_base))
         {
@@ -520,14 +516,14 @@ AST_ValueType::derived_from_primary_key_base (const AST_ValueType *node,
 }
 
 AST_ValueType *
-AST_ValueType::lookup_primary_key_base (void) const
+AST_ValueType::lookup_primary_key_base () const
 {
   AST_ValueType *retval = idl_global->primary_key_base ();
 
-  if (retval == 0)
+  if (retval == nullptr)
     {
       Identifier local_id ("PrimaryKeyBase");
-      UTL_ScopedName local_name (&local_id, 0);
+      UTL_ScopedName local_name (&local_id, nullptr);
 
       Identifier scope_name ("Components");
       UTL_ScopedName pk_name (&scope_name, &local_name);
@@ -537,18 +533,18 @@ AST_ValueType::lookup_primary_key_base (void) const
       local_id.destroy ();
       scope_name.destroy ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (&pk_name);
-          return 0;
+          return nullptr;
         }
 
-      retval = AST_ValueType::narrow_from_decl (d);
+      retval = dynamic_cast<AST_ValueType*> (d);
 
-      if (retval == 0)
+      if (retval == nullptr)
         {
           idl_global->err ()->valuetype_expected (d);
-          return 0;
+          return nullptr;
         }
 
       idl_global->primary_key_base (retval);
@@ -556,7 +552,3 @@ AST_ValueType::lookup_primary_key_base (void) const
 
   return retval;
 }
-
-IMPL_NARROW_FROM_DECL(AST_ValueType)
-IMPL_NARROW_FROM_SCOPE(AST_ValueType)
-
diff --git a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
index 89b8a902a2c..301ded280b3 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
@@ -19,7 +19,7 @@ AST_ValueTypeFwd::AST_ValueTypeFwd (AST_Interface *dummy,
 {
 }
 
-AST_ValueTypeFwd::~AST_ValueTypeFwd (void)
+AST_ValueTypeFwd::~AST_ValueTypeFwd ()
 {
 }
 
@@ -46,11 +46,7 @@ AST_ValueTypeFwd::ast_accept (ast_visitor *visitor)
 }
 
 void
-AST_ValueTypeFwd::destroy (void)
+AST_ValueTypeFwd::destroy ()
 {
   this->AST_InterfaceFwd::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (AST_ValueTypeFwd)
diff --git a/TAO/TAO_IDL/ast/ast_visitor.cpp b/TAO/TAO_IDL/ast/ast_visitor.cpp
index 662179b4154..d90421c3d82 100644
--- a/TAO/TAO_IDL/ast/ast_visitor.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor.cpp
@@ -1,11 +1,11 @@
 #include "ast_visitor.h"
 #include "ace/config-all.h"
 
-ast_visitor::ast_visitor (void)
+ast_visitor::ast_visitor ()
 {
 }
 
-ast_visitor::~ast_visitor (void)
+ast_visitor::~ast_visitor ()
 {
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_visitor_context.cpp b/TAO/TAO_IDL/ast/ast_visitor_context.cpp
index 4c078cb7997..d08b49cc2c3 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_context.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_context.cpp
@@ -12,9 +12,9 @@
 
 #include "ast_visitor_context.h"
 
-ast_visitor_context::ast_visitor_context (void)
-  : template_params_ (0),
-    template_args_ (0)
+ast_visitor_context::ast_visitor_context ()
+  : template_params_ (nullptr),
+    template_args_ (nullptr)
 {
 }
 
@@ -24,12 +24,12 @@ ast_visitor_context::ast_visitor_context (const ast_visitor_context &ctx)
 {
 }
 
-ast_visitor_context::~ast_visitor_context (void)
+ast_visitor_context::~ast_visitor_context ()
 {
 }
 
 FE_Utils::T_PARAMLIST_INFO *
-ast_visitor_context::template_params (void) const
+ast_visitor_context::template_params () const
 {
   return this->template_params_;
 }
@@ -41,7 +41,7 @@ ast_visitor_context::template_params (FE_Utils::T_PARAMLIST_INFO *params)
 }
 
 FE_Utils::T_ARGLIST const *
-ast_visitor_context::template_args (void) const
+ast_visitor_context::template_args () const
 {
   return this->template_args_;
 }
diff --git a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
index 0a6132034c6..c3282d8947e 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
@@ -38,16 +38,16 @@ ast_visitor_reifying::ast_visitor_reifying (
       ast_visitor_context *ctx)
   : ast_visitor (),
     ctx_ (ctx),
-    reified_node_ (0)
+    reified_node_ (nullptr)
 {
 }
 
-ast_visitor_reifying::~ast_visitor_reifying (void)
+ast_visitor_reifying::~ast_visitor_reifying ()
 {
 }
 
 AST_Decl *
-ast_visitor_reifying::reified_node (void) const
+ast_visitor_reifying::reified_node () const
 {
   return this->reified_node_;
 }
@@ -349,25 +349,25 @@ ast_visitor_reifying::visit_array (AST_Array *node)
                         -1);
     }
 
-  bt = AST_Type::narrow_from_decl (this->reified_node_);
+  bt = dynamic_cast<AST_Type*> (this->reified_node_);
 
   AST_Expression **dims = node->dims ();
-  AST_Expression *v = 0;
-  UTL_ExprList *v_list = 0;
+  AST_Expression *v = nullptr;
+  UTL_ExprList *v_list = nullptr;
 
   for (ACE_CDR::ULong i = 0; i < node->n_dims (); ++i)
     {
       AST_Param_Holder *ph = dims[i]->param_holder ();
 
-      if (ph != 0)
+      if (ph != nullptr)
         {
           if (this->visit_param_holder (ph) != 0)
             {
-              if (v_list != 0)
+              if (v_list != nullptr)
                 {
                   v_list->destroy ();
                   delete v_list;
-                  v_list = 0;
+                  v_list = nullptr;
                 }
 
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -378,8 +378,7 @@ ast_visitor_reifying::visit_array (AST_Array *node)
                                 -1);
             }
 
-          AST_Constant *c =
-            AST_Constant::narrow_from_decl (this->reified_node_);
+          AST_Constant *c = dynamic_cast<AST_Constant*> (this->reified_node_);
 
           ACE_NEW_RETURN (v,
                           AST_Expression (c->constant_value (),
@@ -394,12 +393,12 @@ ast_visitor_reifying::visit_array (AST_Array *node)
                           -1);
         }
 
-      UTL_ExprList *el = 0;
+      UTL_ExprList *el = nullptr;
       ACE_NEW_RETURN (el,
-                      UTL_ExprList (v, 0),
+                      UTL_ExprList (v, nullptr),
                       -1);
 
-      if (v_list == 0)
+      if (v_list == nullptr)
         {
           v_list = el;
         }
@@ -409,7 +408,7 @@ ast_visitor_reifying::visit_array (AST_Array *node)
         }
     }
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Array *arr =
     idl_global->gen ()->create_array (&sn,
@@ -421,11 +420,11 @@ ast_visitor_reifying::visit_array (AST_Array *node)
   // No need to add this new node to any scope - it's anonymous
   // and owned by the node that references it.
 
-  if (v_list != 0)
+  if (v_list != nullptr)
     {
       v_list->destroy ();
       delete v_list;
-      v_list = 0;
+      v_list = nullptr;
     }
 
   arr->set_base_type (bt);
@@ -448,12 +447,12 @@ ast_visitor_reifying::visit_sequence (AST_Sequence *node)
                         -1);
     }
 
-  bt = AST_Type::narrow_from_decl (this->reified_node_);
+  bt = dynamic_cast<AST_Type*> (this->reified_node_);
 
   AST_Expression *v = node->max_size ();
   AST_Param_Holder *ph = v->param_holder ();
 
-  if (ph != 0)
+  if (ph != nullptr)
     {
       if (this->visit_param_holder (ph) != 0)
         {
@@ -465,8 +464,7 @@ ast_visitor_reifying::visit_sequence (AST_Sequence *node)
                             -1);
         }
 
-      AST_Constant *c =
-        AST_Constant::narrow_from_decl (this->reified_node_);
+      AST_Constant *c = dynamic_cast<AST_Constant*> (this->reified_node_);
 
       v = c->constant_value ();
     }
@@ -475,7 +473,7 @@ ast_visitor_reifying::visit_sequence (AST_Sequence *node)
     idl_global->gen ()->create_expr (v,
                                      AST_Expression::EV_ulong);
   Identifier id ("sequence");
-  UTL_ScopedName sn (&id, 0);
+  UTL_ScopedName sn (&id, nullptr);
 
   this->reified_node_ =
     idl_global->gen ()->create_sequence (bound,
@@ -503,7 +501,7 @@ ast_visitor_reifying::visit_string (AST_String *node)
   AST_Expression *b = node->max_size ();
   AST_Param_Holder *ph = b->param_holder ();
 
-  if (ph != 0)
+  if (ph != nullptr)
     {
       if (this->visit_param_holder (ph) != 0)
         {
@@ -515,8 +513,7 @@ ast_visitor_reifying::visit_string (AST_String *node)
                             -1);
         }
 
-      AST_Constant *c =
-        AST_Constant::narrow_from_decl (this->reified_node_);
+      AST_Constant *c = dynamic_cast<AST_Constant*> (this->reified_node_);
 
       b = c->constant_value ();
     }
@@ -526,14 +523,14 @@ ast_visitor_reifying::visit_string (AST_String *node)
       return 0;
     }
 
-  AST_Expression *bound = 0;
+  AST_Expression *bound = nullptr;
   ACE_NEW_RETURN (bound,
                   AST_Expression (b,
                                   AST_Expression::EV_ulong),
                   -1);
 
   Identifier id ("string");
-  UTL_ScopedName sn (&id, 0);
+  UTL_ScopedName sn (&id, nullptr);
 
   ACE_NEW_RETURN (this->reified_node_,
                   AST_String (AST_Decl::NT_string,
@@ -566,7 +563,7 @@ ast_visitor_reifying::visit_param_holder (AST_Param_Holder *node)
        !iter.done ();
        iter.advance (), ++i)
     {
-      FE_Utils::T_Param_Info *item = 0;
+      FE_Utils::T_Param_Info *item = nullptr;
       iter.next (item);
 
       ACE_CString name (item->name_);
@@ -579,7 +576,7 @@ ast_visitor_reifying::visit_param_holder (AST_Param_Holder *node)
       /// name, which is what we want.
       if (name == node->local_name ()->get_string ())
         {
-          AST_Decl **ret_ptr = 0;
+          AST_Decl **ret_ptr = nullptr;
 
           if (t_args->get (ret_ptr, i) == 0)
             {
@@ -617,7 +614,7 @@ ast_visitor_reifying::check_and_store (AST_Decl *node)
   UTL_ScopedName *tmpl_tail =
     this->template_module_rel_name (node);
 
-  if (tmpl_tail != 0)
+  if (tmpl_tail != nullptr)
     {
       AST_Decl *d =
         idl_global->scopes ().top ()->lookup_by_name (
@@ -629,7 +626,7 @@ ast_visitor_reifying::check_and_store (AST_Decl *node)
 
       tmpl_tail->destroy ();
       delete tmpl_tail;
-      tmpl_tail = 0;
+      tmpl_tail = nullptr;
     }
   else
     {
@@ -643,9 +640,9 @@ ast_visitor_reifying::template_module_rel_name (AST_Decl *d)
   AST_Decl *tmp = d;
   ACE_CString name (d->full_name ());
 
-  while (tmp != 0)
+  while (tmp != nullptr)
     {
-      if (AST_Template_Module::narrow_from_decl (tmp) != 0)
+      if (dynamic_cast<AST_Template_Module*> (tmp) != nullptr)
         {
           ACE_CString head (tmp->local_name ()->get_string ());
 
@@ -659,6 +656,6 @@ ast_visitor_reifying::template_module_rel_name (AST_Decl *d)
       tmp = ScopeAsDecl (tmp->defined_in ());
     }
 
-  return 0;
+  return nullptr;
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
index 5edba8b1543..759370f41a3 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
@@ -54,7 +54,7 @@ ast_visitor_tmpl_module_inst::ast_visitor_tmpl_module_inst (
       ast_visitor_context *ctx,
       bool ref_only)
   : ast_visitor (),
-    tmi_ (0),
+    tmi_ (nullptr),
     ctx_ (ctx),
     for_eventtype_ (false),
     for_finder_ (false),
@@ -62,7 +62,7 @@ ast_visitor_tmpl_module_inst::ast_visitor_tmpl_module_inst (
 {
 }
 
-ast_visitor_tmpl_module_inst::~ast_visitor_tmpl_module_inst (void)
+ast_visitor_tmpl_module_inst::~ast_visitor_tmpl_module_inst ()
 {
 }
 
@@ -80,7 +80,7 @@ ast_visitor_tmpl_module_inst::visit_scope (UTL_Scope *node)
     {
       AST_Decl *d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("ast_visitor_tmpl_module_inst::")
@@ -90,7 +90,7 @@ ast_visitor_tmpl_module_inst::visit_scope (UTL_Scope *node)
         }
 
       // Send the visitor.
-      if (d == 0 || d->ast_accept (this) == -1)
+      if (d == nullptr || d->ast_accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("ast_visitor_tmpl_module_inst::")
@@ -136,11 +136,11 @@ ast_visitor_tmpl_module_inst::visit_valuetype_fwd (AST_ValueTypeFwd *)
 int
 ast_visitor_tmpl_module_inst::visit_component (AST_Component *node)
 {
-  UTL_ScopedName *base_name = 0;
+  UTL_ScopedName *base_name = nullptr;
   AST_Decl *parent =
     this->reify_type (node->base_component ());
 
-  if (parent != 0)
+  if (parent != nullptr)
     {
       base_name = parent->name ();
     }
@@ -149,14 +149,14 @@ ast_visitor_tmpl_module_inst::visit_component (AST_Component *node)
     this->create_name_list (node->supports (),
                             node->n_supports ());
 
-  Identifier *node_id = 0;
+  Identifier *node_id = nullptr;
   ACE_NEW_RETURN (node_id,
                   Identifier (node->local_name ()->get_string ()),
                   -1);
 
-  UTL_ScopedName *local_name = 0;
+  UTL_ScopedName *local_name = nullptr;
   ACE_NEW_RETURN (local_name,
-                  UTL_ScopedName (node_id, 0),
+                  UTL_ScopedName (node_id, nullptr),
                   -1);
 
   FE_ComponentHeader header (local_name,
@@ -172,11 +172,11 @@ ast_visitor_tmpl_module_inst::visit_component (AST_Component *node)
                                           header.supports_flat (),
                                           header.n_supports_flat ());
 
-  if (supports_names != 0)
+  if (supports_names != nullptr)
     {
       supports_names->destroy ();
       delete supports_names;
-      supports_names = 0;
+      supports_names = nullptr;
     }
 
   idl_global->scopes ().top ()->add_to_scope (added_comp);
@@ -235,7 +235,7 @@ ast_visitor_tmpl_module_inst::visit_template_module_ref (
 int
 ast_visitor_tmpl_module_inst::visit_porttype (AST_PortType *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_PortType *added_porttype =
     idl_global->gen ()->create_porttype (&sn);
@@ -261,11 +261,9 @@ ast_visitor_tmpl_module_inst::visit_porttype (AST_PortType *node)
 int
 ast_visitor_tmpl_module_inst::visit_provides (AST_Provides *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  AST_Type *p_type =
-    AST_Type::narrow_from_decl (
-      this->reify_type (node->provides_type ()));
+  AST_Type *p_type = dynamic_cast<AST_Type*> (this->reify_type (node->provides_type ()));
 
   AST_Provides *added_provides =
     idl_global->gen ()->create_provides (&sn,
@@ -279,11 +277,9 @@ ast_visitor_tmpl_module_inst::visit_provides (AST_Provides *node)
 int
 ast_visitor_tmpl_module_inst::visit_uses (AST_Uses *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  AST_Type *u_type =
-    AST_Type::narrow_from_decl (
-      this->reify_type (node->uses_type ()));
+  AST_Type *u_type = dynamic_cast<AST_Type*> (this->reify_type (node->uses_type ()));
 
   AST_Uses *added_uses =
     idl_global->gen ()->create_uses (&sn,
@@ -298,10 +294,10 @@ ast_visitor_tmpl_module_inst::visit_uses (AST_Uses *node)
 int
 ast_visitor_tmpl_module_inst::visit_publishes (AST_Publishes *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Type *p_type =
-    AST_Type::narrow_from_decl (
+    dynamic_cast<AST_Type*> (
       this->reify_type (node->publishes_type ()));
 
   AST_Publishes *added_publishes =
@@ -316,10 +312,10 @@ ast_visitor_tmpl_module_inst::visit_publishes (AST_Publishes *node)
 int
 ast_visitor_tmpl_module_inst::visit_emits (AST_Emits *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Type *e_type =
-    AST_Type::narrow_from_decl (
+    dynamic_cast<AST_Type*> (
       this->reify_type (node->emits_type ()));
 
   AST_Emits *added_emits =
@@ -333,11 +329,9 @@ ast_visitor_tmpl_module_inst::visit_emits (AST_Emits *node)
 int
 ast_visitor_tmpl_module_inst::visit_consumes (AST_Consumes *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  AST_Type *c_type =
-    AST_Type::narrow_from_decl (
-      this->reify_type (node->consumes_type ()));
+  AST_Type *c_type = dynamic_cast<AST_Type*> (this->reify_type (node->consumes_type ()));
 
   AST_Consumes *added_consumes =
     idl_global->gen ()->create_consumes (&sn, c_type);
@@ -351,11 +345,9 @@ int
 ast_visitor_tmpl_module_inst::visit_extended_port (
   AST_Extended_Port *node)
 {
-  AST_PortType *pt =
-    AST_PortType::narrow_from_decl (
-      this->reify_type (node->port_type ()));
+  AST_PortType *pt = dynamic_cast<AST_PortType*> (this->reify_type (node->port_type ()));
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Extended_Port *added_ep =
     idl_global->gen ()->create_extended_port (&sn, pt);
@@ -369,11 +361,9 @@ int
 ast_visitor_tmpl_module_inst::visit_mirror_port (
   AST_Mirror_Port *node)
 {
-  AST_PortType *pt =
-    AST_PortType::narrow_from_decl (
-      this->reify_type (node->port_type ()));
+  AST_PortType *pt = dynamic_cast<AST_PortType*> (this->reify_type (node->port_type ()));
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Mirror_Port *added_mp =
     idl_global->gen ()->create_mirror_port (&sn, pt);
@@ -386,11 +376,9 @@ ast_visitor_tmpl_module_inst::visit_mirror_port (
 int
 ast_visitor_tmpl_module_inst::visit_connector (AST_Connector *node)
 {
-  AST_Connector *parent =
-    AST_Connector::narrow_from_decl (
-      this->reify_type (node->base_connector ()));
+  AST_Connector *parent = dynamic_cast<AST_Connector*> (this->reify_type (node->base_connector ()));
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Connector *added_connector =
     idl_global->gen ()->create_connector (&sn, parent);
@@ -416,11 +404,11 @@ ast_visitor_tmpl_module_inst::visit_connector (AST_Connector *node)
 int
 ast_visitor_tmpl_module_inst::visit_home (AST_Home *node)
 {
-  UTL_ScopedName *base_name = 0;
+  UTL_ScopedName *base_name = nullptr;
   AST_Decl *parent =
     this->reify_type (node->base_home ());
 
-  if (parent != 0)
+  if (parent != nullptr)
     {
       base_name = parent->name ();
     }
@@ -429,36 +417,32 @@ ast_visitor_tmpl_module_inst::visit_home (AST_Home *node)
     this->create_name_list (node->supports (),
                             node->n_supports ());
 
-  UTL_ScopedName *managed_comp_name = 0;
+  UTL_ScopedName *managed_comp_name = nullptr;
 
-  AST_Component *managed_comp =
-    AST_Component::narrow_from_decl (
-      this->reify_type (node->managed_component ()));
+  AST_Component *managed_comp = dynamic_cast<AST_Component*> (this->reify_type (node->managed_component ()));
 
-  if (managed_comp != 0)
+  if (managed_comp != nullptr)
     {
       managed_comp_name = managed_comp->name ();
     }
 
-  UTL_ScopedName *p_key_name = 0;
+  UTL_ScopedName *p_key_name = nullptr;
 
-  AST_ValueType *p_key =
-    AST_ValueType::narrow_from_decl (
-      this->reify_type (node->primary_key ()));
+  AST_ValueType *p_key = dynamic_cast<AST_ValueType*> (this->reify_type (node->primary_key ()));
 
-  if (p_key != 0)
+  if (p_key != nullptr)
     {
       p_key_name = p_key->name ();
     }
 
-  Identifier *node_id = 0;
+  Identifier *node_id = nullptr;
   ACE_NEW_RETURN (node_id,
                   Identifier (node->local_name ()->get_string ()),
                   -1);
 
-  UTL_ScopedName *local_name = 0;
+  UTL_ScopedName *local_name = nullptr;
   ACE_NEW_RETURN (local_name,
-                  UTL_ScopedName (node_id, 0),
+                  UTL_ScopedName (node_id, nullptr),
                   -1);
 
   FE_HomeHeader header (local_name,
@@ -477,11 +461,11 @@ ast_visitor_tmpl_module_inst::visit_home (AST_Home *node)
                                      header.supports_flat (),
                                      header.n_supports_flat ());
 
-  if (supports_names != 0)
+  if (supports_names != nullptr)
     {
       supports_names->destroy ();
       delete supports_names;
-      supports_names = 0;
+      supports_names = nullptr;
     }
 
   idl_global->scopes ().top ()->add_to_scope (added_home);
@@ -525,7 +509,7 @@ ast_visitor_tmpl_module_inst::visit_expression (AST_Expression *)
 int
 ast_visitor_tmpl_module_inst::visit_enum (AST_Enum *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Enum *added_enum =
     idl_global->gen ()->create_enum (&sn,
@@ -553,7 +537,7 @@ ast_visitor_tmpl_module_inst::visit_enum (AST_Enum *node)
 int
 ast_visitor_tmpl_module_inst::visit_union (AST_Union *node)
 {
-  UTL_ScopedName sn (node->local_name  (), 0);
+  UTL_ScopedName sn (node->local_name  (), nullptr);
 
   AST_Union *added_union =
     idl_global->gen ()->create_union (node->disc_type (),
@@ -593,10 +577,10 @@ int
 ast_visitor_tmpl_module_inst::visit_union_branch (AST_UnionBranch *node)
 {
   AST_Type *ft =
-    AST_Type::narrow_from_decl (
+    dynamic_cast<AST_Type*> (
       this->reify_type (node->field_type ()));
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   // The union branch owns its label list so we have to copy it.
   UTL_LabelList *ll = node->labels ()->copy ();
@@ -608,7 +592,7 @@ ast_visitor_tmpl_module_inst::visit_union_branch (AST_UnionBranch *node)
   // add_to_scope() so we need to reuse it.
 
   AST_Union *u =
-    AST_Union::narrow_from_scope (idl_global->scopes ().top ());
+    dynamic_cast<AST_Union*> (idl_global->scopes ().top ());
 
   u->fe_add_union_branch (added_branch);
 
@@ -624,7 +608,7 @@ ast_visitor_tmpl_module_inst::visit_union_label (AST_UnionLabel *)
 int
 ast_visitor_tmpl_module_inst::visit_enum_val (AST_EnumVal *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_EnumVal *added_enum_val =
     idl_global->gen ()->create_enum_val (
@@ -675,7 +659,7 @@ ast_visitor_tmpl_module_inst::visit_native (AST_Native *)
 int
 ast_visitor_tmpl_module_inst::visit_module (AST_Module *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Module *added_module =
     idl_global->gen ()->create_module (idl_global->scopes ().top (),
@@ -684,7 +668,7 @@ ast_visitor_tmpl_module_inst::visit_module (AST_Module *node)
   added_module->from_inst (this->tmi_);
 
   AST_Module *m =
-    AST_Module::narrow_from_scope (idl_global->scopes ().top ());
+    dynamic_cast<AST_Module*> (idl_global->scopes ().top ());
 
   m->fe_add_module (added_module);
 
@@ -693,7 +677,7 @@ ast_visitor_tmpl_module_inst::visit_module (AST_Module *node)
   AST_Template_Module_Ref *ref = node->from_ref ();
   UTL_StrList const *old_refs = idl_global->alias_params ();
 
-  if (ref != 0)
+  if (ref != nullptr)
     {
       added_module->from_ref (ref);
       idl_global->alias_params (ref->param_refs ());
@@ -752,7 +736,7 @@ ast_visitor_tmpl_module_inst::visit_template_module_inst (
   // Add the new module to the scope containing the template
   // module instantiation.
   AST_Module *m =
-    AST_Module::narrow_from_scope (idl_global->scopes ().top ());
+    dynamic_cast<AST_Module*> (idl_global->scopes ().top ());
 
   m->fe_add_module (instance);
 
@@ -775,7 +759,7 @@ ast_visitor_tmpl_module_inst::visit_template_module_inst (
   // need to know this, for example while visiting an IDL module,
   // to decide whether to create an implied IDL module or just
   // visit its scope.
-  this->ctx_->template_args (0);
+  this->ctx_->template_args (nullptr);
 
   // Restore the scope stack.
   idl_global->scopes ().pop ();
@@ -801,22 +785,22 @@ ast_visitor_tmpl_module_inst::visit_valuetype (AST_ValueType *node)
     this->create_name_list (node->supports (),
                             node->n_supports ());
 
-  Identifier *node_id = 0;
+  Identifier *node_id = nullptr;
   ACE_NEW_RETURN (node_id,
                   Identifier (node->local_name ()->get_string ()),
                   -1);
 
-  UTL_ScopedName *local_name = 0;
+  UTL_ScopedName *local_name = nullptr;
   ACE_NEW_RETURN (local_name,
-                  UTL_ScopedName (node_id, 0),
+                  UTL_ScopedName (node_id, nullptr),
                   -1);
 
-  AST_ValueType *added_vtype = 0;
+  AST_ValueType *added_vtype = nullptr;
 
   FE_OBVHeader header (local_name,
                        parent_names,
                        supports_names,
-                       (parent_names != 0
+                       (parent_names != nullptr
                           ? parent_names->truncatable ()
                           : false),
                        this->for_eventtype_);
@@ -854,18 +838,18 @@ ast_visitor_tmpl_module_inst::visit_valuetype (AST_ValueType *node)
                                               false);
     }
 
-  if (parent_names != 0)
+  if (parent_names != nullptr)
     {
       parent_names->destroy ();
       delete parent_names;
-      parent_names = 0;
+      parent_names = nullptr;
     }
 
-  if (supports_names != 0)
+  if (supports_names != nullptr)
     {
       supports_names->destroy ();
       delete supports_names;
-      supports_names = 0;
+      supports_names = nullptr;
     }
 
   idl_global->scopes ().top ()->add_to_scope (added_vtype);
@@ -898,14 +882,14 @@ ast_visitor_tmpl_module_inst::visit_interface (AST_Interface *node)
     this->create_name_list (node->inherits (),
                             node->n_inherits ());
 
-  Identifier *node_id = 0;
+  Identifier *node_id = nullptr;
   ACE_NEW_RETURN (node_id,
                   Identifier (node->local_name ()->get_string ()),
                   -1);
 
-  UTL_ScopedName *local_name = 0;
+  UTL_ScopedName *local_name = nullptr;
   ACE_NEW_RETURN (local_name,
-                  UTL_ScopedName (node_id, 0),
+                  UTL_ScopedName (node_id, nullptr),
                   -1);
 
   FE_InterfaceHeader header (local_name,
@@ -923,11 +907,11 @@ ast_visitor_tmpl_module_inst::visit_interface (AST_Interface *node)
                                           header.is_local (),
                                           header.is_abstract ());
 
-  if (parent_names != 0)
+  if (parent_names != nullptr)
     {
       parent_names->destroy ();
       delete parent_names;
-      parent_names = 0;
+      parent_names = nullptr;
     }
 
   idl_global->scopes ().top ()->add_to_scope (added_iface);
@@ -959,7 +943,7 @@ int
 ast_visitor_tmpl_module_inst::visit_attribute (AST_Attribute *node)
 {
   AST_Type *ft =
-    AST_Type::narrow_from_decl (
+    dynamic_cast<AST_Type*> (
       this->reify_type (node->field_type ()));
 
   AST_Attribute *added_attr =
@@ -988,11 +972,11 @@ int
 ast_visitor_tmpl_module_inst::visit_operation (AST_Operation *node)
 {
   AST_Type *rt =
-    AST_Type::narrow_from_decl (
+    dynamic_cast<AST_Type*> (
       this->reify_type (node->return_type ()));
 
   Identifier id (node->local_name ()->get_string ());
-  UTL_ScopedName sn (&id, 0);
+  UTL_ScopedName sn (&id, nullptr);
 
   AST_Operation *added_op =
     idl_global->gen ()->create_operation (rt,
@@ -1030,10 +1014,10 @@ int
 ast_visitor_tmpl_module_inst::visit_argument (AST_Argument *node)
 {
   AST_Type *t =
-    AST_Type::narrow_from_decl (
+    dynamic_cast<AST_Type*> (
       this->reify_type (node->field_type ()));
 
-  if (t == 0)
+  if (t == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ast_visitor_tmpl_module_inst::")
@@ -1056,10 +1040,10 @@ int
 ast_visitor_tmpl_module_inst::visit_typedef (AST_Typedef *node)
 {
   AST_Type *bt =
-    AST_Type::narrow_from_decl (
+    dynamic_cast<AST_Type*> (
       this->reify_type (node->base_type ()));
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Typedef *added_td =
     idl_global->gen ()->create_typedef (bt,
@@ -1078,10 +1062,10 @@ ast_visitor_tmpl_module_inst::visit_constant (AST_Constant *node)
   AST_Param_Holder *ph =
     node->constant_value ()->param_holder ();
 
-  AST_Expression *v = 0;
+  AST_Expression *v = nullptr;
   AST_Expression::ExprType et = node->et ();
 
-  if (ph != 0)
+  if (ph != nullptr)
     {
       ast_visitor_reifying rv (this->ctx_);
 
@@ -1096,7 +1080,7 @@ ast_visitor_tmpl_module_inst::visit_constant (AST_Constant *node)
         }
 
       AST_Constant *c =
-        AST_Constant::narrow_from_decl (rv.reified_node ());
+        dynamic_cast<AST_Constant*> (rv.reified_node ());
 
       /// We don't use the reified node's ExprType here, since
       /// it was created from a template arg that (for const
@@ -1131,7 +1115,7 @@ ast_visitor_tmpl_module_inst::visit_constant (AST_Constant *node)
 int
 ast_visitor_tmpl_module_inst::visit_structure (AST_Structure *node)
 {
-  UTL_ScopedName sn (node->name ()->last_component (), 0);
+  UTL_ScopedName sn (node->name ()->last_component (), nullptr);
 
   AST_Structure *added_struct =
     idl_global->gen ()->create_structure (&sn,
@@ -1162,7 +1146,7 @@ int
 ast_visitor_tmpl_module_inst::visit_field (AST_Field *node)
 {
   AST_Type *t =
-    AST_Type::narrow_from_decl (
+    dynamic_cast<AST_Type*> (
       this->reify_type (node->field_type ()));
 
   AST_Field *added_field =
@@ -1179,9 +1163,9 @@ int
 ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node)
 {
   Identifier id (node->local_name ()->get_string ());
-  UTL_ScopedName sn (&id, 0);
+  UTL_ScopedName sn (&id, nullptr);
 
-  AST_Factory *added_factory = 0;
+  AST_Factory *added_factory = nullptr;
 
   if (this->for_finder_)
     {
@@ -1232,9 +1216,9 @@ ast_visitor_tmpl_module_inst::visit_finder (AST_Finder *node)
 AST_Decl *
 ast_visitor_tmpl_module_inst::reify_type (AST_Decl *d)
 {
-  if (d == 0)
+  if (d == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   if (this->ref_only_)
@@ -1265,7 +1249,7 @@ ast_visitor_tmpl_module_inst::reify_type (AST_Decl *d)
                   ACE_TEXT ("visitor failed on %C\n"),
                   d->full_name ()));
 
-      return 0;
+      return nullptr;
     }
 
   return rv.reified_node ();
@@ -1275,26 +1259,26 @@ UTL_ExceptList *
 ast_visitor_tmpl_module_inst::reify_exception_list (
   UTL_ExceptList *orig)
 {
-  if (orig == 0)
+  if (orig == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
-  UTL_ExceptList *retval = 0;
+  UTL_ExceptList *retval = nullptr;
 
   for (UTL_ExceptlistActiveIterator i (orig);
        !i.is_done ();
        i.next ())
     {
       AST_Type *ex =
-        AST_Type::narrow_from_decl (this->reify_type (i.item ()));
+        dynamic_cast<AST_Type*> (this->reify_type (i.item ()));
 
-      UTL_ExceptList *ex_list = 0;
+      UTL_ExceptList *ex_list = nullptr;
       ACE_NEW_RETURN (ex_list,
-                      UTL_ExceptList (ex, 0),
-                      0);
+                      UTL_ExceptList (ex, nullptr),
+                      nullptr);
 
-      if (retval == 0)
+      if (retval == nullptr)
         {
           retval = ex_list;
         }
@@ -1311,22 +1295,22 @@ UTL_NameList *
 ast_visitor_tmpl_module_inst::create_name_list (AST_Type **list,
                                                long length)
 {
-  UTL_NameList *retval = 0;
+  UTL_NameList *retval = nullptr;
 
   for (long i = 0; i < length; ++i)
     {
       AST_Type *item =
-        AST_Type::narrow_from_decl (this->reify_type (list[i]));
+        dynamic_cast<AST_Type*> (this->reify_type (list[i]));
 
       // We copy each name added so we can call destroy() on the
       // list, which disposes of the contents as well as the
       // nested tail pointers.
-      UTL_NameList *name_item = 0;
+      UTL_NameList *name_item = nullptr;
       ACE_NEW_RETURN (name_item,
-                      UTL_NameList (item->name ()->copy (), 0),
-                      0);
+                      UTL_NameList (item->name ()->copy (), nullptr),
+                      nullptr);
 
-      if (retval == 0)
+      if (retval == nullptr)
         {
           retval = name_item;
         }
diff --git a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp
index 39568129e3b..e96bb6a8121 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp
@@ -22,7 +22,7 @@ ast_visitor_tmpl_module_ref::ast_visitor_tmpl_module_ref (
 {
 }
 
-ast_visitor_tmpl_module_ref::~ast_visitor_tmpl_module_ref (void)
+ast_visitor_tmpl_module_ref::~ast_visitor_tmpl_module_ref ()
 {
 }
 
@@ -52,7 +52,7 @@ ast_visitor_tmpl_module_ref::visit_template_module_ref (
   // to the module of the same name in the instantiated template
   // module scope (see ast_visitor_reifying::check_and_store()
   // and ast_visitor_reifying::template_module_rel_name()).
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Module *added_module =
     idl_global->gen ()->create_module (idl_global->scopes (). top (),
@@ -70,7 +70,7 @@ ast_visitor_tmpl_module_ref::visit_template_module_ref (
   /// that's what will be search for any matches. We save the
   /// current list to restore after the traversal.
 
-  if (idl_global->for_new_holder () == 0)
+  if (idl_global->for_new_holder () == nullptr)
     {
       idl_global->for_new_holder (
         const_cast<UTL_StrList *> (
@@ -102,7 +102,7 @@ ast_visitor_tmpl_module_ref::visit_template_module_ref (
   idl_global->current_params (
     const_cast<FE_Utils::T_PARAMLIST_INFO *> (
       old_params));
-  idl_global->for_new_holder (0);
+  idl_global->for_new_holder (nullptr);
   idl_global->alias_params (const_cast<UTL_StrList *> (old_refs));
 
   idl_global->scopes ().pop ();
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp
index 9d1ceb84907..dc26f7e01e1 100644
--- a/TAO/TAO_IDL/be/be_argument.cpp
+++ b/TAO/TAO_IDL/be/be_argument.cpp
@@ -42,11 +42,11 @@ be_argument::be_argument (AST_Argument::Direction d,
   // declared in an included file UNLESS the enclosing
   // interface is abstract, in which case we regenerate the
   // operation.
-  if (dcl != 0
+  if (dcl != nullptr
       && !dcl->is_local ()
       && (idl_global->in_main_file () || dcl->is_abstract ()))
     {
-      be_type *bt = be_type::narrow_from_decl (ft);
+      be_type *bt = dynamic_cast<be_type*> (ft);
       bt->seen_in_operation (true);
       be_util::set_arg_seen_bit (bt);
       idl_global->need_skeleton_includes_ = true;
@@ -61,10 +61,8 @@ be_argument::accept (be_visitor *visitor)
 }
 
 void
-be_argument::destroy (void)
+be_argument::destroy ()
 {
   this->be_decl::destroy ();
   this->AST_Argument::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_argument)
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index 5c7ef0972f2..beb3256d603 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -52,24 +52,24 @@ be_array::be_array (UTL_ScopedName *n,
     }
 }
 
-be_array::~be_array (void)
+be_array::~be_array ()
 {
 }
 
 int
-be_array::create_name (void)
+be_array::create_name ()
 {
   char namebuf [NAMEBUFSIZE];
   unsigned long i;
-  UTL_ScopedName *n = 0;
-  be_decl *scope = 0;
+  UTL_ScopedName *n = nullptr;
+  be_decl *scope = nullptr;
 
   ACE_OS::memset (namebuf,
                   '\0',
                   NAMEBUFSIZE);
   // Retrieve the base type.
   // The name always starts this way.
-  be_type *bt = be_type::narrow_from_decl (this->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (this->base_type ());
 
   if (!bt)
     {
@@ -90,7 +90,7 @@ be_array::create_name (void)
       AST_Expression *expr = this->dims ()[i];
 
       // Dimension value.
-      if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
+      if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr)))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_array::"
@@ -116,22 +116,22 @@ be_array::create_name (void)
     }
 
   // Now see if we have a fully scoped name and if so, generate one.
-  scope = be_scope::narrow_from_scope (this->defined_in ())->decl ();
+  scope = dynamic_cast<be_scope*> (this->defined_in ())->decl ();
 
   if (scope)
     {
       // Make a copy of the enclosing scope's  name.
       n = (UTL_ScopedName *)scope->name ()->copy ();
 
-      Identifier *id = 0;
+      Identifier *id = nullptr;
       ACE_NEW_RETURN (id,
                       Identifier (ACE_OS::strdup (namebuf)),
                       -1);
 
-      UTL_ScopedName *sn = 0;
+      UTL_ScopedName *sn = nullptr;
       ACE_NEW_RETURN (sn,
                       UTL_ScopedName (id,
-                                      0),
+                                      nullptr),
                       -1);
 
       // Add our local name as the last component.
@@ -151,43 +151,43 @@ be_array::create_name (void)
 
 // Overriden method.
 void
-be_array::compute_tc_name (void)
+be_array::compute_tc_name ()
 {
   // Array TypeCodes can only be accessed through an alias
   // TypeCode.  Generate a TypeCode name that is meant for internal
   // use alone.
 
-  Identifier * tao_id = 0;
+  Identifier * tao_id = nullptr;
   ACE_NEW (tao_id,
            Identifier ("TAO"));
 
   ACE_NEW (this->tc_name_,
            UTL_ScopedName (tao_id,
-                           0));
+                           nullptr));
 
   ACE_CString local_tc_name =
     ACE_CString ("tc_")
     + ACE_CString (this->flat_name ());
 
-  Identifier * typecode_scope = 0;
+  Identifier * typecode_scope = nullptr;
   ACE_NEW (typecode_scope,
            Identifier ("TypeCode"));
 
-  UTL_ScopedName * tc_scope_conc_name = 0;
+  UTL_ScopedName * tc_scope_conc_name = nullptr;
   ACE_NEW (tc_scope_conc_name,
            UTL_ScopedName (typecode_scope,
-                           0));
+                           nullptr));
 
   this->tc_name_->nconc (tc_scope_conc_name);
 
-  Identifier * id = 0;
+  Identifier * id = nullptr;
   ACE_NEW (id,
            Identifier (local_tc_name.c_str ()));
 
-  UTL_ScopedName * conc_name = 0;
+  UTL_ScopedName * conc_name = nullptr;
   ACE_NEW (conc_name,
            UTL_ScopedName (id,
-                           0));
+                           nullptr));
 
   this->tc_name_->nconc (conc_name);
 }
@@ -208,7 +208,7 @@ be_array::gen_dimensions (TAO_OutStream *os,
       AST_Expression *expr = this->dims ()[i];
 
       // Dimension value.
-      if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
+      if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr)))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_array::"
@@ -239,7 +239,7 @@ void
 be_array::gen_ostream_operator (TAO_OutStream *os,
                                 bool use_underscore)
 {
-  be_scope* scope = be_scope::narrow_from_scope (this->defined_in ());
+  be_scope* scope = dynamic_cast<be_scope*> (this->defined_in ());
   be_decl* parent = scope->decl ();
   ACE_CString arg_name (ACE_CString (parent->full_name ())
                         + "::"
@@ -288,7 +288,7 @@ be_array::gen_ostream_operator (TAO_OutStream *os,
       instance_name += "]";
     }
 
-  be_type *bt = be_type::narrow_from_decl (this->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (this->base_type ());
   bt->gen_member_ostream_operator (os,
                                    instance_name.c_str (),
                                    use_underscore,
@@ -314,7 +314,7 @@ be_array::gen_member_ostream_operator (TAO_OutStream *os,
                                        bool use_underscore,
                                        bool accessor)
 {
-  be_scope* scope = be_scope::narrow_from_scope (this->defined_in ());
+  be_scope* scope = dynamic_cast<be_scope*> (this->defined_in ());
   be_decl* parent = scope->decl ();
   ACE_CString decl_name (ACE_CString (parent->full_name ())
                          + "::"
@@ -341,12 +341,8 @@ be_array::accept (be_visitor *visitor)
 }
 
 void
-be_array::destroy (void)
+be_array::destroy ()
 {
   this->be_type::destroy ();
   this->AST_Array::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_array)
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
index 3e0931ae0bf..76fb0955062 100644
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_attribute.cpp
@@ -44,16 +44,14 @@ be_attribute::be_attribute (bool ro,
     {
       // For the return types of the two operations
       // generated from this attribute.
-      be_util::set_arg_seen_bit (be_type::narrow_from_decl (ft));
+      be_util::set_arg_seen_bit (dynamic_cast<be_type*> (ft));
     }
 }
 
 be_type *
-be_attribute::field_type (void) const
+be_attribute::field_type () const
 {
-  return
-    be_type::narrow_from_decl  (
-      this->AST_Attribute::field_type ());
+  return dynamic_cast<be_type*>  (this->AST_Attribute::field_type ());
 }
 
 int
@@ -63,10 +61,8 @@ be_attribute::accept (be_visitor *visitor)
 }
 
 void
-be_attribute::destroy (void)
+be_attribute::destroy ()
 {
   this->be_decl::destroy ();
   this->AST_Attribute::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_attribute)
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 4dfbf131304..876c01a32e2 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -28,38 +28,38 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Numeric_Limits.h"
 
-TAO_CodeGen * tao_cg = 0;
-
-TAO_CodeGen::TAO_CodeGen (void)
-  : client_header_ (0),
-    client_stubs_ (0),
-    client_inline_ (0),
-    server_header_ (0),
-    implementation_header_(0),
-    implementation_skeleton_(0),
-    server_template_header_ (0),
-    server_skeletons_ (0),
-    server_template_skeletons_ (0),
-    anyop_header_ (0),
-    anyop_source_ (0),
-    gperf_input_stream_ (0),
-    ciao_svnt_header_ (0),
-    ciao_svnt_source_ (0),
-    ciao_svnt_template_header_ (0),
-    ciao_svnt_template_source_ (0),
-    ciao_exec_header_ (0),
-    ciao_exec_source_ (0),
-    ciao_exec_idl_ (0),
-    ciao_conn_header_ (0),
-    ciao_conn_source_ (0),
-    ciao_ami_conn_idl_ (0),
-    gperf_input_filename_ (0),
+TAO_CodeGen * tao_cg = nullptr;
+
+TAO_CodeGen::TAO_CodeGen ()
+  : client_header_ (nullptr),
+    client_stubs_ (nullptr),
+    client_inline_ (nullptr),
+    server_header_ (nullptr),
+    implementation_header_(nullptr),
+    implementation_skeleton_(nullptr),
+    server_template_header_ (nullptr),
+    server_skeletons_ (nullptr),
+    server_template_skeletons_ (nullptr),
+    anyop_header_ (nullptr),
+    anyop_source_ (nullptr),
+    gperf_input_stream_ (nullptr),
+    ciao_svnt_header_ (nullptr),
+    ciao_svnt_source_ (nullptr),
+    ciao_svnt_template_header_ (nullptr),
+    ciao_svnt_template_source_ (nullptr),
+    ciao_exec_header_ (nullptr),
+    ciao_exec_source_ (nullptr),
+    ciao_exec_idl_ (nullptr),
+    ciao_conn_header_ (nullptr),
+    ciao_conn_source_ (nullptr),
+    ciao_ami_conn_idl_ (nullptr),
+    gperf_input_filename_ (nullptr),
     strategy_ (TAO_PERFECT_HASH)
 {
 }
 
 // destructor
-TAO_CodeGen::~TAO_CodeGen (void)
+TAO_CodeGen::~TAO_CodeGen ()
 {
 }
 
@@ -123,7 +123,7 @@ TAO_CodeGen::downcase (const char *str)
 int
 TAO_CodeGen::start_client_header (const char *fname)
 {
-  if (0 == fname)
+  if (nullptr == fname)
     {
       // Bad file name.
       return -1;
@@ -173,14 +173,14 @@ TAO_CodeGen::start_client_header (const char *fname)
                                "_H_");
     }
 
-  if (be_global->pre_include () != 0)
+  if (be_global->pre_include () != nullptr)
     {
       *this->client_header_ << "#include /**/ \""
                             << be_global->pre_include ()
                             << "\"\n\n";
     }
 
-  if (be_global->include_guard () != 0)
+  if (be_global->include_guard () != nullptr)
     {
       *this->client_header_ << "#ifndef "
                             << be_global->include_guard ()
@@ -189,7 +189,7 @@ TAO_CodeGen::start_client_header (const char *fname)
       *this->client_header_ << "#error "
                             << "You should not include " << fname;
 
-      if (be_global->safe_include () != 0)
+      if (be_global->safe_include () != nullptr)
         {
           *this->client_header_ << ", use " << be_global->safe_include ();
         }
@@ -226,14 +226,14 @@ TAO_CodeGen::start_client_header (const char *fname)
 
   // Other include files.
 
-  if (be_global->stub_export_include () != 0)
+  if (be_global->stub_export_include () != nullptr)
     {
       *this->client_header_ << "\n#include /**/ \""
                             << be_global->stub_export_include ()
                             << "\"";
     }
 
-  if (be_global->unique_include () != 0)
+  if (be_global->unique_include () != nullptr)
     {
       *this->client_header_ << "\n#include \""
                             << be_global->unique_include ()
@@ -276,7 +276,7 @@ TAO_CodeGen::start_client_header (const char *fname)
           idl_name_str.destroy ();
 
           // Sanity check and then print.
-          if (client_hdr != 0)
+          if (client_hdr != nullptr)
             {
               this->client_header_->print ("\n#include \"%s\"",
                                            client_hdr);
@@ -296,7 +296,7 @@ TAO_CodeGen::start_client_header (const char *fname)
        !i.done ();
        i.advance ())
     {
-      char **tmp = 0;
+      char **tmp = nullptr;
       i.next (tmp);
 
       // Make a String out of it.
@@ -310,7 +310,7 @@ TAO_CodeGen::start_client_header (const char *fname)
       idl_name_str.destroy ();
 
       // Sanity check and then print.
-      if (client_hdr != 0)
+      if (client_hdr != nullptr)
         {
           this->client_header_->print ("\n#include \"%s\"",
                                        client_hdr);
@@ -341,7 +341,7 @@ TAO_CodeGen::start_client_header (const char *fname)
 
 // Get the client header stream.
 TAO_OutStream *
-TAO_CodeGen::client_header (void)
+TAO_CodeGen::client_header ()
 {
   return this->client_header_;
 }
@@ -378,7 +378,7 @@ TAO_CodeGen::start_client_stubs (const char *fname)
       // header file.
       *this->client_stubs_ << "\n\n#if !defined (__ACE_INLINE__)";
       *this->client_stubs_ << "\n#include \""
-                           << be_global->be_get_client_inline_fname (1)
+                           << be_global->be_get_client_inline_fname (true)
                            << "\"";
       *this->client_stubs_ << "\n#endif /* !defined INLINE */";
     }
@@ -392,7 +392,7 @@ TAO_CodeGen::start_client_stubs (const char *fname)
 
 // Get the client stubs stream.
 TAO_OutStream *
-TAO_CodeGen::client_stubs (void)
+TAO_CodeGen::client_stubs ()
 {
   return this->client_stubs_;
 }
@@ -425,7 +425,7 @@ TAO_CodeGen::start_client_inline (const char *fname)
 
 // Get the client inline stream.
 TAO_OutStream *
-TAO_CodeGen::client_inline (void)
+TAO_CodeGen::client_inline ()
 {
   return this->client_inline_;
 }
@@ -460,7 +460,7 @@ TAO_CodeGen::start_server_header (const char *fname)
                            "_TAO_IDL_",
                            "_H_");
 
-  if (be_global->pre_include () != 0)
+  if (be_global->pre_include () != nullptr)
     {
       *this->server_header_ << "#include /**/ \""
                             << be_global->pre_include ()
@@ -498,7 +498,7 @@ TAO_CodeGen::start_server_header (const char *fname)
       UTL_String idl_name_str (idl_name);
 
       char const * const server_hdr =
-        BE_GlobalData::be_get_server_hdr (&idl_name_str, 1);
+        BE_GlobalData::be_get_server_hdr (&idl_name_str, true);
 
       idl_name_str.destroy ();
 
@@ -523,7 +523,7 @@ TAO_CodeGen::start_server_header (const char *fname)
 
       this->gen_skel_hdr_includes ();
 
-      if (be_global->skel_export_include () != 0)
+      if (be_global->skel_export_include () != nullptr)
         {
           *this->server_header_ << "\n\n#include /**/ \""
                                 << be_global->skel_export_include ()
@@ -549,7 +549,7 @@ TAO_CodeGen::start_server_header (const char *fname)
 
 // Get the server header stream.
 TAO_OutStream *
-TAO_CodeGen::server_header (void)
+TAO_CodeGen::server_header ()
 {
   return this->server_header_;
 }
@@ -591,7 +591,7 @@ TAO_CodeGen::start_server_template_header (const char *fname)
                            "_TAO_IDL_",
                            "_H_");
 
-  if (be_global->pre_include () != 0)
+  if (be_global->pre_include () != nullptr)
     {
       *this->server_template_header_ << "#include /**/ \""
                                      << be_global->pre_include ()
@@ -608,7 +608,7 @@ TAO_CodeGen::start_server_template_header (const char *fname)
 
 // Get the server header stream.
 TAO_OutStream *
-TAO_CodeGen::server_template_header (void)
+TAO_CodeGen::server_template_header ()
 {
   return this->server_template_header_;
 }
@@ -655,7 +655,7 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
   // Generate the include statement for the server header.
   *this->server_skeletons_
     << "\n#include \""
-    << be_global->be_get_server_hdr_fname (1)
+    << be_global->be_get_server_hdr_fname (true)
     << "\"";
 
   this->gen_skel_src_includes ();
@@ -670,7 +670,7 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
 
 // Get the server skeletons stream.
 TAO_OutStream *
-TAO_CodeGen::server_skeletons (void)
+TAO_CodeGen::server_skeletons ()
 {
   return this->server_skeletons_;
 }
@@ -723,7 +723,7 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
 
 // Get the server template skeletons stream.
 TAO_OutStream *
-TAO_CodeGen::server_template_skeletons (void)
+TAO_CodeGen::server_template_skeletons ()
 {
   return this->server_template_skeletons_;
 }
@@ -786,7 +786,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
                            "_TAO_IDL_",
                            "_H_");
 
-  if (be_global->pre_include () != 0)
+  if (be_global->pre_include () != nullptr)
     {
       *this->anyop_header_ << "#include /**/ \""
                            << be_global->pre_include ()
@@ -794,13 +794,13 @@ TAO_CodeGen::start_anyop_header (const char *fname)
     }
 
   // If anyop macro hasn't been set, default to stub macro.
-  if (be_global->anyop_export_include () != 0)
+  if (be_global->anyop_export_include () != nullptr)
     {
       *this->anyop_header_ << "\n#include /**/ \""
                            << be_global->anyop_export_include ()
                            << "\"";
     }
-  else if (be_global->stub_export_include () != 0)
+  else if (be_global->stub_export_include () != nullptr)
     {
       *this->anyop_header_ << "\n#include /**/ \""
                            << be_global->stub_export_include ()
@@ -822,7 +822,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
     {
       const char *stub_incl_dir = be_global->stub_include_dir ();
 
-      if (stub_incl_dir == 0)
+      if (stub_incl_dir == nullptr)
         {
           tao_prefix = "tao/";
         }
@@ -956,7 +956,7 @@ TAO_CodeGen::start_anyop_source (const char *fname)
   // Generate the include statement for the client header. We just
   // need to put only the base names. Path info is not required.
   *this->anyop_source_ << "\n#include \""
-                       << be_global->be_get_anyop_header_fname (1)
+                       << be_global->be_get_anyop_header_fname (true)
                        << "\"";
 
   this->gen_typecode_includes (this->anyop_source_);
@@ -972,13 +972,13 @@ TAO_CodeGen::start_anyop_source (const char *fname)
 }
 
 TAO_OutStream *
-TAO_CodeGen::anyop_header (void)
+TAO_CodeGen::anyop_header ()
 {
   return this->anyop_header_;
 }
 
 TAO_OutStream *
-TAO_CodeGen::anyop_source (void)
+TAO_CodeGen::anyop_source ()
 {
   return this->anyop_source_;
 }
@@ -1021,7 +1021,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname)
                            "CIAO_SESSION_",
                            "_H_");
 
-  if (be_global->pre_include () != 0)
+  if (be_global->pre_include () != nullptr)
     {
       os << "#include /**/ \""
          << be_global->pre_include ()
@@ -1032,13 +1032,13 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname)
   // generated code in the same library, using the skel export macro,
   // so the values for the servant export default to the skel values.
   // Eventually, there should be a way to completely decouple them.
-  if (be_global->svnt_export_include () != 0)
+  if (be_global->svnt_export_include () != nullptr)
     {
       os << "\n#include /**/ \""
          << be_global->svnt_export_include ()
          << "\"\n";
     }
-  else if (be_global->skel_export_include () != 0)
+  else if (be_global->skel_export_include () != nullptr)
     {
       os << "\n#include /**/ \""
          << be_global->skel_export_include ()
@@ -1053,7 +1053,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname)
      << be_nl;
 
 
-  char **path_tmp = 0;
+  char **path_tmp = nullptr;
 
   for (ACE_Unbounded_Queue_Iterator<char *>riter (
          idl_global->ciao_lem_file_names ());
@@ -1167,7 +1167,7 @@ TAO_CodeGen::start_ciao_svnt_template_header (const char *fname)
                            "CIAO_SERVANT_",
                            "_H_");
 
-  if (be_global->pre_include () != 0)
+  if (be_global->pre_include () != nullptr)
     {
       os << "#include /**/ \""
          << be_global->pre_include ()
@@ -1178,13 +1178,13 @@ TAO_CodeGen::start_ciao_svnt_template_header (const char *fname)
   // generated code in the same library, using the skel export macro,
   // so the values for the servant export default to the skel values.
   // Eventually, there should be a way to completely decouple them.
-  if (be_global->svnt_export_include () != 0)
+  if (be_global->svnt_export_include () != nullptr)
     {
       os << "\n#include /**/ \""
          << be_global->svnt_export_include ()
          << "\"\n";
     }
-  else if (be_global->skel_export_include () != 0)
+  else if (be_global->skel_export_include () != nullptr)
     {
       os << "\n#include /**/ \""
          << be_global->skel_export_include ()
@@ -1255,25 +1255,25 @@ TAO_CodeGen::start_ciao_svnt_template_source (const char *fname)
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_svnt_header (void)
+TAO_CodeGen::ciao_svnt_header ()
 {
   return this->ciao_svnt_header_;
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_svnt_source (void)
+TAO_CodeGen::ciao_svnt_source ()
 {
   return this->ciao_svnt_source_;
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_svnt_template_header (void)
+TAO_CodeGen::ciao_svnt_template_header ()
 {
   return this->ciao_svnt_template_header_;
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_svnt_template_source (void)
+TAO_CodeGen::ciao_svnt_template_source ()
 {
   return this->ciao_svnt_template_source_;
 }
@@ -1311,7 +1311,7 @@ TAO_CodeGen::start_ciao_exec_header (const char *fname)
                            "CIAO_",
                            "_H_");
 
-  if (be_global->pre_include () != 0)
+  if (be_global->pre_include () != nullptr)
     {
       os << "#include /**/ \""
          << be_global->pre_include ()
@@ -1364,13 +1364,13 @@ TAO_CodeGen::start_ciao_exec_source (const char *fname)
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_exec_header (void)
+TAO_CodeGen::ciao_exec_header ()
 {
   return this->ciao_exec_header_;
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_exec_source (void)
+TAO_CodeGen::ciao_exec_source ()
 {
   return this->ciao_exec_source_;
 }
@@ -1413,7 +1413,7 @@ TAO_CodeGen::start_ciao_exec_idl (const char *fname)
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_exec_idl (void)
+TAO_CodeGen::ciao_exec_idl ()
 {
   return this->ciao_exec_idl_;
 }
@@ -1456,7 +1456,7 @@ TAO_CodeGen::start_ciao_conn_header (const char *fname)
                            "CIAO_",
                            "_H_");
 
-  if (be_global->pre_include () != 0)
+  if (be_global->pre_include () != nullptr)
     {
       os << "#include /**/ \""
          << be_global->pre_include ()
@@ -1464,7 +1464,7 @@ TAO_CodeGen::start_ciao_conn_header (const char *fname)
     }
 
   // This will almost certainly be true, but just in case...
-  if (be_global->conn_export_include () != 0)
+  if (be_global->conn_export_include () != nullptr)
     {
       this->gen_standard_include (
         this->ciao_conn_header_,
@@ -1484,7 +1484,7 @@ TAO_CodeGen::start_ciao_conn_header (const char *fname)
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_conn_header (void)
+TAO_CodeGen::ciao_conn_header ()
 {
   return this->ciao_conn_header_;
 }
@@ -1528,7 +1528,7 @@ TAO_CodeGen::start_ciao_conn_source (const char *fname)
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_conn_source (void)
+TAO_CodeGen::ciao_conn_source ()
 {
   return this->ciao_conn_source_;
 }
@@ -1571,7 +1571,7 @@ TAO_CodeGen::start_ciao_ami_conn_idl (const char *fname)
 }
 
 TAO_OutStream *
-TAO_CodeGen::ciao_ami_conn_idl (void)
+TAO_CodeGen::ciao_ami_conn_idl ()
 {
   return this->ciao_ami_conn_idl_;
 }
@@ -1608,7 +1608,7 @@ TAO_CodeGen::start_implementation_header (const char *fname)
                            "",
                            "_H_");
 
-  const char* server_hdr = BE_GlobalData::be_get_server_hdr_fname (1);
+  const char* server_hdr = BE_GlobalData::be_get_server_hdr_fname (true);
 
   *this->implementation_header_<< "#include \"" << server_hdr <<"\"";
 
@@ -1627,7 +1627,7 @@ TAO_CodeGen::start_implementation_header (const char *fname)
 
 // Get the implementation header stream.
 TAO_OutStream *
-TAO_CodeGen::implementation_header (void)
+TAO_CodeGen::implementation_header ()
 {
   return this->implementation_header_;
 }
@@ -1670,14 +1670,14 @@ TAO_CodeGen::start_implementation_skeleton (const char *fname)
 
 // Get the implementation header stream.
 TAO_OutStream *
-TAO_CodeGen::implementation_skeleton (void)
+TAO_CodeGen::implementation_skeleton ()
 {
   return this->implementation_skeleton_;
 }
 
 // Put the last #endif in the client and server headers.
 int
-TAO_CodeGen::end_client_header (void)
+TAO_CodeGen::end_client_header ()
 {
   // Generate the <<= and >>= operators here.
 
@@ -1695,14 +1695,14 @@ TAO_CodeGen::end_client_header (void)
       // Insert the code to include the inline file.
       *this->client_header_ << "#if defined (__ACE_INLINE__)\n";
       *this->client_header_ << "#include \""
-                            << be_global->be_get_client_inline_fname (1)
+                            << be_global->be_get_client_inline_fname (true)
                             << "\"\n";
       *this->client_header_ << "#endif /* defined INLINE */\n\n";
     }
 
   // Code to put the last #endif.
 
-  if (be_global->post_include () != 0)
+  if (be_global->post_include () != nullptr)
     {
       *this->client_header_ << "#include /**/ \""
                             << be_global->post_include ()
@@ -1716,7 +1716,7 @@ TAO_CodeGen::end_client_header (void)
 }
 
 void
-TAO_CodeGen::end_client_inline (void)
+TAO_CodeGen::end_client_inline ()
 {
   *this->client_inline_ << "\n";
 
@@ -1728,7 +1728,7 @@ TAO_CodeGen::end_client_inline (void)
 }
 
 void
-TAO_CodeGen::end_client_stubs (void)
+TAO_CodeGen::end_client_stubs ()
 {
   *this->client_stubs_ << "\n";
 
@@ -1740,7 +1740,7 @@ TAO_CodeGen::end_client_stubs (void)
 }
 
 int
-TAO_CodeGen::end_server_header (void)
+TAO_CodeGen::end_server_header ()
 {
   TAO_OutStream *os = this->server_header_;
 
@@ -1761,7 +1761,7 @@ TAO_CodeGen::end_server_header (void)
         }
     }
 
-  if (be_global->post_include () != 0)
+  if (be_global->post_include () != nullptr)
     {
       *os << be_nl_2
           << "#include /**/ \""
@@ -1779,7 +1779,7 @@ TAO_CodeGen::end_server_header (void)
 int
 TAO_CodeGen::end_implementation_header (const char *fname)
 {
-  if (fname == 0)
+  if (fname == nullptr)
     {
       // Bad file name.
       return -1;
@@ -1787,7 +1787,7 @@ TAO_CodeGen::end_implementation_header (const char *fname)
 
   const char *suffix = ACE_OS::strrchr (fname, '.');
 
-  if (suffix == 0)
+  if (suffix == nullptr)
     {
       // File seems to have no extension, so let us take the name
       // as it is.
@@ -1823,7 +1823,7 @@ TAO_CodeGen::end_implementation_header (const char *fname)
 }
 
 int
-TAO_CodeGen::end_server_template_header (void)
+TAO_CodeGen::end_server_template_header ()
 {
   *this->server_template_header_ << be_nl_2 << "// TAO_IDL - Generated from"
                                  << be_nl << "// "
@@ -1838,7 +1838,7 @@ TAO_CodeGen::end_server_template_header (void)
       << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)";
   *this->server_template_header_
       << be_nl << "#include \""
-      << be_global->be_get_server_template_skeleton_fname (1)
+      << be_global->be_get_server_template_skeleton_fname (true)
       << "\"";
   *this->server_template_header_ << be_nl
       << "#endif /* defined REQUIRED SOURCE */";
@@ -1848,7 +1848,7 @@ TAO_CodeGen::end_server_template_header (void)
       << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)";
   *this->server_template_header_
       << be_nl << "#pragma implementation (\""
-      << be_global->be_get_server_template_skeleton_fname (1)
+      << be_global->be_get_server_template_skeleton_fname (true)
       << "\")";
   *this->server_template_header_ << be_nl
       << "#endif /* defined REQUIRED PRAGMA */";
@@ -1856,7 +1856,7 @@ TAO_CodeGen::end_server_template_header (void)
   // Code to put the last #endif.
   *this->server_template_header_ << "\n\n";
 
-  if (be_global->post_include () != 0)
+  if (be_global->post_include () != nullptr)
     {
       *this->server_template_header_ << "#include /**/ \""
                                      << be_global->post_include ()
@@ -1869,7 +1869,7 @@ TAO_CodeGen::end_server_template_header (void)
 }
 
 int
-TAO_CodeGen::end_server_template_skeletons (void)
+TAO_CodeGen::end_server_template_skeletons ()
 {
   // End versioned namespace support.  Do not place include directives
   // before this.
@@ -1883,7 +1883,7 @@ TAO_CodeGen::end_server_template_skeletons (void)
 }
 
 int
-TAO_CodeGen::end_server_skeletons (void)
+TAO_CodeGen::end_server_skeletons ()
 {
   // End versioned namespace support.  Do not place include directives
   // before this.
@@ -1897,14 +1897,14 @@ TAO_CodeGen::end_server_skeletons (void)
 }
 
 int
-TAO_CodeGen::end_anyop_header (void)
+TAO_CodeGen::end_anyop_header ()
 {
   // End versioned namespace support.  Do not place include directives
   // before this.
   *this->anyop_header_ << be_global->versioning_end ();
 
 
-  if (be_global->post_include () != 0)
+  if (be_global->post_include () != nullptr)
     {
       *this->anyop_header_ << "\n\n#include /**/ \""
                            << be_global->post_include ()
@@ -1918,7 +1918,7 @@ TAO_CodeGen::end_anyop_header (void)
 }
 
 int
-TAO_CodeGen::end_anyop_source (void)
+TAO_CodeGen::end_anyop_source ()
 {
   // End versioned namespace support.  Do not place include directives
   // before this.
@@ -1930,9 +1930,9 @@ TAO_CodeGen::end_anyop_source (void)
 }
 
 int
-TAO_CodeGen::end_ciao_svnt_header (void)
+TAO_CodeGen::end_ciao_svnt_header ()
 {
-  if (be_global->post_include () != 0)
+  if (be_global->post_include () != nullptr)
     {
       *this->ciao_svnt_header_ << "\n\n#include /**/ \""
                                << be_global->post_include ()
@@ -1945,7 +1945,7 @@ TAO_CodeGen::end_ciao_svnt_header (void)
 }
 
 int
-TAO_CodeGen::end_ciao_svnt_source (void)
+TAO_CodeGen::end_ciao_svnt_source ()
 {
   *this->ciao_svnt_source_ << "\n";
 
@@ -1953,7 +1953,7 @@ TAO_CodeGen::end_ciao_svnt_source (void)
 }
 
 int
-TAO_CodeGen::end_ciao_svnt_template_header (void)
+TAO_CodeGen::end_ciao_svnt_template_header ()
 {
   *this->ciao_svnt_template_header_ << be_nl_2
                                     << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"
@@ -1969,7 +1969,7 @@ TAO_CodeGen::end_ciao_svnt_template_header (void)
                                     << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */"
                                     << be_nl;
 
-  if (be_global->post_include () != 0)
+  if (be_global->post_include () != nullptr)
     {
       *this->ciao_svnt_template_header_ << "\n\n#include /**/ \""
                                         << be_global->post_include ()
@@ -1982,7 +1982,7 @@ TAO_CodeGen::end_ciao_svnt_template_header (void)
 }
 
 int
-TAO_CodeGen::end_ciao_svnt_template_source (void)
+TAO_CodeGen::end_ciao_svnt_template_source ()
 {
   *this->ciao_svnt_template_source_ << "\n\n#endif /* ifndef */\n";
 
@@ -1992,9 +1992,9 @@ TAO_CodeGen::end_ciao_svnt_template_source (void)
 }
 
 int
-TAO_CodeGen::end_ciao_exec_header (void)
+TAO_CodeGen::end_ciao_exec_header ()
 {
-  if (be_global->post_include () != 0)
+  if (be_global->post_include () != nullptr)
     {
       *this->ciao_exec_header_ << "\n\n#include /**/ \""
                                << be_global->post_include ()
@@ -2007,7 +2007,7 @@ TAO_CodeGen::end_ciao_exec_header (void)
 }
 
 int
-TAO_CodeGen::end_ciao_exec_source (void)
+TAO_CodeGen::end_ciao_exec_source ()
 {
   *this->ciao_exec_source_ << "\n";
 
@@ -2015,7 +2015,7 @@ TAO_CodeGen::end_ciao_exec_source (void)
 }
 
 int
-TAO_CodeGen::end_ciao_exec_idl (void)
+TAO_CodeGen::end_ciao_exec_idl ()
 {
   *this->ciao_exec_idl_ << "\n\n#endif /* ifndef */\n";
 
@@ -2023,9 +2023,9 @@ TAO_CodeGen::end_ciao_exec_idl (void)
 }
 
 int
-TAO_CodeGen::end_ciao_conn_header (void)
+TAO_CodeGen::end_ciao_conn_header ()
 {
-  if (be_global->post_include () != 0)
+  if (be_global->post_include () != nullptr)
     {
       *this->ciao_conn_header_ << "\n\n#include /**/ \""
                                << be_global->post_include ()
@@ -2038,7 +2038,7 @@ TAO_CodeGen::end_ciao_conn_header (void)
 }
 
 int
-TAO_CodeGen::end_ciao_conn_source (void)
+TAO_CodeGen::end_ciao_conn_source ()
 {
   *this->ciao_conn_source_ << "\n";
 
@@ -2046,7 +2046,7 @@ TAO_CodeGen::end_ciao_conn_source (void)
 }
 
 int
-TAO_CodeGen::end_ciao_ami_conn_idl (void)
+TAO_CodeGen::end_ciao_ami_conn_idl ()
 {
   *this->ciao_ami_conn_idl_ << "\n\n#endif /* ifndef */\n";
 
@@ -2066,7 +2066,7 @@ TAO_CodeGen::gperf_input_stream (TAO_OutStream *os)
 }
 
 TAO_OutStream *
-TAO_CodeGen::gperf_input_stream (void)
+TAO_CodeGen::gperf_input_stream ()
 {
   return this->gperf_input_stream_;
 }
@@ -2079,7 +2079,7 @@ TAO_CodeGen::gperf_input_filename (char *filename)
 }
 
 char *
-TAO_CodeGen::gperf_input_filename (void)
+TAO_CodeGen::gperf_input_filename ()
 {
   return this->gperf_input_filename_;
 }
@@ -2089,39 +2089,39 @@ TAO_CodeGen::gen_ident_string (TAO_OutStream *stream) const
 {
   const char *str = idl_global->ident_string ();
 
-  if (str != 0)
+  if (str != nullptr)
     {
       *stream << "#" << str << be_nl_2;
     }
 }
 
 void
-TAO_CodeGen::gen_export_files (void)
+TAO_CodeGen::gen_export_files ()
 {
   if (be_global->gen_stub_export_hdr_file ()
-      && be_global->stub_export_macro () != 0
-      && (be_global->stub_export_include () != 0 || be_global->stub_export_file () != 0))
+      && be_global->stub_export_macro () != nullptr
+      && (be_global->stub_export_include () != nullptr || be_global->stub_export_file () != nullptr))
     {
       this->gen_export_file (
-        (be_global->stub_export_file () != 0) ? be_global->stub_export_file () : be_global->stub_export_include (),
+        (be_global->stub_export_file () != nullptr) ? be_global->stub_export_file () : be_global->stub_export_include (),
         be_global->stub_export_macro (),
         "stub");
     }
 
   if (be_global->gen_skel_export_hdr_file ()
-      && be_global->skel_export_macro () != 0
-      && be_global->skel_export_include () != 0)
+      && be_global->skel_export_macro () != nullptr
+      && be_global->skel_export_include () != nullptr)
     {
       this->gen_export_file (
-        (be_global->skel_export_file () != 0) ? be_global->skel_export_file () : be_global->skel_export_include (),
+        (be_global->skel_export_file () != nullptr) ? be_global->skel_export_file () : be_global->skel_export_include (),
         be_global->skel_export_macro (),
         "skel",
         true);
     }
 
   if (be_global->gen_svnt_export_hdr_file ()
-      && be_global->svnt_export_macro () != 0
-      && be_global->svnt_export_include () != 0)
+      && be_global->svnt_export_macro () != nullptr
+      && be_global->svnt_export_include () != nullptr)
     {
       this->gen_export_file (
         be_global->svnt_export_include (),
@@ -2130,8 +2130,8 @@ TAO_CodeGen::gen_export_files (void)
     }
 
   if (be_global->gen_exec_export_hdr_file ()
-      && be_global->exec_export_macro () != 0
-      && be_global->exec_export_include () != 0)
+      && be_global->exec_export_macro () != nullptr
+      && be_global->exec_export_include () != nullptr)
     {
       this->gen_export_file (
         be_global->exec_export_include (),
@@ -2140,8 +2140,8 @@ TAO_CodeGen::gen_export_files (void)
     }
 
   if (be_global->gen_conn_export_hdr_file ()
-      && be_global->conn_export_macro () != 0
-      && be_global->conn_export_include () != 0)
+      && be_global->conn_export_macro () != nullptr
+      && be_global->conn_export_include () != nullptr)
     {
       this->gen_export_file (
         be_global->conn_export_include (),
@@ -2159,7 +2159,7 @@ TAO_CodeGen::gen_export_file (const char *filename,
   // Svnt export macro may correctly default to skel
   // export macro, so we just return silently. The
   // null filename check below will catch a real error.
-  if (macro == 0)
+  if (macro == nullptr)
     {
       return;
     }
@@ -2170,7 +2170,7 @@ TAO_CodeGen::gen_export_file (const char *filename,
   const char *output_path =
     be_util::get_output_path (false, for_skel, false);
 
-  if (output_path != 0)
+  if (output_path != nullptr)
     {
       // Turn '\' and '\\' into '/'.
       char* i = const_cast<char*> (output_path);
@@ -2313,7 +2313,7 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
 
   const char *extension = ACE_OS::strrchr (fname, '.');
 
-  if (extension == 0)
+  if (extension == nullptr)
     {
       // File seems to have no extension, so let us take the name
       // as it is.
@@ -2359,7 +2359,7 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
 }
 
 void
-TAO_CodeGen::gen_stub_hdr_includes (void)
+TAO_CodeGen::gen_stub_hdr_includes ()
 {
   // Include valuetype and Any/TypeCode headers before ORB core
   // headers to make sure some things are parsed before some templates
@@ -2468,7 +2468,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
         {
           ACE_Unbounded_Queue<char *> &ts_files =
             idl_global->ciao_oci_ts_file_names ();
-          char **tmp = 0;
+          char **tmp = nullptr;
 
           for (ACE_Unbounded_Queue_Iterator<char *> i (ts_files);
               !i.done ();
@@ -2578,7 +2578,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
               UTL_String idl_name_str = idl_name;
 
               char const * const anyop_hdr =
-                BE_GlobalData::be_get_anyop_header (&idl_name_str, 1);
+                BE_GlobalData::be_get_anyop_header (&idl_name_str, true);
 
               idl_name_str.destroy ();
 
@@ -2640,7 +2640,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
                               "tao/Versioned_Namespace.h",
                               true);
 
-  if ((be_global->versioning_include () != 0) && (ACE_OS::strlen (be_global->versioning_include ()) > 0))
+  if ((be_global->versioning_include () != nullptr) && (ACE_OS::strlen (be_global->versioning_include ()) > 0))
     {
       this->gen_standard_include (this->client_header_,
                                   be_global->versioning_include (),
@@ -2659,7 +2659,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
 }
 
 void
-TAO_CodeGen::gen_stub_src_includes (void)
+TAO_CodeGen::gen_stub_src_includes ()
 {
   // Generate the include statement for the precompiled header file.
   if (be_global->pch_include ())
@@ -2793,7 +2793,7 @@ TAO_CodeGen::gen_stub_src_includes (void)
     {
       // Needed for _narrow(), which is now template-based.
       this->gen_standard_include (this->client_stubs_,
-                                  "ace/OS_NS_string.h");
+                                  "cstring");
     }
 
   if (be_global->gen_amh_classes ())
@@ -2805,7 +2805,7 @@ TAO_CodeGen::gen_stub_src_includes (void)
 }
 
 void
-TAO_CodeGen::gen_skel_hdr_includes (void)
+TAO_CodeGen::gen_skel_hdr_includes ()
 {
   // Include the definitions for the PortableServer namespace,
   // this forces the application to link the POA library, a good
@@ -2836,7 +2836,7 @@ TAO_CodeGen::gen_skel_hdr_includes (void)
 }
 
 void
-TAO_CodeGen::gen_skel_src_includes (void)
+TAO_CodeGen::gen_skel_src_includes ()
 {
   // Only non-local interfaces generate anything in the skeleton.
   if (!(idl_global->non_local_iface_seen_
@@ -2940,10 +2940,14 @@ TAO_CodeGen::gen_skel_src_includes (void)
   // For Static_Allocator_Base
   this->gen_standard_include (this->server_skeletons_,
                               "ace/Malloc_Allocator.h");
+
+  // For std::strcmp
+  this->gen_standard_include (this->server_skeletons_,
+                              "cstring");
 }
 
 void
-TAO_CodeGen::gen_seq_file_includes (void)
+TAO_CodeGen::gen_seq_file_includes ()
 {
   // @@@ (JP) These can get more specialized, after the TAO seq template
   // files have been split up.
@@ -3007,7 +3011,7 @@ TAO_CodeGen::gen_any_file_includes (TAO_OutStream * stream)
 }
 
 void
-TAO_CodeGen::gen_var_file_includes (void)
+TAO_CodeGen::gen_var_file_includes ()
 {
   this->gen_cond_file_include (
       idl_global->valuetype_seen_
@@ -3459,13 +3463,13 @@ TAO_CodeGen::gen_svnt_src_includes (TAO_OutStream *stream)
 }
 
 void
-TAO_CodeGen::gen_exec_hdr_includes (void)
+TAO_CodeGen::gen_exec_hdr_includes ()
 {
   // All CIAO examples so far have component skeleton and servant
   // generated code in the same library, using the skel export macro,
   // so the values for the servant export default to the skel values.
   // Eventually, there should be a way to completely decouple them.
-  if (be_global->exec_export_include () != 0)
+  if (be_global->exec_export_include () != nullptr)
     {
       this->gen_standard_include (
         this->ciao_exec_header_,
@@ -3479,7 +3483,7 @@ TAO_CodeGen::gen_exec_hdr_includes (void)
 }
 
 void
-TAO_CodeGen::gen_exec_src_includes (void)
+TAO_CodeGen::gen_exec_src_includes ()
 {
   // Generate the include statement for the exec source.
   this->gen_standard_include (
@@ -3495,7 +3499,7 @@ TAO_CodeGen::gen_exec_src_includes (void)
 }
 
 void
-TAO_CodeGen::gen_exec_idl_includes (void)
+TAO_CodeGen::gen_exec_idl_includes ()
 {
   if (!be_global->gen_noeventccm ())
     {
@@ -3558,7 +3562,7 @@ TAO_CodeGen::gen_exec_idl_includes (void)
         idl_global->stripped_filename ()->get_string ());
     }
 
-  char **path_tmp = 0;
+  char **path_tmp = nullptr;
 
   for (ACE_Unbounded_Queue_Iterator<char *>riter (
          idl_global->ciao_lem_file_names ());
@@ -3574,7 +3578,7 @@ TAO_CodeGen::gen_exec_idl_includes (void)
       // special case for ami4ccm, if xxxE.idl. don't include xxxAE.idl.
       char *exe_idl_fname = ACE_OS::strdup(exec_idl_fname);
       char * base = ACE_OS::strstr(exe_idl_fname, "E.idl");
-      if (base != 0)
+      if (base != nullptr)
         {
           static char test[MAXPATHLEN];
           ACE_OS::memset (test, 0, MAXPATHLEN);
@@ -3582,7 +3586,7 @@ TAO_CodeGen::gen_exec_idl_includes (void)
           ACE_OS::strncpy(test, exe_idl_fname, base - exe_idl_fname);
           ACE_OS::strcat (test, "AE.idl");
 
-          if (ACE_OS::strstr ( *path_tmp,  test) != 0)
+          if (ACE_OS::strstr ( *path_tmp,  test) != nullptr)
            {
              //skip include
              skip_incl = true;
@@ -3609,12 +3613,12 @@ TAO_CodeGen::is_system_file (const char * idl_name) const
 }
 
 void
-TAO_CodeGen::gen_conn_hdr_includes (void)
+TAO_CodeGen::gen_conn_hdr_includes ()
 {
   ACE_Unbounded_Queue<char *> &lem_file_names =
     idl_global->ciao_lem_file_names ();
 
-  char **path_tmp  = 0;
+  char **path_tmp  = nullptr;
 
   for (ACE_Unbounded_Queue_Iterator<char *> riter (
          lem_file_names);
@@ -3712,7 +3716,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void)
 }
 
 void
-TAO_CodeGen::gen_conn_src_includes (void)
+TAO_CodeGen::gen_conn_src_includes ()
 {
   // Generate the include statement for the connector exec source.
   this->gen_standard_include (
@@ -3729,7 +3733,7 @@ TAO_CodeGen::gen_conn_src_includes (void)
 }
 
 void
-TAO_CodeGen::gen_ami_conn_idl_includes (void)
+TAO_CodeGen::gen_ami_conn_idl_includes ()
 {
   // Include the AMI4CCM library entry point, if AMI4CCM is enabled.
   if (be_global->ami4ccm_call_back ())
@@ -3819,7 +3823,7 @@ TAO_CodeGen::gen_conn_ts_includes (
       *this->ciao_conn_header_ << be_nl;
     }
 
-  char **tmp = 0;
+  char **tmp = nullptr;
 
   for (ACE_Unbounded_Queue_Iterator<char *> i (ts_files);
        !i.done ();
@@ -3832,7 +3836,7 @@ TAO_CodeGen::gen_conn_ts_includes (
 }
 
 void
-TAO_CodeGen::destroy (void)
+TAO_CodeGen::destroy ()
 {
   delete this->client_header_;
   delete this->server_header_;
diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp
index be0855463bf..5262752f986 100644
--- a/TAO/TAO_IDL/be/be_component.cpp
+++ b/TAO/TAO_IDL/be/be_component.cpp
@@ -73,22 +73,20 @@ be_component::be_component (UTL_ScopedName *n,
   this->has_constructor (true);
 }
 
-be_component::~be_component (void)
+be_component::~be_component ()
 {
 }
 
 be_component *
-be_component::base_component (void) const
+be_component::base_component () const
 {
-  return
-    be_component::narrow_from_decl (
-      this->AST_Component::base_component ());
+  return dynamic_cast<be_component*> (this->AST_Component::base_component ());
 }
 
 void
 be_component::redefine (AST_Interface *from)
 {
-  be_component *bc = be_component::narrow_from_decl (from);
+  be_component *bc = dynamic_cast<be_component*> (from);
   this->var_out_seq_decls_gen_ = bc->var_out_seq_decls_gen_;
   AST_Component::redefine (from);
 }
@@ -121,69 +119,66 @@ be_component::be_add_typedef (AST_Typedef *t)
 }
 
 ACE_CDR::ULong
-be_component::n_provides (void) const
+be_component::n_provides () const
 {
   return this->n_provides_;
 }
 
 ACE_CDR::ULong
-be_component::n_remote_provides (void) const
+be_component::n_remote_provides () const
 {
   return this->n_remote_provides_;
 }
 
 ACE_CDR::ULong
-be_component::n_uses (void) const
+be_component::n_uses () const
 {
   return this->n_uses_;
 }
 
 ACE_CDR::ULong
-be_component::n_remote_uses (void) const
+be_component::n_remote_uses () const
 {
   return this->n_remote_uses_;
 }
 
 bool
-be_component::has_uses_multiple (void) const
+be_component::has_uses_multiple () const
 {
   return this->has_uses_multiple_;
 }
 
 ACE_CDR::ULong
-be_component::n_publishes (void) const
+be_component::n_publishes () const
 {
   return this->n_publishes_;
 }
 
 ACE_CDR::ULong
-be_component::n_consumes (void) const
+be_component::n_consumes () const
 {
   return this->n_consumes_;
 }
 
 ACE_CDR::ULong
-be_component::n_emits (void) const
+be_component::n_emits () const
 {
   return this->n_emits_;
 }
 
-IMPL_NARROW_FROM_DECL (be_component)
-IMPL_NARROW_FROM_SCOPE (be_component)
-
 void
 be_component::scan (UTL_Scope *s)
 {
-  if (s == 0)
+  if (s == nullptr)
     {
       return;
     }
 
-  AST_Extended_Port *ep = 0;
-  AST_Mirror_Port *mp = 0;
-  AST_Uses *u = 0;
-  AST_Provides *p = 0;
-  AST_Attribute *a = 0;
+  AST_Extended_Port *ep = nullptr;
+  AST_Mirror_Port *mp = nullptr;
+  AST_Uses *u = nullptr;
+  AST_Provides *p = nullptr;
+  AST_Attribute *a = nullptr;
   AST_Decl::NodeType my_nt;
   AST_Decl::NodeType scope_nt;
 
@@ -197,7 +192,7 @@ be_component::scan (UTL_Scope *s)
         {
           case AST_Decl::NT_provides:
             ++this->n_provides_;
-            p = AST_Provides::narrow_from_decl (d);
+            p = dynamic_cast<AST_Provides*> (d);
 
             if (!p->provides_type ()->is_local ())
               {
@@ -207,7 +202,7 @@ be_component::scan (UTL_Scope *s)
             continue;
           case AST_Decl::NT_uses:
             ++this->n_uses_;
-            u = AST_Uses::narrow_from_decl (d);
+            u = dynamic_cast<AST_Uses*> (d);
 
             if (u->is_multiple ())
               {
@@ -230,15 +225,15 @@ be_component::scan (UTL_Scope *s)
             ++this->n_emits_;
             continue;
           case AST_Decl::NT_ext_port:
-            ep = AST_Extended_Port::narrow_from_decl (d);
+            ep = dynamic_cast<AST_Extended_Port*> (d);
             this->scan (ep->port_type ());
             continue;
           case AST_Decl::NT_mirror_port:
-            mp = AST_Mirror_Port::narrow_from_decl (d);
+            mp = dynamic_cast<AST_Mirror_Port*> (d);
             this->mirror_scan (mp->port_type ());
             continue;
           case AST_Decl::NT_attr:
-            a = AST_Attribute::narrow_from_decl (d);;
+            a = dynamic_cast<AST_Attribute*> (d);;
 
             if (!a->readonly ())
               {
@@ -263,10 +258,10 @@ be_component::scan (UTL_Scope *s)
         }
     }
 
-  AST_Component *c = AST_Component::narrow_from_scope (s);
-  AST_Interface *iface = 0;
+  AST_Component *c = dynamic_cast<AST_Component*> (s);
+  AST_Interface *iface = nullptr;
 
-  if (c != 0)
+  if (c != nullptr)
     {
       for (long i = 0; i < c->n_supports (); ++i)
         {
@@ -280,7 +275,7 @@ be_component::scan (UTL_Scope *s)
       // will be 0 and the call will return immediately.
       this->scan (c->base_component ());
     }
-  else if ((iface = AST_Interface::narrow_from_scope (s)) != 0)
+  else if ((iface = dynamic_cast<AST_Interface*> (s)) != nullptr)
     {
       for (long i = 0; i < iface->n_inherits (); ++i)
         {
@@ -300,7 +295,7 @@ be_component::gen_stub_inheritance (TAO_OutStream *os)
 
   AST_Component *parent = this->base_component ();
 
-  if (parent != 0)
+  if (parent != nullptr)
     {
       *os << parent->name ();
     }
@@ -335,7 +330,7 @@ be_component::gen_skel_inheritance (TAO_OutStream *os)
 {
   AST_Component *base = this->base_component ();
 
-  if (base != 0)
+  if (base != nullptr)
     {
       *os << "public virtual POA_" << base->name ();
     }
@@ -346,7 +341,7 @@ be_component::gen_skel_inheritance (TAO_OutStream *os)
 
   long nsupports = this->n_inherits ();
   AST_Type **supports = this->supports ();
-  AST_Type *supported = 0;
+  AST_Type *supported = nullptr;
 
   for (long i = 0; i < nsupports; ++i)
     {
@@ -367,20 +362,14 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os)
 {
   AST_Component *ancestor = this;
 
-  while (ancestor != 0)
+  while (ancestor != nullptr)
     {
-      *os << "ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "value," << be_nl
-          << "\"" << ancestor->repoID () << "\"" << be_uidt_nl
-          << ") == 0 ||" << be_uidt_nl;
+      *os << "std::strcmp (value, \"" << ancestor->repoID () << "\") == 0 ||" << be_nl;
 
       ancestor = ancestor->base_component ();
     }
 
-  *os << "ACE_OS::strcmp (" << be_idt << be_idt_nl
-      << "value," << be_nl
-      << "\"IDL:omg.org/Components/CCMObject:1.0\"" << be_uidt_nl
-      << ") == 0" << be_uidt << be_uidt_nl;
+  *os << "std::strcmp (value, \"IDL:omg.org/Components/CCMObject:1.0\") == 0" << be_nl;
 
   return 0;
 }
@@ -388,9 +377,9 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os)
 void
 be_component::mirror_scan (AST_PortType *pt)
 {
-  AST_Uses *u = 0;
-  AST_Provides *p = 0;
-  AST_Attribute *a = 0;
+  AST_Uses *u = nullptr;
+  AST_Provides *p = nullptr;
+  AST_Attribute *a = nullptr;
 
   for (UTL_ScopeActiveIterator i (pt, UTL_Scope::IK_decls);
        !i.is_done ();
@@ -402,7 +391,7 @@ be_component::mirror_scan (AST_PortType *pt)
         {
           case AST_Decl::NT_provides:
             ++this->n_uses_;
-            p = AST_Provides::narrow_from_decl (d);
+            p = dynamic_cast<AST_Provides*> (d);
 
             if (!p->provides_type ()->is_local ())
               {
@@ -412,7 +401,7 @@ be_component::mirror_scan (AST_PortType *pt)
             continue;
           case AST_Decl::NT_uses:
             ++this->n_provides_;
-            u = AST_Uses::narrow_from_decl (d);
+            u = dynamic_cast<AST_Uses*> (d);
 
             if (!u->uses_type ()->is_local ())
               {
@@ -421,7 +410,7 @@ be_component::mirror_scan (AST_PortType *pt)
 
             continue;
           case AST_Decl::NT_attr:
-            a = AST_Attribute::narrow_from_decl (d);;
+            a = dynamic_cast<AST_Attribute*> (d);;
 
             if (!a->readonly ())
               {
diff --git a/TAO/TAO_IDL/be/be_component_fwd.cpp b/TAO/TAO_IDL/be/be_component_fwd.cpp
index 7cc6a8f441b..8efa3c94efd 100644
--- a/TAO/TAO_IDL/be/be_component_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_component_fwd.cpp
@@ -36,12 +36,12 @@ be_component_fwd::be_component_fwd (AST_Interface *dummy,
   this->size_type (AST_Type::VARIABLE);
 }
 
-be_component_fwd::~be_component_fwd (void)
+be_component_fwd::~be_component_fwd ()
 {
 }
 
 void
-be_component_fwd::destroy (void)
+be_component_fwd::destroy ()
 {
   this->AST_ComponentFwd::destroy ();
 }
@@ -53,7 +53,3 @@ be_component_fwd::accept (be_visitor *visitor)
             ? 0
             : visitor->visit_component_fwd (this));
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_component_fwd)
diff --git a/TAO/TAO_IDL/be/be_connector.cpp b/TAO/TAO_IDL/be/be_connector.cpp
index b1c4c1c68a9..fb1863a9759 100644
--- a/TAO/TAO_IDL/be/be_connector.cpp
+++ b/TAO/TAO_IDL/be/be_connector.cpp
@@ -16,17 +16,17 @@ be_connector::be_connector (
               n),
     UTL_Scope (AST_Decl::NT_connector),
     AST_Interface (n,
+                   nullptr,
                    0,
-                   0,
-                   0,
+                   nullptr,
                    0,
                    false,
                    false),
     AST_Component (n,
                    base_connector,
+                   nullptr,
                    0,
-                   0,
-                   0,
+                   nullptr,
                    0),
     AST_Connector (n,
                    base_connector),
@@ -36,17 +36,17 @@ be_connector::be_connector (
     be_type (AST_Decl::NT_connector,
              n),
     be_interface (n,
+                  nullptr,
                   0,
-                  0,
-                  0,
+                  nullptr,
                   0,
                   false,
                   false),
     be_component (n,
                   base_connector,
+                  nullptr,
                   0,
-                  0,
-                  0,
+                  nullptr,
                   0),
     dds_connector_ (false),
     ami_connector_ (false)
@@ -57,12 +57,12 @@ be_connector::be_connector (
     }
 }
 
-be_connector::~be_connector (void)
+be_connector::~be_connector ()
 {
 }
 
 void
-be_connector::destroy (void)
+be_connector::destroy ()
 {
   this->AST_Connector::destroy ();
   this->be_component::destroy ();
@@ -75,23 +75,23 @@ be_connector::accept (be_visitor *visitor)
 }
 
 bool
-be_connector::dds_connector (void)
+be_connector::dds_connector ()
 {
   return this->dds_connector_;
 }
 
 bool
-be_connector::ami_connector (void)
+be_connector::ami_connector ()
 {
   return this->ami_connector_;
 }
 
 void
-be_connector::check_ancestors (void)
+be_connector::check_ancestors ()
 {
   AST_Connector *base = this;
 
-  while (base != 0)
+  while (base != nullptr)
     {
       const char *base_fname = base->full_name ();
 
@@ -112,14 +112,14 @@ be_connector::check_ancestors (void)
           // If we have a templated module, enable it as dds_connector_
           // for the moment
           AST_Module *m =
-            AST_Module::narrow_from_scope (this->defined_in ());
-          AST_Template_Module_Inst *t_inst = 0;
-          while (t_inst == 0 && m != 0)
+            dynamic_cast<AST_Module*> (this->defined_in ());
+          AST_Template_Module_Inst *t_inst = nullptr;
+          while (t_inst == nullptr && m != nullptr)
             {
               t_inst = m->from_inst ();
-              m = AST_Module::narrow_from_scope (m->defined_in ());
+              m = dynamic_cast<AST_Module*> (m->defined_in ());
             }
-          if (t_inst != 0 && t_inst->template_args () != 0)
+          if (t_inst != nullptr && t_inst->template_args () != nullptr)
             {
               if (t_inst->template_args ()->size () > 0)
                 {
@@ -132,7 +132,3 @@ be_connector::check_ancestors (void)
       base = base->base_connector ();
     }
 }
-
-IMPL_NARROW_FROM_DECL (be_connector)
-IMPL_NARROW_FROM_SCOPE (be_connector)
-
diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp
index e1ea76357cf..faec5c24b21 100644
--- a/TAO/TAO_IDL/be/be_constant.cpp
+++ b/TAO/TAO_IDL/be/be_constant.cpp
@@ -33,12 +33,8 @@ be_constant::accept (be_visitor *visitor)
 }
 
 void
-be_constant::destroy (void)
+be_constant::destroy ()
 {
   this->be_decl::destroy ();
   this->AST_Constant::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_constant)
diff --git a/TAO/TAO_IDL/be/be_consumes.cpp b/TAO/TAO_IDL/be/be_consumes.cpp
index 479ef491ae5..319930737e3 100644
--- a/TAO/TAO_IDL/be/be_consumes.cpp
+++ b/TAO/TAO_IDL/be/be_consumes.cpp
@@ -20,15 +20,15 @@ be_consumes::be_consumes (UTL_ScopedName *n,
 {
 }
 
-be_consumes::~be_consumes (void)
+be_consumes::~be_consumes ()
 {
 }
 
 be_eventtype *
-be_consumes::consumes_type (void) const
+be_consumes::consumes_type () const
 {
   return
-    be_eventtype::narrow_from_decl (
+    dynamic_cast<be_eventtype*> (
       this->AST_Consumes::consumes_type ());
 }
 
@@ -39,10 +39,8 @@ be_consumes::accept (be_visitor *visitor)
 }
 
 void
-be_consumes::destroy (void)
+be_consumes::destroy ()
 {
   this->AST_Consumes::destroy ();
   this->be_field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_consumes)
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 51b8d05803b..07d121b3427 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -94,7 +94,7 @@ be_decl::be_decl (AST_Decl::NodeType type,
 {
 }
 
-be_decl::~be_decl (void)
+be_decl::~be_decl ()
 {
 }
 
@@ -103,7 +103,7 @@ be_decl::compute_full_name  (const char *prefix,
                              const char *suffix,
                              char *&name)
 {
-  if (prefix == 0 || suffix == 0)
+  if (prefix == nullptr || suffix == nullptr)
     {
       return;
     }
@@ -113,7 +113,7 @@ be_decl::compute_full_name  (const char *prefix,
   ACE_CString result_str;
 
   // Get parent.
-  if (this->defined_in () == 0)
+  if (this->defined_in () == nullptr)
     {
       // Global scope.
 
@@ -130,9 +130,9 @@ be_decl::compute_full_name  (const char *prefix,
     {
       // Get scope name.
       be_decl * const parent =
-        be_scope::narrow_from_scope (this->defined_in ())->decl ();
+        dynamic_cast<be_scope*> (this->defined_in ())->decl ();
 
-      if (parent == 0)
+      if (parent == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) be_decl::"
@@ -169,7 +169,7 @@ be_decl::compute_flat_name  (const char *prefix,
                              const char *suffix,
                              char *&name)
 {
-  if (prefix == 0 || suffix == 0)
+  if (prefix == nullptr || suffix == nullptr)
     {
       return;
     }
@@ -180,7 +180,7 @@ be_decl::compute_flat_name  (const char *prefix,
   ACE_CString result_str;
 
   // Get parent.
-  if (this->defined_in () == 0)
+  if (this->defined_in () == nullptr)
     {
       // Global scope.
 
@@ -199,8 +199,8 @@ be_decl::compute_flat_name  (const char *prefix,
     {
       // Get scope name.
       be_decl * const parent =
-        be_scope::narrow_from_scope (this->defined_in ())->decl ();
-      if (parent == 0)
+        dynamic_cast<be_scope*> (this->defined_in ())->decl ();
+      if (parent == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) be_decl::"
@@ -233,7 +233,7 @@ be_decl::compute_flat_name  (const char *prefix,
 }
 
 void
-be_decl::destroy (void)
+be_decl::destroy ()
 {
 }
 
@@ -245,7 +245,7 @@ be_decl::set_local (bool val)
 
 // Return the scope created by this node (if one exists, else NULL).
 be_scope *
-be_decl::scope (void)
+be_decl::scope ()
 {
   be_decl *d = this;
 
@@ -255,312 +255,312 @@ be_decl::scope (void)
       // Resolve forward declared interface by looking at full_definition()
       // field and iterating.
       d =
-        be_interface::narrow_from_decl (
-            (be_interface_fwd::narrow_from_decl (this))->full_definition ()
+        dynamic_cast<be_interface*> (
+            (dynamic_cast<be_interface_fwd*> (this))->full_definition ()
           );
     // Fall through
     case AST_Decl::NT_interface:
-      return be_interface::narrow_from_decl (d);
+      return dynamic_cast<be_interface*> (d);
     case AST_Decl::NT_module:
-      return be_module::narrow_from_decl (d);
+      return dynamic_cast<be_module*> (d);
     case AST_Decl::NT_root:
-      return be_root::narrow_from_decl (d);
+      return dynamic_cast<be_root*> (d);
     case AST_Decl::NT_except:
-      return be_exception::narrow_from_decl (d);
+      return dynamic_cast<be_exception*> (d);
     case AST_Decl::NT_union:
-      return be_union::narrow_from_decl (d);
+      return dynamic_cast<be_union*> (d);
     case AST_Decl::NT_struct:
-      return be_structure::narrow_from_decl (d);
+      return dynamic_cast<be_structure*> (d);
     case AST_Decl::NT_enum:
-      return be_enum::narrow_from_decl (d);
+      return dynamic_cast<be_enum*> (d);
     case AST_Decl::NT_op:
-      return be_operation::narrow_from_decl (d);
+      return dynamic_cast<be_operation*> (d);
     case AST_Decl::NT_factory:
-      return be_factory::narrow_from_decl (d);
+      return dynamic_cast<be_factory*> (d);
     case AST_Decl::NT_finder:
-      return be_finder::narrow_from_decl (d);
+      return dynamic_cast<be_finder*> (d);
     case AST_Decl::NT_sequence:
-      return be_sequence::narrow_from_decl (d);
+      return dynamic_cast<be_sequence*> (d);
     case AST_Decl::NT_valuetype:
-      return be_valuetype::narrow_from_decl (d);
+      return dynamic_cast<be_valuetype*> (d);
     case AST_Decl::NT_component:
-      return be_component::narrow_from_decl (d);
+      return dynamic_cast<be_component*> (d);
     case AST_Decl::NT_eventtype:
-      return be_eventtype::narrow_from_decl (d);
+      return dynamic_cast<be_eventtype*> (d);
     case AST_Decl::NT_home:
-      return be_home::narrow_from_decl (d);
+      return dynamic_cast<be_home*> (d);
     default:
-      return (be_scope *)0;
+      return nullptr;
   }
 }
 
 // Boolean methods to test if code was already generated.
 bool
-be_decl::cli_hdr_gen (void)
+be_decl::cli_hdr_gen ()
 {
   return this->cli_hdr_gen_;
 }
 
 bool
-be_decl::cli_stub_gen (void)
+be_decl::cli_stub_gen ()
 {
   return this->cli_stub_gen_;
 }
 
 bool
-be_decl::cli_hdr_any_op_gen (void)
+be_decl::cli_hdr_any_op_gen ()
 {
   return this->cli_hdr_any_op_gen_;
 }
 
 bool
-be_decl::cli_stub_any_op_gen (void)
+be_decl::cli_stub_any_op_gen ()
 {
   return this->cli_stub_any_op_gen_;
 }
 
 bool
-be_decl::cli_hdr_cdr_op_gen (void)
+be_decl::cli_hdr_cdr_op_gen ()
 {
   return this->cli_hdr_cdr_op_gen_;
 }
 
 bool
-be_decl::cli_stub_cdr_op_gen (void)
+be_decl::cli_stub_cdr_op_gen ()
 {
   return this->cli_stub_cdr_op_gen_;
 }
 
 bool
-be_decl::cli_inline_cdr_op_gen (void)
+be_decl::cli_inline_cdr_op_gen ()
 {
   return this->cli_inline_cdr_op_gen_;
 }
 
 bool
-be_decl::cli_inline_cdr_decl_gen (void)
+be_decl::cli_inline_cdr_decl_gen ()
 {
   return this->cli_inline_cdr_decl_gen_;
 }
 
 bool
-be_decl::cli_traits_gen (void)
+be_decl::cli_traits_gen ()
 {
   return this->cli_traits_gen_;
 }
 
 bool
-be_decl::cli_arg_traits_gen (void)
+be_decl::cli_arg_traits_gen ()
 {
   return this->cli_arg_traits_gen_;
 }
 
 bool
-be_decl::srv_arg_traits_gen (void)
+be_decl::srv_arg_traits_gen ()
 {
   return this->srv_arg_traits_gen_;
 }
 
 bool
-be_decl::srv_sarg_traits_gen (void)
+be_decl::srv_sarg_traits_gen ()
 {
   return this->srv_sarg_traits_gen_;
 }
 
 bool
-be_decl::cli_pragma_inst_gen (void)
+be_decl::cli_pragma_inst_gen ()
 {
   return this->cli_pragma_inst_gen_;
 }
 
 bool
-be_decl::cli_inarg_tmpl_class_gen (void)
+be_decl::cli_inarg_tmpl_class_gen ()
 {
   return this->cli_inarg_tmpl_class_gen_;
 }
 
 bool
-be_decl::cli_inarg_pragma_inst_gen (void)
+be_decl::cli_inarg_pragma_inst_gen ()
 {
   return this->cli_inarg_pragma_inst_gen_;
 }
 
 bool
-be_decl::cli_inoutarg_tmpl_class_gen (void)
+be_decl::cli_inoutarg_tmpl_class_gen ()
 {
   return this->cli_inoutarg_tmpl_class_gen_;
 }
 
 bool
-be_decl::cli_inoutarg_pragma_inst_gen (void)
+be_decl::cli_inoutarg_pragma_inst_gen ()
 {
   return this->cli_inoutarg_pragma_inst_gen_;
 }
 
 bool
-be_decl::cli_outarg_tmpl_class_gen (void)
+be_decl::cli_outarg_tmpl_class_gen ()
 {
   return this->cli_outarg_tmpl_class_gen_;
 }
 
 bool
-be_decl::cli_outarg_pragma_inst_gen (void)
+be_decl::cli_outarg_pragma_inst_gen ()
 {
   return this->cli_outarg_pragma_inst_gen_;
 }
 
 bool
-be_decl::cli_retarg_tmpl_class_gen (void)
+be_decl::cli_retarg_tmpl_class_gen ()
 {
   return this->cli_retarg_tmpl_class_gen_;
 }
 
 bool
-be_decl::cli_retarg_pragma_inst_gen (void)
+be_decl::cli_retarg_pragma_inst_gen ()
 {
   return this->cli_retarg_pragma_inst_gen_;
 }
 
 bool
-be_decl::srv_tmpl_class_gen (void)
+be_decl::srv_tmpl_class_gen ()
 {
   return this->srv_tmpl_class_gen_;
 }
 
 bool
-be_decl::srv_pragma_inst_gen (void)
+be_decl::srv_pragma_inst_gen ()
 {
   return this->srv_pragma_inst_gen_;
 }
 
 bool
-be_decl::srv_inarg_tmpl_class_gen (void)
+be_decl::srv_inarg_tmpl_class_gen ()
 {
   return this->srv_inarg_tmpl_class_gen_;
 }
 
 bool
-be_decl::srv_inarg_pragma_inst_gen (void)
+be_decl::srv_inarg_pragma_inst_gen ()
 {
   return this->srv_inarg_pragma_inst_gen_;
 }
 
 bool
-be_decl::srv_inoutarg_tmpl_class_gen (void)
+be_decl::srv_inoutarg_tmpl_class_gen ()
 {
   return this->srv_inoutarg_tmpl_class_gen_;
 }
 
 bool
-be_decl::srv_inoutarg_pragma_inst_gen (void)
+be_decl::srv_inoutarg_pragma_inst_gen ()
 {
   return this->srv_inoutarg_pragma_inst_gen_;
 }
 
 bool
-be_decl::srv_outarg_tmpl_class_gen (void)
+be_decl::srv_outarg_tmpl_class_gen ()
 {
   return this->srv_outarg_tmpl_class_gen_;
 }
 
 bool
-be_decl::srv_outarg_pragma_inst_gen (void)
+be_decl::srv_outarg_pragma_inst_gen ()
 {
   return this->srv_outarg_pragma_inst_gen_;
 }
 
 bool
-be_decl::srv_retarg_tmpl_class_gen (void)
+be_decl::srv_retarg_tmpl_class_gen ()
 {
   return this->srv_retarg_tmpl_class_gen_;
 }
 
 bool
-be_decl::srv_retarg_pragma_inst_gen (void)
+be_decl::srv_retarg_pragma_inst_gen ()
 {
   return this->cli_retarg_pragma_inst_gen_;
 }
 
 bool
-be_decl::cli_inline_gen (void)
+be_decl::cli_inline_gen ()
 {
   return this->cli_inline_gen_;
 }
 
 bool
-be_decl::srv_hdr_gen (void)
+be_decl::srv_hdr_gen ()
 {
   return this->srv_hdr_gen_;
 }
 
 bool
-be_decl::impl_hdr_gen (void)
+be_decl::impl_hdr_gen ()
 {
   return this->impl_hdr_gen_;
 }
 
 bool
-be_decl::srv_skel_gen (void)
+be_decl::srv_skel_gen ()
 {
   return this->srv_skel_gen_;
 }
 
 bool
-be_decl::impl_skel_gen (void)
+be_decl::impl_skel_gen ()
 {
   return this->impl_skel_gen_;
 }
 
 bool
-be_decl::srv_inline_gen (void)
+be_decl::srv_inline_gen ()
 {
   return this->srv_inline_gen_;
 }
 
 bool
-be_decl::tie_skel_gen (void)
+be_decl::tie_skel_gen ()
 {
   return this->tie_skel_gen_;
 }
 
 bool
-be_decl::ccm_pre_proc_gen (void)
+be_decl::ccm_pre_proc_gen ()
 {
   return this->ccm_pre_proc_gen_;
 }
 
 bool
-be_decl::ex_idl_facet_gen (void)
+be_decl::ex_idl_facet_gen ()
 {
   return this->ex_idl_facet_gen_;
 }
 
 bool
-be_decl::svnt_hdr_facet_gen (void)
+be_decl::svnt_hdr_facet_gen ()
 {
   return this->svnt_hdr_facet_gen_;
 }
 
 bool
-be_decl::svnt_src_facet_gen (void)
+be_decl::svnt_src_facet_gen ()
 {
   return this->svnt_src_facet_gen_;
 }
 
 bool
-be_decl::exec_hdr_facet_gen (void)
+be_decl::exec_hdr_facet_gen ()
 {
   return this->exec_hdr_facet_gen_;
 }
 
 bool
-be_decl::exec_src_facet_gen (void)
+be_decl::exec_src_facet_gen ()
 {
   return this->exec_src_facet_gen_;
 }
 
 bool
-be_decl::ami4ccm_ex_idl_gen (void)
+be_decl::ami4ccm_ex_idl_gen ()
 {
   return this->ami4ccm_ex_idl_gen_;
 }
@@ -838,7 +838,3 @@ be_decl::accept (be_visitor *visitor)
 {
   return visitor->visit_decl (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_decl)
diff --git a/TAO/TAO_IDL/be/be_emits.cpp b/TAO/TAO_IDL/be/be_emits.cpp
index af1edb18102..6e973c144b7 100644
--- a/TAO/TAO_IDL/be/be_emits.cpp
+++ b/TAO/TAO_IDL/be/be_emits.cpp
@@ -20,15 +20,15 @@ be_emits::be_emits (UTL_ScopedName *n,
 {
 }
 
-be_emits::~be_emits (void)
+be_emits::~be_emits ()
 {
 }
 
 be_eventtype *
-be_emits::emits_type (void) const
+be_emits::emits_type () const
 {
   return
-    be_eventtype::narrow_from_decl (
+    dynamic_cast<be_eventtype*> (
       this->AST_Emits::emits_type ());
 }
 
@@ -39,10 +39,8 @@ be_emits::accept (be_visitor *visitor)
 }
 
 void
-be_emits::destroy (void)
+be_emits::destroy ()
 {
   this->AST_Emits::destroy ();
   this->be_field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_emits)
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
index 520c315ef7d..40d419fe28a 100644
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ b/TAO/TAO_IDL/be/be_enum.cpp
@@ -76,7 +76,7 @@ be_enum::gen_ostream_operator (TAO_OutStream *os,
 }
 
 void
-be_enum::destroy (void)
+be_enum::destroy ()
 {
   // Call the destroy methods of our base classes.
   // No need to call be_scope::destroy(). It has no
@@ -92,8 +92,3 @@ be_enum::accept (be_visitor *visitor)
 {
   return visitor->visit_enum (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_enum)
-IMPL_NARROW_FROM_SCOPE (be_enum)
diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp
index 0970f1b2a6e..d16c0aefb4a 100644
--- a/TAO/TAO_IDL/be/be_enum_val.cpp
+++ b/TAO/TAO_IDL/be/be_enum_val.cpp
@@ -37,11 +37,8 @@ be_enum_val::accept (be_visitor *visitor)
 }
 
 void
-be_enum_val::destroy (void)
+be_enum_val::destroy ()
 {
   this->AST_EnumVal::destroy ();
   this->be_decl::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_enum_val)
-
diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp
index 96b08a05e19..6b84169bffc 100644
--- a/TAO/TAO_IDL/be/be_eventtype.cpp
+++ b/TAO/TAO_IDL/be/be_eventtype.cpp
@@ -27,7 +27,7 @@ be_eventtype::be_eventtype (UTL_ScopedName *n,
                             bool abstract,
                             bool truncatable,
                             bool custom)
-  : COMMON_Base (0,
+  : COMMON_Base (false,
                  abstract),
     AST_Decl (AST_Decl::NT_eventtype,
               n),
@@ -39,7 +39,7 @@ be_eventtype::be_eventtype (UTL_ScopedName *n,
                    n_inherits,
                    inherits_flat,
                    n_inherits_flat,
-                   0,
+                   false,
                    abstract),
     be_scope (AST_Decl::NT_eventtype),
     be_decl (AST_Decl::NT_eventtype,
@@ -51,7 +51,7 @@ be_eventtype::be_eventtype (UTL_ScopedName *n,
                   n_inherits,
                   inherits_flat,
                   n_inherits_flat,
-                  0,
+                  false,
                   abstract),
     AST_ValueType (n,
                    inherits,
@@ -92,7 +92,7 @@ be_eventtype::be_eventtype (UTL_ScopedName *n,
 {
 }
 
-be_eventtype::~be_eventtype (void)
+be_eventtype::~be_eventtype ()
 {
 }
 
@@ -107,12 +107,7 @@ be_eventtype::accept (be_visitor *visitor)
 }
 
 void
-be_eventtype::destroy (void)
+be_eventtype::destroy ()
 {
   this->be_valuetype::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_eventtype)
-IMPL_NARROW_FROM_SCOPE (be_eventtype)
diff --git a/TAO/TAO_IDL/be/be_eventtype_fwd.cpp b/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
index cd04d3a931f..c87fcae4c87 100644
--- a/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
@@ -42,7 +42,7 @@ be_eventtype_fwd::be_eventtype_fwd (AST_Interface *dummy,
 {
 }
 
-be_eventtype_fwd::~be_eventtype_fwd (void)
+be_eventtype_fwd::~be_eventtype_fwd ()
 {
 }
 
@@ -55,12 +55,7 @@ be_eventtype_fwd::accept (be_visitor *visitor)
 }
 
 void
-be_eventtype_fwd::destroy (void)
+be_eventtype_fwd::destroy ()
 {
   this->be_valuetype_fwd::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_eventtype_fwd)
-
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
index 24101456c2d..84fda87d53a 100644
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ b/TAO/TAO_IDL/be/be_exception.cpp
@@ -55,7 +55,7 @@ be_exception::be_exception (UTL_ScopedName *n,
 }
 
 void
-be_exception::destroy (void)
+be_exception::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
@@ -68,8 +68,3 @@ be_exception::accept (be_visitor *visitor)
 {
   return visitor->visit_exception (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_exception)
-IMPL_NARROW_FROM_SCOPE (be_exception)
diff --git a/TAO/TAO_IDL/be/be_extended_port.cpp b/TAO/TAO_IDL/be/be_extended_port.cpp
index bf7be8e98b8..01ffd7b9130 100644
--- a/TAO/TAO_IDL/be/be_extended_port.cpp
+++ b/TAO/TAO_IDL/be/be_extended_port.cpp
@@ -22,20 +22,20 @@ be_extended_port::be_extended_port (
 {
 }
 
-be_extended_port::~be_extended_port (void)
+be_extended_port::~be_extended_port ()
 {
 }
 
 be_porttype *
-be_extended_port::port_type (void) const
+be_extended_port::port_type () const
 {
   return
-    be_porttype::narrow_from_decl (
+    dynamic_cast<be_porttype*> (
       this->AST_Extended_Port::port_type ());
 }
 
 void
-be_extended_port::destroy (void)
+be_extended_port::destroy ()
 {
   this->AST_Extended_Port::destroy ();
   this->be_field::destroy ();
@@ -46,6 +46,3 @@ be_extended_port::accept (be_visitor *visitor)
 {
   return visitor->visit_extended_port (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_extended_port)
-
diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp
index d15c489320d..9aa2fb1d5e5 100644
--- a/TAO/TAO_IDL/be/be_factory.cpp
+++ b/TAO/TAO_IDL/be/be_factory.cpp
@@ -23,8 +23,8 @@
 #include "global_extern.h"
 
 be_factory::be_factory (UTL_ScopedName *n)
-  : COMMON_Base (1,
-                 0), //@@ Always local, never abstract
+  : COMMON_Base (true,
+                 false), //@@ Always local, never abstract
     AST_Decl (AST_Decl::NT_factory,
               n),
     UTL_Scope (AST_Decl::NT_factory),
@@ -35,12 +35,12 @@ be_factory::be_factory (UTL_ScopedName *n)
 {
 }
 
-be_factory::~be_factory (void)
+be_factory::~be_factory ()
 {
 }
 
 void
-be_factory::destroy (void)
+be_factory::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
@@ -60,10 +60,7 @@ be_factory::be_add_argument (AST_Argument *arg)
 {
   this->add_to_scope (arg);
   this->add_to_referenced (arg,
-                           0,
-                           0);
+                           false,
+                           nullptr);
   return arg;
 }
-
-IMPL_NARROW_FROM_DECL (be_factory)
-IMPL_NARROW_FROM_SCOPE (be_factory)
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
index fd54c73baf2..55c1e689cc3 100644
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ b/TAO/TAO_IDL/be/be_field.cpp
@@ -42,10 +42,10 @@ be_field::be_field (AST_Type *ft,
 }
 
 be_type *
-be_field::field_type (void) const
+be_field::field_type () const
 {
   return
-    be_type::narrow_from_decl  (
+    dynamic_cast<be_type*>  (
       this->AST_Field::field_type ());
 }
 
@@ -55,7 +55,7 @@ be_field::gen_member_ostream_operator (TAO_OutStream *os,
                                        bool use_underscore,
                                        bool accessor)
 {
-  be_type *ft = be_type::narrow_from_decl (this->field_type ());
+  be_type *ft = dynamic_cast<be_type*> (this->field_type ());
   ft->gen_member_ostream_operator (os,
                                    instance_name,
                                    use_underscore,
@@ -63,7 +63,7 @@ be_field::gen_member_ostream_operator (TAO_OutStream *os,
 }
 
 bool
-be_field::port_name_prefixed (void) const
+be_field::port_name_prefixed () const
 {
   return this->port_name_prefixed_;
 }
@@ -81,10 +81,8 @@ be_field::accept (be_visitor *visitor)
 }
 
 void
-be_field::destroy (void)
+be_field::destroy ()
 {
   this->be_decl::destroy ();
   this->AST_Field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_field)
diff --git a/TAO/TAO_IDL/be/be_finder.cpp b/TAO/TAO_IDL/be/be_finder.cpp
index 794aaedbf2c..43416cfdf60 100644
--- a/TAO/TAO_IDL/be/be_finder.cpp
+++ b/TAO/TAO_IDL/be/be_finder.cpp
@@ -15,8 +15,8 @@
 #include "be_visitor.h"
 
 be_finder::be_finder (UTL_ScopedName *n)
-  : COMMON_Base (1,
-                 0), //@@ Always local, never abstract
+  : COMMON_Base (true,
+                 false), //@@ Always local, never abstract
     AST_Decl (AST_Decl::NT_finder,
               n),
     UTL_Scope (AST_Decl::NT_finder),
@@ -29,12 +29,12 @@ be_finder::be_finder (UTL_ScopedName *n)
 {
 }
 
-be_finder::~be_finder (void)
+be_finder::~be_finder ()
 {
 }
 
 void
-be_finder::destroy (void)
+be_finder::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->be_factory::destroy ();
@@ -46,6 +46,3 @@ be_finder::accept (be_visitor *visitor)
 {
   return visitor->visit_finder (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_finder)
-IMPL_NARROW_FROM_SCOPE (be_finder)
diff --git a/TAO/TAO_IDL/be/be_fixed.cpp b/TAO/TAO_IDL/be/be_fixed.cpp
index e4657b0e038..c6a30eb1037 100644
--- a/TAO/TAO_IDL/be/be_fixed.cpp
+++ b/TAO/TAO_IDL/be/be_fixed.cpp
@@ -24,5 +24,3 @@ void be_fixed::destroy ()
   be_type::destroy ();
   AST_Fixed::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_fixed)
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index c55a98046d6..541792d3e0c 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -121,10 +121,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 AST_Root *
 be_generator::create_root (UTL_ScopedName *n)
 {
-  be_root *retval = 0;
+  be_root *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_root (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -133,11 +133,11 @@ AST_PredefinedType *
 be_generator::create_predefined_type (AST_PredefinedType::PredefinedType t,
                                       UTL_ScopedName *n)
 {
-  be_predefined_type *retval = 0;
+  be_predefined_type *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_predefined_type (t,
                                       n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -146,7 +146,7 @@ AST_Module *
 be_generator::create_module (UTL_Scope *s,
                              UTL_ScopedName *n)
 {
-  AST_Module *retval = 0;
+  AST_Module *retval = nullptr;
 
   // Check for another module of the same name in this scope.
   for (UTL_ScopeActiveIterator iter (s, UTL_Scope::IK_decls);
@@ -155,13 +155,13 @@ be_generator::create_module (UTL_Scope *s,
     {
       // Can't just check node type here, since it could be a
       // template module or template module instantiation.
-      AST_Module *m = AST_Module::narrow_from_decl (iter.item ());
+      AST_Module *m = dynamic_cast<AST_Module*> (iter.item ());
 
       if (m && m->local_name ()->compare (n->last_component ()))
         {
           // Create this new module with referance to the
           // "first" previous module found in scope.
-          ACE_NEW_RETURN (retval, be_module (n, m), 0);
+          ACE_NEW_RETURN (retval, be_module (n, m), nullptr);
           retval->prefix (const_cast<char *> (m->prefix ()));
           return retval;
         }
@@ -172,7 +172,7 @@ be_generator::create_module (UTL_Scope *s,
   // is itself a module, and has been previously opened, any
   // of the previous openings may contain a previous opening
   // of the module we're creating.
-  AST_Module *prev_module = AST_Module::narrow_from_scope (s);
+  AST_Module *prev_module = dynamic_cast<AST_Module*> (s);
   if (prev_module)
     {
       while (!!(prev_module = prev_module->previous_opening ()))
@@ -181,12 +181,12 @@ be_generator::create_module (UTL_Scope *s,
                !iter.is_done ();
                iter.next ())
             {
-              AST_Module *m = AST_Module::narrow_from_decl (iter.item ());
+              AST_Module *m = dynamic_cast<AST_Module*> (iter.item ());
               if (m && m->local_name ()->compare (n->last_component ()))
                 {
                   // Create this new module with referance to the
                   // "first" previous module found in scope.
-                  ACE_NEW_RETURN (retval, be_module (n, m), 0);
+                  ACE_NEW_RETURN (retval, be_module (n, m), nullptr);
                   return retval;
                 }
             }
@@ -194,7 +194,7 @@ be_generator::create_module (UTL_Scope *s,
     }
 
   // There is no previous module to be found
-  ACE_NEW_RETURN (retval, be_module (n), 0);
+  ACE_NEW_RETURN (retval, be_module (n), nullptr);
   return retval;
 }
 
@@ -207,7 +207,7 @@ be_generator::create_interface (UTL_ScopedName *n,
                                 bool l,
                                 bool a)
 {
-  be_interface *retval = 0;
+  be_interface *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_interface (n,
                                 ih,
@@ -216,7 +216,7 @@ be_generator::create_interface (UTL_ScopedName *n,
                                 nih_flat,
                                 l,
                                 a),
-                  0);
+                  nullptr);
 
   /// Trigger this interation over the included pragmas when the
   /// first local interface is seen in the main file. In an
@@ -236,18 +236,18 @@ be_generator::create_interface_fwd (UTL_ScopedName *n,
                                     bool is_abstract)
 {
   AST_Interface *full_defn = this->create_interface (n,
-                                                     0,
+                                                     nullptr,
                                                      -1,
-                                                     0,
+                                                     nullptr,
                                                      0,
                                                      is_local,
                                                      is_abstract);
 
-  be_interface_fwd *retval = 0;
+  be_interface_fwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_interface_fwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -257,11 +257,11 @@ AST_ValueBox *
 be_generator::create_valuebox (UTL_ScopedName *n,
                                AST_Type *boxed_type)
 {
-  be_valuebox *retval = 0;
+  be_valuebox *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_valuebox (boxed_type,
                                n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -280,7 +280,7 @@ be_generator::create_valuetype (UTL_ScopedName *n,
                                 bool is_truncatable,
                                 bool is_custom)
 {
-  be_valuetype *retval = 0;
+  be_valuetype *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_valuetype (n,
                                 inherits,
@@ -294,7 +294,7 @@ be_generator::create_valuetype (UTL_ScopedName *n,
                                 is_abstract,
                                 is_truncatable,
                                 is_custom),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -304,23 +304,23 @@ be_generator::create_valuetype_fwd (UTL_ScopedName *n,
                                     bool is_abstract)
 {
   AST_ValueType *full_defn = this->create_valuetype (n,
-                                                     0,
+                                                     nullptr,
                                                      -1,
+                                                     nullptr,
+                                                     nullptr,
                                                      0,
+                                                     nullptr,
                                                      0,
-                                                     0,
-                                                     0,
-                                                     0,
-                                                     0,
+                                                     nullptr,
                                                      is_abstract,
                                                      false,
                                                      false);
 
-  be_valuetype_fwd *retval = 0;
+  be_valuetype_fwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_valuetype_fwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -340,7 +340,7 @@ be_generator::create_eventtype (UTL_ScopedName *n,
                                 bool is_truncatable,
                                 bool is_custom)
 {
-  be_eventtype *retval = 0;
+  be_eventtype *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_eventtype (n,
                                 inherits,
@@ -354,7 +354,7 @@ be_generator::create_eventtype (UTL_ScopedName *n,
                                 is_abstract,
                                 is_truncatable,
                                 is_custom),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -364,23 +364,23 @@ be_generator::create_eventtype_fwd (UTL_ScopedName *n,
                                     bool is_abstract)
 {
   AST_EventType *full_defn = this->create_eventtype (n,
-                                                     0,
+                                                     nullptr,
                                                      -1,
+                                                     nullptr,
+                                                     nullptr,
                                                      0,
+                                                     nullptr,
                                                      0,
-                                                     0,
-                                                     0,
-                                                     0,
-                                                     0,
+                                                     nullptr,
                                                      is_abstract,
                                                      false,
                                                      false);
 
-  be_eventtype_fwd *retval = 0;
+  be_eventtype_fwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_eventtype_fwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -394,7 +394,7 @@ be_generator::create_component (UTL_ScopedName *n,
                                 AST_Interface **supports_flat,
                                 long n_supports_flat)
 {
-  be_component *retval = 0;
+  be_component *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_component (n,
                                 base_component,
@@ -402,7 +402,7 @@ be_generator::create_component (UTL_ScopedName *n,
                                 n_supports,
                                 supports_flat,
                                 n_supports_flat),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -411,17 +411,17 @@ AST_ComponentFwd *
 be_generator::create_component_fwd (UTL_ScopedName *n)
 {
   AST_Component *full_defn = this->create_component (n,
-                                                     0,
-                                                     0,
+                                                     nullptr,
+                                                     nullptr,
                                                      -1,
-                                                     0,
+                                                     nullptr,
                                                      0);
 
-  be_component_fwd *retval = 0;
+  be_component_fwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_component_fwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -437,7 +437,7 @@ be_generator::create_home (UTL_ScopedName *n,
                            AST_Interface **supports_flat,
                            long n_supports_flat)
 {
-  be_home *retval = 0;
+  be_home *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_home (n,
                            base_home,
@@ -447,7 +447,7 @@ be_generator::create_home (UTL_ScopedName *n,
                            n_supports,
                            supports_flat,
                            n_supports_flat),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -457,12 +457,12 @@ be_generator::create_exception (UTL_ScopedName *n,
                                 bool is_local,
                                 bool is_abstract)
 {
-  be_exception *retval = 0;
+  be_exception *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_exception (n,
                                 is_local,
                                 is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -472,12 +472,12 @@ be_generator::create_structure (UTL_ScopedName *n,
                                 bool is_local,
                                 bool is_abstract)
 {
-  be_structure *retval = 0;
+  be_structure *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_structure (n,
                                 is_local,
                                 is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -489,11 +489,11 @@ be_generator::create_structure_fwd (UTL_ScopedName *n)
   AST_Structure *full_defn = this->create_structure (n,
                                                      false,
                                                      false);
-  be_structure_fwd *retval = 0;
+  be_structure_fwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_structure_fwd (full_defn,
                                     n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -504,12 +504,12 @@ be_generator::create_enum (UTL_ScopedName *n,
                            bool is_local,
                            bool is_abstract)
 {
-  be_enum *retval = 0;
+  be_enum *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_enum (n,
                            is_local,
                            is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -521,14 +521,14 @@ be_generator::create_operation (AST_Type *rt,
                                 bool is_local,
                                 bool is_abstract)
 {
-  be_operation *retval = 0;
+  be_operation *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_operation (rt,
                                 fl,
                                 n,
                                 is_local,
                                 is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -538,12 +538,12 @@ be_generator::create_field (AST_Type *ft,
                             UTL_ScopedName *n,
                             AST_Field::Visibility vis)
 {
-  be_field *retval = 0;
+  be_field *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_field (ft,
                             n,
                             vis),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -553,12 +553,12 @@ be_generator::create_argument (AST_Argument::Direction d,
                                AST_Type *ft,
                                UTL_ScopedName *n)
 {
-  be_argument *retval = 0;
+  be_argument *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_argument (d,
                                ft,
                                n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -570,14 +570,14 @@ be_generator::create_attribute (bool ro,
                                 bool is_local,
                                 bool is_abstract)
 {
-  be_attribute *retval = 0;
+  be_attribute *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_attribute (ro,
                                 ft,
                                 n,
                                 is_local,
                                 is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -588,13 +588,13 @@ be_generator::create_union (AST_ConcreteType *dt,
                             bool is_local,
                             bool is_abstract)
 {
-  be_union *retval = 0;
+  be_union *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_union (dt,
                             n,
                             is_local,
                             is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -602,15 +602,15 @@ be_generator::create_union (AST_ConcreteType *dt,
 AST_UnionFwd *
 be_generator::create_union_fwd (UTL_ScopedName *n)
 {
-  AST_Union *full_defn = this->create_union (0,
+  AST_Union *full_defn = this->create_union (nullptr,
                                              n,
                                              false,
                                              false);
-  be_union_fwd *retval = 0;
+  be_union_fwd *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_union_fwd (full_defn,
                                 n),
-                  0);
+                  nullptr);
 
   full_defn->fwd_decl (retval);
   return retval;
@@ -621,12 +621,12 @@ be_generator::create_union_branch (UTL_LabelList *ll,
                                    AST_Type *ft,
                                    UTL_ScopedName *n)
 {
-  be_union_branch *retval = 0;
+  be_union_branch *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_union_branch (ll,
                                    ft,
                                    n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -635,11 +635,11 @@ AST_UnionLabel *
 be_generator::create_union_label (AST_UnionLabel::UnionLabel ul,
                                   AST_Expression *lv)
 {
-  be_union_label *retval = 0;
+  be_union_label *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_union_label (ul,
                                   lv),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -649,12 +649,12 @@ be_generator::create_constant (AST_Expression::ExprType et,
                                AST_Expression *ev,
                                UTL_ScopedName *n)
 {
-  be_constant *retval = 0;
+  be_constant *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_constant (et,
                                ev,
                                n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -662,10 +662,10 @@ be_generator::create_constant (AST_Expression::ExprType et,
 AST_Expression *
 be_generator::create_expr (UTL_ScopedName *n)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -674,11 +674,11 @@ AST_Expression *
 be_generator::create_expr (AST_Expression *b,
                            AST_Expression::ExprType t)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (b,
                                  t),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -688,12 +688,12 @@ be_generator::create_expr (AST_Expression::ExprComb c,
                            AST_Expression *v1,
                            AST_Expression *v2)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (c,
                                  v1,
                                  v2),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -701,10 +701,10 @@ be_generator::create_expr (AST_Expression::ExprComb c,
 AST_Expression *
 be_generator::create_expr (ACE_CDR::Long l)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (l),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -712,10 +712,10 @@ be_generator::create_expr (ACE_CDR::Long l)
 AST_Expression *
 be_generator::create_expr (ACE_CDR::LongLong l)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (l),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -723,10 +723,10 @@ be_generator::create_expr (ACE_CDR::LongLong l)
 AST_Expression *
 be_generator::create_expr (ACE_CDR::Boolean b)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (b),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -734,10 +734,10 @@ be_generator::create_expr (ACE_CDR::Boolean b)
 AST_Expression *
 be_generator::create_expr (ACE_CDR::ULong l)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (l),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -745,10 +745,10 @@ be_generator::create_expr (ACE_CDR::ULong l)
 AST_Expression *
 be_generator::create_expr (ACE_CDR::ULongLong l)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (l),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -757,10 +757,10 @@ AST_Expression *
 be_generator::create_expr (ACE_CDR::ULong l,
                            AST_Expression::ExprType t)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (l, t),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -768,10 +768,10 @@ be_generator::create_expr (ACE_CDR::ULong l,
 AST_Expression *
 be_generator::create_expr (UTL_String *s)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (s),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -779,10 +779,10 @@ be_generator::create_expr (UTL_String *s)
 AST_Expression *
 be_generator::create_expr (ACE_CDR::Char c)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (c),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -790,10 +790,10 @@ be_generator::create_expr (ACE_CDR::Char c)
 AST_Expression *
 be_generator::create_expr (ACE_OutputCDR::from_wchar wc)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (wc),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -801,10 +801,10 @@ be_generator::create_expr (ACE_OutputCDR::from_wchar wc)
 AST_Expression *
 be_generator::create_expr (char *s)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (s),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -812,10 +812,10 @@ be_generator::create_expr (char *s)
 AST_Expression *
 be_generator::create_expr (ACE_CDR::Double d)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (d),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -823,10 +823,10 @@ be_generator::create_expr (ACE_CDR::Double d)
 AST_Expression *
 be_generator::create_expr (const ACE_CDR::Fixed &f)
 {
-  be_expression *retval = 0;
+  be_expression *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_expression (f),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -835,11 +835,11 @@ AST_EnumVal *
 be_generator::create_enum_val (ACE_CDR::ULong v,
                                UTL_ScopedName *n)
 {
-  be_enum_val *retval = 0;
+  be_enum_val *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_enum_val (v,
                                n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -851,14 +851,14 @@ be_generator::create_array (UTL_ScopedName *n,
                             bool is_local,
                             bool is_abstract)
 {
-  be_array *retval = 0;
+  be_array *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_array (n,
                             ndims,
                             dims,
                             is_local,
                             is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -870,14 +870,14 @@ be_generator::create_sequence (AST_Expression *v,
                                bool is_local,
                                bool is_abstract)
 {
-  be_sequence *retval = 0;
+  be_sequence *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_sequence (v,
                                bt,
                                n,
                                is_local,
                                is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -887,15 +887,15 @@ be_generator::create_string (AST_Expression *v)
 {
   Identifier id ("string");
   UTL_ScopedName n (&id,
-                    0);
+                    nullptr);
 
-  be_string *retval = 0;
+  be_string *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_string (AST_Decl::NT_string,
                              &n,
                              v,
                              1),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -907,18 +907,18 @@ be_generator::create_wstring (AST_Expression *v)
                    ? "string"
                    : "wstring");
   UTL_ScopedName n (&id,
-                    0);
+                    nullptr);
   AST_Decl::NodeType nt = sizeof (ACE_CDR::WChar) == 1
                             ? AST_Decl::NT_string
                             : AST_Decl::NT_wstring;
 
-  be_string *retval = 0;
+  be_string *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_string (nt,
                              &n,
                              v,
                              sizeof (ACE_CDR::WChar)),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -928,9 +928,9 @@ be_generator::create_fixed (AST_Expression *digits,
                             AST_Expression *scale)
 {
   Identifier id ("fixed");
-  UTL_ScopedName name (&id, 0);
-  AST_Fixed *retval = 0;
-  ACE_NEW_RETURN (retval, be_fixed (&name, digits, scale), 0);
+  UTL_ScopedName name (&id, nullptr);
+  AST_Fixed *retval = nullptr;
+  ACE_NEW_RETURN (retval, be_fixed (&name, digits, scale), nullptr);
   return retval;
 }
 
@@ -940,13 +940,13 @@ be_generator::create_typedef (AST_Type *bt,
                               bool is_local,
                               bool is_abstract)
 {
-  be_typedef *retval = 0;
+  be_typedef *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_typedef (bt,
                               n,
                               is_local,
                               is_abstract),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -954,10 +954,10 @@ be_generator::create_typedef (AST_Type *bt,
 AST_Native *
 be_generator::create_native (UTL_ScopedName *n)
 {
-  be_native *retval = 0;
+  be_native *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_native (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -965,10 +965,10 @@ be_generator::create_native (UTL_ScopedName *n)
 AST_Factory *
 be_generator::create_factory (UTL_ScopedName *n)
 {
-  be_factory *retval = 0;
+  be_factory *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_factory (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -976,10 +976,10 @@ be_generator::create_factory (UTL_ScopedName *n)
 AST_Finder *
 be_generator::create_finder (UTL_ScopedName *n)
 {
-  be_finder *retval = 0;
+  be_finder *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_finder (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -987,10 +987,10 @@ be_generator::create_finder (UTL_ScopedName *n)
 AST_PortType *
 be_generator::create_porttype (UTL_ScopedName *n)
 {
-  be_porttype *retval = 0;
+  be_porttype *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_porttype (n),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -999,11 +999,11 @@ AST_Provides *
 be_generator::create_provides (UTL_ScopedName *n,
                                AST_Type *provides_type)
 {
-  be_provides *retval = 0;
+  be_provides *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_provides (n,
                                provides_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1013,12 +1013,12 @@ be_generator::create_uses (UTL_ScopedName *n,
                            AST_Type *uses_type,
                            bool is_multiple)
 {
-  be_uses *retval = 0;
+  be_uses *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_uses (n,
                            uses_type,
                            is_multiple),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1027,11 +1027,11 @@ AST_Publishes *
 be_generator::create_publishes (UTL_ScopedName *n,
                                 AST_Type *publishes_type)
 {
-  be_publishes *retval = 0;
+  be_publishes *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_publishes (n,
                                 publishes_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1040,11 +1040,11 @@ AST_Emits *
 be_generator::create_emits (UTL_ScopedName *n,
                             AST_Type *emits_type)
 {
-  be_emits *retval = 0;
+  be_emits *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_emits (n,
                             emits_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1052,11 +1052,11 @@ AST_Consumes *
 be_generator::create_consumes (UTL_ScopedName *n,
                                AST_Type *consumes_type)
 {
-  be_consumes *retval = 0;
+  be_consumes *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_consumes (n,
                                consumes_type),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1066,11 +1066,11 @@ be_generator::create_extended_port (
   UTL_ScopedName *n,
   AST_PortType *porttype_ref)
 {
-  be_extended_port *retval = 0;
+  be_extended_port *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_extended_port (n,
                                     porttype_ref),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1080,11 +1080,11 @@ be_generator::create_mirror_port (
   UTL_ScopedName *n,
   AST_PortType *porttype_ref)
 {
-  be_mirror_port *retval = 0;
+  be_mirror_port *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_mirror_port (n,
                                   porttype_ref),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1094,11 +1094,11 @@ be_generator::create_connector (
   UTL_ScopedName *n,
   AST_Connector *base_connector)
 {
-  be_connector *retval = 0;
+  be_connector *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_connector (n,
                                 base_connector),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1108,11 +1108,11 @@ be_generator::create_template_module (
   UTL_ScopedName *n,
   FE_Utils::T_PARAMLIST_INFO *template_params)
 {
-  be_template_module *retval = 0;
+  be_template_module *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_template_module (n,
                                       template_params),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1123,12 +1123,12 @@ be_generator::create_template_module_inst (
   AST_Template_Module *ref,
   FE_Utils::T_ARGLIST *template_args)
 {
-  be_template_module_inst *retval = 0;
+  be_template_module_inst *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_template_module_inst (n,
                                            ref,
                                            template_args),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1139,12 +1139,12 @@ be_generator::create_template_module_ref (
   AST_Template_Module *ref,
   UTL_StrList *param_refs)
 {
-  be_template_module_ref *retval = 0;
+  be_template_module_ref *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_template_module_ref (n,
                                           ref,
                                           param_refs),
-                  0);
+                  nullptr);
 
   return retval;
 }
@@ -1154,11 +1154,11 @@ be_generator::create_param_holder (
   UTL_ScopedName *parameter_name,
   FE_Utils::T_Param_Info *info)
 {
-  be_param_holder *retval = 0;
+  be_param_holder *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_param_holder (parameter_name,
                                    info),
-                  0);
+                  nullptr);
 
   return retval;
 }
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index ac181d2a2cc..2aeaa3f633b 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -30,31 +30,31 @@
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_NS_ctype.h"
 
-TAO_IDL_BE_Export BE_GlobalData *be_global = 0;
+TAO_IDL_BE_Export BE_GlobalData *be_global = nullptr;
 
-BE_GlobalData::BE_GlobalData (void)
+BE_GlobalData::BE_GlobalData ()
   : changing_standard_include_files_ (1),
-    skel_export_macro_ (0),
-    skel_export_include_ (0),
-    skel_export_file_ (0),
-    stub_export_macro_ (0),
-    stub_export_include_ (0),
-    stub_export_file_ (0),
-    anyop_export_macro_ (0),
-    anyop_export_include_ (0),
-    exec_export_macro_ (0),
-    exec_export_include_ (0),
-    svnt_export_macro_ (0),
-    svnt_export_include_ (0),
-    conn_export_macro_ (0),
-    conn_export_include_ (0),
-    pch_include_ (0),
-    pre_include_ (0),
-    post_include_ (0),
-    include_guard_ (0),
-    safe_include_ (0),
-    unique_include_ (0),
-    stripped_filename_ (0),
+    skel_export_macro_ (nullptr),
+    skel_export_include_ (nullptr),
+    skel_export_file_ (nullptr),
+    stub_export_macro_ (nullptr),
+    stub_export_include_ (nullptr),
+    stub_export_file_ (nullptr),
+    anyop_export_macro_ (nullptr),
+    anyop_export_include_ (nullptr),
+    exec_export_macro_ (nullptr),
+    exec_export_include_ (nullptr),
+    svnt_export_macro_ (nullptr),
+    svnt_export_include_ (nullptr),
+    conn_export_macro_ (nullptr),
+    conn_export_include_ (nullptr),
+    pch_include_ (nullptr),
+    pre_include_ (nullptr),
+    post_include_ (nullptr),
+    include_guard_ (nullptr),
+    safe_include_ (nullptr),
+    unique_include_ (nullptr),
+    stripped_filename_ (nullptr),
     core_versioning_begin_ ("\nTAO_BEGIN_VERSIONED_NAMESPACE_DECL\n"),
     core_versioning_end_   ("\nTAO_END_VERSIONED_NAMESPACE_DECL\n"),
     versioning_begin_ (),
@@ -88,15 +88,15 @@ BE_GlobalData::BE_GlobalData (void)
     ciao_ami_conn_impl_hdr_ending_ (ACE::strnew ("_conn_i.h")),
     ciao_ami_conn_impl_src_ending_ (ACE::strnew ("_conn_i.cpp")),
     ciao_container_type_ (ACE::strnew ("Session")),
-    output_dir_ (0),
-    stub_include_dir_ (0),
-    skel_output_dir_ (0),
-    anyop_output_dir_ (0),
-    exec_output_dir_ (0),
+    output_dir_ (nullptr),
+    stub_include_dir_ (nullptr),
+    skel_output_dir_ (nullptr),
+    anyop_output_dir_ (nullptr),
+    exec_output_dir_ (nullptr),
     any_support_ (true),
     cdr_support_ (true),
     tc_support_ (true),
-    obv_opt_accessor_ (0),
+    obv_opt_accessor_ (false),
     gen_impl_files_ (false),
     gen_impl_debug_info_ (false),
     gen_copy_ctor_ (false),
@@ -118,11 +118,11 @@ BE_GlobalData::BE_GlobalData (void)
     gen_empty_anyop_header_ (false),
     lookup_strategy_ (TAO_PERFECT_HASH),
     dds_impl_ (DDS_NONE),
-    void_type_ (0),
-    ccmobject_ (0),
-    messaging_ (0),
-    messaging_exceptionholder_ (0),
-    messaging_replyhandler_ (0),
+    void_type_ (nullptr),
+    ccmobject_ (nullptr),
+    messaging_ (nullptr),
+    messaging_exceptionholder_ (nullptr),
+    messaging_replyhandler_ (nullptr),
     gen_anyop_files_ (false),
     gen_skel_files_ (true),
     gen_svnt_cpp_files_ (true),
@@ -161,7 +161,7 @@ BE_GlobalData::BE_GlobalData (void)
 {
 }
 
-BE_GlobalData::~BE_GlobalData (void)
+BE_GlobalData::~BE_GlobalData ()
 {
 }
 
@@ -176,7 +176,7 @@ BE_GlobalData::changing_standard_include_files (size_t changing)
 }
 
 size_t
-BE_GlobalData::changing_standard_include_files (void)
+BE_GlobalData::changing_standard_include_files ()
 {
   return this->changing_standard_include_files_;
 }
@@ -192,9 +192,9 @@ be_change_idl_file_extension (UTL_String* idl_file,
 {
   // @@ This shouldn't happen anyway; but a better error handling
   // mechanism is needed.
-  if (idl_file == 0 || new_extension == 0)
+  if (idl_file == nullptr || new_extension == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   static char fname[MAXPATHLEN];
@@ -205,7 +205,7 @@ be_change_idl_file_extension (UTL_String* idl_file,
 
   // Get the base part of the filename, we try several extensions
   // before giving up.
-  const char *base = 0;
+  const char *base = nullptr;
 
   static const char* extensions[] = {
     ".idl",
@@ -220,22 +220,22 @@ be_change_idl_file_extension (UTL_String* idl_file,
     {
       base = ACE_OS::strstr (string, extensions[k]);
 
-      if (base != 0)
+      if (base != nullptr)
         {
           break;
         }
     }
 
-  if (base == 0)
+  if (base == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   // Anyop * skel file output defaults to general output dir if not set.
   const char *output_path =
     be_util::get_output_path (for_anyop, for_skel, for_exec);
 
-  if (!base_name_only && output_path != 0)
+  if (!base_name_only && output_path != nullptr)
     {
       // Path info should also be added to fname.
 
@@ -598,7 +598,7 @@ BE_GlobalData::be_get_client_hdr_fname (
 }
 
 const char *
-BE_GlobalData::be_get_client_stub_fname (void)
+BE_GlobalData::be_get_client_stub_fname ()
 {
   return
     be_get_client_stub (idl_global->stripped_filename ());
@@ -650,14 +650,14 @@ BE_GlobalData::be_get_server_template_hdr_fname (
 }
 
 const char *
-BE_GlobalData::be_get_server_skeleton_fname (void)
+BE_GlobalData::be_get_server_skeleton_fname ()
 {
   return
     be_get_server_skeleton (idl_global->stripped_filename ());
 }
 
 const char *
-BE_GlobalData::be_get_implementation_skeleton_fname (void)
+BE_GlobalData::be_get_implementation_skeleton_fname ()
 {
   return
     be_get_implementation_skel (idl_global->stripped_filename ());
@@ -808,9 +808,9 @@ BE_GlobalData::be_get_ciao_ami_conn_impl_src_fname (
 }
 
 const char*
-BE_GlobalData::skel_export_macro (void) const
+BE_GlobalData::skel_export_macro () const
 {
-  if (this->skel_export_macro_ == 0)
+  if (this->skel_export_macro_ == nullptr)
     {
       return "";
     }
@@ -826,7 +826,7 @@ BE_GlobalData::skel_export_macro (const char *s)
 }
 
 const char*
-BE_GlobalData::skel_export_include (void) const
+BE_GlobalData::skel_export_include () const
 {
   return this->skel_export_include_;
 }
@@ -839,7 +839,7 @@ BE_GlobalData::skel_export_include (const char *s)
 }
 
 const char*
-BE_GlobalData::skel_export_file (void) const
+BE_GlobalData::skel_export_file () const
 {
   return this->skel_export_file_;
 }
@@ -852,9 +852,9 @@ BE_GlobalData::skel_export_file (const char *s)
 }
 
 const char*
-BE_GlobalData::stub_export_macro (void) const
+BE_GlobalData::stub_export_macro () const
 {
-  if (this->stub_export_macro_ == 0)
+  if (this->stub_export_macro_ == nullptr)
     {
       return "";
     }
@@ -870,7 +870,7 @@ BE_GlobalData::stub_export_macro (const char *s)
 }
 
 const char*
-BE_GlobalData::stub_export_include (void) const
+BE_GlobalData::stub_export_include () const
 {
   return this->stub_export_include_;
 }
@@ -883,7 +883,7 @@ BE_GlobalData::stub_export_include (const char *s)
 }
 
 const char*
-BE_GlobalData::stub_export_file (void) const
+BE_GlobalData::stub_export_file () const
 {
   return this->stub_export_file_;
 }
@@ -896,9 +896,9 @@ BE_GlobalData::stub_export_file (const char *s)
 }
 
 const char*
-BE_GlobalData::anyop_export_macro (void) const
+BE_GlobalData::anyop_export_macro () const
 {
-  if (this->anyop_export_macro_ == 0)
+  if (this->anyop_export_macro_ == nullptr)
     {
       return "";
     }
@@ -914,7 +914,7 @@ BE_GlobalData::anyop_export_macro (const char *s)
 }
 
 const char*
-BE_GlobalData::anyop_export_include (void) const
+BE_GlobalData::anyop_export_include () const
 {
   return this->anyop_export_include_;
 }
@@ -927,9 +927,9 @@ BE_GlobalData::anyop_export_include (const char *s)
 }
 
 const char*
-BE_GlobalData::exec_export_macro (void) const
+BE_GlobalData::exec_export_macro () const
 {
-  if (this->exec_export_macro_ == 0)
+  if (this->exec_export_macro_ == nullptr)
     {
       return "";
     }
@@ -945,7 +945,7 @@ BE_GlobalData::exec_export_macro (const char *s)
 }
 
 const char*
-BE_GlobalData::exec_export_include (void) const
+BE_GlobalData::exec_export_include () const
 {
   return this->exec_export_include_;
 }
@@ -958,9 +958,9 @@ BE_GlobalData::exec_export_include (const char *s)
 }
 
 const char*
-BE_GlobalData::svnt_export_macro (void) const
+BE_GlobalData::svnt_export_macro () const
 {
-  if (this->svnt_export_macro_ == 0)
+  if (this->svnt_export_macro_ == nullptr)
     {
       return "";
     }
@@ -976,7 +976,7 @@ BE_GlobalData::svnt_export_macro (const char *s)
 }
 
 const char*
-BE_GlobalData::svnt_export_include (void) const
+BE_GlobalData::svnt_export_include () const
 {
   return this->svnt_export_include_;
 }
@@ -989,9 +989,9 @@ BE_GlobalData::svnt_export_include (const char *s)
 }
 
 const char*
-BE_GlobalData::conn_export_macro (void) const
+BE_GlobalData::conn_export_macro () const
 {
-  if (this->conn_export_macro_ == 0)
+  if (this->conn_export_macro_ == nullptr)
     {
       return "";
     }
@@ -1007,7 +1007,7 @@ BE_GlobalData::conn_export_macro (const char *s)
 }
 
 const char*
-BE_GlobalData::conn_export_include (void) const
+BE_GlobalData::conn_export_include () const
 {
   return this->conn_export_include_;
 }
@@ -1020,7 +1020,7 @@ BE_GlobalData::conn_export_include (const char *s)
 }
 
 const char*
-BE_GlobalData::pch_include (void) const
+BE_GlobalData::pch_include () const
 {
   return this->pch_include_;
 }
@@ -1033,7 +1033,7 @@ BE_GlobalData::pch_include (const char *s)
 }
 
 const char*
-BE_GlobalData::pre_include (void) const
+BE_GlobalData::pre_include () const
 {
   return this->pre_include_;
 }
@@ -1046,7 +1046,7 @@ BE_GlobalData::pre_include (const char *s)
 }
 
 const char*
-BE_GlobalData::post_include (void) const
+BE_GlobalData::post_include () const
 {
   return this->post_include_;
 }
@@ -1059,7 +1059,7 @@ BE_GlobalData::post_include (const char *s)
 }
 
 const char*
-BE_GlobalData::include_guard (void) const
+BE_GlobalData::include_guard () const
 {
   return this->include_guard_;
 }
@@ -1072,7 +1072,7 @@ BE_GlobalData::include_guard (const char *s)
 }
 
 const char*
-BE_GlobalData::safe_include (void) const
+BE_GlobalData::safe_include () const
 {
   return this->safe_include_;
 }
@@ -1085,7 +1085,7 @@ BE_GlobalData::safe_include (const char *s)
 }
 
 const char*
-BE_GlobalData::unique_include (void) const
+BE_GlobalData::unique_include () const
 {
   return this->unique_include_;
 }
@@ -1098,7 +1098,7 @@ BE_GlobalData::unique_include (const char *s)
 }
 
 const char*
-BE_GlobalData::stripped_filename (void) const
+BE_GlobalData::stripped_filename () const
 {
   return this->stripped_filename_;
 }
@@ -1111,7 +1111,7 @@ BE_GlobalData::stripped_filename (const char *s)
 }
 
 const char *
-BE_GlobalData::versioning_begin (void) const
+BE_GlobalData::versioning_begin () const
 {
   return this->versioning_begin_.c_str ();
 }
@@ -1123,13 +1123,13 @@ BE_GlobalData::versioning_include (const char * s)
 }
 
 const char *
-BE_GlobalData::versioning_include (void) const
+BE_GlobalData::versioning_include () const
 {
   return this->versioning_include_.c_str ();
 }
 
 const char *
-BE_GlobalData::core_versioning_begin (void) const
+BE_GlobalData::core_versioning_begin () const
 {
   return this->core_versioning_begin_.c_str ();
 }
@@ -1163,13 +1163,13 @@ BE_GlobalData::versioning_begin (const char * s)
 }
 
 const char *
-BE_GlobalData::versioning_end (void) const
+BE_GlobalData::versioning_end () const
 {
   return this->versioning_end_.c_str ();
 }
 
 const char *
-BE_GlobalData::core_versioning_end (void) const
+BE_GlobalData::core_versioning_end () const
 {
   return this->core_versioning_end_.c_str ();
 }
@@ -1184,7 +1184,7 @@ BE_GlobalData::client_hdr_ending (const char* s)
 
 // Get the client_hdr_ending.
 const char*
-BE_GlobalData::client_hdr_ending (void) const
+BE_GlobalData::client_hdr_ending () const
 {
   return this->client_hdr_ending_;
 }
@@ -1197,7 +1197,7 @@ BE_GlobalData::client_inline_ending  (const char* s)
 }
 
 const char*
-BE_GlobalData::client_inline_ending (void) const
+BE_GlobalData::client_inline_ending () const
 {
   return this->client_inline_ending_;
 }
@@ -1211,7 +1211,7 @@ BE_GlobalData::client_stub_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::client_stub_ending (void) const
+BE_GlobalData::client_stub_ending () const
 {
   return this->client_stub_ending_;
 }
@@ -1224,7 +1224,7 @@ BE_GlobalData::server_hdr_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::server_hdr_ending (void) const
+BE_GlobalData::server_hdr_ending () const
 {
   return this->server_hdr_ending_;
 }
@@ -1258,25 +1258,25 @@ BE_GlobalData::impl_class_suffix (const char* s)
 }
 
 const char*
-BE_GlobalData::impl_class_prefix (void) const
+BE_GlobalData::impl_class_prefix () const
 {
   return this->impl_class_prefix_;
 }
 
 const char*
-BE_GlobalData::implementation_hdr_ending (void) const
+BE_GlobalData::implementation_hdr_ending () const
 {
   return this->implementation_hdr_ending_;
 }
 
 const char*
-BE_GlobalData::impl_class_suffix (void) const
+BE_GlobalData::impl_class_suffix () const
 {
   return this->impl_class_suffix_;
 }
 
 const char*
-BE_GlobalData::implementation_skel_ending (void) const
+BE_GlobalData::implementation_skel_ending () const
 {
   return this->implementation_skel_ending_;
 }
@@ -1289,7 +1289,7 @@ BE_GlobalData::server_template_hdr_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::server_template_hdr_ending (void) const
+BE_GlobalData::server_template_hdr_ending () const
 {
   return this->server_template_hdr_ending_;
 }
@@ -1302,7 +1302,7 @@ BE_GlobalData::server_skeleton_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::server_skeleton_ending (void) const
+BE_GlobalData::server_skeleton_ending () const
 {
   return this->server_skeleton_ending_;
 }
@@ -1315,7 +1315,7 @@ BE_GlobalData::server_template_skeleton_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::server_template_skeleton_ending (void) const
+BE_GlobalData::server_template_skeleton_ending () const
 {
   return this->server_template_skeleton_ending_;
 }
@@ -1334,13 +1334,13 @@ BE_GlobalData::use_clonable_in_args (bool clonable)
 }
 
 bool
-BE_GlobalData::use_clonable_in_args (void) const
+BE_GlobalData::use_clonable_in_args () const
 {
   return this->use_clonable_in_args_;
 }
 
 bool
-BE_GlobalData::gen_template_export (void) const
+BE_GlobalData::gen_template_export () const
 {
   return this->gen_template_export_;
 }
@@ -1352,7 +1352,7 @@ BE_GlobalData::gen_template_export (bool val)
 }
 
 bool
-BE_GlobalData::gen_ostream_operators (void) const
+BE_GlobalData::gen_ostream_operators () const
 {
   return this->gen_ostream_operators_;
 }
@@ -1365,7 +1365,7 @@ BE_GlobalData::gen_ostream_operators (bool val)
 
 
 bool
-BE_GlobalData::gen_static_desc_operations (void) const
+BE_GlobalData::gen_static_desc_operations () const
 {
   return this->gen_static_desc_operations_;
 }
@@ -1377,7 +1377,7 @@ BE_GlobalData::gen_static_desc_operations (bool val)
 }
 
 const char*
-BE_GlobalData::anyop_header_ending (void) const
+BE_GlobalData::anyop_header_ending () const
 {
   return this->anyop_hdr_ending_;
 }
@@ -1390,7 +1390,7 @@ BE_GlobalData::anyop_source_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::anyop_source_ending (void) const
+BE_GlobalData::anyop_source_ending () const
 {
   return this->anyop_src_ending_;
 }
@@ -1403,7 +1403,7 @@ BE_GlobalData::ciao_svnt_header_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_svnt_header_ending (void) const
+BE_GlobalData::ciao_svnt_header_ending () const
 {
   return this->ciao_svnt_hdr_ending_;
 }
@@ -1416,7 +1416,7 @@ BE_GlobalData::ciao_svnt_source_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_svnt_source_ending (void) const
+BE_GlobalData::ciao_svnt_source_ending () const
 {
   return this->ciao_svnt_src_ending_;
 }
@@ -1429,7 +1429,7 @@ BE_GlobalData::ciao_svnt_header_template_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_svnt_header_template_ending (void) const
+BE_GlobalData::ciao_svnt_header_template_ending () const
 {
   return this->ciao_svnt_hdr_template_ending_;
 }
@@ -1442,7 +1442,7 @@ BE_GlobalData::ciao_svnt_source_template_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_svnt_source_template_ending (void) const
+BE_GlobalData::ciao_svnt_source_template_ending () const
 {
   return this->ciao_svnt_src_template_ending_;
 }
@@ -1455,7 +1455,7 @@ BE_GlobalData::ciao_exec_header_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_exec_header_ending (void) const
+BE_GlobalData::ciao_exec_header_ending () const
 {
   return this->ciao_exec_hdr_ending_;
 }
@@ -1468,7 +1468,7 @@ BE_GlobalData::ciao_exec_source_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_exec_source_ending (void) const
+BE_GlobalData::ciao_exec_source_ending () const
 {
   return this->ciao_exec_src_ending_;
 }
@@ -1481,7 +1481,7 @@ BE_GlobalData::ciao_exec_stub_header_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_exec_stub_header_ending (void) const
+BE_GlobalData::ciao_exec_stub_header_ending () const
 {
   return this->ciao_exec_stub_hdr_ending_;
 }
@@ -1494,7 +1494,7 @@ BE_GlobalData::ciao_exec_idl_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_exec_idl_ending (void) const
+BE_GlobalData::ciao_exec_idl_ending () const
 {
   return this->ciao_exec_idl_ending_;
 }
@@ -1507,7 +1507,7 @@ BE_GlobalData::ciao_conn_header_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_conn_header_ending (void) const
+BE_GlobalData::ciao_conn_header_ending () const
 {
   return this->ciao_conn_hdr_ending_;
 }
@@ -1520,7 +1520,7 @@ BE_GlobalData::ciao_conn_source_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::ciao_conn_source_ending (void) const
+BE_GlobalData::ciao_conn_source_ending () const
 {
   return this->ciao_conn_src_ending_;
 }
@@ -1533,7 +1533,7 @@ BE_GlobalData::dds_typesupport_hdr_ending (const char* s)
 }
 
 const char*
-BE_GlobalData::dds_typesupport_hdr_ending (void) const
+BE_GlobalData::dds_typesupport_hdr_ending () const
 {
   return this->dds_typesupport_hdr_ending_;
 }
@@ -1546,7 +1546,7 @@ BE_GlobalData::ciao_ami_conn_idl_ending (const char* s)
 }
 
 const char *
-BE_GlobalData::ciao_ami_conn_idl_ending (void) const
+BE_GlobalData::ciao_ami_conn_idl_ending () const
 {
   return this->ciao_ami_conn_idl_ending_;
 }
@@ -1559,7 +1559,7 @@ BE_GlobalData::ciao_ami_conn_impl_hdr_ending (const char* s)
 }
 
 const char *
-BE_GlobalData::ciao_ami_conn_impl_hdr_ending (void) const
+BE_GlobalData::ciao_ami_conn_impl_hdr_ending () const
 {
   return this->ciao_ami_conn_impl_hdr_ending_;
 }
@@ -1572,7 +1572,7 @@ BE_GlobalData::ciao_ami_conn_impl_src_ending (const char* s)
 }
 
 const char *
-BE_GlobalData::ciao_ami_conn_impl_src_ending (void) const
+BE_GlobalData::ciao_ami_conn_impl_src_ending () const
 {
   return this->ciao_ami_conn_impl_src_ending_;
 }
@@ -1585,7 +1585,7 @@ BE_GlobalData::ciao_container_type (const char* s)
 }
 
 const char *
-BE_GlobalData::ciao_container_type (void) const
+BE_GlobalData::ciao_container_type () const
 {
   return this->ciao_container_type_;
 }
@@ -1598,12 +1598,12 @@ BE_GlobalData::output_dir (const char* s)
 }
 
 const char*
-BE_GlobalData::output_dir (void) const
+BE_GlobalData::output_dir () const
 {
   return this->output_dir_;
 }
 bool
-BE_GlobalData::overwrite_not_exec (void) const
+BE_GlobalData::overwrite_not_exec () const
 {
   return this->overwrite_not_exec_;
 }
@@ -1622,7 +1622,7 @@ BE_GlobalData::skel_output_dir (const char* s)
 }
 
 const char*
-BE_GlobalData::skel_output_dir (void) const
+BE_GlobalData::skel_output_dir () const
 {
   return this->skel_output_dir_;
 }
@@ -1635,7 +1635,7 @@ BE_GlobalData::stub_include_dir (const char* s)
 }
 
 const char*
-BE_GlobalData::stub_include_dir (void) const
+BE_GlobalData::stub_include_dir () const
 {
   return this->stub_include_dir_;
 }
@@ -1648,7 +1648,7 @@ BE_GlobalData::anyop_output_dir (const char* s)
 }
 
 const char*
-BE_GlobalData::anyop_output_dir (void) const
+BE_GlobalData::anyop_output_dir () const
 {
   return this->anyop_output_dir_;
 }
@@ -1661,7 +1661,7 @@ BE_GlobalData::exec_output_dir (const char* s)
 }
 
 const char*
-BE_GlobalData::exec_output_dir (void) const
+BE_GlobalData::exec_output_dir () const
 {
   return this->exec_output_dir_;
 }
@@ -1672,7 +1672,7 @@ BE_GlobalData::any_support (bool val)
 }
 
 bool
-BE_GlobalData::any_support (void) const
+BE_GlobalData::any_support () const
 {
   return this->any_support_;
 }
@@ -1684,7 +1684,7 @@ BE_GlobalData::cdr_support (bool val)
 }
 
 bool
-BE_GlobalData::cdr_support (void) const
+BE_GlobalData::cdr_support () const
 {
   return this->cdr_support_;
 }
@@ -1696,7 +1696,7 @@ BE_GlobalData::tc_support (bool val)
 }
 
 bool
-BE_GlobalData::tc_support (void) const
+BE_GlobalData::tc_support () const
 {
   return this->tc_support_;
 }
@@ -1708,7 +1708,7 @@ BE_GlobalData::obv_opt_accessor (bool val)
 }
 
 bool
-BE_GlobalData::obv_opt_accessor (void) const
+BE_GlobalData::obv_opt_accessor () const
 {
   return this->obv_opt_accessor_;
 }
@@ -1720,7 +1720,7 @@ BE_GlobalData::gen_impl_files (bool val)
 }
 
 bool
-BE_GlobalData::gen_impl_files (void) const
+BE_GlobalData::gen_impl_files () const
 {
   return this->gen_impl_files_;
 }
@@ -1732,7 +1732,7 @@ BE_GlobalData::gen_impl_debug_info (bool val)
 }
 
 bool
-BE_GlobalData::gen_impl_debug_info (void) const
+BE_GlobalData::gen_impl_debug_info () const
 {
   return this->gen_impl_debug_info_;
 }
@@ -1744,7 +1744,7 @@ BE_GlobalData::gen_copy_ctor (bool val)
 }
 
 bool
-BE_GlobalData::gen_copy_ctor (void) const
+BE_GlobalData::gen_copy_ctor () const
 {
   return this->gen_copy_ctor_;
 }
@@ -1756,7 +1756,7 @@ BE_GlobalData::gen_assign_op (bool val)
 }
 
 bool
-BE_GlobalData::gen_assign_op (void) const
+BE_GlobalData::gen_assign_op () const
 {
   return this->gen_assign_op_;
 }
@@ -1768,7 +1768,7 @@ BE_GlobalData::gen_thru_poa_collocation (bool val)
 }
 
 bool
-BE_GlobalData::gen_thru_poa_collocation (void) const
+BE_GlobalData::gen_thru_poa_collocation () const
 {
   return this->gen_thru_poa_collocation_;
 }
@@ -1780,7 +1780,7 @@ BE_GlobalData::gen_direct_collocation (bool val)
 }
 
 bool
-BE_GlobalData::gen_direct_collocation (void) const
+BE_GlobalData::gen_direct_collocation () const
 {
   return this->gen_direct_collocation_;
 }
@@ -1792,7 +1792,7 @@ BE_GlobalData::gen_corba_e (bool val)
 }
 
 bool
-BE_GlobalData::gen_corba_e (void) const
+BE_GlobalData::gen_corba_e () const
 {
   return this->gen_corba_e_;
 }
@@ -1804,7 +1804,7 @@ BE_GlobalData::gen_minimum_corba (bool val)
 }
 
 bool
-BE_GlobalData::gen_minimum_corba (void) const
+BE_GlobalData::gen_minimum_corba () const
 {
   return this->gen_minimum_corba_;
 }
@@ -1816,7 +1816,7 @@ BE_GlobalData::gen_noeventccm (bool val)
 }
 
 bool
-BE_GlobalData::gen_noeventccm (void) const
+BE_GlobalData::gen_noeventccm () const
 {
   return this->gen_noeventccm_;
 }
@@ -1828,7 +1828,7 @@ BE_GlobalData::gen_lwccm (bool val)
 }
 
 bool
-BE_GlobalData::gen_lwccm (void) const
+BE_GlobalData::gen_lwccm () const
 {
   return this->gen_lwccm_;
 }
@@ -1841,7 +1841,7 @@ BE_GlobalData::opt_tc (bool val)
 }
 
 bool
-BE_GlobalData::opt_tc (void) const
+BE_GlobalData::opt_tc () const
 {
   return this->opt_tc_;
 }
@@ -1853,7 +1853,7 @@ BE_GlobalData::ami4ccm_call_back (bool val)
 }
 
 bool
-BE_GlobalData::ami4ccm_call_back (void) const
+BE_GlobalData::ami4ccm_call_back () const
 {
   return this->ami4ccm_call_back_;
 }
@@ -1865,7 +1865,7 @@ BE_GlobalData::ami_call_back (bool val)
 }
 
 bool
-BE_GlobalData::ami_call_back (void) const
+BE_GlobalData::ami_call_back () const
 {
   return this->ami_call_back_;
 }
@@ -1877,7 +1877,7 @@ BE_GlobalData::gen_amh_classes (bool val)
 }
 
 bool
-BE_GlobalData::gen_amh_classes (void) const
+BE_GlobalData::gen_amh_classes () const
 {
   return this->gen_amh_classes_;
 }
@@ -1889,7 +1889,7 @@ BE_GlobalData::gen_tie_classes (bool val)
 }
 
 bool
-BE_GlobalData::gen_tie_classes (void) const
+BE_GlobalData::gen_tie_classes () const
 {
   return this->gen_tie_classes_;
 }
@@ -1901,7 +1901,7 @@ BE_GlobalData::gen_smart_proxies (bool val)
 }
 
 bool
-BE_GlobalData::gen_smart_proxies (void) const
+BE_GlobalData::gen_smart_proxies () const
 {
   return this->gen_smart_proxies_;
 }
@@ -1913,7 +1913,7 @@ BE_GlobalData::gen_inline_constants (bool val)
 }
 
 bool
-BE_GlobalData::gen_inline_constants (void) const
+BE_GlobalData::gen_inline_constants () const
 {
   return this->gen_inline_constants_;
 }
@@ -1925,7 +1925,7 @@ BE_GlobalData::gen_orb_h_include (bool val)
 }
 
 bool
-BE_GlobalData::gen_orb_h_include (void) const
+BE_GlobalData::gen_orb_h_include () const
 {
   return this->gen_orb_h_include_;
 }
@@ -1937,7 +1937,7 @@ BE_GlobalData::gen_empty_anyop_header (bool val)
 }
 
 bool
-BE_GlobalData::gen_empty_anyop_header (void) const
+BE_GlobalData::gen_empty_anyop_header () const
 {
   return this->gen_empty_anyop_header_;
 }
@@ -1949,7 +1949,7 @@ BE_GlobalData::lookup_strategy (LOOKUP_STRATEGY s)
 }
 
 BE_GlobalData::LOOKUP_STRATEGY
-BE_GlobalData::lookup_strategy (void) const
+BE_GlobalData::lookup_strategy () const
 {
   return this->lookup_strategy_;
 }
@@ -1957,7 +1957,7 @@ BE_GlobalData::lookup_strategy (void) const
 void
 BE_GlobalData::dds_impl (char const * const val)
 {
-  ACE_CString tmp (val, 0, false);
+  ACE_CString tmp (val, nullptr, false);
 
   if (tmp == "ndds")
     {
@@ -1986,236 +1986,236 @@ BE_GlobalData::dds_impl (char const * const val)
 }
 
 BE_GlobalData::DDS_IMPL
-BE_GlobalData::dds_impl (void) const
+BE_GlobalData::dds_impl () const
 {
   return this->dds_impl_;
 }
 
 void
-BE_GlobalData::destroy (void)
+BE_GlobalData::destroy ()
 {
   ACE::strdelete (this->skel_export_macro_);
-  this->skel_export_macro_ = 0;
+  this->skel_export_macro_ = nullptr;
 
   ACE::strdelete (this->skel_export_include_);
-  this->skel_export_include_ = 0;
+  this->skel_export_include_ = nullptr;
 
   ACE::strdelete (this->skel_export_file_);
-  this->skel_export_file_ = 0;
+  this->skel_export_file_ = nullptr;
 
   ACE::strdelete (this->stub_export_macro_);
-  this->stub_export_macro_ = 0;
+  this->stub_export_macro_ = nullptr;
 
   ACE::strdelete (this->stub_export_include_);
-  this->stub_export_include_ = 0;
+  this->stub_export_include_ = nullptr;
 
   ACE::strdelete (this->stub_export_file_);
-  this->stub_export_file_ = 0;
+  this->stub_export_file_ = nullptr;
 
   ACE::strdelete (this->anyop_export_macro_);
-  this->anyop_export_macro_ = 0;
+  this->anyop_export_macro_ = nullptr;
 
   ACE::strdelete (this->anyop_export_include_);
-  this->anyop_export_include_ = 0;
+  this->anyop_export_include_ = nullptr;
 
   ACE::strdelete (this->exec_export_macro_);
-  this->exec_export_macro_ = 0;
+  this->exec_export_macro_ = nullptr;
 
   ACE::strdelete (this->exec_export_include_);
-  this->exec_export_include_ = 0;
+  this->exec_export_include_ = nullptr;
 
   ACE::strdelete (this->svnt_export_macro_);
-  this->svnt_export_macro_ = 0;
+  this->svnt_export_macro_ = nullptr;
 
   ACE::strdelete (this->svnt_export_include_);
-  this->svnt_export_include_ = 0;
+  this->svnt_export_include_ = nullptr;
 
   ACE::strdelete (this->conn_export_macro_);
-  this->conn_export_macro_ = 0;
+  this->conn_export_macro_ = nullptr;
 
   ACE::strdelete (this->conn_export_include_);
-  this->conn_export_include_ = 0;
+  this->conn_export_include_ = nullptr;
 
   ACE::strdelete (this->pch_include_);
-  this->pch_include_ = 0;
+  this->pch_include_ = nullptr;
 
   ACE::strdelete (this->pre_include_);
-  this->pre_include_ = 0;
+  this->pre_include_ = nullptr;
 
   ACE::strdelete (this->post_include_);
-  this->post_include_ = 0;
+  this->post_include_ = nullptr;
 
   ACE::strdelete (this->include_guard_);
-  this->include_guard_ = 0;
+  this->include_guard_ = nullptr;
 
   ACE::strdelete (this->safe_include_);
-  this->safe_include_ = 0;
+  this->safe_include_ = nullptr;
 
   ACE::strdelete (this->unique_include_);
-  this->unique_include_ = 0;
+  this->unique_include_ = nullptr;
 
   ACE::strdelete (this->stripped_filename_);
-  this->stripped_filename_ = 0;
+  this->stripped_filename_ = nullptr;
 
   ACE::strdelete (this->client_hdr_ending_);
-  this->client_hdr_ending_ = 0;
+  this->client_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->client_stub_ending_);
-  this->client_stub_ending_ = 0;
+  this->client_stub_ending_ = nullptr;
 
   ACE::strdelete (this->client_inline_ending_);
-  this->client_inline_ending_ = 0;
+  this->client_inline_ending_ = nullptr;
 
   ACE::strdelete (this->server_hdr_ending_);
-  this->server_hdr_ending_ = 0;
+  this->server_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->implementation_hdr_ending_);
-  this->implementation_hdr_ending_ = 0;
+  this->implementation_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->implementation_skel_ending_);
-  this->implementation_skel_ending_ = 0;
+  this->implementation_skel_ending_ = nullptr;
 
   ACE::strdelete (this->impl_class_prefix_);
-  this->impl_class_prefix_ = 0;
+  this->impl_class_prefix_ = nullptr;
 
   ACE::strdelete (this->impl_class_suffix_);
-  this->impl_class_suffix_ = 0;
+  this->impl_class_suffix_ = nullptr;
 
   ACE::strdelete (this->server_template_hdr_ending_);
-  this->server_template_hdr_ending_ = 0;
+  this->server_template_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->server_skeleton_ending_);
-  this->server_skeleton_ending_ = 0;
+  this->server_skeleton_ending_ = nullptr;
 
   ACE::strdelete (this->server_template_skeleton_ending_);
-  this->server_template_skeleton_ending_ = 0;
+  this->server_template_skeleton_ending_ = nullptr;
 
   ACE::strdelete (this->anyop_hdr_ending_);
-  this->anyop_hdr_ending_ = 0;
+  this->anyop_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->anyop_src_ending_);
-  this->anyop_src_ending_ = 0;
+  this->anyop_src_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_svnt_hdr_ending_);
-  this->ciao_svnt_hdr_ending_ = 0;
+  this->ciao_svnt_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_svnt_src_ending_);
-  this->ciao_svnt_src_ending_ = 0;
+  this->ciao_svnt_src_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_svnt_hdr_template_ending_);
-  this->ciao_svnt_hdr_template_ending_ = 0;
+  this->ciao_svnt_hdr_template_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_svnt_src_template_ending_);
-  this->ciao_svnt_src_template_ending_ = 0;
+  this->ciao_svnt_src_template_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_exec_hdr_ending_);
-  this->ciao_exec_hdr_ending_ = 0;
+  this->ciao_exec_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_exec_src_ending_);
-  this->ciao_exec_src_ending_ = 0;
+  this->ciao_exec_src_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_exec_stub_hdr_ending_);
-  this->ciao_exec_stub_hdr_ending_ = 0;
+  this->ciao_exec_stub_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_exec_idl_ending_);
-  this->ciao_exec_idl_ending_ = 0;
+  this->ciao_exec_idl_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_conn_hdr_ending_);
-  this->ciao_conn_hdr_ending_ = 0;
+  this->ciao_conn_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_conn_src_ending_);
-  this->ciao_conn_src_ending_ = 0;
+  this->ciao_conn_src_ending_ = nullptr;
 
   ACE::strdelete (this->dds_typesupport_hdr_ending_);
-  this->dds_typesupport_hdr_ending_ = 0;
+  this->dds_typesupport_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_ami_conn_idl_ending_);
-  this->ciao_ami_conn_idl_ending_ = 0;
+  this->ciao_ami_conn_idl_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_ami_conn_impl_hdr_ending_);
-  this->ciao_ami_conn_impl_hdr_ending_ = 0;
+  this->ciao_ami_conn_impl_hdr_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_ami_conn_impl_src_ending_);
-  this->ciao_ami_conn_impl_src_ending_ = 0;
+  this->ciao_ami_conn_impl_src_ending_ = nullptr;
 
   ACE::strdelete (this->ciao_container_type_);
-  this->ciao_container_type_ = 0;
+  this->ciao_container_type_ = nullptr;
 
   ACE::strdelete (this->output_dir_);
-  this->output_dir_ = 0;
+  this->output_dir_ = nullptr;
 
   ACE::strdelete (this->stub_include_dir_);
-  this->stub_include_dir_ = 0;
+  this->stub_include_dir_ = nullptr;
 
   ACE::strdelete (this->skel_output_dir_);
-  this->skel_output_dir_ = 0;
+  this->skel_output_dir_ = nullptr;
 
   ACE::strdelete (this->anyop_output_dir_);
-  this->anyop_output_dir_ = 0;
+  this->anyop_output_dir_ = nullptr;
 
   ACE::strdelete (this->exec_output_dir_);
-  this->exec_output_dir_ = 0;
+  this->exec_output_dir_ = nullptr;
 
-  if (0 != this->messaging_)
+  if (nullptr != this->messaging_)
     {
       this->messaging_->destroy ();
       delete this->messaging_;
-      this->messaging_ = 0;
+      this->messaging_ = nullptr;
     }
 
-  if (0 != this->messaging_exceptionholder_)
+  if (nullptr != this->messaging_exceptionholder_)
     {
       this->messaging_exceptionholder_->destroy ();
       delete this->messaging_exceptionholder_;
-      this->messaging_exceptionholder_ = 0;
+      this->messaging_exceptionholder_ = nullptr;
     }
 
-  if (0 != this->messaging_replyhandler_)
+  if (nullptr != this->messaging_replyhandler_)
     {
       this->messaging_replyhandler_->destroy ();
       delete this->messaging_replyhandler_;
-      this->messaging_replyhandler_ = 0;
+      this->messaging_replyhandler_ = nullptr;
     }
 
-  if (0 != tao_cg)
+  if (nullptr != tao_cg)
     {
       tao_cg->destroy ();
     }
 }
 
 AST_PredefinedType *
-BE_GlobalData:: void_type (void)
+BE_GlobalData:: void_type ()
 {
-  if (0 == this->void_type_)
+  if (nullptr == this->void_type_)
     {
       AST_Decl *d =
         idl_global->root ()->lookup_primitive_type (
           AST_Expression::EV_void);
 
-      this->void_type_ = AST_PredefinedType::narrow_from_decl (d);
+      this->void_type_ = dynamic_cast<AST_PredefinedType*> (d);
     }
 
   return this->void_type_;
 }
 
 be_interface *
-BE_GlobalData::ccmobject (void)
+BE_GlobalData::ccmobject ()
 {
-  if (0 == this->ccmobject_)
+  if (nullptr == this->ccmobject_)
     {
-      Identifier *local_id = 0;
+      Identifier *local_id = nullptr;
       ACE_NEW_RETURN (local_id,
                       Identifier ("CCMObject"),
-                      0);
-      UTL_ScopedName *local_name = 0;
+                      nullptr);
+      UTL_ScopedName *local_name = nullptr;
       ACE_NEW_RETURN (local_name,
-                      UTL_ScopedName (local_id, 0),
-                      0);
+                      UTL_ScopedName (local_id, nullptr),
+                      nullptr);
 
-      Identifier *module_id = 0;
+      Identifier *module_id = nullptr;
       ACE_NEW_RETURN (module_id,
                       Identifier ("Components"),
-                      0);
+                      nullptr);
       UTL_ScopedName sn (module_id,
                          local_name);
 
@@ -2225,7 +2225,7 @@ BE_GlobalData::ccmobject (void)
 
       sn.destroy ();
 
-      if (0 == d)
+      if (nullptr == d)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_global::ccmobject - "
@@ -2233,32 +2233,32 @@ BE_GlobalData::ccmobject (void)
                             0);
         }
 
-      this->ccmobject_ = be_interface::narrow_from_decl (d);
+      this->ccmobject_ = dynamic_cast<be_interface*> (d);
     }
 
   return this->ccmobject_;
 }
 
 be_module *
-BE_GlobalData::messaging (void)
+BE_GlobalData::messaging ()
 {
-  if (0 == this->messaging_)
+  if (nullptr == this->messaging_)
     {
-      Identifier *id = 0;
-      UTL_ScopedName *sn = 0;
+      Identifier *id = nullptr;
+      UTL_ScopedName *sn = nullptr;
 
       ACE_NEW_RETURN (id,
                       Identifier ("Messaging"),
-                      0);
+                      nullptr);
 
       ACE_NEW_RETURN (sn,
                       UTL_ScopedName (id,
-                                      0),
-                      0);
+                                      nullptr),
+                      nullptr);
 
       ACE_NEW_RETURN (this->messaging_,
                       be_module (sn),
-                      0);
+                      nullptr);
 
       this->messaging_->set_name (sn);
     }
@@ -2267,52 +2267,52 @@ BE_GlobalData::messaging (void)
 }
 
 be_valuetype *
-BE_GlobalData::messaging_exceptionholder (void)
+BE_GlobalData::messaging_exceptionholder ()
 {
-  if (0 == this->messaging_exceptionholder_)
+  if (nullptr == this->messaging_exceptionholder_)
     {
-      Identifier *id = 0;
+      Identifier *id = nullptr;
       be_module *msg = this->messaging ();
       idl_global->scopes ().push (msg);
 
       ACE_NEW_RETURN (id,
                       Identifier ("Messaging"),
-                      0);
+                      nullptr);
 
       // Create a valuetype "ExceptionHolder"
       // from which we inherit.
-      UTL_ScopedName *full_name = 0;
+      UTL_ScopedName *full_name = nullptr;
       ACE_NEW_RETURN (full_name,
                       UTL_ScopedName (id,
-                                      0),
-                      0);
+                                      nullptr),
+                      nullptr);
 
       ACE_NEW_RETURN (id,
                       Identifier ("ExceptionHolder"),
-                      0);
+                      nullptr);
 
-      UTL_ScopedName *local_name = 0;
+      UTL_ScopedName *local_name = nullptr;
       ACE_NEW_RETURN (local_name,
                       UTL_ScopedName (id,
-                                      0),
-                      0);
+                                      nullptr),
+                      nullptr);
 
       full_name->nconc (local_name);
 
       ACE_NEW_RETURN (this->messaging_exceptionholder_,
                       be_valuetype (full_name,
+                                    nullptr,
                                     0,
+                                    nullptr,
+                                    nullptr,
                                     0,
+                                    nullptr,
                                     0,
-                                    0,
-                                    0,
-                                    0,
-                                    0,
-                                    0,
+                                    nullptr,
                                     0,
                                     0,
                                     0),
-                      0);
+                      nullptr);
 
       this->messaging_exceptionholder_->set_name (full_name);
 
@@ -2332,49 +2332,49 @@ BE_GlobalData::messaging_exceptionholder (void)
 }
 
 be_interface *
-BE_GlobalData::messaging_replyhandler (void)
+BE_GlobalData::messaging_replyhandler ()
 {
-  if (0 == this->messaging_replyhandler_)
+  if (nullptr == this->messaging_replyhandler_)
     {
       be_module *msg = this->messaging ();
       idl_global->scopes ().push (msg);
 
-      Identifier *id = 0;
-      UTL_ScopedName *local_name = 0;
+      Identifier *id = nullptr;
+      UTL_ScopedName *local_name = nullptr;
 
       // Create a virtual module named "Messaging"
       // "and an interface "ReplyHandler"
       // from which we inherit.
       ACE_NEW_RETURN (id,
                       Identifier ("Messaging"),
-                      0);
+                      nullptr);
 
-      UTL_ScopedName *full_name = 0;
+      UTL_ScopedName *full_name = nullptr;
       ACE_NEW_RETURN (full_name,
                       UTL_ScopedName (id,
-                                      0),
-                      0);
+                                      nullptr),
+                      nullptr);
 
       ACE_NEW_RETURN (id,
                       Identifier ("ReplyHandler"),
-                      0);
+                      nullptr);
 
       ACE_NEW_RETURN (local_name,
                       UTL_ScopedName (id,
-                                      0),
-                      0);
+                                      nullptr),
+                      nullptr);
 
       full_name->nconc (local_name);
 
       ACE_NEW_RETURN (this->messaging_replyhandler_,
                       be_interface (full_name,
-                                    0,  // inherited interfaces
+                                    nullptr,  // inherited interfaces
                                     0,  // number of inherited interfaces
-                                    0,  // ancestors
+                                    nullptr,  // ancestors
                                     0,  // number of ancestors
                                     0,  // not local
                                     0), // not abstract
-                      0);
+                      nullptr);
 
       this->messaging_replyhandler_->set_name (full_name);
       this->messaging_replyhandler_->set_prefix_with_typeprefix ("omg.org");
@@ -2390,7 +2390,7 @@ BE_GlobalData::messaging_replyhandler (void)
 }
 
 bool
-BE_GlobalData::gen_anyop_files (void) const
+BE_GlobalData::gen_anyop_files () const
 {
   return this->gen_anyop_files_;
 }
@@ -2402,7 +2402,7 @@ BE_GlobalData::gen_anyop_files (bool val)
 }
 
 bool
-BE_GlobalData::gen_skel_files (void) const
+BE_GlobalData::gen_skel_files () const
 {
   return this->gen_skel_files_;
 }
@@ -2414,7 +2414,7 @@ BE_GlobalData::gen_skel_files (bool val)
 }
 
 bool
-BE_GlobalData::gen_svnt_cpp_files (void) const
+BE_GlobalData::gen_svnt_cpp_files () const
 {
   return this->gen_svnt_cpp_files_;
 }
@@ -2426,7 +2426,7 @@ BE_GlobalData::gen_svnt_cpp_files (bool val)
 }
 
 bool
-BE_GlobalData::gen_svnt_t_files (void) const
+BE_GlobalData::gen_svnt_t_files () const
 {
   return this->gen_svnt_t_files_;
 }
@@ -2438,7 +2438,7 @@ BE_GlobalData::gen_svnt_t_files (bool val)
 }
 
 bool
-BE_GlobalData::gen_client_inline (void) const
+BE_GlobalData::gen_client_inline () const
 {
   return this->gen_client_inline_;
 }
@@ -2450,7 +2450,7 @@ BE_GlobalData::gen_client_inline (bool val)
 }
 
 bool
-BE_GlobalData::gen_client_stub (void) const
+BE_GlobalData::gen_client_stub () const
 {
   return this->gen_client_stub_;
 }
@@ -2462,7 +2462,7 @@ BE_GlobalData::gen_client_stub (bool val)
 }
 
 bool
-BE_GlobalData::gen_client_header (void) const
+BE_GlobalData::gen_client_header () const
 {
   return this->gen_client_header_;
 }
@@ -2474,7 +2474,7 @@ BE_GlobalData::gen_client_header (bool val)
 }
 
 bool
-BE_GlobalData::gen_server_skeleton (void) const
+BE_GlobalData::gen_server_skeleton () const
 {
   return this->gen_server_skeleton_;
 }
@@ -2486,7 +2486,7 @@ BE_GlobalData::gen_server_skeleton (bool val)
 }
 
 bool
-BE_GlobalData::gen_server_header (void) const
+BE_GlobalData::gen_server_header () const
 {
   return this->gen_server_header_;
 }
@@ -2498,7 +2498,7 @@ BE_GlobalData::gen_server_header (bool val)
 }
 
 bool
-BE_GlobalData::gen_local_iface_anyops (void) const
+BE_GlobalData::gen_local_iface_anyops () const
 {
   return this->gen_local_iface_anyops_;
 }
@@ -2510,7 +2510,7 @@ BE_GlobalData::gen_local_iface_anyops (bool val)
 }
 
 bool
-BE_GlobalData::gen_custom_ending (void) const
+BE_GlobalData::gen_custom_ending () const
 {
   return this->gen_custom_ending_;
 }
@@ -2522,7 +2522,7 @@ BE_GlobalData::gen_custom_ending (bool val)
 }
 
 bool
-BE_GlobalData::gen_unique_guards (void) const
+BE_GlobalData::gen_unique_guards () const
 {
   return this->gen_unique_guards_;
 }
@@ -2534,7 +2534,7 @@ BE_GlobalData::gen_unique_guards (bool val)
 }
 
 bool
-BE_GlobalData::gen_ciao_svnt (void) const
+BE_GlobalData::gen_ciao_svnt () const
 {
   return this->gen_ciao_svnt_;
 }
@@ -2546,7 +2546,7 @@ BE_GlobalData::gen_ciao_svnt (bool val)
 }
 
 bool
-BE_GlobalData::gen_ciao_exec_idl (void) const
+BE_GlobalData::gen_ciao_exec_idl () const
 {
   return this->gen_ciao_exec_idl_;
 }
@@ -2558,7 +2558,7 @@ BE_GlobalData::gen_ciao_exec_idl (bool val)
 }
 
 bool
-BE_GlobalData::gen_ciao_exec_impl (void) const
+BE_GlobalData::gen_ciao_exec_impl () const
 {
   return this->gen_ciao_exec_impl_;
 }
@@ -2570,7 +2570,7 @@ BE_GlobalData::gen_ciao_exec_impl (bool val)
 }
 
 bool
-BE_GlobalData::gen_ciao_exec_reactor_impl (void) const
+BE_GlobalData::gen_ciao_exec_reactor_impl () const
 {
   return this->gen_ciao_exec_reactor_impl_;
 }
@@ -2582,7 +2582,7 @@ BE_GlobalData::gen_ciao_exec_reactor_impl (bool val)
 }
 
 bool
-BE_GlobalData::gen_ciao_conn_impl (void) const
+BE_GlobalData::gen_ciao_conn_impl () const
 {
   return this->gen_ciao_conn_impl_;
 }
@@ -2594,7 +2594,7 @@ BE_GlobalData::gen_ciao_conn_impl (bool val)
 }
 
 bool
-BE_GlobalData::gen_dds_typesupport_idl (void) const
+BE_GlobalData::gen_dds_typesupport_idl () const
 {
   return this->gen_dds_typesupport_idl_;
 }
@@ -2606,7 +2606,7 @@ BE_GlobalData::gen_dds_typesupport_idl (bool val)
 }
 
 bool
-BE_GlobalData::gen_ciao_valuefactory_reg (void) const
+BE_GlobalData::gen_ciao_valuefactory_reg () const
 {
   return this->gen_ciao_valuefactory_reg_;
 }
@@ -2618,7 +2618,7 @@ BE_GlobalData::gen_ciao_valuefactory_reg (bool val)
 }
 
 bool
-BE_GlobalData::gen_stub_export_hdr_file (void) const
+BE_GlobalData::gen_stub_export_hdr_file () const
 {
   return this->gen_stub_export_hdr_file_;
 }
@@ -2630,7 +2630,7 @@ BE_GlobalData::gen_stub_export_hdr_file (bool val)
 }
 
 bool
-BE_GlobalData::gen_skel_export_hdr_file (void) const
+BE_GlobalData::gen_skel_export_hdr_file () const
 {
   return this->gen_skel_export_hdr_file_;
 }
@@ -2642,7 +2642,7 @@ BE_GlobalData::gen_skel_export_hdr_file (bool val)
 }
 
 bool
-BE_GlobalData::gen_svnt_export_hdr_file (void) const
+BE_GlobalData::gen_svnt_export_hdr_file () const
 {
   return this->gen_svnt_export_hdr_file_;
 }
@@ -2654,7 +2654,7 @@ BE_GlobalData::gen_svnt_export_hdr_file (bool val)
 }
 
 bool
-BE_GlobalData::gen_exec_export_hdr_file (void) const
+BE_GlobalData::gen_exec_export_hdr_file () const
 {
   return this->gen_exec_export_hdr_file_;
 }
@@ -2666,7 +2666,7 @@ BE_GlobalData::gen_exec_export_hdr_file (bool val)
 }
 
 bool
-BE_GlobalData::gen_conn_export_hdr_file (void) const
+BE_GlobalData::gen_conn_export_hdr_file () const
 {
   return this->gen_conn_export_hdr_file_;
 }
@@ -2678,7 +2678,7 @@ BE_GlobalData::gen_conn_export_hdr_file (bool val)
 }
 
 bool
-BE_GlobalData::alt_mapping (void) const
+BE_GlobalData::alt_mapping () const
 {
   return this->alt_mapping_;
 }
@@ -2690,7 +2690,7 @@ BE_GlobalData::alt_mapping (bool val)
 }
 
 bool
-BE_GlobalData::in_facet_servant (void) const
+BE_GlobalData::in_facet_servant () const
 {
   return this->in_facet_servant_;
 }
@@ -2702,7 +2702,7 @@ BE_GlobalData::in_facet_servant (bool val)
 }
 
 bool
-BE_GlobalData::gen_arg_traits (void) const
+BE_GlobalData::gen_arg_traits () const
 {
   return this->gen_arg_traits_;
 }
@@ -2714,7 +2714,7 @@ BE_GlobalData::gen_arg_traits (bool val)
 }
 
 bool
-BE_GlobalData::gen_anytypecode_adapter (void) const
+BE_GlobalData::gen_anytypecode_adapter () const
 {
   return this->gen_anytypecode_adapter_;
 }
@@ -2738,7 +2738,7 @@ BE_GlobalData::no_fixed_err (bool val)
 }
 
 unsigned long
-BE_GlobalData::tab_size (void) const
+BE_GlobalData::tab_size () const
 {
   return this->tab_size_;
 }
@@ -2750,7 +2750,7 @@ BE_GlobalData::tab_size (unsigned long val)
 }
 
 ACE_CString
-BE_GlobalData::spawn_options (void)
+BE_GlobalData::spawn_options ()
 {
   return idl_global->idl_flags ();
 }
@@ -2902,7 +2902,7 @@ BE_GlobalData::parse_args (long &i, char **av)
       case 'H':
         idl_global->append_idl_flag (av[i + 1]);
 
-        if (av[i + 1] == 0 || av[i + 1][0] == '-')
+        if (av[i + 1] == nullptr || av[i + 1][0] == '-')
           {
             ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("no selection for -H option\n")));
@@ -2981,7 +2981,7 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == '\0')
           {
             idl_global->append_idl_flag (av[i + 1]);
-            ACE_CString tmp (av[i + 1], 0, false);
+            ACE_CString tmp (av[i + 1], nullptr, false);
 #if defined (ACE_WIN32)
             // WIN32's CreateProcess needs the full executable name
             // when the gperf path is modified, but not for the default
@@ -3420,7 +3420,7 @@ BE_GlobalData::parse_args (long &i, char **av)
         else if (av[i][2] == 't')
           {
             // Optimized typecode generation.
-            be_global->opt_tc (1);
+            be_global->opt_tc (true);
           }
         else if (av[i][2] == 'p')
           {
@@ -3488,7 +3488,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             size_t j;
             size_t k = i;
             // Generate implementation files.
-            be_global->gen_impl_files (1);
+            be_global->gen_impl_files (true);
 
             for (j = 0; j < options; ++j)
               {
@@ -3713,7 +3713,7 @@ BE_GlobalData::parse_args (long &i, char **av)
       case 'T':
         if (av[i][2] == 'S')
           {
-            unsigned long ul = ACE_OS::strtoul (av[i + 1], 0, 10);
+            unsigned long ul = ACE_OS::strtoul (av[i + 1], nullptr, 10);
             be_global->tab_size (ul);
             ++i;
           }
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index b62ed54a062..1a0ed5e84a7 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -46,12 +46,12 @@ static const char copyright[] =
 " *     https://www.dre.vanderbilt.edu/~schmidt/TAO.html\n"
 " **/";
 
-TAO_NL::TAO_NL (void)
+TAO_NL::TAO_NL ()
 {
   ACE_UNUSED_ARG (copyright);
 }
 
-TAO_NL_2::TAO_NL_2 (void)
+TAO_NL_2::TAO_NL_2 ()
 {
   ACE_UNUSED_ARG (copyright);
 }
@@ -75,8 +75,8 @@ const TAO_UNINDENT be_uidt_nl (1);
 
 // Methods of the TAO_OutStream class.
 
-TAO_OutStream::TAO_OutStream (void)
-  : fp_ (0),
+TAO_OutStream::TAO_OutStream ()
+  : fp_ (nullptr),
     st_ (TAO_CLI_HDR),
     indent_level_ (0)
 {
@@ -86,13 +86,13 @@ TAO_OutStream::TAO_OutStream (void)
     }
 }
 
-TAO_OutStream::~TAO_OutStream (void)
+TAO_OutStream::~TAO_OutStream ()
 {
   // Close the underlying I/O handle only if it exists.
-  if (this->fp_ != 0)
+  if (this->fp_ != nullptr)
     {
       ACE_OS::fclose (this->fp_);
-      this->fp_ = 0;
+      this->fp_ = nullptr;
     }
 
   indent_level_ = 0;
@@ -102,12 +102,12 @@ int
 TAO_OutStream::open (const char *fname,
                      TAO_OutStream::STREAM_TYPE st)
 {
-  if (fname != 0)
+  if (fname != nullptr)
     {
       // File name exists, open an I/O file handle.
       this->fp_ = ACE_OS::fopen (fname, "w");
 
-      if (this->fp_ != 0)
+      if (this->fp_ != nullptr)
         {
           this->st_ = st;
           // Put the copyright notice.  Not for the gperf's temp input
@@ -140,7 +140,7 @@ TAO_OutStream::stream_type (TAO_OutStream::STREAM_TYPE st)
 }
 
 TAO_OutStream::STREAM_TYPE
-TAO_OutStream::stream_type (void)
+TAO_OutStream::stream_type ()
 {
   return this->st_;
 }
@@ -148,7 +148,7 @@ TAO_OutStream::stream_type (void)
 // Return the underlying lowlevel file pointer.
 // indentation.
 FILE *&
-TAO_OutStream::file (void)
+TAO_OutStream::file ()
 {
   return this->fp_;
 }
@@ -192,7 +192,7 @@ TAO_OutStream::decr_indent (unsigned short flag)
 }
 
 int
-TAO_OutStream::reset (void)
+TAO_OutStream::reset ()
 {
   this->indent_level_ = 0;
   return 0;
@@ -200,7 +200,7 @@ TAO_OutStream::reset (void)
 
 // Indented print.
 int
-TAO_OutStream::indent (void)
+TAO_OutStream::indent ()
 {
   // Based on the current indentation level, leave appropriate number of blank
   // spaces in the output.
@@ -216,7 +216,7 @@ TAO_OutStream::indent (void)
 }
 
 int
-TAO_OutStream::nl (void)
+TAO_OutStream::nl ()
 {
   ACE_OS::fprintf (this->fp_, "\n");
   this->indent ();
@@ -239,7 +239,7 @@ TAO_OutStream::gen_ifdef_macro (const char *flat_name,
                    "_%s_",
                    tao_cg->upcase (flat_name));
 
-  if (suffix != 0)
+  if (suffix != nullptr)
     {
       ACE_OS::strcat (macro, "_");
       ACE_OS::strcat (macro, tao_cg->upcase (suffix));
@@ -287,7 +287,7 @@ TAO_OutStream::gen_ifdef_macro (const char *flat_name,
 }
 
 int
-TAO_OutStream::gen_endif (void)
+TAO_OutStream::gen_endif ()
 {
   *this << "\n\n#endif /* end #if !defined */";
 
@@ -464,7 +464,7 @@ TAO_OutStream::print (UTL_IdList *idl)
 {
   bool first = true;
   bool second = false;
-  Identifier *id = 0;
+  Identifier *id = nullptr;
 
   for (UTL_IdListActiveIterator i (idl); !i.is_done (); i.next ())
     {
@@ -505,7 +505,7 @@ TAO_OutStream::print (AST_Expression *expr)
   AST_Expression::AST_ExprValue *ev = expr->ev ();
 
   /// Never happens as far as I know, but just in case...
-  if (ev == 0)
+  if (ev == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("TAO_OutStream::print() - ")
diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp
index c83cd2aa991..b3e00cc5739 100644
--- a/TAO/TAO_IDL/be/be_home.cpp
+++ b/TAO/TAO_IDL/be/be_home.cpp
@@ -66,28 +66,28 @@ be_home::be_home (UTL_ScopedName *n,
 
   // Some previous error may have caused a lookup failure, in which
   // case we'll crash if we do the narrow below.
-  if (managed_component == 0)
+  if (managed_component == nullptr)
     {
       idl_global->set_err_count (idl_global->err_count () + 1);
       return;
     }
 
   be_component *bt =
-     be_component::narrow_from_decl (managed_component);
+     dynamic_cast<be_component*> (managed_component);
 
   bt->seen_in_operation (true);
 
   idl_global->object_arg_seen_ = true;
 }
 
-be_home::~be_home (void)
+be_home::~be_home ()
 {
 }
 
 void
 be_home::scan (UTL_Scope *s)
 {
-  if (s == 0)
+  if (s == nullptr)
     {
       return;
     }
@@ -98,55 +98,55 @@ be_home::scan (UTL_Scope *s)
     {
       AST_Decl *d = i.item ();
       AST_Attribute *attr =
-        AST_Attribute::narrow_from_decl (d);
+        dynamic_cast<AST_Attribute*> (d);
 
-      if (attr != 0 && ! attr->readonly ())
+      if (attr != nullptr && ! attr->readonly ())
         {
           this->has_rw_attributes_ = true;
           return;
         }
     }
 
-  AST_Home *h = AST_Home::narrow_from_scope (s);
+  AST_Home *h = dynamic_cast<AST_Home*> (s);
 
-  if (h != 0)
+  if (h != nullptr)
     {
       this->scan (h->base_home ());
     }
 }
 
 void
-be_home::destroy (void)
+be_home::destroy ()
 {
   delete [] this->full_skel_name_;
-  this->full_skel_name_ = 0;
+  this->full_skel_name_ = nullptr;
 
   delete [] this->full_coll_name_;
-  this->full_coll_name_ = 0;
+  this->full_coll_name_ = nullptr;
 
   delete [] this->local_coll_name_;
-  this->local_coll_name_ = 0;
+  this->local_coll_name_ = nullptr;
 
   delete [] this->relative_skel_name_;
-  this->relative_skel_name_ = 0;
+  this->relative_skel_name_ = nullptr;
 
   delete [] this->direct_proxy_impl_name_;
-  this->direct_proxy_impl_name_ = 0;
+  this->direct_proxy_impl_name_ = nullptr;
 
   delete [] this->full_direct_proxy_impl_name_;
-  this->full_direct_proxy_impl_name_ = 0;
+  this->full_direct_proxy_impl_name_ = nullptr;
 
   delete [] this->client_scope_;
-  this->client_scope_ = 0;
+  this->client_scope_ = nullptr;
 
   delete [] this->flat_client_scope_;
-  this->flat_client_scope_ = 0;
+  this->flat_client_scope_ = nullptr;
 
   delete [] this->server_scope_;
-  this->server_scope_ = 0;
+  this->server_scope_ = nullptr;
 
   delete [] this->flat_server_scope_;
-  this->flat_server_scope_ = 0;
+  this->flat_server_scope_ = nullptr;
 
   this->be_scope::destroy ();
   this->be_type::destroy ();
@@ -162,6 +162,3 @@ be_home::accept (be_visitor *visitor)
             ? 0
             : visitor->visit_home (this));
 }
-
-IMPL_NARROW_FROM_DECL (be_home)
-IMPL_NARROW_FROM_SCOPE (be_home)
diff --git a/TAO/TAO_IDL/be/be_identifier_helper.cpp b/TAO/TAO_IDL/be/be_identifier_helper.cpp
index 9abb24ce0ba..72c848882b1 100644
--- a/TAO/TAO_IDL/be/be_identifier_helper.cpp
+++ b/TAO/TAO_IDL/be/be_identifier_helper.cpp
@@ -12,7 +12,7 @@ ACE_CString IdentifierHelper::tmp_retval_;
 const char *
 IdentifierHelper::type_name (be_type *t, be_visitor *visitor)
 {
-  AST_PredefinedType *pdt = 0;
+  AST_PredefinedType *pdt = nullptr;
 
   switch (t->node_type ())
     {
@@ -22,7 +22,7 @@ IdentifierHelper::type_name (be_type *t, be_visitor *visitor)
         (void) t->accept (visitor);
         return "";
       case AST_Decl::NT_pre_defined:
-        pdt = AST_PredefinedType::narrow_from_decl (t);
+        pdt = dynamic_cast<AST_PredefinedType*> (t);
 
         switch (pdt->pt ())
           {
@@ -78,7 +78,7 @@ IdentifierHelper::type_name (be_type *t, be_visitor *visitor)
 Identifier *
 IdentifierHelper::original_local_name (Identifier * local_name)
 {
-  Identifier * id = 0;
+  Identifier * id = nullptr;
   const char *lname = local_name->get_string ();
 
   // Remove _cxx_ if:
@@ -95,16 +95,16 @@ IdentifierHelper::original_local_name (Identifier * local_name)
       const TAO_IDL_CPP_Keyword_Entry *entry =
         cpp_key_tbl.lookup (lname + 5, len);
 
-      if (entry != 0)
+      if (entry != nullptr)
         {
           // Remove _cxx_ and assign to the Identifier variable.
           ACE_NEW_RETURN (id,
                           Identifier (lname + 5),
-                          0);
+                          nullptr);
         }
     }
 
-  if (id == 0)
+  if (id == nullptr)
     {
       id = local_name->copy ();
     }
@@ -118,7 +118,7 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl)
   ACE_CString retval;
   bool first = true;
   bool second = false;
-  Identifier *id = 0;
+  Identifier *id = nullptr;
 
   for (UTL_IdListActiveIterator i (sn); !i.is_done ();)
     {
@@ -159,7 +159,7 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl)
 
       id->destroy ();
       delete id;
-      id = 0;
+      id = nullptr;
     }
 
   return retval;
diff --git a/TAO/TAO_IDL/be/be_init.cpp b/TAO/TAO_IDL/be/be_init.cpp
index 691eb0056cd..cb617133710 100644
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ b/TAO/TAO_IDL/be/be_init.cpp
@@ -3,7 +3,7 @@
 #include "../../tao/Version.h"
 
 TAO_IDL_BE_Export void
-BE_version (void)
+BE_version ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("TAO_IDL_BE, version ") ACE_TEXT (TAO_VERSION)
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index fc1bba18bd5..ba3b0ce5ff0 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -82,23 +82,23 @@ be_interface::be_interface (UTL_ScopedName *n,
              n),
     be_type (AST_Decl::NT_interface,
              n),
-    direct_proxy_impl_name_ (0),
-    full_direct_proxy_impl_name_ (0),
-    client_scope_ (0),
-    flat_client_scope_ (0),
-    server_scope_ (0),
-    flat_server_scope_ (0),
+    direct_proxy_impl_name_ (nullptr),
+    full_direct_proxy_impl_name_ (nullptr),
+    client_scope_ (nullptr),
+    flat_client_scope_ (nullptr),
+    server_scope_ (nullptr),
+    flat_server_scope_ (nullptr),
     var_out_seq_decls_gen_ (false),
     skel_count_ (0),
     in_mult_inheritance_ (-1),
-    original_interface_ (0),
+    original_interface_ (nullptr),
     is_amh_rh_ (false),
     is_ami_rh_ (false),
     is_ami4ccm_rh_ (false),
-    full_skel_name_ (0),
-    full_coll_name_ (0),
-    local_coll_name_ (0),
-    relative_skel_name_ (0),
+    full_skel_name_ (nullptr),
+    full_coll_name_ (nullptr),
+    local_coll_name_ (nullptr),
+    relative_skel_name_ (nullptr),
     cached_type_ (-1),
     has_rw_attributes_ (false),
     dds_connector_traits_done_ (false)
@@ -141,12 +141,12 @@ be_interface::be_interface (UTL_ScopedName *n,
     }
 }
 
-be_interface::~be_interface (void)
+be_interface::~be_interface ()
 {
 }
 
 const char *
-be_interface::local_name (void)
+be_interface::local_name ()
 {
   // Return the local name.
 //  return this->strategy_->local_name ();
@@ -154,9 +154,9 @@ be_interface::local_name (void)
 }
 
 const char *
-be_interface::full_skel_name (void)
+be_interface::full_skel_name ()
 {
-  if (this->full_skel_name_ == 0)
+  if (this->full_skel_name_ == nullptr)
     {
       this->compute_full_skel_name ("POA_",
                                     this->full_skel_name_);
@@ -169,8 +169,8 @@ const char *
 be_interface::full_coll_name (int type)
 {
   this->compute_coll_names (type,
-                            0,  // prefix
-                            0); // suffix
+                            nullptr,  // prefix
+                            nullptr); // suffix
 
   return this->full_coll_name_;
 }
@@ -179,8 +179,8 @@ const char *
 be_interface::local_coll_name (int type)
 {
   this->compute_coll_names (type,
-                            0,  // prefix
-                            0); // suffix
+                            nullptr,  // prefix
+                            nullptr); // suffix
 
   return this->local_coll_name_;
 }
@@ -196,7 +196,7 @@ void
 be_interface::compute_full_skel_name (const char *prefix,
                                       char *&skel_name)
 {
-  if (skel_name != 0)
+  if (skel_name != nullptr)
     {
       return;
     }
@@ -204,7 +204,7 @@ be_interface::compute_full_skel_name (const char *prefix,
   size_t namelen = ACE_OS::strlen (prefix);
   long first = true;
   long second = false;
-  char *item_name = 0;
+  char *item_name = nullptr;
 
   // In the first loop compute the total length.
   for (UTL_IdListActiveIterator i (this->name ());
@@ -284,7 +284,7 @@ be_interface::compute_coll_names (int type,
                                   const char *prefix,
                                   const char *suffix)
 {
-  if (type == this->cached_type_ && this->full_coll_name_ != 0)
+  if (type == this->cached_type_ && this->full_coll_name_ != nullptr)
     {
       return;
     }
@@ -296,8 +296,8 @@ be_interface::compute_coll_names (int type,
 
       // Reset to zero in case allocations below fail, and cause
       // premature return to caller.
-      this->full_coll_name_ = 0;
-      this->local_coll_name_ = 0;
+      this->full_coll_name_ = nullptr;
+      this->local_coll_name_ = nullptr;
     }
 
   static const char *collocated_names[] = {"_tao_thru_poa_collocated_",
@@ -494,8 +494,8 @@ be_interface::relative_name (const char *localname,
       if (!ACE_OS::strcmp (def_curr, use_curr))
         {
           // They have same prefix, append to arg1.
-          def_curr = (def_next ? (def_next+2) : 0); // Skip the ::
-          use_curr = (use_next ? (use_next+2) : 0); // Skip the ::
+          def_curr = (def_next ? (def_next+2) : nullptr); // Skip the ::
+          use_curr = (use_next ? (use_next+2) : nullptr); // Skip the ::
         }
       else
         {
@@ -533,7 +533,7 @@ be_interface::relative_name (const char *localname,
 
 // Am I in some kind of a multiple inheritance?
 int
-be_interface::in_mult_inheritance (void)
+be_interface::in_mult_inheritance ()
 {
   if (this->in_mult_inheritance_ == -1)
     {
@@ -541,7 +541,7 @@ be_interface::in_mult_inheritance (void)
       // Determine if we are in some form of a multiple inheritance.
       if (this->traverse_inheritance_graph (
               be_interface::in_mult_inheritance_helper,
-              0
+              nullptr
             ) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -564,7 +564,7 @@ be_interface::in_mult_inheritance (int mi)
 }
 
 bool
-be_interface::has_rw_attributes (void) const
+be_interface::has_rw_attributes () const
 {
   return this->has_rw_attributes_;
 }
@@ -572,7 +572,7 @@ be_interface::has_rw_attributes (void) const
 void
 be_interface::redefine (AST_Interface *from)
 {
-  be_interface *bi = be_interface::narrow_from_decl (from);
+  be_interface *bi = dynamic_cast<be_interface*> (from);
   this->var_out_seq_decls_gen_ = bi->var_out_seq_decls_gen_;
   this->has_mixed_parentage_ = bi->has_mixed_parentage_;
 
@@ -581,7 +581,7 @@ be_interface::redefine (AST_Interface *from)
       ACE_Unbounded_Queue<AST_Interface *> &q =
         idl_global->mixed_parentage_interfaces ();
       size_t slot = 0;
-      AST_Interface **t = 0;
+      AST_Interface **t = nullptr;
 
       // The queue of interfaces with mixed parentage must
       // replace each interface that has been forward
@@ -734,7 +734,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
 // interface _var and _out template classes, as well as by the
 // template sequence classes for object references.
 void
-be_interface:: gen_var_out_seq_decls (void)
+be_interface::gen_var_out_seq_decls ()
 {
   if (this->var_out_seq_decls_gen_)
     {
@@ -758,7 +758,7 @@ be_interface:: gen_var_out_seq_decls (void)
   // execution of the IDL compiler) there is nothing
   // to tell the IDL compiler that this interface is in any
   // way special. All we can do is search for the prefix.
-  ACE_CString test (lname, 0, false);
+  ACE_CString test (lname, nullptr, false);
   bool has_ami4ccm_prefix = (test.find ("AMI4CCM_") == 0);
 
   bool already_ami =
@@ -808,7 +808,7 @@ be_interface:: gen_var_out_seq_decls (void)
 // ****************************************************************
 
 TAO_IDL_Inheritance_Hierarchy_Worker::~TAO_IDL_Inheritance_Hierarchy_Worker (
-    void)
+    )
 {
 }
 
@@ -841,7 +841,7 @@ TAO_IDL_Gen_OpTable_Worker::emit (be_interface *derived_interface,
 {
   // Generate entries for the derived class using the properties of its
   // ancestors.
-  be_interface *bi = be_interface::narrow_from_decl (base_interface);
+  be_interface *bi = dynamic_cast<be_interface*> (base_interface);
   return bi->gen_optable_entries (derived_interface,
                                   this->skeleton_name_,
                                   os);
@@ -890,13 +890,13 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface,
       return 0;
     }
 
-  be_decl *d = 0;
+  be_decl *d = nullptr;
 
   for (UTL_ScopeActiveIterator si (base_interface, UTL_Scope::IK_decls);
        !si.is_done ();
        si.next ())
     {
-      d = be_decl::narrow_from_decl (si.item ());
+      d = dynamic_cast<be_decl*> (si.item ());
 
       if (d->node_type () == AST_Decl::NT_op)
         {
@@ -981,15 +981,15 @@ be_interface::gen_operation_table (const char *flat_name,
         // Generate the skeleton for the is_a method.
         if (amh)
           {
-            *os << "{\"_is_a\", &TAO_AMH_Skeletons::_is_a_amh_skel, 0}," << be_nl;
+            *os << "{\"_is_a\", std::addressof(TAO_AMH_Skeletons::_is_a_amh_skel), nullptr}," << be_nl;
           }
         else if (be_global->gen_thru_poa_collocation ())
           {
-            *os << "{\"_is_a\", &TAO_ServantBase::_is_a_thru_poa_skel, 0}," << be_nl;
+            *os << "{\"_is_a\", std::addressof(TAO_ServantBase::_is_a_thru_poa_skel), nullptr}," << be_nl;
           }
         else
           {
-            *os << "{\"_is_a\", &TAO_ServantBase::_is_a_skel, 0}," << be_nl;
+            *os << "{\"_is_a\", std::addressof(TAO_ServantBase::_is_a_skel), nullptr}," << be_nl;
           }
 
         ++this->skel_count_;
@@ -998,18 +998,18 @@ be_interface::gen_operation_table (const char *flat_name,
           {
             if (amh)
               {
-                *os << "{\"_non_existent\", &TAO_AMH_Skeletons"
-                    << "::_non_existent_amh_skel, 0}," << be_nl;
+                *os << "{\"_non_existent\", std::addressof(TAO_AMH_Skeletons"
+                    << "::_non_existent_amh_skel), nullptr}," << be_nl;
               }
             else if (be_global->gen_thru_poa_collocation ())
               {
-                *os << "{\"_non_existent\", &TAO_ServantBase"
-                    << "::_non_existent_thru_poa_skel, 0}," << be_nl;
+                *os << "{\"_non_existent\", std::addressof(TAO_ServantBase"
+                    << "::_non_existent_thru_poa_skel), nullptr}," << be_nl;
               }
             else
               {
-                *os << "{\"_non_existent\", &TAO_ServantBase"
-                    << "::_non_existent_skel, 0}," << be_nl;
+                *os << "{\"_non_existent\", std::addressof(TAO_ServantBase"
+                    << "::_non_existent_skel), nullptr}," << be_nl;
               }
 
             ++this->skel_count_;
@@ -1019,18 +1019,18 @@ be_interface::gen_operation_table (const char *flat_name,
           {
             if (amh)
               {
-                *os << "{\"_component\", &TAO_AMH_Skeletons"
-                    << "::_component_amh_skel, 0}," << be_nl;
+                *os << "{\"_component\", std::addressof(TAO_AMH_Skeletons"
+                    << "::_component_amh_skel), nullptr}," << be_nl;
               }
             else if (be_global->gen_thru_poa_collocation ())
               {
-                *os << "{\"_component\", &TAO_ServantBase"
-                    << "::_component_thru_poa_skel, 0}," << be_nl;
+                *os << "{\"_component\", std::addressof(TAO_ServantBase"
+                    << "::_component_thru_poa_skel), nullptr}," << be_nl;
               }
             else
               {
-                *os << "{\"_component\", &TAO_ServantBase"
-                    << "::_component_skel, 0}," << be_nl;
+                *os << "{\"_component\", std::addressof(TAO_ServantBase"
+                    << "::_component_skel), nullptr}," << be_nl;
               }
 
             ++this->skel_count_;
@@ -1040,13 +1040,13 @@ be_interface::gen_operation_table (const char *flat_name,
           {
             if (amh)
               {
-                *os << "{\"_interface\", &TAO_AMH_Skeletons"
-                    << "::_interface_amh_skel, 0}," << be_nl;
+                *os << "{\"_interface\", std::addressof(TAO_AMH_Skeletons"
+                    << "::_interface_amh_skel), nullptr}," << be_nl;
               }
             else
               {
-                *os << "{\"_interface\", &TAO_ServantBase"
-                    << "::_interface_skel, 0}," << be_nl;
+                *os << "{\"_interface\", std::addressof(TAO_ServantBase"
+                    << "::_interface_skel), nullptr}," << be_nl;
               }
 
             ++this->skel_count_;
@@ -1056,18 +1056,18 @@ be_interface::gen_operation_table (const char *flat_name,
           {
             if (amh)
               {
-                *os << "{\"_repository_id\", &TAO_AMH_Skeletons"
-                    << "::_repository_id_amh_skel, 0}" << be_uidt_nl;
+                *os << "{\"_repository_id\", std::addressof(TAO_AMH_Skeletons"
+                    << "::_repository_id_amh_skel), nullptr}" << be_uidt_nl;
               }
             else if (be_global->gen_thru_poa_collocation ())
               {
-                *os << "{\"_repository_id\", &TAO_ServantBase"
-                    << "::_repository_id_thru_poa_skel, 0}" << be_uidt_nl;
+                *os << "{\"_repository_id\", std::addressof(TAO_ServantBase"
+                    << "::_repository_id_thru_poa_skel), nullptr}" << be_uidt_nl;
               }
             else
               {
-                *os << "{\"_repository_id\", &TAO_ServantBase"
-                    << "::_repository_id_skel, 0}" << be_uidt_nl;
+                *os << "{\"_repository_id\", std::addressof(TAO_ServantBase"
+                    << "::_repository_id_skel), nullptr}" << be_uidt_nl;
               }
 
             ++this->skel_count_;
@@ -1107,7 +1107,7 @@ be_interface::gen_operation_table (const char *flat_name,
         // We must randomize this a bit in order to avoid problems with
         // processing more than one idl file (in separate processes) with
         // the same name (in different directories).
-        char *temp_file = 0;
+        char *temp_file = nullptr;
         ACE_NEW_RETURN (temp_file,
                         char [ACE_OS::strlen (idl_global->temp_dir ())
                               + 11 // The number of possible digits in
@@ -1148,10 +1148,10 @@ be_interface::gen_operation_table (const char *flat_name,
 
         // Make a new outstream to hold the gperf_temp_file for this
         // interface.
-        TAO_OutStream *os = 0;
+        TAO_OutStream *os = nullptr;
         ACE_NEW_NORETURN (os, TAO_OutStream);
 
-        if (os == 0)
+        if (os == nullptr)
           {
             ACE_ERROR_RETURN ((LM_ERROR,
                                "be_visitor_interface_ss"
@@ -1205,18 +1205,18 @@ be_interface::gen_operation_table (const char *flat_name,
 
         if (amh)
           {
-            *os << "_is_a,&TAO_AMH_Skeletons"
-                << "::_is_a_amh_skel, 0" << be_nl;
+            *os << "_is_a,std::addressof(TAO_AMH_Skeletons"
+                << "::_is_a_amh_skel), nullptr" << be_nl;
           }
         else if (be_global->gen_thru_poa_collocation ())
           {
-            *os << "_is_a,&TAO_ServantBase"
-                << "::_is_a_thru_poa_skel, 0" << be_nl;
+            *os << "_is_a,std::addressof(TAO_ServantBase"
+                << "::_is_a_thru_poa_skel), nullptr" << be_nl;
           }
         else
           {
-            *os << "_is_a,&TAO_ServantBase"
-                << "::_is_a_skel, 0" << be_nl;
+            *os << "_is_a,std::addressof(TAO_ServantBase"
+                << "::_is_a_skel), nullptr" << be_nl;
           }
 
         ++this->skel_count_;
@@ -1225,18 +1225,18 @@ be_interface::gen_operation_table (const char *flat_name,
           {
             if (amh)
               {
-                *os << "_non_existent,&TAO_AMH_Skeletons"
-                    << "::_non_existent_amh_skel, 0" << be_nl;
+                *os << "_non_existent,std::addressof(TAO_AMH_Skeletons"
+                    << "::_non_existent_amh_skel), nullptr" << be_nl;
               }
             else if (be_global->gen_thru_poa_collocation ())
               {
-                *os << "_non_existent,&TAO_ServantBase"
-                    << "::_non_existent_thru_poa_skel, 0" << be_nl;
+                *os << "_non_existent,std::addressof(TAO_ServantBase"
+                    << "::_non_existent_thru_poa_skel), nullptr" << be_nl;
               }
             else
               {
-                *os << "_non_existent,&TAO_ServantBase"
-                    << "::_non_existent_skel, 0" << be_nl;
+                *os << "_non_existent,std::addressof(TAO_ServantBase"
+                    << "::_non_existent_skel), nullptr" << be_nl;
               }
 
             ++this->skel_count_;
@@ -1246,18 +1246,18 @@ be_interface::gen_operation_table (const char *flat_name,
           {
             if (amh)
               {
-                *os << "_component,&TAO_AMH_Skeletons"
-                    << "::_component_amh_skel, 0" << be_nl;
+                *os << "_component,std::addressof(TAO_AMH_Skeletons"
+                    << "::_component_amh_skel), nullptr" << be_nl;
               }
             else if (be_global->gen_thru_poa_collocation ())
               {
-                *os << "_component,&TAO_ServantBase"
-                    << "::_component_thru_poa_skel, 0" << be_nl;
+                *os << "_component,std::addressof(TAO_ServantBase"
+                    << "::_component_thru_poa_skel), nullptr" << be_nl;
               }
             else
               {
-                *os << "_component,&TAO_ServantBase"
-                    << "::_component_skel, 0" << be_nl;
+                *os << "_component,std::addressof(TAO_ServantBase"
+                    << "::_component_skel), nullptr" << be_nl;
               }
             ++this->skel_count_;
           }
@@ -1266,13 +1266,13 @@ be_interface::gen_operation_table (const char *flat_name,
           {
             if (amh)
               {
-                *os << "_interface,&TAO_AMH_Skeletons"
-                    << "::_interface_amh_skel, 0" << be_nl;
+                *os << "_interface,std::addressof(TAO_AMH_Skeletons"
+                    << "::_interface_amh_skel), nullptr" << be_nl;
               }
             else
               {
-                *os << "_interface,&TAO_ServantBase"
-                    << "::_interface_skel, 0" << be_nl;
+                *os << "_interface,std::addressof(TAO_ServantBase"
+                    << "::_interface_skel), nullptr" << be_nl;
               }
 
             ++this->skel_count_;
@@ -1282,18 +1282,18 @@ be_interface::gen_operation_table (const char *flat_name,
           {
             if (amh)
               {
-                *os << "_repository_id,&TAO_AMH_Skeletons"
-                    << "::_repository_id_amh_skel, 0" << be_nl;
+                *os << "_repository_id,std::addressof(TAO_AMH_Skeletons"
+                    << "::_repository_id_amh_skel), nullptr" << be_nl;
               }
             else if (be_global->gen_thru_poa_collocation ())
               {
-                *os << "_repository_id,&TAO_ServantBase"
-                    << "::_repository_id_thru_poa_skel, 0" << be_nl;
+                *os << "_repository_id,std::addressof(TAO_ServantBase"
+                    << "::_repository_id_thru_poa_skel), nullptr" << be_nl;
               }
             else
               {
-                *os << "_repository_id,&TAO_ServantBase"
-                    << "::_repository_id_skel, 0" << be_nl;
+                *os << "_repository_id,std::addressof(TAO_ServantBase"
+                    << "::_repository_id_skel), nullptr" << be_nl;
               }
 
             ++this->skel_count_;
@@ -1337,7 +1337,7 @@ be_interface::convert_parent_ops (be_visitor *visitor)
   // Traverse the graph.
   Pure_Virtual_Regenerator worker (visitor);
 
-  if (this->traverse_inheritance_graph (worker, 0) == -1)
+  if (this->traverse_inheritance_graph (worker, nullptr) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                           "(%N:%l) be_interface::"
@@ -1387,7 +1387,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
           if (d->node_type () == AST_Decl::NT_op)
             {
               be_operation *op =
-                be_operation::narrow_from_decl (d);
+                dynamic_cast<be_operation*> (d);
 
               if (op->is_sendc_ami ())
                 {
@@ -1395,19 +1395,19 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                 }
 
               // We are an operation node.
-              *os << "{\"" << d->original_local_name () << "\", &"
+              *os << "{\"" << d->original_local_name () << "\", std::addressof("
                   << full_skeleton_name << "::"
-                  << d->local_name () << "_skel,";
+                  << d->local_name () << "_skel),";
 
               if (be_global->gen_direct_collocation ())
                 {
-                  *os << " &"
+                  *os << " std::addressof("
                       << this->full_direct_proxy_impl_name ()
-                      << "::" << d->local_name ();
+                      << "::" << d->local_name () << ")";
                 }
               else
                 {
-                  *os << " 0";
+                  *os << " nullptr";
                 }
 
               *os << "}," << be_nl;
@@ -1417,26 +1417,26 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
           else if (d->node_type () == AST_Decl::NT_attr)
             {
               AST_Attribute *attr =
-                AST_Attribute::narrow_from_decl (d);
+                dynamic_cast<AST_Attribute*> (d);
 
-              if (attr == 0)
+              if (attr == nullptr)
                 return -1;
 
               // Generate only the "get" entry if we are
               // readonly.
               *os << "{\"_get_" << d->original_local_name ()
-                  << "\", &" << full_skeleton_name
-                  << "::_get_" << d->local_name () << "_skel,";
+                  << "\", std::addressof(" << full_skeleton_name
+                  << "::_get_" << d->local_name () << "_skel),";
 
               if (be_global->gen_direct_collocation ())
                 {
-                  *os << " &"
+                  *os << " std::addressof("
                       << this->full_direct_proxy_impl_name ()
-                      << "::_get_" << d->local_name ();
+                      << "::_get_" << d->local_name () << ")";
                 }
               else
                 {
-                  *os << " 0";
+                  *os << " nullptr";
                 }
 
               *os << "}," << be_nl;
@@ -1447,18 +1447,18 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                 {
                   // The set method
                   *os << "{\"_set_" << d->original_local_name ()
-                      << "\", &" << full_skeleton_name
-                      << "::_set_" << d->local_name () << "_skel,";
+                      << "\", std::addressof(" << full_skeleton_name
+                      << "::_set_" << d->local_name () << "_skel),";
 
                   if (be_global->gen_direct_collocation ())
                     {
-                      *os << " &"
+                      *os << " std::addressof("
                           << this->full_direct_proxy_impl_name ()
-                          << "::_set_" << d->local_name ();
+                          << "::_set_" << d->local_name () << ")";
                     }
                   else
                     {
-                      *os << " 0";
+                      *os << " nullptr";
                     }
 
                   *os << "}," << be_nl;
@@ -1488,7 +1488,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
           if (d->node_type () == AST_Decl::NT_op)
             {
               be_operation *op =
-                be_operation::narrow_from_decl (d);
+                dynamic_cast<be_operation*> (d);
 
               if (op->is_sendc_ami ())
                 {
@@ -1513,54 +1513,54 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                     {
                       ACE_CString nspace = name.substring (0, name.rfind (':') - 1);
                       name = name.substring (name.rfind (':') + 1);
-                      *os << d->original_local_name () << ",&POA_"
+                      *os << d->original_local_name () << ",std::addressof(POA_"
                           << nspace.c_str () << "::AMH_"
                           << name.c_str () << "::"
                           << d->original_local_name ()
-                          << "_skel,";
+                          << "_skel),";
                     }
                   else
                     {
-                      *os << d->original_local_name () << ",&POA_AMH_"
+                      *os << d->original_local_name () << ",std::addressof(POA_AMH_"
                           << name.c_str () << "::"
                           << d->original_local_name ()
-                          << "_skel,";
+                          << "_skel),";
                     }
                 }
               else
                 {
                   if (!d->is_abstract ())
                     {
-                      *os << d->original_local_name () << ",&POA_"
-                          << d->full_name () << "_skel,";
+                      *os << d->original_local_name () << ",std::addressof(POA_"
+                          << d->full_name () << "_skel),";
                     }
                   else
                     {
-                      *os << d->original_local_name () << ",&"
+                      *os << d->original_local_name () << ",std::addressof("
                           << full_skeleton_name << "::"
                           << d->original_local_name ()
-                          << "_skel,";
+                          << "_skel),";
                     }
                 }
               if (be_global->gen_direct_collocation ())
                 {
                   if (!d->is_abstract ())
                     {
-                      *os << " &"
+                      *os << " std::addressof("
                           << this->full_direct_proxy_impl_name ()
-                          << "::" << d->local_name ();
+                          << "::" << d->local_name () << ")";
                     }
                   else
                     {
-                      *os << " &"
+                      *os << " std::addressof("
                           << derived_interface->full_direct_proxy_impl_name ()
-                          << "::" << d->local_name ();
+                          << "::" << d->local_name () << ")";
                     }
 
                 }
               else
                 {
-                  *os << " 0";
+                  *os << " nullptr";
                 }
 
               *os << "\n";
@@ -1570,9 +1570,9 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
           else if (d->node_type () == AST_Decl::NT_attr)
             {
               AST_Attribute *attr =
-                AST_Attribute::narrow_from_decl (d);
+                dynamic_cast<AST_Attribute*> (d);
 
-              if (attr == 0)
+              if (attr == nullptr)
                 {
                   return -1;
                 }
@@ -1588,15 +1588,15 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (!d->is_abstract ())
                 {
-                  *os << "_get_" << d->original_local_name () << ",&POA_"
+                  *os << "_get_" << d->original_local_name () << ",std::addressof(POA_"
                       << nspace.c_str () << "_get_"
-                      << d->original_local_name () << "_skel,";
+                      << d->original_local_name () << "_skel),";
 
                   if (be_global->gen_direct_collocation ())
                     {
-                      *os << " &"
+                      *os << " std::addressof("
                           << this->full_direct_proxy_impl_name ()
-                          << "::_get_" << d->local_name ();
+                          << "::_get_" << d->local_name () << ")";
                     }
                   else
                     {
@@ -1605,19 +1605,19 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                 }
               else
                 {
-                  *os << "_get_" << d->original_local_name () << ",&"
+                  *os << "_get_" << d->original_local_name () << ",std::addressof("
                       << full_skeleton_name << "::_get_"
-                      << d->original_local_name () << "_skel,";
+                      << d->original_local_name () << "_skel),";
 
                   if (be_global->gen_direct_collocation ())
                     {
-                      *os << " &"
+                      *os << " std::addressof("
                           << derived_interface->full_direct_proxy_impl_name ()
-                          << "::_get_" << d->local_name ();
+                          << "::_get_" << d->local_name () << ")";
                     }
                   else
                     {
-                      *os << " 0";
+                      *os << " nullptr";
                     }
                 }
 
@@ -1630,37 +1630,37 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                   if (!d->is_abstract ())
                     {
                       // The set method
-                      *os << "_set_" << d->original_local_name () << ",&POA_"
+                      *os << "_set_" << d->original_local_name () << ",std::addressof(POA_"
                           << nspace.c_str () << "_set_"
-                          << d->original_local_name () << "_skel,";
+                          << d->original_local_name () << "_skel),";
 
                       if (be_global->gen_direct_collocation ())
                         {
-                          *os << " &"
+                          *os << " std::addressof("
                               << this->full_direct_proxy_impl_name ()
-                              << "::_set_" << d->local_name ();
+                              << "::_set_" << d->local_name () << ")";
                         }
                       else
                         {
-                          *os << " 0";
+                          *os << " nullptr";
                         }
                     }
                   else
                     {
                       // The set method in case abstract
-                      *os << "_set_" << d->original_local_name () << ",&"
+                      *os << "_set_" << d->original_local_name () << ",std::addressof("
                           << full_skeleton_name << "::_set_"
-                          << d->original_local_name () << "_skel,";
+                          << d->original_local_name () << "_skel),";
 
                       if (be_global->gen_direct_collocation ())
                         {
-                          *os << " &"
+                          *os << " std::addressof("
                               << derived_interface->full_direct_proxy_impl_name ()
-                              << "::_set_" << d->local_name ();
+                              << "::_set_" << d->local_name () << ")";
                         }
                       else
                         {
-                          *os << " 0";
+                          *os << " nullptr";
                         }
                     }
 
@@ -1767,7 +1767,7 @@ be_interface::traverse_inheritance_graph (
   bool abstract_paths_only,
   bool add_ccm_object)
 {
-  AST_Type *intf = 0;  // element inside the queue
+  AST_Type *intf = nullptr;  // element inside the queue
 
   if (!this->insert_queue.is_empty ())
     {
@@ -1786,7 +1786,7 @@ be_interface::traverse_inheritance_graph (
       if (nt == AST_Decl::NT_home)
         {
           this->enqueue_base_home_r (
-            AST_Home::narrow_from_decl (intf));
+            dynamic_cast<AST_Home*> (intf));
         }
 
       // If we are doing a component, we check for a parent.
@@ -1798,7 +1798,7 @@ be_interface::traverse_inheritance_graph (
             }
 
           this->enqueue_base_component_r (
-            AST_Component::narrow_from_decl (intf));
+            dynamic_cast<AST_Component*> (intf));
         }
 
       (void) this->insert_non_dup (intf, abstract_paths_only);
@@ -1831,7 +1831,7 @@ be_interface::traverse_inheritance_graph (
                             -1);
         }
 
-      be_interface *bi = be_interface::narrow_from_decl (intf);
+      be_interface *bi = dynamic_cast<be_interface*> (intf);
 
       // Use the helper method to generate code for ourself using the
       // properties of the element dequeued. For the first iteration, the
@@ -2019,7 +2019,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
     }
 
   // And reset file to 0 because otherwise there is a problem during destruction of stream.
-  tao_cg->gperf_input_stream ()->file () = 0;
+  tao_cg->gperf_input_stream ()->file () = nullptr;
 
   // Open the temp file.
 #if defined (ACE_OPENVMS)
@@ -2309,10 +2309,7 @@ be_interface::is_a_helper (be_interface * /*derived*/,
                            TAO_OutStream *os)
 {
   // Emit the comparison code.
-  *os << "ACE_OS::strcmp (" << be_idt << be_idt_nl
-      << "value," << be_nl
-      << "\"" << bi->repoID () << "\"" << be_uidt_nl
-      << ") == 0 ||" << be_uidt_nl;
+  *os << "std::strcmp (value, \"" << bi->repoID () << "\") == 0 ||" << be_nl;
 
   return 0;
 }
@@ -2340,8 +2337,8 @@ be_interface::copy_ctor_helper (be_interface *derived,
     }
   else if (base->is_nested ())
     {
-      be_decl *scope = 0;
-      scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
+      be_decl *scope = nullptr;
+      scope = dynamic_cast<be_scope*> (base->defined_in ())->decl ();
 
       *os << "POA_" << scope->name () << "::"
           << base->local_name () << " (rhs)";
@@ -2428,7 +2425,7 @@ be_interface::op_attr_decl_helper (be_interface * /*derived */,
                                    be_interface *ancestor,
                                    TAO_OutStream *os)
 {
-  if (be_component::narrow_from_decl (ancestor) != 0)
+  if (dynamic_cast<be_component*> (ancestor) != nullptr)
     {
       return 0;
     }
@@ -2447,7 +2444,7 @@ be_interface::op_attr_decl_helper (be_interface * /*derived */,
 
       if (nt == AST_Decl::NT_op)
         {
-          be_operation *op = be_operation::narrow_from_decl (d);
+          be_operation *op = dynamic_cast<be_operation*> (d);
 
           /// No sendc_* operations in facet servants. If the
           /// original interface had these generated as AMI
@@ -2471,7 +2468,7 @@ be_interface::op_attr_decl_helper (be_interface * /*derived */,
         }
       else if (nt == AST_Decl::NT_attr)
         {
-          be_attribute *attr = be_attribute::narrow_from_decl (d);
+          be_attribute *attr = dynamic_cast<be_attribute*> (d);
           be_visitor_attribute v (&ctx);
 
           if (v.visit_attribute (attr) == -1)
@@ -2490,37 +2487,37 @@ be_interface::op_attr_decl_helper (be_interface * /*derived */,
 }
 
 void
-be_interface::destroy (void)
+be_interface::destroy ()
 {
   delete [] this->full_skel_name_;
-  this->full_skel_name_ = 0;
+  this->full_skel_name_ = nullptr;
 
   delete [] this->full_coll_name_;
-  this->full_coll_name_ = 0;
+  this->full_coll_name_ = nullptr;
 
   delete [] this->local_coll_name_;
-  this->local_coll_name_ = 0;
+  this->local_coll_name_ = nullptr;
 
   delete [] this->relative_skel_name_;
-  this->relative_skel_name_ = 0;
+  this->relative_skel_name_ = nullptr;
 
   delete [] this->direct_proxy_impl_name_;
-  this->direct_proxy_impl_name_ = 0;
+  this->direct_proxy_impl_name_ = nullptr;
 
   delete [] this->full_direct_proxy_impl_name_;
-  this->full_direct_proxy_impl_name_ = 0;
+  this->full_direct_proxy_impl_name_ = nullptr;
 
   delete [] this->client_scope_;
-  this->client_scope_ = 0;
+  this->client_scope_ = nullptr;
 
   delete [] this->flat_client_scope_;
-  this->flat_client_scope_ = 0;
+  this->flat_client_scope_ = nullptr;
 
   delete [] this->server_scope_;
-  this->server_scope_ = 0;
+  this->server_scope_ = nullptr;
 
   delete [] this->flat_server_scope_;
-  this->flat_server_scope_ = 0;
+  this->flat_server_scope_ = nullptr;
 
   // Call the destroy methods of our base classes.
   this->AST_Interface::destroy ();
@@ -2541,13 +2538,13 @@ be_interface::original_interface (be_interface *original_interface)
 }
 
 be_interface *
-be_interface::original_interface (void)
+be_interface::original_interface ()
 {
   return this->original_interface_;
 }
 
 bool
-be_interface::is_event_consumer (void)
+be_interface::is_event_consumer ()
 {
   return
     this->pd_n_inherits == 1
@@ -2586,7 +2583,7 @@ be_interface::enqueue_base_component_r (AST_Component *node)
 {
   AST_Component *base = node->base_component ();
 
-  if (base == 0)
+  if (base == nullptr)
     {
       return;
     }
@@ -2609,7 +2606,7 @@ be_interface::enqueue_base_home_r (AST_Home *node)
 {
   AST_Home *base = node->base_home ();
 
-  if (base == 0)
+  if (base == nullptr)
     {
       return;
     }
@@ -2628,7 +2625,7 @@ be_interface::enqueue_base_home_r (AST_Home *node)
 }
 
 bool
-be_interface::dds_connector_traits_done (void) const
+be_interface::dds_connector_traits_done () const
 {
   return this->dds_connector_traits_done_;
 }
@@ -2706,7 +2703,7 @@ void
 be_interface::gen_skel_inheritance (TAO_OutStream *os)
 {
   long n_parents = this->n_inherits ();
-  AST_Type *parent = 0;
+  AST_Type *parent = nullptr;
   AST_Type **parents = this->inherits ();
   bool has_concrete_parent = false;
 
@@ -2756,34 +2753,25 @@ be_interface::gen_is_a_ancestors (TAO_OutStream *os)
 
   if (this->is_abstract () || this->has_mixed_parentage ())
     {
-      *os << "ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "value," << be_nl
-          << "\"IDL:omg.org/CORBA/AbstractBase:1.0\"" << be_uidt_nl
-          << ") == 0";
+      *os << "std::strcmp (value, \"IDL:omg.org/CORBA/AbstractBase:1.0\") == 0";
     }
   else if (this->is_local ())
     {
-      *os << "ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "value," << be_nl
-          << "\"IDL:omg.org/CORBA/LocalObject:1.0\"" << be_uidt_nl
-          << ") == 0";
+      *os << "std::strcmp (value, \"IDL:omg.org/CORBA/LocalObject:1.0\") == 0";
     }
 
   if (this->has_mixed_parentage () || this->is_local ())
     {
-      *os << " ||" << be_uidt_nl;
+      *os << " ||" << be_nl;
     }
   else if (this->is_abstract ())
     {
-      *os << be_uidt << be_uidt_nl;
+      *os << be_nl;
     }
 
   if (! this->is_abstract ())
     {
-      *os << "ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "value," << be_nl
-          << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl
-          << ") == 0" << be_uidt << be_uidt_nl;
+      *os << "std::strcmp (value, \"IDL:omg.org/CORBA/Object:1.0\") == 0" << be_nl;
     }
 
   return 0;
@@ -2879,7 +2867,7 @@ be_interface::gen_ami4ccm_idl (TAO_OutStream *os)
 }
 
 bool
-be_interface::is_ami_rh (void) const
+be_interface::is_ami_rh () const
 {
   return this->is_ami_rh_;
 }
@@ -2891,7 +2879,7 @@ be_interface::is_ami_rh (bool val)
 }
 
 bool
-be_interface::is_ami4ccm_rh (void) const
+be_interface::is_ami4ccm_rh () const
 {
   return this->is_ami4ccm_rh_;
 }
@@ -2903,9 +2891,9 @@ be_interface::is_ami4ccm_rh (bool val)
 }
 
 const char *
-be_interface::direct_proxy_impl_name (void)
+be_interface::direct_proxy_impl_name ()
 {
-  if (this->direct_proxy_impl_name_ == 0)
+  if (this->direct_proxy_impl_name_ == nullptr)
     {
       this->direct_proxy_impl_name_ =
         this->create_with_prefix_suffix (
@@ -2919,9 +2907,9 @@ be_interface::direct_proxy_impl_name (void)
 }
 
 const char *
-be_interface::full_direct_proxy_impl_name (void)
+be_interface::full_direct_proxy_impl_name ()
 {
-  if (this->full_direct_proxy_impl_name_ == 0)
+  if (this->full_direct_proxy_impl_name_ == nullptr)
     {
       const char *scope = this->server_enclosing_scope ();
       const char *base_name = this->direct_proxy_impl_name ();
@@ -2931,7 +2919,7 @@ be_interface::full_direct_proxy_impl_name (void)
 
       ACE_NEW_RETURN (this->full_direct_proxy_impl_name_,
                       char[length + 1],
-                      0);
+                      nullptr);
 
       ACE_OS::strcpy (this->full_direct_proxy_impl_name_,
                       scope);
@@ -2944,9 +2932,9 @@ be_interface::full_direct_proxy_impl_name (void)
 
 
 const char *
-be_interface::client_enclosing_scope (void)
+be_interface::client_enclosing_scope ()
 {
-  if (this->client_scope_ == 0)
+  if (this->client_scope_ == nullptr)
     {
       const char *full_name = this->full_name ();
       const char *name = this->local_name ();
@@ -2955,7 +2943,7 @@ be_interface::client_enclosing_scope (void)
       size_t length = ACE_OS::strlen (full_name) - offset;
       ACE_NEW_RETURN (this->client_scope_,
                       char[length + 1],
-                      0);
+                      nullptr);
 
       ACE_OS::strncpy (this->client_scope_, full_name, length);
       this->client_scope_[length] = '\0';
@@ -2965,9 +2953,9 @@ be_interface::client_enclosing_scope (void)
 }
 
 const char *
-be_interface::flat_client_enclosing_scope (void)
+be_interface::flat_client_enclosing_scope ()
 {
-  if (this->flat_client_scope_ == 0)
+  if (this->flat_client_scope_ == nullptr)
     {
       const char *full_name = this->flat_name ();
       const char *name =
@@ -2978,7 +2966,7 @@ be_interface::flat_client_enclosing_scope (void)
 
       ACE_NEW_RETURN (this->flat_client_scope_,
                       char[length + 1],
-                      0);
+                      nullptr);
 
       ACE_OS::strncpy (this->flat_client_scope_,
                        full_name,
@@ -2990,9 +2978,9 @@ be_interface::flat_client_enclosing_scope (void)
 }
 
 const char *
-be_interface::server_enclosing_scope (void)
+be_interface::server_enclosing_scope ()
 {
-  if (this->server_scope_ == 0)
+  if (this->server_scope_ == nullptr)
     {
       const char *full_name =
         this->full_coll_name (be_interface::DIRECT);
@@ -3004,7 +2992,7 @@ be_interface::server_enclosing_scope (void)
       size_t length = ACE_OS::strlen (full_name) - offset;
       ACE_NEW_RETURN (this->server_scope_,
                       char[length + 1],
-                      0);
+                      nullptr);
 
       ACE_OS::strncpy (this->server_scope_, full_name, length);
       this->server_scope_[length] = '\0';
@@ -3019,7 +3007,7 @@ be_interface::create_with_prefix_suffix (const char *prefix,
                                          const char *suffix,
                                          const char *separator)
 {
-  char *cat_string = 0;
+  char *cat_string = nullptr;
   size_t length =
     ACE_OS::strlen (str) +
     ACE_OS::strlen (prefix) +
@@ -3029,7 +3017,7 @@ be_interface::create_with_prefix_suffix (const char *prefix,
 
   ACE_NEW_RETURN (cat_string,
                   char[length],
-                  0);
+                  nullptr);
 
   ACE_OS::strcpy (cat_string, prefix);
   ACE_OS::strcat (cat_string, str);
@@ -3038,6 +3026,3 @@ be_interface::create_with_prefix_suffix (const char *prefix,
 
   return cat_string;
 }
-
-IMPL_NARROW_FROM_DECL (be_interface)
-IMPL_NARROW_FROM_SCOPE (be_interface)
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
index 79415551ea4..e1134961c1e 100644
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp
@@ -35,7 +35,7 @@ be_interface_fwd::be_interface_fwd (AST_Interface *dummy,
   this->size_type (AST_Type::VARIABLE);
 }
 
-be_interface_fwd::~be_interface_fwd (void)
+be_interface_fwd::~be_interface_fwd ()
 {
 }
 
@@ -44,7 +44,7 @@ be_interface_fwd::seen_in_sequence (bool val)
 {
   this->be_type::seen_in_sequence (val);
   be_interface *fd =
-    be_interface::narrow_from_decl (this->full_definition ());
+    dynamic_cast<be_interface*> (this->full_definition ());
   fd->seen_in_sequence (val);
 }
 
@@ -53,12 +53,12 @@ be_interface_fwd::seen_in_operation (bool val)
 {
   this->be_type::seen_in_operation (val);
   be_interface *fd =
-    be_interface::narrow_from_decl (this->full_definition ());
+    dynamic_cast<be_interface*> (this->full_definition ());
   fd->seen_in_operation (val);
 }
 
 void
-be_interface_fwd::destroy (void)
+be_interface_fwd::destroy ()
 {
   this->be_type::destroy ();
   this->AST_InterfaceFwd::destroy ();
@@ -69,7 +69,3 @@ be_interface_fwd::accept (be_visitor *visitor)
 {
   return visitor->visit_interface_fwd (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_interface_fwd)
diff --git a/TAO/TAO_IDL/be/be_mirror_port.cpp b/TAO/TAO_IDL/be/be_mirror_port.cpp
index 8ee81e31128..48c2f84d19d 100644
--- a/TAO/TAO_IDL/be/be_mirror_port.cpp
+++ b/TAO/TAO_IDL/be/be_mirror_port.cpp
@@ -26,12 +26,12 @@ be_mirror_port::be_mirror_port (
 {
 }
 
-be_mirror_port::~be_mirror_port (void)
+be_mirror_port::~be_mirror_port ()
 {
 }
 
 void
-be_mirror_port::destroy (void)
+be_mirror_port::destroy ()
 {
   this->AST_Mirror_Port::destroy ();
   this->be_extended_port::destroy ();
@@ -43,6 +43,3 @@ be_mirror_port::accept (be_visitor *visitor)
 {
   return visitor->visit_mirror_port (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_mirror_port)
-
diff --git a/TAO/TAO_IDL/be/be_module.cpp b/TAO/TAO_IDL/be/be_module.cpp
index 00c679e588d..71d6a3b04db 100644
--- a/TAO/TAO_IDL/be/be_module.cpp
+++ b/TAO/TAO_IDL/be/be_module.cpp
@@ -24,7 +24,7 @@ be_module::be_module (UTL_ScopedName *n, AST_Module *previous)
 }
 
 void
-be_module::destroy (void)
+be_module::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
@@ -37,6 +37,3 @@ be_module::accept (be_visitor *visitor)
 {
   return visitor->visit_module (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_module)
-IMPL_NARROW_FROM_SCOPE (be_module)
diff --git a/TAO/TAO_IDL/be/be_native.cpp b/TAO/TAO_IDL/be/be_native.cpp
index 6725f29d60d..8bc0e1eb352 100644
--- a/TAO/TAO_IDL/be/be_native.cpp
+++ b/TAO/TAO_IDL/be/be_native.cpp
@@ -43,19 +43,19 @@ be_native::be_native (UTL_ScopedName *n)
 }
 
 int
-be_native::gen_typecode (void)
+be_native::gen_typecode ()
 {
   return 0;
 }
 
 long
-be_native::tc_size (void)
+be_native::tc_size ()
 {
   return 0;
 }
 
 void
-be_native::destroy (void)
+be_native::destroy ()
 {
   this->be_exception::destroy ();
   this->AST_Native::destroy ();
@@ -66,7 +66,3 @@ be_native::accept (be_visitor *visitor)
 {
   return visitor->visit_native (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL(be_native)
diff --git a/TAO/TAO_IDL/be/be_null_return_emitter.cpp b/TAO/TAO_IDL/be/be_null_return_emitter.cpp
index 350bb316b90..f8a3fa23c9a 100644
--- a/TAO/TAO_IDL/be/be_null_return_emitter.cpp
+++ b/TAO/TAO_IDL/be/be_null_return_emitter.cpp
@@ -26,7 +26,7 @@ be_null_return_emitter::be_null_return_emitter (
 {
 }
 
-be_null_return_emitter::~be_null_return_emitter (void)
+be_null_return_emitter::~be_null_return_emitter ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp
index 5422f80cd0a..012bc7bdd08 100644
--- a/TAO/TAO_IDL/be/be_operation.cpp
+++ b/TAO/TAO_IDL/be/be_operation.cpp
@@ -55,19 +55,19 @@ be_operation::be_operation (AST_Type *rt,
 
   if (!this->is_local ())
     {
-      be_type *bt = be_type::narrow_from_decl (rt);
+      be_type *bt = dynamic_cast<be_type*> (rt);
       bt->seen_in_operation (true);
       be_util::set_arg_seen_bit (bt);
       idl_global->non_local_op_seen_ = true;
     }
 }
 
-be_operation::~be_operation (void)
+be_operation::~be_operation ()
 {
 }
 
 void
-be_operation::destroy (void)
+be_operation::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
@@ -86,15 +86,15 @@ be_operation::be_add_argument (AST_Argument *arg)
 {
   this->add_to_scope (arg);
   this->add_to_referenced (arg,
-                           0,
-                           0);
+                           false,
+                           nullptr);
   return arg;
 }
 
 int
 be_operation::be_insert_exception (AST_Exception *ex)
 {
-  UTL_ExceptList *new_list = 0;
+  UTL_ExceptList *new_list = nullptr;
   ACE_NEW_RETURN (new_list,
                   UTL_ExceptList (ex,
                                   this->pd_exceptions),
@@ -104,7 +104,7 @@ be_operation::be_insert_exception (AST_Exception *ex)
 }
 
 bool
-be_operation::is_sendc_ami (void) const
+be_operation::is_sendc_ami () const
 {
   return this->is_sendc_ami_;
 }
@@ -116,7 +116,7 @@ be_operation::is_sendc_ami (bool val)
 }
 
 bool
-be_operation::is_excep_ami (void) const
+be_operation::is_excep_ami () const
 {
   return this->is_excep_ami_;
 }
@@ -128,7 +128,7 @@ be_operation::is_excep_ami (bool val)
 }
 
 bool
-be_operation::is_attr_op (void) const
+be_operation::is_attr_op () const
 {
   return this->is_attr_op_;
 }
@@ -138,6 +138,3 @@ be_operation::is_attr_op (bool val)
 {
   this->is_attr_op_ = val;
 }
-
-IMPL_NARROW_FROM_DECL (be_operation)
-IMPL_NARROW_FROM_SCOPE (be_operation)
diff --git a/TAO/TAO_IDL/be/be_param_holder.cpp b/TAO/TAO_IDL/be/be_param_holder.cpp
index d9c6aeed908..0388f2aa116 100644
--- a/TAO/TAO_IDL/be/be_param_holder.cpp
+++ b/TAO/TAO_IDL/be/be_param_holder.cpp
@@ -31,7 +31,7 @@ be_param_holder::be_param_holder (UTL_ScopedName *parameter_name,
 {
 }
 
-be_param_holder::~be_param_holder (void)
+be_param_holder::~be_param_holder ()
 {
 }
 
@@ -42,11 +42,8 @@ be_param_holder::accept (be_visitor *visitor)
 }
 
 void
-be_param_holder::destroy (void)
+be_param_holder::destroy ()
 {
   this->AST_Param_Holder::destroy ();
   this->be_type::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_param_holder)
-
diff --git a/TAO/TAO_IDL/be/be_porttype.cpp b/TAO/TAO_IDL/be/be_porttype.cpp
index 9cd5e14a99f..58d776165c6 100644
--- a/TAO/TAO_IDL/be/be_porttype.cpp
+++ b/TAO/TAO_IDL/be/be_porttype.cpp
@@ -18,12 +18,12 @@ be_porttype::be_porttype (UTL_ScopedName *n)
 {
 }
 
-be_porttype::~be_porttype (void)
+be_porttype::~be_porttype ()
 {
 }
 
 void
-be_porttype::destroy (void)
+be_porttype::destroy ()
 {
   this->AST_PortType::destroy ();
 }
@@ -33,6 +33,3 @@ be_porttype::accept (be_visitor *visitor)
 {
   return visitor->visit_porttype (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_porttype)
-IMPL_NARROW_FROM_SCOPE (be_porttype)
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index fedc10172dd..7aa8a813c9b 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -123,19 +123,19 @@ be_predefined_type::gen_member_ostream_operator (TAO_OutStream *os,
 
 // Overriden method.
 void
-be_predefined_type::compute_tc_name (void)
+be_predefined_type::compute_tc_name ()
 {
   // Start with the head as the CORBA namespace.
-  Identifier *corba_id = 0;
+  Identifier *corba_id = nullptr;
   ACE_NEW (corba_id,
            Identifier ("CORBA"));
 
   ACE_NEW (this->tc_name_,
            UTL_ScopedName (corba_id,
-                           0));
+                           nullptr));
 
-  Identifier *id = 0;
-  UTL_ScopedName *conc_name = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *conc_name = nullptr;
 
   switch (this->pt ())
     {
@@ -229,13 +229,13 @@ be_predefined_type::compute_tc_name (void)
 
   ACE_NEW (conc_name,
            UTL_ScopedName (id,
-                           0));
+                           nullptr));
 
   this->tc_name_->nconc (conc_name);
 }
 
 void
-be_predefined_type::compute_repoID (void)
+be_predefined_type::compute_repoID ()
 {
   switch (this->pt ())
     {
@@ -256,12 +256,8 @@ be_predefined_type::accept (be_visitor *visitor)
 }
 
 void
-be_predefined_type::destroy (void)
+be_predefined_type::destroy ()
 {
   this->AST_PredefinedType::destroy ();
   this->be_type::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_predefined_type)
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 1db60dd8097..052b3145f4e 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -76,14 +76,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Clean up before exit, whether successful or not.
 TAO_IDL_BE_Export void
-BE_cleanup (void)
+BE_cleanup ()
 {
   idl_global->destroy ();
 }
 
 // Abort this run of the BE.
 TAO_IDL_BE_Export void
-BE_abort (void)
+BE_abort ()
 {
   ACE_ERROR ((LM_ERROR,
               "Fatal Error - Aborting\n"));
@@ -97,7 +97,7 @@ BE_visit_root (be_visitor_decl &root_visitor,
                const char *which_pass)
 {
   static be_root *root =
-    be_root::narrow_from_decl (idl_global->root ());
+    dynamic_cast<be_root*> (idl_global->root ());
 
   if (-1 == root->accept (&root_visitor))
     {
@@ -112,7 +112,7 @@ BE_visit_root (be_visitor_decl &root_visitor,
 
 // Do the work of this BE. This is the starting point for code generation.
 TAO_IDL_BE_Export void
-BE_produce (void)
+BE_produce ()
 {
   be_visitor_context ctx;
 
diff --git a/TAO/TAO_IDL/be/be_provides.cpp b/TAO/TAO_IDL/be/be_provides.cpp
index 5d6fcbcf775..8d89b138c4f 100644
--- a/TAO/TAO_IDL/be/be_provides.cpp
+++ b/TAO/TAO_IDL/be/be_provides.cpp
@@ -32,20 +32,18 @@ be_provides::be_provides (UTL_ScopedName *n,
 {
 }
 
-be_provides::~be_provides (void)
+be_provides::~be_provides ()
 {
 }
 
 be_type *
-be_provides::provides_type (void) const
+be_provides::provides_type () const
 {
   return
-    be_type::narrow_from_decl (
+    dynamic_cast<be_type*> (
       this->AST_Provides::provides_type ());
 }
 
-IMPL_NARROW_FROM_DECL (be_provides)
-
 int
 be_provides::accept (be_visitor *visitor)
 {
@@ -53,7 +51,7 @@ be_provides::accept (be_visitor *visitor)
 }
 
 void
-be_provides::destroy (void)
+be_provides::destroy ()
 {
   this->AST_Provides::destroy ();
   this->be_field::destroy ();
diff --git a/TAO/TAO_IDL/be/be_publishes.cpp b/TAO/TAO_IDL/be/be_publishes.cpp
index 7920c556635..ff23536a39b 100644
--- a/TAO/TAO_IDL/be/be_publishes.cpp
+++ b/TAO/TAO_IDL/be/be_publishes.cpp
@@ -20,15 +20,15 @@ be_publishes::be_publishes (UTL_ScopedName *n,
 {
 }
 
-be_publishes::~be_publishes (void)
+be_publishes::~be_publishes ()
 {
 }
 
 be_eventtype *
-be_publishes::publishes_type (void) const
+be_publishes::publishes_type () const
 {
   return
-    be_eventtype::narrow_from_decl (
+    dynamic_cast<be_eventtype*> (
       this->AST_Publishes::publishes_type ());
 }
 
@@ -39,10 +39,8 @@ be_publishes::accept (be_visitor *visitor)
 }
 
 void
-be_publishes::destroy (void)
+be_publishes::destroy ()
 {
   this->AST_Publishes::destroy ();
   this->be_field::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_publishes)
diff --git a/TAO/TAO_IDL/be/be_root.cpp b/TAO/TAO_IDL/be/be_root.cpp
index 8c4340f7e1a..430ac4d1f37 100644
--- a/TAO/TAO_IDL/be/be_root.cpp
+++ b/TAO/TAO_IDL/be/be_root.cpp
@@ -31,12 +31,12 @@ be_root::be_root (UTL_ScopedName *n)
 {
 }
 
-be_root::~be_root (void)
+be_root::~be_root ()
 {
 }
 
 void
-be_root::destroy (void)
+be_root::destroy ()
 {
   // Call the destroy methods of our base classes.
 
@@ -54,8 +54,3 @@ be_root::accept (be_visitor *visitor)
 {
   return visitor->visit_root (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_root)
-IMPL_NARROW_FROM_SCOPE (be_root)
diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp
index 90439922ea7..cdbf44f9635 100644
--- a/TAO/TAO_IDL/be/be_scope.cpp
+++ b/TAO/TAO_IDL/be/be_scope.cpp
@@ -15,7 +15,7 @@
 #include "be_visitor.h"
 
 // Default Constructor.
-be_scope::be_scope (void)
+be_scope::be_scope ()
   : UTL_Scope (),
     comma_ (0)
 {
@@ -28,7 +28,7 @@ be_scope::be_scope (AST_Decl::NodeType type)
 {
 }
 
-be_scope::~be_scope (void)
+be_scope::~be_scope ()
 {
 }
 
@@ -43,7 +43,7 @@ be_scope::be_add_field (AST_Field *f)
 AST_Argument *
 be_scope::be_add_argument (AST_Argument *)
 {
-  return 0;
+  return nullptr;
 }
 
 void
@@ -53,54 +53,54 @@ be_scope::comma (unsigned short comma)
 }
 
 int
-be_scope::comma (void) const
+be_scope::comma () const
 {
   return this->comma_;
 }
 
 // Return the scope created by this node (if one exists, else NULL).
 be_decl *
-be_scope::decl (void)
+be_scope::decl ()
 {
   switch (this->scope_node_type ())
     {
     case AST_Decl::NT_interface:
-      return be_interface::narrow_from_scope (this);
+      return dynamic_cast<be_interface*> (this);
     case AST_Decl::NT_valuetype:
-      return be_valuetype::narrow_from_scope (this);
+      return dynamic_cast<be_valuetype*> (this);
     case AST_Decl::NT_eventtype:
-      return be_eventtype::narrow_from_scope (this);
+      return dynamic_cast<be_eventtype*> (this);
     case AST_Decl::NT_component:
-      return be_component::narrow_from_scope (this);
+      return dynamic_cast<be_component*> (this);
     case AST_Decl::NT_connector:
-      return be_connector::narrow_from_scope (this);
+      return dynamic_cast<be_connector*> (this);
     case AST_Decl::NT_home:
-      return be_home::narrow_from_scope (this);
+      return dynamic_cast<be_home*> (this);
     case AST_Decl::NT_module:
-      return be_module::narrow_from_scope (this);
+      return dynamic_cast<be_module*> (this);
     case AST_Decl::NT_root:
-      return be_root::narrow_from_scope (this);
+      return dynamic_cast<be_root*> (this);
     case AST_Decl::NT_except:
-      return be_exception::narrow_from_scope (this);
+      return dynamic_cast<be_exception*> (this);
     case AST_Decl::NT_union:
-      return be_union::narrow_from_scope (this);
+      return dynamic_cast<be_union*> (this);
     case AST_Decl::NT_struct:
-      return be_structure::narrow_from_scope (this);
+      return dynamic_cast<be_structure*> (this);
     case AST_Decl::NT_enum:
-      return be_enum::narrow_from_scope (this);
+      return dynamic_cast<be_enum*> (this);
     case AST_Decl::NT_op:
-      return be_operation::narrow_from_scope (this);
+      return dynamic_cast<be_operation*> (this);
     case AST_Decl::NT_factory:
-      return be_factory::narrow_from_scope (this);
+      return dynamic_cast<be_factory*> (this);
     case AST_Decl::NT_finder:
-      return be_finder::narrow_from_scope (this);
+      return dynamic_cast<be_finder*> (this);
     default:
-      return (be_decl *)0;
+      return (be_decl *)nullptr;
     }
 }
 
 void
-be_scope::destroy (void)
+be_scope::destroy ()
 {
 }
 
@@ -109,5 +109,3 @@ be_scope::accept (be_visitor *visitor)
 {
   return visitor->visit_scope (this);
 }
-
-IMPL_NARROW_FROM_SCOPE (be_scope)
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 76a067fcad0..e59a718ad6d 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -55,7 +55,7 @@ be_sequence::be_sequence (AST_Expression *v,
     be_type (AST_Decl::NT_sequence,
              n),
     mt_ (be_sequence::MNG_UNKNOWN),
-    field_node_ (0)
+    field_node_ (nullptr)
 {
   // Always the case.
   this->has_constructor (true);
@@ -96,12 +96,12 @@ be_sequence::be_sequence (AST_Expression *v,
     }
 
   AST_Decl::NodeType nt = t->node_type ();
-  AST_Typedef *td = 0;
-  AST_Type *pbt = 0;
+  AST_Typedef *td = nullptr;
+  AST_Type *pbt = nullptr;
 
   if (nt == AST_Decl::NT_typedef)
     {
-      td = AST_Typedef::narrow_from_decl (t);
+      td = dynamic_cast<AST_Typedef*> (t);
       pbt = td->primitive_base_type ();
       nt = pbt->node_type ();
     }
@@ -109,7 +109,7 @@ be_sequence::be_sequence (AST_Expression *v,
   if (nt == AST_Decl::NT_pre_defined)
     {
       AST_PredefinedType *pdt =
-        AST_PredefinedType::narrow_from_decl (pbt ? pbt : t);
+        dynamic_cast<AST_PredefinedType*> (pbt ? pbt : t);
 
       switch (pdt->pt ())
         {
@@ -123,19 +123,19 @@ be_sequence::be_sequence (AST_Expression *v,
 }
 
 be_type *
-be_sequence::base_type (void) const
+be_sequence::base_type () const
 {
   return
-    be_type::narrow_from_decl (
+    dynamic_cast<be_type*> (
       this->AST_Sequence::base_type ());
 }
 
 // Helper to create_name.
 char *
-be_sequence::gen_name (void)
+be_sequence::gen_name ()
 {
   char namebuf [NAMEBUFSIZE];
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Reset the buffer.
   ACE_OS::memset (namebuf,
@@ -143,9 +143,9 @@ be_sequence::gen_name (void)
                   NAMEBUFSIZE);
 
   // Retrieve the base type.
-  bt = be_type::narrow_from_decl (this->base_type ());
+  bt = dynamic_cast<be_type*> (this->base_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_sequence::"
@@ -161,9 +161,9 @@ be_sequence::gen_name (void)
   if (bt->node_type () == AST_Decl::NT_sequence)
     {
       // Our base type is an anonymous sequence.
-      be_sequence *seq = be_sequence::narrow_from_decl (bt);
+      be_sequence *seq = dynamic_cast<be_sequence*> (bt);
 
-      if (seq == 0)
+      if (seq == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_sequence::"
@@ -215,11 +215,11 @@ be_sequence::gen_name (void)
 int
 be_sequence::create_name (be_typedef *node)
 {
-  static char *namebuf = 0;
-  UTL_ScopedName *n = 0;
+  static char *namebuf = nullptr;
+  UTL_ScopedName *n = nullptr;
 
   // Scope in which we are defined.
-  be_decl *scope = 0;
+  be_decl *scope = nullptr;
 
   // If there is a typedef node, we use its name as our name.
   if (node)
@@ -236,22 +236,22 @@ be_sequence::create_name (be_typedef *node)
       // Now see if we have a fully scoped name and if so, generate one.
       UTL_Scope *us = this->defined_in ();
 
-      scope = be_scope::narrow_from_scope (us)->decl ();
+      scope = dynamic_cast<be_scope*> (us)->decl ();
 
-      if (scope != 0)
+      if (scope != nullptr)
         {
           // Make a copy of the enclosing scope's name.
           n = (UTL_ScopedName *) scope->name ()->copy ();
 
-          Identifier *id = 0;
+          Identifier *id = nullptr;
           ACE_NEW_RETURN (id,
                           Identifier (namebuf),
                           -1);
 
-          UTL_ScopedName *conc_name = 0;
+          UTL_ScopedName *conc_name = nullptr;
           ACE_NEW_RETURN (conc_name,
                           UTL_ScopedName (id,
-                                          0),
+                                          nullptr),
                           -1);
 
           // Add our local name as the last component.
@@ -275,27 +275,27 @@ be_sequence::create_name (be_typedef *node)
 
 // Does this sequence have a managed type sequence element?
 be_sequence::MANAGED_TYPE
-be_sequence::managed_type (void)
+be_sequence::managed_type ()
 {
   if (this->mt_ == be_sequence::MNG_UNKNOWN) // Not calculated yet.
     {
       // Base types.
-      be_type *bt = 0;
-      be_type *prim_type = 0;
+      be_type *bt = nullptr;
+      be_type *prim_type = nullptr;
 
-      bt = be_type::narrow_from_decl (this->base_type ());
+      bt = dynamic_cast<be_type*> (this->base_type ());
 
       if (!bt)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "TAO_IDL (%N:%l) "
-                           "be_type::narrow_from_decl "
+                           "dynamic_cast<be_type*> "
                            "failed\n"),
                           be_sequence::MNG_UNKNOWN);
 
       if (bt->node_type () == AST_Decl::NT_typedef)
         {
           // Get the primitive base type of this typedef node.
-          be_typedef *t = be_typedef::narrow_from_decl (bt);
+          be_typedef *t = dynamic_cast<be_typedef*> (bt);
           prim_type = t->primitive_base_type ();
         }
       else
@@ -329,7 +329,7 @@ be_sequence::managed_type (void)
           case AST_Decl::NT_pre_defined:
             {
               be_predefined_type * const bpd =
-                be_predefined_type::narrow_from_decl (prim_type);
+                dynamic_cast<be_predefined_type*> (prim_type);
 
               AST_PredefinedType::PredefinedType pt = bpd->pt ();
 
@@ -361,9 +361,9 @@ be_sequence::managed_type (void)
 AST_Sequence *
 be_sequence::fe_add_sequence (AST_Sequence *t)
 {
-  if (t == 0)
+  if (t == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   this->add_to_local_types (t);
@@ -372,7 +372,7 @@ be_sequence::fe_add_sequence (AST_Sequence *t)
 
 // Overridden method
 be_decl *
-be_sequence::decl (void)
+be_sequence::decl ()
 {
   return this;
 }
@@ -426,10 +426,10 @@ be_sequence::instance_name ()
                   '\0',
                   NAMEBUFSIZE);
 
-  be_type *bt = 0;
-  bt = be_type::narrow_from_decl (this->base_type ());
+  be_type *bt = nullptr;
+  bt = dynamic_cast<be_type*> (this->base_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%N:%l) be_visitor_sequence_ch::"
@@ -447,7 +447,7 @@ be_sequence::instance_name ()
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
       // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
+      be_typedef *t = dynamic_cast<be_typedef*> (bt);
       prim_type = t->primitive_base_type ();
     }
 
@@ -523,9 +523,9 @@ be_sequence::instance_name ()
           // TAO provides extensions for octet sequences, first find out
           // if the base type is an octet (or an alias for octet)
           be_predefined_type *predef =
-            be_predefined_type::narrow_from_decl (prim_type);
+            dynamic_cast<be_predefined_type*> (prim_type);
 
-          if (predef != 0
+          if (predef != nullptr
               && predef->pt() == AST_PredefinedType::PT_octet)
             {
               ACE_OS::sprintf (namebuf,
@@ -558,7 +558,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
                                   const char * linebreak,
                                   AST_Decl *ctx_scope)
 {
-  be_type *elem = be_type::narrow_from_decl (this->base_type ());
+  be_type *elem = dynamic_cast<be_type*> (this->base_type ());
   /*
   if (be_global->alt_mapping () && this->unbounded ())
     {
@@ -621,11 +621,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
       break;
     case be_sequence::MNG_STRING:
       {
-        be_type *prim_type = 0;
+        be_type *prim_type = nullptr;
         if (elem->node_type () == AST_Decl::NT_typedef)
           {
             // Get the primitive base type of this typedef node.
-            be_typedef *t = be_typedef::narrow_from_decl (elem);
+            be_typedef *t = dynamic_cast<be_typedef*> (elem);
             prim_type = t->primitive_base_type ();
           }
         else
@@ -636,7 +636,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
         if (prim_type->node_type () == AST_Decl::NT_string)
           {
             be_string *str =
-              be_string::narrow_from_decl (prim_type);
+              dynamic_cast<be_string*> (prim_type);
             if (!str)
               {
                 ACE_ERROR_RETURN ((LM_ERROR,
@@ -680,11 +680,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
       break;
     case be_sequence::MNG_WSTRING:
       {
-        be_type *prim_type = 0;
+        be_type *prim_type = nullptr;
         if (elem->node_type () == AST_Decl::NT_typedef)
           {
             // Get the primitive base type of this typedef node.
-            be_typedef *t = be_typedef::narrow_from_decl (elem);
+            be_typedef *t = dynamic_cast<be_typedef*> (elem);
             prim_type = t->primitive_base_type ();
           }
         else
@@ -695,7 +695,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
         if (prim_type->node_type () == AST_Decl::NT_wstring)
           {
             be_string *str =
-              be_string::narrow_from_decl (prim_type);
+              dynamic_cast<be_string*> (prim_type);
             if (!str)
               {
                 ACE_ERROR_RETURN ((LM_ERROR,
@@ -794,7 +794,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
 }
 
 be_field *
-be_sequence::field_node (void) const
+be_sequence::field_node () const
 {
   return this->field_node_;
 }
@@ -807,19 +807,19 @@ be_sequence::field_node (be_field *node)
 
 // Overriden method.
 void
-be_sequence::compute_tc_name (void)
+be_sequence::compute_tc_name ()
 {
   // Sequence TypeCodes can only be accessed through an alias
   // TypeCode.  Generate a TypeCode name that is meant for internal
   // use alone.
 
-  Identifier * tao_id = 0;
+  Identifier * tao_id = nullptr;
   ACE_NEW (tao_id,
            Identifier ("TAO"));
 
   ACE_NEW (this->tc_name_,
            UTL_ScopedName (tao_id,
-                           0));
+                           nullptr));
 
   char bound[30] = { 0 };
 
@@ -832,25 +832,25 @@ be_sequence::compute_tc_name (void)
     + ACE_CString (this->flat_name ())
     + ACE_CString (bound);
 
-  Identifier * typecode_scope = 0;
+  Identifier * typecode_scope = nullptr;
   ACE_NEW (typecode_scope,
            Identifier ("TypeCode"));
 
-  UTL_ScopedName * tc_scope_conc_name = 0;
+  UTL_ScopedName * tc_scope_conc_name = nullptr;
   ACE_NEW (tc_scope_conc_name,
            UTL_ScopedName (typecode_scope,
-                           0));
+                           nullptr));
 
   this->tc_name_->nconc (tc_scope_conc_name);
 
-  Identifier * id = 0;
+  Identifier * id = nullptr;
   ACE_NEW (id,
            Identifier (local_tc_name.c_str ()));
 
-  UTL_ScopedName * conc_name = 0;
+  UTL_ScopedName * conc_name = nullptr;
   ACE_NEW (conc_name,
            UTL_ScopedName (id,
-                           0));
+                           nullptr));
 
   this->tc_name_->nconc (conc_name);
 }
@@ -870,14 +870,10 @@ be_sequence::smart_fwd_helper_name (AST_Decl *ctx_scope,
 }
 
 void
-be_sequence::destroy (void)
+be_sequence::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
   this->be_type::destroy ();
   this->AST_Sequence::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_sequence)
diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp
index 4219440c874..fa08fc47ec9 100644
--- a/TAO/TAO_IDL/be/be_string.cpp
+++ b/TAO/TAO_IDL/be/be_string.cpp
@@ -95,9 +95,9 @@ be_string::gen_member_ostream_operator (TAO_OutStream *os,
 
 // Overriden method.
 void
-be_string::compute_tc_name (void)
+be_string::compute_tc_name ()
 {
-  Identifier * id = 0;
+  Identifier * id = nullptr;
   ACE_CDR::ULong val = 0UL;
   AST_Expression zero (val);
 
@@ -107,13 +107,13 @@ be_string::compute_tc_name (void)
       // constants.
 
       // Start with the head as the CORBA namespace.
-      Identifier * corba_id = 0;
+      Identifier * corba_id = nullptr;
       ACE_NEW (corba_id,
                Identifier ("CORBA"));
 
       ACE_NEW (this->tc_name_,
                UTL_ScopedName (corba_id,
-                               0));
+                               nullptr));
 
       ACE_NEW (id,
                Identifier (this->width () == 1
@@ -125,26 +125,26 @@ be_string::compute_tc_name (void)
       // We have a bounded string.  Generate a TypeCode name that is
       // meant for internal use alone.
 
-      Identifier * tao_id = 0;
+      Identifier * tao_id = nullptr;
       ACE_NEW (tao_id,
                Identifier ("TAO"));
 
       ACE_NEW (this->tc_name_,
                UTL_ScopedName (tao_id,
-                               0));
+                               nullptr));
 
       ACE_CString local_tc_name =
         ACE_CString ("tc_")
         + ACE_CString (this->flat_name ());
 
-      Identifier * typecode_scope = 0;
+      Identifier * typecode_scope = nullptr;
       ACE_NEW (typecode_scope,
                Identifier ("TypeCode"));
 
-      UTL_ScopedName * tc_scope_conc_name = 0;
+      UTL_ScopedName * tc_scope_conc_name = nullptr;
       ACE_NEW (tc_scope_conc_name,
                UTL_ScopedName (typecode_scope,
-                               0));
+                               nullptr));
 
       this->tc_name_->nconc (tc_scope_conc_name);
 
@@ -154,10 +154,10 @@ be_string::compute_tc_name (void)
 
   zero.destroy ();
 
-  UTL_ScopedName *conc_name = 0;
+  UTL_ScopedName *conc_name = nullptr;
   ACE_NEW (conc_name,
            UTL_ScopedName (id,
-                           0));
+                           nullptr));
 
   this->tc_name_->nconc (conc_name);
 }
@@ -169,10 +169,8 @@ be_string::accept (be_visitor * visitor)
 }
 
 void
-be_string::destroy (void)
+be_string::destroy ()
 {
   this->be_type::destroy ();
   this->AST_String::destroy ();
 }
-
-IMPL_NARROW_FROM_DECL (be_string)
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index 75224d09216..24874c51167 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -81,7 +81,7 @@ be_structure::be_structure (AST_Decl::NodeType nt,
 void
 be_structure::redefine (AST_Structure *from)
 {
-  be_structure *bs = be_structure::narrow_from_decl (from);
+  be_structure *bs = dynamic_cast<be_structure*> (from);
   this->common_varout_gen_ = bs->common_varout_gen_;
   this->AST_Structure::redefine (from);
 }
@@ -111,10 +111,10 @@ be_structure::gen_ostream_operator (TAO_OutStream *os,
 
   for (long i = 0; i < n; ++i)
     {
-      be_field *f = be_field::narrow_from_decl (this->pd_decls[i]);
+      be_field *f = dynamic_cast<be_field*> (this->pd_decls[i]);
 
       // We don't want any decls, just members.
-      if (f == 0)
+      if (f == nullptr)
         {
           continue;
         }
@@ -145,7 +145,7 @@ be_structure::gen_ostream_operator (TAO_OutStream *os,
 }
 
 void
-be_structure::destroy (void)
+be_structure::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
@@ -158,6 +158,3 @@ be_structure::accept (be_visitor *visitor)
 {
   return visitor->visit_structure (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_structure)
-IMPL_NARROW_FROM_SCOPE (be_structure)
diff --git a/TAO/TAO_IDL/be/be_structure_fwd.cpp b/TAO/TAO_IDL/be/be_structure_fwd.cpp
index 40df470d4aa..fb789735705 100644
--- a/TAO/TAO_IDL/be/be_structure_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_structure_fwd.cpp
@@ -29,12 +29,12 @@ be_structure_fwd::be_structure_fwd (AST_Structure *dummy,
 {
 }
 
-be_structure_fwd::~be_structure_fwd (void)
+be_structure_fwd::~be_structure_fwd ()
 {
 }
 
 void
-be_structure_fwd::destroy (void)
+be_structure_fwd::destroy ()
 {
   this->be_type::destroy ();
   this->AST_StructureFwd::destroy ();
@@ -45,7 +45,3 @@ be_structure_fwd::accept (be_visitor *visitor)
 {
   return visitor->visit_structure_fwd (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_structure_fwd)
diff --git a/TAO/TAO_IDL/be/be_template_module.cpp b/TAO/TAO_IDL/be/be_template_module.cpp
index 14fe8190139..a82a7413057 100644
--- a/TAO/TAO_IDL/be/be_template_module.cpp
+++ b/TAO/TAO_IDL/be/be_template_module.cpp
@@ -20,12 +20,12 @@ be_template_module::be_template_module (
 {
 }
 
-be_template_module::~be_template_module (void)
+be_template_module::~be_template_module ()
 {
 }
 
 void
-be_template_module::destroy (void)
+be_template_module::destroy ()
 {
   this->AST_Template_Module::destroy ();
   this->be_scope::destroy ();
@@ -42,6 +42,3 @@ be_template_module::accept (be_visitor *)
   // to generate implied IDL.
   return 0;
 }
-
-IMPL_NARROW_FROM_DECL (be_template_module)
-IMPL_NARROW_FROM_SCOPE (be_template_module)
diff --git a/TAO/TAO_IDL/be/be_template_module_inst.cpp b/TAO/TAO_IDL/be/be_template_module_inst.cpp
index 3380ad2f6c7..bcc5ac8ce25 100644
--- a/TAO/TAO_IDL/be/be_template_module_inst.cpp
+++ b/TAO/TAO_IDL/be/be_template_module_inst.cpp
@@ -24,12 +24,12 @@ be_template_module_inst::be_template_module_inst (
 {
 }
 
-be_template_module_inst::~be_template_module_inst (void)
+be_template_module_inst::~be_template_module_inst ()
 {
 }
 
 void
-be_template_module_inst::destroy (void)
+be_template_module_inst::destroy ()
 {
   this->AST_Template_Module_Inst::destroy ();
 }
@@ -39,6 +39,3 @@ be_template_module_inst::accept (be_visitor *visitor)
 {
   return visitor->visit_template_module_inst (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_template_module_inst)
-
diff --git a/TAO/TAO_IDL/be/be_template_module_ref.cpp b/TAO/TAO_IDL/be/be_template_module_ref.cpp
index 20f30788315..3fa20740229 100644
--- a/TAO/TAO_IDL/be/be_template_module_ref.cpp
+++ b/TAO/TAO_IDL/be/be_template_module_ref.cpp
@@ -24,12 +24,12 @@ be_template_module_ref::be_template_module_ref (
 {
 }
 
-be_template_module_ref::~be_template_module_ref (void)
+be_template_module_ref::~be_template_module_ref ()
 {
 }
 
 void
-be_template_module_ref::destroy (void)
+be_template_module_ref::destroy ()
 {
   this->AST_Template_Module_Ref::destroy ();
   this->be_field::destroy ();
@@ -40,6 +40,3 @@ be_template_module_ref::accept (be_visitor *visitor)
 {
   return visitor->visit_template_module_ref (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_template_module_ref)
-
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 5a429a23a46..dcc4bf6f369 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -35,18 +35,18 @@ be_type::be_type (AST_Decl::NodeType nt,
               n),
     be_decl (nt,
              n),
-    tc_name_ (0),
+    tc_name_ (nullptr),
     common_varout_gen_ (false),
     seen_in_sequence_ (false),
     seen_in_operation_ (false)
 {
-  if (n != 0)
+  if (n != nullptr)
     {
       this->gen_fwd_helper_name ();
     }
 }
 
-be_type::~be_type (void)
+be_type::~be_type ()
 {
 }
 
@@ -56,37 +56,37 @@ be_type::~be_type (void)
 // predefined types.
 
 void
-be_type::compute_tc_name (void)
+be_type::compute_tc_name ()
 {
   static char namebuf [NAMEBUFSIZE];
   UTL_ScopedName *n = this->name ();
 
-  if (this->tc_name_ != 0)
+  if (this->tc_name_ != nullptr)
     {
       this->tc_name_->destroy ();
       delete this->tc_name_;
-      this->tc_name_ = 0;
+      this->tc_name_ = nullptr;
     }
 
   ACE_OS::memset (namebuf,
                   '\0',
                   NAMEBUFSIZE);
 
-  while (n->tail () != 0)
+  while (n->tail () != nullptr)
     {
       // Does not exist.
-      if (this->tc_name_ == 0)
+      if (this->tc_name_ == nullptr)
         {
           ACE_NEW (this->tc_name_,
                    UTL_ScopedName (n->head ()->copy (),
-                                   0));
+                                   nullptr));
         }
       else
         {
-          UTL_ScopedName *conc_name = 0;
+          UTL_ScopedName *conc_name = nullptr;
           ACE_NEW (conc_name,
                    UTL_ScopedName (n->head ()->copy (),
-                                   0));
+                                   nullptr));
 
           this->tc_name_->nconc (conc_name);
         }
@@ -98,23 +98,23 @@ be_type::compute_tc_name (void)
                    "_tc_%s",
                    n->last_component ()->get_string ());
 
-  Identifier *id = 0;
+  Identifier *id = nullptr;
   ACE_NEW (id,
            Identifier (namebuf));
 
   // Does not exist.
-  if (this->tc_name_ == 0)
+  if (this->tc_name_ == nullptr)
     {
       ACE_NEW (this->tc_name_,
                UTL_ScopedName (id,
-                               0));
+                               nullptr));
     }
   else
     {
-      UTL_ScopedName *conc_name = 0;
+      UTL_ScopedName *conc_name = nullptr;
       ACE_NEW (conc_name,
                UTL_ScopedName (id,
-                               0));
+                               nullptr));
 
       this->tc_name_->nconc (conc_name);
     }
@@ -122,10 +122,10 @@ be_type::compute_tc_name (void)
 
 // Retrieve typecode name.
 UTL_ScopedName *
-be_type::tc_name (void)
+be_type::tc_name ()
 {
   // Compute and init the member.
-  if (this->tc_name_ == 0)
+  if (this->tc_name_ == nullptr)
     {
       this->compute_tc_name ();
     }
@@ -145,7 +145,7 @@ be_type::nested_sp_type_name (be_decl *use_scope,
                               const char *prefix)
 {
   // Our defining scope.
-  be_decl *fu_scope = 0;
+  be_decl *fu_scope = nullptr;
 
   char fu_name [NAMEBUFSIZE];
   char fl_name [NAMEBUFSIZE];
@@ -159,11 +159,11 @@ be_type::nested_sp_type_name (be_decl *use_scope,
                   NAMEBUFSIZE);
 
   fu_scope = this->defined_in ()
-               ? be_scope::narrow_from_scope (this->defined_in ())->decl ()
-               : 0;
+               ? dynamic_cast<be_scope*> (this->defined_in ())->decl ()
+               : nullptr;
 
   ACE_OS::strcat (fu_name,
-                  (fu_scope != 0 ? fu_scope->full_name () : ""));
+                  (fu_scope != nullptr ? fu_scope->full_name () : ""));
 
   ACE_OS::strcat (fu_name,
                   "::TAO_");
@@ -185,14 +185,14 @@ be_type::nested_sp_type_name (be_decl *use_scope,
 }
 
 void
-be_type::gen_fwd_helper_name (void)
+be_type::gen_fwd_helper_name ()
 {
   AST_Decl *parent = ScopeAsDecl (this->defined_in ());
-  Identifier *segment = 0;
-  char *tmp = 0;
+  Identifier *segment = nullptr;
+  char *tmp = nullptr;
   this->fwd_helper_name_.clear (true);
 
-  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+  if (parent != nullptr && parent->node_type () != AST_Decl::NT_root)
     {
       for (UTL_IdListActiveIterator i (parent->name ());
            !i.is_done ();
@@ -235,7 +235,7 @@ be_type::gen_member_ostream_operator (TAO_OutStream *os,
 }
 
 const char *
-be_type::fwd_helper_name (void) const
+be_type::fwd_helper_name () const
 {
   return this->fwd_helper_name_.fast_rep ();
 }
@@ -303,19 +303,19 @@ be_type::gen_stub_decls (TAO_OutStream *os)
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  AST_Interface *i = AST_Interface::narrow_from_decl (this);
-  AST_ValueType *v = AST_ValueType::narrow_from_decl (this);
+  AST_Interface *i = dynamic_cast<AST_Interface*> (this);
+  AST_ValueType *v = dynamic_cast<AST_ValueType*> (this);
 
-  if (i != 0)
+  if (i != nullptr)
     {
       *os << "typedef " << this->local_name ()
-          << (v == 0 ? "_ptr" : " *") << " _ptr_type;";
+          << (v == nullptr ? "_ptr" : " *") << " _ptr_type;";
     }
 
   bool skip_varout = false;
-  AST_Sequence *s = AST_Sequence::narrow_from_decl (this);
+  AST_Sequence *s = dynamic_cast<AST_Sequence*> (this);
 
-  if (s != 0)
+  if (s != nullptr)
     {
       // _vars and _outs not supported yet by alt mapping.
       if (be_global->alt_mapping () && s->unbounded ())
@@ -346,7 +346,7 @@ be_type::gen_stub_decls (TAO_OutStream *os)
 }
 
 bool
-be_type::seen_in_sequence (void) const
+be_type::seen_in_sequence () const
 {
   return this->seen_in_sequence_;
 }
@@ -358,7 +358,7 @@ be_type::seen_in_sequence (bool val)
 }
 
 bool
-be_type::seen_in_operation (void) const
+be_type::seen_in_operation () const
 {
   return this->seen_in_operation_;
 }
@@ -370,20 +370,20 @@ be_type::seen_in_operation (bool val)
 }
 
 AST_Decl::NodeType
-be_type::base_node_type (void) const
+be_type::base_node_type () const
 {
   return const_cast<be_type*> (this)->node_type ();
 }
 
 // Cleanup method
 void
-be_type::destroy (void)
+be_type::destroy ()
 {
-  if (this->tc_name_ != 0)
+  if (this->tc_name_ != nullptr)
     {
       this->tc_name_->destroy ();
       delete this->tc_name_;
-      this->tc_name_ = 0;
+      this->tc_name_ = nullptr;
     }
 
   this->be_decl::destroy ();
@@ -394,7 +394,3 @@ be_type::accept (be_visitor *visitor)
 {
   return visitor->visit_type (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_type)
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index 2763137e85d..bee4349fe04 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -56,7 +56,7 @@ be_typedef::seen_in_sequence (bool val)
 // Some compilers seems to have a problem with a function
 // that's both virtual and overloaded.
 bool
-be_typedef::seen_in_operation (void) const
+be_typedef::seen_in_operation () const
 {
   return this->be_type::seen_in_operation ();
 }
@@ -70,26 +70,26 @@ be_typedef::seen_in_operation (bool val)
 // Given a typedef node, traverse the chain of base types until they are no
 // more typedefs, and return that most primitive base type.
 be_type *
-be_typedef::primitive_base_type (void)
+be_typedef::primitive_base_type ()
 {
   be_type *d = this;
-  be_typedef *temp = 0;
+  be_typedef *temp = nullptr;
 
   while (d && d->node_type () == AST_Decl::NT_typedef)
     {
-      temp = be_typedef::narrow_from_decl (d);
-      d = be_type::narrow_from_decl (temp->base_type ());
+      temp = dynamic_cast<be_typedef*> (d);
+      d = dynamic_cast<be_type*> (temp->base_type ());
     }
 
   return d;
 }
 
 AST_Decl::NodeType
-be_typedef::base_node_type (void) const
+be_typedef::base_node_type () const
 {
   be_typedef *td = const_cast<be_typedef *> (this);
 
-  be_type *base = be_type::narrow_from_decl (td->base_type ());
+  be_type *base = dynamic_cast<be_type*> (td->base_type ());
 
   return base->base_node_type ();
 }
@@ -107,7 +107,7 @@ be_typedef::gen_member_ostream_operator (TAO_OutStream *os,
 }
 
 void
-be_typedef::destroy (void)
+be_typedef::destroy ()
 {
   this->AST_Typedef::destroy ();
   this->be_type::destroy ();
@@ -118,5 +118,3 @@ be_typedef::accept (be_visitor *visitor)
 {
   return visitor->visit_typedef (this);
 }
-
-IMPL_NARROW_FROM_DECL (be_typedef)
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 2493aed1c23..f13367ddab0 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -66,13 +66,13 @@ be_union::be_union (AST_ConcreteType *dt,
 void
 be_union::redefine (AST_Structure *from)
 {
-  be_union *bu = be_union::narrow_from_decl (from);
+  be_union *bu = dynamic_cast<be_union*> (from);
   this->common_varout_gen_ = bu->common_varout_gen_;
   AST_Union::redefine (from);
 }
 
 bool
-be_union::has_duplicate_case_labels (void)
+be_union::has_duplicate_case_labels ()
 {
   for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
        !si.is_done ();
@@ -80,7 +80,7 @@ be_union::has_duplicate_case_labels (void)
     {
       AST_Decl *d = si.item ();
       AST_UnionBranch *ub =
-        AST_UnionBranch::narrow_from_decl (d);
+        dynamic_cast<AST_UnionBranch*> (d);
 
       if (ub->label_list_length () > 1)
         {
@@ -108,10 +108,10 @@ be_union::gen_ostream_operator (TAO_OutStream *os,
   for (long i = 0; i < this->pd_decls_used; ++i)
     {
       be_union_branch *ub =
-        be_union_branch::narrow_from_decl (this->pd_decls[i]);
+        dynamic_cast<be_union_branch*> (this->pd_decls[i]);
 
       // We don't want any decls, just members.
-      if (ub == 0)
+      if (ub == nullptr)
         {
           continue;
         }
@@ -151,7 +151,7 @@ be_union::gen_ostream_operator (TAO_OutStream *os,
 
       *os << "strm << ";
 
-      be_type *ub_ft = be_type::narrow_from_decl (ub->field_type ());
+      be_type *ub_ft = dynamic_cast<be_type*> (ub->field_type ());
       AST_Decl::NodeType ub_nt = ub_ft->node_type ();
       // catch anonymous Array member types
       bool ub_use_underscore = ub_nt == AST_Decl::NT_array;
@@ -181,7 +181,7 @@ be_union::gen_ostream_operator (TAO_OutStream *os,
 }
 
 void
-be_union::destroy (void)
+be_union::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
@@ -198,7 +198,7 @@ be_union::accept (be_visitor *visitor)
 }
 
 bool
-be_union::gen_empty_default_label (void)
+be_union::gen_empty_default_label ()
 {
   // A non-empty explicit default label will be generated.
   if (this->default_index () != -1)
@@ -207,7 +207,7 @@ be_union::gen_empty_default_label (void)
     }
 
   AST_ConcreteType *disc = this->disc_type ();
-  if (disc == 0)
+  if (disc == nullptr)
     {
       return true; // In reality this is an error.
     }
@@ -223,8 +223,8 @@ be_union::gen_empty_default_label (void)
       return (n_labels <= ACE_UINT32_MAX);
     }
 
-  AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (disc);
-  if (pdt == 0)
+  AST_PredefinedType *pdt = dynamic_cast<AST_PredefinedType*> (disc);
+  if (pdt == nullptr)
     {
       return true; // In reality this is an error.
     }
@@ -266,7 +266,7 @@ be_union::be_add_union_branch (AST_UnionBranch *b)
 }
 
 ACE_UINT64
-be_union::nlabels (void)
+be_union::nlabels ()
 {
   ACE_UINT64 retval = 0;
 
@@ -276,9 +276,9 @@ be_union::nlabels (void)
     {
       AST_Decl *d = si.item ();
       AST_UnionBranch *ub =
-        AST_UnionBranch::narrow_from_decl (d);
+        dynamic_cast<AST_UnionBranch*> (d);
 
-      if (ub != 0)
+      if (ub != nullptr)
         {
           retval += ub->label_list_length ();
         }
@@ -286,8 +286,3 @@ be_union::nlabels (void)
 
   return retval;
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_union)
-IMPL_NARROW_FROM_SCOPE (be_union)
diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp
index 17dd1156d16..217857d51bf 100644
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_union_branch.cpp
@@ -54,17 +54,17 @@ be_union_branch::gen_label_value (TAO_OutStream *os, unsigned long index)
 
   // If the enum is not in the global scope we have to prefix it.
   be_union *u =
-    be_union::narrow_from_scope (this->defined_in ());
+    dynamic_cast<be_union*> (this->defined_in ());
 
-  if (u == 0)
+  if (u == nullptr)
     {
       return -1;
     }
 
   be_type* dt =
-    be_type::narrow_from_decl (u->disc_type ());
+    dynamic_cast<be_type*> (u->disc_type ());
 
-  if (dt == 0)
+  if (dt == nullptr)
     {
       return -1;
     }
@@ -83,9 +83,9 @@ be_union_branch::gen_label_value (TAO_OutStream *os, unsigned long index)
   // Find where was the enum defined, if it was defined in the globa
   // scope, then it is easy to generate the enum values....
   be_scope* scope =
-    be_scope::narrow_from_scope (dt->defined_in ());
+    dynamic_cast<be_scope*> (dt->defined_in ());
 
-  if (scope == 0)
+  if (scope == nullptr)
     {
       *os << e->n ();
       return 0;
@@ -141,7 +141,7 @@ be_union_branch::gen_default_label_value (TAO_OutStream *os,
         // discriminant, so we must generate the string name.
         {
           AST_ConcreteType *act = bu->disc_type ();
-          be_enum *be = be_enum::narrow_from_decl (act);
+          be_enum *be = dynamic_cast<be_enum*> (act);
 
           UTL_ScopedName *sn = be->value_to_name (dv.u.enum_val);
           if (sn)
@@ -183,12 +183,8 @@ be_union_branch::accept (be_visitor *visitor)
 }
 
 void
-be_union_branch::destroy (void)
+be_union_branch::destroy ()
 {
   this->be_decl::destroy ();
   this->AST_UnionBranch::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_union_branch)
diff --git a/TAO/TAO_IDL/be/be_union_fwd.cpp b/TAO/TAO_IDL/be/be_union_fwd.cpp
index 064cbece771..0980994c2ee 100644
--- a/TAO/TAO_IDL/be/be_union_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_union_fwd.cpp
@@ -34,12 +34,12 @@ be_union_fwd::be_union_fwd (AST_Union *dummy,
 {
 }
 
-be_union_fwd::~be_union_fwd (void)
+be_union_fwd::~be_union_fwd ()
 {
 }
 
 void
-be_union_fwd::destroy (void)
+be_union_fwd::destroy ()
 {
   this->be_structure_fwd::destroy ();
 }
@@ -49,7 +49,3 @@ be_union_fwd::accept (be_visitor *visitor)
 {
   return visitor->visit_union_fwd (this);
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_union_fwd)
diff --git a/TAO/TAO_IDL/be/be_union_label.cpp b/TAO/TAO_IDL/be/be_union_label.cpp
index 9d0cd9f3c84..7b15a4fad7e 100644
--- a/TAO/TAO_IDL/be/be_union_label.cpp
+++ b/TAO/TAO_IDL/be/be_union_label.cpp
@@ -15,7 +15,7 @@ be_union_label::accept (be_visitor *visitor)
 }
 
 void
-be_union_label::destroy (void)
+be_union_label::destroy ()
 {
   this->AST_UnionLabel::destroy ();
 }
diff --git a/TAO/TAO_IDL/be/be_uses.cpp b/TAO/TAO_IDL/be/be_uses.cpp
index 1837fb30a19..46e35d90690 100644
--- a/TAO/TAO_IDL/be/be_uses.cpp
+++ b/TAO/TAO_IDL/be/be_uses.cpp
@@ -19,19 +19,19 @@ be_uses::be_uses (UTL_ScopedName *n,
              n),
     be_field (uses_type,
               n),
-    original_uses_ (0)
+    original_uses_ (nullptr)
 {
 }
 
-be_uses::~be_uses (void)
+be_uses::~be_uses ()
 {
 }
 
 be_type *
-be_uses::uses_type (void) const
+be_uses::uses_type () const
 {
   return
-    be_type::narrow_from_decl (
+    dynamic_cast<be_type*> (
       this->AST_Uses::uses_type ());
 }
 
@@ -42,7 +42,7 @@ be_uses::accept (be_visitor *visitor)
 }
 
 void
-be_uses::destroy (void)
+be_uses::destroy ()
 {
   this->AST_Uses::destroy ();
   this->be_field::destroy ();
@@ -55,9 +55,7 @@ be_uses::original_uses (be_uses *original_uses)
 }
 
 be_uses *
-be_uses::original_uses (void)
+be_uses::original_uses ()
 {
   return this->original_uses_;
 }
-
-IMPL_NARROW_FROM_DECL (be_uses)
diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp
index 14813ba4f6b..cc605a4e5c1 100644
--- a/TAO/TAO_IDL/be/be_util.cpp
+++ b/TAO/TAO_IDL/be/be_util.cpp
@@ -34,7 +34,7 @@ be_util::gen_nested_namespace_begin (TAO_OutStream *os,
                                      be_module *node,
                                      bool skel)
 {
-  char *item_name = 0;
+  char *item_name = nullptr;
   bool first_level = true;
 
   for (UTL_IdListActiveIterator i (node->name ());
@@ -154,11 +154,11 @@ be_util::prep_be_arg (char *s)
   static const char stripped_filename[]    = "stripped_filename=";
   static const char no_fixed_err[]         = "no_fixed_err";
 
-  char* last = 0;
+  char* last = nullptr;
 
   for (char* arg = ACE_OS::strtok_r (s, ",", &last);
-       arg != 0;
-       arg = ACE_OS::strtok_r (0, ",", &last))
+       arg != nullptr;
+       arg = ACE_OS::strtok_r (nullptr, ",", &last))
     {
       if (ACE_OS::strstr (arg, arg_macro) == arg)
         {
@@ -279,7 +279,7 @@ be_util::prep_be_arg (char *s)
         }
       else if (ACE_OS::strstr (arg, obv_opt_accessor) == arg)
         {
-          be_global->obv_opt_accessor (1);
+          be_global->obv_opt_accessor (true);
         }
       else if (ACE_OS::strstr (arg, ciao_container_type) == arg)
         {
@@ -326,7 +326,7 @@ be_util::prep_be_arg (char *s)
 }
 
 void
-be_util::arg_post_proc (void)
+be_util::arg_post_proc ()
 {
   // Let us try to use Perfect Hashing Operation Lookup Strategy. Let
   // us check whether things are fine with GPERF.
@@ -384,7 +384,7 @@ be_util::arg_post_proc (void)
 }
 
 void
-be_util::usage (void)
+be_util::usage ()
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -940,14 +940,14 @@ be_util::usage (void)
 }
 
 AST_Generator *
-be_util::generator_init (void)
+be_util::generator_init ()
 {
   tao_cg = TAO_CODEGEN::instance ();
 
-  AST_Generator *gen = 0;
+  AST_Generator *gen = nullptr;
   ACE_NEW_RETURN (gen,
                   be_generator,
-                  0);
+                  nullptr);
 
   return gen;
 }
@@ -957,15 +957,15 @@ be_util::get_output_path (bool for_anyop,
                           bool for_skel,
                           bool for_exec)
 {
-  if (for_anyop && 0 != be_global->anyop_output_dir ())
+  if (for_anyop && nullptr != be_global->anyop_output_dir ())
     {
       return be_global->anyop_output_dir ();
     }
-  else if (for_skel && 0 != be_global->skel_output_dir ())
+  else if (for_skel && nullptr != be_global->skel_output_dir ())
     {
       return be_global->skel_output_dir ();
     }
-  else if (for_exec && 0 != be_global->exec_output_dir ())
+  else if (for_exec && nullptr != be_global->exec_output_dir ())
     {
       return be_global->exec_output_dir ();
     }
@@ -1008,7 +1008,7 @@ be_util::overwrite_ciao_exec_files ()
 void
 be_util::set_arg_seen_bit (be_type *bt)
 {
-  if (bt == 0)
+  if (bt == nullptr)
     {
       return;
     }
@@ -1017,9 +1017,9 @@ be_util::set_arg_seen_bit (be_type *bt)
     {
       case AST_Decl::NT_typedef:
         {
-          AST_Typedef *td = AST_Typedef::narrow_from_decl (bt);
+          AST_Typedef *td = dynamic_cast<AST_Typedef*> (bt);
           be_util::set_arg_seen_bit (
-                    be_type::narrow_from_decl (td->primitive_base_type ())
+                    dynamic_cast<be_type*> (td->primitive_base_type ())
                   );
           break;
         }
@@ -1049,8 +1049,8 @@ be_util::set_arg_seen_bit (be_type *bt)
       case AST_Decl::NT_struct_fwd:
       case AST_Decl::NT_union_fwd:
         {
-          AST_StructureFwd *fwd = AST_StructureFwd::narrow_from_decl (bt);
-          be_type *fd = be_type::narrow_from_decl (fwd->full_definition ());
+          AST_StructureFwd *fwd = dynamic_cast<AST_StructureFwd*> (bt);
+          be_type *fd = dynamic_cast<be_type*> (fwd->full_definition ());
           be_util::set_arg_seen_bit (fd);
           break;
         }
@@ -1061,7 +1061,7 @@ be_util::set_arg_seen_bit (be_type *bt)
       case AST_Decl::NT_string:
       case AST_Decl::NT_wstring:
         {
-          AST_String *str = AST_String::narrow_from_decl (bt);
+          AST_String *str = dynamic_cast<AST_String*> (bt);
 
           if (str->max_size ()->ev ()->u.ulval == 0)
             {
@@ -1090,7 +1090,7 @@ be_util::set_arg_seen_bit (be_type *bt)
         break;
       case AST_Decl::NT_pre_defined:
         {
-          AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (bt);
+          AST_PredefinedType *pdt = dynamic_cast<AST_PredefinedType*> (bt);
 
           switch (pdt->pt ())
             {
diff --git a/TAO/TAO_IDL/be/be_valuebox.cpp b/TAO/TAO_IDL/be/be_valuebox.cpp
index 21d00fd2972..eca86d93483 100644
--- a/TAO/TAO_IDL/be/be_valuebox.cpp
+++ b/TAO/TAO_IDL/be/be_valuebox.cpp
@@ -57,13 +57,9 @@ be_valuebox::accept (be_visitor *visitor)
 
 
 void
-be_valuebox::destroy (void)
+be_valuebox::destroy ()
 {
   // Call the destroy methods of our base classes.
   this->AST_ValueBox::destroy ();
   this->be_type::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_valuebox)
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index eeb9d21a15f..02dcf8f8228 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -37,7 +37,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
                             bool abstract,
                             bool truncatable,
                             bool custom)
-  : COMMON_Base (0,
+  : COMMON_Base (false,
                  abstract),
     AST_Decl (AST_Decl::NT_valuetype,
               n),
@@ -49,7 +49,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
                    n_inherits,
                    inherits_flat,
                    n_inherits_flat,
-                   0,
+                   false,
                    abstract),
     be_scope (AST_Decl::NT_valuetype),
     be_decl (AST_Decl::NT_valuetype,
@@ -61,7 +61,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
                   n_inherits,
                   inherits_flat,
                   n_inherits_flat,
-                  0,
+                  false,
                   abstract),
     AST_ValueType (n,
                    inherits,
@@ -77,7 +77,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
                    custom),
     supports_abstract_ (false),
     var_out_seq_decls_gen_ (false),
-    full_obv_skel_name_ (0),
+    full_obv_skel_name_ (nullptr),
     is_amh_excep_holder_ (false)
 {
   // Check that redefine() copies all members.
@@ -85,9 +85,9 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
   // Always the case.
   this->size_type (AST_Type::VARIABLE);
 
-  AST_Module *m = AST_Module::narrow_from_scope (this->defined_in ());
+  AST_Module *m = dynamic_cast<AST_Module*> (this->defined_in ());
 
-  if (m != 0)
+  if (m != nullptr)
     {
       m->set_has_nested_valuetype ();
     }
@@ -98,9 +98,9 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
   for (long i = 0; i < this->pd_n_supports; ++i)
     {
       be_interface *intf =
-        be_interface::narrow_from_decl (this->pd_supports[i]);
+        dynamic_cast<be_interface*> (this->pd_supports[i]);
 
-      if (intf == 0)
+      if (intf == nullptr)
         {
           // The item is a template param holder.
           continue;
@@ -131,18 +131,18 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
     }
 }
 
-be_valuetype::~be_valuetype (void)
+be_valuetype::~be_valuetype ()
 {
 }
 
 void
 be_valuetype::redefine (AST_Interface *from)
 {
-  be_valuetype *bv = be_valuetype::narrow_from_decl (from);
+  be_valuetype *bv = dynamic_cast<be_valuetype*> (from);
 
   // This should always be TRUE, but our signature is inherited, so
   // the narrow is necessary and should always be checked.
-  if (bv != 0)
+  if (bv != nullptr)
     {
       this->var_out_seq_decls_gen_ = bv->var_out_seq_decls_gen_;
     }
@@ -153,14 +153,14 @@ be_valuetype::redefine (AST_Interface *from)
 // Is true if non-virtual accessor and modifier should be generated
 // If #pragma TAO OBV opt_accessor (todo) is used or -Wb,obv_opt_accessor.
 bool
-be_valuetype::opt_accessor (void)
+be_valuetype::opt_accessor ()
 {
   return be_global->obv_opt_accessor ();
 }
 
 // Compute stringified fully scoped skeleton name (OBV_name).
 void
-be_valuetype::compute_fullobvskelname (void)
+be_valuetype::compute_fullobvskelname ()
 {
   this->compute_full_skel_name ("OBV_",
                                 this->full_obv_skel_name_);
@@ -168,9 +168,9 @@ be_valuetype::compute_fullobvskelname (void)
 
 // Retrieve the fully scoped skeleton name.
 const char*
-be_valuetype::full_obv_skel_name (void)
+be_valuetype::full_obv_skel_name ()
 {
-  if (0 == this->full_obv_skel_name_)
+  if (nullptr == this->full_obv_skel_name_)
     {
       this->compute_fullobvskelname ();
     }
@@ -179,13 +179,13 @@ be_valuetype::full_obv_skel_name (void)
 }
 
 const char *
-be_valuetype::fwd_helper_name (void) const
+be_valuetype::fwd_helper_name () const
 {
   return this->fwd_helper_name_.fast_rep ();
 }
 
 be_valuetype::FactoryStyle
-be_valuetype::determine_factory_style (void)
+be_valuetype::determine_factory_style ()
 {
   FactoryStyle factory_style = FS_UNKNOWN;
 
@@ -197,7 +197,7 @@ be_valuetype::determine_factory_style (void)
 
   // Check whether we have at least one operation or not.
   bool have_operation = this->have_operation ();
-  bool have_factory = 0;
+  bool have_factory = false;
 
   // Try only our own scope.
   if (this->nmembers () > 0)
@@ -225,7 +225,7 @@ be_valuetype::determine_factory_style (void)
 
           if (node_type == AST_Decl::NT_factory)
             {
-              have_factory = 1;
+              have_factory = true;
               break;
             }
 
@@ -249,7 +249,7 @@ be_valuetype::determine_factory_style (void)
 }
 
 bool
-be_valuetype::have_operation (void)
+be_valuetype::have_operation ()
 {
   // Check whatever scope we get for operations/attributes.
 
@@ -301,9 +301,9 @@ be_valuetype::have_operation (void)
 
       for (i = 0; i < n_inherits; ++i)
         {
-          be_valuetype *vt = be_valuetype::narrow_from_decl (inherits[i]);
+          be_valuetype *vt = dynamic_cast<be_valuetype*> (inherits[i]);
 
-          if (vt != 0 && vt->have_operation ())
+          if (vt != nullptr && vt->have_operation ())
             {
               have_operation = true;
               break;
@@ -316,12 +316,12 @@ be_valuetype::have_operation (void)
       // Check for operations on supported interfaces
       AST_Type * supported = this->supports_concrete ();
 
-      if (supported != 0)
+      if (supported != nullptr)
         {
           be_interface *intf =
-            be_interface::narrow_from_decl (supported);
+            dynamic_cast<be_interface*> (supported);
 
-          if (intf != 0)
+          if (intf != nullptr)
             {
               have_operation =
                 be_valuetype::have_supported_op (intf);
@@ -349,7 +349,7 @@ be_valuetype::have_supported_op (be_interface * node)
     {
       AST_Decl *d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_valuetype::")
@@ -378,9 +378,9 @@ be_valuetype::have_supported_op (be_interface * node)
       for (i = 0; i < n_inherits; ++i)
         {
           be_interface * intf =
-            be_interface::narrow_from_decl (inherits[i]);
+            dynamic_cast<be_interface*> (inherits[i]);
 
-          if (intf != 0)
+          if (intf != nullptr)
             {
               have_supported_op =
                 be_valuetype::have_supported_op (intf);
@@ -397,7 +397,7 @@ be_valuetype::have_supported_op (be_interface * node)
 }
 
 bool
-be_valuetype::will_have_factory (void)
+be_valuetype::will_have_factory ()
 {
   FactoryStyle fs = this->determine_factory_style ();
 
@@ -405,15 +405,15 @@ be_valuetype::will_have_factory (void)
 }
 
 bool
-be_valuetype::has_member (void)
+be_valuetype::has_member ()
 {
   AST_Type *parent = this->pd_inherits_concrete;
 
   // We're looking for inherited members too.
-  if (parent != 0)
+  if (parent != nullptr)
     {
       be_valuetype *be_parent =
-        be_valuetype::narrow_from_decl (parent);
+        dynamic_cast<be_valuetype*> (parent);
 
       if (be_parent->has_member ())
         {
@@ -435,7 +435,7 @@ be_valuetype::has_member (void)
 }
 
 bool
-be_valuetype::is_amh_excep_holder (void) const
+be_valuetype::is_amh_excep_holder () const
 {
   return this->is_amh_excep_holder_;
 }
@@ -551,7 +551,7 @@ be_valuetype::gen_ostream_operator (TAO_OutStream *os,
 // interface _var and _out template classes, as well as by the
 // template sequence classes for object references.
 void
-be_valuetype::gen_var_out_seq_decls (void)
+be_valuetype::gen_var_out_seq_decls ()
 {
   if (this->var_out_seq_decls_gen_)
     {
@@ -589,29 +589,29 @@ be_valuetype::gen_var_out_seq_decls (void)
 
 // For building the pre and postfix of private data fields.
 const char *
-be_valuetype::field_pd_prefix (void)
+be_valuetype::field_pd_prefix ()
 {
   return "_pd_";
 }
 
 const char *
-be_valuetype::field_pd_postfix (void)
+be_valuetype::field_pd_postfix ()
 {
   return "";
 }
 
 be_valuetype *
-be_valuetype::statefull_inherit (void)
+be_valuetype::statefull_inherit ()
 {
-  if (this->pd_inherits_concrete != 0)
+  if (this->pd_inherits_concrete != nullptr)
     {
       return
-        be_valuetype::narrow_from_decl (
+        dynamic_cast<be_valuetype*> (
           this->pd_inherits_concrete);
     }
   else
     {
-      return 0;
+      return nullptr;
     }
 }
 
@@ -623,10 +623,10 @@ be_valuetype::accept (be_visitor *visitor)
 }
 
 void
-be_valuetype::destroy (void)
+be_valuetype::destroy ()
 {
   delete [] this->full_obv_skel_name_;
-  this->full_obv_skel_name_ = 0;
+  this->full_obv_skel_name_ = nullptr;
 
   this->be_interface::destroy ();
   this->AST_ValueType::destroy ();
@@ -651,10 +651,10 @@ be_valuetype::data_members_count (AST_Field::Visibility vis)
                             0);
         }
 
-      AST_Field *field = AST_Field::narrow_from_decl (d);
-      AST_Attribute *attr = AST_Attribute::narrow_from_decl (d);
+      AST_Field *field = dynamic_cast<AST_Field*> (d);
+      AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d);
 
-      if (field == 0 || attr != 0)
+      if (field == nullptr || attr != nullptr)
         {
           continue;
         }
@@ -672,7 +672,7 @@ be_valuetype::data_members_count (AST_Field::Visibility vis)
 }
 
 bool
-be_valuetype::supports_abstract (void) const
+be_valuetype::supports_abstract () const
 {
   return this->supports_abstract_;
 }
@@ -701,7 +701,7 @@ be_valuetype::traverse_supports_list_graphs (
   this->insert_queue.reset ();
   this->del_queue.reset ();
 
-  be_interface *supported_interface = 0;
+  be_interface *supported_interface = nullptr;
 
   for (long i = 0; i < n_supports; ++i)
     {
@@ -718,7 +718,7 @@ be_valuetype::traverse_supports_list_graphs (
         }
 
       supported_interface =
-        be_interface::narrow_from_decl (this->pd_supports[i]);
+        dynamic_cast<be_interface*> (this->pd_supports[i]);
 
       // Insert a supported interface in the queue.
       if (this->insert_queue.enqueue_tail (supported_interface) == -1)
@@ -744,13 +744,13 @@ be_valuetype::traverse_concrete_inheritance_graph (tao_code_emitter gen,
 {
   AST_Type *supported = this->supports_concrete ();
 
-  if (supported == 0)
+  if (supported == nullptr)
     {
       return 0;
     }
 
   be_interface *concrete =
-    be_interface::narrow_from_decl (supported);
+    dynamic_cast<be_interface*> (supported);
 
   // Make sure the queues are empty.
   this->insert_queue.reset ();
@@ -783,6 +783,3 @@ be_valuetype::abstract_supports_helper (be_interface *,
 
   return 0;
 }
-
-IMPL_NARROW_FROM_DECL (be_valuetype)
-IMPL_NARROW_FROM_SCOPE (be_valuetype)
diff --git a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
index a10a3874255..b6151ea0f69 100644
--- a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
@@ -36,7 +36,7 @@ be_valuetype_fwd::be_valuetype_fwd (AST_Interface *dummy,
 {
 }
 
-be_valuetype_fwd::~be_valuetype_fwd (void)
+be_valuetype_fwd::~be_valuetype_fwd ()
 {
 }
 
@@ -47,12 +47,7 @@ be_valuetype_fwd::accept (be_visitor *visitor)
 }
 
 void
-be_valuetype_fwd::destroy (void)
+be_valuetype_fwd::destroy ()
 {
   this->be_interface_fwd::destroy ();
 }
-
-
-
-IMPL_NARROW_FROM_DECL (be_valuetype_fwd)
-
diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp
index bd4b8ff125c..e8b1736bb77 100644
--- a/TAO/TAO_IDL/be/be_visitor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor.cpp
@@ -21,11 +21,11 @@
 
 #include "ace/config-all.h"
 
-be_visitor::be_visitor (void)
+be_visitor::be_visitor ()
 {
 }
 
-be_visitor::~be_visitor (void)
+be_visitor::~be_visitor ()
 {
 }
 
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 bf34b126a16..87b095402ab 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -32,7 +32,7 @@ be_visitor_amh_pre_proc::be_visitor_amh_pre_proc (be_visitor_context *ctx)
 {
 }
 
-be_visitor_amh_pre_proc::~be_visitor_amh_pre_proc (void)
+be_visitor_amh_pre_proc::~be_visitor_amh_pre_proc ()
 {
 }
 
@@ -68,7 +68,7 @@ int
 be_visitor_amh_pre_proc::visit_interface (be_interface *node)
 {
   // Do not generate AMH classes for any sort of implied IDL.
-  if (node->original_interface () != 0)
+  if (node->original_interface () != nullptr)
     {
       return 0;
     }
@@ -106,14 +106,14 @@ be_visitor_amh_pre_proc::visit_interface (be_interface *node)
   excep_holder->is_amh_excep_holder (true);
 
   AST_Module *module =
-    AST_Module::narrow_from_scope (node->defined_in ());
+    dynamic_cast<AST_Module*> (node->defined_in ());
   module->set_has_nested_valuetype ();
 
   // Create the ResponseHandler class
   be_interface *response_handler =
     this->create_response_handler (node,
                                    excep_holder);
-  if (response_handler == 0)
+  if (response_handler == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_amh_pre_proc::"
@@ -167,16 +167,16 @@ be_visitor_amh_pre_proc::create_response_handler (
   // the inherited classes in the original interface, change their
   // names and then use the symbol table to look up the
   // AMH-response-handler nodes.
-  be_interface *response_handler = 0;
+  be_interface *response_handler = nullptr;
   ACE_NEW_RETURN (response_handler,
                   be_interface (amh_name,   // name
-                                0,          // list of inherited
+                                nullptr,          // list of inherited
                                 0,          // number of inherited
-                                0,          // list of ancestors
+                                nullptr,          // list of ancestors
                                 0,          // number of ancestors
                                 1,          // local
                                 0),         // non-abstract
-                  0);
+                  nullptr);
 
   idl_global->scopes ().pop ();
 
@@ -190,7 +190,7 @@ be_visitor_amh_pre_proc::create_response_handler (
   // and set the prefix to the node's prefix. All this is
   // necessary in case the node's prefix was modified after
   // its declaration.
-  response_handler->AST_Decl::repoID (0);
+  response_handler->AST_Decl::repoID (nullptr);
   response_handler->prefix (const_cast<char*> (node->prefix ()));
 
   response_handler->gen_fwd_helper_name ();
@@ -229,9 +229,9 @@ be_visitor_amh_pre_proc::add_rh_node_members ( be_interface *node,
 
       if (nt == AST_Decl::NT_attr)
         {
-          be_attribute *attr = be_attribute::narrow_from_decl (d);
+          be_attribute *attr = dynamic_cast<be_attribute*> (d);
 
-          if (attr != 0)
+          if (attr != nullptr)
             {
               status =
                 this->create_response_handler_attribute (attr,
@@ -250,9 +250,9 @@ be_visitor_amh_pre_proc::add_rh_node_members ( be_interface *node,
         }
       else if (nt == AST_Decl::NT_op)
         {
-          be_operation* operation = be_operation::narrow_from_decl (d);
+          be_operation* operation = dynamic_cast<be_operation*> (d);
 
-          if (operation != 0)
+          if (operation != nullptr)
             {
               status =
                 this->create_response_handler_operation (operation,
@@ -285,7 +285,7 @@ be_visitor_amh_pre_proc::create_response_handler_operation (
     be_valuetype *exception_holder
   )
 {
-  if (node == 0)
+  if (node == nullptr)
     {
       return -1;
     }
@@ -325,7 +325,7 @@ be_visitor_amh_pre_proc::create_response_handler_attribute (
 
   get_operation->destroy ();
   delete get_operation;
-  get_operation = 0;
+  get_operation = nullptr;
 
   if (status == -1)
     {
@@ -349,7 +349,7 @@ be_visitor_amh_pre_proc::create_response_handler_attribute (
 
   set_operation->destroy ();
   delete set_operation;
-  set_operation = 0;
+  set_operation = nullptr;
 
   return status;
 }
@@ -362,7 +362,7 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node,
   UTL_ScopedName *operation_name = node->compute_name ("",
                                                        "_excep");
 
-  be_operation *node_excep = 0;
+  be_operation *node_excep = nullptr;
   ACE_NEW_RETURN (node_excep,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
@@ -373,17 +373,17 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node,
 
   node_excep->set_name (operation_name);
 
-  Identifier *arg_id = 0;
+  Identifier *arg_id = nullptr;
   ACE_NEW_RETURN (arg_id,
                   Identifier ("holder"),
                   -1);
 
-  UTL_ScopedName *arg_name = 0;
+  UTL_ScopedName *arg_name = nullptr;
   ACE_NEW_RETURN (arg_name,
-                  UTL_ScopedName (arg_id, 0),
+                  UTL_ScopedName (arg_id, nullptr),
                   -1);
 
-  be_argument *argument = 0;
+  be_argument *argument = nullptr;
   ACE_NEW_RETURN (argument,
                   be_argument (AST_Argument::dir_IN,
                                exception_holder,
@@ -396,7 +396,7 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node,
 
   node_excep->set_defined_in (response_handler);
 
-  if (0 == response_handler->be_add_operation (node_excep))
+  if (nullptr == response_handler->be_add_operation (node_excep))
     {
       return -1;
     }
@@ -408,8 +408,8 @@ int
 be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
                                            be_interface *response_handler)
 {
-  Identifier *id = 0;
-  UTL_ScopedName *sn = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *sn = nullptr;
 
   ACE_CString original_op_name (
                   node->name ()->last_component ()->get_string ()
@@ -424,13 +424,13 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
 
   ACE_NEW_RETURN (sn,
                   UTL_ScopedName (id,
-                                  0),
+                                  nullptr),
                   -1);
 
   op_name->nconc (sn);
 
   // Create the operation
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
@@ -445,18 +445,18 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
 
   if (!node->void_return_type ())
     {
-      Identifier *arg_id = 0;
+      Identifier *arg_id = nullptr;
       ACE_NEW_RETURN (arg_id,
                       Identifier ("return_value"),
                       -1);
 
-      UTL_ScopedName *arg_name = 0;
+      UTL_ScopedName *arg_name = nullptr;
       ACE_NEW_RETURN (arg_name,
-                      UTL_ScopedName (arg_id, 0),
+                      UTL_ScopedName (arg_id, nullptr),
                       -1);
 
       // Create the argument
-      be_argument *arg = 0;
+      be_argument *arg = nullptr;
       ACE_NEW_RETURN (arg,
                       be_argument (AST_Argument::dir_IN,
                                    node->return_type (),
@@ -481,7 +481,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
         {
           operation->destroy ();
           delete operation;
-          operation = 0;
+          operation = nullptr;
 
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_amh_pre_proc::")
@@ -491,14 +491,14 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
 
         }
 
-      //be_decl *arg = be_decl::narrow_from_decl (d);
-      AST_Argument *original_arg = AST_Argument::narrow_from_decl (d);
+      //be_decl *arg = dynamic_cast<be_decl*> (d);
+      AST_Argument *original_arg = dynamic_cast<AST_Argument*> (d);
 
       if (original_arg->direction () == AST_Argument::dir_INOUT ||
           original_arg->direction () == AST_Argument::dir_OUT)
         {
           // Create the argument
-          be_argument *arg = 0;
+          be_argument *arg = nullptr;
           ACE_NEW_RETURN (arg,
                           be_argument (AST_Argument::dir_IN,
                                        original_arg->field_type (),
@@ -516,7 +516,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
 
   // After having generated the operation we insert it into the
   // response handler interface.
-  if (0 == response_handler->be_add_operation (operation))
+  if (nullptr == response_handler->be_add_operation (operation))
     {
       return -1;
     }
@@ -548,7 +548,7 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
   idl_global->valuefactory_seen_ = true;
 
   const int inherit_count = 0;
-  AST_Type **p_intf = 0;
+  AST_Type **p_intf = nullptr;
 
   UTL_ScopedName *excep_holder_name =
     node->compute_name ("AMH_",
@@ -557,21 +557,21 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
   UTL_Scope *s = node->defined_in ();
   idl_global->scopes ().push (s);
 
-  be_valuetype *excep_holder = 0;
+  be_valuetype *excep_holder = nullptr;
   ACE_NEW_RETURN (excep_holder,
                   be_valuetype (excep_holder_name,
                                 p_intf,
                                 inherit_count,
+                                nullptr,
+                                nullptr,
                                 0,
+                                nullptr,
                                 0,
-                                0,
-                                0,
-                                0,
-                                0,
+                                nullptr,
                                 0,
                                 0,
                                 0),
-                  0);
+                  nullptr);
 
   idl_global->scopes ().pop ();
 
@@ -582,7 +582,7 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
   // and set the prefix to the node's prefix. All this is
   // necessary in case the node's prefix was modified after
   // its declaration.
-  excep_holder->AST_Decl::repoID (0);
+  excep_holder->AST_Decl::repoID (nullptr);
   excep_holder->prefix (const_cast<char*> (node->prefix ()));
 
   excep_holder->gen_fwd_helper_name ();
@@ -597,7 +597,7 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
     {
       AST_Decl *d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_amh_pre_proc::"
@@ -606,16 +606,16 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
                             0);
         }
 
-      be_decl *op = be_decl::narrow_from_decl (d);
+      be_decl *op = dynamic_cast<be_decl*> (d);
       AST_Decl::NodeType nt = d->node_type ();
 
       if (nt == AST_Decl::NT_attr)
         {
-          AST_Attribute *attribute = AST_Attribute::narrow_from_decl (d);
+          AST_Attribute *attribute = dynamic_cast<AST_Attribute*> (d);
 
-          if (attribute == 0)
+          if (attribute == nullptr)
             {
-              return 0;
+              return nullptr;
             }
 
           this->create_raise_operation (op,
@@ -651,13 +651,13 @@ be_visitor_amh_pre_proc::create_raise_operation (
     Operation_Kind operation_kind
   )
 {
-  Identifier *id = 0;
-  UTL_ScopedName *sn = 0;
-  be_operation *orig_op = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *sn = nullptr;
+  be_operation *orig_op = nullptr;
 
   if (operation_kind == NORMAL)
     {
-      orig_op = be_operation::narrow_from_decl (node);
+      orig_op = dynamic_cast<be_operation*> (node);
     }
 
   // Name the operation properly
@@ -683,12 +683,12 @@ be_visitor_amh_pre_proc::create_raise_operation (
 
   ACE_NEW_RETURN (sn,
                   UTL_ScopedName (id,
-                                  0),
+                                  nullptr),
                   -1);
 
   op_name->nconc (sn);
 
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
@@ -707,7 +707,7 @@ be_visitor_amh_pre_proc::create_raise_operation (
           // Copy the exceptions.
           UTL_ExceptList *exceptions = orig_op->exceptions ();
 
-          if (0 != exceptions)
+          if (nullptr != exceptions)
             {
               operation->be_add_exceptions (exceptions->copy ());
             }
@@ -716,7 +716,7 @@ be_visitor_amh_pre_proc::create_raise_operation (
 
   // After having generated the operation we insert it into the
   // exceptionholder valuetype.
-  if (0 == excep_holder->be_add_operation (operation))
+  if (nullptr == excep_holder->be_add_operation (operation))
     {
       return -1;
     }
@@ -751,14 +751,14 @@ be_visitor_amh_pre_proc::generate_get_operation (be_attribute *node)
     static_cast<UTL_ScopedName *> (node->name ()-> copy ());
   get_name->last_component ()->replace_string (new_op_name.c_str ());
 
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (node->field_type (),
                                 AST_Operation::OP_noflags,
                                 get_name,
                                 1,
                                 0),
-                  0);
+                  nullptr);
 
   operation->set_name (get_name);
   operation->set_defined_in (node->defined_in ());
@@ -779,24 +779,24 @@ be_visitor_amh_pre_proc::generate_set_operation (be_attribute *node)
   set_op_name->last_component ()->replace_string (new_op_name.c_str ());
 
   // argument type is the same as the attribute type
-  be_argument *arg = 0;
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                node->field_type (),
                                set_op_name),
-                  0);
+                  nullptr);
 
   arg->set_name (dynamic_cast<UTL_ScopedName *> (node->name ()->copy ()));
 
   // create the operation
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
                                 set_op_name,
                                 0,
                                 0),
-                  0);
+                  nullptr);
 
   operation->set_name (set_op_name);
   operation->set_defined_in (node->defined_in ());
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 d9b13eba963..cc0145cd2e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -40,7 +40,7 @@ be_visitor_ami_pre_proc::be_visitor_ami_pre_proc (be_visitor_context *ctx)
 {
 }
 
-be_visitor_ami_pre_proc::~be_visitor_ami_pre_proc (void)
+be_visitor_ami_pre_proc::~be_visitor_ami_pre_proc ()
 {
 }
 
@@ -122,7 +122,7 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
   AST_Decl *first_stored =
     node->defined_in ()->lookup_by_name_local (node_lname, false);
 
-  if (0 != first_stored && first_stored->node_type () == AST_Decl::NT_home)
+  if (nullptr != first_stored && first_stored->node_type () == AST_Decl::NT_home)
     {
       return 0;
     }
@@ -137,14 +137,14 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
       AST_Decl *d = s->lookup_by_name_local (&local_id, false);
       local_id.destroy ();
 
-      if (0 != d)
+      if (nullptr != d)
         {
           return 0;
         }
     }
 
   AST_Module *module =
-    AST_Module::narrow_from_scope (node->defined_in ());
+    dynamic_cast<AST_Module*> (node->defined_in ());
 
   if (!module)
     {
@@ -203,7 +203,7 @@ be_visitor_ami_pre_proc::visit_operation (be_operation *node)
     }
 
   be_interface *parent =
-    be_interface::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_interface*> (node->defined_in ());
 
   // If we're here, we're sure that the arg traits specialization
   // for this will be needed.
@@ -231,7 +231,7 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node)
 
       set_operation->destroy ();
       delete set_operation;
-      set_operation = 0;
+      set_operation = nullptr;
     }
 
   /// Temporarily generate the get operation.
@@ -243,7 +243,7 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node)
 
   get_operation->destroy ();
   delete get_operation;
-  get_operation = 0;
+  get_operation = nullptr;
 
   return 0;
 }
@@ -275,7 +275,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
   AST_Type **p_intf =
     this->create_inheritance_list (node, n_parents);
 
-  if (p_intf == 0)
+  if (p_intf == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                         "(%N:%l) be_visitor_ami_pre_proc::visit_interface - "
@@ -283,16 +283,16 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
                         0);
     }
 
-  be_interface *reply_handler = 0;
+  be_interface *reply_handler = nullptr;
   ACE_NEW_RETURN (reply_handler,
                   be_interface (reply_handler_name, // name
                                 p_intf,             // list of inherited
                                 n_parents,          // number of inherited
-                                0,                  // list of all ancestors
+                                nullptr,                  // list of all ancestors
                                 0,                  // number of ancestors
                                 0,                  // non-local
                                 0),                 // non-abstract
-                  0);
+                  nullptr);
 
   // Back to reality.
   idl_global->scopes ().pop ();
@@ -307,7 +307,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
   // and set the prefix to the node's prefix. All this is
   // necessary in case the node's prefix was modified after
   // its declaration.
-  reply_handler->AST_Decl::repoID (0);
+  reply_handler->AST_Decl::repoID (nullptr);
   reply_handler->prefix (const_cast<char*> (node->prefix ()));
 
   reply_handler->gen_fwd_helper_name ();
@@ -340,7 +340,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
 
           if (d->node_type () == AST_Decl::NT_attr)
             {
-              be_attribute *attribute = be_attribute::narrow_from_decl (d);
+              be_attribute *attribute = dynamic_cast<be_attribute*> (d);
 
               if (attribute)
                 {
@@ -355,7 +355,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
 
                   get_operation->destroy ();
                   delete get_operation;
-                  get_operation = 0;
+                  get_operation = nullptr;
 
                   if (!attribute->readonly ())
                     {
@@ -370,13 +370,13 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
 
                       set_operation->destroy ();
                       delete set_operation;
-                      set_operation = 0;
+                      set_operation = nullptr;
                     }
                 }
             }
           else
             {
-              be_operation* operation = be_operation::narrow_from_decl (d);
+              be_operation* operation = dynamic_cast<be_operation*> (d);
 
               if (operation)
                 {
@@ -402,11 +402,11 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
   if (node->flags () == AST_Operation::OP_oneway)
     {
       // We do nothing for oneways!
-      return 0;
+      return nullptr;
     }
 
-  Identifier *id = 0;
-  UTL_ScopedName *sn = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *sn = nullptr;
 
   // Create the new name
   // Prepend "sendc_" to the name of the operation
@@ -422,14 +422,14 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
   idl_global->scopes ().push (node->defined_in ());
 
   // Create the operation
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
                                 op_name,
                                 false,
                                 false),
-                  0);
+                  nullptr);
 
   idl_global->scopes ().pop ();
 
@@ -439,7 +439,7 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
 
   // Look up the field type.
   UTL_Scope *s = node->defined_in ();
-  be_interface *parent = be_interface::narrow_from_scope (s);
+  be_interface *parent = dynamic_cast<be_interface*> (s);
 
   // Add the pre- and suffix
   ACE_CString handler_local_name;
@@ -452,11 +452,11 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
 
   AST_Interface *handler = parent->ami_handler ();
 
-  if (0 == handler)
+  if (nullptr == handler)
     {
       op->destroy ();
       delete op;
-      op = 0;
+      op = nullptr;
 
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ami_pre_proc::")
@@ -467,28 +467,28 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
     }
 
   be_interface *field_type =
-    be_interface::narrow_from_decl (handler);
+    dynamic_cast<be_interface*> (handler);
 
   ACE_NEW_RETURN (id,
                   Identifier ("ami_handler"),
-                  0);
+                  nullptr);
 
-  UTL_ScopedName *tmp = 0;
+  UTL_ScopedName *tmp = nullptr;
 
   ACE_NEW_RETURN (tmp,
                   UTL_ScopedName (id,
-                                  0),
-                  0);
+                                  nullptr),
+                  nullptr);
 
   sn = (UTL_ScopedName *)op->name ()->copy ();
   sn->nconc (tmp);
 
-  be_argument *arg = 0;
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                field_type, // is also a valuetype
                                sn),
-                  0);
+                  nullptr);
 
   arg->set_defined_in (op);
   arg->set_name (sn);
@@ -522,20 +522,20 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
 
             }
 
-          AST_Argument *original_arg = AST_Argument::narrow_from_decl (d);
+          AST_Argument *original_arg = dynamic_cast<AST_Argument*> (d);
 
           if (original_arg->direction () == AST_Argument::dir_IN ||
               original_arg->direction () == AST_Argument::dir_INOUT)
             {
               // Create the argument.
-              be_argument *arg = 0;
+              be_argument *arg = nullptr;
               UTL_ScopedName *new_name =
                 (UTL_ScopedName *)original_arg->name ()->copy ();
               ACE_NEW_RETURN (arg,
                               be_argument (AST_Argument::dir_IN,
                                            original_arg->field_type (),
                                            new_name),
-                              0);
+                              nullptr);
 
               arg->set_defined_in (op);
               arg->set_name (new_name);
@@ -565,8 +565,8 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
       return 0;
     }
 
-  Identifier *id = 0;
-  UTL_ScopedName *sn = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *sn = nullptr;
 
   ACE_CString original_op_name (
                   node->name ()->last_component ()->get_string ()
@@ -581,13 +581,13 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
 
   ACE_NEW_RETURN (sn,
                   UTL_ScopedName (id,
-                                  0),
+                                  nullptr),
                   -1);
 
   op_name->nconc (sn);
 
   // Create the operation.
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
@@ -606,18 +606,18 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
                       Identifier ("ami_return_val"),
                       -1);
 
-      UTL_ScopedName *tmp = 0;
+      UTL_ScopedName *tmp = nullptr;
 
       ACE_NEW_RETURN (tmp,
                       UTL_ScopedName (id,
-                                      0),
+                                      nullptr),
                       -1);
 
       sn = (UTL_ScopedName *)operation->name ()->copy ();
       sn->nconc (tmp);
 
       // Create the argument.
-      be_argument *arg = 0;
+      be_argument *arg = nullptr;
       ACE_NEW_RETURN (arg,
                       be_argument (AST_Argument::dir_IN,
                                    node->return_type (),
@@ -642,11 +642,11 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
         {
           AST_Decl *d = si.item ();
 
-          if (d == 0)
+          if (d == nullptr)
             {
               operation->destroy ();
               delete operation;
-              operation = 0;
+              operation = nullptr;
 
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("be_visitor_ami_pre_proc::")
@@ -656,13 +656,13 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
 
             }
 
-          AST_Argument *original_arg = AST_Argument::narrow_from_decl (d);
+          AST_Argument *original_arg = dynamic_cast<AST_Argument*> (d);
 
           if (original_arg->direction () == AST_Argument::dir_INOUT ||
               original_arg->direction () == AST_Argument::dir_OUT)
             {
               // Create the argument.
-              be_argument *arg = 0;
+              be_argument *arg = nullptr;
               UTL_ScopedName *new_name =
                 (UTL_ScopedName *)original_arg->name ()->copy ();
               ACE_NEW_RETURN (arg,
@@ -685,7 +685,7 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
     {
       UTL_ExceptList *exceptions = node->exceptions ();
 
-      if (0 != exceptions)
+      if (nullptr != exceptions)
         {
           operation->be_add_exceptions (exceptions->copy ());
         }
@@ -693,7 +693,7 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
 
   // After having generated the operation we insert it into the
   // reply handler interface.
-  if (0 == reply_handler->be_add_operation (operation))
+  if (nullptr == reply_handler->be_add_operation (operation))
     {
       return -1;
     }
@@ -713,8 +713,8 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node,
     }
 
   // Create the return type, which is "void".
-  Identifier *id = 0;
-  UTL_ScopedName *sn = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *sn = nullptr;
 
   // Create the argument.
   ACE_NEW_RETURN (id,
@@ -723,11 +723,11 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node,
 
   ACE_NEW_RETURN (sn,
                   UTL_ScopedName (id,
-                                  0),
+                                  nullptr),
                   -1);
 
   be_valuetype *excep_holder = be_global->messaging_exceptionholder ();
-  be_argument *arg = 0;
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                excep_holder, // is also a valuetype
@@ -754,7 +754,7 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node,
 
   ACE_NEW_RETURN (sn,
                   UTL_ScopedName (id,
-                                  0),
+                                  nullptr),
                   -1);
 
   op_name->nconc (sn);
@@ -762,7 +762,7 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node,
   AST_PredefinedType *rt = be_global->void_type ();
 
   // Create the operation.
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (rt,
                                 AST_Operation::OP_noflags,
@@ -785,7 +785,7 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node,
   // be needed when collocation is disabled.
   UTL_ExceptList *exceptions = node->exceptions ();
 
-  if (0 != exceptions)
+  if (nullptr != exceptions)
     {
       operation->be_add_exceptions (exceptions->copy ());
     }
@@ -815,7 +815,7 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node)
           }
       }
 
-      AST_Decl **elements = 0;
+      AST_Decl **elements = nullptr;
       ACE_NEW_RETURN (elements,
                       AST_Decl *[number_of_elements],
                       -1);
@@ -842,7 +842,7 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node)
           if (!d)
             {
               delete [] elements;
-              elements = 0;
+              elements = nullptr;
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "(%N:%l) be_visitor_scope::visit_scope - "
                                  "bad node in this scope\n"),
@@ -855,7 +855,7 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node)
               continue;
             }
 
-          be_decl *bd = be_decl::narrow_from_decl (d);
+          be_decl *bd = dynamic_cast<be_decl*> (d);
 
           // Set the scope node as "node" in which the code is being
           // generated so that elements in the node's scope can use it
@@ -866,10 +866,10 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node)
           this->ctx_->node (bd);
 
           // Send the visitor.
-          if (bd == 0 ||  bd->accept (this) == -1)
+          if (bd == nullptr ||  bd->accept (this) == -1)
             {
               delete [] elements;
-              elements = 0;
+              elements = nullptr;
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "(%N:%l) be_visitor_scope::visit_scope - "
                                  "codegen for scope failed\n"),
@@ -878,7 +878,7 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node)
         } // end of while loop
 
       delete [] elements;
-      elements = 0;
+      elements = nullptr;
     } // end of if
 
   return 0;
@@ -910,14 +910,14 @@ be_visitor_ami_pre_proc::generate_get_operation (be_attribute *node)
     static_cast<UTL_ScopedName *> (node->name ()->copy ());
   get_name->last_component ()->replace_string (new_op_name.c_str ());
 
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (node->field_type (),
                                 AST_Operation::OP_noflags,
                                 get_name,
                                 false,
                                 false),
-                  0);
+                  nullptr);
 
   operation->set_name (get_name);
   operation->set_defined_in (node->defined_in ());
@@ -926,7 +926,7 @@ be_visitor_ami_pre_proc::generate_get_operation (be_attribute *node)
   // be needed when collocation is disabled.
   UTL_ExceptList *exceptions = node->get_get_exceptions ();
 
-  if (0 != exceptions)
+  if (nullptr != exceptions)
     {
       operation->be_add_exceptions (exceptions->copy ());
     }
@@ -948,24 +948,24 @@ be_visitor_ami_pre_proc::generate_set_operation (be_attribute *node)
   set_name->last_component ()->replace_string (new_op_name.c_str ());
 
   // Argument type is the same as the attribute type.
-  be_argument *arg = 0;
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                node->field_type (),
                                set_name),
-                  0);
+                  nullptr);
 
   arg->set_name ((UTL_ScopedName *) node->name ()->copy ());
 
   // Create the operation.
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
                                 set_name,
                                 false,
                                 false),
-                  0);
+                  nullptr);
 
   operation->set_name (set_name);
   operation->set_defined_in (node->defined_in ());
@@ -975,7 +975,7 @@ be_visitor_ami_pre_proc::generate_set_operation (be_attribute *node)
   // be needed when collocation is disabled.
   UTL_ExceptList *exceptions = node->get_set_exceptions ();
 
-  if (0 != exceptions)
+  if (nullptr != exceptions)
     {
       operation->be_add_exceptions (exceptions->copy ());
     }
@@ -988,11 +988,11 @@ AST_Type **
 be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
                                                   long &n_rh_parents)
 {
-  AST_Type **retval = 0;
+  AST_Type **retval = nullptr;
 
   long const n_parents = node->n_inherits ();
   AST_Type **parents = node->inherits ();
-  AST_Type *parent = 0;
+  AST_Type *parent = nullptr;
 
   for (long i = 0; i < n_parents; ++i)
     {
@@ -1012,7 +1012,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
 
       ACE_NEW_RETURN (retval,
                       AST_Type *[1],
-                      0);
+                      nullptr);
 
       retval[0] = inherit_intf;
       n_rh_parents = 1;
@@ -1021,7 +1021,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
     {
       ACE_NEW_RETURN (retval,
                       AST_Type *[n_rh_parents],
-                      0);
+                      nullptr);
 
       ACE_CString prefix ("AMI_");
 
@@ -1051,9 +1051,9 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
             node->defined_in ()->lookup_by_name (rh_parent_name,
                                                  true);
 
-          if (d != 0)
+          if (d != nullptr)
             {
-              retval[index] = AST_Interface::narrow_from_decl (d);
+              retval[index] = dynamic_cast<AST_Interface*> (d);
               retval[index++]->set_prefix_with_typeprefix (parent->prefix () ?
                                                            const_cast<char*> (parent->prefix()) :
                                                            const_cast<char*> (""));
@@ -1061,7 +1061,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
 
           rh_parent_name->destroy ();
           delete rh_parent_name;
-          rh_parent_name = 0;
+          rh_parent_name = nullptr;
         }
 
       // Just a sanity check until we're sure this works in all use cases.
@@ -1078,7 +1078,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
 }
 
 int
-be_visitor_ami_pre_proc::generate_ami4ccm_idl (void)
+be_visitor_ami_pre_proc::generate_ami4ccm_idl ()
 {
   /// The interfaces in the list below are from this IDL file,
   /// which then must be processed with the -GC option, so we
@@ -1115,7 +1115,7 @@ be_visitor_ami_pre_proc::generate_ami4ccm_idl (void)
        ! i.done ();
        i.advance ())
     {
-      char **item = 0;
+      char **item = nullptr;
       i.next (item);
 
       UTL_ScopedName *sn =
@@ -1126,25 +1126,25 @@ be_visitor_ami_pre_proc::generate_ami4ccm_idl (void)
 
       AST_Decl *d = s->lookup_by_name (sn, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (sn);
 
           sn->destroy ();
           delete sn;
-          sn = 0;
+          sn = nullptr;
 
           continue;
         }
 
       sn->destroy ();
       delete sn;
-      sn = 0;
+      sn = nullptr;
 
       be_interface *iface =
-        be_interface::narrow_from_decl (d);
+        dynamic_cast<be_interface*> (d);
 
-      if (iface == 0)
+      if (iface == nullptr)
         {
           idl_global->err ()->interface_expected (d);
           continue;
diff --git a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
index 9a16e7d7ced..e9bc800f9a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
@@ -29,7 +29,7 @@ be_visitor_any_extracted_type_decl::be_visitor_any_extracted_type_decl (
 }
 
 be_visitor_any_extracted_type_decl::~be_visitor_any_extracted_type_decl (
-  void)
+  )
 {
 }
 
@@ -59,7 +59,7 @@ int
 be_visitor_any_extracted_type_decl::visit_eventtype (
   be_eventtype *node)
 {
-  os_ << node->full_name () << " * " << var_name_ << " = 0;";
+  os_ << node->full_name () << " * " << var_name_ << " = nullptr;";
   return 0;
 }
 
@@ -157,7 +157,7 @@ be_visitor_any_extracted_type_decl::visit_sequence (be_sequence *node)
 {
   be_type *bt = this->ctx_->alias ();
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       bt = node;
     }
@@ -203,7 +203,7 @@ be_visitor_any_extracted_type_decl::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index c8de4b12d65..c759000c029 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -51,7 +51,7 @@ be_visitor_arg_traits::be_visitor_arg_traits (const char *S,
 {
 }
 
-be_visitor_arg_traits::~be_visitor_arg_traits (void)
+be_visitor_arg_traits::~be_visitor_arg_traits ()
 {
   delete [] this->S_;
 }
@@ -209,7 +209,7 @@ be_visitor_arg_traits::visit_interface_fwd (be_interface_fwd *node)
     }
 
   be_interface *fd =
-    be_interface::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_interface*> (node->full_definition ());
 
   // The logic in visit_interface() should handle what gets generated
   // and what doesn't.
@@ -368,7 +368,7 @@ be_visitor_arg_traits::visit_valuetype_fwd (be_valuetype_fwd *node)
     }
 
   be_valuetype *fd =
-    be_valuetype::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_valuetype*> (node->full_definition ());
 
   // The logic in visit_valuetype() should handle what gets generated
   // and what doesn't.
@@ -418,7 +418,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
   // Arg_Traits<> template parameter.
   if (nt == AST_Decl::NT_string || nt == AST_Decl::NT_wstring)
     {
-      AST_String *str = AST_String::narrow_from_decl (rt);
+      AST_String *str = dynamic_cast<AST_String*> (rt);
       ACE_CDR::ULong bound = str->max_size ()->ev ()->u.ulval;
 
       if (bound > 0)
@@ -484,14 +484,14 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
 int
 be_visitor_arg_traits::visit_attribute (be_attribute *node)
 {
-  if (this->ctx_->alias () != 0 || this->generated (node))
+  if (this->ctx_->alias () != nullptr || this->generated (node))
     {
       return 0;
     }
 
-  AST_String *st = AST_String::narrow_from_decl (node->field_type ());
+  AST_String *st = dynamic_cast<AST_String*> (node->field_type ());
 
-  if (st == 0)
+  if (st == nullptr)
     {
       return 0;
     }
@@ -559,7 +559,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
 int
 be_visitor_arg_traits::visit_argument (be_argument *node)
 {
-  if (this->ctx_->alias () != 0 || this->generated (node))
+  if (this->ctx_->alias () != nullptr || this->generated (node))
     {
       return 0;
     }
@@ -575,7 +575,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
       return 0;
     }
 
-  be_string *st = be_string::narrow_from_decl (bt);
+  be_string *st = dynamic_cast<be_string*> (bt);
   ACE_CDR::ULong bound = st->max_size ()->ev ()->u.ulval;
 
   if (bound == 0)
@@ -674,7 +674,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
   be_typedef *alias = this->ctx_->alias ();
 
   /// No arg traits for anonymous sequences.
-  if (alias == 0)
+  if (alias == nullptr)
     {
       return 0;
     }
@@ -741,7 +741,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
   // since a bounded (w)string of the same length may be used or typedef'd
   // more than once.
 
-  if (alias == 0)
+  if (alias == nullptr)
     {
       os->gen_ifdef_macro (node->flat_name (), guard_suffix.c_str (), false);
     }
@@ -758,14 +758,14 @@ be_visitor_arg_traits::visit_string (be_string *node)
         }
 
       size_t bound_length = num_digits + 1;
-      char* bound_string = 0;
+      char* bound_string = nullptr;
       ACE_NEW_RETURN (bound_string, char[bound_length], -1) ;
       ACE_OS::sprintf (bound_string, ACE_UINT32_FORMAT_SPECIFIER_ASCII, bound);
 
       size_t cat_length = ACE_OS::strlen (alias->local_name ()->get_string ()) +
                           ACE_OS::strlen (bound_string) +
                           1;
-      char* cat_string = 0;
+      char* cat_string = nullptr;
       ACE_NEW_RETURN (cat_string, char[cat_length], -1) ;
       ACE_OS::strcpy (cat_string, alias->local_name ()->get_string ()) ;
       ACE_OS::strcat (cat_string, bound_string);
@@ -785,7 +785,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       *os << be_nl_2
           << "struct ";
 
-      if (alias == 0)
+      if (alias == nullptr)
         {
           *os << node->flat_name ();
         }
@@ -802,7 +802,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       << "class "
       << this->S_ << "Arg_Traits<";
 
-  if (0 == alias)
+  if (nullptr == alias)
     {
       *os << node->flat_name ();
     }
@@ -845,7 +845,7 @@ be_visitor_arg_traits::visit_array (be_array *node)
 
  // Add the alias check here because anonymous arrays can't be
  // operation arguments.
- if (this->generated (node) || this->ctx_->alias () == 0)
+ if (this->generated (node) || this->ctx_->alias () == nullptr)
     {
       return 0;
     }
@@ -992,7 +992,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
 int
 be_visitor_arg_traits::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -1106,7 +1106,7 @@ be_visitor_arg_traits::visit_union (be_union *node)
 int
 be_visitor_arg_traits::visit_union_branch (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -1172,7 +1172,7 @@ be_visitor_arg_traits::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -1212,7 +1212,7 @@ be_visitor_arg_traits::generated (be_decl *node) const
           case TAO_CodeGen::TAO_ROOT_SH:
             return node->srv_arg_traits_gen ();
           default:
-            return 0;
+            return false;
         }
     }
 
@@ -1242,7 +1242,7 @@ be_visitor_arg_traits::generated (be_decl *node,
 }
 
 const char *
-be_visitor_arg_traits::insert_policy (void)
+be_visitor_arg_traits::insert_policy ()
 {
   if (be_global->any_support ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index da6cfa447e6..432928452bd 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -22,7 +22,7 @@ be_visitor_args_arglist::be_visitor_args_arglist (be_visitor_context *ctx)
 {
 }
 
-be_visitor_args_arglist::~be_visitor_args_arglist (void)
+be_visitor_args_arglist::~be_visitor_args_arglist ()
 {
 }
 
@@ -32,7 +32,7 @@ int be_visitor_args_arglist::visit_argument (be_argument *node)
   this->ctx_->node (node);
 
   // Retrieve the type.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -280,7 +280,7 @@ int be_visitor_args_arglist::visit_sequence (be_sequence *node)
   // then 'type_name' below will output 'sequence'.
   if (node->imported () && node->anonymous ())
     {
-      (void) node->create_name (0);
+      (void) node->create_name (nullptr);
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
@@ -417,7 +417,7 @@ int be_visitor_args_arglist::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
index f345289f030..5bad138dd40 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
@@ -18,7 +18,7 @@ be_visitor_args::be_visitor_args (be_visitor_context *ctx)
 {
 }
 
-be_visitor_args::~be_visitor_args (void)
+be_visitor_args::~be_visitor_args ()
 {
 }
 
@@ -39,7 +39,7 @@ be_visitor_args::type_name (be_type *node,
                   '\0',
                   NAMEBUFSIZE);
 
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Use the typedefed name if that is the one
   // used in the IDL defn.
@@ -67,7 +67,7 @@ be_visitor_args::type_name (be_type *node,
 
 // Helper that returns the direction type of the argument
 AST_Argument::Direction
-be_visitor_args::direction (void)
+be_visitor_args::direction ()
 {
   if (this->fixed_direction_ != -1)
     {
@@ -77,7 +77,7 @@ be_visitor_args::direction (void)
   // Grab the argument node. We know that our context has stored the right
   // argument node.
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   return arg->direction ();
 }
@@ -146,7 +146,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node,
   const char *to_from = to_from_str.c_str ();
 
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
   const char *lname = arg->local_name ()->get_string ();
 
   switch (pt)
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
index 891adb52b07..bba3d3ed72e 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
@@ -22,7 +22,7 @@ be_visitor_args_invoke_cs (be_visitor_context *ctx)
 }
 
 be_visitor_args_invoke_cs::
-~be_visitor_args_invoke_cs (void)
+~be_visitor_args_invoke_cs ()
 {
 }
 
@@ -30,7 +30,7 @@ int be_visitor_args_invoke_cs::visit_argument (be_argument *node)
 {
   this->ctx_->node (node);
   be_type *bt =
-    be_type::narrow_from_decl (node->field_type ());
+    dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -128,7 +128,7 @@ int be_visitor_args_invoke_cs::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -175,7 +175,7 @@ int be_visitor_args_invoke_cs::visit_enum (be_enum *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -254,7 +254,7 @@ int be_visitor_args_invoke_cs::visit_sequence (be_sequence *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -298,7 +298,7 @@ int be_visitor_args_invoke_cs::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -402,7 +402,7 @@ int be_visitor_args_invoke_cs::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -447,11 +447,11 @@ be_visitor_args_invoke_cs::visit_home (
 }
 
 
-int be_visitor_args_invoke_cs::emit_common (void)
+int be_visitor_args_invoke_cs::emit_common ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -495,7 +495,7 @@ int be_visitor_args_invoke_cs::emit_common2 (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
index 2c2f2fd09e3..6b3f0e041bf 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
@@ -24,7 +24,7 @@ be_visitor_args_marshal_ss (be_visitor_context *ctx)
 }
 
 be_visitor_args_marshal_ss::
-~be_visitor_args_marshal_ss (void)
+~be_visitor_args_marshal_ss ()
 {
 }
 
@@ -32,7 +32,7 @@ int be_visitor_args_marshal_ss::visit_argument (
   be_argument *node)
 {
   this->ctx_->node (node);
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -130,7 +130,7 @@ int be_visitor_args_marshal_ss::visit_array (be_array *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
   const char *lname = arg->local_name ()->get_string ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
@@ -173,7 +173,7 @@ int be_visitor_args_marshal_ss::visit_enum (be_enum *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
   const char *lname = arg->local_name ()->get_string ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
@@ -252,7 +252,7 @@ int be_visitor_args_marshal_ss::visit_sequence (be_sequence *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
   const char *lname = arg->local_name ()->get_string ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
@@ -297,7 +297,7 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
   const char *lname = arg->local_name ()->get_string ();
   ACE_CDR::ULong bound = node->max_size ()->ev ()->u.ulval;
   bool wide =
@@ -394,7 +394,7 @@ int be_visitor_args_marshal_ss::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -439,11 +439,11 @@ be_visitor_args_marshal_ss::visit_home (
 }
 
 int
-be_visitor_args_marshal_ss::emit_common (void)
+be_visitor_args_marshal_ss::emit_common ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
   const char *lname = arg->local_name ()->get_string ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
@@ -488,7 +488,7 @@ be_visitor_args_marshal_ss::emit_common2 (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
   const char *lname = arg->local_name ()->get_string ();
   AST_Type::SIZE_TYPE st = node->size_type ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
index deb129f256b..47685db6143 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
@@ -21,14 +21,14 @@ be_visitor_args_upcall_ss::be_visitor_args_upcall_ss (be_visitor_context *ctx)
 {
 }
 
-be_visitor_args_upcall_ss::~be_visitor_args_upcall_ss (void)
+be_visitor_args_upcall_ss::~be_visitor_args_upcall_ss ()
 {
 }
 
 int be_visitor_args_upcall_ss::visit_argument (be_argument *node)
 {
   this->ctx_->node (node);
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -61,7 +61,7 @@ int be_visitor_args_upcall_ss::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   switch (this->direction ())
     {
@@ -108,7 +108,7 @@ int be_visitor_args_upcall_ss::visit_enum (be_enum *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   switch (this->direction ())
     {
@@ -158,7 +158,7 @@ int be_visitor_args_upcall_ss::visit_predefined_type (
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
   AST_PredefinedType::PredefinedType pt = node->pt ();
 
   if (pt == AST_PredefinedType::PT_any)
@@ -248,7 +248,7 @@ int be_visitor_args_upcall_ss::visit_sequence (
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   switch (this->direction ())
     {
@@ -307,7 +307,7 @@ int be_visitor_args_upcall_ss::visit_typedef (
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -343,11 +343,11 @@ be_visitor_args_upcall_ss::visit_eventtype_fwd (
   return this->visit_valuetype_fwd (node);
 }
 
-int be_visitor_args_upcall_ss::emit_common (void)
+int be_visitor_args_upcall_ss::emit_common ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   switch (this->direction ())
     {
@@ -397,7 +397,7 @@ int be_visitor_args_upcall_ss::emit_common2 (
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   switch (this->direction ())
     {
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 0bf36459e38..f8505ad354a 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
@@ -23,7 +23,7 @@ be_visitor_args_vardecl_ss::be_visitor_args_vardecl_ss (
 {
 }
 
-be_visitor_args_vardecl_ss::~be_visitor_args_vardecl_ss (void)
+be_visitor_args_vardecl_ss::~be_visitor_args_vardecl_ss ()
 {
 }
 
@@ -31,7 +31,7 @@ int be_visitor_args_vardecl_ss::visit_argument (
   be_argument *node)
 {
   this->ctx_->node (node);
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -65,8 +65,8 @@ int be_visitor_args_vardecl_ss::visit_array (
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_argument*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -113,8 +113,8 @@ int be_visitor_args_vardecl_ss::visit_enum (be_enum *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_argument*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -175,8 +175,8 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_argument*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -260,8 +260,8 @@ int be_visitor_args_vardecl_ss::visit_sequence (
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_argument*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -295,7 +295,7 @@ int be_visitor_args_vardecl_ss::visit_string (
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
   switch (this->direction ())
     {
@@ -358,7 +358,7 @@ int be_visitor_args_vardecl_ss::visit_typedef (
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -401,8 +401,8 @@ be_visitor_args_vardecl_ss::emit_common (
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_argument*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -438,8 +438,8 @@ be_visitor_args_vardecl_ss::emit_common2 (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_argument*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
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 602ab334825..ed5cb8e796f 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,7 +18,7 @@ be_visitor_array_any_op_ch::be_visitor_array_any_op_ch (
 {
 }
 
-be_visitor_array_any_op_ch::~be_visitor_array_any_op_ch (void)
+be_visitor_array_any_op_ch::~be_visitor_array_any_op_ch ()
 {
 }
 
@@ -45,6 +45,6 @@ be_visitor_array_any_op_ch::visit_array (be_array *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  node->cli_hdr_any_op_gen (1);
+  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 163c65fc6e5..cd6b9c256c3 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,7 +18,7 @@ be_visitor_array_any_op_cs::be_visitor_array_any_op_cs (
 {
 }
 
-be_visitor_array_any_op_cs::~be_visitor_array_any_op_cs (void)
+be_visitor_array_any_op_cs::~be_visitor_array_any_op_cs ()
 {
 }
 
@@ -88,7 +88,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "_forany::_tao_any_destructor," << be_nl
-      << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
+      << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
       << "_tao_elem.nocopy ()" << be_idt_nl
       << "? _tao_elem.ptr ()" << be_nl
       << ": "
@@ -108,13 +108,13 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << ">::extract (" << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "_forany::_tao_any_destructor," << be_nl
-      << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << 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
       << "}";
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  node->cli_stub_any_op_gen (1);
+  node->cli_stub_any_op_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array.cpp b/TAO/TAO_IDL/be/be_visitor_array/array.cpp
index 7bb40c6e001..a64f84367e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array.cpp
@@ -16,7 +16,7 @@ be_visitor_array::be_visitor_array (be_visitor_context *ctx)
 {
 }
 
-be_visitor_array::~be_visitor_array (void)
+be_visitor_array::~be_visitor_array ()
 {
 }
 
@@ -147,7 +147,7 @@ be_visitor_array::visit_typedef (be_typedef *node)
 
   if (nt == AST_Decl::NT_pre_defined)
     {
-      AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (pbt);
+      AST_PredefinedType *pdt = dynamic_cast<AST_PredefinedType*> (pbt);
       pt = pdt->pt ();
     }
 
@@ -169,7 +169,7 @@ int
 be_visitor_array::visit_node (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -196,7 +196,7 @@ int
 be_visitor_array::emit_common (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
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 50e9e8facf1..bfcec987fbd 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -17,7 +17,7 @@ be_visitor_array_ch::be_visitor_array_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_array_ch::~be_visitor_array_ch (void)
+be_visitor_array_ch::~be_visitor_array_ch ()
 {
 }
 
@@ -35,7 +35,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
   this->ctx_->node (node);
 
   // Retrieve the type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
   if (!bt)
     {
@@ -70,7 +70,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
   // If the array is an anonymous member and if its element type
   // is a declaration (not a reference), we must generate code for
   // the declaration.
-  if (this->ctx_->alias () == 0 // Not a typedef.
+  if (this->ctx_->alias () == nullptr // Not a typedef.
       && bt->is_child (this->ctx_->scope ()->decl ()))
     {
       int status = 0;
@@ -126,7 +126,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
 
   be_typedef *td = this->ctx_->tdef ();
 
-  if (td == 0)
+  if (td == nullptr)
     {
       // We are dealing with an anonymous array case. Generate a typedef with
       // an _ prepended to the name.
@@ -165,7 +165,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
                   '\0',
                   2);
 
-  if (this->ctx_->tdef () != 0)
+  if (this->ctx_->tdef () != nullptr)
     {
       anon_p[0] = '\0';
     }
@@ -193,7 +193,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       << " {};" << be_nl;
 
   // No _var or _out class for an anonymous (non-typedef'd) array.
-  if (td != 0)
+  if (td != nullptr)
     {
       // Generate _var class decl.
       // An _out decl is generated only for a variable size array.
@@ -270,7 +270,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       storage_class = storage_class + " ";
     }
 
-  if (td != 0)
+  if (td != nullptr)
     {
       // Typedefed array.
       *os << storage_class.c_str() << node->nested_type_name (scope, "_slice")
@@ -306,7 +306,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       *os << storage_class.c_str() << node->nested_type_name (scope, "_slice", "_")
           << " *" << be_nl;
       *os << node->nested_type_name (scope, "_alloc", "_")
-          << " (void);" << be_nl_2;
+          << " ();" << be_nl_2;
       *os << storage_class.c_str() << "void" << be_nl
           << node->nested_type_name (scope, "_free", "_")
           << " (" << be_idt << be_idt_nl;
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 11d7cccbaac..eafc05c4e2d 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -16,7 +16,7 @@ be_visitor_array_ci::be_visitor_array_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_array_ci::~be_visitor_array_ci (void)
+be_visitor_array_ci::~be_visitor_array_ci ()
 {
 }
 
@@ -31,7 +31,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
   this->ctx_->node (node); // save the array node
 
   // If we contain an anonymous sequence, generate code for it here.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
   if (!bt)
     {
@@ -61,7 +61,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
   // If the array is an anonymous member and if its element type
   // is a declaration (not a reference), we must generate code for
   // the declaration.
-  if (this->ctx_->alias () == 0 // Not a typedef.
+  if (this->ctx_->alias () == nullptr // Not a typedef.
       && bt->is_child (this->ctx_->scope ()->decl ()))
     {
       int status = 0;
@@ -121,7 +121,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -153,7 +153,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
 
   if (nt == AST_Decl::NT_typedef)
     {
-      be_typedef *td = be_typedef::narrow_from_decl (bt);
+      be_typedef *td = dynamic_cast<be_typedef*> (bt);
       unique = td->primitive_base_type ()->flat_name ();
     }
   else
@@ -220,7 +220,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << "{" << be_idt_nl;
 
   ACE_CDR::ULong ndims = node->n_dims ();
-  be_array *primitive_type = 0;
+  be_array *primitive_type = nullptr;
 
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
@@ -234,11 +234,11 @@ int be_visitor_array_ci::visit_array (be_array *node)
 
       while (tmp->node_type () == AST_Decl::NT_typedef)
         {
-          be_typedef *tdef = be_typedef::narrow_from_decl (tmp);
-          tmp = be_type::narrow_from_decl (tdef->base_type ());
+          be_typedef *tdef = dynamic_cast<be_typedef*> (tmp);
+          tmp = dynamic_cast<be_type*> (tdef->base_type ());
         }
 
-      primitive_type = be_array::narrow_from_decl (tmp);
+      primitive_type = dynamic_cast<be_array*> (tmp);
     }
 
   *os << "// Zero each individual element." << be_nl;
@@ -249,7 +249,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       // Retrieve the ith dimension value.
       AST_Expression *expr = node->dims ()[i];
 
-      if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
+      if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr)))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                               "(%N:%l) be_visitor_array_cs::"
@@ -341,7 +341,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
   *os << be_nl_2
       << "ACE_INLINE" << be_nl
       << fname << "_slice *" << be_nl
-     << "TAO::Array_Traits<" << fname << "_forany>::alloc (void)"
+     << "TAO::Array_Traits<" << fname << "_forany>::alloc ()"
       << be_idt << be_uidt_nl
       << "{" << be_idt_nl
       << "return " << fname << "_alloc ();" << be_uidt_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 edfd9e18351..df353da2a53 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -16,7 +16,7 @@ be_visitor_array_cs::be_visitor_array_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_array_cs::~be_visitor_array_cs (void)
+be_visitor_array_cs::~be_visitor_array_cs ()
 {
 }
 
@@ -33,7 +33,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
   this->ctx_->node (node);
 
   // Retrieve the type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
   if (!bt)
     {
@@ -70,7 +70,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -111,7 +111,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
 
   // alloc method.
   *os << fname << "_slice *" << be_nl;
-  *os << fname << "_alloc (void)" << be_nl;
+  *os << fname << "_alloc ()" << be_nl;
   *os << "{" << be_idt_nl;
   *os << fname << "_slice *retval = 0;" << be_nl;
   *os << "ACE_NEW_RETURN (retval, ";
@@ -164,7 +164,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
       // Retrieve the ith dimension value.
       AST_Expression *expr = node->dims ()[i];
 
-      if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
+      if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr)))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_array_cs::"
@@ -192,7 +192,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
 
   // Now generate code such that every element of the array gets assigned
   // inside the innermost level of the  nested loops generated above.
-  be_array *primitive_type = 0;
+  be_array *primitive_type = nullptr;
 
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
@@ -206,14 +206,14 @@ int be_visitor_array_cs::visit_array (be_array *node)
 
       while (tmp->node_type () == AST_Decl::NT_typedef)
         {
-          be_typedef *tdef = be_typedef::narrow_from_decl (tmp);
-          tmp = be_type::narrow_from_decl (tdef->base_type ());
+          be_typedef *tdef = dynamic_cast<be_typedef*> (tmp);
+          tmp = dynamic_cast<be_type*> (tdef->base_type ());
         }
 
-      primitive_type = be_array::narrow_from_decl (tmp);
+      primitive_type = dynamic_cast<be_array*> (tmp);
     }
 
-  if (primitive_type != 0)
+  if (primitive_type != nullptr)
     {
       // The base type is a typedef to another array type, so
       // we use the base type's copy method.
@@ -297,7 +297,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
   // If the member's element type
   // is a declaration (not a reference), we must generate code for
   // the declaration.
-  if (this->ctx_->alias () == 0 // Not a typedef.
+  if (this->ctx_->alias () == nullptr // Not a typedef.
       && bt->is_child (this->ctx_->scope ()->decl ()))
     {
       int status = 0;
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 e4f4bda808b..b65ee3bf8c8 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
@@ -19,7 +19,7 @@ be_visitor_array_cdr_op_ch::be_visitor_array_cdr_op_ch (
 {
 }
 
-be_visitor_array_cdr_op_ch::~be_visitor_array_cdr_op_ch (void)
+be_visitor_array_cdr_op_ch::~be_visitor_array_cdr_op_ch ()
 {
 }
 
@@ -33,7 +33,7 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
   AST_Decl::NodeType nt = bt->node_type ();
 
   // If the node is an array of anonymous sequence, we need to
@@ -55,7 +55,7 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
   // If the array is an anonymous member and if its element type
   // is a declaration (not a reference), we must generate code for
   // the declaration.
-  if (this->ctx_->alias () == 0 && // Not a typedef.
+  if (this->ctx_->alias () == nullptr && // Not a typedef.
       bt->is_child (this->ctx_->scope ()->decl ()))
     {
       int status = 0;
@@ -100,12 +100,12 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
 
   *os << be_global->core_versioning_begin () << be_nl;
 
-  be_scope* scope = be_scope::narrow_from_scope (node->defined_in ());
+  be_scope* scope = dynamic_cast<be_scope*> (node->defined_in ());
   be_decl* parent = scope->decl ();
   be_typedef *td = this->ctx_->tdef ();
   ACE_CString arg_name (ACE_CString (parent->full_name ())
                         + "::"
-                        + (td == 0 ? "_" : "")
+                        + (td == nullptr ? "_" : "")
                         + node->local_name ()->get_string ()
                         + "_forany &_tao_array");
 
@@ -129,6 +129,6 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
 
   *os << be_global->core_versioning_end ();
 
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
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 1f8d4590b74..160bf640597 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
@@ -18,7 +18,7 @@ be_visitor_array_cdr_op_cs::be_visitor_array_cdr_op_cs (
 {
 }
 
-be_visitor_array_cdr_op_cs::~be_visitor_array_cdr_op_cs (void)
+be_visitor_array_cdr_op_cs::~be_visitor_array_cdr_op_cs ()
 {
 }
 
@@ -41,7 +41,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
     }
 
   // Retrieve the base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
   if (!bt)
     {
@@ -74,7 +74,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
   // If the array is an anonymous member and if its element type
   // is a declaration (not a reference), we must generate code for
   // the declaration.
-  if (this->ctx_->alias () == 0 // Not a typedef.
+  if (this->ctx_->alias () == nullptr // Not a typedef.
       && bt->is_child (this->ctx_->scope ()->decl ()))
     {
       int status = 0;
@@ -124,7 +124,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
                   '\0',
                   NAMEBUFSIZE);
 
-  bool use_underscore = (this->ctx_->tdef () == 0);
+  bool use_underscore = (this->ctx_->tdef () == nullptr);
 
   if (!use_underscore)
     {
@@ -140,7 +140,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -286,9 +286,9 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (
 
   // Grab the array node.
   be_array *array =
-    be_array::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_array*> (this->ctx_->node ());
 
-  if (array == 0)
+  if (array == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_cdr_op_cs::"
@@ -465,7 +465,7 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (
       // Retrieve the ith dimension value.
       AST_Expression *expr = array->dims ()[i];
 
-      if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
+      if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr)))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_array_cdr_op_cs::"
@@ -542,7 +542,7 @@ be_visitor_array_cdr_op_cs::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -553,10 +553,10 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
   TAO_OutStream *os = this->ctx_->stream ();
   ACE_CDR::ULong i;
   be_array *node =
-    be_array::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_array*> (this->ctx_->node ());
   AST_Decl::NodeType nt = bt->node_type ();
 
-  if (node == 0)
+  if (node == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_cdr_op_cs::"
@@ -580,7 +580,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
       // Retrieve the ith dimension value.
       AST_Expression *expr = node->dims ()[i];
 
-      if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
+      if ((expr == nullptr) || ((expr != nullptr) && (expr->ev () == nullptr)))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_array_cdr_op_cs::"
@@ -633,11 +633,11 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
         }
       else
         {
-          be_string *str = 0;
+          be_string *str = nullptr;
           if (bt->node_type () == AST_Decl::NT_string ||
               bt->node_type () == AST_Decl::NT_wstring)
             {
-              str = be_string::narrow_from_decl (bt);
+              str = dynamic_cast<be_string*> (bt);
               if (!str)
                 {
                   ACE_ERROR_RETURN ((LM_ERROR,
@@ -649,7 +649,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
             }
 
           *os << "_tao_marshal_flag = (strm >> ";
-          if (str != 0 && str->max_size ()->ev ()->u.ulval != 0)
+          if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0)
             {
               if (str->width () == (long) sizeof (char))
                 {
@@ -698,7 +698,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
                   // We need to separately handle this case of pseudo
                   // objects because they have a _var type.
                   be_predefined_type *pt =
-                    be_predefined_type::narrow_from_decl (bt);
+                    dynamic_cast<be_predefined_type*> (bt);
 
                   if (!pt)
                     {
@@ -760,11 +760,11 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
         }
       else
         {
-          be_string *str = 0;
+          be_string *str = nullptr;
           if (bt->node_type () == AST_Decl::NT_string ||
               bt->node_type () == AST_Decl::NT_wstring)
             {
-              str = be_string::narrow_from_decl (bt);
+              str = dynamic_cast<be_string*> (bt);
               if (!str)
                 {
                   ACE_ERROR_RETURN ((LM_ERROR,
@@ -776,7 +776,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
             }
 
           *os << "_tao_marshal_flag = (strm << ";
-          if (str != 0 && str->max_size ()->ev ()->u.ulval != 0)
+          if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0)
             {
               if (str->width () == (long) sizeof (char))
                 {
@@ -825,7 +825,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
                   // We need to separately handle this case of pseudo
                   // objects because they have a _var type.
                   be_predefined_type *pt =
-                    be_predefined_type::narrow_from_decl (bt);
+                    dynamic_cast<be_predefined_type*> (bt);
 
                   if (!pt)
                     {
diff --git a/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp b/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp
index 692367b1245..51fd3762802 100644
--- a/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp
@@ -18,12 +18,12 @@
 be_visitor_attr_assign::be_visitor_attr_assign  (
       be_visitor_context *ctx)
   : be_visitor_decl (ctx),
-    attr_name_ (0),
+    attr_name_ (nullptr),
     attr_name_string_ ("this->")
 {
 }
 
-be_visitor_attr_assign::~be_visitor_attr_assign (void)
+be_visitor_attr_assign::~be_visitor_attr_assign ()
 {
 }
 
@@ -110,7 +110,7 @@ be_visitor_attr_assign::visit_sequence (be_sequence *)
 {
   be_type *bt = this->ctx_->alias ();
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       /// Support anonymous types?
       return -1;
@@ -167,7 +167,7 @@ be_visitor_attr_assign::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_attr_init.cpp b/TAO/TAO_IDL/be/be_visitor_attr_init.cpp
index 5808490dcfc..752eea411f0 100644
--- a/TAO/TAO_IDL/be/be_visitor_attr_init.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attr_init.cpp
@@ -22,7 +22,7 @@ be_visitor_attr_init::be_visitor_attr_init (
 {
 }
 
-be_visitor_attr_init::~be_visitor_attr_init (void)
+be_visitor_attr_init::~be_visitor_attr_init ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp
index 4ff0e93139e..731e32bb18d 100644
--- a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp
@@ -22,7 +22,7 @@ be_visitor_attr_return::be_visitor_attr_return  (
 {
 }
 
-be_visitor_attr_return::~be_visitor_attr_return (void)
+be_visitor_attr_return::~be_visitor_attr_return ()
 {
 }
 
@@ -114,7 +114,7 @@ be_visitor_attr_return::visit_predefined_type (
             << this->attr_name_string_.c_str () << ".in ());";
         break;
       case AST_PredefinedType::PT_any:
-        os_ << "::CORBA::Any * retval = 0;" << be_nl
+        os_ << "::CORBA::Any * retval {};" << be_nl
             << "ACE_NEW_RETURN (" << be_idt_nl
             << "retval," << be_nl
             << "::CORBA::Any ("
@@ -146,7 +146,7 @@ be_visitor_attr_return::visit_sequence (be_sequence *)
 {
   be_type *bt = this->ctx_->alias ();
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       /// Support anonymous types?
       return -1;
@@ -222,7 +222,7 @@ be_visitor_attr_return::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp b/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp
index 6dc5900e433..b434a50014c 100644
--- a/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp
@@ -21,7 +21,7 @@ be_visitor_attr_setarg_type::be_visitor_attr_setarg_type  (
 {
 }
 
-be_visitor_attr_setarg_type::~be_visitor_attr_setarg_type (void)
+be_visitor_attr_setarg_type::~be_visitor_attr_setarg_type ()
 {
 }
 
@@ -30,7 +30,7 @@ be_visitor_attr_setarg_type::visit_array (be_array *)
 {
   be_type *bt = this->ctx_->alias ();
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       /// Support anonymous types?
       return -1;
@@ -107,7 +107,7 @@ be_visitor_attr_setarg_type::visit_sequence (be_sequence *)
 {
   be_type *bt = this->ctx_->alias ();
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       /// Support anonymous types?
       return -1;
@@ -156,7 +156,7 @@ be_visitor_attr_setarg_type::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 77337f29a73..a7069c430a8 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -40,12 +40,12 @@
 be_visitor_attribute::be_visitor_attribute (be_visitor_context *ctx)
   : be_visitor_decl (ctx),
     for_facets_ (false),
-    op_scope_ (0),
+    op_scope_ (nullptr),
     exec_class_extension_ ("_exec_i")
 {
 }
 
-be_visitor_attribute::~be_visitor_attribute (void)
+be_visitor_attribute::~be_visitor_attribute ()
 {
 }
 
@@ -59,14 +59,14 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   AST_Decl *d = ScopeAsDecl (s);
   ACE_CString op_name (this->ctx_->port_prefix ());
   op_name += node->local_name ()->get_string ();
-  Identifier *op_id = 0;
+  Identifier *op_id = nullptr;
   ACE_NEW_RETURN (op_id,
                   Identifier (op_name.c_str ()),
                   -1);
 
-  UTL_ScopedName *op_ln = 0;
+  UTL_ScopedName *op_ln = nullptr;
   ACE_NEW_RETURN (op_ln,
-                  UTL_ScopedName (op_id, 0),
+                  UTL_ScopedName (op_id, nullptr),
                   -1);
 
   UTL_ScopedName *op_sn =
@@ -76,7 +76,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // first the "get" operation
   be_operation get_op (node->field_type (),
                        AST_Operation::OP_noflags,
-                       0,
+                       nullptr,
                        node->is_local (),
                        node->is_abstract ());
 
@@ -84,7 +84,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   get_op.set_name (op_sn);
   UTL_ExceptList *get_exceptions = node->get_get_exceptions ();
 
-  if (0 != get_exceptions)
+  if (nullptr != get_exceptions)
     {
       get_op.be_add_exceptions (get_exceptions->copy ());
     }
@@ -229,7 +229,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // Create the set method.
   Identifier id ("void");
   UTL_ScopedName sn (&id,
-                     0);
+                     nullptr);
 
   // The return type  is "void".
   be_predefined_type rt (AST_PredefinedType::PT_void,
@@ -246,7 +246,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // Create the operation.
   be_operation set_op (&rt,
                        AST_Operation::OP_noflags,
-                       0,
+                       nullptr,
                        node->is_local (),
                        node->is_abstract ());
   set_op.set_defined_in (node->defined_in ());
@@ -255,7 +255,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
 
   UTL_ExceptList *set_exceptions = node->get_set_exceptions ();
 
-  if (0 != set_exceptions)
+  if (nullptr != set_exceptions)
     {
       set_op.be_add_exceptions (set_exceptions->copy ());
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp
index 68056b645bb..7175cdf71f9 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp
@@ -15,12 +15,12 @@
 be_visitor_attribute_ccm_init::be_visitor_attribute_ccm_init (
     be_visitor_context *ctx)
   : be_visitor_any_extracted_type_decl (ctx),
-    attr_ (0)
+    attr_ (nullptr)
 {
 }
 
 be_visitor_attribute_ccm_init::~be_visitor_attribute_ccm_init (
-  void)
+  )
 {
 }
 
@@ -35,7 +35,7 @@ be_visitor_attribute_ccm_init::visit_attribute (
 
   be_interface *intf = this->ctx_->interface ();
 
-  if (intf != 0)
+  if (intf != nullptr)
     {
       AST_Decl::NodeType snt = intf->node_type ();
       AST_Decl::NodeType ant =
@@ -49,7 +49,7 @@ be_visitor_attribute_ccm_init::visit_attribute (
     }
 
   attr_ = node;
-  be_type *ft = be_type::narrow_from_decl (node->field_type ());
+  be_type *ft = dynamic_cast<be_type*> (node->field_type ());
   return ft->accept (this);
 }
 
@@ -165,12 +165,12 @@ be_visitor_attribute_ccm_init::visit_valuetype (
 }
 
 void
-be_visitor_attribute_ccm_init::emit_init_block (void)
+be_visitor_attribute_ccm_init::emit_init_block ()
 {
   this->open_if_block ();
 
   be_visitor_any_extracted_type_decl decl_emitter (this->ctx_);
-  be_type *ft = be_type::narrow_from_decl (attr_->field_type ());
+  be_type *ft = dynamic_cast<be_type*> (attr_->field_type ());
 
   if (ft->accept (&decl_emitter) == -1)
     {
@@ -228,7 +228,7 @@ be_visitor_attribute_ccm_init::emit_error (
 }
 
 void
-be_visitor_attribute_ccm_init::open_if_block (void)
+be_visitor_attribute_ccm_init::open_if_block ()
 {
   os_ << be_nl_2
       << "if (ACE_OS::strcmp (descr_name, \""
@@ -239,7 +239,7 @@ be_visitor_attribute_ccm_init::open_if_block (void)
 }
 
 void
-be_visitor_attribute_ccm_init::close_if_block (void)
+be_visitor_attribute_ccm_init::close_if_block ()
 {
   os_ << be_nl
       << "continue;" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
index 4de6e726456..47583e17a98 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
@@ -19,7 +19,7 @@ be_visitor_attribute_set_from_extracted::be_visitor_attribute_set_from_extracted
 }
 
 be_visitor_attribute_set_from_extracted::~be_visitor_attribute_set_from_extracted (
-  void)
+  )
 {
 }
 
@@ -137,7 +137,7 @@ be_visitor_attribute_set_from_extracted::visit_typedef (
   be_typedef *node)
 {
   be_type *pbt =
-    be_type::narrow_from_decl (node->primitive_base_type ());
+    dynamic_cast<be_type*> (node->primitive_base_type ());
 
   return (pbt->accept (this));
 }
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 f54de26ad5d..2b0c7d847eb 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -74,24 +74,24 @@ be_visitor_ccm_pre_proc::be_visitor_ccm_pre_proc (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
     module_id_ ("Components"),
-    cookie_ (0),
-    already_connected_ (0),
-    invalid_connection_ (0),
-    no_connection_ (0),
-    exceeded_connection_limit_ (0),
-    create_failure_ (0),
-    remove_failure_ (0),
-    finder_failure_ (0),
-    invalid_key_ (0),
-    unknown_key_value_ (0),
-    duplicate_key_value_ (0),
-    comp_ (0),
-    home_ (0),
+    cookie_ (nullptr),
+    already_connected_ (nullptr),
+    invalid_connection_ (nullptr),
+    no_connection_ (nullptr),
+    exceeded_connection_limit_ (nullptr),
+    create_failure_ (nullptr),
+    remove_failure_ (nullptr),
+    finder_failure_ (nullptr),
+    invalid_key_ (nullptr),
+    unknown_key_value_ (nullptr),
+    duplicate_key_value_ (nullptr),
+    comp_ (nullptr),
+    home_ (nullptr),
     ccm_lookups_done_ (false)
 {
 }
 
-be_visitor_ccm_pre_proc::~be_visitor_ccm_pre_proc (void)
+be_visitor_ccm_pre_proc::~be_visitor_ccm_pre_proc ()
 {
   this->module_id_.destroy ();
 }
@@ -212,16 +212,16 @@ be_visitor_ccm_pre_proc::visit_provides (be_provides *node)
       ACE_CString prefix ("provide_");
       prefix += this->ctx_->port_prefix ();
 
-      AST_Operation *provides_op = 0;
+      AST_Operation *provides_op = nullptr;
       UTL_ScopedName *op_name =
         this->create_scoped_name (prefix.c_str (),
                                   node->local_name ()->get_string (),
-                                  0,
+                                  nullptr,
                                   comp_);
       ACE_NEW_RETURN (provides_op,
                       be_operation (node->provides_type (),
                                     AST_Operation::OP_noflags,
-                                    0,
+                                    nullptr,
                                     0,
                                     0),
                       -1);
@@ -230,7 +230,7 @@ be_visitor_ccm_pre_proc::visit_provides (be_provides *node)
       provides_op->set_imported (comp_->imported ());
       provides_op->set_name (op_name);
 
-      if (0 == comp_->be_add_operation (provides_op))
+      if (nullptr == comp_->be_add_operation (provides_op))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -390,7 +390,7 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node)
 {
   AST_Interface *xplicit = this->create_explicit (node);
 
-  if (xplicit == 0)
+  if (xplicit == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -401,7 +401,7 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node)
 
   AST_Interface *implicit = this->create_implicit (node);
 
-  if (implicit == 0)
+  if (implicit == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -420,7 +420,7 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node)
                         -1);
     }
 
-  if (this->create_equivalent (node, xplicit, implicit) == 0)
+  if (this->create_equivalent (node, xplicit, implicit) == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -460,7 +460,7 @@ int
 be_visitor_ccm_pre_proc::visit_eventtype_fwd (be_eventtype_fwd *node)
 {
   be_eventtype *fd =
-    be_eventtype::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_eventtype*> (node->full_definition ());
 
   return this->visit_eventtype (fd);
 }
@@ -480,7 +480,7 @@ be_visitor_ccm_pre_proc::gen_implicit_ops (be_home *node,
 
   AST_Type *pk = node->primary_key ();
 
-  if (pk == 0)
+  if (pk == nullptr)
     {
       return 0;
     }
@@ -534,13 +534,13 @@ be_visitor_ccm_pre_proc::gen_connect_single (be_uses *node)
   UTL_ScopedName *op_full_name =
     this->create_scoped_name (prefix.c_str (),
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -549,8 +549,8 @@ be_visitor_ccm_pre_proc::gen_connect_single (be_uses *node)
   op->set_name (op_full_name);
   Identifier arg_id ("conxn");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  be_argument *arg = 0;
+                           nullptr);
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                node->uses_type (),
@@ -559,19 +559,19 @@ be_visitor_ccm_pre_proc::gen_connect_single (be_uses *node)
   arg_id.destroy ();
   op->be_add_argument (arg);
 
-  UTL_ExceptList *tail = 0;
+  UTL_ExceptList *tail = nullptr;
   ACE_NEW_RETURN (tail,
                   UTL_ExceptList (this->invalid_connection_,
-                                  0),
+                                  nullptr),
                   -1);
-  UTL_ExceptList *connect_single = 0;
+  UTL_ExceptList *connect_single = nullptr;
   ACE_NEW_RETURN (connect_single,
                   UTL_ExceptList (this->already_connected_,
                                   tail),
                  -1);
   op->be_add_exceptions (connect_single);
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -590,27 +590,27 @@ be_visitor_ccm_pre_proc::gen_disconnect_single (be_uses *node)
   UTL_ScopedName *op_full_name =
     this->create_scoped_name (prefix.c_str (),
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (node->uses_type (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
   op->set_name (op_full_name);
   op->set_defined_in (comp_);
   op->set_imported (comp_->imported ());
-  UTL_ExceptList *disconnect_single = 0;
+  UTL_ExceptList *disconnect_single = nullptr;
   ACE_NEW_RETURN (disconnect_single,
                   UTL_ExceptList (this->no_connection_,
-                                  0),
+                                  nullptr),
                  -1);
   op->be_add_exceptions (disconnect_single);
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -629,13 +629,13 @@ be_visitor_ccm_pre_proc::gen_get_connection_single (be_uses *node)
   UTL_ScopedName *op_full_name =
     this->create_scoped_name (prefix.c_str (),
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (node->uses_type (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -643,7 +643,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_single (be_uses *node)
   op->set_defined_in (comp_);
   op->set_imported (comp_->imported ());
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -662,14 +662,14 @@ be_visitor_ccm_pre_proc::gen_connect_multiple (be_uses *node)
   UTL_ScopedName *op_full_name =
     this->create_scoped_name (prefix.c_str (),
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
 
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (this->cookie_,
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -678,8 +678,8 @@ be_visitor_ccm_pre_proc::gen_connect_multiple (be_uses *node)
   op->set_imported (comp_->imported ());
   Identifier arg_id ("connection");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  be_argument *arg = 0;
+                           nullptr);
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                node->uses_type (),
@@ -687,19 +687,19 @@ be_visitor_ccm_pre_proc::gen_connect_multiple (be_uses *node)
                   -1);
   arg_id.destroy ();
   op->be_add_argument (arg);
-  UTL_ExceptList *tail = 0;
+  UTL_ExceptList *tail = nullptr;
   ACE_NEW_RETURN (tail,
                   UTL_ExceptList (this->invalid_connection_,
-                                  0),
+                                  nullptr),
                   -1);
-  UTL_ExceptList *connect_multiple = 0;
+  UTL_ExceptList *connect_multiple = nullptr;
   ACE_NEW_RETURN (connect_multiple,
                   UTL_ExceptList (this->exceeded_connection_limit_,
                                   tail),
                  -1);
   op->be_add_exceptions (connect_multiple);
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -718,13 +718,13 @@ be_visitor_ccm_pre_proc::gen_disconnect_multiple (be_uses *node)
   UTL_ScopedName *op_full_name =
     this->create_scoped_name (prefix.c_str (),
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (node->uses_type (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -733,8 +733,8 @@ be_visitor_ccm_pre_proc::gen_disconnect_multiple (be_uses *node)
   op->set_imported (comp_->imported ());
   Identifier arg_id ("ck");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  be_argument *arg = 0;
+                           nullptr);
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                this->cookie_,
@@ -742,14 +742,14 @@ be_visitor_ccm_pre_proc::gen_disconnect_multiple (be_uses *node)
                   -1);
   arg_id.destroy ();
   op->be_add_argument (arg);
-  UTL_ExceptList *disconnect_multiple = 0;
+  UTL_ExceptList *disconnect_multiple = nullptr;
   ACE_NEW_RETURN (disconnect_multiple,
                   UTL_ExceptList (this->invalid_connection_,
-                                  0),
+                                  nullptr),
                  -1);
   op->be_add_exceptions (disconnect_multiple);
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -768,7 +768,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple (be_uses *node)
   UTL_ScopedName *op_full_name =
     this->create_scoped_name (prefix.c_str (),
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
 
   // Look up the implied IDL typedef created in the front end.
@@ -780,17 +780,17 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple (be_uses *node)
   connections_string += "Connections";
   Identifier connections_id (connections_string.c_str ());
   UTL_ScopedName connections_name (&connections_id,
-                                   0);
+                                   nullptr);
   AST_Decl *d = comp_->lookup_by_name (&connections_name,
                                        true);
-  be_typedef *td = be_typedef::narrow_from_decl (d);
+  be_typedef *td = dynamic_cast<be_typedef*> (d);
   connections_id.destroy ();
 
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (td,
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -798,7 +798,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple (be_uses *node)
   op->set_defined_in (comp_);
   op->set_imported (comp_->imported ());
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -815,13 +815,13 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
       UTL_ScopedName *op_full_name =
         this->create_scoped_name ("push_",
                                   node->local_name (),
-                                  0,
+                                  nullptr,
                                   consumer);
-      be_operation *push_op = 0;
+      be_operation *push_op = nullptr;
       ACE_NEW_RETURN (push_op,
                       be_operation (be_global->void_type (),
                                     AST_Operation::OP_noflags,
-                                    0,
+                                    nullptr,
                                     false,
                                     false),
                       -1);
@@ -829,13 +829,13 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
       push_op->set_imported (node->imported ());
       push_op->set_name (op_full_name);
       ACE_CString arg_string ("the_",
-                              0,
+                              nullptr,
                               false);
       arg_string += node->local_name ();
       Identifier arg_id (arg_string.fast_rep ());
       UTL_ScopedName arg_name (&arg_id,
-                               0);
-      be_argument *arg = 0;
+                               nullptr);
+      be_argument *arg = nullptr;
       ACE_NEW_RETURN (arg,
                       be_argument (AST_Argument::dir_IN,
                                    node,
@@ -844,7 +844,7 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
       arg_id.destroy ();
       push_op->be_add_argument (arg);
 
-      if (0 == consumer->be_add_operation (push_op))
+      if (nullptr == consumer->be_add_operation (push_op))
         {
           return -1;
         }
@@ -863,13 +863,13 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_publishes *node)
   UTL_ScopedName *op_name =
     this->create_scoped_name ("subscribe_",
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (this->cookie_,
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -879,11 +879,11 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_publishes *node)
 
   AST_Interface *i = this->lookup_consumer (node);
 
-  if (i == 0)
+  if (i == nullptr)
     {
       op->destroy ();
       delete op;
-      op = 0;
+      op = nullptr;
 
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -894,22 +894,22 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_publishes *node)
 
   Identifier arg_id ("consumer");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  be_argument *arg = 0;
+                           nullptr);
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                i,
                                &arg_name),
                   -1);
   op->be_add_argument (arg);
-  UTL_ExceptList *subscribe = 0;
+  UTL_ExceptList *subscribe = nullptr;
   ACE_NEW_RETURN (subscribe,
                   UTL_ExceptList (this->exceeded_connection_limit_,
-                                  0),
+                                  nullptr),
                   -1);
   op->be_add_exceptions (subscribe);
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -927,7 +927,7 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_publishes *node)
 
   AST_Interface *i = this->lookup_consumer (node);
 
-  if (i == 0)
+  if (i == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -939,13 +939,13 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_publishes *node)
   UTL_ScopedName *op_name =
     this->create_scoped_name ("unsubscribe_",
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (i,
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -954,22 +954,22 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_publishes *node)
   op->set_name (op_name);
   Identifier arg_id ("ck");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  be_argument *arg = 0;
+                           nullptr);
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                this->cookie_,
                                &arg_name),
                   -1);
   op->be_add_argument (arg);
-  UTL_ExceptList *unsubscribe = 0;
+  UTL_ExceptList *unsubscribe = nullptr;
   ACE_NEW_RETURN (unsubscribe,
                   UTL_ExceptList (this->invalid_connection_,
-                                  0),
+                                  nullptr),
                   -1);
   op->be_add_exceptions (unsubscribe);
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -988,13 +988,13 @@ be_visitor_ccm_pre_proc::gen_emits_connect (be_emits *node)
   UTL_ScopedName *op_name =
     this->create_scoped_name ("connect_",
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -1003,11 +1003,11 @@ be_visitor_ccm_pre_proc::gen_emits_connect (be_emits *node)
   op->set_imported (comp_->imported ());
   AST_Interface *i = this->lookup_consumer (node);
 
-  if (i == 0)
+  if (i == nullptr)
     {
       op->destroy ();
       delete op;
-      op = 0;
+      op = nullptr;
 
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -1018,22 +1018,22 @@ be_visitor_ccm_pre_proc::gen_emits_connect (be_emits *node)
 
   Identifier arg_id ("consumer");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  be_argument *arg = 0;
+                           nullptr);
+  be_argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                i,
                                &arg_name),
                   -1);
   op->be_add_argument (arg);
-  UTL_ExceptList *emits_connect = 0;
+  UTL_ExceptList *emits_connect = nullptr;
   ACE_NEW_RETURN (emits_connect,
                   UTL_ExceptList (this->already_connected_,
-                                  0),
+                                  nullptr),
                   -1);
   op->be_add_exceptions (emits_connect);
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -1051,7 +1051,7 @@ be_visitor_ccm_pre_proc::gen_emits_disconnect (be_emits *node)
 
   AST_Interface *i = this->lookup_consumer (node);
 
-  if (i == 0)
+  if (i == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -1063,27 +1063,27 @@ be_visitor_ccm_pre_proc::gen_emits_disconnect (be_emits *node)
   UTL_ScopedName *op_name =
     this->create_scoped_name ("disconnect_",
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (i,
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
   op->set_name (op_name);
   op->set_defined_in (comp_);
   op->set_imported (comp_->imported ());
-  UTL_ExceptList *emits_disconnect = 0;
+  UTL_ExceptList *emits_disconnect = nullptr;
   ACE_NEW_RETURN (emits_disconnect,
                   UTL_ExceptList (this->no_connection_,
-                                  0),
+                                  nullptr),
                   -1);
   op->be_add_exceptions (emits_disconnect);
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -1101,7 +1101,7 @@ be_visitor_ccm_pre_proc::gen_get_consumer (be_consumes *node)
 
   AST_Interface *i = this->lookup_consumer (node);
 
-  if (i == 0)
+  if (i == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ccm_pre_proc::")
@@ -1113,13 +1113,13 @@ be_visitor_ccm_pre_proc::gen_get_consumer (be_consumes *node)
   UTL_ScopedName *op_name =
     this->create_scoped_name ("get_consumer_",
                               node->local_name ()->get_string (),
-                              0,
+                              nullptr,
                               comp_);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (i,
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -1127,7 +1127,7 @@ be_visitor_ccm_pre_proc::gen_get_consumer (be_consumes *node)
   op->set_defined_in (comp_);
   op->set_imported (comp_->imported ());
 
-  if (0 == comp_->be_add_operation (op))
+  if (nullptr == comp_->be_add_operation (op))
     {
       return -1;
     }
@@ -1139,32 +1139,32 @@ int
 be_visitor_ccm_pre_proc::gen_create (be_home *node,
                                      AST_Interface *implicit)
 {
-  UTL_ScopedName *op_name = this->create_scoped_name (0,
+  UTL_ScopedName *op_name = this->create_scoped_name (nullptr,
                                                       "create",
-                                                      0,
+                                                      nullptr,
                                                       implicit);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (node->managed_component (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
   op->set_name (op_name);
   AST_Type *pk = node->primary_key ();
-  UTL_ExceptList *exceps = 0;
+  UTL_ExceptList *exceps = nullptr;
   ACE_NEW_RETURN (exceps,
                   UTL_ExceptList (this->create_failure_,
-                                  0),
+                                  nullptr),
                   -1);
 
-  if (pk != 0 && !be_global->gen_lwccm ())
+  if (pk != nullptr && !be_global->gen_lwccm ())
     {
       Identifier arg_id ("key");
       UTL_ScopedName arg_name (&arg_id,
-                               0);
-      AST_Argument *arg = 0;
+                               nullptr);
+      AST_Argument *arg = nullptr;
       ACE_NEW_RETURN (arg,
                       be_argument (AST_Argument::dir_IN,
                                    pk,
@@ -1173,12 +1173,12 @@ be_visitor_ccm_pre_proc::gen_create (be_home *node,
       arg_id.destroy ();
       op->be_add_argument (arg);
 
-      UTL_ExceptList *tail = 0;
+      UTL_ExceptList *tail = nullptr;
       ACE_NEW_RETURN (tail,
                       UTL_ExceptList (this->invalid_key_,
-                                      0),
+                                      nullptr),
                       -1);
-      UTL_ExceptList *middle = 0;
+      UTL_ExceptList *middle = nullptr;
       ACE_NEW_RETURN (middle,
                       UTL_ExceptList (this->duplicate_key_value_,
                                       tail),
@@ -1190,7 +1190,7 @@ be_visitor_ccm_pre_proc::gen_create (be_home *node,
   op->set_defined_in (implicit);
   op->set_imported (node->imported ());
 
-  if (0 == implicit->be_add_operation (op))
+  if (nullptr == implicit->be_add_operation (op))
     {
       return -1;
     }
@@ -1202,15 +1202,15 @@ int
 be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node,
                                                   AST_Interface *implicit)
 {
-  UTL_ScopedName *op_name = this->create_scoped_name (0,
+  UTL_ScopedName *op_name = this->create_scoped_name (nullptr,
                                                       "find_by_primary_key",
-                                                      0,
+                                                      nullptr,
                                                       implicit);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (node->managed_component (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -1218,8 +1218,8 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node,
   AST_Type *pk = node->primary_key ();
   Identifier arg_id ("key");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  AST_Argument *arg = 0;
+                           nullptr);
+  AST_Argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                pk,
@@ -1228,14 +1228,14 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node,
   arg_id.destroy ();
   op->be_add_argument (arg);
 
-  UTL_ExceptList *tail = 0;
-  UTL_ExceptList *middle = 0;
+  UTL_ExceptList *tail = nullptr;
+  UTL_ExceptList *middle = nullptr;
 
   if (!be_global->gen_lwccm ())
     {
       ACE_NEW_RETURN (tail,
                       UTL_ExceptList (this->invalid_key_,
-                                      0),
+                                      nullptr),
                       -1);
       ACE_NEW_RETURN (middle,
                       UTL_ExceptList (this->unknown_key_value_,
@@ -1243,7 +1243,7 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node,
                       -1);
     }
 
-  UTL_ExceptList *exceps = 0;
+  UTL_ExceptList *exceps = nullptr;
   ACE_NEW_RETURN (exceps,
                   UTL_ExceptList (this->finder_failure_,
                                   middle),
@@ -1252,7 +1252,7 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node,
   op->set_defined_in (implicit);
   op->set_imported (node->imported ());
 
-  if (0 == implicit->be_add_operation (op))
+  if (nullptr == implicit->be_add_operation (op))
     {
       return -1;
     }
@@ -1264,15 +1264,15 @@ int
 be_visitor_ccm_pre_proc::gen_remove (be_home *node,
                                      AST_Interface *implicit)
 {
-  UTL_ScopedName *op_name = this->create_scoped_name (0,
+  UTL_ScopedName *op_name = this->create_scoped_name (nullptr,
                                                       "remove",
-                                                      0,
+                                                      nullptr,
                                                       implicit);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
@@ -1280,8 +1280,8 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node,
   AST_Type *pk = node->primary_key ();
   Identifier arg_id ("key");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  AST_Argument *arg = 0;
+                           nullptr);
+  AST_Argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                pk,
@@ -1290,14 +1290,14 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node,
   arg_id.destroy ();
   op->be_add_argument (arg);
 
-  UTL_ExceptList *tail = 0;
-  UTL_ExceptList *middle = 0;
+  UTL_ExceptList *tail = nullptr;
+  UTL_ExceptList *middle = nullptr;
 
   if (!be_global->gen_lwccm ())
     {
       ACE_NEW_RETURN (tail,
                       UTL_ExceptList (this->invalid_key_,
-                                      0),
+                                      nullptr),
                       -1);
       ACE_NEW_RETURN (middle,
                       UTL_ExceptList (this->unknown_key_value_,
@@ -1305,7 +1305,7 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node,
                       -1);
     }
 
-  UTL_ExceptList *exceps = 0;
+  UTL_ExceptList *exceps = nullptr;
   ACE_NEW_RETURN (exceps,
                   UTL_ExceptList (this->remove_failure_,
                                   middle),
@@ -1314,7 +1314,7 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node,
   op->set_defined_in (implicit);
   op->set_imported (node->imported ());
 
-  if (0 == implicit->be_add_operation (op))
+  if (nullptr == implicit->be_add_operation (op))
     {
       return -1;
     }
@@ -1326,23 +1326,23 @@ int
 be_visitor_ccm_pre_proc::gen_get_primary_key (be_home *node,
                                               AST_Interface *implicit)
 {
-  UTL_ScopedName *op_name = this->create_scoped_name (0,
+  UTL_ScopedName *op_name = this->create_scoped_name (nullptr,
                                                       "get_primary_key",
-                                                      0,
+                                                      nullptr,
                                                       implicit);
-  be_operation *op = 0;
+  be_operation *op = nullptr;
   ACE_NEW_RETURN (op,
                   be_operation (node->primary_key (),
                                 AST_Operation::OP_noflags,
-                                0,
+                                nullptr,
                                 0,
                                 0),
                   -1);
   op->set_name (op_name);
   Identifier arg_id ("comp");
   UTL_ScopedName arg_name (&arg_id,
-                           0);
-  AST_Argument *arg = 0;
+                           nullptr);
+  AST_Argument *arg = nullptr;
   ACE_NEW_RETURN (arg,
                   be_argument (AST_Argument::dir_IN,
                                node->managed_component (),
@@ -1353,7 +1353,7 @@ be_visitor_ccm_pre_proc::gen_get_primary_key (be_home *node,
   op->set_defined_in (implicit);
   op->set_imported (node->imported ());
 
-  if (0 == implicit->be_add_operation (op))
+  if (nullptr == implicit->be_add_operation (op))
     {
       return -1;
     }
@@ -1377,13 +1377,13 @@ be_visitor_ccm_pre_proc::gen_extended_port (be_porttype *pt)
 }
 
 int
-be_visitor_ccm_pre_proc::lookup_cookie (void)
+be_visitor_ccm_pre_proc::lookup_cookie ()
 {
-  if (this->cookie_ == 0)
+  if (this->cookie_ == nullptr)
     {
       Identifier local_id ("Cookie");
       UTL_ScopedName local_name (&local_id,
-                                 0);
+                                 nullptr);
       UTL_ScopedName cookie_name (&this->module_id_,
                                   &local_name);
       AST_Decl *d =
@@ -1391,15 +1391,15 @@ be_visitor_ccm_pre_proc::lookup_cookie (void)
                                              true);
       local_id.destroy ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (&cookie_name);
           return -1;
         }
 
-      this->cookie_ = be_valuetype::narrow_from_decl (d);
+      this->cookie_ = dynamic_cast<be_valuetype*> (d);
 
-      if (this->cookie_ == 0)
+      if (this->cookie_ == nullptr)
         {
           idl_global->err ()->valuetype_expected (d);
           return -1;
@@ -1410,7 +1410,7 @@ be_visitor_ccm_pre_proc::lookup_cookie (void)
 }
 
 int
-be_visitor_ccm_pre_proc::lookup_exceptions (void)
+be_visitor_ccm_pre_proc::lookup_exceptions ()
 {
   int status = 0;
 
@@ -1460,7 +1460,7 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name,
 {
   Identifier id (name);
   UTL_ScopedName local_name (&id,
-                             0);
+                             nullptr);
   UTL_ScopedName scoped_name (&this->module_id_,
                               &local_name);
   AST_Decl *d =
@@ -1468,15 +1468,15 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name,
                                          true);
   id.destroy ();
 
-  if (d == 0)
+  if (d == nullptr)
     {
       idl_global->err ()->lookup_error (&scoped_name);
       return -1;
     }
 
-  result = be_exception::narrow_from_decl (d);
+  result = dynamic_cast<be_exception*> (d);
 
-  if (result == 0)
+  if (result == nullptr)
     {
       return -1;
     }
@@ -1491,7 +1491,7 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
   UTL_Scope *s = node->defined_in ();
 
   UTL_ScopedName *consumer_name =
-    this->create_scoped_name (0,
+    this->create_scoped_name (nullptr,
                               node->local_name (),
                               "Consumer",
                               ScopeAsDecl (node->defined_in ()));
@@ -1500,13 +1500,13 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
   /// declared eventtypes. Since forward declarations can
   /// appear any number of times, we need to check that this
   /// event consumer hasn't already been created.
-  if (s->lookup_by_name (consumer_name, true) != 0)
+  if (s->lookup_by_name (consumer_name, true) != nullptr)
     {
       return 0;
     }
 
-  AST_Interface *event_consumer = 0;
-  AST_Module *m = AST_Module::narrow_from_scope (s);
+  AST_Interface *event_consumer = nullptr;
+  AST_Module *m = dynamic_cast<AST_Module*> (s);
 
   // We're at global scope here so we need to fool the scope stack
   // for a minute so the correct repo id can be calculated at
@@ -1515,11 +1515,11 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
 
   Identifier parent_id ("EventConsumerBase");
   UTL_ScopedName parent_local_name (&parent_id,
-                                    0);
+                                    nullptr);
   UTL_ScopedName parent_full_name (&this->module_id_,
                                    &parent_local_name);
   UTL_NameList parent_list (&parent_full_name,
-                            0);
+                            nullptr);
   FE_InterfaceHeader header (consumer_name,
                              &parent_list,
                              false,
@@ -1543,7 +1543,7 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
   event_consumer->set_imported (node->imported ());
   event_consumer->set_name (consumer_name);
   be_interface *bec =
-    be_interface::narrow_from_decl (event_consumer);
+    dynamic_cast<be_interface*> (event_consumer);
   bec->original_interface (node);
 
   // Set repo id to 0, so it will be recomputed on the next access,
@@ -1551,10 +1551,10 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
   // necessary in case the eventtype's prefix was modified after
   // its declaration. We assume 'implied IDL' means that the
   // derived event consumer interface should have the same prefix.
-  event_consumer->repoID (0);
+  event_consumer->repoID (nullptr);
   event_consumer->prefix (const_cast<char*> (node->prefix ()));
 
-  be_type::narrow_from_decl (event_consumer)->gen_fwd_helper_name ();
+  dynamic_cast<be_type*> (event_consumer)->gen_fwd_helper_name ();
   m->be_add_interface (event_consumer);
   return this->gen_push_op (node,
                             event_consumer);
@@ -1571,17 +1571,17 @@ be_visitor_ccm_pre_proc::lookup_consumer (be_field *node)
     impl->defined_in ()->lookup_by_name_local (&rettype_id, false);
   rettype_id.destroy ();
 
-  if (d == 0)
+  if (d == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
-  AST_Interface *i = AST_Interface::narrow_from_decl (d);
+  AST_Interface *i = dynamic_cast<AST_Interface*> (d);
 
-  if (i == 0)
+  if (i == nullptr)
     {
       idl_global->err ()->interface_expected (d);
-      return 0;
+      return nullptr;
     }
 
   return i;
@@ -1607,32 +1607,32 @@ be_visitor_ccm_pre_proc::create_explicit (be_home *node)
 AST_Interface *
 be_visitor_ccm_pre_proc::create_implicit (be_home *node)
 {
-  Identifier *parent_id = 0;
+  Identifier *parent_id = nullptr;
   ACE_NEW_RETURN (parent_id,
                   Identifier ("KeylessCCMHome"),
-                  0);
+                  nullptr);
 
-  UTL_ScopedName *parent_local_name = 0;
+  UTL_ScopedName *parent_local_name = nullptr;
   ACE_NEW_RETURN (parent_local_name,
-                  UTL_ScopedName (parent_id, 0),
-                  0);
+                  UTL_ScopedName (parent_id, nullptr),
+                  nullptr);
 
-  UTL_ScopedName *parent_full_name = 0;
+  UTL_ScopedName *parent_full_name = nullptr;
   ACE_NEW_RETURN (parent_full_name,
                   UTL_ScopedName (this->module_id_.copy (),
                                   parent_local_name),
-                  0);
+                  nullptr);
 
-  UTL_NameList parent_list (parent_full_name, 0);
+  UTL_NameList parent_list (parent_full_name, nullptr);
 
-  UTL_NameList *parent_list_ptr = 0;
+  UTL_NameList *parent_list_ptr = nullptr;
 
-  if (node->primary_key () == 0)
+  if (node->primary_key () == nullptr)
     {
       parent_list_ptr = &parent_list;
     }
 
-  FE_InterfaceHeader header (0,
+  FE_InterfaceHeader header (nullptr,
                              parent_list_ptr,
                              false,
                              false,
@@ -1644,12 +1644,12 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node)
   idl_global->scopes ().push (node->defined_in ());
 
   UTL_ScopedName *implicit_name =
-    this->create_scoped_name (0,
+    this->create_scoped_name (nullptr,
                               node->local_name (),
                               "Implicit",
                               ScopeAsDecl (node->defined_in ()));
 
-  be_interface *i = 0;
+  be_interface *i = nullptr;
   ACE_NEW_RETURN (i,
                   be_interface (implicit_name,
                                 header.inherits (),
@@ -1658,7 +1658,7 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node)
                                 header.n_inherits_flat (),
                                 false,
                                 false),
-                  0);
+                  nullptr);
 
   // Back to reality.
   idl_global->scopes ().pop ();
@@ -1675,7 +1675,7 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node)
 
   i->gen_fwd_helper_name ();
   i->original_interface (node);
-  AST_Module *m = AST_Module::narrow_from_scope (node->defined_in ());
+  AST_Module *m = dynamic_cast<AST_Module*> (node->defined_in ());
   m->be_add_interface (i);
 
   return i;
@@ -1688,15 +1688,15 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
 {
   UTL_Scope *s = node->defined_in ();
   UTL_ScopedName *equiv_name =
-    this->create_scoped_name (0,
+    this->create_scoped_name (nullptr,
                               node->local_name (),
-                              0,
+                              nullptr,
                               ScopeAsDecl (s));
   UTL_NameList tail (implicit->name (),
-                     0);
+                     nullptr);
   UTL_NameList parent_list (xplicit->name (),
                             &tail);
-  FE_InterfaceHeader header (0,
+  FE_InterfaceHeader header (nullptr,
                              &parent_list,
                              false,
                              false,
@@ -1707,7 +1707,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
   // interface construction time.
   idl_global->scopes ().push (node->defined_in ());
 
-  be_interface *retval = 0;
+  be_interface *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   be_interface (equiv_name,
                                 header.inherits (),
@@ -1716,7 +1716,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
                                 header.n_inherits_flat (),
                                 false,
                                 false),
-                  0);
+                  nullptr);
 
   // Back to reality.
   idl_global->scopes ().pop ();
@@ -1733,12 +1733,12 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
   UTL_ScopedName *unmangled_name =
     static_cast<UTL_ScopedName *> (node->name ()->copy ());
   UTL_ScopedName *mangled_name =
-    this->create_scoped_name (0,
+    this->create_scoped_name (nullptr,
                               node->local_name (),
                               "_tao_home_name_extension",
                               ScopeAsDecl (s));
   node->set_name (mangled_name);
-  AST_Module *m = AST_Module::narrow_from_scope (s);
+  AST_Module *m = dynamic_cast<AST_Module*> (s);
 
   /// Calling be_add_interface() here calls add_to_referenced(),
   /// which will give a redef error.
@@ -1755,19 +1755,19 @@ be_visitor_ccm_pre_proc::create_scoped_name (const char *prefix,
                                              AST_Decl *parent)
 {
   ACE_CString local_string (prefix,
-                            0,
+                            nullptr,
                             false);
   local_string += local_name;
   local_string += suffix;
-  Identifier *local_id = 0;
+  Identifier *local_id = nullptr;
   ACE_NEW_RETURN (local_id,
                   Identifier (local_string.fast_rep ()),
-                  0);
-  UTL_ScopedName *last_segment = 0;
+                  nullptr);
+  UTL_ScopedName *last_segment = nullptr;
   ACE_NEW_RETURN (last_segment,
                   UTL_ScopedName (local_id,
-                                  0),
-                  0);
+                                  nullptr),
+                  nullptr);
   UTL_ScopedName *full_name =
     static_cast<UTL_ScopedName *> (parent->name ()->copy ());
   full_name->nconc (last_segment);
@@ -1777,28 +1777,28 @@ be_visitor_ccm_pre_proc::create_scoped_name (const char *prefix,
 UTL_NameList *
 be_visitor_ccm_pre_proc::compute_inheritance (be_home *node)
 {
-  UTL_NameList *retval = 0;
+  UTL_NameList *retval = nullptr;
 
-  if (node->base_home () == 0)
+  if (node->base_home () == nullptr)
     {
-      Identifier *local_id = 0;
+      Identifier *local_id = nullptr;
       ACE_NEW_RETURN (local_id,
                       Identifier ("CCMHome"),
-                      0);
-      UTL_ScopedName *local_name = 0;
+                      nullptr);
+      UTL_ScopedName *local_name = nullptr;
       ACE_NEW_RETURN (local_name,
                       UTL_ScopedName (local_id,
-                                      0),
-                      0);
-      UTL_ScopedName *full_name = 0;
+                                      nullptr),
+                      nullptr);
+      UTL_ScopedName *full_name = nullptr;
       ACE_NEW_RETURN (full_name,
                       UTL_ScopedName (this->module_id_.copy (),
                                       local_name),
-                      0);
+                      nullptr);
       ACE_NEW_RETURN (retval,
                       UTL_NameList (full_name,
-                                    0),
-                      0);
+                                    nullptr),
+                      nullptr);
 
     }
   else
@@ -1812,13 +1812,13 @@ be_visitor_ccm_pre_proc::compute_inheritance (be_home *node)
       parent_name->last_component ()->replace_string (new_local.c_str ());
       ACE_NEW_RETURN (retval,
                       UTL_NameList (parent_name,
-                                    0),
-                      0);
+                                    nullptr),
+                      nullptr);
     }
 
   long n_supports = node->n_inherits ();
-  UTL_ScopedName *supported_name = 0;
-  UTL_NameList *conc_value = 0;
+  UTL_ScopedName *supported_name = nullptr;
+  UTL_NameList *conc_value = nullptr;
 
   for (long i = 0; i < n_supports; ++i)
     {
@@ -1826,8 +1826,8 @@ be_visitor_ccm_pre_proc::compute_inheritance (be_home *node)
         static_cast<UTL_ScopedName *> (node->inherits ()[i]->name ()->copy ());
       ACE_NEW_RETURN (conc_value,
                       UTL_NameList (supported_name,
-                                    0),
-                      0);
+                                    nullptr),
+                      nullptr);
       retval->nconc (conc_value);
     }
 
@@ -1835,7 +1835,7 @@ be_visitor_ccm_pre_proc::compute_inheritance (be_home *node)
 }
 
 int
-be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
+be_visitor_ccm_pre_proc::generate_ami4ccm_uses ()
 {
   /// The interfaces in the list below are from this IDL file,
   /// which then must be processed with the -GC option, so we
@@ -1857,7 +1857,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
        ! i.done ();
        i.advance ())
     {
-      char **item = 0;
+      char **item = nullptr;
       i.next (item);
 
       UTL_ScopedName *sn =
@@ -1868,24 +1868,24 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
 
       AST_Decl *d = s->lookup_by_name (sn, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (sn);
 
           sn->destroy ();
           delete sn;
-          sn = 0;
+          sn = nullptr;
 
           continue;
         }
 
       sn->destroy ();
       delete sn;
-      sn = 0;
+      sn = nullptr;
 
-      be_uses *u = be_uses::narrow_from_decl (d);
+      be_uses *u = dynamic_cast<be_uses*> (d);
 
-      if (u == 0)
+      if (u == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_ccm_pre_proc")
@@ -1896,7 +1896,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
         }
 
       be_interface *iface =
-        be_interface::narrow_from_decl (u->uses_type ());
+        dynamic_cast<be_interface*> (u->uses_type ());
 
       /// The real AMI_xxx exists only in the *A.idl file, so
       /// we create a dummy as the uses type for the implied
@@ -1904,23 +1904,23 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
       /// already been created for this uses type.
 
       be_interface *ami_iface =
-        be_interface::narrow_from_decl (iface->ami4ccm_uses ());
+        dynamic_cast<be_interface*> (iface->ami4ccm_uses ());
 
-      if (ami_iface == 0)
+      if (ami_iface == nullptr)
         {
           ACE_CString iname ("AMI4CCM_");
 
           iname += iface->local_name ();
           Identifier itmp_id (iname.c_str ());
-          UTL_ScopedName itmp_sn (&itmp_id, 0);
+          UTL_ScopedName itmp_sn (&itmp_id, nullptr);
 
           s = iface->defined_in ();
           idl_global->scopes ().push (s);
           ACE_NEW_RETURN (ami_iface,
                           be_interface (&itmp_sn,
+                                        nullptr,
                                         0,
-                                        0,
-                                        0,
+                                        nullptr,
                                         0,
                                         true,
                                         false),
@@ -1945,11 +1945,11 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
       ACE_CString uname ("sendc_");
       uname += u->local_name ()->get_string ();
       Identifier utmp_id (uname.c_str ());
-      UTL_ScopedName utmp_sn (&utmp_id, 0);
+      UTL_ScopedName utmp_sn (&utmp_id, nullptr);
 
       s = u->defined_in ();
       idl_global->scopes ().push (s);
-      be_uses *ami_uses = 0;
+      be_uses *ami_uses = nullptr;
       ACE_NEW_RETURN (ami_uses,
                       be_uses (&utmp_sn,
                                ami_iface,
@@ -1970,7 +1970,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
         */
           // Grammar ensures this narrowing will never be 0.
           AST_Component *c =
-            AST_Component::narrow_from_scope (s);
+            dynamic_cast<AST_Component*> (s);
           FE_Utils::create_uses_multiple_stuff (c, ami_uses);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component.cpp b/TAO/TAO_IDL/be/be_visitor_component/component.cpp
index 5bf1836db45..72050e8148e 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component.cpp
@@ -16,7 +16,7 @@ be_visitor_component::be_visitor_component (be_visitor_context *ctx)
 {
 }
 
-be_visitor_component::~be_visitor_component (void)
+be_visitor_component::~be_visitor_component ()
 {
 }
 
@@ -316,7 +316,7 @@ be_visitor_component::visit_extended_port (
   /// original porttype, this is a way for visitors down the
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
-    be_interface::narrow_from_scope (node->defined_in ()));
+    dynamic_cast<be_interface*> (node->defined_in ()));
 
   be_porttype *pt = node->port_type ();
 
@@ -345,7 +345,7 @@ be_visitor_component::visit_mirror_port (be_mirror_port *node)
   /// original porttype, this is a way for visitors down the
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
-    be_interface::narrow_from_scope (node->defined_in ()));
+    dynamic_cast<be_interface*> (node->defined_in ()));
 
   be_porttype *pt = node->port_type ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp
index 50ba087ec5a..42d8ac9a8b6 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp
@@ -15,13 +15,13 @@
 be_visitor_component_ami_rh_ex_base::be_visitor_component_ami_rh_ex_base (
       be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    iface_ (0),
-    port_ (0)
+    iface_ (nullptr),
+    port_ (nullptr)
 {
 }
 
 be_visitor_component_ami_rh_ex_base::~be_visitor_component_ami_rh_ex_base (
-  void)
+  )
 {
 }
 
@@ -33,7 +33,7 @@ be_visitor_component_ami_rh_ex_base::post_process (be_decl *bd)
   if (bd->node_type () == AST_Decl::NT_argument)
     {
       AST_Argument *arg =
-        AST_Argument::narrow_from_decl (bd);
+        dynamic_cast<AST_Argument*> (bd);
 
       if (arg->direction () != AST_Argument::dir_IN
           && ! this->last_inout_or_out_node (bd))
@@ -46,7 +46,7 @@ be_visitor_component_ami_rh_ex_base::post_process (be_decl *bd)
 }
 
 void
-be_visitor_component_ami_rh_ex_base::init (void)
+be_visitor_component_ami_rh_ex_base::init ()
 {
   UTL_Scope *s = this->iface_->defined_in ();
   AST_Decl *scope = ScopeAsDecl (s);
@@ -94,7 +94,7 @@ be_visitor_component_ami_rh_ex_base::gen_excep_op (
 }
 
 void
-be_visitor_component_ami_rh_ex_base::gen_op_body (void)
+be_visitor_component_ami_rh_ex_base::gen_op_body ()
 {
 }
 
@@ -153,7 +153,7 @@ be_visitor_component_ami_rh_ex_base::gen_attr_op (
         }
 
       os_ << "set_" << node->local_name ()->get_string ()
-          << " (void)" << (for_defn ? "" : ";");
+          << " ()" << (for_defn ? "" : ";");
 
       this->gen_op_body ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp
index 56c89bfd64c..55661cadbf5 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp
@@ -18,7 +18,7 @@ be_visitor_component_ami_rh_exh::be_visitor_component_ami_rh_exh (
 {
 }
 
-be_visitor_component_ami_rh_exh::~be_visitor_component_ami_rh_exh (void)
+be_visitor_component_ami_rh_exh::~be_visitor_component_ami_rh_exh ()
 {
 }
 
@@ -28,7 +28,7 @@ be_visitor_component_ami_rh_exh::visit_uses (be_uses *node)
   this->port_ = node;
 
   this->iface_ =
-    be_interface::narrow_from_decl (node->uses_type ());
+    dynamic_cast<be_interface*> (node->uses_type ());
 
   this->init ();
 
@@ -38,8 +38,8 @@ be_visitor_component_ami_rh_exh::visit_uses (be_uses *node)
       << "public virtual ::CORBA::LocalObject" << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
-      << this->class_name_ << " (void);" << be_nl
-      << "virtual ~" << this->class_name_ << " (void);";
+      << this->class_name_ << " ();" << be_nl
+      << "virtual ~" << this->class_name_ << " ();";
 
   /// This overload of traverse_inheritance_graph() used here
   /// doesn't automatically prime the queues.
@@ -112,7 +112,7 @@ be_visitor_component_ami_rh_exh::visit_operation (
 
   if (count == 0 && vrt)
     {
-      os_ << "void);";
+      os_ << ");";
     }
   else
     {
@@ -120,25 +120,25 @@ be_visitor_component_ami_rh_exh::visit_operation (
 
       if (!vrt)
         {
-          Identifier *id = 0;
-          UTL_ScopedName *sn = 0;
+          Identifier *id = nullptr;
+          UTL_ScopedName *sn = nullptr;
 
           ACE_NEW_RETURN (id,
                           Identifier ("ami_return_val"),
                           -1);
 
-          UTL_ScopedName *tmp = 0;
+          UTL_ScopedName *tmp = nullptr;
 
           ACE_NEW_RETURN (tmp,
                           UTL_ScopedName (id,
-                                          0),
+                                          nullptr),
                           -1);
 
           sn = (UTL_ScopedName *)node->name ()->copy ();
           sn->nconc (tmp);
 
           // Create the argument.
-          be_argument *arg = 0;
+          be_argument *arg = nullptr;
           ACE_NEW_RETURN (arg,
                           be_argument (AST_Argument::dir_OUT,
                                       node->return_type (),
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp
index cf8df9cddea..854c2c0f2c3 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp
@@ -19,7 +19,7 @@ be_visitor_component_ami_rh_exs::be_visitor_component_ami_rh_exs (
 {
 }
 
-be_visitor_component_ami_rh_exs::~be_visitor_component_ami_rh_exs (void)
+be_visitor_component_ami_rh_exs::~be_visitor_component_ami_rh_exs ()
 {
 }
 
@@ -29,19 +29,19 @@ be_visitor_component_ami_rh_exs::visit_uses (be_uses *node)
   this->port_ = node;
 
   this->iface_ =
-    be_interface::narrow_from_decl (node->uses_type ());
+    dynamic_cast<be_interface*> (node->uses_type ());
 
   this->init ();
 
   os_ << be_nl_2
       << this->class_name_ << "::"
-      << this->class_name_ << " (void)" << be_nl
+      << this->class_name_ << " ()" << be_nl
       << "{" << be_nl
       << "}";
 
   os_ << be_nl_2
       << this->class_name_ << "::~"
-      << this->class_name_ << " (void)" << be_nl
+      << this->class_name_ << " ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -112,7 +112,7 @@ be_visitor_component_ami_rh_exs::visit_operation (
 
   if (count == 0 && vrt)
     {
-      os_ << "void)";
+      os_ << ")";
     }
   else
     {
@@ -121,25 +121,25 @@ be_visitor_component_ami_rh_exs::visit_operation (
 
   if (!vrt)
     {
-      Identifier *id = 0;
-      UTL_ScopedName *sn = 0;
+      Identifier *id = nullptr;
+      UTL_ScopedName *sn = nullptr;
 
       ACE_NEW_RETURN (id,
                       Identifier ("ami_return_val"),
                       -1);
 
-      UTL_ScopedName *tmp = 0;
+      UTL_ScopedName *tmp = nullptr;
 
       ACE_NEW_RETURN (tmp,
                       UTL_ScopedName (id,
-                                      0),
+                                      nullptr),
                       -1);
 
       sn = (UTL_ScopedName *)node->name ()->copy ();
       sn->nconc (tmp);
 
       // Create the argument.
-      be_argument *arg = 0;
+      be_argument *arg = nullptr;
       ACE_NEW_RETURN (arg,
                       be_argument (AST_Argument::dir_OUT,
                                   node->return_type (),
@@ -225,7 +225,7 @@ be_visitor_component_ami_rh_exs::visit_argument (
 }
 
 void
-be_visitor_component_ami_rh_exs::gen_op_body (void)
+be_visitor_component_ami_rh_exs::gen_op_body ()
 {
   os_ << be_nl
       << "{" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
index 5fcd2665e55..35a2cdd0515 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
@@ -18,7 +18,7 @@ be_visitor_component_ex_idl::be_visitor_component_ex_idl (
 {
 }
 
-be_visitor_component_ex_idl::~be_visitor_component_ex_idl (void)
+be_visitor_component_ex_idl::~be_visitor_component_ex_idl ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp
index 55b941d8a80..cfb2a7196aa 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp
@@ -22,7 +22,7 @@ be_visitor_component_exh::be_visitor_component_exh (
   export_macro_ = be_global->exec_export_macro ();
 }
 
-be_visitor_component_exh::~be_visitor_component_exh (void)
+be_visitor_component_exh::~be_visitor_component_exh ()
 {
 }
 
@@ -36,8 +36,7 @@ be_visitor_component_exh::visit_component (be_component *node)
 
   this->node_ = node;
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "/// Namespace for implementation of " << node->full_name () << " component" << be_nl
       << "namespace CIAO_" << node->flat_name ()
@@ -74,7 +73,7 @@ be_visitor_component_exh::visit_component (be_component *node)
        ! i.done ();
        i.advance ())
     {
-      char **item = 0;
+      char **item = nullptr;
       i.next (item);
 
       UTL_ScopedName *sn =
@@ -85,24 +84,24 @@ be_visitor_component_exh::visit_component (be_component *node)
 
       AST_Decl *d = s->lookup_by_name (sn, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (sn);
 
           sn->destroy ();
           delete sn;
-          sn = 0;
+          sn = nullptr;
 
           continue;
         }
 
       sn->destroy ();
       delete sn;
-      sn = 0;
+      sn = nullptr;
 
-      be_uses *u = be_uses::narrow_from_decl (d);
+      be_uses *u = dynamic_cast<be_uses*> (d);
 
-      if (u == 0)
+      if (u == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_component_exh")
@@ -113,7 +112,7 @@ be_visitor_component_exh::visit_component (be_component *node)
         }
 
       be_component *c =
-        be_component::narrow_from_decl (
+        dynamic_cast<be_component*> (
           ScopeAsDecl (u->defined_in ()));
 
       if (c == node)
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 e95463cf1bc..b890516c0a1 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp
@@ -22,7 +22,7 @@ be_visitor_component_exs::be_visitor_component_exs (
   export_macro_ = be_global->exec_export_macro ();
 }
 
-be_visitor_component_exs::~be_visitor_component_exs (void)
+be_visitor_component_exs::~be_visitor_component_exs ()
 {
 }
 
@@ -37,8 +37,7 @@ be_visitor_component_exs::visit_component (be_component *node)
 
   node_ = node;
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
@@ -75,7 +74,7 @@ be_visitor_component_exs::visit_component (be_component *node)
        ! i.done ();
        i.advance ())
     {
-      char **item = 0;
+      char **item = nullptr;
       i.next (item);
 
       UTL_ScopedName *sn =
@@ -86,24 +85,24 @@ be_visitor_component_exs::visit_component (be_component *node)
 
       AST_Decl *d = s->lookup_by_name (sn, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (sn);
 
           sn->destroy ();
           delete sn;
-          sn = 0;
+          sn = nullptr;
 
           continue;
         }
 
       sn->destroy ();
       delete sn;
-      sn = 0;
+      sn = nullptr;
 
-      be_uses *u = be_uses::narrow_from_decl (d);
+      be_uses *u = dynamic_cast<be_uses*> (d);
 
-      if (u == 0)
+      if (u == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_component_exs")
@@ -114,7 +113,7 @@ be_visitor_component_exs::visit_component (be_component *node)
         }
 
       be_component *c =
-        be_component::narrow_from_decl (
+        dynamic_cast<be_component*> (
           ScopeAsDecl (u->defined_in ()));
 
       if (c == node)
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
index 4c54bdf4398..009fc949d27 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
@@ -26,7 +26,7 @@ be_visitor_component_svh::be_visitor_component_svh (be_visitor_context *ctx)
     }
 }
 
-be_visitor_component_svh::~be_visitor_component_svh (void)
+be_visitor_component_svh::~be_visitor_component_svh ()
 {
 }
 
@@ -42,8 +42,7 @@ be_visitor_component_svh::visit_component (be_component *node)
   /// code generation.
   node->scan (node);
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
index 17909773375..d5030f23013 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
@@ -26,7 +26,7 @@ be_visitor_component_svs::be_visitor_component_svs (be_visitor_context *ctx)
     }
 }
 
-be_visitor_component_svs::~be_visitor_component_svs (void)
+be_visitor_component_svs::~be_visitor_component_svs ()
 {
 }
 
@@ -38,8 +38,7 @@ be_visitor_component_svs::visit_component (be_component *node)
       return 0;
     }
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svth.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svth.cpp
index 577c7f3cbd2..50aa72bc274 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svth.cpp
@@ -26,7 +26,7 @@ be_visitor_component_svth::be_visitor_component_svth (be_visitor_context *ctx)
     }
 }
 
-be_visitor_component_svth::~be_visitor_component_svth (void)
+be_visitor_component_svth::~be_visitor_component_svth ()
 {
 }
 
@@ -42,8 +42,7 @@ be_visitor_component_svth::visit_component (be_component *node)
   /// code generation.
   node->scan (node);
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svts.cpp
index 4287154b275..fa96d579498 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svts.cpp
@@ -26,7 +26,7 @@ be_visitor_component_svts::be_visitor_component_svts (be_visitor_context *ctx)
     }
 }
 
-be_visitor_component_svts::~be_visitor_component_svts (void)
+be_visitor_component_svts::~be_visitor_component_svts ()
 {
 }
 
@@ -38,8 +38,7 @@ be_visitor_component_svts::visit_component (be_component *node)
       return 0;
     }
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
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 3a6be29fa1f..1e0c8462031 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
@@ -19,7 +19,7 @@ be_visitor_context_ex_idl::be_visitor_context_ex_idl (
 }
 
 be_visitor_context_ex_idl::~be_visitor_context_ex_idl (
-  void)
+  )
 {
 }
 
@@ -36,7 +36,7 @@ be_visitor_context_ex_idl::visit_component (be_component *node)
 
   AST_Component *base = node->base_component ();
 
-  if (base == 0)
+  if (base == nullptr)
     {
       os_ << "::Components::"
           << be_global->ciao_container_type () << "Context";
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
index 8a08a862fd1..7ae81441c30 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
@@ -17,7 +17,7 @@ be_visitor_context_svth::be_visitor_context_svth (be_visitor_context *ctx)
 {
 }
 
-be_visitor_context_svth::~be_visitor_context_svth (void)
+be_visitor_context_svth::~be_visitor_context_svth ()
 {
 }
 
@@ -108,7 +108,7 @@ be_visitor_context_svth::visit_component (be_component *node)
       << "PortableServer::Servant sv," << be_nl
       << "const char *id);" << be_uidt << be_nl_2;
 
-  os_ << "virtual ~" << lname << "_Context_T (void);";
+  os_ << "virtual ~" << lname << "_Context_T ();";
 
   os_ << be_nl_2
       << "/** @name Operations and members for " << lname
@@ -161,12 +161,12 @@ be_visitor_context_svth::visit_uses (be_uses *node)
     {
       os_ << "::" << node_->full_name () << "::"
           << port_name << "Connections *" << be_nl
-          << "get_connections_" << port_name << " (void);";
+          << "get_connections_" << port_name << " ();";
     }
   else
     {
       os_ << "::" << obj_name << "_ptr" << be_nl
-          << "get_connection_" << port_name << " (void);";
+          << "get_connection_" << port_name << " ();";
     }
 
   os_ << be_nl << be_uidt_nl
@@ -187,7 +187,7 @@ be_visitor_context_svth::visit_uses (be_uses *node)
     }
   else
     {
-      os_ << "void);";
+      os_ << ");";
     }
 
   os_ << be_uidt_nl << be_nl
@@ -276,7 +276,7 @@ be_visitor_context_svth::visit_emits (be_emits *node)
 
   os_ << be_nl_2
       << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
-      << "disconnect_" << port_name << " (void);";
+      << "disconnect_" << port_name << " ();";
 
   os_ << be_uidt_nl << be_nl
       << "protected:" << be_idt_nl
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 8678ab83ed1..3b1355474cb 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
@@ -17,7 +17,7 @@ be_visitor_context_svts::be_visitor_context_svts (be_visitor_context *ctx)
 {
 }
 
-be_visitor_context_svts::~be_visitor_context_svts (void)
+be_visitor_context_svts::~be_visitor_context_svts ()
 {
 }
 
@@ -70,7 +70,7 @@ be_visitor_context_svts::visit_component (be_component *node)
   os_ << be_nl_2
       << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl
       << lname << "_Context_T<CONTAINER_TYPE, BASE>::~"
-      << lname << "_Context_T (void)" << be_nl
+      << lname << "_Context_T ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -192,7 +192,7 @@ be_visitor_context_svts::visit_publishes (be_publishes *node)
 
   os_ << be_nl
       << be_nl
-      << "::Components::Cookie * retv = 0;" << be_nl
+      << "::Components::Cookie * retv {};" << be_nl
       << "ACE_NEW_THROW_EX (retv," << be_nl
       << "                  ::CIAO::Cookie_Impl (ptr),"
       << be_nl
@@ -303,7 +303,7 @@ be_visitor_context_svts::visit_emits (be_emits *node)
       << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl
       << "::" << fname << "Consumer_ptr" << be_nl
       << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::disconnect_"
-      << port_name << " (void)" << be_nl
+      << port_name << " ()" << be_nl
       << "{" << 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
@@ -329,7 +329,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj,
       << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl
       << "::" << fname << "_ptr" << be_nl
       << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::get_connection_"
-      << port_name << " (void)" << be_nl
+      << port_name << " ()" << be_nl
       << "{" << be_idt_nl
       << "return ::" << fname << "::_duplicate (" << be_idt_nl
       << "this->ciao_uses_" << port_name << "_.in ());"
@@ -361,7 +361,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj,
       << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl
       << "::" << fname << "_ptr" << be_nl
       << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::disconnect_"
-      << port_name << " (void)" << be_nl
+      << port_name << " ()" << be_nl
       << "{" << be_idt_nl
       << "::" << fname << "_var ciao_uses_" << port_name << " =" << be_idt_nl
       << "this->ciao_uses_" << port_name << "_._retn ();" << be_uidt_nl << be_nl
@@ -387,7 +387,7 @@ be_visitor_context_svts::gen_uses_multiplex (
       << "::" << node_->full_name () << "::" << port_name
       << "Connections *" << be_nl
       << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::get_connections_"
-      << port_name << " (void)" << be_nl
+      << port_name << " ()" << be_nl
       << "{" << be_idt_nl;
 
   os_ << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
@@ -397,7 +397,7 @@ be_visitor_context_svts::gen_uses_multiplex (
       << "                  0);" << be_nl_2;
 
   os_ << "::" << node_->full_name () << "::" << port_name
-      << "Connections * tmp_retv = 0;" << be_nl
+      << "Connections * tmp_retv {};" << be_nl
       << "ACE_NEW_THROW_EX (tmp_retv," << be_nl
       << "                  ::" << node_->full_name ()
       << "::" << port_name << "Connections (" << be_nl
@@ -465,7 +465,7 @@ be_visitor_context_svts::gen_uses_multiplex (
       << "}";
 
   os_ << be_nl_2
-      << "::Components::Cookie * ck = 0;" << be_nl
+      << "::Components::Cookie * ck {};" << be_nl
       << "ACE_NEW_THROW_EX (ck," << be_nl
       << "                  ::CIAO::Cookie_Impl (ptr),"
       << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
index 18701bbb2cb..9cdfad5b5a6 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
@@ -19,7 +19,7 @@ be_visitor_executor_ex_idl::be_visitor_executor_ex_idl (
 }
 
 be_visitor_executor_ex_idl::~be_visitor_executor_ex_idl (
-  void)
+  )
 {
 }
 
@@ -37,7 +37,7 @@ be_visitor_executor_ex_idl::visit_component (
       << be_idt_nl
       << ": ";
 
-  if (base == 0)
+  if (base == nullptr)
     {
       os_ << "::Components::EnterpriseComponent";
     }
@@ -204,7 +204,7 @@ be_visitor_executor_ex_idl::visit_consumes (
 }
 
 void
-be_visitor_executor_ex_idl::gen_supported (void)
+be_visitor_executor_ex_idl::gen_supported ()
 {
   os_ << be_idt;
 
@@ -226,7 +226,7 @@ be_visitor_executor_ex_idl::gen_exception_list (
   const char *prefix,
   bool closed)
 {
-  if (exceptions != 0 && exceptions->length () > 0)
+  if (exceptions != nullptr && exceptions->length () > 0)
     {
       os_ << be_idt_nl
           << prefix << "raises ( ";
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 76f80a31c3d..412debc236a 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
@@ -24,7 +24,7 @@ be_visitor_executor_exh::be_visitor_executor_exh (
   export_macro_ = be_global->exec_export_macro ();
 }
 
-be_visitor_executor_exh::~be_visitor_executor_exh (void)
+be_visitor_executor_exh::~be_visitor_executor_exh ()
 {
 }
 
@@ -81,11 +81,11 @@ be_visitor_executor_exh::visit_component (be_component *node)
       << "public:" << be_idt_nl;
 
   os_ << "/// Constructor" << be_nl
-      << lname << "_exec_i (void);";
+      << lname << "_exec_i ();";
 
   os_ << be_nl
       << "/// Destructor" << be_nl
-      << "virtual ~" << lname << "_exec_i (void);";
+      << "virtual ~" << lname << "_exec_i ();";
 
   os_ << be_nl_2
       << "/** @name Supported operations and attributes. */" << be_nl
@@ -147,18 +147,18 @@ be_visitor_executor_exh::visit_component (be_component *node)
     {
       os_ << be_nl_2
           << "/// Component state change method to configuration_complete state" << be_nl
-          << "virtual void configuration_complete (void);";
+          << "virtual void configuration_complete ();";
 
       os_ << be_nl_2
           << "/// Component state change method to activated state" << be_nl
-          << "virtual void ccm_activate (void);" << be_nl_2
+          << "virtual void ccm_activate ();" << be_nl_2
           << "/// Component state change method to passivated state" << be_nl
-          << "virtual void ccm_passivate (void);";
+          << "virtual void ccm_passivate ();";
     }
 
   os_ << be_nl_2
       << "/// Component state change method to removed state" << be_nl
-      << "virtual void ccm_remove (void);";
+      << "virtual void ccm_remove ();";
 
   os_ << be_nl
       << "//@}";
@@ -268,7 +268,7 @@ be_visitor_executor_exh::visit_component (be_component *node)
       os_ << be_nl_2
           << "/// Get the ACE_Reactor" << be_nl
           << "/// @return non-owning pointer to reactor" << be_nl
-          << "ACE_Reactor* reactor (void);";
+          << "ACE_Reactor* reactor ();";
     }
 
   os_ << be_uidt_nl
@@ -302,7 +302,7 @@ be_visitor_executor_exh::visit_provides (be_provides *node)
       << "/// @return existing instance of facet if one exists, else creates one" << be_nl
       << "virtual " << global << sname << "::CCM_"
       << lname << "_ptr" << be_nl
-      << "get_" << port_name << " (void);";
+      << "get_" << port_name << " ();";
 
   return 0;
 }
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 23525462dd7..d2d93264f93 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
@@ -14,14 +14,14 @@
 be_visitor_executor_exs::be_visitor_executor_exs (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
-    op_scope_ (0),
+    op_scope_ (nullptr),
     comment_start_border_ ("/**"),
     comment_end_border_ (" */"),
     your_code_here_ ("/* Your code here. */")
 {
 }
 
-be_visitor_executor_exs::~be_visitor_executor_exs (void)
+be_visitor_executor_exs::~be_visitor_executor_exs ()
 {
 }
 
@@ -72,7 +72,7 @@ be_visitor_executor_exs::visit_attribute (be_attribute *node)
   os_ << be_nl
       << this->node_->original_local_name () << "_exec_i::"
       << this->ctx_->port_prefix ().c_str ()
-      << node->local_name () << " (void)" << be_nl
+      << node->local_name () << " ()" << be_nl
       << "{" << be_idt;
 
   be_visitor_attr_return ar_visitor (this->ctx_);
@@ -152,7 +152,7 @@ be_visitor_executor_exs::visit_component (be_component *node)
 
   os_ << be_nl_2
       << lname << "_exec_i::" << lname
-      << "_exec_i (void)";
+      << "_exec_i ()";
 
   /// The overload of traverse_inheritance_graph() used here
   /// doesn't automatically prime the queues.
@@ -195,7 +195,7 @@ be_visitor_executor_exs::visit_component (be_component *node)
 
   os_ << be_nl_2
       << lname << "_exec_i::~" << lname
-      << "_exec_i (void)" << be_nl
+      << "_exec_i ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -206,9 +206,9 @@ be_visitor_executor_exs::visit_component (be_component *node)
     {
       os_ << be_nl
           << "ACE_Reactor*" << be_nl
-          << lname << "_exec_i::reactor (void)" << be_nl
+          << lname << "_exec_i::reactor ()" << be_nl
           << "{" << be_idt_nl
-          << "ACE_Reactor* reactor = 0;" << be_nl
+          << "ACE_Reactor* reactor {};" << be_nl
           << "::CORBA::Object_var ccm_object = " << be_idt_nl
           << "this->ciao_context_->get_CCM_object();" << be_uidt_nl
           << "if (! ::CORBA::is_nil (ccm_object.in ())) " << be_idt_nl
@@ -297,7 +297,7 @@ be_visitor_executor_exs::visit_component (be_component *node)
     {
       os_ << be_nl_2
           << "void" << be_nl
-          << lname << "_exec_i::configuration_complete (void)"
+          << lname << "_exec_i::configuration_complete ()"
           << be_nl
           << "{" << be_idt_nl
           << your_code_here_ << be_uidt_nl
@@ -305,14 +305,14 @@ be_visitor_executor_exs::visit_component (be_component *node)
 
       os_ << be_nl_2
           << "void" << be_nl
-          << lname << "_exec_i::ccm_activate (void)" << be_nl
+          << lname << "_exec_i::ccm_activate ()" << be_nl
           << "{" << be_idt_nl
           << your_code_here_ << be_uidt_nl
           << "}";
 
       os_ << be_nl_2
           << "void" << be_nl
-          << lname << "_exec_i::ccm_passivate (void)" << be_nl
+          << lname << "_exec_i::ccm_passivate ()" << be_nl
           << "{" << be_idt_nl
           << your_code_here_ << be_uidt_nl
           << "}";
@@ -320,7 +320,7 @@ be_visitor_executor_exs::visit_component (be_component *node)
 
   os_ << be_nl_2
       << "void" << be_nl
-      << lname << "_exec_i::ccm_remove (void)" << be_nl
+      << lname << "_exec_i::ccm_remove ()" << be_nl
       << "{" << be_idt_nl
       << your_code_here_ << be_uidt_nl
       << "}";
@@ -352,12 +352,12 @@ be_visitor_executor_exs::visit_provides (be_provides *node)
       << global << sname << "::CCM_"
       << iname << "_ptr" << be_nl
       << node_->local_name () << "_exec_i::get_"
-      << port_name << " (void)" << be_nl
+      << port_name << " ()" << be_nl
       << "{" << be_idt_nl
       << "if ( ::CORBA::is_nil (this->ciao_" << port_name
       << "_.in ()))" << be_idt_nl
       << "{" << be_idt_nl
-      << lname << "_exec_i *tmp = 0;" << be_nl
+      << lname << "_exec_i *tmp {};" << be_nl
       << "ACE_NEW_RETURN (" << be_idt_nl
       << "tmp," << be_nl
       << lname << "_exec_i (" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp
index e18fe809272..beb75e7c658 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp
@@ -19,7 +19,7 @@ be_visitor_executor_exs_attr_init::be_visitor_executor_exs_attr_init (
 {
 }
 
-be_visitor_executor_exs_attr_init::~be_visitor_executor_exs_attr_init (void)
+be_visitor_executor_exs_attr_init::~be_visitor_executor_exs_attr_init ()
 {
 }
 
@@ -100,7 +100,7 @@ be_visitor_executor_exs_attr_init::pre_process (be_decl *node)
 }
 
 bool
-be_visitor_executor_exs_attr_init::attr_generated (void) const
+be_visitor_executor_exs_attr_init::attr_generated () const
 {
   return this->semicolon_generated_;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_private_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_private_exh.cpp
index 3c454482c49..8073752ac4c 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_private_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_private_exh.cpp
@@ -20,7 +20,7 @@ be_visitor_executor_private_exh::be_visitor_executor_private_exh (
 {
 }
 
-be_visitor_executor_private_exh::~be_visitor_executor_private_exh (void)
+be_visitor_executor_private_exh::~be_visitor_executor_private_exh ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
index 0503c92c7dc..8ba4b0082f3 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
@@ -24,7 +24,7 @@ be_visitor_facet_exh::be_visitor_facet_exh (
   export_macro_ = be_global->exec_export_macro ();
 }
 
-be_visitor_facet_exh::~be_visitor_facet_exh (void)
+be_visitor_facet_exh::~be_visitor_facet_exh ()
 {
 }
 
@@ -69,12 +69,12 @@ be_visitor_facet_exh::visit_provides (be_provides *node)
       << this->node_->local_name ()
       << "_Context_ptr ctx);" << be_uidt_nl
       << "/// Destructor" << be_nl
-      << "virtual ~" << lname << "_exec_i (void);";
+      << "virtual ~" << lname << "_exec_i ();";
 
   if (impl->node_type () == AST_Decl::NT_interface)
     {
       be_interface *intf =
-        be_interface::narrow_from_decl (impl);
+        dynamic_cast<be_interface*> (impl);
 
       os_ << be_nl_2
           << "/** @name Operations and attributes from "
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp
index 6501c49524b..1c401ba88db 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp
@@ -14,13 +14,13 @@
 be_visitor_facet_exs::be_visitor_facet_exs (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
-    op_scope_ (0),
+    op_scope_ (nullptr),
     comment_start_border_ ("/**"),
     comment_end_border_ (" */")
 {
 }
 
-be_visitor_facet_exs::~be_visitor_facet_exs (void)
+be_visitor_facet_exs::~be_visitor_facet_exs ()
 {
 }
 
@@ -55,7 +55,7 @@ be_visitor_facet_exs::visit_attribute (be_attribute *node)
     }
 
   be_decl *attr_scope =
-    be_decl::narrow_from_decl (ScopeAsDecl (node->defined_in ()));
+    dynamic_cast<be_decl*> (ScopeAsDecl (node->defined_in ()));
 
   nt = attr_scope->node_type ();
 
@@ -106,7 +106,7 @@ be_visitor_facet_exs::visit_provides (be_provides *node)
 
   os_ << be_nl_2
       << lname << "_exec_i::~" << lname
-      << "_exec_i (void)" << be_nl
+      << "_exec_i ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -115,7 +115,7 @@ be_visitor_facet_exs::visit_provides (be_provides *node)
   if (impl->node_type () == AST_Decl::NT_interface)
     {
       be_interface *intf =
-        be_interface::narrow_from_decl (impl);
+        dynamic_cast<be_interface*> (impl);
 
       os_ << be_nl_2
           << "// Operations from ::" << intf->full_name ();
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 eb710e03ba9..9fbd6a8de25 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
@@ -17,7 +17,7 @@ be_visitor_servant_svh::be_visitor_servant_svh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_servant_svh::~be_visitor_servant_svh (void)
+be_visitor_servant_svh::~be_visitor_servant_svh ()
 {
 }
 
@@ -75,7 +75,7 @@ be_visitor_servant_svh::visit_component (be_component *node)
 
   os_ << be_nl
       << "virtual ~" << lname << "_Servant"
-      << " (void);" << be_nl;
+      << " ();" << be_nl;
 
   if (this->node_->has_rw_attributes ())
     {
@@ -166,13 +166,13 @@ be_visitor_servant_svh::visit_provides (be_provides *node)
       os_ << be_uidt_nl << be_nl
           << "public:" << be_idt_nl
           << "virtual ::" << obj_name << "_ptr" << be_nl
-          << "provide_" << port_name << " (void);";
+          << "provide_" << port_name << " ();";
     }
 
   os_ << be_uidt_nl << be_nl
       << "private:" << be_idt_nl
       << "void" << be_nl
-      << "setup_" << port_name << "_i (void);";
+      << "setup_" << port_name << "_i ();";
 
   if (!be_global->gen_lwccm ())
      {
@@ -207,12 +207,12 @@ be_visitor_servant_svh::visit_uses (be_uses *node)
     {
       os_ << "::" << node_->full_name () << "::"
           << port_name << "Connections *" << be_nl
-          << "get_connections_" << port_name << " (void);";
+          << "get_connections_" << port_name << " ();";
     }
   else
     {
       os_ << "::" << obj_name << "_ptr" << be_nl
-          << "get_connection_" << port_name << " (void);";
+          << "get_connection_" << port_name << " ();";
     }
 
   os_ << be_nl_2
@@ -232,7 +232,7 @@ be_visitor_servant_svh::visit_uses (be_uses *node)
     }
   else
     {
-      os_ << "void);";
+      os_ << ");";
     }
 
   return 0;
@@ -276,7 +276,7 @@ be_visitor_servant_svh::visit_emits (be_emits *node)
 
       os_ << be_nl_2
           << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
-          << "disconnect_" << port_name << " (void);";
+          << "disconnect_" << port_name << " ();";
     }
   return 0;
 }
@@ -291,7 +291,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node)
 
       ACE_CString holder (obj_name);
       ACE_CString::size_type pos = holder.rfind (':');
-      const char *ev_lname = 0;
+      const char *ev_lname = nullptr;
 
       if (pos == ACE_CString::npos)
         {
@@ -329,7 +329,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node)
           << "_Context_ptr c);" << be_uidt_nl << be_nl;
 
       os_ << "virtual ~" << ev_lname << "Consumer_" << port_name
-          << "_Servant (void);";
+          << "_Servant ();";
 
       os_ << be_nl_2
           << "virtual void" << be_nl
@@ -344,7 +344,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node)
       os_ << be_nl_2
           << "/// Get component implementation." << be_nl
           << "virtual ::CORBA::Object_ptr" << be_nl
-          << "_get_component (void);";
+          << "_get_component ();";
 
       os_ << be_uidt_nl << be_nl
           << "protected:" << be_idt_nl;
@@ -364,14 +364,14 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node)
         {
           os_ << be_nl_2
               << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
-              << "get_consumer_" << port_name << " (void);";
+              << "get_consumer_" << port_name << " ();";
         }
 
       os_ << be_uidt_nl << be_nl
           << "private:" << be_idt_nl;
 
       os_ << "void" << be_nl
-          << "setup_consumer_" << port_name << "_i (void);";
+          << "setup_consumer_" << port_name << "_i ();";
 
       os_ << be_uidt_nl << be_nl
           << "private:" << be_idt_nl;
@@ -383,7 +383,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node)
 }
 
 void
-be_visitor_servant_svh::gen_non_type_specific (void)
+be_visitor_servant_svh::gen_non_type_specific ()
 {
   os_ << be_nl_2
       << "// Base class overrides."
@@ -406,7 +406,7 @@ be_visitor_servant_svh::gen_non_type_specific (void)
       os_ << be_nl_2
           << "virtual ::Components::ReceptacleDescriptions *"
           << be_nl
-          << "get_all_receptacles (void);";
+          << "get_all_receptacles ();";
     }
 
   AST_Decl::NodeType nt = this->node_->node_type ();
@@ -420,7 +420,7 @@ be_visitor_servant_svh::gen_non_type_specific (void)
           os_ << be_nl_2
               << "virtual ::Components::PublisherDescriptions *"
               << be_nl
-              << "get_all_publishers (void);";
+              << "get_all_publishers ();";
         }
 
       if (this->node_->n_emits () != 0UL)
@@ -428,7 +428,7 @@ be_visitor_servant_svh::gen_non_type_specific (void)
           os_ << be_nl_2
               << "virtual ::Components::EmitterDescriptions *"
               << be_nl
-              << "get_all_emitters (void);";
+              << "get_all_emitters ();";
         }
     }
 
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 bf1420b8c4f..3f081adcfb4 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -13,11 +13,11 @@
 
 be_visitor_servant_svs::be_visitor_servant_svs (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
-    op_scope_ (0)
+    op_scope_ (nullptr)
 {
 }
 
-be_visitor_servant_svs::~be_visitor_servant_svs (void)
+be_visitor_servant_svs::~be_visitor_servant_svs ()
 {
 }
 
@@ -110,7 +110,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
 
   os_ << be_nl_2
       << lname << "_Servant::~"
-      << lname << "_Servant (void)" << be_nl
+      << lname << "_Servant ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -285,7 +285,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
       os_ << be_nl_2
           << "::" << obj_name << "_ptr" << be_nl
           << node_->local_name () << "_Servant::provide_"
-          << port_name << " (void)" << be_nl
+          << port_name << " ()" << be_nl
           << "{" << be_idt_nl;
 
       os_ << "return" << be_idt_nl
@@ -297,7 +297,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
   os_ << be_nl_2
         << "void" << be_nl
         << node_->local_name () << "_Servant::setup_"
-        << port_name << "_i (void)" << be_nl
+        << port_name << "_i ()" << be_nl
         << "{" << be_idt_nl
         << "ACE_CString obj_id (this->ins_name_);" << be_nl
         << "obj_id += \"_" << port_name << "\";" << be_nl_2
@@ -416,7 +416,7 @@ be_visitor_servant_svs::visit_uses (be_uses *node)
   os_ << be_nl
       << node_->local_name () << "_Servant::get_connection"
       << (is_multiple ? "s" : "") << "_"
-      << port_name << " (void)" << be_nl
+      << port_name << " ()" << be_nl
       << "{" << be_idt_nl
       << "return this->context_->get_connection"
       << (is_multiple ? "s" : "") << "_"
@@ -486,7 +486,7 @@ be_visitor_servant_svs::visit_emits (be_emits *node)
   os_ << be_nl_2
       << "::" << obj_name << "Consumer_ptr" << be_nl
       << node_->local_name () << "_Servant::disconnect_"
-      << port_name << " (void)" << be_nl
+      << port_name << " ()" << be_nl
       << "{" << be_idt_nl
       << "return this->context_->disconnect_"
       << port_name << " ();" << be_uidt_nl
@@ -529,14 +529,14 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
   os_ << be_nl_2
       << comp_lname << "_Servant::" << lname << "Consumer_"
       << port_name << "_Servant::~" << lname << "Consumer_"
-      << port_name << "_Servant (void)" << be_nl
+      << port_name << "_Servant ()" << be_nl
       << "{" << be_nl
       << "}";
 
   os_ << be_nl_2
       << "::CORBA::Object_ptr" << be_nl
       << comp_lname << "_Servant::" << lname << "Consumer_"
-      << port_name << "_Servant::_get_component (void)" << be_nl
+      << port_name << "_Servant::_get_component ()" << be_nl
       << "{" << be_idt_nl;
 
   if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0)
@@ -585,7 +585,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
       os_ << be_nl_2
           << "::" << fname << "Consumer_ptr" << be_nl
           << node_->local_name () << "_Servant::get_consumer_"
-          << port_name << " (void)" << be_nl
+          << port_name << " ()" << be_nl
           << "{" << be_idt_nl
           << "return" << be_idt_nl
           << "::" << fname << "Consumer::_duplicate (" << be_idt_nl
@@ -597,7 +597,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
   os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Servant::setup_consumer_"
-      << port_name << "_i (void)" << be_nl
+      << port_name << "_i ()" << be_nl
       << "{" << be_idt_nl
       << "ACE_CString obj_id (this->ins_name_);" << be_nl
       << "obj_id += \"_" << port_name << "\";" << be_nl_2
@@ -648,7 +648,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
 }
 
 void
-be_visitor_servant_svs::gen_provides_top (void)
+be_visitor_servant_svs::gen_provides_top ()
 {
   if (this->node_->n_provides () == 0UL)
     {
@@ -702,7 +702,7 @@ be_visitor_servant_svs::gen_provides_top (void)
 }
 
 void
-be_visitor_servant_svs::gen_publishes_top (void)
+be_visitor_servant_svs::gen_publishes_top ()
 {
   ACE_CDR::ULong npubs = this->node_->n_publishes ();
 
@@ -773,9 +773,9 @@ be_visitor_servant_svs::gen_publishes_top (void)
       os_ << be_nl_2
           << "::Components::PublisherDescriptions *" << be_nl
           << node_->local_name ()
-          << "_Servant::get_all_publishers (void)" << be_nl
+          << "_Servant::get_all_publishers ()" << be_nl
           << "{" << be_idt_nl
-          << "::Components::PublisherDescriptions *retval = 0;"
+          << "::Components::PublisherDescriptions *retval {};"
           << be_nl
           << "ACE_NEW_THROW_EX (retval," << be_nl
           << "                  ::Components::PublisherDescriptions,"
@@ -809,7 +809,7 @@ be_visitor_servant_svs::gen_publishes_top (void)
 }
 
 void
-be_visitor_servant_svs::gen_uses_top (void)
+be_visitor_servant_svs::gen_uses_top ()
 {
   ACE_CDR::ULong nuses = this->node_->n_uses ();
 
@@ -880,9 +880,9 @@ be_visitor_servant_svs::gen_uses_top (void)
       os_ << be_nl_2
           << "::Components::ReceptacleDescriptions *" << be_nl
           << node_->local_name ()
-          << "_Servant::get_all_receptacles (void)" << be_nl
+          << "_Servant::get_all_receptacles ()" << be_nl
           << "{" << be_idt_nl
-          << "::Components::ReceptacleDescriptions * retval = 0;"
+          << "::Components::ReceptacleDescriptions * retval {};"
           << be_nl
           << "ACE_NEW_THROW_EX (retval," << be_nl
           << "                  ::Components::ReceptacleDescriptions,"
@@ -916,7 +916,7 @@ be_visitor_servant_svs::gen_uses_top (void)
 }
 
 void
-be_visitor_servant_svs::gen_emits_top (void)
+be_visitor_servant_svs::gen_emits_top ()
 {
   /// Generated whether the component has emits ports
   /// or not, except if we are generating a LwCCM
@@ -991,7 +991,7 @@ be_visitor_servant_svs::gen_emits_top (void)
 }
 
 void
-be_visitor_servant_svs::gen_get_all_emitters (void)
+be_visitor_servant_svs::gen_get_all_emitters ()
 {
   if (be_global->gen_lwccm () || be_global->gen_noeventccm () || this->node_->n_emits () == 0UL)
     {
@@ -1001,9 +1001,9 @@ be_visitor_servant_svs::gen_get_all_emitters (void)
   os_ << be_nl_2
       << "::Components::EmitterDescriptions *" << be_nl
       << node_->local_name ()
-      << "_Servant::get_all_emitters (void)" << be_nl
+      << "_Servant::get_all_emitters ()" << be_nl
       << "{" << be_idt_nl
-      << "::Components::EmitterDescriptions *retval = 0;"
+      << "::Components::EmitterDescriptions *retval {};"
       << be_nl
       << "ACE_NEW_THROW_EX (retval," << be_nl
       << "                  ::Components::EmitterDescriptions,"
@@ -1039,7 +1039,7 @@ be_visitor_obv_factory_reg::be_visitor_obv_factory_reg (
 {
 }
 
-be_visitor_obv_factory_reg::~be_visitor_obv_factory_reg (void)
+be_visitor_obv_factory_reg::~be_visitor_obv_factory_reg ()
 {
 }
 
@@ -1087,7 +1087,7 @@ be_visitor_attr_set::be_visitor_attr_set (be_visitor_context *ctx)
 {
 }
 
-be_visitor_attr_set::~be_visitor_attr_set (void)
+be_visitor_attr_set::~be_visitor_attr_set ()
 {
 }
 
@@ -1112,7 +1112,7 @@ be_visitor_attr_set::visit_attribute (be_attribute *node)
 int
 be_visitor_attr_set::visit_component_scope (be_component *node)
 {
-  if (node == 0)
+  if (node == nullptr)
     {
       return 0;
     }
@@ -1168,7 +1168,7 @@ be_visitor_facet_executor_block::be_visitor_facet_executor_block (
 }
 
 be_visitor_facet_executor_block::~be_visitor_facet_executor_block (
-  void)
+  )
 {
 }
 
@@ -1199,7 +1199,7 @@ be_visitor_connect_block::be_visitor_connect_block (
 {
 }
 
-be_visitor_connect_block::~be_visitor_connect_block (void)
+be_visitor_connect_block::~be_visitor_connect_block ()
 {
 }
 
@@ -1247,7 +1247,7 @@ be_visitor_disconnect_block::be_visitor_disconnect_block (
 }
 
 be_visitor_disconnect_block::~be_visitor_disconnect_block (
-  void)
+  )
 {
 }
 
@@ -1295,7 +1295,7 @@ be_visitor_receptacle_desc::be_visitor_receptacle_desc (
 }
 
 be_visitor_receptacle_desc::~be_visitor_receptacle_desc (
-  void)
+  )
 {
 }
 
@@ -1364,7 +1364,7 @@ be_visitor_subscribe_block::be_visitor_subscribe_block (
 }
 
 be_visitor_subscribe_block::~be_visitor_subscribe_block (
-  void)
+  )
 {
 }
 
@@ -1400,7 +1400,7 @@ be_visitor_unsubscribe_block::be_visitor_unsubscribe_block (
 }
 
 be_visitor_unsubscribe_block::~be_visitor_unsubscribe_block (
-  void)
+  )
 {
 }
 
@@ -1432,7 +1432,7 @@ be_visitor_event_source_desc::be_visitor_event_source_desc (
 }
 
 be_visitor_event_source_desc::~be_visitor_event_source_desc (
-  void)
+  )
 {
 }
 
@@ -1478,7 +1478,7 @@ be_visitor_connect_consumer_block::be_visitor_connect_consumer_block (
 {
 }
 
-be_visitor_connect_consumer_block::~be_visitor_connect_consumer_block (void)
+be_visitor_connect_consumer_block::~be_visitor_connect_consumer_block ()
 {
 }
 
@@ -1516,7 +1516,7 @@ be_visitor_disconnect_consumer_block::be_visitor_disconnect_consumer_block (
 }
 
 be_visitor_disconnect_consumer_block::~be_visitor_disconnect_consumer_block (
-  void)
+  )
 {
 }
 
@@ -1548,7 +1548,7 @@ be_visitor_emitter_desc::be_visitor_emitter_desc (
 }
 
 be_visitor_emitter_desc::~be_visitor_emitter_desc (
-  void)
+  )
 {
 }
 
@@ -1583,7 +1583,7 @@ be_visitor_populate_port_tables::be_visitor_populate_port_tables (
 }
 
 be_visitor_populate_port_tables::~be_visitor_populate_port_tables (
-  void)
+  )
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
index 7b3ee0415d6..f0a1f99be9f 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
@@ -18,7 +18,7 @@ be_visitor_component_fwd_any_op_ch::be_visitor_component_fwd_any_op_ch (
 {
 }
 
-be_visitor_component_fwd_any_op_ch::~be_visitor_component_fwd_any_op_ch (void)
+be_visitor_component_fwd_any_op_ch::~be_visitor_component_fwd_any_op_ch ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp
index d8d155023ab..fa60dd92946 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp
@@ -18,7 +18,7 @@ be_visitor_component_fwd_cdr_op_ch::be_visitor_component_fwd_cdr_op_ch (
 {
 }
 
-be_visitor_component_fwd_cdr_op_ch::~be_visitor_component_fwd_cdr_op_ch (void)
+be_visitor_component_fwd_cdr_op_ch::~be_visitor_component_fwd_cdr_op_ch ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp
index 47443384619..68c6ce58147 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp
@@ -17,7 +17,7 @@ be_visitor_component_fwd_ch::be_visitor_component_fwd_ch (
 {
 }
 
-be_visitor_component_fwd_ch::~be_visitor_component_fwd_ch (void)
+be_visitor_component_fwd_ch::~be_visitor_component_fwd_ch ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
index 750de044bd6..c7f28aeccf3 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
@@ -26,7 +26,7 @@
 be_visitor_component_scope::be_visitor_component_scope (
       be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    node_ (0),
+    node_ (nullptr),
     os_ (*ctx->stream ()),
     export_macro_ (be_global->svnt_export_macro ()),
     in_ext_port_ (false)
@@ -42,7 +42,7 @@ be_visitor_component_scope::be_visitor_component_scope (
 }
 
 be_visitor_component_scope::~be_visitor_component_scope (
-  void)
+  )
 {
 }
 
@@ -119,7 +119,7 @@ int
 be_visitor_component_scope::visit_component_scope (
   be_component *node)
 {
-  if (node == 0)
+  if (node == nullptr)
     {
       return 0;
     }
@@ -154,14 +154,14 @@ be_visitor_component_scope::visit_porttype_scope_mirror (
        !si.is_done ();
        si.next ())
     {
-      be_decl *d = be_decl::narrow_from_decl (si.item ());
+      be_decl *d = dynamic_cast<be_decl*> (si.item ());
 
       switch (d->node_type ())
         {
           case AST_Decl::NT_provides:
             {
               be_provides *p =
-                be_provides::narrow_from_decl (d);
+                dynamic_cast<be_provides*> (d);
 
               be_uses mirror_node (p->name (),
                                    p->provides_type (),
@@ -182,7 +182,7 @@ be_visitor_component_scope::visit_porttype_scope_mirror (
           case AST_Decl::NT_uses:
             {
               be_uses *u =
-                be_uses::narrow_from_decl (d);
+                dynamic_cast<be_uses*> (d);
 
               be_provides mirror_node (u->name (),
                                        u->uses_type ());
@@ -224,7 +224,7 @@ be_visitor_component_scope::node (be_component *c)
 }
 
 void
-be_visitor_component_scope::gen_svnt_entrypoint_decl (void)
+be_visitor_component_scope::gen_svnt_entrypoint_decl ()
 {
   os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
@@ -239,7 +239,7 @@ be_visitor_component_scope::gen_svnt_entrypoint_decl (void)
 }
 
 void
-be_visitor_component_scope::gen_svnt_entrypoint_defn (void)
+be_visitor_component_scope::gen_svnt_entrypoint_defn ()
 {
   ACE_CString sname_str (
     ScopeAsDecl (node_->defined_in ())->full_name ());
@@ -279,7 +279,7 @@ be_visitor_component_scope::gen_svnt_entrypoint_defn (void)
 }
 
 void
-be_visitor_component_scope::gen_exec_entrypoint_decl (void)
+be_visitor_component_scope::gen_exec_entrypoint_decl ()
 {
   os_ << be_nl_2
       << "/// Factory method and library entry point used by the middleware" << be_nl
@@ -287,17 +287,17 @@ be_visitor_component_scope::gen_exec_entrypoint_decl (void)
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::EnterpriseComponent_ptr" << be_nl
       << "create_" << node_->flat_name ()
-      << "_Impl (void);";
+      << "_Impl ();";
 }
 
 void
-be_visitor_component_scope::gen_exec_entrypoint_defn (void)
+be_visitor_component_scope::gen_exec_entrypoint_defn ()
 {
   os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::EnterpriseComponent_ptr" << be_nl
       << "create_" << node_->flat_name ()
-      << "_Impl (void)" << be_nl
+      << "_Impl ()" << be_nl
       << "{" << be_idt_nl
       << "::Components::EnterpriseComponent_ptr retval ="
       << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
index 35e0d1ec5fd..40230a812e4 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
@@ -22,7 +22,7 @@ be_visitor_connector_ami_exh::be_visitor_connector_ami_exh (
   this->export_macro_ = be_global->conn_export_macro ();
 }
 
-be_visitor_connector_ami_exh::~be_visitor_connector_ami_exh (void)
+be_visitor_connector_ami_exh::~be_visitor_connector_ami_exh ()
 {
 }
 
@@ -36,8 +36,7 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node)
 
   this->node_ = node;
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
@@ -77,13 +76,13 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node)
 }
 
 void
-be_visitor_connector_ami_exh::gen_entrypoint (void)
+be_visitor_connector_ami_exh::gen_entrypoint ()
 {
   os_ << be_nl_2
       << "extern \"C\" " << this->export_macro_.c_str ()
       << " ::Components::EnterpriseComponent_ptr" << be_nl
       << "create_"
       << ScopeAsDecl (this->node_->defined_in ())->flat_name ()
-      << "_Impl (void);";
+      << "_Impl ();";
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
index a74d9fafba6..8cbe4b5832c 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
@@ -18,7 +18,7 @@ be_visitor_connector_ami_exs::be_visitor_connector_ami_exs (
 {
 }
 
-be_visitor_connector_ami_exs::~be_visitor_connector_ami_exs (void)
+be_visitor_connector_ami_exs::~be_visitor_connector_ami_exs ()
 {
 }
 
@@ -32,8 +32,7 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node)
 
   this->node_ = node;
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
@@ -70,14 +69,14 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node)
 }
 
 void
-be_visitor_connector_ami_exs::gen_entrypoint (void)
+be_visitor_connector_ami_exs::gen_entrypoint ()
 {
   AST_Decl *s = ScopeAsDecl (this->node_->defined_in ());
 
   os_ << be_nl_2
       << "extern \"C\" ::Components::EnterpriseComponent_ptr"
       << be_nl
-      << "create_" << s->flat_name () << "_Impl (void)" << be_nl
+      << "create_" << s->flat_name () << "_Impl ()" << be_nl
       << "{" << be_idt_nl
       << "::Components::EnterpriseComponent_ptr retval ="
       << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
index 7343204497f..b52a43f1df2 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
@@ -26,15 +26,15 @@
 be_visitor_connector_dds_ex_base::be_visitor_connector_dds_ex_base (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
-    t_inst_ (0),
-    t_ref_ (0),
-    t_params_ (0),
-    base_tname_ (0)
+    t_inst_ (nullptr),
+    t_ref_ (nullptr),
+    t_params_ (nullptr),
+    base_tname_ (nullptr)
 {
 }
 
 be_visitor_connector_dds_ex_base::~be_visitor_connector_dds_ex_base (
-  void)
+  )
 {
 }
 
@@ -47,7 +47,7 @@ be_visitor_connector_dds_ex_base::begin (be_connector *node)
 
   AST_Connector *base = node;
 
-  while (this->t_args_.is_empty () && base != 0)
+  while (this->t_args_.is_empty () && base != nullptr)
     {
       this->process_template_args (base);
       base = base->base_connector ();
@@ -58,8 +58,7 @@ be_visitor_connector_dds_ex_base::begin (be_connector *node)
       return false;
     }
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
@@ -79,7 +78,7 @@ be_visitor_connector_dds_ex_base::is_dds_type (
 
   if (base)
     {
-      while (base->base_connector () != 0)
+      while (base->base_connector () != nullptr)
         {
           base = base->base_connector ();
         }
@@ -88,15 +87,15 @@ be_visitor_connector_dds_ex_base::is_dds_type (
 
       if (ACE_OS::strcmp (lname, "DDS_Base") == 0)
         {
-          AST_Structure *s = AST_Structure::narrow_from_decl (d);
+          AST_Structure *s = dynamic_cast<AST_Structure*> (d);
 
-          if (s == 0)
+          if (s == nullptr)
             {
-              AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+              AST_Typedef *td = dynamic_cast<AST_Typedef*> (d);
 
-              if (td != 0)
+              if (td != nullptr)
                 {
-                  s = AST_Structure::narrow_from_decl (td->primitive_base_type ());
+                  s = dynamic_cast<AST_Structure*> (td->primitive_base_type ());
                 }
             }
 
@@ -115,7 +114,7 @@ be_visitor_connector_dds_ex_base::process_template_args (
   AST_Connector *node)
 {
   AST_Module *m =
-    AST_Module::narrow_from_scope (node->defined_in ());
+    dynamic_cast<AST_Module*> (node->defined_in ());
 
   /// If this is non-zero, we use this to limit our template
   /// args list to those used in the alias. If it is zero, we
@@ -127,13 +126,13 @@ be_visitor_connector_dds_ex_base::process_template_args (
   /// We assume the connector comes from the instantiation
   /// of a template module, and the regular module it's
   /// defined in (at some level) will have a reference to it.
-  while (this->t_inst_ == 0 && m != 0)
+  while (this->t_inst_ == nullptr && m != nullptr)
     {
       this->t_inst_ = m->from_inst ();
-      m = AST_Module::narrow_from_scope (m->defined_in ());
+      m = dynamic_cast<AST_Module*> (m->defined_in ());
     }
 
-  if (this->t_inst_ == 0)
+  if (this->t_inst_ == nullptr)
     {
       /// Probably means we're trying the base connector
       /// of DDS_State or DDS_Event, in which case we
@@ -155,7 +154,7 @@ be_visitor_connector_dds_ex_base::process_template_args (
 
   /// We depend on the DDS datatype being the first template
   /// argument for now, this may change.
-  AST_Decl **datatype = 0;
+  AST_Decl **datatype = nullptr;
   int const status = this->t_args_.get (datatype, 0UL);
 
   if (status != 0)
@@ -173,14 +172,14 @@ be_visitor_connector_dds_ex_base::process_template_args (
 }
 
 void
-be_visitor_connector_dds_ex_base::match_template_args (void)
+be_visitor_connector_dds_ex_base::match_template_args ()
 {
   /// If the connector was declared in an aliased templated
   /// module, we want to populate our template args list with
   /// only the args referenced in the alias (see FOR loop
   /// below). Otherwise, we just copy the containing template
   /// module instantiation's arg list.
-  if (this->t_ref_ == 0)
+  if (this->t_ref_ == nullptr)
     {
       this->t_args_ = *this->t_inst_->template_args ();
       return;
@@ -198,12 +197,12 @@ be_visitor_connector_dds_ex_base::match_template_args (void)
            ! ci.done ();
            ci.advance (), ++slot)
         {
-          FE_Utils::T_Param_Info *t_param = 0;
+          FE_Utils::T_Param_Info *t_param = nullptr;
           ci.next (t_param);
 
           if (t_param->name_ == ref_name)
             {
-              AST_Decl **d = 0;
+              AST_Decl **d = nullptr;
               this->t_inst_->template_args ()->get (d, slot);
               this->t_args_.enqueue_tail (*d);
               break;
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 37275aabd0d..03394c4b548 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
@@ -33,7 +33,7 @@ be_visitor_connector_dds_exh::be_visitor_connector_dds_exh (
   export_macro_ = be_global->conn_export_macro ();
 }
 
-be_visitor_connector_dds_exh::~be_visitor_connector_dds_exh (void)
+be_visitor_connector_dds_exh::~be_visitor_connector_dds_exh ()
 {
 }
 
@@ -58,7 +58,7 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node)
           !i.done ();
           i.advance ())
         {
-          AST_Decl **item = 0;
+          AST_Decl **item = nullptr;
           i.next (item);
           AST_Decl *d = *item;
 
@@ -87,7 +87,7 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node)
           !i.done ();
           i.advance (), ++slot)
         {
-          AST_Decl **item = 0;
+          AST_Decl **item = nullptr;
           i.next (item);
           AST_Decl *d = *item;
 
@@ -103,7 +103,7 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node)
 
           bool needs_bool = false;
           bool is_fixed = false;
-          FE_Utils::T_Param_Info *param = 0;
+          FE_Utils::T_Param_Info *param = nullptr;
 
           if (this->t_params_->get (param, slot - 1) != 0)
             {
@@ -117,13 +117,13 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node)
           if (d->node_type () == AST_Decl::NT_typedef)
             {
               /// Strip away all layers of typedef before narrowing.
-              AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+              AST_Typedef *td = dynamic_cast<AST_Typedef*> (d);
               d = td->primitive_base_type ();
             }
 
           /// No need to check if this is 0, but must narrow
           /// to call virtual function size_type() below.
-          AST_Type *t = AST_Type::narrow_from_decl (d);
+          AST_Type *t = dynamic_cast<AST_Type*> (d);
 
           switch (param->type_)
             {
@@ -154,9 +154,9 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node)
       os_ << be_uidt << be_uidt << be_uidt_nl
           << "{" << be_nl
           << "public:" << be_idt_nl
-          << this->node_->local_name () << "_exec_i (void);" << be_nl
+          << this->node_->local_name () << "_exec_i ();" << be_nl
           << "virtual ~" << this->node_->local_name ()
-          << "_exec_i (void);" << be_uidt_nl
+          << "_exec_i ();" << be_uidt_nl
           << "};";
 
       this->gen_exec_entrypoint_decl ();
@@ -175,7 +175,7 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node)
       !iter.done ();
       iter.advance ())
     {
-      be_interface **item = 0;
+      be_interface **item = nullptr;
       iter.next (item);
 
       (*item)->dds_connector_traits_done (false);
@@ -218,7 +218,7 @@ be_visitor_connector_dds_exh::visit_mirror_port (
        !iter.done ();
        iter.advance ())
     {
-      be_interface **item = 0;
+      be_interface **item = nullptr;
       iter.next (item);
 
       (*item)->dds_connector_traits_done (false);
@@ -231,7 +231,7 @@ int
 be_visitor_connector_dds_exh::visit_provides (be_provides *node)
 {
   be_interface *iface =
-    be_interface::narrow_from_decl (node->provides_type ());
+    dynamic_cast<be_interface*> (node->provides_type ());
 
   this->gen_interface_connector_trait (iface, node, true);
 
@@ -242,7 +242,7 @@ int
 be_visitor_connector_dds_exh::visit_uses (be_uses *node)
 {
   be_interface *iface =
-    be_interface::narrow_from_decl (node->uses_type ());
+    dynamic_cast<be_interface*> (node->uses_type ());
 
   this->gen_interface_connector_trait (iface, node, false);
 
@@ -356,7 +356,7 @@ be_visitor_connector_dds_exh::gen_dds_traits (AST_Decl *datatype)
 }
 
 void
-be_visitor_connector_dds_exh::gen_connector_traits (void)
+be_visitor_connector_dds_exh::gen_connector_traits ()
 {
   AST_Decl *comp_scope =
     ScopeAsDecl (this->node_->defined_in ());
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 45424fa074d..d114738c868 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
@@ -24,7 +24,7 @@ be_visitor_connector_dds_exs::be_visitor_connector_dds_exs (
   export_macro_ = be_global->conn_export_macro ();
 }
 
-be_visitor_connector_dds_exs::~be_visitor_connector_dds_exs (void)
+be_visitor_connector_dds_exs::~be_visitor_connector_dds_exs ()
 {
 }
 
@@ -46,7 +46,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node)
     {
       os_ << be_nl
           << this->node_->local_name () << "_exec_i::"
-          << this->node_->local_name () << "_exec_i (void)"
+          << this->node_->local_name () << "_exec_i ()"
           << be_idt_nl
           << ": " << this->base_tname_ << "_Connector_T";
 
@@ -61,7 +61,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node)
           !i.done ();
           i.advance (), ++slot)
         {
-          AST_Decl **item = 0;
+          AST_Decl **item = nullptr;
           i.next (item);
           AST_Decl *d = *item;
 
@@ -77,7 +77,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node)
 
           bool needs_bool = false;
           bool is_fixed = false;
-          FE_Utils::T_Param_Info *param = 0;
+          FE_Utils::T_Param_Info *param = nullptr;
 
           if (this->t_params_->get (param, slot - 1) != 0)
             {
@@ -91,13 +91,13 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node)
           if (d->node_type () == AST_Decl::NT_typedef)
             {
               /// Strip away all layers of typedef before narrowing.
-              AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+              AST_Typedef *td = dynamic_cast<AST_Typedef*> (d);
               d = td->primitive_base_type ();
             }
 
           /// No need to check if this is 0, but must narrow
           /// to call virtual function size_type() below.
-          AST_Type *t = AST_Type::narrow_from_decl (d);
+          AST_Type *t = dynamic_cast<AST_Type*> (d);
 
           switch (param->type_)
             {
@@ -130,7 +130,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node)
 
       os_ << be_nl_2
           << this->node_->local_name () << "_exec_i::~"
-          << this->node_->local_name () << "_exec_i (void)" << be_nl
+          << this->node_->local_name () << "_exec_i ()" << be_nl
           << "{" << be_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 5bdd441b4b1..bea0ef5deb2 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
@@ -23,7 +23,7 @@ be_visitor_executor_ami_exh::be_visitor_executor_ami_exh (
   export_macro_ = be_global->conn_export_macro ();
 }
 
-be_visitor_executor_ami_exh::~be_visitor_executor_ami_exh (void)
+be_visitor_executor_ami_exh::~be_visitor_executor_ami_exh ()
 {
 }
 
@@ -43,9 +43,9 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node)
       << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
-      << scope->local_name () << suffix << " (void);" << be_nl
+      << scope->local_name () << suffix << " ();" << be_nl
       << "virtual ~" << scope->local_name () << suffix
-      << " (void);";
+      << " ();";
 
   if (this->visit_scope (node) == -1)
     {
@@ -65,11 +65,11 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node)
       << "::Components::" << be_global->ciao_container_type ()
       << "Context_ptr ctx);"
       << be_nl_2
-      << "virtual void configuration_complete (void);"
+      << "virtual void configuration_complete ();"
       << be_nl_2
-      << "virtual void ccm_activate (void);" << be_nl
-      << "virtual void ccm_passivate (void);" << be_nl
-      << "virtual void ccm_remove (void);";
+      << "virtual void ccm_activate ();" << be_nl
+      << "virtual void ccm_passivate ();" << be_nl
+      << "virtual void ccm_remove ();";
 
   os_ << be_uidt_nl << be_nl
       << "private:" << be_idt_nl;
@@ -116,7 +116,7 @@ be_visitor_executor_ami_exh::visit_provides (be_provides *node)
   AST_Decl *d = i.item ();
 
   os_ << d->local_name () << "_"
-      << node->local_name () << " (void);";
+      << node->local_name () << " ();";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
index 3f8265af4d2..68933967984 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
@@ -18,7 +18,7 @@ be_visitor_executor_ami_exs::be_visitor_executor_ami_exs (
 {
 }
 
-be_visitor_executor_ami_exs::~be_visitor_executor_ami_exs (void)
+be_visitor_executor_ami_exs::~be_visitor_executor_ami_exs ()
 {
 }
 
@@ -35,12 +35,12 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
 
   os_ << be_nl_2
       << class_name << "::"
-      << class_name << " (void)" << be_idt_nl;
+      << class_name << " ()" << be_idt_nl;
 
   /// The port is the only item in the connector's scope.
   UTL_ScopeActiveIterator j (node, UTL_Scope::IK_decls);
   AST_Extended_Port *p =
-    AST_Extended_Port::narrow_from_decl (j.item ());
+    dynamic_cast<AST_Extended_Port*> (j.item ());
 
   bool first = true;
   int port_nr = 0;
@@ -49,9 +49,9 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
        i.next ())
     {
       AST_Decl *d = i.item ();
-      AST_Provides *p = AST_Provides::narrow_from_decl (d);
+      AST_Provides *p = dynamic_cast<AST_Provides*> (d);
 
-      if (p != 0)
+      if (p != nullptr)
         {
           if (first)
             {
@@ -75,7 +75,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
 
   os_ << be_nl_2
       << class_name << "::~"
-      << class_name << " (void)" << be_nl
+      << class_name << " ()" << be_nl
       << "{" << be_idt_nl;
   for (int i = 0; i < port_nr; i ++)
     {
@@ -115,7 +115,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
 
   os_ << be_nl_2
       << "void" << be_nl
-      << class_name << "::configuration_complete (void)" << be_nl
+      << class_name << "::configuration_complete ()" << be_nl
       << "{" << be_idt_nl;
    for (int i = 0; i < port_nr; i ++)
     {
@@ -125,13 +125,13 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
 
   os_ << be_nl_2
       << "void" << be_nl
-      << class_name << "::ccm_activate (void)" << be_nl
+      << class_name << "::ccm_activate ()" << be_nl
       << "{" << be_nl
       << "}";
 
   os_ << be_nl_2
       << "void" << be_nl
-      << class_name << "::ccm_passivate (void)" << be_nl
+      << class_name << "::ccm_passivate ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -142,7 +142,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
 
   os_ << be_nl_2
       << "void" << be_nl
-      << class_name << "::ccm_remove (void)" << be_nl
+      << class_name << "::ccm_remove ()" << be_nl
       << "{" << be_idt_nl;
    for (int i = 0; i < port_nr; i ++)
     {
@@ -179,7 +179,7 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node)
   const char *exec_ext = (ACE_OS::strstr (loc_name, "sync") ? "1" : "0");
 
     os_ << d->local_name () << "_"
-      << node->local_name () << " (void)" << be_nl
+      << node->local_name () << " ()" << be_nl
       << "{" << be_idt_nl
       << "return "
       << smart_scope << scope->full_name () << "::CCM_" << t->local_name () << "::_duplicate ("
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 dbe687392dc..c8cd22615a1 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
@@ -17,10 +17,10 @@
 be_visitor_facet_ami_exh::be_visitor_facet_ami_exh (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
-    iface_ (0),
-    callback_iface_ (0),
-    scope_name_ (0),
-    iface_name_ (0),
+    iface_ (nullptr),
+    callback_iface_ (nullptr),
+    scope_name_ (nullptr),
+    iface_name_ (nullptr),
     sync_ (false)
 {
   // This is initialized in the base class to svnt_export_macro()
@@ -30,7 +30,7 @@ be_visitor_facet_ami_exh::be_visitor_facet_ami_exh (
   export_macro_ = be_global->conn_export_macro ();
 }
 
-be_visitor_facet_ami_exh::~be_visitor_facet_ami_exh (void)
+be_visitor_facet_ami_exh::~be_visitor_facet_ami_exh ()
 {
 }
 
@@ -51,7 +51,7 @@ int
 be_visitor_facet_ami_exh::visit_provides (be_provides *node)
 {
   this->iface_ =
-    be_interface::narrow_from_decl (node->provides_type ());
+    dynamic_cast<be_interface*> (node->provides_type ());
 
   if (this->gen_reply_handler_class () == -1)
     {
@@ -83,8 +83,8 @@ be_visitor_facet_ami_exh::visit_attribute (be_attribute *node)
   be_operation get_op (node->field_type (),
                        AST_Operation::OP_noflags,
                        node->name (),
-                       0,
-                       0);
+                       false,
+                       false);
 
   get_op.set_name ((UTL_IdList *) node->name ()->copy ());
   if (this->visit_operation (&get_op) == -1)
@@ -103,7 +103,7 @@ be_visitor_facet_ami_exh::visit_attribute (be_attribute *node)
       return 0;
     }
   Identifier id ("void");
-  UTL_ScopedName sn (&id, 0);
+  UTL_ScopedName sn (&id, nullptr);
 
   // Create the return type, which is "void"
   be_predefined_type rt (AST_PredefinedType::PT_void, &sn);
@@ -120,8 +120,8 @@ be_visitor_facet_ami_exh::visit_attribute (be_attribute *node)
   be_operation set_op (&rt,
                        AST_Operation::OP_noflags,
                        node->name (),
-                       0,
-                       0);
+                       false,
+                       false);
 
   set_op.set_name ((UTL_IdList *) node->name ()->copy ());
   set_op.be_add_argument (arg);
@@ -206,18 +206,18 @@ be_visitor_facet_ami_exh::init (bool for_impl)
   UTL_ScopedName *sn =
     FE_Utils::string_to_scoped_name (this->handler_str_.c_str ());
   AST_Decl *d = s->lookup_by_name (sn, true, false);
-  this->callback_iface_ = be_interface::narrow_from_decl (d);
+  this->callback_iface_ = dynamic_cast<be_interface*> (d);
 
-  if (this->callback_iface_ == 0)
+  if (this->callback_iface_ == nullptr)
     this->sync_  = true;
 
   sn->destroy ();
   delete sn;
-  sn = 0;
+  sn = nullptr;
 }
 
 int
-be_visitor_facet_ami_exh::gen_reply_handler_class (void)
+be_visitor_facet_ami_exh::gen_reply_handler_class ()
 {
   os_ << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
@@ -239,7 +239,7 @@ be_visitor_facet_ami_exh::gen_reply_handler_class (void)
       << this->iface_name_
       << "ReplyHandler_ptr callback," << be_nl
       << "::PortableServer::POA_ptr poa);" << be_uidt_nl << be_nl
-      << "virtual ~" << this->iface_name_ << suffix << " (void);";
+      << "virtual ~" << this->iface_name_ << suffix << " ();";
 
   int const status =
     this->callback_iface_->traverse_inheritance_graph (
@@ -269,7 +269,7 @@ be_visitor_facet_ami_exh::gen_reply_handler_class (void)
 }
 
 int
-be_visitor_facet_ami_exh::gen_facet_executor_class (void)
+be_visitor_facet_ami_exh::gen_facet_executor_class ()
 {
     os_ << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
@@ -288,9 +288,9 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
       << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
-      << iface_name << suffix << " (void);" << be_nl_2
+      << iface_name << suffix << " ();" << be_nl_2
       << "virtual ~" << iface_name << suffix
-      << " (void);";
+      << " ();";
 
 
   ACE_CString handler_str (
@@ -299,7 +299,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
   handler_str += "::";
   handler_str += tmp;
 
-  if (ACE_OS::strstr (tmp.c_str(), "AMI4CCM") != 0)
+  if (ACE_OS::strstr (tmp.c_str(), "AMI4CCM") != nullptr)
     this->sync_ = false;
   else
     this->sync_ = true;
@@ -312,10 +312,10 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
 
      sn->destroy ();
      delete sn;
-     sn = 0;
+     sn = nullptr;
 
      be_interface *sync_iface =
-     be_interface::narrow_from_decl (d);
+     dynamic_cast<be_interface*> (d);
 
      /// The overload of traverse_inheritance_graph() used here
      /// doesn't automatically prime the queues.
@@ -371,7 +371,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
   const char *smart_scope = (is_global ? "" : "::");
 
   os_ << be_nl_2
-      << "virtual ::CORBA::Object_ptr _get_component (void);";
+      << "virtual ::CORBA::Object_ptr _get_component ();";
 
   os_ << be_nl_2
       << "virtual void _set_component (" << be_idt_nl
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 c711169ad5e..176da224463 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
@@ -21,7 +21,7 @@ be_visitor_facet_ami_exs::be_visitor_facet_ami_exs (
 {
 }
 
-be_visitor_facet_ami_exs::~be_visitor_facet_ami_exs (void)
+be_visitor_facet_ami_exs::~be_visitor_facet_ami_exs ()
 {
 }
 
@@ -43,7 +43,7 @@ be_visitor_facet_ami_exs::visit_provides (be_provides *node)
 {
 
   this->iface_ =
-    be_interface::narrow_from_decl (node->provides_type ());
+    dynamic_cast<be_interface*> (node->provides_type ());
 
     if (this->gen_reply_handler_class () == -1)
     {
@@ -74,8 +74,8 @@ be_visitor_facet_ami_exs::visit_attribute (be_attribute *node)
   be_operation get_op (node->field_type (),
                          AST_Operation::OP_noflags,
                          node->name (),
-                         0,
-                         0);
+                         false,
+                         false);
   get_op.set_name ((UTL_IdList *) node->name ()->copy ());
   if (this->visit_operation (&get_op) == -1)
     {
@@ -94,7 +94,7 @@ be_visitor_facet_ami_exs::visit_attribute (be_attribute *node)
       return 0;
     }
   Identifier id ("void");
-  UTL_ScopedName sn (&id, 0);
+  UTL_ScopedName sn (&id, nullptr);
 
   // Create the return type, which is "void"
   be_predefined_type rt (AST_PredefinedType::PT_void, &sn);
@@ -111,8 +111,8 @@ be_visitor_facet_ami_exs::visit_attribute (be_attribute *node)
   be_operation set_op (&rt,
                        AST_Operation::OP_noflags,
                        node->name (),
-                       0,
-                       0);
+                       false,
+                       false);
 
   set_op.set_name ((UTL_IdList *) node->name ()->copy ());
   set_op.be_add_argument (arg);
@@ -203,7 +203,7 @@ be_visitor_facet_ami_exs::post_process (be_decl *node)
   return 0;
 }
 void
-be_visitor_facet_ami_exs::init (void)
+be_visitor_facet_ami_exs::init ()
 {
   UTL_Scope *s = this->iface_->defined_in ();
   ACE_CString handler_str (
@@ -219,13 +219,13 @@ be_visitor_facet_ami_exs::init (void)
 
   sn->destroy ();
   delete sn;
-  sn = 0;
+  sn = nullptr;
 
 
   be_interface *callback_iface =
-    be_interface::narrow_from_decl (d);
+    dynamic_cast<be_interface*> (d);
 
-  if (callback_iface == 0)
+  if (callback_iface == nullptr)
    this->sync_ = true;
   else
     this->sync_ = false;
@@ -233,7 +233,7 @@ be_visitor_facet_ami_exs::init (void)
 
 }
 int
-be_visitor_facet_ami_exs::gen_reply_handler_class (void)
+be_visitor_facet_ami_exs::gen_reply_handler_class ()
 {
   this->for_reply_handler_ = true;
 
@@ -268,7 +268,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class (void)
 
   os_ << be_nl_2
       << iface_name << suffix << "::~"
-      << iface_name << suffix << " (void)" << be_nl
+      << iface_name << suffix << " ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -291,11 +291,11 @@ be_visitor_facet_ami_exs::gen_reply_handler_class (void)
 
   sn->destroy ();
   delete sn;
-  sn = 0;
+  sn = nullptr;
 
 
   be_interface *callback_iface =
-    be_interface::narrow_from_decl (d);
+    dynamic_cast<be_interface*> (d);
 
   /// The overload of traverse_inheritance_graph() used here
   /// doesn't automatically prime the queues.
@@ -325,7 +325,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class (void)
 }
 
 int
-be_visitor_facet_ami_exs::gen_facet_executor_class (void)
+be_visitor_facet_ami_exs::gen_facet_executor_class ()
 {
 
   this->for_reply_handler_ = false;
@@ -337,13 +337,13 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
 
   os_ << be_nl_2
       << iface_name << suffix << "::"
-      << iface_name << suffix << " (void)" << be_nl
+      << iface_name << suffix << " ()" << be_nl
       << "{" << be_nl
       << "}";
 
   os_ << be_nl_2
       << iface_name << suffix << "::~"
-      << iface_name << suffix << " (void)" << be_nl
+      << iface_name << suffix << " ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -360,10 +360,10 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
 
     sn->destroy ();
     delete sn;
-    sn = 0;
+    sn = nullptr;
 
     be_interface *sync_iface =
-       be_interface::narrow_from_decl (d);
+       dynamic_cast<be_interface*> (d);
 
     /// The overload of traverse_inheritance_graph() used here
     /// doesn't automatically prime the queues.
@@ -389,7 +389,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
 
       }
 
-  ACE_CString scope_str (scope_name, 0, false);
+  ACE_CString scope_str (scope_name, nullptr, false);
 
   const char *container_type = be_global->ciao_container_type ();
 
@@ -421,7 +421,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
 
   os_ << be_nl_2
       << "::CORBA::Object_ptr" << be_nl
-      << iface_name << "_exec_i::_get_component (void)" << be_nl
+      << iface_name << "_exec_i::_get_component ()" << be_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "::" << s->name () << smart_scope
@@ -477,7 +477,7 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
       UTL_ScopeActiveIterator i (node, UTL_Scope::IK_decls);
       AST_Decl *d = i.item ();
       AST_Argument *arg =
-        AST_Argument::narrow_from_decl (d);
+        dynamic_cast<AST_Argument*> (d);
       AST_Type *t = arg->field_type ();
       ACE_CString type_name = t->full_name ();
 
@@ -539,7 +539,7 @@ 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_")== 0)
+  if (ACE_OS::strstr (node->local_name()->get_string (), "sendc_")== nullptr)
      return 0;
 
     os_ << be_nl_2
@@ -653,7 +653,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node)
 
    os_ << be_nl_2;
   // generate the return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -701,10 +701,10 @@ be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node)
   os_ << be_nl
       << "{" << be_idt_nl;
 
-  AST_PredefinedType *pdt = 0;
-  pdt = AST_PredefinedType::narrow_from_decl (bt);
+  AST_PredefinedType *pdt = nullptr;
+  pdt = dynamic_cast<AST_PredefinedType*> (bt);
   bool ret = true;
-  if ((pdt != 0) && (pdt->pt () == AST_PredefinedType::PT_void))
+  if ((pdt != nullptr) && (pdt->pt () == AST_PredefinedType::PT_void))
     ret =false;
 
   os_  << "::" << scope->full_name () << smart_scope
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 a8100df3ba0..ef25afde9ca 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
@@ -16,7 +16,7 @@ be_visitor_constant_ch::be_visitor_constant_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_constant_ch::~be_visitor_constant_ch (void)
+be_visitor_constant_ch::~be_visitor_constant_ch ()
 {
 }
 
@@ -43,10 +43,10 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
   AST_Expression::ExprType etype = node->et ();
   AST_Decl::NodeType snt = node->defined_in ()->scope_node_type ();
 
-  if (tdef != 0)
+  if (tdef != nullptr)
     {
       nt = tdef->node_type ();
-      be_typedef *td = be_typedef:: narrow_from_decl (tdef);
+      be_typedef *td = dynamic_cast<be_typedef*> (tdef);
       bnt = td->base_node_type ();
     }
 
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 403a16a9f7e..1db7973d95f 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
@@ -16,7 +16,7 @@ be_visitor_constant_cs::be_visitor_constant_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_constant_cs::~be_visitor_constant_cs (void)
+be_visitor_constant_cs::~be_visitor_constant_cs ()
 {
 }
 
@@ -56,7 +56,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
   *os << be_nl_2;
   if (be_global->gen_inline_constants () && !forbidden_in_class)
     {
-      // Some compilers (especially Microsoft) always define storeage
+      // Some compilers (especially Microsoft) always define storage
       // when the initialiser is given, therefore the header has already
       // done this (which is non-C++ complient by the way).
       *os << "#ifndef ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE" << be_nl << "  ";
diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp
index 358281ed669..15cc1cd7069 100644
--- a/TAO/TAO_IDL/be/be_visitor_context.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_context.cpp
@@ -13,19 +13,19 @@
 #include "be_extern.h"
 #include "be_helper.h"
 
-be_visitor_context::be_visitor_context (void)
+be_visitor_context::be_visitor_context ()
   : ast_visitor_context (),
     state_ (TAO_CodeGen::TAO_INITIAL),
     sub_state_ (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN),
-    os_ (0),
-    scope_ (0),
-    node_ (0),
-    alias_ (0),
-    tdef_ (0),
-    attr_ (0),
-    exception_ (0),
-    comma_ (0),
-    interface_ (0)
+    os_ (nullptr),
+    scope_ (nullptr),
+    node_ (nullptr),
+    alias_ (nullptr),
+    tdef_ (nullptr),
+    attr_ (nullptr),
+    exception_ (false),
+    comma_ (false),
+    interface_ (nullptr)
 {
 }
 
@@ -67,7 +67,7 @@ be_visitor_context::operator= (const be_visitor_context &ctx)
   return *this;
 }
 
-be_visitor_context::~be_visitor_context (void)
+be_visitor_context::~be_visitor_context ()
 {
   // We do not own anything.
 }
@@ -75,21 +75,21 @@ be_visitor_context::~be_visitor_context (void)
 //= helpers
 
 void
-be_visitor_context::reset (void)
+be_visitor_context::reset ()
 {
   this->state_ = TAO_CodeGen::TAO_INITIAL;
   this->sub_state_ = TAO_CodeGen::TAO_SUB_STATE_UNKNOWN;
-  this->os_ = 0;
-  this->scope_ = 0;
-  this->node_ = 0;
-  this->alias_ = 0;
-  this->tdef_ = 0;
-  this->attr_ = 0;
-  this->exception_ = 0;
-  this->comma_ = 0;
-  this->interface_ = 0;
-  this->template_args_ = 0;
-  this->template_params_ = 0;
+  this->os_ = nullptr;
+  this->scope_ = nullptr;
+  this->node_ = nullptr;
+  this->alias_ = nullptr;
+  this->tdef_ = nullptr;
+  this->attr_ = nullptr;
+  this->exception_ = false;
+  this->comma_ = false;
+  this->interface_ = nullptr;
+  this->template_args_ = nullptr;
+  this->template_params_ = nullptr;
   this->port_prefix_ = "";
 }
 
@@ -100,7 +100,7 @@ be_visitor_context::stream (TAO_OutStream *os)
 }
 
 TAO_OutStream *
-be_visitor_context::stream (void)
+be_visitor_context::stream ()
 {
   static TAO_OutStream null_stream;
   return os_ ? os_ : &null_stream;
@@ -113,7 +113,7 @@ be_visitor_context::scope (be_scope *s)
 }
 
 be_scope *
-be_visitor_context::scope (void)
+be_visitor_context::scope ()
 {
   return this->scope_;
 }
@@ -125,7 +125,7 @@ be_visitor_context::node (be_decl *n)
 }
 
 be_decl *
-be_visitor_context::node (void)
+be_visitor_context::node ()
 {
   return this->node_;
 }
@@ -137,7 +137,7 @@ be_visitor_context::state (TAO_CodeGen::CG_STATE st)
 }
 
 TAO_CodeGen::CG_STATE
-be_visitor_context::state (void)
+be_visitor_context::state ()
 {
   return this->state_;
 }
@@ -149,7 +149,7 @@ be_visitor_context::sub_state (TAO_CodeGen::CG_SUB_STATE st)
 }
 
 TAO_CodeGen::CG_SUB_STATE
-be_visitor_context::sub_state (void)
+be_visitor_context::sub_state ()
 {
   return this->sub_state_;
 }
@@ -161,7 +161,7 @@ be_visitor_context::tdef (be_typedef *node)
 }
 
 be_typedef *
-be_visitor_context::tdef (void)
+be_visitor_context::tdef ()
 {
   return this->tdef_;
 }
@@ -173,7 +173,7 @@ be_visitor_context::alias (be_typedef *node)
 }
 
 be_typedef *
-be_visitor_context::alias (void)
+be_visitor_context::alias ()
 {
   return this->alias_;
 }
@@ -185,7 +185,7 @@ be_visitor_context::attribute (be_attribute *node)
 }
 
 be_attribute *
-be_visitor_context::attribute (void)
+be_visitor_context::attribute ()
 {
   return this->attr_;
 }
@@ -197,7 +197,7 @@ be_visitor_context::exception (bool ib)
 }
 
 bool
-be_visitor_context::exception (void)
+be_visitor_context::exception ()
 {
   return this->exception_;
 }
@@ -209,7 +209,7 @@ be_visitor_context::comma (bool ib)
 }
 
 bool
-be_visitor_context::comma (void)
+be_visitor_context::comma ()
 {
   return this->comma_;
 }
@@ -221,19 +221,19 @@ be_visitor_context::interface (be_interface *interface)
 }
 
 be_interface *
-be_visitor_context::interface (void) const
+be_visitor_context::interface () const
 {
   return this->interface_;
 }
 
 ACE_CString &
-be_visitor_context::port_prefix (void)
+be_visitor_context::port_prefix ()
 {
   return this->port_prefix_;
 }
 
 const char *
-be_visitor_context::export_macro (void) const
+be_visitor_context::export_macro () const
 {
   switch (this->state_)
     {
@@ -258,7 +258,7 @@ be_visitor_context::export_macro (void) const
 }
 
 const char *
-be_visitor_context::non_null_export_macro (void) const
+be_visitor_context::non_null_export_macro () const
 {
   const char *anyop_export = be_global->anyop_export_macro ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_dds_ts_idl.cpp b/TAO/TAO_IDL/be/be_visitor_dds_ts_idl.cpp
index f7374989670..ada0800b67c 100644
--- a/TAO/TAO_IDL/be/be_visitor_dds_ts_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_dds_ts_idl.cpp
@@ -28,11 +28,11 @@
 be_visitor_dds_ts_idl::be_visitor_dds_ts_idl (
       be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    os_ptr_ (0)
+    os_ptr_ (nullptr)
 {
 }
 
-be_visitor_dds_ts_idl::~be_visitor_dds_ts_idl (void)
+be_visitor_dds_ts_idl::~be_visitor_dds_ts_idl ()
 {
 }
 
@@ -317,7 +317,7 @@ be_visitor_dds_ts_idl::gen_datareader (be_type *node)
 }
 
 int
-be_visitor_dds_ts_idl::init_file (void)
+be_visitor_dds_ts_idl::init_file ()
 {
   /// Open an IDL file for writing.
   ACE_CString orig (
@@ -358,12 +358,12 @@ be_visitor_dds_ts_idl::init_file (void)
 }
 
 void
-be_visitor_dds_ts_idl::fini_file (void)
+be_visitor_dds_ts_idl::fini_file ()
 {
   *this->os_ptr_ << be_nl_2
                  << "#endif /* ifndef */\n"
                  << "\n";
 
   delete this->os_ptr_;
-  this->os_ptr_ = 0;
+  this->os_ptr_ = nullptr;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_decl.cpp b/TAO/TAO_IDL/be/be_visitor_decl.cpp
index 14ec839436f..c735b7bcc13 100644
--- a/TAO/TAO_IDL/be/be_visitor_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_decl.cpp
@@ -23,12 +23,12 @@ be_visitor_decl::be_visitor_decl (be_visitor_context *ctx)
 {
 }
 
-be_visitor_decl::~be_visitor_decl (void)
+be_visitor_decl::~be_visitor_decl ()
 {
 }
 
 be_visitor_context *
-be_visitor_decl::ctx (void)
+be_visitor_decl::ctx ()
 {
   return this->ctx_;
 }
@@ -37,7 +37,7 @@ int
 be_visitor_decl::gen_anonymous_base_type (be_type *bt,
                                           TAO_CodeGen::CG_STATE cg_state)
 {
-  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
+  be_typedef *tdef = dynamic_cast<be_typedef*> (bt);
 
   if (!tdef)
     {
@@ -45,7 +45,7 @@ be_visitor_decl::gen_anonymous_base_type (be_type *bt,
       ctx.state (cg_state);
 
       // In case our container was typedef'd.
-      ctx.tdef (0);
+      ctx.tdef (nullptr);
 
       int status = 0;
 
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 52fd1b3fc7b..1a2c6dc7fd4 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,7 +17,7 @@ be_visitor_enum_any_op_ch::be_visitor_enum_any_op_ch (
 {
 }
 
-be_visitor_enum_any_op_ch::~be_visitor_enum_any_op_ch (void)
+be_visitor_enum_any_op_ch::~be_visitor_enum_any_op_ch ()
 {
 }
 
@@ -35,7 +35,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested ())
     {
@@ -46,7 +46,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -56,7 +56,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
@@ -90,11 +90,11 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
 
-  node->cli_hdr_any_op_gen (1);
+  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 62be2400733..f6d8c7f5b35 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
@@ -17,7 +17,7 @@ be_visitor_enum_any_op_cs::be_visitor_enum_any_op_cs (
 {
 }
 
-be_visitor_enum_any_op_cs::~be_visitor_enum_any_op_cs (void)
+be_visitor_enum_any_op_cs::~be_visitor_enum_any_op_cs ()
 {
 }
 
@@ -68,7 +68,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -78,7 +78,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -88,7 +88,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace corresponding
           // to their module, others do not.
@@ -166,11 +166,11 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
 
-  node->cli_stub_any_op_gen (1);
+  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 4717ce4c8d6..5c0e63d33ac 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
@@ -16,7 +16,7 @@ be_visitor_enum_cdr_op_ch::be_visitor_enum_cdr_op_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_enum_cdr_op_ch::~be_visitor_enum_cdr_op_ch (void)
+be_visitor_enum_cdr_op_ch::~be_visitor_enum_cdr_op_ch ()
 {
 }
 
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 4e269fca772..5ff226289aa 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,7 +16,7 @@ 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 (void)
+be_visitor_enum_cdr_op_cs::~be_visitor_enum_cdr_op_cs ()
 {
 }
 
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 c08274dc244..32f9694a2ba 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
@@ -22,7 +22,7 @@ be_visitor_enum_ch::be_visitor_enum_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_enum_ch::~be_visitor_enum_ch (void)
+be_visitor_enum_ch::~be_visitor_enum_ch ()
 {
 }
 
@@ -38,7 +38,7 @@ be_visitor_enum_ch::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Comma to be generated by the scope visitor.
-  this->ctx_->comma (1);
+  this->ctx_->comma (true);
 
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
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 5def28c74e5..aeaac4931ed 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
@@ -22,7 +22,7 @@ be_visitor_enum_cs::be_visitor_enum_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_enum_cs::~be_visitor_enum_cs (void)
+be_visitor_enum_cs::~be_visitor_enum_cs ()
 {
 }
 
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 220bbc8daf3..8d19cc74442 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
@@ -17,7 +17,7 @@ be_visitor_exception_any_op_ch::be_visitor_exception_any_op_ch (
 {
 }
 
-be_visitor_exception_any_op_ch::~be_visitor_exception_any_op_ch (void)
+be_visitor_exception_any_op_ch::~be_visitor_exception_any_op_ch ()
 {
 }
 
@@ -36,7 +36,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -46,7 +46,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -56,7 +56,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
@@ -92,7 +92,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
@@ -106,7 +106,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
                         -1);
     }
 
-  node->cli_hdr_any_op_gen (1);
+  node->cli_hdr_any_op_gen (true);
   return 0;
 }
 
@@ -114,7 +114,7 @@ int
 be_visitor_exception_any_op_ch::visit_field (be_field *node)
 {
   // First generate the type information.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
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 3f6ef5dea96..c38649bd11a 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
@@ -18,7 +18,7 @@ be_visitor_exception_any_op_cs::be_visitor_exception_any_op_cs (
 {
 }
 
-be_visitor_exception_any_op_cs::~be_visitor_exception_any_op_cs (void)
+be_visitor_exception_any_op_cs::~be_visitor_exception_any_op_cs ()
 {
 }
 
@@ -103,7 +103,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -113,7 +113,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -123,7 +123,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace corresponding
           // to their module, others do not.
@@ -244,7 +244,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
@@ -258,7 +258,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
                         -1);
     }
 
-  node->cli_stub_any_op_gen (1);
+  node->cli_stub_any_op_gen (true);
   return 0;
 }
 
@@ -266,7 +266,7 @@ int
 be_visitor_exception_any_op_cs::visit_field (be_field *node)
 {
   // First generate the type information.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
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 646b4b3b5ea..d190c985d5e 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
@@ -19,7 +19,7 @@ be_visitor_exception_cdr_op_ch::be_visitor_exception_cdr_op_ch (
 {
 }
 
-be_visitor_exception_cdr_op_ch::~be_visitor_exception_cdr_op_ch (void)
+be_visitor_exception_cdr_op_ch::~be_visitor_exception_cdr_op_ch ()
 {
 }
 
@@ -67,6 +67,6 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node)
                         -1);
     }
 
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
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 7c18447874c..eb400f07815 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
@@ -17,7 +17,7 @@ be_visitor_exception_cdr_op_cs::be_visitor_exception_cdr_op_cs (
 {
 }
 
-be_visitor_exception_cdr_op_cs::~be_visitor_exception_cdr_op_cs (void)
+be_visitor_exception_cdr_op_cs::~be_visitor_exception_cdr_op_cs ()
 {
 }
 
@@ -177,7 +177,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  node->cli_stub_cdr_op_gen (1);
+  node->cli_stub_cdr_op_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
index eb6d879e173..07949f99c42 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
@@ -19,7 +19,7 @@ be_visitor_exception_ctor_assign::be_visitor_exception_ctor_assign (
 {
 }
 
-be_visitor_exception_ctor_assign::~be_visitor_exception_ctor_assign (void)
+be_visitor_exception_ctor_assign::~be_visitor_exception_ctor_assign ()
 {
 }
 
@@ -48,7 +48,7 @@ be_visitor_exception_ctor_assign::visit_field (be_field *node)
   this->ctx_->node (node);
 
   // Retrieve the type.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -344,7 +344,7 @@ be_visitor_exception_ctor_assign::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -375,7 +375,7 @@ int
 be_visitor_exception_ctor_assign::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
@@ -394,7 +394,7 @@ be_visitor_exception_ctor_assign::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp
index 6f41600faa1..f1e7c6b5fdb 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp
@@ -17,7 +17,7 @@ be_visitor_exception::be_visitor_exception (be_visitor_context *ctx)
 {
 }
 
-be_visitor_exception::~be_visitor_exception (void)
+be_visitor_exception::~be_visitor_exception ()
 {
 }
 
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 b1a89b0904d..ad0751a4dad 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -23,7 +23,7 @@ be_visitor_exception_ch::be_visitor_exception_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_exception_ch::~be_visitor_exception_ch (void)
+be_visitor_exception_ch::~be_visitor_exception_ch ()
 {
 }
 
@@ -58,10 +58,10 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
 
   // Constructors and destructor.
   *os << be_nl_2
-      << node->local_name () << " (void);" << be_nl
+      << node->local_name () << " ();" << be_nl
       << node->local_name () << " (const " << node->local_name ()
       << " &);" << be_nl
-      << "~" << node->local_name () << " (void);\n" << be_nl;
+      << "~" << node->local_name () << " () = default;\n" << be_nl;
 
   // Assignment operator.
   *os << node->local_name () << " &operator= (const "
@@ -77,11 +77,11 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
       << "static const " << node->local_name ()
       << " *_downcast ( ::CORBA::Exception const *);" << be_nl_2;
 
-  *os << "static ::CORBA::Exception *_alloc (void);" << be_nl_2;
+  *os << "static ::CORBA::Exception *_alloc ();" << be_nl_2;
 
   *os << "virtual ::CORBA::Exception *"
-      << "_tao_duplicate (void) const;\n" << be_nl
-      << "virtual void _raise (void) const;\n" << be_nl
+      << "_tao_duplicate () const;\n" << be_nl
+      << "virtual void _raise () const;\n" << be_nl
       << "virtual void _tao_encode (TAO_OutputCDR &cdr) const;" << be_nl
       << "virtual void _tao_decode (TAO_InputCDR &cdr);";
 
@@ -106,7 +106,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
   if (be_global->tc_support ())
     {
       *os << be_nl_2
-          << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;";
+          << "virtual ::CORBA::TypeCode_ptr _tao_type () const;";
     }
 
   *os << be_uidt_nl << "};";
@@ -126,6 +126,6 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
         }
     }
 
-  node->cli_hdr_gen (1);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
index 69ffb0d436a..6cd46fd03e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
@@ -16,7 +16,7 @@ be_visitor_exception_ci::be_visitor_exception_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_exception_ci::~be_visitor_exception_ci (void)
+be_visitor_exception_ci::~be_visitor_exception_ci ()
 {
 }
 
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 c0e0427d1ba..a25dc7fb3da 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -21,7 +21,7 @@ be_visitor_exception_cs::be_visitor_exception_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_exception_cs::~be_visitor_exception_cs (void)
+be_visitor_exception_cs::~be_visitor_exception_cs ()
 {
 }
 
@@ -99,7 +99,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   // Default constructor.
   *os << node->name () << "::" << node->local_name ()
-      << " (void)" << be_idt_nl;
+      << " ()" << be_idt_nl;
   *os << ": ::CORBA::UserException (" << be_idt << be_idt << be_idt_nl
       << "\"" << node->repoID () << "\"," << be_nl
       << "\"" << node->local_name () << "\")" << be_uidt
@@ -107,12 +107,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
   *os << "{" << be_nl;
   *os << "}" << be_nl_2;
 
-  // Destructor.
-  *os << node->name () << "::~" << node->local_name ()
-      << " (void)" << be_nl;
-  *os << "{" << be_nl;
-  *os << "}" << be_nl_2;
-
   // Copy constructor.
   *os << node->name () << "::" << node->local_name () << " (const ::"
       << node->name () << " &_tao_excp)" << be_idt_nl;
@@ -201,25 +195,25 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   // Generate the _alloc method.
   *os << "::CORBA::Exception *" << node->name ()
-      << "::_alloc (void)" << be_nl;
+      << "::_alloc ()" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "::CORBA::Exception *retval = 0;" << be_nl
+  *os << "::CORBA::Exception *retval {};" << be_nl
       << "ACE_NEW_RETURN (retval, ::" << node->name ()
-      << ", 0);" << be_nl
+      << ", nullptr);" << be_nl
       << "return retval;" << be_uidt_nl;
   *os << "}" << be_nl_2;
 
   *os << "::CORBA::Exception *" << be_nl
-      << node->name () << "::_tao_duplicate (void) const" << be_nl
+      << node->name () << "::_tao_duplicate () const" << be_nl
       << "{" << be_idt_nl
-      << "::CORBA::Exception *result = 0;" << be_nl
+      << "::CORBA::Exception *result {};" << be_nl
       << "ACE_NEW_RETURN (result, "
-      << "::" << node->name () << " (*this), 0);"
+      << "::" << node->name () << " (*this), nullptr);"
       << be_nl
       << "return result;" << be_uidt_nl
       << "}" << be_nl_2;
 
-  *os << "void " << node->name () << "::_raise (void) const" << be_nl
+  *os << "void " << node->name () << "::_raise () const" << be_nl
       << "{" << be_idt_nl
       << "throw *this;" << be_uidt_nl
       << "}" << be_nl_2;
@@ -277,7 +271,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     {
       *os << "// TAO extension - the virtual _type method." << be_nl
           << "::CORBA::TypeCode_ptr " << node->name ()
-          << "::_tao_type (void) const" << be_nl
+          << "::_tao_type () const" << be_nl
           << "{" << be_idt_nl
           << "TAO_AnyTypeCode_Adapter *adapter =" << be_idt_nl
           << "ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ("
@@ -309,7 +303,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
         {
           *os << "// TAO extension - the virtual _type method." << be_nl;
           *os << "::CORBA::TypeCode_ptr " << node->name ()
-              << "::_tao_type (void) const" << be_nl;
+              << "::_tao_type () const" << be_nl;
           *os << "{" << be_idt_nl;
           *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
           *os << "}";
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 27fd2e6206f..b4730800ba1 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -16,7 +16,7 @@ be_visitor_exception_ctor::be_visitor_exception_ctor (be_visitor_context *ctx)
 {
 }
 
-be_visitor_exception_ctor::~be_visitor_exception_ctor (void)
+be_visitor_exception_ctor::~be_visitor_exception_ctor ()
 {
 }
 
@@ -90,7 +90,7 @@ be_visitor_exception_ctor::visit_field (be_field *node)
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
   // Retrieve the type.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -119,7 +119,7 @@ int
 be_visitor_exception_ctor::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -132,7 +132,7 @@ be_visitor_exception_ctor::visit_array (be_array *node)
 
   *os << "const ";
 
-  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
+  be_typedef *tdef = dynamic_cast<be_typedef*> (bt);
 
   if (this->ctx_->state () != TAO_CodeGen::TAO_EXCEPTION_CTOR_CH
       && !tdef)
@@ -154,7 +154,7 @@ int
 be_visitor_exception_ctor::visit_enum (be_enum *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -181,7 +181,7 @@ int
 be_visitor_exception_ctor::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -208,7 +208,7 @@ int
 be_visitor_exception_ctor::visit_interface_fwd (be_interface_fwd *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -253,10 +253,10 @@ int
 be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
   be_typedef *td = this->ctx_->alias ();
 
-  if (td != 0)
+  if (td != nullptr)
     {
       bt = td;
     }
@@ -315,7 +315,7 @@ int
 be_visitor_exception_ctor::visit_sequence (be_sequence *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -361,7 +361,7 @@ int
 be_visitor_exception_ctor::visit_structure (be_structure *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -391,7 +391,7 @@ be_visitor_exception_ctor::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -400,7 +400,7 @@ int
 be_visitor_exception_ctor::visit_union (be_union *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -429,7 +429,7 @@ int
 be_visitor_exception_ctor::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
@@ -448,7 +448,7 @@ be_visitor_exception_ctor::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -456,7 +456,7 @@ int
 be_visitor_exception_ctor::emit_common (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
index be1477f0b21..09909a0f4fe 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
@@ -25,7 +25,7 @@ be_visitor_field_cdr_op_ch::be_visitor_field_cdr_op_ch (be_visitor_context *ctx)
 }
 
 // Destructor.
-be_visitor_field_cdr_op_ch::~be_visitor_field_cdr_op_ch (void)
+be_visitor_field_cdr_op_ch::~be_visitor_field_cdr_op_ch ()
 {
 }
 
@@ -33,7 +33,7 @@ be_visitor_field_cdr_op_ch::~be_visitor_field_cdr_op_ch (void)
 int
 be_visitor_field_cdr_op_ch::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -182,7 +182,7 @@ be_visitor_field_cdr_op_ch::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -207,7 +207,7 @@ be_visitor_field_cdr_op_ch::visit_typedef (be_typedef *node)
                          ), -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -244,7 +244,7 @@ int
 be_visitor_field_cdr_op_ch::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
index 9c336055a34..79c2c13aff0 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
@@ -21,14 +21,14 @@ be_visitor_field_cdr_op_cs::be_visitor_field_cdr_op_cs (
 {
 }
 
-be_visitor_field_cdr_op_cs::~be_visitor_field_cdr_op_cs (void)
+be_visitor_field_cdr_op_cs::~be_visitor_field_cdr_op_cs ()
 {
 }
 
 int
 be_visitor_field_cdr_op_cs::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -81,9 +81,9 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -102,7 +102,7 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node)
                   '\0',
                   NAMEBUFSIZE);
 
-  if (this->ctx_->alias () == 0 // Not a typedef.
+  if (this->ctx_->alias () == nullptr // Not a typedef.
       && node->is_child (this->ctx_->scope ()->decl ()))
     {
       // For anonymous arrays ...
@@ -112,7 +112,7 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -188,9 +188,9 @@ be_visitor_field_cdr_op_cs::visit_enum (be_enum *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -231,9 +231,9 @@ be_visitor_field_cdr_op_cs::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -305,9 +305,9 @@ be_visitor_field_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -404,13 +404,13 @@ be_visitor_field_cdr_op_cs::visit_eventtype_fwd (be_eventtype_fwd *node)
 
 
 int
-be_visitor_field_cdr_op_cs::emit_valuetype_common (void)
+be_visitor_field_cdr_op_cs::emit_valuetype_common ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -456,9 +456,9 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -579,9 +579,9 @@ be_visitor_field_cdr_op_cs::visit_sequence (be_sequence *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -624,9 +624,9 @@ be_visitor_field_cdr_op_cs::visit_string (be_string *str)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -640,7 +640,7 @@ be_visitor_field_cdr_op_cs::visit_string (be_string *str)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      if (str != 0 && str->max_size ()->ev ()->u.ulval != 0)
+      if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0)
         {
           if (str->width () == (long) sizeof (char))
             {
@@ -662,7 +662,7 @@ be_visitor_field_cdr_op_cs::visit_string (be_string *str)
 
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      if (str != 0 && str->max_size ()->ev ()->u.ulval != 0)
+      if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0)
         {
           if (str->width () == (long) sizeof (char))
             {
@@ -726,9 +726,9 @@ be_visitor_field_cdr_op_cs::visit_structure (be_structure *node)
 
   // retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -769,7 +769,7 @@ be_visitor_field_cdr_op_cs::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -789,7 +789,7 @@ be_visitor_field_cdr_op_cs::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -821,9 +821,9 @@ be_visitor_field_cdr_op_cs::visit_union (be_union *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -863,7 +863,7 @@ int
 be_visitor_field_cdr_op_cs::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
@@ -887,9 +887,9 @@ be_visitor_cdr_op_field_decl::be_visitor_cdr_op_field_decl (
 int
 be_visitor_cdr_op_field_decl::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_cdr_op_field_decl::"
@@ -920,9 +920,9 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_cdr_op_field_decl::"
@@ -939,7 +939,7 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
                   '\0',
                   NAMEBUFSIZE);
 
-  if (this->ctx_->alias () == 0 // Not a typedef.
+  if (this->ctx_->alias () == nullptr // Not a typedef.
       && node->is_child (this->ctx_->scope ()->decl ()))
     {
       // For anonymous arrays,
@@ -949,7 +949,7 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
 
       if (node->is_nested ())
         {
-          be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+          be_decl *parent = dynamic_cast<be_scope*> (node->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -1005,7 +1005,7 @@ be_visitor_cdr_op_field_decl::visit_typedef (be_typedef *node)
   // The node to be visited in the base primitve type that gets typedefed.
   be_type *bt = node->primitive_base_type ();
 
-  if (bt == 0 || bt->accept (this) == -1)
+  if (bt == nullptr || bt->accept (this) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_cdr_op_field_decl::"
@@ -1014,6 +1014,6 @@ be_visitor_cdr_op_field_decl::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
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 105c71840dc..46691909cae 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -23,7 +23,7 @@ be_visitor_field_ch::be_visitor_field_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_field_ch::~be_visitor_field_ch (void)
+be_visitor_field_ch::~be_visitor_field_ch ()
 {
 }
 
@@ -31,7 +31,7 @@ int
 be_visitor_field_ch::visit_field (be_field *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -67,7 +67,7 @@ int
 be_visitor_field_ch::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -137,7 +137,7 @@ int
 be_visitor_field_ch::visit_enum (be_enum *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -226,7 +226,7 @@ int
 be_visitor_field_ch::emit_common (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -261,10 +261,10 @@ int
 be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
   be_typedef *td = this->ctx_->alias ();
 
-  if (td != 0)
+  if (td != nullptr)
     {
       bt = td;
     }
@@ -296,7 +296,7 @@ int
 be_visitor_field_ch::visit_sequence (be_sequence *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -313,7 +313,7 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
       // Put the field node into the (anonymous) sequence node, to be
       // used later for unique name generation.
       be_field *member_node =
-        be_field::narrow_from_decl (this->ctx_->node ());
+        dynamic_cast<be_field*> (this->ctx_->node ());
       node->field_node (member_node);
 
       // This was already generated in the corresponding valuetype class.
@@ -357,7 +357,7 @@ 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 = be_typedef::narrow_from_decl (bt);
+  be_typedef *tdef = dynamic_cast<be_typedef*> (bt);
 
   // This was a typedefed array.
   // ACE_NESTED_CLASS macro generated by nested_type_name
@@ -402,7 +402,7 @@ int
 be_visitor_field_ch::visit_structure (be_structure *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -456,7 +456,7 @@ int
 be_visitor_field_ch::visit_structure_fwd (be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -479,7 +479,7 @@ be_visitor_field_ch::visit_typedef (be_typedef *node)
     }
 
   // Reset the alias.
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -487,7 +487,7 @@ int
 be_visitor_field_ch::visit_union (be_union *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -543,7 +543,7 @@ int
 be_visitor_field_ch::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
index eae1db16f16..07781ae74ff 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
@@ -19,7 +19,7 @@ be_visitor_field_ci::be_visitor_field_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_field_ci::~be_visitor_field_ci (void)
+be_visitor_field_ci::~be_visitor_field_ci ()
 {
 }
 
@@ -27,7 +27,7 @@ int
 be_visitor_field_ci::visit_field (be_field *node)
 {
   be_type *bt =
-    be_type::narrow_from_decl (node->field_type ());
+    dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -111,7 +111,7 @@ be_visitor_field_ci::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -131,7 +131,7 @@ be_visitor_field_ci::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -162,7 +162,7 @@ int
 be_visitor_field_ci::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
index 93bfe7181fb..8ba93034609 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
@@ -25,14 +25,14 @@ be_visitor_field_cs::be_visitor_field_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_field_cs::~be_visitor_field_cs (void)
+be_visitor_field_cs::~be_visitor_field_cs ()
 {
 }
 
 int
 be_visitor_field_cs::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -154,7 +154,7 @@ be_visitor_field_cs::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -174,7 +174,7 @@ be_visitor_field_cs::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -205,7 +205,7 @@ int
 be_visitor_field_cs::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
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 6aef08a239e..6d989d0bda9 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
@@ -14,12 +14,12 @@
 be_visitor_home_ex_idl::be_visitor_home_ex_idl (
     be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    node_ (0),
+    node_ (nullptr),
     os_ (*ctx->stream ())
 {
 }
 
-be_visitor_home_ex_idl::~be_visitor_home_ex_idl (void)
+be_visitor_home_ex_idl::~be_visitor_home_ex_idl ()
 {
 }
 
@@ -62,7 +62,7 @@ be_visitor_home_ex_idl::visit_attribute (be_attribute *node)
    os_ << be_nl
        << (rd_only ? "readonly " : "") << "attribute ";
 
-   be_type *ft = be_type::narrow_from_decl (node->field_type ());
+   be_type *ft = dynamic_cast<be_type*> (node->field_type ());
 
    os_ << IdentifierHelper::type_name (ft, this);
    os_ << " "
@@ -89,7 +89,7 @@ be_visitor_home_ex_idl::visit_operation (be_operation *node)
       os_ << "oneway ";
     }
 
-  be_type *rt = be_type::narrow_from_decl (node->return_type ());
+  be_type *rt = dynamic_cast<be_type*> (node->return_type ());
 
   os_ << IdentifierHelper::type_name (rt, this);
 
@@ -136,7 +136,7 @@ be_visitor_home_ex_idl::visit_argument (be_argument *node)
         return -1;
     }
 
-  be_type *ft = be_type::narrow_from_decl (node->field_type ());
+  be_type *ft = dynamic_cast<be_type*> (node->field_type ());
 
   os_ << IdentifierHelper::type_name (ft, this)
       << " "
@@ -178,7 +178,7 @@ be_visitor_home_ex_idl::visit_sequence (be_sequence *node)
   // Keep output statements separate because of side effects.
   os_ << "sequence<";
 
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
   os_ << IdentifierHelper::type_name (bt, this);
 
@@ -210,7 +210,7 @@ be_visitor_home_ex_idl::visit_string (be_string *node)
 }
 
 void
-be_visitor_home_ex_idl::gen_implicit (void)
+be_visitor_home_ex_idl::gen_implicit ()
 {
   os_ << be_nl
       << "local interface CCM_"
@@ -224,7 +224,7 @@ be_visitor_home_ex_idl::gen_implicit (void)
 }
 
 void
-be_visitor_home_ex_idl::gen_explicit (void)
+be_visitor_home_ex_idl::gen_explicit ()
 {
   os_ << be_nl_2
       << "local interface CCM_"
@@ -234,7 +234,7 @@ be_visitor_home_ex_idl::gen_explicit (void)
 
   AST_Home *base = node_->base_home ();
 
-  if (base == 0)
+  if (base == nullptr)
     {
       os_ << "::Components::HomeExecutorBase";
 
@@ -270,7 +270,7 @@ be_visitor_home_ex_idl::gen_explicit (void)
 }
 
 void
-be_visitor_home_ex_idl::gen_derived (void)
+be_visitor_home_ex_idl::gen_derived ()
 {
   ACE_CString lname_str =
     IdentifierHelper::try_escape (node_->original_local_name ());
@@ -285,7 +285,7 @@ be_visitor_home_ex_idl::gen_derived (void)
 }
 
 void
-be_visitor_home_ex_idl::gen_supported (void)
+be_visitor_home_ex_idl::gen_supported ()
 {
   os_ << be_idt;
 
@@ -309,7 +309,7 @@ be_visitor_home_ex_idl::gen_exception_list (
 {
   ACE_CDR::Long cutoff = (init_op ? 1 : 0);
 
-  if (exceptions != 0 && exceptions->length () > cutoff)
+  if (exceptions != nullptr && exceptions->length () > cutoff)
     {
       os_ << be_idt_nl
           << prefix << "raises ( ";
@@ -351,7 +351,7 @@ be_visitor_home_ex_idl::gen_exception_list (
 }
 
 void
-be_visitor_home_ex_idl::gen_home_executor (void)
+be_visitor_home_ex_idl::gen_home_executor ()
 {
   AST_Component *comp = node_->managed_component ();
   AST_Decl *scope = ScopeAsDecl (node_->defined_in ());
@@ -377,7 +377,7 @@ be_visitor_home_ex_idl::gen_home_executor (void)
 }
 
 void
-be_visitor_home_ex_idl::restore_scope (void)
+be_visitor_home_ex_idl::restore_scope ()
 {
   for (UTL_ScopeActiveIterator iter (node_, UTL_Scope::IK_decls);
        ! iter.is_done ();
@@ -389,7 +389,7 @@ be_visitor_home_ex_idl::restore_scope (void)
 
       UTL_ScopedName *nconc_name =
         new UTL_ScopedName (d->local_name ()->copy (),
-                            0);
+                            nullptr);
 
       UTL_ScopedName *new_name =
         dynamic_cast<UTL_ScopedName *> (node_->name ()->copy ());
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp
index 7214009bfca..c0953bcfbb7 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp
@@ -13,14 +13,14 @@
 
 be_visitor_home_exh::be_visitor_home_exh (be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    node_ (0),
-    comp_ (0),
+    node_ (nullptr),
+    comp_ (nullptr),
     os_ (*ctx->stream ()),
     export_macro_ (be_global->exec_export_macro ())
 {
 }
 
-be_visitor_home_exh::~be_visitor_home_exh (void)
+be_visitor_home_exh::~be_visitor_home_exh ()
 {
 }
 
@@ -35,8 +35,7 @@ be_visitor_home_exh::visit_home (be_home *node)
   node_ = node;
   comp_ = node_->managed_component ();
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
@@ -99,7 +98,7 @@ be_visitor_home_exh::visit_factory (be_factory *node)
 }
 
 int
-be_visitor_home_exh::gen_exec_class (void)
+be_visitor_home_exh::gen_exec_class ()
 {
   // We don't want a '_cxx_' prefix here.
   const char *lname =
@@ -120,15 +119,15 @@ be_visitor_home_exh::gen_exec_class (void)
 
   os_ << be_nl
       << "/// Constructor" << be_nl
-      << lname << "_exec_i (void);";
+      << lname << "_exec_i ();";
 
   os_ << be_nl_2
       << "/// Destructor" << be_nl
-      << "virtual ~" << lname << "_exec_i (void);";
+      << "virtual ~" << lname << "_exec_i ();";
 
   be_home *h = node_;
 
-  while (h != 0)
+  while (h != nullptr)
     {
       if (this->visit_scope (h) != 0)
         {
@@ -144,7 +143,7 @@ be_visitor_home_exh::gen_exec_class (void)
           // A closure of all the supported interfaces is stored
           // in the base class 'pd_inherits_flat' member.
           be_interface *bi =
-            be_interface::narrow_from_decl (h->inherits ()[i]);
+            dynamic_cast<be_interface*> (h->inherits ()[i]);
 
           int status =
             bi->traverse_inheritance_graph (
@@ -163,14 +162,14 @@ be_visitor_home_exh::gen_exec_class (void)
             }
         }
 
-      h = be_home::narrow_from_decl (h->base_home ());
+      h = dynamic_cast<be_home*> (h->base_home ());
     }
 
   os_ << be_nl_2
       << "/// Factory method";
 
   os_ << be_nl
-      << "virtual ::Components::EnterpriseComponent_ptr create (void);";
+      << "virtual ::Components::EnterpriseComponent_ptr create ();";
 
   os_ << be_uidt_nl
       << "};";
@@ -179,14 +178,14 @@ be_visitor_home_exh::gen_exec_class (void)
 }
 
 void
-be_visitor_home_exh::gen_entrypoint (void)
+be_visitor_home_exh::gen_entrypoint ()
 {
   os_ << be_nl_2
       << "/// Factory method for " << node_->full_name () << be_nl
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::HomeExecutorBase_ptr" << be_nl
       << "create_" << node_->flat_name ()
-      << "_Impl (void);";
+      << "_Impl ();";
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp
index 4d85b77fe57..634b9cb3ae0 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp
@@ -13,8 +13,8 @@
 
 be_visitor_home_exs::be_visitor_home_exs (be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    node_ (0),
-    comp_ (0),
+    node_ (nullptr),
+    comp_ (nullptr),
     os_ (*ctx->stream ()),
     comment_start_border_ ("/**"),
     comment_end_border_ (" */"),
@@ -23,7 +23,7 @@ be_visitor_home_exs::be_visitor_home_exs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_home_exs::~be_visitor_home_exs (void)
+be_visitor_home_exs::~be_visitor_home_exs ()
 {
 }
 
@@ -38,8 +38,7 @@ be_visitor_home_exs::visit_home (be_home *node)
   node_ = node;
   comp_ = node_->managed_component ();
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
@@ -114,7 +113,7 @@ be_visitor_home_exs::visit_factory (be_factory *node)
 }
 
 int
-be_visitor_home_exs::gen_exec_class (void)
+be_visitor_home_exs::gen_exec_class ()
 {
   // No '_cxx_' prefix.
   const char *lname =
@@ -127,18 +126,18 @@ be_visitor_home_exs::gen_exec_class (void)
       << comment_end_border_;
 
   os_ << be_nl_2
-      << lname << "_exec_i::" << lname << "_exec_i (void)" << be_nl
+      << lname << "_exec_i::" << lname << "_exec_i ()" << be_nl
       << "{" << be_nl
       << "}";
 
   os_ << be_nl_2
-      << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl
+      << lname << "_exec_i::~" << lname << "_exec_i ()" << be_nl
       << "{" << be_nl
       << "}";
 
   be_home *h = node_;
 
-  while (h != 0)
+  while (h != nullptr)
     {
       if (this->visit_scope (h) != 0)
         {
@@ -155,7 +154,7 @@ be_visitor_home_exs::gen_exec_class (void)
           // A closure of all the supported interfaces is stored
           // in the base class 'pd_inherits_flat' member.
           be_interface *bi =
-            be_interface::narrow_from_decl (h->inherits ()[i]);
+            dynamic_cast<be_interface*> (h->inherits ()[i]);
 
           bi->get_insert_queue ().reset ();
           bi->get_del_queue ().reset ();
@@ -181,7 +180,7 @@ be_visitor_home_exs::gen_exec_class (void)
             }
         }
 
-      h = be_home::narrow_from_decl (h->base_home ());
+      h = dynamic_cast<be_home*> (h->base_home ());
     }
 
   os_ << be_nl_2
@@ -189,7 +188,7 @@ be_visitor_home_exs::gen_exec_class (void)
 
   os_ << be_nl_2
       << "::Components::EnterpriseComponent_ptr" << be_nl
-      << lname << "_exec_i::create (void)" << be_nl
+      << lname << "_exec_i::create ()" << be_nl
       << "{" << be_idt_nl
       << "::Components::EnterpriseComponent_ptr retval ="
       << be_idt_nl
@@ -208,13 +207,13 @@ be_visitor_home_exs::gen_exec_class (void)
 }
 
 void
-be_visitor_home_exs::gen_entrypoint (void)
+be_visitor_home_exs::gen_entrypoint ()
 {
   os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::HomeExecutorBase_ptr" << be_nl
       << "create_" << node_->flat_name ()
-      << "_Impl (void)" << be_nl
+      << "_Impl ()" << be_nl
       << "{" << be_idt_nl
       << "::Components::HomeExecutorBase_ptr retval =" << be_idt_nl
       << "::Components::HomeExecutorBase::_nil ();"
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp
index cc21257c2b8..dcf444cd61b 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp
@@ -13,8 +13,8 @@
 
 be_visitor_home_svh::be_visitor_home_svh (be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    node_ (0),
-    comp_ (0),
+    node_ (nullptr),
+    comp_ (nullptr),
     os_ (*ctx->stream ()),
     export_macro_ (be_global->svnt_export_macro ())
 {
@@ -28,7 +28,7 @@ be_visitor_home_svh::be_visitor_home_svh (be_visitor_context *ctx)
     }
 }
 
-be_visitor_home_svh::~be_visitor_home_svh (void)
+be_visitor_home_svh::~be_visitor_home_svh ()
 {
 }
 
@@ -44,8 +44,7 @@ be_visitor_home_svh::visit_home (be_home *node)
   node_ = node;
   comp_ = node_->managed_component ();
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
@@ -87,7 +86,7 @@ be_visitor_home_svh::visit_factory (be_factory *node)
   // An inherited factory/finder needs to return the managed
   // component of the home where it is defined.
   be_home *h =
-    be_home::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_home*> (node->defined_in ());
 
   AST_Component *c = h->managed_component ();
 
@@ -120,7 +119,7 @@ be_visitor_home_svh::visit_finder (be_finder *node)
 }
 
 int
-be_visitor_home_svh::gen_servant_class (void)
+be_visitor_home_svh::gen_servant_class ()
 {
   AST_Decl *scope = ScopeAsDecl (node_->defined_in ());
   ACE_CString sname_str (scope->full_name ());
@@ -154,7 +153,7 @@ be_visitor_home_svh::gen_servant_class (void)
       << "_Container_ptr c);" << be_uidt;
 
   os_ << be_nl_2
-      << "virtual ~" << lname << "_Servant (void);";
+      << "virtual ~" << lname << "_Servant ();";
 
   if (this->node_->has_rw_attributes ())
     {
@@ -166,7 +165,7 @@ be_visitor_home_svh::gen_servant_class (void)
 
 AST_Type *pk = node_->primary_key ();
 
-  if (pk != 0)
+  if (pk != nullptr)
     {
       os_ << be_nl_2
           << "// Implicit home primary key operations - not supported.";
@@ -200,7 +199,7 @@ AST_Type *pk = node_->primary_key ();
 
   be_home *h = node_;
 
-  while (h != 0)
+  while (h != nullptr)
     {
       if (this->visit_scope (h) != 0)
         {
@@ -216,7 +215,7 @@ AST_Type *pk = node_->primary_key ();
           // A closure of all the supported interfaces is stored
           // in the base class 'pd_inherits_flat' member.
           be_interface *bi =
-            be_interface::narrow_from_decl (h->inherits ()[i]);
+            dynamic_cast<be_interface*> (h->inherits ()[i]);
 
           int status =
             bi->traverse_inheritance_graph (
@@ -235,7 +234,7 @@ AST_Type *pk = node_->primary_key ();
             }
         }
 
-      h = be_home::narrow_from_decl (h->base_home ());
+      h = dynamic_cast<be_home*> (h->base_home ());
     }
 
   os_ << be_uidt_nl
@@ -245,7 +244,7 @@ AST_Type *pk = node_->primary_key ();
 }
 
 void
-be_visitor_home_svh::gen_entrypoint (void)
+be_visitor_home_svh::gen_entrypoint ()
 {
   os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
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 12d36a276ef..805646d81b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp
@@ -13,8 +13,8 @@
 
 be_visitor_home_svs::be_visitor_home_svs (be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    node_ (0),
-    comp_ (0),
+    node_ (nullptr),
+    comp_ (nullptr),
     os_ (*ctx->stream ()),
     export_macro_ (be_global->svnt_export_macro ()),
     for_finder_ (false)
@@ -29,7 +29,7 @@ be_visitor_home_svs::be_visitor_home_svs (be_visitor_context *ctx)
     }
 }
 
-be_visitor_home_svs::~be_visitor_home_svs (void)
+be_visitor_home_svs::~be_visitor_home_svs ()
 {
 }
 
@@ -44,8 +44,7 @@ be_visitor_home_svs::visit_home (be_home *node)
   node_ = node;
   comp_ = node_->managed_component ();
 
-  /// CIDL-generated namespace used 'CIDL_' + composition name.
-  /// Now we use 'CIAO_' + component's flat name.
+  /// Use 'CIAO_' + component's flat name.
   os_ << be_nl_2
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
@@ -102,7 +101,7 @@ be_visitor_home_svs::visit_factory (be_factory *node)
   // An inherited factory/finder needs to return the managed
   // component of the home where it is defined.
   be_home *h =
-    be_home::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_home*> (node->defined_in ());
 
   AST_Component *c = h->managed_component ();
 
@@ -204,7 +203,7 @@ be_visitor_home_svs::visit_finder (be_finder *node)
 }
 
 int
-be_visitor_home_svs::gen_servant_class (void)
+be_visitor_home_svs::gen_servant_class ()
 {
   AST_Decl *scope = ScopeAsDecl (node_->defined_in ());
   ACE_CString sname_str (scope->full_name ());
@@ -236,7 +235,7 @@ be_visitor_home_svs::gen_servant_class (void)
       << "}";
 
   os_ << be_nl_2
-      << lname << "_Servant::~" << lname << "_Servant (void)"
+      << lname << "_Servant::~" << lname << "_Servant ()"
       << be_nl
       << "{" << be_nl
       << "}";
@@ -275,7 +274,7 @@ be_visitor_home_svs::gen_servant_class (void)
 
   AST_Type *pk = node_->primary_key ();
 
-  if (pk != 0)
+  if (pk != nullptr)
     {
       os_ << be_nl_2
           << "::" << comp_->name () << "_ptr" << be_nl
@@ -330,7 +329,7 @@ be_visitor_home_svs::gen_servant_class (void)
 
   be_home *h = node_;
 
-  while (h != 0)
+  while (h != nullptr)
     {
       if (this->visit_scope (h) != 0)
         {
@@ -346,7 +345,7 @@ be_visitor_home_svs::gen_servant_class (void)
           // A closure of all the supported interfaces is stored
           // in the base class 'pd_inherits_flat' member.
           be_interface *bi =
-            be_interface::narrow_from_decl (h->inherits ()[i]);
+            dynamic_cast<be_interface*> (h->inherits ()[i]);
 
           bi->get_insert_queue ().reset ();
           bi->get_del_queue ().reset ();
@@ -373,14 +372,14 @@ be_visitor_home_svs::gen_servant_class (void)
 
         }
 
-      h = be_home::narrow_from_decl (h->base_home ());
+      h = dynamic_cast<be_home*> (h->base_home ());
     }
 
   return 0;
 }
 
 void
-be_visitor_home_svs::gen_entrypoint (void)
+be_visitor_home_svs::gen_entrypoint ()
 {
   ACE_CString sname_str (
     ScopeAsDecl (node_->defined_in ())->full_name ());
@@ -443,14 +442,14 @@ be_visitor_home_attr_set::be_visitor_home_attr_set (
 {
 }
 
-be_visitor_home_attr_set::~be_visitor_home_attr_set (void)
+be_visitor_home_attr_set::~be_visitor_home_attr_set ()
 {
 }
 
 int
 be_visitor_home_attr_set::visit_home (be_home *node)
 {
-  if (node == 0)
+  if (node == nullptr)
     {
       return 0;
     }
@@ -459,7 +458,7 @@ be_visitor_home_attr_set::visit_home (be_home *node)
        !i.is_done ();
        i.next ())
     {
-      be_decl *d = be_decl::narrow_from_decl (i.item ());
+      be_decl *d = dynamic_cast<be_decl*> (i.item ());
 
       if (d->accept (this) == -1)
         {
@@ -471,7 +470,7 @@ be_visitor_home_attr_set::visit_home (be_home *node)
         }
     }
 
-  be_home *h = be_home::narrow_from_decl (node->base_home ());
+  be_home *h = dynamic_cast<be_home*> (node->base_home ());
 
   return this->visit_home (h);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
index f73289a33df..98ef62a49d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
@@ -17,7 +17,7 @@ be_visitor_amh_interface_ch::be_visitor_amh_interface_ch (
 {
 }
 
-be_visitor_amh_interface_ch::~be_visitor_amh_interface_ch (void)
+be_visitor_amh_interface_ch::~be_visitor_amh_interface_ch ()
 {
 }
 
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 f5f4cd4bb34..7dd6916b136 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
@@ -17,7 +17,7 @@ be_visitor_amh_rh_interface_sh::be_visitor_amh_rh_interface_sh (
 {
 }
 
-be_visitor_amh_rh_interface_sh::~be_visitor_amh_rh_interface_sh (void)
+be_visitor_amh_rh_interface_sh::~be_visitor_amh_rh_interface_sh ()
 {
 }
 
@@ -72,8 +72,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 () << " (void);" << be_nl
-      << "virtual ~" << rh_skel_class_name.c_str () << " (void);";
+      << rh_skel_class_name.c_str () << " ();" << be_nl
+      << "virtual ~" << rh_skel_class_name.c_str () << " ();";
 
   // 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 9c8a8d087be..c95bbdba3a1 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
@@ -17,7 +17,7 @@ be_visitor_amh_rh_interface_ss::be_visitor_amh_rh_interface_ss (
 {
 }
 
-be_visitor_amh_rh_interface_ss::~be_visitor_amh_rh_interface_ss (void)
+be_visitor_amh_rh_interface_ss::~be_visitor_amh_rh_interface_ss ()
 {
 }
 
@@ -68,7 +68,7 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << rh_skel_full_scope_name.c_str ()
-      << "::" << rh_skel_class_name.c_str () << " (void)" << be_nl
+      << "::" << 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
@@ -76,7 +76,7 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node)
 
   *os << rh_skel_full_scope_name.c_str ()
       << "::~" << rh_skel_class_name.c_str ()
-      << " (void)" << be_nl;
+      << " ()" << be_nl;
   *os << "{" << be_nl;
   *os << "}";
 
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 a4945489238..74a665c0482 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -17,7 +17,7 @@ be_visitor_amh_interface_sh::be_visitor_amh_interface_sh (
 {
 }
 
-be_visitor_amh_interface_sh::~be_visitor_amh_interface_sh (void)
+be_visitor_amh_interface_sh::~be_visitor_amh_interface_sh ()
 {
 }
 
@@ -34,7 +34,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
     }
 
   // Do not generate AMH classes for any sort of implied IDL.
-  if (node->original_interface () != 0)
+  if (node->original_interface () != nullptr)
     {
       return 0;
     }
@@ -78,9 +78,9 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
           ACE_CString amh_name ("POA_");
 
           // @@ The following code is *NOT* exception-safe.
-          char *buf = 0;
+          char *buf = nullptr;
           be_interface *base =
-            be_interface::narrow_from_decl (node->inherits ()[i]);
+            dynamic_cast<be_interface*> (node->inherits ()[i]);
           base->compute_full_name ("AMH_", "", buf);
           amh_name += buf;
           // buf was allocated by ACE_OS::strdup, so we need to use free
@@ -107,7 +107,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
   *os << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "protected:" << be_idt_nl
-      << class_name.c_str () << " (void);" << be_uidt_nl << be_nl
+      << class_name.c_str () << " ();" << be_uidt_nl << be_nl
       << "public:" << be_idt_nl;
 
   // No copy constructor for locality constraint interface.
@@ -128,7 +128,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
   // The _interface_repository_id method.
   *os << be_nl
       << "virtual const char* _interface_repository_id "
-      << "(void) const;";
+      << "() const;";
 
   if (this->visit_scope (node) ==  -1)
     {
@@ -189,7 +189,7 @@ be_visitor_amh_interface_sh::add_original_members (be_interface *node,
 
       if (d->node_type () == AST_Decl::NT_attr)
         {
-          be_attribute *attribute = be_attribute::narrow_from_decl (d);
+          be_attribute *attribute = dynamic_cast<be_attribute*> (d);
 
           if (!attribute)
             {
@@ -198,7 +198,7 @@ be_visitor_amh_interface_sh::add_original_members (be_interface *node,
         }
       else
         {
-          be_operation* operation = be_operation::narrow_from_decl (d);
+          be_operation* operation = dynamic_cast<be_operation*> (d);
 
           if (operation)
             {
@@ -226,8 +226,8 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
       return 0;
     }
 
-  Identifier *id = 0;
-  UTL_ScopedName *sn = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *sn = nullptr;
 
   ACE_NEW_RETURN (id,
                   Identifier ("void"),
@@ -235,11 +235,11 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
 
   ACE_NEW_RETURN (sn,
                   UTL_ScopedName (id,
-                                  0),
+                                  nullptr),
                   -1);
 
   // Create the return type, which is "void"
-  be_predefined_type *rt = 0;
+  be_predefined_type *rt = nullptr;
   ACE_NEW_RETURN (rt,
                   be_predefined_type (AST_PredefinedType::PT_void,
                                       sn),
@@ -258,13 +258,13 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
 
   ACE_NEW_RETURN (sn,
                   UTL_ScopedName (id,
-                                  0),
+                                  nullptr),
                   -1);
 
   op_name->nconc (sn);
 
   // Create the operation
-  be_operation *operation = 0;
+  be_operation *operation = nullptr;
   ACE_NEW_RETURN (operation,
                   be_operation (rt, //node->return_type (),
                                 AST_Operation::OP_noflags,
@@ -290,7 +290,7 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
             {
               operation->destroy ();
               delete operation;
-              operation = 0;
+              operation = nullptr;
 
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("be_visitor_amh_pre_proc::")
@@ -301,13 +301,13 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
             }
 
           AST_Argument *original_arg =
-            AST_Argument::narrow_from_decl (d);
+            dynamic_cast<AST_Argument*> (d);
 
           if (original_arg->direction () == AST_Argument::dir_INOUT ||
               original_arg->direction () == AST_Argument::dir_IN)
             {
               // Create the argument.
-              be_argument *arg = 0;
+              be_argument *arg = nullptr;
               ACE_NEW_RETURN (arg,
                               be_argument (original_arg->direction (),
                                            original_arg->field_type (),
@@ -323,7 +323,7 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
 
   // After having generated the operation we insert it into the
   // AMH node interface.
-  if (0 == amh_node->be_add_operation (operation))
+  if (nullptr == amh_node->be_add_operation (operation))
     {
       return -1;
     }
@@ -335,27 +335,27 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
 be_interface *
 be_visitor_amh_interface_sh::create_amh_class (ACE_CString name)
 {
-  Identifier *id = 0;
+  Identifier *id = nullptr;
   ACE_NEW_RETURN (id,
                   Identifier (name.c_str ()),
-                  0);
+                  nullptr);
 
-  UTL_ScopedName *amh_class_name = 0;
+  UTL_ScopedName *amh_class_name = nullptr;
   ACE_NEW_RETURN (amh_class_name,
                   UTL_ScopedName (id,
-                                  0),
-                  0);
+                                  nullptr),
+                  nullptr);
 
-  be_interface *amh_class = 0;
+  be_interface *amh_class = nullptr;
   ACE_NEW_RETURN (amh_class,
                   be_interface (amh_class_name, // name
-                                0,              // list of inherited
+                                nullptr,              // list of inherited
                                 0,              // number of inherited
-                                0,              // list of ancestors
+                                nullptr,              // list of ancestors
                                 0,              // number of ancestors
                                 0,              // non-local
                                 0),             // non-abstract
-                  0);
+                  nullptr);
 
   amh_class->set_name (amh_class_name);
   return amh_class;
@@ -373,5 +373,5 @@ be_visitor_amh_interface_sh::this_method (be_interface *node)
   // interfaces is "special", because the returned type is not exactly
   // the type of the class, but the original class that "implied" the
   // AMH one.
-  *os << non_amh_name.c_str () << " *_this (void);\n" << be_uidt;
+  *os << non_amh_name.c_str () << " *_this ();\n" << be_uidt;
 }
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 766f8e5a6f2..e792b18f3c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -16,7 +16,7 @@ be_visitor_amh_interface_ss::be_visitor_amh_interface_ss (
 {
 }
 
-be_visitor_amh_interface_ss::~be_visitor_amh_interface_ss (void)
+be_visitor_amh_interface_ss::~be_visitor_amh_interface_ss ()
 {
 }
 
@@ -38,7 +38,7 @@ int
 be_visitor_amh_interface_ss::visit_interface (be_interface *node)
 {
   // Do not generate AMH classes for any sort of implied IDL.
-  if (node->original_interface () != 0)
+  if (node->original_interface () != nullptr)
     {
       return 0;
     }
@@ -66,12 +66,12 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
 
   *os << non_amh_name.c_str () << "*" << be_nl
       << full_skel_name
-      << "::_this (void)" << be_nl
+      << "::_this ()" << be_nl
       << "{" << be_idt_nl
       << "TAO_Stub *stub = this->_create_stub ();" << be_nl_2;
 
   *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl
-      << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();" << be_nl
+      << "::CORBA::Object_ptr tmp {};" << be_nl
       << be_nl
       << "::CORBA::Boolean _tao_opt_colloc =" << be_idt_nl
       << "stub->servant_orb_var ()->orb_core ()->"
@@ -79,7 +79,7 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
       << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
       << "tmp," << be_nl
       << "::CORBA::Object (stub, _tao_opt_colloc, this)," << be_nl
-      << "0" << be_uidt_nl
+      << "nullptr" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   *os << "::CORBA::Object_var obj = tmp;" << be_nl
@@ -157,7 +157,7 @@ public:
 };
 
 TAO_IDL_Downcast_Implementation_Worker::
-TAO_IDL_Downcast_Implementation_Worker (void)
+TAO_IDL_Downcast_Implementation_Worker ()
 {
 }
 
@@ -173,7 +173,7 @@ emit (be_interface * /* derived */,
   ACE_CString amh_name ("POA_");
 
   // @@ The following code is *NOT* exception-safe.
-  char *buf = 0;
+  char *buf = nullptr;
   base->compute_full_name ("AMH_", "", buf);
   amh_name += buf;
   // buf was allocated using ACE_OS::strdup, so we must use free instead
@@ -194,14 +194,14 @@ class TAO_IDL_Copy_Ctor_Worker
   : public TAO_IDL_Inheritance_Hierarchy_Worker
 {
 public:
-  TAO_IDL_Copy_Ctor_Worker (void);
+  TAO_IDL_Copy_Ctor_Worker ();
 
   virtual int emit (be_interface *base,
                     TAO_OutStream *os,
                     be_interface *derived);
 };
 
-TAO_IDL_Copy_Ctor_Worker::TAO_IDL_Copy_Ctor_Worker (void)
+TAO_IDL_Copy_Ctor_Worker::TAO_IDL_Copy_Ctor_Worker ()
 {
 }
 
@@ -219,8 +219,8 @@ TAO_IDL_Copy_Ctor_Worker::emit (be_interface *derived,
 
   if (base->is_nested ())
     {
-      be_decl *scope = 0;
-      scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
+      be_decl *scope = nullptr;
+      scope = dynamic_cast<be_scope*> (base->defined_in ())->decl ();
 
       *os << "POA_" << scope->name () << "::AMH_"
           << base->local_name () << " (rhs)";
@@ -233,7 +233,7 @@ TAO_IDL_Copy_Ctor_Worker::emit (be_interface *derived,
       ACE_CString amh_name ("POA_");
 
       // @@ The following code is *NOT* exception-safe.
-      char *buf = 0;
+      char *buf = nullptr;
       base->compute_full_name ("AMH_", "", buf);
       amh_name += buf;
       // buf was allocated by ACE_OS::strdup, so we need to use free
@@ -275,7 +275,7 @@ ACE_CString
 be_visitor_amh_interface_ss::generate_flat_name (be_interface *node)
 {
   // @@ The following code is *NOT* exception-safe.
-  char *buf = 0;
+  char *buf = nullptr;
   node->compute_flat_name ("AMH_", "", buf);
 
   // @@ This whole thing would be more efficient if we could pass the
@@ -306,7 +306,7 @@ be_visitor_amh_interface_ss::generate_full_skel_name (be_interface *node)
   ACE_CString result ("POA_");
 
   // @@ The following code is *NOT* exception-safe.
-  char *buf = 0;
+  char *buf = nullptr;
   node->compute_full_name ("AMH_", "", buf);
   result += buf;
   // buf was allocated using ACE_OS::strdup, so we must use free instead
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 c7c001a671b..ceee283915f 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
@@ -18,7 +18,7 @@ be_visitor_ami4ccm_conn_ex_idl::be_visitor_ami4ccm_conn_ex_idl (
 {
 }
 
-be_visitor_ami4ccm_conn_ex_idl::~be_visitor_ami4ccm_conn_ex_idl (void)
+be_visitor_ami4ccm_conn_ex_idl::~be_visitor_ami4ccm_conn_ex_idl ()
 {
 }
 
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 2eeb3cb4307..4947b6291e4 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
@@ -19,7 +19,7 @@ be_visitor_ami4ccm_rh_ex_idl::be_visitor_ami4ccm_rh_ex_idl (
 {
 }
 
-be_visitor_ami4ccm_rh_ex_idl::~be_visitor_ami4ccm_rh_ex_idl (void)
+be_visitor_ami4ccm_rh_ex_idl::~be_visitor_ami4ccm_rh_ex_idl ()
 {
 }
 
@@ -106,7 +106,7 @@ be_visitor_ami4ccm_rh_ex_idl::visit_operation (be_operation *node)
   if (!node->void_return_type ())
     {
       be_type *t =
-        be_type::narrow_from_decl (node->return_type ());
+        dynamic_cast<be_type*> (node->return_type ());
 
       os_ << be_nl
           << "in "
@@ -158,7 +158,7 @@ be_visitor_ami4ccm_rh_ex_idl::visit_argument (be_argument *node)
     }
 
   be_type *t =
-    be_type::narrow_from_decl (node->field_type ());
+    dynamic_cast<be_type*> (node->field_type ());
 
   os_ << be_nl
       << "in ";
@@ -206,18 +206,18 @@ int
 be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node)
 {
   be_operation *op =
-    be_operation::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_operation*> (this->ctx_->scope ());
 
-  if (op == 0)
+  if (op == nullptr)
     {
       return 0;
     }
 
   bool void_ret_type = op->void_return_type ();
 
-  be_argument *arg = be_argument::narrow_from_decl (node);
+  be_argument *arg = dynamic_cast<be_argument*> (node);
 
-  if (arg == 0)
+  if (arg == nullptr)
     {
       return 0;
     }
@@ -258,7 +258,7 @@ be_visitor_ami4ccm_rh_ex_idl::gen_attr_rh_ops (bool is_set_op,
   if (!is_set_op)
     {
       be_type *t =
-        be_type::narrow_from_decl (node->field_type ());
+        dynamic_cast<be_type*> (node->field_type ());
 
       os_ << be_idt_nl << "in ";
 
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 1cbc59cd559..c0bab2857f8 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
@@ -15,11 +15,11 @@ be_visitor_ami4ccm_sendc_ex_idl::be_visitor_ami4ccm_sendc_ex_idl (
       be_visitor_context *ctx)
   : be_visitor_scope (ctx),
     os_ (*ctx->stream ()),
-    iface_ (0)
+    iface_ (nullptr)
 {
 }
 
-be_visitor_ami4ccm_sendc_ex_idl::~be_visitor_ami4ccm_sendc_ex_idl (void)
+be_visitor_ami4ccm_sendc_ex_idl::~be_visitor_ami4ccm_sendc_ex_idl ()
 {
 }
 
@@ -51,7 +51,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_interface (be_interface *node)
   for (long i = 0; i < node->n_inherits_flat (); ++i)
     {
       be_interface *ancestor =
-        be_interface::narrow_from_decl (inh_flat[i]);
+        dynamic_cast<be_interface*> (inh_flat[i]);
 
       if (this->visit_scope (ancestor) == -1)
         {
@@ -121,7 +121,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_argument (be_argument *node)
   else
     {
       be_type *t =
-        be_type::narrow_from_decl (node->field_type ());
+        dynamic_cast<be_type*> (node->field_type ());
 
       os_ << be_nl
           << "in ";
@@ -169,9 +169,9 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_sequence (be_sequence *node)
 int
 be_visitor_ami4ccm_sendc_ex_idl::pre_process (be_decl *node)
 {
-  be_argument *arg = be_argument::narrow_from_decl (node);
+  be_argument *arg = dynamic_cast<be_argument*> (node);
 
-  if (arg == 0)
+  if (arg == nullptr)
     {
       return 0;
     }
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 13df2b47da4..b95446f3f0d 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
@@ -18,7 +18,7 @@ be_visitor_interface_any_op_ch::be_visitor_interface_any_op_ch
 {
 }
 
-be_visitor_interface_any_op_ch::~be_visitor_interface_any_op_ch (void)
+be_visitor_interface_any_op_ch::~be_visitor_interface_any_op_ch ()
 {
 }
 
@@ -42,7 +42,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested ())
     {
@@ -53,7 +53,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -63,7 +63,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
@@ -101,7 +101,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
@@ -117,7 +117,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
     }
 
 
-  node->cli_hdr_any_op_gen (1);
+  node->cli_hdr_any_op_gen (true);
   return 0;
 }
 
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 6cb026e9f28..b65572712f8 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
@@ -18,7 +18,7 @@ be_visitor_interface_any_op_cs::be_visitor_interface_any_op_cs (
 {
 }
 
-be_visitor_interface_any_op_cs::~be_visitor_interface_any_op_cs (void)
+be_visitor_interface_any_op_cs::~be_visitor_interface_any_op_cs ()
 {
 }
 
@@ -112,7 +112,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested ())
     {
@@ -123,7 +123,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -133,7 +133,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace corresponding
           // to their module, others do not.
@@ -238,7 +238,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
@@ -251,7 +251,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
-  node->cli_stub_any_op_gen (1);
+  node->cli_stub_any_op_gen (true);
   return 0;
 }
 
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 9c37d52049d..2453440ca1f 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
@@ -18,7 +18,7 @@ be_visitor_interface_cdr_op_ch::be_visitor_interface_cdr_op_ch (
 {
 }
 
-be_visitor_interface_cdr_op_ch::~be_visitor_interface_cdr_op_ch (void)
+be_visitor_interface_cdr_op_ch::~be_visitor_interface_cdr_op_ch ()
 {
 }
 
@@ -74,7 +74,7 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
     }
 
   this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
 
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 d9a04a235e5..a9ac02c8953 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
@@ -17,7 +17,7 @@ be_visitor_interface_cdr_op_cs::be_visitor_interface_cdr_op_cs (
 {
 }
 
-be_visitor_interface_cdr_op_cs::~be_visitor_interface_cdr_op_cs (void)
+be_visitor_interface_cdr_op_cs::~be_visitor_interface_cdr_op_cs ()
 {
 }
 
@@ -106,25 +106,24 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       << "if (!(strm >> obj.inout ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "return false;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "typedef ::" << node->name () << " RHS_SCOPED_NAME;"
-      << be_nl_2
+      << "}" << be_uidt_nl
+      << be_nl
       << "// Narrow to the right type." << be_nl;
 
-  *os << "_tao_objref =" << be_idt_nl;
+  *os << "_tao_objref = ";
 
   if (!node->is_abstract ())
     {
-      *os << "TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ("
+      *os << "TAO::Narrow_Utils< ::" << node->name () << ">::unchecked_narrow ("
           << "obj.in ());";
     }
   else
     {
-      *os << "TAO::AbstractBase_Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ("
+      *os << "TAO::AbstractBase_Narrow_Utils< ::" << node->name () << ">::unchecked_narrow ("
           << "obj.in ());";
     }
 
-  *os << be_nl << be_uidt_nl;
+  *os << be_nl_2;
 
   *os << "return true;" << be_uidt_nl
       << "}" << be_nl;
@@ -138,7 +137,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  node->cli_stub_cdr_op_gen (1);
+  node->cli_stub_cdr_op_gen (true);
   return 0;
 }
 
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 d7114306b98..ea9855ced65 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
@@ -8,7 +8,7 @@ be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx)
 }
 
 be_visitor_interface_direct_proxy_impl_sh::
-~be_visitor_interface_direct_proxy_impl_sh (void)
+~be_visitor_interface_direct_proxy_impl_sh ()
 {
   // No-Op.
 }
@@ -38,7 +38,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
 
   if (node->n_inherits () > 0)
     {
-      AST_Type *parent = 0;
+      AST_Type *parent = nullptr;
 
       for (int i = 0; i < node->n_inherits (); ++i)
         {
@@ -50,7 +50,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
             }
 
           be_interface *inherited =
-            be_interface::narrow_from_decl (parent);
+            dynamic_cast<be_interface*> (parent);
 
           if (first_concrete)
             {
@@ -78,7 +78,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
       << "{" << be_nl << "public:" << be_idt_nl;
 
   // Dtor
-  *os << "virtual ~" << node->direct_proxy_impl_name () << " (void);";
+  *os << "virtual ~" << node->direct_proxy_impl_name () << " ();";
 
   if (this->visit_scope (node) == -1)
     {
@@ -111,7 +111,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
       return 0;
     }
 
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
   be_visitor_context ctx;
   ctx.stream (os);
   ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH);
@@ -122,7 +122,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
     {
       d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_thru_poa_proxy_"
@@ -132,7 +132,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
         }
 
       UTL_ScopedName item_new_name (d->local_name (),
-                                    0);
+                                    nullptr);
 
           // We pass the node's is_abstract flag to the operation
           // constructor so we will get the right generated operation
@@ -140,13 +140,13 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
           // abstract interface in a concrete interface or component.
       if (d->node_type () == AST_Decl::NT_op)
         {
-          be_operation *op = be_operation::narrow_from_decl (d);
+          be_operation *op = dynamic_cast<be_operation*> (d);
           be_visitor_operation_proxy_impl_xh op_visitor (&ctx);
           op_visitor.visit_operation (op);
         }
       else if (d->node_type () == AST_Decl::NT_attr)
         {
-          AST_Attribute *attr = AST_Attribute::narrow_from_decl (d);
+          AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d);
           be_attribute new_attr (attr->readonly (),
                                  attr->field_type (),
                                  &item_new_name,
@@ -156,21 +156,21 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
 
           UTL_ExceptList *get_exceptions = attr->get_get_exceptions ();
 
-          if (0 != get_exceptions)
+          if (nullptr != get_exceptions)
             {
               new_attr.be_add_get_exceptions (get_exceptions->copy ());
             }
 
           UTL_ExceptList *set_exceptions = attr->get_set_exceptions ();
 
-          if (0 != set_exceptions)
+          if (nullptr != set_exceptions)
             {
               new_attr.be_add_set_exceptions (set_exceptions->copy ());
             }
 
           be_visitor_attribute attr_visitor (&ctx);
           attr_visitor.visit_attribute (&new_attr);
-          ctx.attribute (0);
+          ctx.attribute (nullptr);
           new_attr.destroy ();
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
index e54120f1e10..50134bfb463 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
@@ -9,7 +9,7 @@ be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx)
 }
 
 be_visitor_interface_direct_proxy_impl_ss::
-~be_visitor_interface_direct_proxy_impl_ss (void)
+~be_visitor_interface_direct_proxy_impl_ss ()
 {
 }
 
@@ -29,7 +29,7 @@ be_visitor_interface_direct_proxy_impl_ss::visit_interface (
 
   // Destructor Implementation
   *os << node->full_direct_proxy_impl_name () << "::~"
-      << node->direct_proxy_impl_name () << " (void)"
+      << node->direct_proxy_impl_name () << " ()"
       << be_nl << "{" << be_nl << "}" << be_nl_2;
 
   if (this->visit_scope (node) == -1)
@@ -61,7 +61,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
       return 0;
     }
 
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
   be_visitor_context ctx;
   ctx.stream (os);
   ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS);
@@ -72,7 +72,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
     {
       d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_direct_proxy"
@@ -83,14 +83,14 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
 
       AST_Decl::NodeType nt = d->node_type ();
 
-      UTL_ScopedName *item_new_name = 0;
-      UTL_ScopedName *new_name = 0;
+      UTL_ScopedName *item_new_name = nullptr;
+      UTL_ScopedName *new_name = nullptr;
 
       if (AST_Decl::NT_op == nt || AST_Decl::NT_attr == nt)
         {
           ACE_NEW_RETURN (item_new_name,
                           UTL_ScopedName (d->local_name ()->copy (),
-                                          0),
+                                          nullptr),
                           -1);
 
           new_name = (UTL_ScopedName *) node->name ()->copy ();
@@ -107,7 +107,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
       // abstract interface in a concrete interface or component.
       if (d->node_type () == AST_Decl::NT_op)
         {
-          be_operation *op = be_operation::narrow_from_decl (d);
+          be_operation *op = dynamic_cast<be_operation*> (d);
           UTL_ScopedName *old_name =
             (UTL_ScopedName *) op->name ()->copy ();
           op->set_name (new_name);
@@ -123,10 +123,10 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
         }
       else if (d->node_type () == AST_Decl::NT_attr)
         {
-          AST_Attribute *attr = AST_Attribute::narrow_from_decl (d);
+          AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d);
           be_attribute new_attr (attr->readonly (),
                                  attr->field_type (),
-                                 0,
+                                 nullptr,
                                  attr->is_local (),
                                  attr->is_abstract ());
           new_attr.set_defined_in (node);
@@ -134,21 +134,21 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
 
           UTL_ExceptList *get_exceptions = attr->get_get_exceptions ();
 
-          if (0 != get_exceptions)
+          if (nullptr != get_exceptions)
             {
               new_attr.be_add_get_exceptions (get_exceptions->copy ());
             }
 
           UTL_ExceptList *set_exceptions = attr->get_set_exceptions ();
 
-          if (0 != set_exceptions)
+          if (nullptr != set_exceptions)
             {
               new_attr.be_add_set_exceptions (set_exceptions->copy ());
             }
 
           be_visitor_attribute attr_visitor (&ctx);
           attr_visitor.visit_attribute (&new_attr);
-          ctx.attribute (0);
+          ctx.attribute (nullptr);
           new_attr.destroy ();
         }
     }
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 a022fdd2d52..21130dd0ba5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp
@@ -17,7 +17,7 @@ be_visitor_facet_svth::be_visitor_facet_svth (be_visitor_context *ctx)
 {
 }
 
-be_visitor_facet_svth::~be_visitor_facet_svth (void)
+be_visitor_facet_svth::~be_visitor_facet_svth ()
 {
 }
 
@@ -37,7 +37,7 @@ be_visitor_facet_svth::visit_interface (be_interface *node)
   const char *lname = node->local_name ();
 
   be_decl *scope =
-    be_scope::narrow_from_scope (node->defined_in ())->decl ();
+    dynamic_cast<be_scope*> (node->defined_in ())->decl ();
   ACE_CString suffix (scope->flat_name ());
 
   if (suffix != "")
@@ -64,12 +64,12 @@ be_visitor_facet_svth::visit_interface (be_interface *node)
       << "typename EXEC::_ptr_type executor," << be_nl
       << "::Components::CCMContext_ptr ctx);" << be_uidt_nl << be_nl;
 
-  os_ << "virtual ~" << lname << "_Servant_T (void);";
+  os_ << "virtual ~" << lname << "_Servant_T ();";
 
   if (is_intf)
     {
       be_interface *intf =
-        be_interface::narrow_from_decl (node);
+        dynamic_cast<be_interface*> (node);
 
       be_global->in_facet_servant (true);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp
index fae40ad6ef1..441df38fd93 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp
@@ -17,7 +17,7 @@ be_visitor_facet_svts::be_visitor_facet_svts (be_visitor_context *ctx)
 {
 }
 
-be_visitor_facet_svts::~be_visitor_facet_svts (void)
+be_visitor_facet_svts::~be_visitor_facet_svts ()
 {
 }
 
@@ -36,7 +36,7 @@ be_visitor_facet_svts::visit_interface (be_interface *node)
   const char *lname = node->local_name ();
 
   be_decl *scope =
-    be_scope::narrow_from_scope (node->defined_in ())->decl ();
+    dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
   ACE_CString sname_str (scope->full_name ());
 
@@ -66,7 +66,7 @@ be_visitor_facet_svts::visit_interface (be_interface *node)
 
   os_ << be_nl_2 << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl
       << lname << "_Servant_T<BASE, EXEC, CONTEXT>::~"
-      << lname << "_Servant_T (void)" << be_nl
+      << lname << "_Servant_T ()" << be_nl
       << "{" << be_nl
       << "}";
 
@@ -75,7 +75,7 @@ be_visitor_facet_svts::visit_interface (be_interface *node)
   if (is_intf)
     {
       be_interface *op_scope =
-        be_interface::narrow_from_decl (node);
+        dynamic_cast<be_interface*> (node);
 
       os_ << be_nl_2
           << "// All facet operations and attributes.";
@@ -147,7 +147,7 @@ be_facet_op_attr_defn_helper::emit (be_interface * /* derived_interface */,
           case AST_Decl::NT_op:
             {
               be_operation *op =
-                be_operation::narrow_from_decl (d);
+                dynamic_cast<be_operation*> (d);
 
               /// If AMI implied IDL was generated for the
               /// original interface, we don't want those
@@ -174,7 +174,7 @@ be_facet_op_attr_defn_helper::emit (be_interface * /* derived_interface */,
           case AST_Decl::NT_attr:
             {
               be_attribute *attr =
-                be_attribute::narrow_from_decl (d);
+                dynamic_cast<be_attribute*> (d);
 
               be_visitor_attribute v (&ctx);
               v.op_scope (op_scope_);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index 81171e0d3e3..879a8d66789 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -16,7 +16,7 @@ be_visitor_interface::be_visitor_interface (be_visitor_context *ctx)
 {
 }
 
-be_visitor_interface::~be_visitor_interface (void)
+be_visitor_interface::~be_visitor_interface ()
 {
 }
 
@@ -35,9 +35,9 @@ be_visitor_interface::visit_scope (be_scope *node)
       return -1;
     }
 
-  be_interface *intf = be_interface::narrow_from_scope (node);
+  be_interface *intf = dynamic_cast<be_interface*> (node);
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
       return 0;
     }
@@ -52,7 +52,7 @@ be_visitor_interface::visit_scope (be_scope *node)
       return 0;
     }
 
-  be_interface::tao_code_emitter helper = 0;
+  be_interface::tao_code_emitter helper = nullptr;
 
   switch (this->ctx_->state ())
     {
@@ -84,7 +84,7 @@ be_visitor_interface::visit_scope (be_scope *node)
         break;
     }
 
-  if (helper == 0)
+  if (helper == nullptr)
     {
       return 0;
     }
@@ -113,7 +113,7 @@ int
 be_visitor_interface::is_amh_rh_node (be_interface *node)
 {
    //If, is implied-IDL
-  if (node->original_interface () != 0)
+  if (node->original_interface () != nullptr)
     {
       // and the name starts with AMH
       if (ACE_OS::strncmp (node->local_name (), "AMH", 3) == 0)
@@ -130,7 +130,7 @@ void
 be_visitor_interface::add_abstract_op_args (AST_Operation *old_op,
                                             be_operation &new_op)
 {
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
 
   for (UTL_ScopeActiveIterator si (old_op, UTL_Scope::IK_decls);
        !si.is_done ();
@@ -142,7 +142,7 @@ be_visitor_interface::add_abstract_op_args (AST_Operation *old_op,
 
   UTL_ExceptList *excep_list = old_op->exceptions ();
 
-  if (0 != excep_list)
+  if (nullptr != excep_list)
     {
       new_op.be_add_exceptions (excep_list->copy ());
     }
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 761b7806411..102a7c67036 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -16,7 +16,7 @@ be_visitor_interface_ch::be_visitor_interface_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_interface_ch::~be_visitor_interface_ch (void)
+be_visitor_interface_ch::~be_visitor_interface_ch ()
 {
 }
 
@@ -39,7 +39,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  AST_Component *c = AST_Component::narrow_from_decl (node);
+  AST_Component *c = dynamic_cast<AST_Component*> (node);
 
   // Now generate the class definition.
   *os << be_nl_2
@@ -74,7 +74,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       << "static " << node->local_name () << "_ptr " << "_duplicate ("
       << node->local_name () << "_ptr obj);" << be_nl_2;
 
-  if (c == 0)
+  if (c == nullptr)
     {
       *os << "static void _tao_release ("
           << node->local_name () << "_ptr obj);"
@@ -91,7 +91,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                         -1);
     }
 
-  if (c == 0)
+  if (c == nullptr)
     {
       if (! this->gen_xxx_narrow ("_unchecked_narrow", node, os))
         {
@@ -104,7 +104,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         }
     }
 
-  *os << "static " << node->local_name () << "_ptr _nil (void);";
+  *os << "static " << node->local_name () << "_ptr _nil ();";
 
   // Generate code for the interface definition by traversing thru the
   // elements of its scope. We depend on the front-end to have made sure
@@ -142,7 +142,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   // we have to override _add_ref() to avoid ambiguity.
   if (node->has_mixed_parentage ())
     {
-      *os << "virtual void _add_ref (void);" << be_nl_2;
+      *os << "virtual void _add_ref ();" << be_nl_2;
     }
 
   // The _is_a method
@@ -151,13 +151,13 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   // The _interface_repository_id method.
   *os << "virtual const char* _interface_repository_id "
-      << "(void) const;";
+      << "() const;";
 
   if (be_global->gen_static_desc_operations ())
     {
-      *os << be_nl << "static const char* _desc_repository_id (void);";
+      *os << be_nl << "static const char* _desc_repository_id ();";
 
-      *os << be_nl << "static const char* _desc_interface_name (void);";
+      *os << be_nl << "static const char* _desc_interface_name ();";
     }
 
   // The virtual marshal method, to prevent marshal of local interfaces.
@@ -171,8 +171,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       *os << be_nl
           << "virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);" << be_nl
           << "virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);" << be_nl
-          << "virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;" << be_nl
-          << "virtual TAO_Policy_Scope _tao_scope (void) const;" << be_nl;
+          << "virtual TAO_Cached_Policy_Type _tao_cached_type () const;" << be_nl
+          << "virtual TAO_Policy_Scope _tao_scope () const;" << be_nl;
     }
 
   if (be_global->gen_ostream_operators ())
@@ -192,7 +192,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       if (! node->is_abstract ())
         {
           *os << "// Concrete interface only." << be_nl
-              << node->local_name () << " (void);"
+              << node->local_name () << " ();"
               << be_nl_2;
         }
     }
@@ -201,7 +201,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       // Protected default constructor for abstract interfaces.
       *os << "// Abstract or local interface only." << be_nl
-          << node->local_name () << " (void);" << be_nl_2;
+          << node->local_name () << " ();" << be_nl_2;
     }
 
   if (node->is_abstract ())
@@ -228,12 +228,12 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           << node->local_name () << " (" << be_idt << be_idt_nl
           << "TAO_Stub *objref," << be_nl
           << "::CORBA::Boolean _tao_collocated = false," << be_nl
-          << "TAO_Abstract_ServantBase *servant = 0," <<  be_nl
-          << "TAO_ORB_Core *orb_core = 0);"
+          << "TAO_Abstract_ServantBase *servant = nullptr," <<  be_nl
+          << "TAO_ORB_Core *orb_core = nullptr);"
           << be_uidt << be_uidt;
     }
 
-  if (c != 0)
+  if (c != nullptr)
     {
       // Friends declarations, component only.
       *os << be_nl_2
@@ -243,7 +243,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   // Protected destructor.
   *os << be_nl_2
-      << "virtual ~" << node->local_name () << " (void);";
+      << "virtual ~" << node->local_name () << " ();";
 
   // Private copy constructor and assignment operator. These are not
   // allowed, hence they are private.
@@ -255,12 +255,15 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       *os << "// Private and unimplemented for concrete interfaces." << be_nl
           << node->local_name () << " (const "
-          << node->local_name () << " &);" << be_nl_2;
+          << node->local_name () << " &) = delete;" << be_nl
+          << node->local_name () << " ("
+          << node->local_name () << " &&) = delete;" << be_nl;
     }
 
-  *os << "void operator= (const " << node->local_name () << " &);";
-
-  *os << be_uidt_nl
+  *os << node->local_name ()
+      << " &operator= (const " << node->local_name () << " &) = delete;" << be_nl
+      <<  node->local_name ()
+      << " &operator= (" << node->local_name () << " &&) = delete;" << be_uidt_nl
       << "};";
 
   be_visitor_context ctx (*this->ctx_);
@@ -328,7 +331,7 @@ be_visitor_interface_ch::visit_extended_port (be_extended_port *node)
   /// original porttype, this is a way for visitors down the
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
-    be_interface::narrow_from_scope (node->defined_in ()));
+    dynamic_cast<be_interface*> (node->defined_in ()));
 
   /// Will ignore everything but porttype attributes.
   int status = this->visit_scope (node->port_type ());
@@ -357,7 +360,7 @@ be_visitor_interface_ch::visit_mirror_port (be_mirror_port *node)
   /// original porttype, this is a way for visitors down the
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
-    be_interface::narrow_from_scope (node->defined_in ()));
+    dynamic_cast<be_interface*> (node->defined_in ()));
 
   /// Will ignore everything but porttype attributes.
   int status = this->visit_scope (node->port_type ());
@@ -386,7 +389,7 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node,
       return 0;
     }
 
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
   be_visitor_context ctx;
   ctx.stream (os);
 
@@ -396,7 +399,7 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node,
     {
       d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_interface::")
@@ -408,7 +411,7 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node,
       if (d->node_type () == AST_Decl::NT_op)
         {
 
-          be_operation *op = be_operation::narrow_from_decl (d);
+          be_operation *op = dynamic_cast<be_operation*> (d);
           op->set_local (node->is_local ());
           ctx.state (TAO_CodeGen::TAO_OPERATION_CH);
           be_visitor_operation_ch op_visitor (&ctx);
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 d5b0bf8b0fa..5129d1965d2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -16,7 +16,7 @@ be_visitor_interface_ci::be_visitor_interface_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_interface_ci::~be_visitor_interface_ci (void)
+be_visitor_interface_ci::~be_visitor_interface_ci ()
 {
 }
 
@@ -63,7 +63,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
       *os << be_nl_2
           << "ACE_INLINE" << be_nl
           << node->name () << "::" << node->local_name ()
-          << " (void)" << be_nl
+          << " ()" << be_nl
           << "{}" << be_nl_2;
 
       *os << "ACE_INLINE" << be_nl
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 ec2e9924172..072a877ecad 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -15,7 +15,7 @@ be_visitor_interface_cs::be_visitor_interface_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_interface_cs::~be_visitor_interface_cs (void)
+be_visitor_interface_cs::~be_visitor_interface_cs ()
 {
 }
 
@@ -27,7 +27,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       return 0;
     }
 
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Set the right type.
   if (this->ctx_->alias ())
@@ -39,7 +39,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       bt = node;
     }
 
-  AST_Component *c = AST_Component::narrow_from_decl (node);
+  AST_Component *c = dynamic_cast<AST_Component*> (node);
   TAO_OutStream *os = this->ctx_->stream ();
 
   if (node->is_defined () && be_global->gen_arg_traits ())
@@ -83,7 +83,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
       *os << be_nl_2
           << node->name () << "_ptr" << be_nl
-          << "TAO::Objref_Traits<" << node->name () << ">::nil (void)"
+          << "TAO::Objref_Traits<" << node->name () << ">::nil ()"
           << be_nl
           << "{" << be_idt_nl
           << "return " << node->name () << "::_nil ();" << be_uidt_nl
@@ -99,7 +99,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "return ";
 
 
-      if (node->is_abstract () || c != 0)
+      if (node->is_abstract () || c != nullptr)
         {
           *os << "cdr << p;";
         }
@@ -129,12 +129,12 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "  return false;" << be_nl
           << "}" << be_nl << be_nl
           << "TAO_Cached_Policy_Type" << be_nl
-          << "CORBA::Policy::_tao_cached_type (void) const" << be_nl
+          << "CORBA::Policy::_tao_cached_type () const" << be_nl
           << "{" << be_nl
             << "return TAO_CACHED_POLICY_UNCACHED;" << be_nl
           << "}" << be_nl << be_nl
           << "TAO_Policy_Scope" << be_nl
-          << "CORBA::Policy::_tao_scope (void) const" << be_nl
+          << "CORBA::Policy::_tao_scope () const" << be_nl
           << "{" << be_nl
           << "  return TAO_POLICY_DEFAULT_SCOPE;" << be_nl
           << "}" << be_nl;
@@ -189,7 +189,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     {
       *os << be_nl_2
           << node->name () << "::" << node->local_name ()
-          << " (void)" << be_nl
+          << " ()" << be_nl
           << "{}";
     }
 
@@ -197,7 +197,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     {
       *os << be_nl_2
           << node->name () << "::" << node->local_name ()
-          << " (void)" << be_nl;
+          << " ()" << be_nl;
 
       *os << "{" << be_nl;
 
@@ -206,7 +206,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   *os << be_nl_2
       << node->name () << "::~" << node->local_name ()
-      << " (void)" << be_nl;
+      << " ()" << be_nl;
   *os << "{" << be_nl << "}" << be_nl_2;
 
   bool gen_any_destructor =
@@ -230,7 +230,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   if (node->has_mixed_parentage ())
     {
       *os << "void" << be_nl
-          << node->name () << "::_add_ref (void)" << be_nl
+          << node->name () << "::_add_ref ()" << be_nl
           << "{" << be_idt_nl
           << "this->::CORBA::Object::_add_ref ();"
           << be_uidt_nl
@@ -248,7 +248,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
 
   // The _unchecked_narrow method, not for components.
-  if (c == 0 && ! this->gen_xxx_narrow ("unchecked_narrow", node))
+  if (c == nullptr && ! this->gen_xxx_narrow ("unchecked_narrow", node))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_interface_cs::")
@@ -260,10 +260,10 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   // The _nil method
   *os << node->full_name () << "_ptr" << be_nl
-      << node->full_name () << "::_nil (void)"
+      << node->full_name () << "::_nil ()"
       << be_nl
       << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
+      << "return nullptr;" << be_uidt_nl
       << "}" << be_nl_2;
 
   // The _duplicate method
@@ -280,7 +280,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "}" << be_nl_2;
 
   // The _tao_release method
-  if (c == 0)
+  if (c == nullptr)
     {
       *os << "void" << be_nl
           << node->full_name () << "::_tao_release ("
@@ -308,7 +308,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
                         -1);
     }
 
-  *os << ")" << be_nl
+  *os << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "return true; // success using local knowledge" << be_uidt_nl
       << "}" << be_uidt_nl
@@ -328,7 +328,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "}" << be_nl_2;
 
   *os << "const char* " << node->full_name ()
-      << "::_interface_repository_id (void) const"
+      << "::_interface_repository_id () const"
       << be_nl
       << "{" << be_idt_nl
       << "return \"" << node->repoID ()
@@ -338,7 +338,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   if (be_global->gen_static_desc_operations ())
     {
       *os << be_nl_2 << "const char* " << node->full_name ()
-          << "::_desc_repository_id (void)"
+          << "::_desc_repository_id ()"
           << be_nl
           << "{" << be_idt_nl
           << "return \"" << node->repoID ()
@@ -346,7 +346,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "}";
 
       *os << be_nl_2 << "const char* " << node->full_name ()
-          << "::_desc_interface_name (void)"
+          << "::_desc_interface_name ()"
           << be_nl
           << "{" << be_idt_nl
           << "return \"" << node->local_name()
@@ -471,7 +471,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
     }
   else
     {
-      *os << "return" << be_idt_nl;
+      *os << "return ";
 
       if (!node->is_abstract ())
         {
@@ -484,18 +484,17 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
               << node->local_name () << ">::" << pre <<" (";
         }
 
-      *os << be_idt << be_idt_nl
-          << "_tao_objref";
+      *os << "_tao_objref";
 
       if (ACE_OS::strcmp (pre, "narrow") == 0)
         {
-          *os << "," << be_nl
+          *os << ", "
               << "\"" << node->repoID () << "\"";
         }
 
       *os << ");";
 
-      *os << be_uidt << be_uidt << be_uidt << be_uidt_nl
+      *os << be_uidt_nl
           << "}" << be_nl_2;
     }
 
@@ -524,7 +523,7 @@ be_visitor_interface_cs::visit_extended_port (be_extended_port *node)
   /// original porttype, this is a way for visitors down the
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
-    be_interface::narrow_from_scope (node->defined_in ()));
+    dynamic_cast<be_interface*> (node->defined_in ()));
 
   /// Will ignore everything but porttype attributes.
   int status = this->visit_scope (node->port_type ());
@@ -553,7 +552,7 @@ be_visitor_interface_cs::visit_mirror_port (be_mirror_port *node)
   /// original porttype, this is a way for visitors down the
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
-    be_interface::narrow_from_scope (node->defined_in ()));
+    dynamic_cast<be_interface*> (node->defined_in ()));
 
   /// Will ignore everything but porttype attributes.
   int status = this->visit_scope (node->port_type ());
@@ -584,7 +583,7 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node,
       return 0;
     }
 
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
   be_visitor_context ctx;
   ctx.stream (os);
 
@@ -594,7 +593,7 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node,
     {
       d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_cs::"
@@ -605,17 +604,17 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node,
 
       if (d->node_type () == AST_Decl::NT_op)
         {
-          UTL_ScopedName *item_new_name  = 0;
+          UTL_ScopedName *item_new_name  = nullptr;
           ACE_NEW_RETURN (item_new_name,
                           UTL_ScopedName (d->local_name ()->copy (),
-                                          0),
+                                          nullptr),
                           -1);
 
           UTL_ScopedName *new_op_name =
             (UTL_ScopedName *)node->name ()->copy ();
           new_op_name->nconc (item_new_name);
 
-          be_operation *op = be_operation::narrow_from_decl (d);
+          be_operation *op = dynamic_cast<be_operation*> (d);
           UTL_ScopedName *old_op_name =
             (UTL_ScopedName *) op->name ()->copy ();
           op->set_name (new_op_name);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp
index 21c0f1e5e1d..3e486fdedf7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp
@@ -18,7 +18,7 @@ be_visitor_interface_ex_idl::be_visitor_interface_ex_idl (
 {
 }
 
-be_visitor_interface_ex_idl::~be_visitor_interface_ex_idl (void)
+be_visitor_interface_ex_idl::~be_visitor_interface_ex_idl ()
 {
 }
 
@@ -26,7 +26,7 @@ int
 be_visitor_interface_ex_idl::visit_interface (be_interface *node)
 {
   // Skip implied IDL nodes.
-  if (node->original_interface () != 0)
+  if (node->original_interface () != nullptr)
     {
       return 0;
     }
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 eb8ac329352..448c1ebf838 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
@@ -16,7 +16,7 @@ be_visitor_interface_ih::be_visitor_interface_ih (be_visitor_context *ctx)
 {
 }
 
-be_visitor_interface_ih::~be_visitor_interface_ih (void)
+be_visitor_interface_ih::~be_visitor_interface_ih ()
 {
 }
 
@@ -74,7 +74,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
       << "public:" << be_idt_nl
       << "// Constructor" << be_nl
       <<  be_global->impl_class_prefix () << namebuf
-      << be_global->impl_class_suffix () << " (void);" << be_nl_2;
+      << be_global->impl_class_suffix () << " ();" << be_nl_2;
 
   if (be_global->gen_copy_ctor () && !node->is_local ())
     {
@@ -97,7 +97,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
 
   *os << "// Destructor" << be_nl
       << "virtual " << "~" << be_global->impl_class_prefix () << namebuf
-      << be_global->impl_class_suffix () << " (void);";
+      << be_global->impl_class_suffix () << " ();";
 
 
   // Generate code for elements in the scope (e.g., operations).
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 1bf00f89aa9..0d7589dbbd4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
@@ -16,7 +16,7 @@ be_visitor_interface_is::be_visitor_interface_is (be_visitor_context *ctx)
 {
 }
 
-be_visitor_interface_is::~be_visitor_interface_is (void)
+be_visitor_interface_is::~be_visitor_interface_is ()
 {
 }
 
@@ -46,7 +46,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
       << be_global->impl_class_suffix () <<"::"
       << be_global->impl_class_prefix () << node->flat_name ()
       << be_global->impl_class_suffix ()
-      << " (void)" << be_nl;
+      << " ()" << be_nl;
 
   *os << "{" << be_nl
       << "}" << be_nl_2;
@@ -58,7 +58,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
       << be_global->impl_class_suffix () <<"::~"
       << be_global->impl_class_prefix () << node->flat_name ()
       << be_global->impl_class_suffix ()
-      << " (void)" << be_nl;
+      << " ()" << be_nl;
 
   *os << "{" <<be_nl;
   *os << "}" << be_nl_2;
@@ -92,8 +92,8 @@ be_visitor_interface_is::visit_interface (be_interface *node)
 
           if (node->is_nested ())
             {
-              be_decl *scope = 0;
-              scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+              be_decl *scope = nullptr;
+              scope = dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
               *os << "  POA_" << scope->name () << "::"
                   << node->local_name () << " (rhs)";
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 a0c021c1a9e..0dd4c94accc 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -16,7 +16,7 @@ be_visitor_interface_sh::be_visitor_interface_sh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_interface_sh::~be_visitor_interface_sh (void)
+be_visitor_interface_sh::~be_visitor_interface_sh ()
 {
 }
 
@@ -101,7 +101,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "protected:" << be_idt_nl;
 
   // Default constructor.
-  *os << class_name.c_str () << " (void);"
+  *os << class_name.c_str () << " ();"
       << be_uidt_nl << be_nl
       << "public:" << be_idt_nl;
 
@@ -117,7 +117,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 () << " (void);" << be_nl_2;
+      << "virtual ~" << class_name.c_str () << " ();" << be_nl_2;
 
   // _is_a
   *os << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2;
@@ -133,7 +133,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   // The _interface_repository_id method.
   *os << be_nl
       << "virtual const char* _interface_repository_id "
-      << "(void) const;";
+      << "() const;";
 
   // Generate code for elements in the scope (e.g., operations).
   if (this->visit_scope (node) ==  -1)
@@ -194,7 +194,7 @@ be_visitor_interface_sh::gen_abstract_ops_helper (
       return 0;
     }
 
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
   be_visitor_context ctx;
   ctx.stream (os);
   ctx.state (TAO_CodeGen::TAO_ROOT_SH);
@@ -205,7 +205,7 @@ be_visitor_interface_sh::gen_abstract_ops_helper (
     {
       d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_interface_sh::")
@@ -215,17 +215,17 @@ be_visitor_interface_sh::gen_abstract_ops_helper (
         }
 
       UTL_ScopedName item_new_name (d->local_name (),
-                                    0);
+                                    nullptr);
 
       if (d->node_type () == AST_Decl::NT_op)
         {
-          be_operation *op = be_operation::narrow_from_decl (d);
+          be_operation *op = dynamic_cast<be_operation*> (d);
           be_visitor_operation_sh op_visitor (&ctx);
           op_visitor.visit_operation (op);
         }
       else if (d->node_type () == AST_Decl::NT_attr)
         {
-          AST_Attribute *attr = AST_Attribute::narrow_from_decl (d);
+          AST_Attribute *attr = dynamic_cast<AST_Attribute*> (d);
           be_attribute new_attr (attr->readonly (),
                                  attr->field_type (),
                                  &item_new_name,
@@ -235,21 +235,21 @@ be_visitor_interface_sh::gen_abstract_ops_helper (
 
           UTL_ExceptList *get_exceptions = attr->get_get_exceptions ();
 
-          if (0 != get_exceptions)
+          if (nullptr != get_exceptions)
             {
               new_attr.be_add_get_exceptions (get_exceptions->copy ());
             }
 
           UTL_ExceptList *set_exceptions = attr->get_set_exceptions ();
 
-          if (0 != set_exceptions)
+          if (nullptr != set_exceptions)
             {
               new_attr.be_add_set_exceptions (set_exceptions->copy ());
             }
 
           be_visitor_attribute attr_visitor (&ctx);
           attr_visitor.visit_attribute (&new_attr);
-          ctx.attribute (0);
+          ctx.attribute (nullptr);
           new_attr.destroy ();
         }
     }
@@ -263,7 +263,7 @@ be_visitor_interface_sh::this_method (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Print out the _this() method.
-  *os << "::" << node->full_name () << " *_this (void);"
+  *os << "::" << node->full_name () << " *_this ();"
       << be_nl;
 }
 
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 fa3e691ebc8..81256400f5f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -19,7 +19,7 @@ be_visitor_interface_ss::be_visitor_interface_ss (be_visitor_context *ctx)
 {
 }
 
-be_visitor_interface_ss::~be_visitor_interface_ss (void)
+be_visitor_interface_ss::~be_visitor_interface_ss ()
 {
 }
 
@@ -108,14 +108,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << full_skel_name << "::"
       << local_name_prefix << node_local_name
-      << " (void)" << be_idt_nl;
+      << " ()" << be_idt_nl;
 
   *os << ": TAO_ServantBase ()" << be_uidt_nl;
 
   // Default constructor body.
   *os << "{" << be_idt_nl
-      << "this->optable_ = &tao_" << flat_name
-      << "_optable;" << be_uidt_nl
+      << "this->optable_ = std::addressof(tao_" << flat_name
+      << "_optable);" << be_uidt_nl
       << "}" << be_nl_2;
 
   // find if we are at the top scope or inside some module
@@ -143,7 +143,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << full_skel_name << "::~"
       << local_name_prefix << node_local_name
-      << " (void)" << be_nl;
+      << " ()" << be_nl;
   *os << "{" << be_nl;
   *os << "}" << be_nl;
 
@@ -182,27 +182,20 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                         -1);
     }
 
-  *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-      << "value," << be_nl
-      << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl
-      << ")";
+  *os << "std::strcmp (value, \"IDL:omg.org/CORBA/Object:1.0\") == 0";
 
   if (node->has_mixed_parentage ())
     {
-      *os << " ||" << be_uidt_nl
-          << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "value," << be_nl
-          << "\"IDL:omg.org/CORBA/AbstractBase:1.0\""
-          << be_uidt_nl
-          << ")";
+      *os << " ||" << be_nl
+          << "std::strcmp (value, \"IDL:omg.org/CORBA/AbstractBase:1.0\") == 0";
     }
 
-  *os << be_uidt << be_uidt_nl
+  *os << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "const char* " << full_skel_name
-      << "::_interface_repository_id (void) const"
+      << "::_interface_repository_id () const"
       << be_nl;
   *os << "{" << be_idt_nl;
   *os << "return \"" << node->repoID () << "\";" << be_uidt_nl;
@@ -261,7 +254,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper (
       return 0;
     }
 
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
   be_visitor_context ctx;
   ctx.stream (os);
   ctx.state (TAO_CodeGen::TAO_ROOT_SS);
@@ -272,7 +265,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper (
     {
       d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_interface_ss::")
@@ -283,14 +276,14 @@ be_visitor_interface_ss::gen_abstract_ops_helper (
 
       AST_Decl::NodeType nt = d->node_type ();
 
-      UTL_ScopedName *item_new_name = 0;
-      UTL_ScopedName *new_name = 0;
+      UTL_ScopedName *item_new_name = nullptr;
+      UTL_ScopedName *new_name = nullptr;
 
       if (AST_Decl::NT_op == nt || AST_Decl::NT_attr == nt)
         {
           ACE_NEW_RETURN (item_new_name,
                           UTL_ScopedName (d->local_name ()->copy (),
-                                          0),
+                                          nullptr),
                           -1);
 
           new_name = (UTL_ScopedName *) node->name ()->copy ();
@@ -307,7 +300,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper (
       // abstract interface in a concrete interface or component.
       if (AST_Decl::NT_op == nt)
         {
-          be_operation *op = be_operation::narrow_from_decl (d);
+          be_operation *op = dynamic_cast<be_operation*> (d);
           UTL_ScopedName *old_name =
             (UTL_ScopedName *) op->name ()->copy ();
           op->set_name (new_name);
@@ -324,10 +317,10 @@ be_visitor_interface_ss::gen_abstract_ops_helper (
       else if (AST_Decl::NT_attr == nt)
         {
           AST_Attribute *attr =
-            AST_Attribute::narrow_from_decl (d);
+            dynamic_cast<AST_Attribute*> (d);
           be_attribute new_attr (attr->readonly (),
                                  attr->field_type (),
-                                 0,
+                                 nullptr,
                                  attr->is_local (),
                                  attr->is_abstract ());
           new_attr.set_defined_in (node);
@@ -336,7 +329,7 @@ be_visitor_interface_ss::gen_abstract_ops_helper (
           UTL_ExceptList *get_exceptions =
             attr->get_get_exceptions ();
 
-          if (0 != get_exceptions)
+          if (nullptr != get_exceptions)
             {
               new_attr.be_add_get_exceptions (get_exceptions->copy ());
             }
@@ -344,14 +337,14 @@ be_visitor_interface_ss::gen_abstract_ops_helper (
           UTL_ExceptList *set_exceptions =
             attr->get_set_exceptions ();
 
-          if (0 != set_exceptions)
+          if (nullptr != set_exceptions)
             {
               new_attr.be_add_set_exceptions (set_exceptions->copy ());
             }
 
           be_visitor_attribute attr_visitor (&ctx);
           attr_visitor.visit_attribute (&new_attr);
-          ctx.attribute (0);
+          ctx.attribute (nullptr);
           new_attr.destroy ();
         }
     }
@@ -374,7 +367,7 @@ be_visitor_interface_ss::this_method (be_interface *node)
   // The _this () operation.
   *os << node->full_name () << " *" << be_nl
       << node->full_skel_name ()
-      << "::_this (void)" << be_nl
+      << "::_this ()" << be_nl
       << "{" << be_idt_nl
       << "TAO_Stub *stub = this->_create_stub ();"
       << be_nl_2
@@ -382,7 +375,7 @@ be_visitor_interface_ss::this_method (be_interface *node)
 
   /* Coverity whines about an unused return value from _nil() when
      initializing tmp.  Just use zero instead. */
-  *os << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();"
+  *os << "::CORBA::Object_ptr tmp {};"
       << be_nl_2;
 
   *os << "::CORBA::Boolean const _tao_opt_colloc ="
@@ -397,18 +390,15 @@ be_visitor_interface_ss::this_method (be_interface *node)
   *os << "_tao_opt_colloc";
 
   *os << ", this)," << be_nl
-      << "0);" << be_uidt << be_uidt_nl << be_nl;
+      << "nullptr);" << be_uidt << be_uidt_nl << be_nl;
 
   *os << "::CORBA::Object_var obj = tmp;" << be_nl
       << "(void) safe_stub.release ();" << be_nl_2
-      << "typedef ::" << node->name () << " STUB_SCOPED_NAME;"
-      << be_nl
-      << "return" << be_idt_nl
-      << "TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow ("
-      << be_idt << be_idt_nl
+      << "return "
+      << "TAO::Narrow_Utils< ::" << node->name () << ">::unchecked_narrow ("
       << "obj.in ());";
 
-  *os << be_uidt << be_uidt << be_uidt << be_uidt_nl
+  *os << be_uidt_nl
       << "}";
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svth.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svth.cpp
index 467432362c1..0ebf03db35f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svth.cpp
@@ -18,7 +18,7 @@ be_visitor_interface_svth::be_visitor_interface_svth (
 {
 }
 
-be_visitor_interface_svth::~be_visitor_interface_svth (void)
+be_visitor_interface_svth::~be_visitor_interface_svth ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svts.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svts.cpp
index 0f764a2b801..81da50fde3a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svts.cpp
@@ -18,7 +18,7 @@ be_visitor_interface_svts::be_visitor_interface_svts (
 {
 }
 
-be_visitor_interface_svts::~be_visitor_interface_svts (void)
+be_visitor_interface_svts::~be_visitor_interface_svts ()
 {
 }
 
@@ -42,7 +42,7 @@ int
 be_visitor_interface_svts::visit_operation (be_operation *node)
 {
   be_visitor_operation_svs v (this->ctx_);
-  v.scope (be_interface::narrow_from_decl (
+  v.scope (dynamic_cast<be_interface*> (
              this->ctx_->scope ()->decl ()));
 
   return v.visit_operation (node);
@@ -54,7 +54,7 @@ be_visitor_interface_svts::visit_attribute (be_attribute *node)
   be_visitor_attribute v (this->ctx_);
 
   v.for_facets (true);
-  v.op_scope (be_interface::narrow_from_decl (
+  v.op_scope (dynamic_cast<be_interface*> (
                 this->ctx_->scope ()->decl ()));
 
   return v.visit_attribute (node);
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 eb0620e67a7..d403ce016d2 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
@@ -17,14 +17,14 @@ be_visitor_interface_smart_proxy_ch::be_visitor_interface_smart_proxy_ch (
 {
 }
 
-be_visitor_interface_smart_proxy_ch::~be_visitor_interface_smart_proxy_ch (void)
+be_visitor_interface_smart_proxy_ch::~be_visitor_interface_smart_proxy_ch ()
 {
 }
 
 int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -54,7 +54,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "// flexibility of having a different smart proxy per object "<<be_nl
       <<"// instead of per interface."<<be_nl<< be_nl
       << "virtual ~TAO_" << node->flat_name ()
-      << "_Default_Proxy_Factory (void);" << be_nl_2
+      << "_Default_Proxy_Factory ();" << be_nl_2
       << "virtual "<< node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
       << node->local_name ()
@@ -73,16 +73,16 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl
       << "bool one_shot_factory = true" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl
-      << "void unregister_proxy_factory (void);" << be_nl_2
+      << "void unregister_proxy_factory ();" << be_nl_2
       << node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
       << node->local_name () << "_ptr proxy" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl << be_nl
       << "protected:" << be_idt_nl
       << "TAO_" << node->flat_name ()
-      << "_Proxy_Factory_Adapter (void);" << be_nl
+      << "_Proxy_Factory_Adapter ();" << be_nl
       << "~TAO_" << node->flat_name ()
-      << "_Proxy_Factory_Adapter (void);" << be_nl
+      << "_Proxy_Factory_Adapter ();" << be_nl
       << "TAO_" << node->flat_name ()
       << "_Proxy_Factory_Adapter &operator= (" << be_idt << be_idt_nl
       << "const TAO_" << node->flat_name ()
@@ -114,14 +114,14 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       for (i = 0; i < node->n_inherits (); i++)
         {
           be_interface *inherited =
-            be_interface::narrow_from_decl (node->inherits ()[i]);
-          be_decl *scope = 0;
+            dynamic_cast<be_interface*> (node->inherits ()[i]);
+          be_decl *scope = nullptr;
 
           if (inherited->is_nested ())
             {
               // Inherited node is used in the scope of "node" node.
               scope =
-                be_scope::narrow_from_scope (node->defined_in ())->decl ();
+                dynamic_cast<be_scope*> (node->defined_in ())->decl ();
             }
 
           *os << "," << be_nl << "  public virtual ";
@@ -138,19 +138,19 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
 
   *os << "{" << be_nl
       << "public:" << be_idt_nl
-      << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);"
+      << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base ();"
       << be_nl
       // Just to keep Old g++ complier (version: 2.7.2.3) happy it's
       // necesssary to declare and define the destructor explicitly.
-      << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);"
+      << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base ();"
       << be_nl
       // This method will delegate this method to the <base_proxy_>
       // member of the smart proxy and so the smart proxy's (nil)
       // stubobj will not be returned.
-      << "virtual TAO_Stub *_stubobj (void) const;"
+      << "virtual TAO_Stub *_stubobj () const;"
 << be_nl
 // Another version of the above method..
-<< "virtual TAO_Stub *_stubobj (void);"
+<< "virtual TAO_Stub *_stubobj ();"
       << be_uidt_nl;
 
   // Generate code for the interface definition by traversing thru the
@@ -169,7 +169,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
 
   *os << "protected:" << be_idt_nl
       << "::" << node->full_name ()
-      << "_ptr get_proxy (void);" << be_nl
+      << "_ptr get_proxy ();" << be_nl
       << "::" << node->full_name () << "_var proxy_;"
       << be_uidt_nl
       << "};\n\n";
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 1149f0384f0..2379e9acf52 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
@@ -18,9 +18,7 @@ be_visitor_interface_smart_proxy_cs::be_visitor_interface_smart_proxy_cs (
 {
 }
 
-be_visitor_interface_smart_proxy_cs::~be_visitor_interface_smart_proxy_cs (
-    void
-  )
+be_visitor_interface_smart_proxy_cs::~be_visitor_interface_smart_proxy_cs ()
 {
 }
 
@@ -36,7 +34,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       // Its necessary to take care of the nested case. The smart proxy classes
       // are in the same scope as the proxy.
-      be_decl* scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+      be_decl* scope = dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
       *os << be_nl_2
           << scope->full_name ();
@@ -67,7 +65,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_"<< node->flat_name ()
           << "_Default_Proxy_Factory::~";
       *os <<"TAO_"
-          << node->flat_name () << "_Default_Proxy_Factory (void)"
+          << node->flat_name () << "_Default_Proxy_Factory ()"
           << be_nl << be_uidt << be_uidt
           << "{" << be_nl
           << "}";
@@ -100,7 +98,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::";
       *os << "TAO_"
-          << node->flat_name () << "_Proxy_Factory_Adapter (void)" << be_idt_nl
+          << node->flat_name () << "_Proxy_Factory_Adapter ()" << be_idt_nl
           << ": proxy_factory_ (0)," << be_idt_nl
           << "one_shot_factory_ (false)," << be_nl
           << "disable_factory_ (false)" << be_uidt << be_uidt_nl
@@ -118,7 +116,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::";
       *os << "~TAO_"
-          << node->flat_name () << "_Proxy_Factory_Adapter (void)" << be_nl
+          << node->flat_name () << "_Proxy_Factory_Adapter ()" << be_nl
           << "{" << be_idt_nl
           << "// Making sure the factory which the adapter"
           << " has is destroyed with it."
@@ -169,7 +167,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
         *os << "::";
 
       *os << "TAO_"<< node->flat_name ()
-          << "_Proxy_Factory_Adapter::unregister_proxy_factory (void)" << be_nl
+          << "_Proxy_Factory_Adapter::unregister_proxy_factory ()" << be_nl
           << "{" << be_idt_nl
           << "ACE_MT (" << be_idt << be_idt_nl
           << "ACE_GUARD (" << be_idt << be_idt_nl
@@ -238,7 +236,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::";
       *os << "TAO_"
-          <<  node->flat_name () << "_Smart_Proxy_Base (void)" << be_uidt_nl
+          <<  node->flat_name () << "_Smart_Proxy_Base ()" << be_uidt_nl
           << "{" << be_nl
           << "}" << be_nl_2;
 
@@ -251,7 +249,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::";
       *os << "~TAO_"
-          <<  node->flat_name () << "_Smart_Proxy_Base (void)" <<be_nl
+          <<  node->flat_name () << "_Smart_Proxy_Base ()" <<be_nl
           << "{" << be_nl
           << "}\n\n";
 
@@ -265,7 +263,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
         *os << "::";
 
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::";
-      *os << "_stubobj (void) const"<<be_nl
+      *os << "_stubobj () const"<<be_nl
           << "{" << be_idt_nl
           << "return this->base_proxy_->_stubobj ();"<< be_uidt_nl
           << "}"<< be_nl_2;
@@ -279,7 +277,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       if (node->is_nested ())
         *os << "::";
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::";
-      *os << "_stubobj (void)"<<be_nl
+      *os << "_stubobj ()"<<be_nl
           << "{" << be_idt_nl
           << "return this->base_proxy_->_stubobj ();"<< be_uidt_nl
           << "}" << be_nl_2;
@@ -304,7 +302,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
         *os << "::";
 
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"
-          << "get_proxy (void)" << be_idt_nl
+          << "get_proxy ()" << be_idt_nl
           << be_uidt_nl;
 
       *os << "{" << be_idt_nl
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 58f86811c6e..85f7e25cbf1 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -18,7 +18,7 @@ be_visitor_interface_tie_sh::be_visitor_interface_tie_sh (
 {
 }
 
-be_visitor_interface_tie_sh::~be_visitor_interface_tie_sh (void)
+be_visitor_interface_tie_sh::~be_visitor_interface_tie_sh ()
 {
 }
 
@@ -88,20 +88,20 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "::CORBA::Boolean release = true);" << be_uidt
       << be_uidt_nl
       << "/// dtor" << be_nl
-      << "~" << tiename << " (void);" << be_nl
+      << "~" << tiename << " ();" << be_nl
       << "// TIE specific functions" << be_nl
       << "/// return the underlying object" << be_nl
-      << "T *_tied_object (void);" << be_nl
+      << "T *_tied_object ();" << be_nl
       << "/// set the underlying object" << be_nl
       << "void _tied_object (T &obj);" << be_nl
       << "/// set the underlying object and the ownership flag" << be_nl
       << "void _tied_object (T *obj, ::CORBA::Boolean release = true);" << be_nl
       << "/// do we own it" << be_nl
-      << "::CORBA::Boolean _is_owner (void);" << be_nl
+      << "::CORBA::Boolean _is_owner ();" << be_nl
       << "/// set the ownership" << be_nl_2
       << "void _is_owner ( ::CORBA::Boolean b);" << be_nl
       << "// overridden ServantBase operations" << be_nl
-      << "PortableServer::POA_ptr _default_POA (void);";
+      << "PortableServer::POA_ptr _default_POA ();";
 
   int status =
     node->traverse_inheritance_graph (
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 5bd6a66367d..2aefd8183b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
@@ -18,7 +18,7 @@ be_visitor_interface_tie_ss::be_visitor_interface_tie_ss (
 {
 }
 
-be_visitor_interface_tie_ss::~be_visitor_interface_tie_ss (void)
+be_visitor_interface_tie_ss::~be_visitor_interface_tie_ss ()
 {
 }
 
@@ -111,7 +111,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "{}" << be_nl_2;
 
   *os << "template <class T>" << be_nl
-      << fulltiename << "<T>::~" << localtiename << " (void)" << be_nl
+      << fulltiename << "<T>::~" << localtiename << " ()" << be_nl
       << "{" << be_idt_nl
       << "if (this->rel_)" << be_idt_nl
       << "{" << be_idt_nl
@@ -120,7 +120,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "}" << be_nl_2;
 
   *os << "template <class T> T *" << be_nl
-      << fulltiename << "<T>::_tied_object (void)" << be_nl
+      << fulltiename << "<T>::_tied_object ()" << be_nl
       << "{" << be_idt_nl
       << "return this->ptr_;" << be_uidt_nl
       << "}" << be_nl_2;
@@ -149,7 +149,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "}" << be_nl_2;
 
   *os << "template <class T>  ::CORBA::Boolean" << be_nl
-      << fulltiename << "<T>::_is_owner (void)" << be_nl
+      << fulltiename << "<T>::_is_owner ()" << be_nl
       << "{" << be_idt_nl
       << "return this->rel_;" << 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 6589e9f170c..7136b8cce2e 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
@@ -18,7 +18,7 @@ be_visitor_interface_fwd_any_op_ch::be_visitor_interface_fwd_any_op_ch (
 {
 }
 
-be_visitor_interface_fwd_any_op_ch::~be_visitor_interface_fwd_any_op_ch (void)
+be_visitor_interface_fwd_any_op_ch::~be_visitor_interface_fwd_any_op_ch ()
 {
 }
 
@@ -48,14 +48,14 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
-      module = be_module::narrow_from_scope (node->defined_in ());
+      module = dynamic_cast<be_module*> (node->defined_in ());
 
-      if (0 == module)
+      if (nullptr == module)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "be_visitor_valuebox_any_op_ch::"
@@ -101,11 +101,11 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
 
-  node->cli_hdr_any_op_gen (1);
+  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 20199cf5d0c..1af551c91c2 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
@@ -18,7 +18,7 @@ be_visitor_interface_fwd_cdr_op_ch::be_visitor_interface_fwd_cdr_op_ch (
 {
 }
 
-be_visitor_interface_fwd_cdr_op_ch::~be_visitor_interface_fwd_cdr_op_ch (void)
+be_visitor_interface_fwd_cdr_op_ch::~be_visitor_interface_fwd_cdr_op_ch ()
 {
 }
 
@@ -57,6 +57,6 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
index 352675c9189..2529a46ccf3 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
@@ -17,7 +17,7 @@ be_visitor_interface_fwd_ch::be_visitor_interface_fwd_ch (
 {
 }
 
-be_visitor_interface_fwd_ch::~be_visitor_interface_fwd_ch (void)
+be_visitor_interface_fwd_ch::~be_visitor_interface_fwd_ch ()
 {
 }
 
@@ -31,7 +31,7 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
     }
 
   AST_Interface *fd = node->full_definition ();
-  be_interface *bfd = be_interface::narrow_from_decl (fd);
+  be_interface *bfd = dynamic_cast<be_interface*> (fd);
 
   // This will be a no-op if it has already been done for this node.
   bfd->gen_var_out_seq_decls ();
diff --git a/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp
index 9917cbac4f4..eae48a5e4e0 100644
--- a/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp
@@ -21,7 +21,7 @@ be_visitor_member_type_decl::be_visitor_member_type_decl  (
 {
 }
 
-be_visitor_member_type_decl::~be_visitor_member_type_decl (void)
+be_visitor_member_type_decl::~be_visitor_member_type_decl ()
 {
 }
 
@@ -30,7 +30,7 @@ be_visitor_member_type_decl::visit_array (be_array *)
 {
   be_type *bt = this->ctx_->alias ();
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       /// Support anonymous types?
       return -1;
@@ -110,7 +110,7 @@ be_visitor_member_type_decl::visit_sequence (be_sequence *)
 {
   be_type *bt = this->ctx_->alias ();
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       /// Support anonymous types?
       return -1;
@@ -151,7 +151,7 @@ be_visitor_member_type_decl::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp
index 65576becd8c..3c642a7bbe8 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp
@@ -17,7 +17,7 @@ be_visitor_module_any_op::be_visitor_module_any_op (be_visitor_context *ctx)
 {
 }
 
-be_visitor_module_any_op::~be_visitor_module_any_op (void)
+be_visitor_module_any_op::~be_visitor_module_any_op ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp
index ae5fb8db117..75c65619fd0 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp
@@ -17,7 +17,7 @@ be_visitor_module_cdr_op::be_visitor_module_cdr_op (be_visitor_context *ctx)
 {
 }
 
-be_visitor_module_cdr_op::~be_visitor_module_cdr_op (void)
+be_visitor_module_cdr_op::~be_visitor_module_cdr_op ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index 5cd0cf15ed2..28cd2dedcd7 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -16,7 +16,7 @@ be_visitor_module::be_visitor_module (be_visitor_context *ctx)
 {
 }
 
-be_visitor_module::~be_visitor_module (void)
+be_visitor_module::~be_visitor_module ()
 {
 }
 
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 85636db20ea..9f27e58ac96 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
@@ -16,7 +16,7 @@ be_visitor_module_ch::be_visitor_module_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_module_ch::~be_visitor_module_ch (void)
+be_visitor_module_ch::~be_visitor_module_ch ()
 {
 }
 
@@ -29,7 +29,7 @@ be_visitor_module_ch::visit_module (be_module *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  TAO_OutStream *aos = 0;
+  TAO_OutStream *aos = nullptr;
 
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp
index 971954b23ce..ecf4e15c7f6 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp
@@ -16,7 +16,7 @@ be_visitor_module_ih::be_visitor_module_ih (be_visitor_context *ctx)
 {
 }
 
-be_visitor_module_ih::~be_visitor_module_ih (void)
+be_visitor_module_ih::~be_visitor_module_ih ()
 {
 }
 
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 126bd313960..53e787c0e30 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
@@ -16,7 +16,7 @@ be_visitor_module_sh::be_visitor_module_sh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_module_sh::~be_visitor_module_sh (void)
+be_visitor_module_sh::~be_visitor_module_sh ()
 {
 }
 
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 0ef79436a49..9017e596896 100644
--- a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp
@@ -23,7 +23,7 @@ be_visitor_native_ch::be_visitor_native_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_native_ch::~be_visitor_native_ch (void)
+be_visitor_native_ch::~be_visitor_native_ch ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp
index 91c17cabbbb..12f226ea1c6 100644
--- a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp
@@ -23,7 +23,7 @@ be_visitor_null_return_value::be_visitor_null_return_value (
 {
 }
 
-be_visitor_null_return_value::~be_visitor_null_return_value (void)
+be_visitor_null_return_value::~be_visitor_null_return_value ()
 {
 }
 
@@ -122,7 +122,7 @@ be_visitor_null_return_value::visit_sequence (be_sequence *node)
   const char *fname = node->full_name ();
   be_typedef *td = this->ctx_->tdef ();
 
-  if (td != 0)
+  if (td != nullptr)
     {
       fname = td->full_name ();
     }
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 9e934d95725..080f6c6b715 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
@@ -17,7 +17,7 @@ be_visitor_amh_rh_operation_sh::be_visitor_amh_rh_operation_sh (
 {
 }
 
-be_visitor_amh_rh_operation_sh::~be_visitor_amh_rh_operation_sh (void)
+be_visitor_amh_rh_operation_sh::~be_visitor_amh_rh_operation_sh ()
 {
 }
 
@@ -46,8 +46,8 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node)
       : node->defined_in ();
 
   // Needs to be one or the other.
-  if (be_interface::narrow_from_scope (s) == 0
-      && be_porttype::narrow_from_scope (s) == 0)
+  if (dynamic_cast<be_interface*> (s) == nullptr
+      && dynamic_cast<be_porttype*> (s) == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_amh_rh_operation_sh::")
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 c16e63c9736..9e2e9b98cf9 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
@@ -16,7 +16,7 @@ be_visitor_amh_rh_operation_ss::be_visitor_amh_rh_operation_ss (
 {
 }
 
-be_visitor_amh_rh_operation_ss::~be_visitor_amh_rh_operation_ss (void)
+be_visitor_amh_rh_operation_ss::~be_visitor_amh_rh_operation_ss ()
 {
 }
 
@@ -43,13 +43,13 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
 
-  be_interface *intf = be_interface::narrow_from_scope (s);
+  be_interface *intf = dynamic_cast<be_interface*> (s);
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
-      be_porttype *pt = be_porttype::narrow_from_scope (s);
+      be_porttype *pt = dynamic_cast<be_porttype*> (s);
 
-      if (pt == 0)
+      if (pt == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_amh_rh_operation_sh::")
@@ -63,14 +63,14 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
         }
     }
 
-  char *buf = 0;
+  char *buf = nullptr;
   intf->compute_full_name ("TAO_", "", buf);
   ACE_CString response_handler_implementation_name ("POA_");
   response_handler_implementation_name += buf;
   // buf was allocated by ACE_OS::strdup, so we need to use free instead
   // of delete.
   ACE_OS::free (buf);
-  buf = 0;
+  buf = nullptr;
 
   // Step 1 : Generate return type: always void
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
@@ -125,7 +125,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
   // 4) The implied valuetype ends in ExceptionHolder
   const char *last_underbar = ACE_OS::strrchr (node->full_name (), '_');
 
-  if (last_underbar != 0
+  if (last_underbar != nullptr
       && ACE_OS::strcmp (last_underbar, "_excep") == 0)
     {
       if (node->nmembers () == 1)
@@ -136,17 +136,17 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
           if (!i.is_done ())
             {
               be_argument *argument =
-                be_argument::narrow_from_decl (i.item ());
+                dynamic_cast<be_argument*> (i.item ());
               be_valuetype *vt =
-                be_valuetype::narrow_from_decl (argument->field_type ());
+                dynamic_cast<be_valuetype*> (argument->field_type ());
 
-              if (vt != 0
+              if (vt != nullptr
                   && vt->original_interface () == intf->original_interface ())
                 {
                   const char *last_E =
                     ACE_OS::strrchr (vt->full_name (), 'E');
 
-                  if (last_E != 0
+                  if (last_E != nullptr
                       && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0)
                     {
                       is_an_exception_reply = 1;
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 45a289e6fe5..f926fced243 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -18,7 +18,7 @@ be_visitor_amh_operation_sh::be_visitor_amh_operation_sh (
 {
 }
 
-be_visitor_amh_operation_sh::~be_visitor_amh_operation_sh (void)
+be_visitor_amh_operation_sh::~be_visitor_amh_operation_sh ()
 {
 }
 
@@ -53,9 +53,9 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
        i.next ())
     {
       be_argument *argument =
-        be_argument::narrow_from_decl (i.item ());
+        dynamic_cast<be_argument*> (i.item ());
 
-      if (argument == 0
+      if (argument == nullptr
           || argument->direction () == AST_Argument::dir_OUT)
         {
           continue;
@@ -139,16 +139,16 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
   // if this operation node was an attribute node in disguise, we get this
   // information from the context
   be_interface *intf =
-    be_interface::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_interface*> (node->defined_in ());
 
-  if (this->ctx_->attribute () != 0)
+  if (this->ctx_->attribute () != nullptr)
     {
-      intf = be_interface::narrow_from_scope (
+      intf = dynamic_cast<be_interface*> (
                  this->ctx_->attribute()->defined_in ()
                );
     }
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%N:%l) be_visitor_amh_operation_sh::"
@@ -177,5 +177,5 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
   // buf was allocated by ACE_OS::strdup, so we must use free instead
   // of delete.
   ACE_OS::free (buf);
-  buf = 0;
+  buf = nullptr;
 }
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 459e253fb1c..d188e056618 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -17,7 +17,7 @@ be_visitor_amh_operation_ss::be_visitor_amh_operation_ss (
 {
 }
 
-be_visitor_amh_operation_ss::~be_visitor_amh_operation_ss (void)
+be_visitor_amh_operation_ss::~be_visitor_amh_operation_ss ()
 {
 }
 
@@ -62,9 +62,9 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
            si.next ())
         {
           be_argument *argument =
-            be_argument::narrow_from_decl (si.item ());
+            dynamic_cast<be_argument*> (si.item ());
 
-          if (argument == 0
+          if (argument == nullptr
               || argument->direction () == AST_Argument::dir_OUT)
             {
               continue;
@@ -99,9 +99,9 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
            sj.next ())
         {
           be_argument *argument =
-            be_argument::narrow_from_decl (sj.item ());
+            dynamic_cast<be_argument*> (sj.item ());
 
-          if (argument == 0
+          if (argument == nullptr
               || argument->direction () == AST_Argument::dir_OUT)
             {
               continue;
@@ -151,11 +151,11 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
          !i.is_done ();)
       {
         be_argument *argument =
-          be_argument::narrow_from_decl (i.item ());
+          dynamic_cast<be_argument*> (i.item ());
 
         i.next ();
 
-        if (argument == 0
+        if (argument == nullptr
             || argument->direction () == AST_Argument::dir_OUT)
           {
             continue;
@@ -308,9 +308,9 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
   // if this operation node was an attribute node in disguise, we get this
   // information from the context
   be_interface *intf =
-    be_interface::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_interface*> (node->defined_in ());
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_operation_ss::"
@@ -327,7 +327,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
   // buf was allocated by ACE_OS::strdup, so we need to use free instead
   // of delete.
   ACE_OS::free (buf);
-  buf = 0;
+  buf = nullptr;
 
   *os << "void" << be_nl
       << amh_skel_name.c_str () << "::"
@@ -359,7 +359,7 @@ be_visitor_amh_operation_ss::generate_shared_section (be_decl *node,
                                                       TAO_OutStream *os)
 {
   be_interface *intf =
-    be_interface::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_interface*> (node->defined_in ());
 
   if (!intf)
     {
@@ -377,7 +377,7 @@ be_visitor_amh_operation_ss::generate_shared_section (be_decl *node,
   // buf was allocated by ACE_OS::strdup, so we need to use free instead
   // of delete.
   ACE_OS::free (buf);
-  buf = 0;
+  buf = nullptr;
 
   *os << be_nl
       << "TAO_ORB_Core *orb_core =" << be_idt_nl
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 359af9aab39..b073286e4d7 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -18,7 +18,7 @@ be_visitor_operation_ami_cs::be_visitor_operation_ami_cs (
 {
 }
 
-be_visitor_operation_ami_cs::~be_visitor_operation_ami_cs (void)
+be_visitor_operation_ami_cs::~be_visitor_operation_ami_cs ()
 {
 }
 
@@ -62,9 +62,9 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   // Grab the scope name.
   be_decl *parent =
-    be_scope::narrow_from_scope (node->defined_in ())->decl ();
+    dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
-  if (parent == 0)
+  if (parent == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_operation_ami_cs::"
@@ -103,7 +103,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   if (node->has_native ()) // native exists => no stub
     {
       be_predefined_type bpt (AST_PredefinedType::PT_void,
-                              0);
+                              nullptr);
 
       int const status = this->gen_raise_exception ("::CORBA::MARSHAL",
                                                     "");
@@ -136,7 +136,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
       // type is void.  No need to generate argument list.
 
       *os << be_nl_2
-          << "TAO::Argument ** _the_tao_operation_signature = 0;";
+          << "TAO::Argument ** _the_tao_operation_signature {};";
       nargs = 0; // Don't count the reply handler.
     }
   else
@@ -154,9 +154,9 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
       *os << be_nl_2
           << "TAO::Argument *_the_tao_operation_signature[] =" << be_idt_nl
           << "{" << be_idt_nl
-          << "&_tao_retval";
+          << "std::addressof(_tao_retval)";
 
-      AST_Argument *arg = 0;
+      AST_Argument *arg = nullptr;
       UTL_ScopeActiveIterator arg_list_iter (ami_op,
                                              UTL_Scope::IK_decls);
 
@@ -165,10 +165,10 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
       for (; ! arg_list_iter.is_done (); arg_list_iter.next ())
         {
-          arg = AST_Argument::narrow_from_decl (arg_list_iter.item ());
+          arg = dynamic_cast<AST_Argument*> (arg_list_iter.item ());
 
           *os << "," << be_nl
-              << "&_tao_" << arg->local_name ();
+              << "std::addressof(_tao_" << arg->local_name () << ")";
         }
 
       *os << be_uidt_nl
@@ -225,7 +225,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   if (parent->is_nested ())
     {
       be_decl *gparent =
-        be_scope::narrow_from_scope (parent->defined_in ())->decl ();
+        dynamic_cast<be_scope*> (parent->defined_in ())->decl ();
 
       *os << gparent->name () << "::";
     }
@@ -245,10 +245,10 @@ int
 be_visitor_operation_ami_cs::visit_argument (be_argument *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0; // argument type
+  be_type *bt = nullptr; // argument type
 
   // Retrieve the type for this argument.
-  bt = be_type::narrow_from_decl (node->field_type ());
+  bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 1e4c533a705..8be04af15e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -19,7 +19,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs (
 }
 
 be_visitor_operation_ami_handler_reply_stub_operation_cs::
-~be_visitor_operation_ami_handler_reply_stub_operation_cs (void)
+~be_visitor_operation_ami_handler_reply_stub_operation_cs ()
 {
 }
 
@@ -44,14 +44,14 @@ int
 be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
   be_operation *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
   be_visitor_context ctx;
 
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
   // Initialize the return type variable.
-  bt = be_type::narrow_from_decl (node->return_type ());
+  bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -74,7 +74,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
 
   // Get the scope name.
   be_decl *parent =
-    be_scope::narrow_from_scope (node->defined_in ())->decl ();
+    dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
   if (!parent)
     {
@@ -155,7 +155,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       *os << be_nl << "static TAO::Exception_Data " << "exceptions_data [] =" << be_nl;
       *os << "{" << be_idt_nl;
 
-      be_exception *ex = 0;
+      be_exception *ex = nullptr;
 
       // Initialize an iterator to iterate thru the exception list.
       // Continue until each element is visited.
@@ -163,7 +163,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
            !ei.is_done ();)
         {
-          ex = be_exception::narrow_from_decl (ei.item ());
+          ex = dynamic_cast<be_exception*> (ei.item ());
 
           *os << "{" << be_idt_nl
               << "\"" << ex->repoID () << "\"," << be_nl;
@@ -205,7 +205,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       << "0);" << be_uidt
       << be_uidt_nl;
 
- *os  << "::Messaging::ExceptionHolder* exception_holder_ptr = 0;" << be_nl
+ *os  << "::Messaging::ExceptionHolder* exception_holder_ptr {};" << be_nl
       << "ACE_NEW (" << be_idt << be_idt_nl
       << "exception_holder_ptr," << be_nl
       << "::TAO::ExceptionHolder (" << be_idt_nl
@@ -246,10 +246,10 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_argument (
   )
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Retrieve the type for this argument.
-  bt = be_type::narrow_from_decl (node->field_type ());
+  bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index aeb7d0d0ca9..9e72f70475d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -25,7 +25,7 @@ be_visitor_operation_arglist::be_visitor_operation_arglist (
 {
 }
 
-be_visitor_operation_arglist::~be_visitor_operation_arglist (void)
+be_visitor_operation_arglist::~be_visitor_operation_arglist ()
 {
 }
 
@@ -148,24 +148,24 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
   // inside the scope of the interface node. In such cases, we would like to
   // generate the appropriate relative scoped names.
   be_operation *op =
-    be_operation::narrow_from_scope (this->ctx_->scope ());
-  be_interface *intf = 0;
+    dynamic_cast<be_operation*> (this->ctx_->scope ());
+  be_interface *intf = nullptr;
 
   // 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
   // information from the context
-  if (op == 0)
+  if (op == nullptr)
     {
       be_factory *f =
-        be_factory::narrow_from_scope (this->ctx_->scope ());
+        dynamic_cast<be_factory*> (this->ctx_->scope ());
 
-      intf = be_interface::narrow_from_scope (f->defined_in ());
+      intf = dynamic_cast<be_interface*> (f->defined_in ());
     }
   else
     {
       intf = this->ctx_->attribute ()
-        ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-        : be_interface::narrow_from_scope (op->defined_in ());
+        ? dynamic_cast<be_interface*> (this->ctx_->attribute ()->defined_in ())
+        : dynamic_cast<be_interface*> (op->defined_in ());
     }
 
   // Set new scope.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index ca8756a0886..8eb0700cea0 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -23,7 +23,7 @@ be_visitor_operation_argument::be_visitor_operation_argument (
 {
 }
 
-be_visitor_operation_argument::~be_visitor_operation_argument (void)
+be_visitor_operation_argument::~be_visitor_operation_argument ()
 {
 }
 
@@ -87,9 +87,9 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
   // inside the scope of the interface node. In such cases, we would like to
   // generate the appropriate relative scoped names.
   be_operation *op =
-    be_operation::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_operation*> (this->ctx_->scope ());
 
-  if (op == 0)
+  if (op == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_arglist::"
@@ -103,8 +103,8 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
   // information from the context.
   be_interface *intf;
   intf = this->ctx_->attribute ()
-    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_interface::narrow_from_scope (op->defined_in ());
+    ? dynamic_cast<be_interface*> (this->ctx_->attribute ()->defined_in ())
+    : dynamic_cast<be_interface*> (op->defined_in ());
 
   if (!intf)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
index d86ea3ee5b8..a1423254492 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
@@ -19,16 +19,13 @@
 
 be_visitor_operation_argument_invoke::be_visitor_operation_argument_invoke (
     be_visitor_context
-    *ctx
-  )
+    *ctx)
   : be_visitor_operation_argument (ctx),
     last_arg_printed_ (be_visitor_operation_argument_invoke::TAO_ARG_NONE)
 {
 }
 
-be_visitor_operation_argument_invoke::~be_visitor_operation_argument_invoke (
-    void
-  )
+be_visitor_operation_argument_invoke::~be_visitor_operation_argument_invoke ()
 {
 }
 
@@ -37,7 +34,7 @@ be_visitor_operation_argument_invoke::pre_process (be_decl *bd)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_argument *arg = be_argument::narrow_from_decl (bd);
+  be_argument *arg = dynamic_cast<be_argument*> (bd);
 
   if (!arg)
     {
@@ -97,7 +94,7 @@ be_visitor_operation_argument_invoke::pre_process (be_decl *bd)
 int
 be_visitor_operation_argument_invoke::post_process (be_decl *bd)
 {
-  be_argument *arg = be_argument::narrow_from_decl (bd);
+  be_argument *arg = dynamic_cast<be_argument*> (bd);
 
   if (!arg)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
index 45a51afde58..57693c39b6f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
@@ -19,16 +19,13 @@
 
 be_visitor_operation_argument_marshal::be_visitor_operation_argument_marshal (
     be_visitor_context
-    *ctx
-  )
+    *ctx)
   : be_visitor_operation_argument (ctx),
     last_arg_printed_ (be_visitor_operation_argument_marshal::TAO_ARG_NONE)
 {
 }
 
-be_visitor_operation_argument_marshal::~be_visitor_operation_argument_marshal (
-    void
-  )
+be_visitor_operation_argument_marshal::~be_visitor_operation_argument_marshal ()
 {
 }
 
@@ -37,7 +34,7 @@ be_visitor_operation_argument_marshal::pre_process (be_decl *bd)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_argument *arg = be_argument::narrow_from_decl (bd);
+  be_argument *arg = dynamic_cast<be_argument*> (bd);
 
   if (!arg)
     {
@@ -97,7 +94,7 @@ be_visitor_operation_argument_marshal::pre_process (be_decl *bd)
 int
 be_visitor_operation_argument_marshal::post_process (be_decl *bd)
 {
-  be_argument *arg = be_argument::narrow_from_decl (bd);
+  be_argument *arg = dynamic_cast<be_argument*> (bd);
 
   if (!arg)
     {
@@ -178,7 +175,7 @@ be_visitor_args_decl::visit_argument (be_argument *node)
   this->ctx_->node (node); // save the argument node
 
   // retrieve the type of the argument
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   return bt->accept (this);
 }
@@ -191,9 +188,9 @@ be_visitor_args_decl::visit_array (be_array *node)
 
   // retrieve the field node
   be_argument *f =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_argument*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_args_decl::"
@@ -221,7 +218,7 @@ be_visitor_args_decl::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
           ACE_OS::sprintf (fname,
                            "%s::_%s",
@@ -275,6 +272,6 @@ be_visitor_args_decl::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
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 714bcfa1e3b..aab0e909e4b 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
@@ -7,7 +7,7 @@ be_visitor_operation_direct_proxy_impl_ss (be_visitor_context *ctx)
 }
 
 be_visitor_operation_direct_proxy_impl_ss::
-~be_visitor_operation_direct_proxy_impl_ss (void)
+~be_visitor_operation_direct_proxy_impl_ss ()
 {
 }
 
@@ -32,13 +32,13 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
 
-  be_interface *intf = be_interface::narrow_from_scope (s);
+  be_interface *intf = dynamic_cast<be_interface*> (s);
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
-      be_porttype *pt = be_porttype::narrow_from_scope (s);
+      be_porttype *pt = dynamic_cast<be_porttype*> (s);
 
-      if (pt == 0)
+      if (pt == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_operation_")
@@ -153,12 +153,12 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke (
       return 0;
     }
 
-  AST_Argument *arg = 0;
+  AST_Argument *arg = nullptr;
   int index = 1;
 
   for (; !si.is_done (); si.next (), ++index)
     {
-      arg = AST_Argument::narrow_from_decl (si.item ());
+      arg = dynamic_cast<AST_Argument*> (si.item ());
 
       *os << (index == 1 ? "" : ",") << be_nl
           << "((TAO::Arg_Traits< ";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
index e234183eda7..7a4e5274a17 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
@@ -23,7 +23,7 @@ be_visitor_operation_exceptlist_cs::be_visitor_operation_exceptlist_cs (
 {
 }
 
-be_visitor_operation_exceptlist_cs::~be_visitor_operation_exceptlist_cs (void)
+be_visitor_operation_exceptlist_cs::~be_visitor_operation_exceptlist_cs ()
 {
 }
 
@@ -41,7 +41,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
           << "_exceptiondata [] = " << be_idt_nl;
       *os << "{" << be_idt_nl;
 
-      be_exception *ex = 0;
+      be_exception *ex = nullptr;
 
       // Initialize an iterator to iterate thru the exception list.
       // Continue until each element is visited.
@@ -50,7 +50,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
            !ei.is_done ();)
         {
           AST_Decl *d = ei.item ();
-          ex = be_exception::narrow_from_decl (d);
+          ex = dynamic_cast<be_exception*> (d);
 
           *os << "{" << be_idt_nl
               << "\"" << ex->repoID () << "\"," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
index 9b8db063795..8d54dfbce92 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
@@ -23,7 +23,7 @@ be_visitor_operation_exceptlist_ss::be_visitor_operation_exceptlist_ss (
 {
 }
 
-be_visitor_operation_exceptlist_ss::~be_visitor_operation_exceptlist_ss (void)
+be_visitor_operation_exceptlist_ss::~be_visitor_operation_exceptlist_ss ()
 {
 }
 
@@ -47,7 +47,7 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node)
       for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
            !ei.is_done ();)
         {
-          be_exception * ex = be_exception::narrow_from_decl (ei.item ());
+          be_exception * ex = dynamic_cast<be_exception*> (ei.item ());
 
           *os << ex->tc_name ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 479ee59a5a6..498b403d1da 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -20,7 +20,7 @@ be_visitor_operation::be_visitor_operation (be_visitor_context *ctx)
 {
 }
 
-be_visitor_operation::~be_visitor_operation (void)
+be_visitor_operation::~be_visitor_operation ()
 {
 }
 
@@ -31,12 +31,12 @@ be_visitor_operation::void_return_type (be_type *bt)
   if (bt->node_type () == AST_Decl::NT_pre_defined)
     {
       be_predefined_type * const bpd =
-        be_predefined_type::narrow_from_decl (bt);
+        dynamic_cast<be_predefined_type*> (bt);
 
       if (!bpd)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "TAO_IDL (%N:%l) "
-                           "be_predefined_type::narrow_from_decl "
+                           "dynamic_cast<be_predefined_type*> "
                            "failed\n"),
                           0);
 
@@ -75,14 +75,14 @@ be_visitor_operation::count_non_out_parameters (be_operation *node)
        si.next ())
     {
       be_argument *bd =
-        be_argument::narrow_from_decl (si.item ());
+        dynamic_cast<be_argument*> (si.item ());
 
       // We do not generate insertion operators for valuetypes
       // yet. Do not include them in the count.
       be_valuetype *vt =
-        be_valuetype::narrow_from_decl (bd->field_type ());
+        dynamic_cast<be_valuetype*> (bd->field_type ());
 
-      if ((bd->direction () != AST_Argument::dir_OUT) && vt == 0)
+      if ((bd->direction () != AST_Argument::dir_OUT) && vt == nullptr)
         {
           ++count;
         }
@@ -106,7 +106,7 @@ be_visitor_operation::is_amh_exception_holder (be_interface *node)
     {
       //ACE_DEBUG ((LM_DEBUG, "Passed first test of amh_excepholder\n"));
       const char *last_E = ACE_OS::strrchr (node->full_name (), 'E');
-      if (last_E != 0
+      if (last_E != nullptr
           && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0)
         {
           //ACE_DEBUG ((LM_DEBUG, "be_visitor_operation: Passed second test of amh_excepholder\n"));
@@ -140,13 +140,13 @@ be_visitor_operation::gen_stub_operation_body (
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
 
-  be_interface *intf = be_interface::narrow_from_scope (s);
+  be_interface *intf = dynamic_cast<be_interface*> (s);
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
-      be_porttype *pt = be_porttype::narrow_from_scope (s);
+      be_porttype *pt = dynamic_cast<be_porttype*> (s);
 
-      if (pt == 0)
+      if (pt == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_operation::")
@@ -213,18 +213,18 @@ be_visitor_operation::gen_stub_operation_body (
   *os << be_nl_2
       << "TAO::Argument *_the_tao_operation_signature [] =" << be_idt_nl
       << "{" << be_idt_nl
-      << "&_tao_retval";
+      << "std::addressof(_tao_retval)";
 
-  AST_Argument *arg = 0;
+  AST_Argument *arg = nullptr;
 
   for (UTL_ScopeActiveIterator arg_list_iter (node, UTL_Scope::IK_decls);
        ! arg_list_iter.is_done ();
        arg_list_iter.next ())
     {
-      arg = AST_Argument::narrow_from_decl (arg_list_iter.item ());
+      arg = dynamic_cast<AST_Argument*> (arg_list_iter.item ());
 
       *os << "," << be_nl
-          << "&_tao_" << arg->local_name ();
+          << "std::addressof(_tao_" << arg->local_name () << ")";
     }
 
   *os << be_uidt_nl
@@ -329,7 +329,7 @@ be_visitor_operation::gen_stub_operation_body (
     }
   else
     {
-      *os << "_tao_call.invoke (0, 0);";
+      *os << "_tao_call.invoke (nullptr, 0);";
     }
 
   if (!this->void_return_type (return_type))
@@ -408,7 +408,7 @@ be_visitor_operation::gen_stub_body_arglist (be_operation *node,
                                              TAO_OutStream *os,
                                              bool ami)
 {
-  AST_Argument *arg = 0;
+  AST_Argument *arg = nullptr;
   UTL_ScopeActiveIterator arg_decl_iter (node, UTL_Scope::IK_decls);
 
   if (ami)
@@ -419,7 +419,7 @@ be_visitor_operation::gen_stub_body_arglist (be_operation *node,
 
   for (; ! arg_decl_iter.is_done (); arg_decl_iter.next ())
     {
-      arg = AST_Argument::narrow_from_decl (arg_decl_iter.item ());
+      arg = dynamic_cast<AST_Argument*> (arg_decl_iter.item ());
 
       *os << be_nl
           << "TAO::Arg_Traits< ";
@@ -459,11 +459,11 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope,
                                                    AST_Type *bt,
                                                    TAO_OutStream *os)
 {
-  AST_Typedef *alias = 0;
+  AST_Typedef *alias = nullptr;
 
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
-      alias = AST_Typedef::narrow_from_decl (bt);
+      alias = dynamic_cast<AST_Typedef*> (bt);
     }
 
   AST_Decl::NodeType nt = bt->unaliased_type ()->node_type ();
@@ -472,7 +472,7 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope,
   if (nt == AST_Decl::NT_string || nt == AST_Decl::NT_wstring)
     {
       AST_String *s =
-        AST_String::narrow_from_decl (bt->unaliased_type  ());
+        dynamic_cast<AST_String*> (bt->unaliased_type  ());
       bound = s->max_size ()->ev ()->u.ulval;
 
       // If the (w)string is unbounded, code is generated below by the
@@ -481,7 +481,7 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope,
         {
           *os << "::TAO::";
 
-          if (alias != 0)
+          if (alias != nullptr)
             {
               *os << alias->local_name () << "_" << bound;
             }
@@ -513,7 +513,7 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope,
   if (nt == AST_Decl::NT_pre_defined)
     {
       AST_PredefinedType *pdt =
-        AST_PredefinedType::narrow_from_decl (ut);
+        dynamic_cast<AST_PredefinedType*> (ut);
 
       switch (pdt->pt ())
         {
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 736845088ba..9135f9dfe30 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
@@ -20,7 +20,7 @@ be_visitor_operation_ch::be_visitor_operation_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_operation_ch::~be_visitor_operation_ch (void)
+be_visitor_operation_ch::~be_visitor_operation_ch ()
 {
 }
 
@@ -34,7 +34,7 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
   *os << be_nl_2;
 
   // STEP I: generate the return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -97,12 +97,12 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
     }
 
   be_interface *intf =
-    be_interface::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_interface*> (node->defined_in ());
 
   /// If we are in a reply handler, are not an excep_* operation,
   /// and have no native args, then generate the AMI static
   /// reply stub declaration.
-  if (intf != 0
+  if (intf != nullptr
       && intf->is_ami_rh ()
       && !node->is_excep_ami ()
       && !node->has_native ())
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 4177101bb59..ec94769a15e 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -20,7 +20,7 @@ be_visitor_operation_cs::be_visitor_operation_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_operation_cs::~be_visitor_operation_cs (void)
+be_visitor_operation_cs::~be_visitor_operation_cs ()
 {
 }
 
@@ -47,13 +47,13 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
 
-  be_interface *intf = be_interface::narrow_from_scope (s);
+  be_interface *intf = dynamic_cast<be_interface*> (s);
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
-      be_porttype *pt = be_porttype::narrow_from_scope (s);
+      be_porttype *pt = dynamic_cast<be_porttype*> (s);
 
-      if (pt == 0)
+      if (pt == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_operation_cs::")
@@ -65,7 +65,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
         {
           intf = this->ctx_->interface ();
 
-          if (intf == 0)
+          if (intf == nullptr)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("be_visitor_operation_cs::")
@@ -88,7 +88,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Retrieve the operation return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -142,7 +142,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
   /// If we are in a reply handler, are not an execp_* operation,
   /// and have no native args, then generate the AMI static
   /// reply stub declaration.
-  if (intf != 0
+  if (intf != nullptr
       && intf->is_ami_rh ()
       && !node->is_excep_ami ()
       && !node->has_native ())
@@ -171,7 +171,7 @@ be_visitor_operation_cs::visit_argument (be_argument *node)
   // This method is used to generate the ParamData table entry.
 
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
index 5e52b120d66..38a7844492b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
@@ -14,13 +14,13 @@
 be_visitor_operation_exs::be_visitor_operation_exs (be_visitor_context *ctx)
   : be_visitor_scope (ctx),
     os_ (*ctx->stream ()),
-    scope_ (0),
+    scope_ (nullptr),
     your_code_here_ ("/* Your code here. */"),
     class_extension_ ("_exec_i")
 {
 }
 
-be_visitor_operation_exs::~be_visitor_operation_exs (void)
+be_visitor_operation_exs::~be_visitor_operation_exs ()
 {
 }
 
@@ -38,9 +38,9 @@ be_visitor_operation_exs::visit_operation (be_operation *node)
   os_ << be_nl_2;
 
   // Retrieve the operation return type.
-  be_type *rt = be_type::narrow_from_decl (node->return_type ());
+  be_type *rt = dynamic_cast<be_type*> (node->return_type ());
 
-  if (rt == 0)
+  if (rt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_operation_exs::")
@@ -111,7 +111,7 @@ be_visitor_operation_exs::gen_op_body (be_type *return_type)
       << your_code_here_;
 
   be_operation *op =
-    be_operation::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_operation*> (this->ctx_->node ());
 
   if (! op->void_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 67c4ad7bf65..26ab9dace41 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
@@ -16,7 +16,7 @@ be_visitor_operation_ih::be_visitor_operation_ih (be_visitor_context *ctx)
 {
 }
 
-be_visitor_operation_ih::~be_visitor_operation_ih (void)
+be_visitor_operation_ih::~be_visitor_operation_ih ()
 {
 }
 
@@ -44,7 +44,7 @@ be_visitor_operation_ih::visit_operation (be_operation *node)
   *os << "virtual" << be_nl;
 
   // STEP I: generate the return type
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
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 7a3a3893e98..2de4bd8c983 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
@@ -16,7 +16,7 @@ be_visitor_operation_is::be_visitor_operation_is (be_visitor_context *ctx)
 {
 }
 
-be_visitor_operation_is::~be_visitor_operation_is (void)
+be_visitor_operation_is::~be_visitor_operation_is ()
 {
 }
 
@@ -35,7 +35,7 @@ be_visitor_operation_is::visit_operation (be_operation *node)
   this->ctx_->node (node); // save the node
 
   // STEP I: generate the return type
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -64,7 +64,7 @@ be_visitor_operation_is::visit_operation (be_operation *node)
                         -1);
     }
 
-  const char *classname = 0;
+  const char *classname = nullptr;
 
   if (intf)
     {
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 d0aa64d2023..d26e0eb61eb 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -16,7 +16,7 @@ be_visitor_operation_sh::be_visitor_operation_sh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_operation_sh::~be_visitor_operation_sh (void)
+be_visitor_operation_sh::~be_visitor_operation_sh ()
 {
 }
 
@@ -38,7 +38,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
   *os << "virtual ";
 
   // STEP I: generate the return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
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 1c04abc57a8..a3256880c8e 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -16,7 +16,7 @@ be_visitor_operation_ss::be_visitor_operation_ss (be_visitor_context *ctx)
 {
 }
 
-be_visitor_operation_ss::~be_visitor_operation_ss (void)
+be_visitor_operation_ss::~be_visitor_operation_ss ()
 {
 }
 
@@ -30,7 +30,7 @@ be_visitor_operation_ss::visit_operation (be_operation * node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   this->ctx_->node (node);
 
@@ -43,7 +43,7 @@ be_visitor_operation_ss::visit_operation (be_operation * node)
     }
 
   // Retrieve the operation return type.
-  bt = be_type::narrow_from_decl (node->return_type ());
+  bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -65,7 +65,7 @@ be_visitor_operation_ss::visit_argument (be_argument *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the type for this argument.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -127,9 +127,9 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
                  ? this->ctx_->attribute ()->defined_in ()
                  : node->defined_in ();
 
-  be_interface *intf = be_interface::narrow_from_scope (s);
+  be_interface *intf = dynamic_cast<be_interface*> (s);
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_operation_ss::")
@@ -220,17 +220,17 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
   *os << be_nl_2
       << "TAO::Argument * const args[] =" << be_idt_nl
       << "{" << be_idt_nl
-      << "&retval";
+      << "std::addressof(retval)";
 
   for (UTL_ScopeActiveIterator arg_list_iter (node, UTL_Scope::IK_decls);
        ! arg_list_iter.is_done ();
        arg_list_iter.next ())
     {
       AST_Argument * const arg =
-        AST_Argument::narrow_from_decl (arg_list_iter.item ());
+        dynamic_cast<AST_Argument*> (arg_list_iter.item ());
 
       *os << "," << be_nl
-          << "&_tao_" << arg->local_name ();
+          << "std::addressof(_tao_" << arg->local_name () << ")";
     }
 
   *os << be_uidt_nl
@@ -280,7 +280,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
     }
   else
     {
-      *os << "                       , 0" << be_nl
+      *os << "                       , nullptr" << be_nl
           << "                       , 0";
     }
 
@@ -300,7 +300,7 @@ be_visitor_operation_ss::gen_skel_body_arglist (be_operation * node,
        arg_decl_iter.next ())
     {
       AST_Argument * const arg =
-        AST_Argument::narrow_from_decl (arg_decl_iter.item ());
+        dynamic_cast<AST_Argument*> (arg_decl_iter.item ());
 
       *os << be_nl
           << "TAO::SArg_Traits< ";
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 0a7f41b866c..f238e8996d9 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
@@ -15,11 +15,11 @@
 be_visitor_operation_svs::be_visitor_operation_svs (
       be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    scope_ (0)
+    scope_ (nullptr)
 {
 }
 
-be_visitor_operation_svs::~be_visitor_operation_svs (void)
+be_visitor_operation_svs::~be_visitor_operation_svs ()
 {
 }
 
@@ -37,9 +37,9 @@ be_visitor_operation_svs::visit_operation (be_operation *node)
           << be_nl;
     }
   // Retrieve the operation return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "be_visitor_operation_svs::"
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 46dadc29d59..87bdd4dc2da 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
@@ -6,7 +6,7 @@ be_visitor_operation_proxy_impl_xh::be_visitor_operation_proxy_impl_xh (
 {
 }
 
-be_visitor_operation_proxy_impl_xh::~be_visitor_operation_proxy_impl_xh (void)
+be_visitor_operation_proxy_impl_xh::~be_visitor_operation_proxy_impl_xh ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
index 8096821e52e..08115517406 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -23,7 +23,7 @@ be_visitor_operation_rettype::be_visitor_operation_rettype (be_visitor_context
 {
 }
 
-be_visitor_operation_rettype::~be_visitor_operation_rettype (void)
+be_visitor_operation_rettype::~be_visitor_operation_rettype ()
 {
 }
 
@@ -76,7 +76,7 @@ int
 be_visitor_operation_rettype::visit_predefined_type (
   be_predefined_type *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -195,7 +195,7 @@ be_visitor_operation_rettype::visit_typedef (
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -286,9 +286,9 @@ be_visitor_operation_rettype::visit_valuebox (
 const char *
 be_visitor_operation_rettype::type_name (be_type *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
-  if (this->ctx_->alias () != 0)
+  if (this->ctx_->alias () != nullptr)
     {
       // A typedefed return type.
       bt = this->ctx_->alias ();
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
index dffded06c3e..035f27cb707 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
@@ -24,7 +24,7 @@ be_visitor_operation_rettype_return_cs (be_visitor_context *ctx)
 }
 
 be_visitor_operation_rettype_return_cs::
-~be_visitor_operation_rettype_return_cs (void)
+~be_visitor_operation_rettype_return_cs ()
 {
 }
 
@@ -189,7 +189,7 @@ be_visitor_operation_rettype_return_cs::visit_typedef (
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
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 41520dce0f7..3a4522ffbbf 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
@@ -16,15 +16,12 @@
 // ******************************************************
 
 be_visitor_operation_smart_proxy_ch::be_visitor_operation_smart_proxy_ch (
-    be_visitor_context *ctx
-  )
+    be_visitor_context *ctx)
   : be_visitor_scope (ctx)
 {
 }
 
-be_visitor_operation_smart_proxy_ch::~be_visitor_operation_smart_proxy_ch (
-    void
-  )
+be_visitor_operation_smart_proxy_ch::~be_visitor_operation_smart_proxy_ch ()
 {
 }
 
@@ -41,7 +38,7 @@ be_visitor_operation_smart_proxy_ch::visit_operation (be_operation *node)
       *os << "virtual ";
 
       // STEP I: generate the return type.
-      be_type *bt = be_type::narrow_from_decl (node->return_type ());
+      be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
       if (!bt)
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
index 0ca7300e45b..7173c94b322 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
@@ -17,9 +17,7 @@ be_visitor_operation_smart_proxy_cs::be_visitor_operation_smart_proxy_cs (
 {
 }
 
-be_visitor_operation_smart_proxy_cs::~be_visitor_operation_smart_proxy_cs (
-    void
-  )
+be_visitor_operation_smart_proxy_cs::~be_visitor_operation_smart_proxy_cs ()
 {
 }
 
@@ -37,13 +35,13 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node)
           ? this->ctx_->attribute ()->defined_in ()
           : node->defined_in ();
 
-      be_interface *intf = be_interface::narrow_from_scope (s);
+      be_interface *intf = dynamic_cast<be_interface*> (s);
 
-      if (intf == 0)
+      if (intf == nullptr)
         {
-          be_porttype *pt = be_porttype::narrow_from_scope (s);
+          be_porttype *pt = dynamic_cast<be_porttype*> (s);
 
-          if (pt == 0)
+          if (pt == nullptr)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("be_visitor_operation_")
@@ -58,7 +56,7 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node)
             }
         }
 
-      be_type *bt = be_type::narrow_from_decl (node->return_type ());
+      be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
       if (!bt)
         {
@@ -87,7 +85,7 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node)
       // node (i.e the operation) is already in a scope lower than intf
       // (i.e. be_interface), so for deciding the exact scope use intf.
 
-      be_decl* scope = be_scope::narrow_from_scope (intf->defined_in ())->decl ();
+      be_decl* scope = dynamic_cast<be_scope*> (intf->defined_in ())->decl ();
 
       *os << " ";
       *os << scope->full_name ();
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 2448df4c6cc..fb24e5ed20d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
@@ -18,7 +18,7 @@ be_visitor_operation_tie_sh::be_visitor_operation_tie_sh (
 {
 }
 
-be_visitor_operation_tie_sh::~be_visitor_operation_tie_sh (void)
+be_visitor_operation_tie_sh::~be_visitor_operation_tie_sh ()
 {
 }
 
@@ -36,7 +36,7 @@ be_visitor_operation_tie_sh::visit_operation (be_operation *node)
   this->ctx_->node (node);
 
   // STEP I: generate the return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
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 9450b60e1e3..6d68b3ec985 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
@@ -17,7 +17,7 @@ be_visitor_operation_tie_ss::be_visitor_operation_tie_ss (
 {
 }
 
-be_visitor_operation_tie_ss::~be_visitor_operation_tie_ss (void)
+be_visitor_operation_tie_ss::~be_visitor_operation_tie_ss ()
 {
 }
 
@@ -44,7 +44,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
     }
 
   // Retrieve the operation return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -71,7 +71,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
           // Check for conflicts between the arg name and the proposed template
           // class identifier
           AST_Argument *arg =
-            AST_Argument::narrow_from_decl (si.item ());
+            dynamic_cast<AST_Argument*> (si.item ());
 
           if (! ACE_OS::strcmp (arg->local_name ()->get_string (),
                                 template_name.c_str ()))
@@ -127,9 +127,9 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
 
   *os << be_nl << "{" << be_idt_nl;
 
-  be_predefined_type *pdt = be_predefined_type::narrow_from_decl (bt);
+  be_predefined_type *pdt = dynamic_cast<be_predefined_type*> (bt);
 
-  if (pdt == 0 || pdt->pt () != AST_PredefinedType::PT_void)
+  if (pdt == nullptr || pdt->pt () != AST_PredefinedType::PT_void)
     {
       *os << "return ";
     }
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 2df7ec104ad..4827c027ba9 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
@@ -19,7 +19,7 @@ be_visitor_operation_upcall_command_ss::be_visitor_operation_upcall_command_ss (
 }
 
 be_visitor_operation_upcall_command_ss::~be_visitor_operation_upcall_command_ss (
-  void)
+  )
 {
 }
 
@@ -35,8 +35,8 @@ be_visitor_operation_upcall_command_ss::visit (
     }
 
   be_interface * const intf = this->ctx_->attribute ()
-    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_interface::narrow_from_scope (node->defined_in ());
+    ? dynamic_cast<be_interface*> (this->ctx_->attribute ()->defined_in ())
+    : dynamic_cast<be_interface*> (node->defined_in ());
 
   if (!intf)
     {
@@ -47,7 +47,7 @@ be_visitor_operation_upcall_command_ss::visit (
                         -1);
     }
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
@@ -57,9 +57,9 @@ be_visitor_operation_upcall_command_ss::visit (
   if (intf->is_nested () &&
       intf->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
-      module = be_module::narrow_from_scope (intf->defined_in ());
+      module = dynamic_cast<be_module*> (intf->defined_in ());
 
-      if (module == 0)
+      if (module == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_operation_")
@@ -134,7 +134,7 @@ be_visitor_operation_upcall_command_ss::visit (
      << "}" << be_nl_2;
 
   // Generate execute() method.
-  os << "virtual void execute (void)" << be_nl
+  os << "virtual void execute ()" << be_nl
      << "{" << be_idt_nl;
 
   if (!node->void_return_type ())
@@ -200,7 +200,7 @@ be_visitor_operation_upcall_command_ss::visit (
   os << be_uidt_nl
      << "};";
 
-  if (module != 0)
+  if (module != nullptr)
     {
       be_util::gen_nested_namespace_end (&os, module);
     }
@@ -228,18 +228,18 @@ be_visitor_operation_upcall_command_ss::gen_upcall (
   for (; !si.is_done (); si.next (), ++index)
     {
       AST_Argument * const arg =
-        AST_Argument::narrow_from_decl (si.item ());
+        dynamic_cast<AST_Argument*> (si.item ());
 
       // Finish the check for the _excep method
       if (excep_method)
         {
           excep_method = false;
           be_argument *argument =
-            be_argument::narrow_from_decl (si.item ());
+            dynamic_cast<be_argument*> (si.item ());
           be_valuetype *value_type =
-            be_valuetype::narrow_from_decl (argument->field_type ());
+            dynamic_cast<be_valuetype*> (argument->field_type ());
 
-          if (value_type != 0)
+          if (value_type != nullptr)
             {
               static const char *excepholder = "ExceptionHolder";
               static const size_t excepholder_len =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
index 56a0feed9b1..439da73062d 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
@@ -22,7 +22,7 @@ be_visitor_root_any_op::be_visitor_root_any_op (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_any_op::~be_visitor_root_any_op (void)
+be_visitor_root_any_op::~be_visitor_root_any_op ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
index bd62a120467..89cb9e23096 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
@@ -22,7 +22,7 @@ be_visitor_root_cdr_op::be_visitor_root_cdr_op (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_cdr_op::~be_visitor_root_cdr_op (void)
+be_visitor_root_cdr_op::~be_visitor_root_cdr_op ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index e2e0ec92fae..ef1ad8a4882 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -17,7 +17,7 @@ be_visitor_root::be_visitor_root (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root::~be_visitor_root (void)
+be_visitor_root::~be_visitor_root ()
 {
 }
 
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 44adb8fb6c7..d2cfc9934c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -17,11 +17,11 @@
 
 be_visitor_root_ch::be_visitor_root_ch (be_visitor_context *ctx)
   : be_visitor_root (ctx),
-    o_ (0)
+    o_ (nullptr)
 {
 }
 
-be_visitor_root_ch::~be_visitor_root_ch (void)
+be_visitor_root_ch::~be_visitor_root_ch ()
 {
 }
 
@@ -116,7 +116,7 @@ be_visitor_root_ch::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_ch::init (void)
+be_visitor_root_ch::init ()
 {
   /// First open the client-side file for writing
   int status =
@@ -148,7 +148,7 @@ be_visitor_root_ch::gen_arg_traits (be_root *node)
 }
 
 void
-be_visitor_root_ch::gen_fwd_decls (void)
+be_visitor_root_ch::gen_fwd_decls ()
 {
   if (idl_global->non_local_iface_seen_)
     {
@@ -175,7 +175,7 @@ be_visitor_root_ch::gen_fwd_decls (void)
 }
 
 void
-be_visitor_root_ch::gen_ref_counting_overrides (void)
+be_visitor_root_ch::gen_ref_counting_overrides ()
 {
   size_t size = be_global->non_defined_interfaces.size ();
 
@@ -185,7 +185,7 @@ be_visitor_root_ch::gen_ref_counting_overrides (void)
     }
 
   size_t index = 0;
-  be_interface_fwd *ifwd = 0;
+  be_interface_fwd *ifwd = nullptr;
 
   *o_ << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
@@ -221,7 +221,7 @@ be_visitor_root_ch::gen_ref_counting_overrides (void)
 }
 
 void
-be_visitor_root_ch::gen_static_corba_overrides (void)
+be_visitor_root_ch::gen_static_corba_overrides ()
 {
   size_t size = idl_global->mixed_parentage_interfaces ().size ();
 
@@ -231,7 +231,7 @@ be_visitor_root_ch::gen_static_corba_overrides (void)
     }
 
   size_t index = 0;
-  AST_Interface *i = 0;
+  AST_Interface *i = nullptr;
 
   *o_ << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp
index 7e6e0b32c19..aedb03c7454 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp
@@ -16,7 +16,7 @@ be_visitor_root_ci::be_visitor_root_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_ci::~be_visitor_root_ci (void)
+be_visitor_root_ci::~be_visitor_root_ci ()
 {
 }
 
@@ -55,7 +55,7 @@ be_visitor_root_ci::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_ci::init (void)
+be_visitor_root_ci::init ()
 {
   /// First open the client-side file for writing
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp
index df203ce008c..834a0896cb0 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp
@@ -17,7 +17,7 @@ be_visitor_root_cnh::be_visitor_root_cnh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_cnh::~be_visitor_root_cnh (void)
+be_visitor_root_cnh::~be_visitor_root_cnh ()
 {
 }
 
@@ -46,7 +46,7 @@ be_visitor_root_cnh::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_cnh::init (void)
+be_visitor_root_cnh::init ()
 {
   // First open the client-side header file for writing.
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp
index 1d9a05c44cf..fd83265d321 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp
@@ -17,7 +17,7 @@ be_visitor_root_cns::be_visitor_root_cns (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_cns::~be_visitor_root_cns (void)
+be_visitor_root_cns::~be_visitor_root_cns ()
 {
 }
 
@@ -46,7 +46,7 @@ be_visitor_root_cns::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_cns::init (void)
+be_visitor_root_cns::init ()
 {
   // First open the client-side header file for writing.
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp
index 88c61e03276..c535e266697 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp
@@ -16,7 +16,7 @@ be_visitor_root_cs::be_visitor_root_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_cs::~be_visitor_root_cs (void)
+be_visitor_root_cs::~be_visitor_root_cs ()
 {
 }
 
@@ -76,7 +76,7 @@ be_visitor_root_cs::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_cs::init (void)
+be_visitor_root_cs::init ()
 {
   /// First open the client-side file for writing
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
index 69ca7540719..c07d97c752b 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
@@ -17,7 +17,7 @@ be_visitor_root_ex_idl::be_visitor_root_ex_idl (
 {
 }
 
-be_visitor_root_ex_idl::~be_visitor_root_ex_idl (void)
+be_visitor_root_ex_idl::~be_visitor_root_ex_idl ()
 {
 }
 
@@ -46,7 +46,7 @@ be_visitor_root_ex_idl::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_ex_idl::init (void)
+be_visitor_root_ex_idl::init ()
 {
   // First open the client-side header file for writing.
   int const status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp
index 8d7f3e298e7..f067a2b3650 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp
@@ -17,7 +17,7 @@ be_visitor_root_exh::be_visitor_root_exh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_exh::~be_visitor_root_exh (void)
+be_visitor_root_exh::~be_visitor_root_exh ()
 {
 }
 
@@ -46,7 +46,7 @@ be_visitor_root_exh::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_exh::init (void)
+be_visitor_root_exh::init ()
 {
   // First open the client-side header file for writing.
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp
index 23b8f6a90cc..0f4fed06651 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp
@@ -17,7 +17,7 @@ be_visitor_root_exs::be_visitor_root_exs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_exs::~be_visitor_root_exs (void)
+be_visitor_root_exs::~be_visitor_root_exs ()
 {
 }
 
@@ -46,7 +46,7 @@ be_visitor_root_exs::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_exs::init (void)
+be_visitor_root_exs::init ()
 {
   // First open the client-side header file for writing.
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp
index a587795780a..79153d5c5f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp
@@ -16,7 +16,7 @@ be_visitor_root_ih::be_visitor_root_ih (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_ih::~be_visitor_root_ih (void)
+be_visitor_root_ih::~be_visitor_root_ih ()
 {
 }
 
@@ -46,7 +46,7 @@ be_visitor_root_ih::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_ih::init (void)
+be_visitor_root_ih::init ()
 {
   /// First open the implementation header file for writing.
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp
index 702037acb05..59cf3774f95 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp
@@ -15,7 +15,7 @@ be_visitor_root_is::be_visitor_root_is (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_is::~be_visitor_root_is (void)
+be_visitor_root_is::~be_visitor_root_is ()
 {
 }
 
@@ -42,7 +42,7 @@ be_visitor_root_is::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_is::init (void)
+be_visitor_root_is::init ()
 {
   /// First open the file for writing.
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
index 4439ce8e8d9..86a90fb6c77 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
@@ -16,7 +16,7 @@ be_visitor_root_sh::be_visitor_root_sh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_sh::~be_visitor_root_sh (void)
+be_visitor_root_sh::~be_visitor_root_sh ()
 {
 }
 
@@ -62,7 +62,7 @@ be_visitor_root_sh::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_sh::init (void)
+be_visitor_root_sh::init ()
 {
   /// First open the server-side file for writing
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
index 7155616850e..b9eac55f549 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
@@ -16,7 +16,7 @@ be_visitor_root_ss::be_visitor_root_ss (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_ss::~be_visitor_root_ss (void)
+be_visitor_root_ss::~be_visitor_root_ss ()
 {
 }
 
@@ -50,7 +50,7 @@ be_visitor_root_ss::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_ss::init (void)
+be_visitor_root_ss::init ()
 {
   /// First open the server-side file for writing
   int status =
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 64fee51a744..99b145d6462 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -16,7 +16,7 @@ be_visitor_root_sth::be_visitor_root_sth (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_sth::~be_visitor_root_sth (void)
+be_visitor_root_sth::~be_visitor_root_sth ()
 {
 }
 
@@ -127,7 +127,7 @@ be_visitor_root_sth::visit_component (be_component *node)
 }
 
 int
-be_visitor_root_sth::init (void)
+be_visitor_root_sth::init ()
 {
   /// First open the server-side file for writing
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp
index db753dffb12..f9f8f0c392d 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp
@@ -16,7 +16,7 @@ be_visitor_root_svh::be_visitor_root_svh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_svh::~be_visitor_root_svh (void)
+be_visitor_root_svh::~be_visitor_root_svh ()
 {
 }
 
@@ -45,7 +45,7 @@ be_visitor_root_svh::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_svh::init (void)
+be_visitor_root_svh::init ()
 {
   /// First open the file for writing.
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp
index 900b7854b0a..c95f57595e4 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp
@@ -16,7 +16,7 @@ be_visitor_root_svs::be_visitor_root_svs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_svs::~be_visitor_root_svs (void)
+be_visitor_root_svs::~be_visitor_root_svs ()
 {
 }
 
@@ -45,7 +45,7 @@ be_visitor_root_svs::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_svs::init (void)
+be_visitor_root_svs::init ()
 {
   // First open the ciao servant source file for writing.
   int const status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp
index 78f75df71a0..e235b9255c2 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp
@@ -16,7 +16,7 @@ be_visitor_root_svth::be_visitor_root_svth (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_svth::~be_visitor_root_svth (void)
+be_visitor_root_svth::~be_visitor_root_svth ()
 {
 }
 
@@ -45,7 +45,7 @@ be_visitor_root_svth::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_svth::init (void)
+be_visitor_root_svth::init ()
 {
   /// First open the file for writing.
   int const status =
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp
index d6232163125..44d063f3df1 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp
@@ -16,7 +16,7 @@ be_visitor_root_svts::be_visitor_root_svts (be_visitor_context *ctx)
 {
 }
 
-be_visitor_root_svts::~be_visitor_root_svts (void)
+be_visitor_root_svts::~be_visitor_root_svts ()
 {
 }
 
@@ -45,7 +45,7 @@ be_visitor_root_svts::visit_root (be_root *node)
 }
 
 int
-be_visitor_root_svts::init (void)
+be_visitor_root_svts::init ()
 {
   // First open the client-side header file for writing.
   int status =
diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp
index c2902c45dc5..e67a1afe354 100644
--- a/TAO/TAO_IDL/be/be_visitor_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp
@@ -29,7 +29,7 @@ be_visitor_scope::be_visitor_scope (be_visitor_context *ctx)
 {
 }
 
-be_visitor_scope::~be_visitor_scope (void)
+be_visitor_scope::~be_visitor_scope ()
 {
 }
 
@@ -37,7 +37,7 @@ be_visitor_scope::~be_visitor_scope (void)
 int
 be_visitor_scope::visit_scope (be_scope *node)
 {
-  if (node == 0)
+  if (node == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                         "(%N:%l) be_visitor_scope::visit_scope - "
@@ -54,7 +54,7 @@ be_visitor_scope::visit_scope (be_scope *node)
     {
       AST_Decl *d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::visit_scope - "
@@ -67,7 +67,7 @@ be_visitor_scope::visit_scope (be_scope *node)
           continue;
         }
 
-      be_decl *bd = be_decl::narrow_from_decl (d);
+      be_decl *bd = dynamic_cast<be_decl*> (d);
 
       // Set the scope node as "node" in which the code is being
       // generated so that elements in the node's scope can use it
@@ -88,7 +88,7 @@ be_visitor_scope::visit_scope (be_scope *node)
         }
 
       // Send the visitor.
-      if (bd == 0 || bd->accept (this) == -1)
+      if (bd == nullptr || bd->accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::visit_scope - "
@@ -122,7 +122,7 @@ be_visitor_scope::pre_process (be_decl *)
 }
 
 int
-be_visitor_scope::elem_number (void)
+be_visitor_scope::elem_number ()
 {
   // Return the current element that we are working on.
   return this->elem_number_;
@@ -134,14 +134,14 @@ be_visitor_scope::next_elem (be_decl *elem,
                              be_decl *&successor)
 {
   be_decl *ctx_scope = this->ctx_->scope ()->decl ();
-  be_scope *node = 0;
+  be_scope *node = nullptr;
 
-  if (ctx_scope != 0)
+  if (ctx_scope != nullptr)
     {
       node = ctx_scope->scope ();
     }
 
-  if (ctx_scope == 0 || node == 0)
+  if (ctx_scope == nullptr || node == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_scope::next_elem - "
@@ -149,16 +149,16 @@ be_visitor_scope::next_elem (be_decl *elem,
                         -1);
     }
 
-  successor = 0;
+  successor = nullptr;
 
   // Initialize an iterator to iterate thru our scope.
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
        !si.is_done ();
        si.next ())
     {
-      be_decl *bd = be_decl::narrow_from_decl (si.item ());
+      be_decl *bd = dynamic_cast<be_decl*> (si.item ());
 
-      if (bd == 0)
+      if (bd == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::next_elem - "
@@ -180,9 +180,9 @@ be_visitor_scope::next_elem (be_decl *elem,
           return 0;
         }
 
-      successor = be_decl::narrow_from_decl (si.item ());
+      successor = dynamic_cast<be_decl*> (si.item ());
 
-      if (successor == 0)
+      if (successor == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::next_elem - "
@@ -200,24 +200,24 @@ be_visitor_scope::next_elem (be_decl *elem,
 bool
 be_visitor_scope::last_node (be_decl *bd)
 {
-  be_decl *next = 0;
+  be_decl *next = nullptr;
   (void) this->next_elem (bd,
                           next);
 
-  return (next == 0);
+  return (next == nullptr);
 }
 
 bool
 be_visitor_scope::last_inout_or_out_node (be_decl *)
 {
   // Return true if we are the last inout or out argument.
-  be_decl *next = 0;
+  be_decl *next = nullptr;
   (void) this->next_elem (this->ctx_->node (),
                           next);
 
-  while (next != 0)
+  while (next != nullptr)
     {
-      be_argument *arg = be_argument::narrow_from_decl (next);
+      be_argument *arg = dynamic_cast<be_argument*> (next);
 
       if (arg->direction () == AST_Argument::dir_INOUT
           || arg->direction () == AST_Argument::dir_OUT)
@@ -226,7 +226,7 @@ be_visitor_scope::last_inout_or_out_node (be_decl *)
           return false;
         }
 
-      be_decl *next_next = 0;
+      be_decl *next_next = nullptr;
       this->next_elem (next,
                        next_next);
 
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 9c927db93be..5cc90dcf290 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
@@ -18,7 +18,7 @@ be_visitor_sequence_any_op_ch::be_visitor_sequence_any_op_ch (
 {
 }
 
-be_visitor_sequence_any_op_ch::~be_visitor_sequence_any_op_ch (void)
+be_visitor_sequence_any_op_ch::~be_visitor_sequence_any_op_ch ()
 {
 }
 
@@ -55,7 +55,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
   if (alt)
     {
       be_type *bt =
-        be_type::narrow_from_decl (node->base_type ());
+        dynamic_cast<be_type*> (node->base_type ());
 
       name = "std::vector<";
       name += bt->full_name ();
@@ -66,7 +66,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
       name = node->full_name ();
     }
 
-  be_module *module = 0;
+  be_module *module = nullptr;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -76,7 +76,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -86,7 +86,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
@@ -150,7 +150,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
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 ff3efd24709..a49fdcbeeb6 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
@@ -18,7 +18,7 @@ be_visitor_sequence_any_op_cs::be_visitor_sequence_any_op_cs (
 {
 }
 
-be_visitor_sequence_any_op_cs::~be_visitor_sequence_any_op_cs (void)
+be_visitor_sequence_any_op_cs::~be_visitor_sequence_any_op_cs ()
 {
 }
 
@@ -50,11 +50,11 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   if (be_global->alt_mapping () && node->max_size ()->ev ()->u.ulval == 0)
     {
       be_type *bt =
-        be_type::narrow_from_decl (node->base_type ());
+        dynamic_cast<be_type*> (node->base_type ());
 
       if (bt->node_type () == AST_Decl::NT_typedef)
         {
-          be_typedef *td = be_typedef::narrow_from_decl (bt);
+          be_typedef *td = dynamic_cast<be_typedef*> (bt);
           bt = td->primitive_base_type ();
         }
 
@@ -71,8 +71,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
         {
           tc = ANY_ARRAY;
         }
-      else if (be_interface::narrow_from_decl (bt) != 0
-               && be_valuetype::narrow_from_decl (bt) == 0)
+      else if (dynamic_cast<be_interface*> (bt) != nullptr
+               && dynamic_cast<be_valuetype*> (bt) == nullptr)
         {
           tc = ANY_OBJREF;
         }
@@ -184,7 +184,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   // for the TypeCode to pass to the Any operator impls.
   be_typedef *td = this->ctx_->tdef ();
 
-  be_module *module = 0;
+  be_module *module = nullptr;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -194,7 +194,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -204,7 +204,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
@@ -224,7 +224,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
+              << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
               << "_tao_elem);" << be_uidt
               << be_uidt_nl
               << "}" << be_nl_2;
@@ -240,7 +240,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
+              << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
               << "_tao_elem);" << be_uidt
               << be_uidt_nl
               << "}" << be_nl_2;
@@ -256,7 +256,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << be_idt_nl
               << "_tao_any," << be_nl
               << "::"  <<  node->name () << "::_tao_any_destructor," << be_nl
-              << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
+              << "::" << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
               << "_tao_elem);" << be_uidt
               << be_uidt_nl
               << "}";
@@ -283,7 +283,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
-      << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
+      << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
       << "_tao_elem);" << be_uidt
       << be_uidt_nl
       << "}" << be_nl_2;
@@ -299,7 +299,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
-      << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
+      << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl
       << "_tao_elem);" << be_uidt
       << be_uidt_nl
       << "}" << be_nl_2;
@@ -315,14 +315,14 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
-      << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << 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 != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
index b8b8398c3bd..932929e7425 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
@@ -22,7 +22,7 @@ be_visitor_sequence_buffer_type::be_visitor_sequence_buffer_type (
 {
 }
 
-be_visitor_sequence_buffer_type::~be_visitor_sequence_buffer_type (void)
+be_visitor_sequence_buffer_type::~be_visitor_sequence_buffer_type ()
 {
 }
 
@@ -31,7 +31,7 @@ int
 be_visitor_sequence_buffer_type::visit_node (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -269,6 +269,6 @@ be_visitor_sequence_buffer_type::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   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 ffe0da6995d..0dd0d3522b7 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
@@ -23,7 +23,7 @@ be_visitor_sequence_cdr_op_ch::be_visitor_sequence_cdr_op_ch (
 {
 }
 
-be_visitor_sequence_cdr_op_ch::~be_visitor_sequence_cdr_op_ch (void)
+be_visitor_sequence_cdr_op_ch::~be_visitor_sequence_cdr_op_ch ()
 {
 }
 
@@ -42,7 +42,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
       return 0;
     }
 
-  be_type *base_type = be_type::narrow_from_decl (node->base_type ());
+  be_type *base_type = dynamic_cast<be_type*> (node->base_type ());
 
   // If our base type is an anonymous sequence, generate code for it here.
   if (base_type->node_type () == AST_Decl::NT_sequence)
@@ -58,15 +58,15 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_type *bt = be_type::narrow_from_decl (node);
-  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
+  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__;
 
   // If we're an anonymous sequence, we must protect against
   // being declared more than once.
-  if (tdef == 0)
+  if (tdef == nullptr)
     {
       *os << "\n\n#if !defined _TAO_CDR_OP_"
           << node->flat_name () << "_H_"
@@ -122,12 +122,12 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
   *os << be_nl
       << be_global->core_versioning_end () << be_nl;
 
-  if (tdef == 0)
+  if (tdef == nullptr)
     {
       *os << "\n\n#endif /* _TAO_CDR_OP_"
           << node->flat_name () << "_H_ */";
     }
 
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
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 a5b3d008e81..e54fa0d0c03 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
@@ -24,7 +24,7 @@ be_visitor_sequence_cdr_op_cs::be_visitor_sequence_cdr_op_cs (
 {
 }
 
-be_visitor_sequence_cdr_op_cs::~be_visitor_sequence_cdr_op_cs (void)
+be_visitor_sequence_cdr_op_cs::~be_visitor_sequence_cdr_op_cs ()
 {
 }
 
@@ -55,7 +55,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   be_type *bt =
-    be_type::narrow_from_decl (node->base_type ());
+    dynamic_cast<be_type*> (node->base_type ());
 
   if (!bt)
     {
@@ -203,7 +203,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       << "#endif /* _TAO_CDR_OP_"
       << node->flat_name () << "_CPP_ */";
 
-  node->cli_stub_cdr_op_gen (1);
+  node->cli_stub_cdr_op_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
index 6602ec8030e..b4257eb0324 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
@@ -21,7 +21,7 @@ be_visitor_sequence_base::be_visitor_sequence_base (be_visitor_context *ctx)
 {
 }
 
-be_visitor_sequence_base::~be_visitor_sequence_base (void)
+be_visitor_sequence_base::~be_visitor_sequence_base ()
 {
 }
 
@@ -41,7 +41,7 @@ int
 be_visitor_sequence_base::visit_node (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -172,7 +172,7 @@ be_visitor_sequence_base::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -186,7 +186,7 @@ be_visitor_sequence_base_template_args (be_visitor_context *ctx,
 
 
 be_visitor_sequence_base_template_args::
-~be_visitor_sequence_base_template_args (void)
+~be_visitor_sequence_base_template_args ()
 {
 }
 
@@ -194,7 +194,7 @@ int
 be_visitor_sequence_base_template_args::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -225,7 +225,7 @@ be_visitor_sequence_base_template_args::visit_interface_fwd (
   )
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
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 6606887c9f8..dcd96d21466 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -17,13 +17,13 @@ be_visitor_sequence_ch::be_visitor_sequence_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_sequence_ch::~be_visitor_sequence_ch (void)
+be_visitor_sequence_ch::~be_visitor_sequence_ch ()
 {
 }
 
 int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 {
-  if (node->defined_in () == 0)
+  if (node->defined_in () == nullptr)
     {
       // The node is a nested sequence, and has had no scope defined.
       node->set_defined_in (DeclAsScope (this->ctx_->scope ()->decl ()));
@@ -55,9 +55,9 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 
   // Retrieve the base type since we may need to do some code
   // generation for the base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_sequence_ch::")
@@ -77,7 +77,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       // to create_name will not get confused and give our anonymous
       // sequence element type the same name as we have.
       be_typedef *tmp = this->ctx_->tdef ();
-      this->ctx_->tdef (0);
+      this->ctx_->tdef (nullptr);
 
       if (bt->accept (this) != 0)
         {
@@ -133,12 +133,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       /// and _outs. They may get redefined and reinstated later.
       if (!be_global->alt_mapping () || !node->unbounded ())
         {
-          if (this->ctx_->tdef () != 0)
+          if (this->ctx_->tdef () != nullptr)
             {
               *os << "class " << node->local_name () << ";";
             }
 
-          if (this->ctx_->tdef () != 0)
+          if (this->ctx_->tdef () != nullptr)
             {
               this->gen_varout_typedefs (node, bt);
             }
@@ -195,7 +195,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
           << "public:" << be_idt;
 
       *os << be_nl
-          << node->local_name () << " (void);";
+          << node->local_name () << " ();";
 
       if (node->unbounded ())
         {
@@ -238,23 +238,23 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       }
 
       // Default copy/move constructor and assignment operators
-      *os << "\n#if defined (ACE_HAS_CPP11)" << be_nl
+      *os << be_nl
           << node->local_name () << " (const " << node->local_name () << " &) = default;" << be_nl
           << node->local_name () << " (" << node->local_name () << " &&) = default;" << be_nl
           << node->local_name () << "& operator= (const " << node->local_name () << " &) = default;" << be_nl
           << node->local_name () << "& operator= (" << node->local_name () << " &&) = default;"
-          << "\n#endif /* ACE_HAS_CPP11 */" << be_nl;
+          << be_nl;
 
-      *os << "virtual ~" << node->local_name () << " (void);";
+      *os << "virtual ~" << node->local_name () << " ();";
 
       if (be_global->alt_mapping () && node->unbounded ())
         {
           *os << be_nl_2
-              << "virtual ::CORBA::ULong length (void) const;"
+              << "virtual ::CORBA::ULong length () const;"
               << be_nl
               << "virtual void length (::CORBA::ULong);"
               << be_nl_2
-              << "virtual ::CORBA::ULong maximum (void) const;";
+              << "virtual ::CORBA::ULong maximum () const;";
         }
 
       *os << be_nl;
@@ -263,28 +263,28 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 
       // TAO provides extensions for octet sequences, first find out if
       // the base type is an octet (or an alias for octet).
-      be_predefined_type *predef = 0;
+      be_predefined_type *predef = nullptr;
 
       if (bt->base_node_type () == AST_Type::NT_pre_defined)
         {
           be_typedef* alias =
-                be_typedef::narrow_from_decl (bt);
+                dynamic_cast<be_typedef*> (bt);
 
-          if (alias == 0)
+          if (alias == nullptr)
             {
-              predef = be_predefined_type::narrow_from_decl (bt);
+              predef = dynamic_cast<be_predefined_type*> (bt);
             }
           else
             {
               predef =
-                be_predefined_type::narrow_from_decl (
+                dynamic_cast<be_predefined_type*> (
                     alias->primitive_base_type ()
                   );
             }
         }
 
       // Now generate the extension...
-      if (predef != 0
+      if (predef != nullptr
           && predef->pt () == AST_PredefinedType::PT_octet
           && node->unbounded ()
           && !be_global->alt_mapping ())
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 f06f0bf1693..978866d68b5 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -20,7 +20,7 @@ be_visitor_sequence_cs::be_visitor_sequence_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_sequence_cs::~be_visitor_sequence_cs (void)
+be_visitor_sequence_cs::~be_visitor_sequence_cs ()
 {
 }
 
@@ -53,9 +53,9 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
       return 0;
     }
 
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_sequence_cs::")
@@ -74,7 +74,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
       // to create_name will not get confused and give our anonymous
       // sequence element type the same name as we have.
       be_typedef *tmp = this->ctx_->tdef ();
-      this->ctx_->tdef (0);
+      this->ctx_->tdef (nullptr);
 
       if (bt->accept (this) != 0)
         {
@@ -109,7 +109,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
   // default constructor
   *os << be_nl_2
       << node->name () << "::" << node->local_name ()
-      << " (void)" << be_nl
+      << " ()" << be_nl
       << "{}";
 
   // for unbounded sequences, we have a different set of constructors
@@ -204,14 +204,14 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
   // Destructor.
   *os << be_nl_2
       << node->name () << "::~" << node->local_name ()
-      << " (void)" << be_nl
+      << " ()" << be_nl
       << "{}";
 
   if (be_global->alt_mapping () && node->unbounded ())
     {
       *os << be_nl_2
           << "::CORBA::ULong" << be_nl
-          << node->name () << "::length (void) const" << be_nl
+          << node->name () << "::length () const" << be_nl
           << "{" << be_idt_nl
           << "return this->size ();" << be_uidt_nl
           << "}";
@@ -226,7 +226,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
 
       *os << be_nl_2
           << "::CORBA::ULong" << be_nl
-          << node->name () << "::maximum (void) const" << be_nl
+          << node->name () << "::maximum () const" << be_nl
           << "{" << be_idt_nl
           << "return this->capacity ();" << 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 bde9bfa0731..df8603b9463 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,7 +22,7 @@ be_visitor_structure_any_op_ch::be_visitor_structure_any_op_ch (
 {
 }
 
-be_visitor_structure_any_op_ch::~be_visitor_structure_any_op_ch (void)
+be_visitor_structure_any_op_ch::~be_visitor_structure_any_op_ch ()
 {
 }
 
@@ -41,7 +41,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -51,7 +51,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -61,7 +61,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
@@ -95,7 +95,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
@@ -110,17 +110,17 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
                         -1);
     }
 
-  node->cli_hdr_any_op_gen (1);
+  node->cli_hdr_any_op_gen (true);
   return 0;
 }
 
 int
 be_visitor_structure_any_op_ch::visit_field (be_field *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // First generate the type information.
-  bt = be_type::narrow_from_decl (node->field_type ());
+  bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
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 b938d981a43..aa234e85fa4 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,7 +23,7 @@ be_visitor_structure_any_op_cs::be_visitor_structure_any_op_cs (
 {
 }
 
-be_visitor_structure_any_op_cs::~be_visitor_structure_any_op_cs (void)
+be_visitor_structure_any_op_cs::~be_visitor_structure_any_op_cs ()
 {
 }
 
@@ -77,7 +77,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
     }
 
 
-  be_module *module = 0;
+  be_module *module = nullptr;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -87,7 +87,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
         {
           if (nt == AST_Decl::NT_module)
             {
-              module = be_module::narrow_from_decl (d);
+              module = dynamic_cast<be_module*> (d);
               break;
             }
           else
@@ -97,7 +97,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
             }
         }
 
-      if (module != 0)
+      if (module != nullptr)
         {
           // Some compilers handle "any" operators in a namespace corresponding
           // to their module, others do not.
@@ -213,7 +213,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
@@ -227,7 +227,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
                         -1);
     }
 
-  node->cli_stub_any_op_gen (1);
+  node->cli_stub_any_op_gen (true);
   return 0;
 }
 
@@ -235,7 +235,7 @@ int
 be_visitor_structure_any_op_cs::visit_field (be_field *node)
 {
   // First generate the type information.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
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 36eaa146bcd..4c873c0e7ec 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
@@ -23,7 +23,7 @@ be_visitor_structure_cdr_op_ch::be_visitor_structure_cdr_op_ch (
 {
 }
 
-be_visitor_structure_cdr_op_ch::~be_visitor_structure_cdr_op_ch (void)
+be_visitor_structure_cdr_op_ch::~be_visitor_structure_cdr_op_ch ()
 {
 }
 
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 ec8989e87b4..ed19672a653 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
@@ -17,7 +17,7 @@ be_visitor_structure_cdr_op_cs::be_visitor_structure_cdr_op_cs (
 {
 }
 
-be_visitor_structure_cdr_op_cs::~be_visitor_structure_cdr_op_cs (void)
+be_visitor_structure_cdr_op_cs::~be_visitor_structure_cdr_op_cs ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
index dc541350607..ecd2ee05479 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
@@ -16,7 +16,7 @@ be_visitor_structure::be_visitor_structure (be_visitor_context *ctx)
 {
 }
 
-be_visitor_structure::~be_visitor_structure (void)
+be_visitor_structure::~be_visitor_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 b9cffa5a891..24bbbdf3550 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
@@ -20,7 +20,7 @@ be_visitor_structure_ch::be_visitor_structure_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_structure_ch::~be_visitor_structure_ch (void)
+be_visitor_structure_ch::~be_visitor_structure_ch ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
index 4074e0c5d54..2814fa8ff44 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
@@ -20,7 +20,7 @@ be_visitor_structure_ci::be_visitor_structure_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_structure_ci::~be_visitor_structure_ci (void)
+be_visitor_structure_ci::~be_visitor_structure_ci ()
 {
 }
 
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 7800264a0dc..29028da44cb 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -20,7 +20,7 @@ be_visitor_structure_cs::be_visitor_structure_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_structure_cs::~be_visitor_structure_cs (void)
+be_visitor_structure_cs::~be_visitor_structure_cs ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
index eef782f6182..6bbe50fb757 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
@@ -17,7 +17,7 @@ be_visitor_structure_fwd_ch::be_visitor_structure_fwd_ch (
 {
 }
 
-be_visitor_structure_fwd_ch::~be_visitor_structure_fwd_ch (void)
+be_visitor_structure_fwd_ch::~be_visitor_structure_fwd_ch ()
 {
 }
 
@@ -33,7 +33,7 @@ be_visitor_structure_fwd_ch::visit_structure_fwd (be_structure_fwd *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   be_structure *fd =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   // This will be a no-op if it has already been done for this node.
   fd->gen_common_varout (os);
diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
index 47205281d4d..59dce19e81c 100644
--- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
@@ -25,7 +25,7 @@ be_visitor_template_export::be_visitor_template_export (
 {
 }
 
-be_visitor_template_export::~be_visitor_template_export (void)
+be_visitor_template_export::~be_visitor_template_export ()
 {
 }
 
@@ -71,32 +71,32 @@ be_visitor_template_export::visit_sequence (be_sequence *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
   // TAO provides extensions for octet sequences, first find out if
   // the base type is an octet (or an alias for octet).
-  be_predefined_type *predef = 0;
+  be_predefined_type *predef = nullptr;
 
   if (bt->base_node_type () == AST_Type::NT_pre_defined)
     {
       be_typedef* alias =
-            be_typedef::narrow_from_decl (bt);
+            dynamic_cast<be_typedef*> (bt);
 
-      if (alias == 0)
+      if (alias == nullptr)
         {
-          predef = be_predefined_type::narrow_from_decl (bt);
+          predef = dynamic_cast<be_predefined_type*> (bt);
         }
       else
         {
           predef =
-            be_predefined_type::narrow_from_decl (
+            dynamic_cast<be_predefined_type*> (
                 alias->primitive_base_type ()
               );
         }
     }
 
   // When it is a sequence add a special guard
-  if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet
+  if (predef != nullptr && predef->pt () == AST_PredefinedType::PT_octet
       && node->unbounded ())
     {
       *os << "\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 0)";
@@ -119,7 +119,7 @@ be_visitor_template_export::visit_sequence (be_sequence *node)
 
   *os << ";" << be_uidt;
 
-  if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet
+  if (predef != nullptr && predef->pt () == AST_PredefinedType::PT_octet
       && node->unbounded ())
     {
       *os << "\n#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 0 */";
@@ -143,6 +143,6 @@ be_visitor_template_export::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp
index cd0c733da33..ae8161b414b 100644
--- a/TAO/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp
@@ -44,7 +44,7 @@ be_visitor_traits::be_visitor_traits (be_visitor_context *ctx)
 {
 }
 
-be_visitor_traits::~be_visitor_traits (void)
+be_visitor_traits::~be_visitor_traits ()
 {
 }
 
@@ -132,7 +132,7 @@ be_visitor_traits::visit_interface (be_interface *node)
           << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl
           << "static void release (" << be_idt << be_idt_nl
           << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl
-          << "static ::" << fname << "_ptr nil (void);" << 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
@@ -161,7 +161,7 @@ be_visitor_traits::visit_interface_fwd (be_interface_fwd *node)
     }
 
   be_interface *fd =
-    be_interface::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_interface*> (node->full_definition ());
 
   // We want to generate just the declaration of the Arg_Traits<>
   // specialization if the interface is forward declared but not defined.
@@ -234,7 +234,7 @@ be_visitor_traits::visit_valuetype_fwd (be_valuetype_fwd *node)
     }
 
   be_valuetype *fd =
-    be_valuetype::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_valuetype*> (node->full_definition ());
 
   // The logic in visit_valuetype() should handle what gets generated
   // and what doesn't.
@@ -320,7 +320,7 @@ be_visitor_traits::visit_eventtype_fwd (be_eventtype_fwd *node)
 int
 be_visitor_traits::visit_field (be_field *node)
 {
-  be_type *ft = be_type::narrow_from_decl (node->field_type ());
+  be_type *ft = dynamic_cast<be_type*> (node->field_type ());
 
   if (ft->accept (this) == -1)
     {
@@ -336,7 +336,7 @@ be_visitor_traits::visit_field (be_field *node)
 int
 be_visitor_traits::visit_union_branch (be_union_branch *node)
 {
-  be_type *ft = be_type::narrow_from_decl (node->field_type ());
+  be_type *ft = dynamic_cast<be_type*> (node->field_type ());
   AST_Decl::NodeType nt = ft->node_type ();
 
   // All we are trying to catch in here are anonymous array members.
@@ -411,7 +411,7 @@ be_visitor_traits::visit_array (be_array *node)
   if (node->is_nested ())
     {
       be_decl *parent =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
+        dynamic_cast<be_scope*> (node->defined_in ())->decl ();
       name_holder = parent->full_name ();
 
       name_holder += "::";
@@ -454,7 +454,7 @@ be_visitor_traits::visit_array (be_array *node)
       << "const " << name << "_slice * _tao_from);"
       << be_uidt
       << be_uidt_nl
-      << "static " << name << "_slice * alloc (void);"
+      << "static " << name << "_slice * alloc ();"
       << be_nl
       << "static void zero (" << be_idt << be_idt_nl
       << name << "_slice * _tao_slice);"
@@ -485,7 +485,7 @@ be_visitor_traits::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   node->cli_traits_gen (true);
   return 0;
 }
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 6e655d80b99..59636667018 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
@@ -21,7 +21,7 @@ TAO::be_visitor_alias_typecode::be_visitor_alias_typecode (
 int
 TAO::be_visitor_alias_typecode::visit_typedef (be_typedef * node)
 {
-  be_type * const base = be_type::narrow_from_decl (node->base_type ());
+  be_type * const base = dynamic_cast<be_type*> (node->base_type ());
 
 
   return this->common (node, base, "tk_alias");
@@ -32,7 +32,7 @@ TAO::be_visitor_alias_typecode::visit_typedef (be_typedef * node)
 int
 TAO::be_visitor_alias_typecode::visit_valuebox (be_valuebox * node)
 {
-  be_type * const base = be_type::narrow_from_decl (node->boxed_type ());
+  be_type * const base = dynamic_cast<be_type*> (node->boxed_type ());
 
   return this->common (node, base, "tk_value_box");
 }
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 87f980a3a57..1e641558d78 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
@@ -76,7 +76,7 @@ TAO::be_visitor_enum_typecode::visit_members (be_enum * node)
        i.next ())
     {
       AST_Decl * const d = i.item  ();
-      AST_EnumVal * const item = AST_EnumVal::narrow_from_decl (d);
+      AST_EnumVal * const item = dynamic_cast<AST_EnumVal*> (d);
 
       // os << item->name ();
       os << "\"" << item->original_local_name () << "\"";
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 9209875fc37..74177b36dbc 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
@@ -30,7 +30,7 @@ TAO::be_visitor_objref_typecode::visit_interface (be_interface * node)
   static char const local_interface[]    = "local_interface";
   static char const objref[]             = "objref";
 
-  char const * kind = 0;
+  char const * kind = nullptr;
 
   if (dynamic_cast<be_component *> (node))
     kind = component;
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 d17c4be7e1b..ff909252566 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
@@ -39,7 +39,7 @@ TAO::be_visitor_struct_typecode::visit_structure (be_structure * node)
       // we're repeated and we're recursive so just leave
       return 0;
     }
-  else if (this->queue_insert (this->tc_queue_, node, 0) == 0)
+  else if (this->queue_insert (this->tc_queue_, node, 0) == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_struct_typecode::"
@@ -164,7 +164,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
      << node->nfields () << ");"
      << be_uidt_nl << be_nl;
 
-  if (this->gen_typecode_ptr (be_type::narrow_from_decl (node)) != 0)
+  if (this->gen_typecode_ptr (dynamic_cast<be_type*> (node)) != 0)
     {
       return -1;
     }
@@ -175,7 +175,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
 int
 TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
 {
-  AST_Field ** member_ptr = 0;
+  AST_Field ** member_ptr = nullptr;
   ACE_CDR::ULong const count = node->nfields ();
 
   for (ACE_CDR::ULong i = 0; i < count; ++i)
@@ -183,7 +183,7 @@ TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
       node->field (member_ptr, i);
 
       be_type * const member_type =
-        be_type::narrow_from_decl ((*member_ptr)->field_type ());
+        dynamic_cast<be_type*> ((*member_ptr)->field_type ());
 
       if (this->is_typecode_generation_required (member_type)
           && member_type->accept (this) != 0)
@@ -194,7 +194,7 @@ TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
 /*  MCO@20101020 - this is unnecessary since the check for recursiveness
  *  of *this* typecode has already been done before calling this method
 
-      be_structure *bs = be_structure::narrow_from_decl (node);
+      be_structure *bs = dynamic_cast<be_structure*> (node);
       if (bs)
         {
           be_visitor_typecode_defn::QNode const * const qnode =
@@ -217,7 +217,7 @@ TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
 int
 TAO::be_visitor_struct_typecode::visit_members (AST_Structure * node)
 {
-  AST_Field ** member_ptr = 0;
+  AST_Field ** member_ptr = nullptr;
   ACE_CDR::ULong const count = node->nfields ();
   TAO_OutStream & os = *this->ctx_->stream ();
 
@@ -226,10 +226,10 @@ TAO::be_visitor_struct_typecode::visit_members (AST_Structure * node)
       node->field (member_ptr, i);
 
       be_decl * const member_decl =
-        be_decl::narrow_from_decl (*member_ptr);
+        dynamic_cast<be_decl*> (*member_ptr);
 
       be_type * const member_type =
-        be_type::narrow_from_decl ((*member_ptr)->field_type ());
+        dynamic_cast<be_type*> ((*member_ptr)->field_type ());
 
       os << "{ "
          << "\"" << member_decl->original_local_name () << "\", "
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 b07080f85ab..46b547a446b 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
@@ -21,7 +21,7 @@ be_visitor_typecode_decl::be_visitor_typecode_decl (be_visitor_context *ctx)
     }
 }
 
-be_visitor_typecode_decl::~be_visitor_typecode_decl (void)
+be_visitor_typecode_decl::~be_visitor_typecode_decl ()
 {
 }
 
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 e9dcd3b4ee5..9696d002830 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -18,7 +18,7 @@ class Scoped_Compute_Queue_Guard
 {
 public:
   Scoped_Compute_Queue_Guard (be_visitor_typecode_defn* );
-  ~Scoped_Compute_Queue_Guard (void);
+  ~Scoped_Compute_Queue_Guard ();
 
 private:
   be_visitor_typecode_defn* customer_;
@@ -29,7 +29,7 @@ Scoped_Compute_Queue_Guard::Scoped_Compute_Queue_Guard (
   )
   :customer_ (customer)
 {
-  if (customer_ != 0)
+  if (customer_ != nullptr)
     {
       // Reset the compute queue to set the stage for computing our
       // encapsulation length.
@@ -37,9 +37,9 @@ Scoped_Compute_Queue_Guard::Scoped_Compute_Queue_Guard (
     }
 }
 
-Scoped_Compute_Queue_Guard::~Scoped_Compute_Queue_Guard (void)
+Scoped_Compute_Queue_Guard::~Scoped_Compute_Queue_Guard ()
 {
-  if (customer_ != 0)
+  if (customer_ != nullptr)
     {
       // Reset the compute queue since we must not affect computation of other
       // nodes.
@@ -70,7 +70,7 @@ be_visitor_typecode_defn::be_visitor_typecode_defn (be_visitor_context * ctx)
     }
 }
 
-be_visitor_typecode_defn::~be_visitor_typecode_defn (void)
+be_visitor_typecode_defn::~be_visitor_typecode_defn ()
 {
   this->queue_reset (this->tc_queue_);
   this->queue_reset (this->compute_queue_);
@@ -98,9 +98,9 @@ be_visitor_typecode_defn::gen_typecode_ptr (be_type * node)
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
       be_module * const module =
-        be_module::narrow_from_scope (node->defined_in ());
+        dynamic_cast<be_module*> (node->defined_in ());
 
-      if (module == 0)
+      if (module == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_typecode_defn::")
@@ -188,9 +188,9 @@ be_visitor_typecode_defn::gen_forward_declared_typecode (be_type * node)
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
       be_module * const module =
-        be_module::narrow_from_scope (node->defined_in ());
+        dynamic_cast<be_module*> (node->defined_in ());
 
-      if (module == 0)
+      if (module == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_typecode_defn::")
@@ -238,7 +238,7 @@ be_visitor_typecode_defn::is_typecode_generation_required (be_type * node)
                                                          true);
 
       be_interface * const intf =
-        d != 0 ? be_interface::narrow_from_decl (d) : 0;
+        d != nullptr ? dynamic_cast<be_interface*> (d) : nullptr;
 
       if (intf && intf->is_defined ())
         {
@@ -251,7 +251,7 @@ be_visitor_typecode_defn::is_typecode_generation_required (be_type * node)
       // structures and unions
 
       AST_Structure * const st =
-        AST_Structure::narrow_from_decl (node);
+        dynamic_cast<AST_Structure*> (node);
 
       if (st && st->is_defined ())
         {
@@ -263,7 +263,7 @@ be_visitor_typecode_defn::is_typecode_generation_required (be_type * node)
 }
 
 void
-be_visitor_typecode_defn::gen_begin_NS_for_anon (void)
+be_visitor_typecode_defn::gen_begin_NS_for_anon ()
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
@@ -276,7 +276,7 @@ be_visitor_typecode_defn::gen_begin_NS_for_anon (void)
 }
 
 void
-be_visitor_typecode_defn::gen_end_NS_for_anon (void)
+be_visitor_typecode_defn::gen_end_NS_for_anon ()
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
@@ -289,7 +289,7 @@ be_visitor_typecode_defn::gen_end_NS_for_anon (void)
 int
 be_visitor_typecode_defn::visit_array (be_array *node)
 {
-  be_type * const base = be_type::narrow_from_decl (node->base_type ());
+  be_type * const base = dynamic_cast<be_type*> (node->base_type ());
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
@@ -452,7 +452,7 @@ be_visitor_typecode_defn::visit_interface_fwd (be_interface_fwd * node)
 int
 be_visitor_typecode_defn::visit_sequence (be_sequence * node)
 {
-  be_type * const base = be_type::narrow_from_decl (node->base_type ());
+  be_type * const base = dynamic_cast<be_type*> (node->base_type ());
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
@@ -615,7 +615,7 @@ be_visitor_typecode_defn::visit_typedef (be_typedef * node)
   // visited are strings and sequences.  All others have their own
   // full-fledged visitors (e.g. objref_typecode, etc.)
 
-  be_type * const base = be_type::narrow_from_decl (node->base_type ());
+  be_type * const base = dynamic_cast<be_type*> (node->base_type ());
 
   this->recursion_detect_ = true;
 
@@ -711,9 +711,9 @@ be_visitor_typecode_defn::queue_insert (
     ACE_CDR::Long offset
   )
 {
-  be_visitor_typecode_defn::QNode *qnode = 0;
+  be_visitor_typecode_defn::QNode *qnode = nullptr;
 
-  ACE_NEW_RETURN (qnode, be_visitor_typecode_defn::QNode, 0);
+  ACE_NEW_RETURN (qnode, be_visitor_typecode_defn::QNode, nullptr);
 
   qnode->node = node;
   qnode->offset = offset;
@@ -741,8 +741,8 @@ be_visitor_typecode_defn::queue_lookup (
        !iter.done ();
        iter.advance ())
     {
-      be_visitor_typecode_defn::QNode **addr = 0;
-      be_visitor_typecode_defn::QNode *item = 0;
+      be_visitor_typecode_defn::QNode **addr = nullptr;
+      be_visitor_typecode_defn::QNode *item = nullptr;
       iter.next (addr);
       item = *addr;
 
@@ -754,7 +754,7 @@ be_visitor_typecode_defn::queue_lookup (
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 void
@@ -763,7 +763,7 @@ queue_reset (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> & queue)
 {
   while (!queue.is_empty ())
     {
-      be_visitor_typecode_defn::QNode * qnode = 0;
+      be_visitor_typecode_defn::QNode * qnode = nullptr;
       (void) queue.dequeue_head (qnode);
       delete qnode;
     }
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 8616f9212f5..4ed2f4d340a 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
@@ -39,7 +39,7 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
     // we're repeated and we're recursive so just leave
       return 0;
     }
-  else if (this->queue_insert (this->tc_queue_, node, 0) == 0)
+  else if (this->queue_insert (this->tc_queue_, node, 0) == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_typecode::"
@@ -65,9 +65,9 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   be_type * const discriminant_type =
-    be_type::narrow_from_decl (node->disc_type ());
+    dynamic_cast<be_type*> (node->disc_type ());
 
-  ACE_ASSERT (discriminant_type != 0);
+  ACE_ASSERT (discriminant_type != nullptr);
 
   if (this->gen_case_typecodes (node) != 0)
     {
@@ -121,7 +121,7 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
      << node->default_index () << ");" << be_uidt_nl
      << be_uidt_nl;
 
-  if (this->gen_typecode_ptr (be_type::narrow_from_decl (node)) != 0)
+  if (this->gen_typecode_ptr (dynamic_cast<be_type*> (node)) != 0)
     {
       return -1;
     }
@@ -132,7 +132,7 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
 int
 TAO::be_visitor_union_typecode::gen_case_typecodes (be_union * node)
 {
-  AST_Field ** member_ptr = 0;
+  AST_Field ** member_ptr = nullptr;
 
   ACE_CDR::ULong const count = node->nfields ();
 
@@ -141,7 +141,7 @@ TAO::be_visitor_union_typecode::gen_case_typecodes (be_union * node)
       node->field (member_ptr, i);
 
       be_type * const member_type =
-        be_type::narrow_from_decl ((*member_ptr)->field_type ());
+        dynamic_cast<be_type*> ((*member_ptr)->field_type ());
 
       if (this->is_typecode_generation_required (member_type)
           && member_type->accept (this) != 0)
@@ -175,7 +175,7 @@ TAO::be_visitor_union_typecode::visit_cases (be_union * node)
   // Generate array containing union case/branch characterstics.
 
   be_type * const discriminant_type =
-    be_type::narrow_from_decl (node->disc_type ());
+    dynamic_cast<be_type*> (node->disc_type ());
 
   ACE_CString tao_cases ("_tao_cases_");
   ACE_CString const fields_name (tao_cases
@@ -189,16 +189,16 @@ TAO::be_visitor_union_typecode::visit_cases (be_union * node)
   ACE_CDR::ULong const countFields = node->nfields ();
   for (ACE_CDR::ULong fieldNumber = 0u; fieldNumber < countFields; ++fieldNumber)
     {
-      AST_Field ** member_ptr = 0;
+      AST_Field ** member_ptr = nullptr;
       node->field (member_ptr, fieldNumber);
 
       be_type * const type =
-        be_type::narrow_from_decl ((*member_ptr)->field_type ());
+        dynamic_cast<be_type*> ((*member_ptr)->field_type ());
 
       be_union_branch * const branch =
-        be_union_branch::narrow_from_decl (*member_ptr);
+        dynamic_cast<be_union_branch*> (*member_ptr);
 
-      ACE_ASSERT (branch != 0);
+      ACE_ASSERT (branch != nullptr);
       ACE_CDR::ULong numberOfLabels = branch->label_list_length ();
 
       // Check for a default branch for the current union field.
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 6103a7de557..0fce2fa7734 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -39,7 +39,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
       // we're repeated and we're recursive so just leave
       return 0;
     }
-  else if (this->queue_insert (this->tc_queue_, node, 0) == 0)
+  else if (this->queue_insert (this->tc_queue_, node, 0) == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_value_typecode::"
@@ -155,7 +155,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
   if (concrete_base)
     {
       be_type * const base_type =
-        be_type::narrow_from_decl (concrete_base);
+        dynamic_cast<be_type*> (concrete_base);
 
       ACE_ASSERT (base_type);
 
@@ -172,7 +172,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
      << count << ");" << be_uidt_nl
      << be_uidt_nl;
 
-  if (this->gen_typecode_ptr (be_type::narrow_from_decl (node)) != 0)
+  if (this->gen_typecode_ptr (dynamic_cast<be_type*> (node)) != 0)
     {
       return -1;
     }
@@ -198,7 +198,7 @@ TAO::be_visitor_value_typecode::gen_member_typecodes (be_valuetype * node)
                             0);
         }
 
-      AST_Field * const field = AST_Field::narrow_from_decl (d);
+      AST_Field * const field = dynamic_cast<AST_Field*> (d);
 
       if (!field
           || field->visibility () == AST_Field::vis_NA)
@@ -207,7 +207,7 @@ TAO::be_visitor_value_typecode::gen_member_typecodes (be_valuetype * node)
         }
 
       be_type * const member_type =
-        be_type::narrow_from_decl (field->field_type ());
+        dynamic_cast<be_type*> (field->field_type ());
 
       if (this->is_typecode_generation_required (member_type)
           && member_type->accept (this) != 0)
@@ -259,7 +259,7 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node)
                              "bad node in this scope\n"), 0);
         }
 
-      AST_Field * const field = AST_Field::narrow_from_decl (d);
+      AST_Field * const field = dynamic_cast<AST_Field*> (d);
 
       if (!field)
         {
@@ -274,10 +274,10 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node)
         }
 
       be_decl * const member_decl =
-        be_decl::narrow_from_decl (field);
+        dynamic_cast<be_decl*> (field);
 
       be_type * const member_type =
-        be_type::narrow_from_decl (field->field_type ());
+        dynamic_cast<be_type*> (field->field_type ());
 
       os << "{ "
          << "\"" << member_decl->original_local_name () << "\", "
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
index 446cff9a3b0..4d3811f2e0a 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
@@ -21,7 +21,7 @@ be_visitor_typedef_any_op_ch::be_visitor_typedef_any_op_ch (
 {
 }
 
-be_visitor_typedef_any_op_ch::~be_visitor_typedef_any_op_ch (void)
+be_visitor_typedef_any_op_ch::~be_visitor_typedef_any_op_ch ()
 {
 }
 
@@ -60,7 +60,7 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node)
   // the type maybe. In the latter, we just need typedefs for the type and all
   // associated _var, _out, and other types.
 
-  be_type *bt = 0; // base type
+  be_type *bt = nullptr; // base type
 
   if (this->ctx_->tdef ())
     {
@@ -92,7 +92,7 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node)
                              "failed to accept visitor\n"),
                             -1);
         }
-      this->ctx_->alias (0); // reset
+      this->ctx_->alias (nullptr); // reset
     }
   else
     {
@@ -122,17 +122,17 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->tdef (0); // reset
+      this->ctx_->tdef (nullptr); // reset
     }
 
-  node->cli_hdr_any_op_gen (1);
+  node->cli_hdr_any_op_gen (true);
   return 0;
 }
 
 int
 be_visitor_typedef_any_op_ch::visit_array (be_array *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -163,7 +163,7 @@ be_visitor_typedef_any_op_ch::visit_array (be_array *node)
 int
 be_visitor_typedef_any_op_ch::visit_enum (be_enum *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -193,7 +193,7 @@ be_visitor_typedef_any_op_ch::visit_enum (be_enum *node)
 int
 be_visitor_typedef_any_op_ch::visit_sequence (be_sequence *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -223,7 +223,7 @@ be_visitor_typedef_any_op_ch::visit_sequence (be_sequence *node)
 int
 be_visitor_typedef_any_op_ch::visit_structure (be_structure *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -253,7 +253,7 @@ be_visitor_typedef_any_op_ch::visit_structure (be_structure *node)
 int
 be_visitor_typedef_any_op_ch::visit_union (be_union *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
index 3d3a68e300c..d42b9417928 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
@@ -22,7 +22,7 @@ be_visitor_typedef_any_op_cs::be_visitor_typedef_any_op_cs (
 {
 }
 
-be_visitor_typedef_any_op_cs::~be_visitor_typedef_any_op_cs (void)
+be_visitor_typedef_any_op_cs::~be_visitor_typedef_any_op_cs ()
 {
 }
 
@@ -59,7 +59,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node)
   // the type maybe. In the latter, we just need typedefs for the type and all
   // associated _var, _out, and other types.
 
-  be_type *bt = 0; // base type
+  be_type *bt = nullptr; // base type
 
   if (this->ctx_->tdef ())
     {
@@ -92,7 +92,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node)
                              ),  -1);
         }
 
-      this->ctx_->alias (0); // reset
+      this->ctx_->alias (nullptr); // reset
     }
   else
     {
@@ -101,7 +101,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node)
       this->ctx_->tdef (node); // save the typedef node
 
       // Grab the immediate base type node.
-      bt = be_type::narrow_from_decl (node->base_type ());
+      bt = dynamic_cast<be_type*> (node->base_type ());
 
       if (!bt)
         {
@@ -122,7 +122,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node)
                              ),  -1);
         }
 
-      this->ctx_->tdef (0); // Reset.
+      this->ctx_->tdef (nullptr); // Reset.
     }
 
   node->cli_stub_any_op_gen (true);
@@ -132,7 +132,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node)
 int
 be_visitor_typedef_any_op_cs::visit_array (be_array *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     bt = this->ctx_->alias ();
@@ -160,7 +160,7 @@ be_visitor_typedef_any_op_cs::visit_array (be_array *node)
 int
 be_visitor_typedef_any_op_cs::visit_enum (be_enum *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     bt = this->ctx_->alias ();
@@ -187,7 +187,7 @@ be_visitor_typedef_any_op_cs::visit_enum (be_enum *node)
 int
 be_visitor_typedef_any_op_cs::visit_sequence (be_sequence *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     bt = this->ctx_->alias ();
@@ -214,7 +214,7 @@ be_visitor_typedef_any_op_cs::visit_sequence (be_sequence *node)
 int
 be_visitor_typedef_any_op_cs::visit_structure (be_structure *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     bt = this->ctx_->alias ();
@@ -241,7 +241,7 @@ be_visitor_typedef_any_op_cs::visit_structure (be_structure *node)
 int
 be_visitor_typedef_any_op_cs::visit_union (be_union *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     bt = this->ctx_->alias ();
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
index eb40ff0be2c..0865d98dc57 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
@@ -21,7 +21,7 @@ be_visitor_typedef_cdr_op_ch::be_visitor_typedef_cdr_op_ch (
 {
 }
 
-be_visitor_typedef_cdr_op_ch::~be_visitor_typedef_cdr_op_ch (void)
+be_visitor_typedef_cdr_op_ch::~be_visitor_typedef_cdr_op_ch ()
 {
 }
 
@@ -59,7 +59,7 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node)
   // the type maybe. In the latter, we just need typedefs for the type and all
   // associated _var, _out, and other types.
 
-  be_type *bt = 0; // base type
+  be_type *bt = nullptr; // base type
 
   if (this->ctx_->tdef ())
     {
@@ -92,7 +92,7 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->alias (0); // reset
+      this->ctx_->alias (nullptr); // reset
     }
   else
     {
@@ -101,7 +101,7 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node)
       this->ctx_->tdef (node); // save the typedef node
 
       // Grab the immediate base type node.
-      bt = be_type::narrow_from_decl (node->base_type ());
+      bt = dynamic_cast<be_type*> (node->base_type ());
 
       if (!bt)
         {
@@ -122,17 +122,17 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->tdef (0);
+      this->ctx_->tdef (nullptr);
     }
 
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
 
 int
 be_visitor_typedef_cdr_op_ch::visit_array (be_array *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -163,7 +163,7 @@ be_visitor_typedef_cdr_op_ch::visit_array (be_array *node)
 int
 be_visitor_typedef_cdr_op_ch::visit_enum (be_enum *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -193,7 +193,7 @@ be_visitor_typedef_cdr_op_ch::visit_enum (be_enum *node)
 int
 be_visitor_typedef_cdr_op_ch::visit_sequence (be_sequence *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -223,7 +223,7 @@ be_visitor_typedef_cdr_op_ch::visit_sequence (be_sequence *node)
 int
 be_visitor_typedef_cdr_op_ch::visit_structure (be_structure *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -253,7 +253,7 @@ be_visitor_typedef_cdr_op_ch::visit_structure (be_structure *node)
 int
 be_visitor_typedef_cdr_op_ch::visit_union (be_union *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
index 0afec693394..9045ff559a8 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
@@ -22,7 +22,7 @@ be_visitor_typedef_cdr_op_cs::be_visitor_typedef_cdr_op_cs (
 {
 }
 
-be_visitor_typedef_cdr_op_cs::~be_visitor_typedef_cdr_op_cs (void)
+be_visitor_typedef_cdr_op_cs::~be_visitor_typedef_cdr_op_cs ()
 {
 }
 
@@ -55,7 +55,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node)
   // the type maybe. In the latter, we just need typedefs for the type and all
   // associated _var, _out, and other types.
 
-  be_type *bt = 0; // base type
+  be_type *bt = nullptr; // base type
 
   if (this->ctx_->tdef ())
     {
@@ -88,7 +88,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->alias (0); // reset
+      this->ctx_->alias (nullptr); // reset
     }
   else
     {
@@ -97,7 +97,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node)
       this->ctx_->tdef (node); // save the typedef node
 
       // grab the immediate base type node
-      bt = be_type::narrow_from_decl (node->base_type ());
+      bt = dynamic_cast<be_type*> (node->base_type ());
 
       if (!bt)
         {
@@ -118,17 +118,17 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->tdef (0); // reset
+      this->ctx_->tdef (nullptr); // reset
     }
 
-  node->cli_stub_cdr_op_gen (1);
+  node->cli_stub_cdr_op_gen (true);
   return 0;
 }
 
 int
 be_visitor_typedef_cdr_op_cs::visit_array (be_array *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     {
@@ -160,7 +160,7 @@ be_visitor_typedef_cdr_op_cs::visit_array (be_array *node)
 int
 be_visitor_typedef_cdr_op_cs::visit_sequence (be_sequence *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     {
@@ -191,7 +191,7 @@ be_visitor_typedef_cdr_op_cs::visit_sequence (be_sequence *node)
 int
 be_visitor_typedef_cdr_op_cs::visit_structure (be_structure *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     {
@@ -222,7 +222,7 @@ be_visitor_typedef_cdr_op_cs::visit_structure (be_structure *node)
 int
 be_visitor_typedef_cdr_op_cs::visit_union (be_union *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
index 93defa2abb2..070e3c679ab 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
@@ -20,7 +20,7 @@ be_visitor_typedef::be_visitor_typedef (be_visitor_context *ctx)
 {
 }
 
-be_visitor_typedef::~be_visitor_typedef (void)
+be_visitor_typedef::~be_visitor_typedef ()
 {
 }
 
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 be22cc09883..11ece6e78d2 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -20,7 +20,7 @@ be_visitor_typedef_ch::be_visitor_typedef_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_typedef_ch::~be_visitor_typedef_ch (void)
+be_visitor_typedef_ch::~be_visitor_typedef_ch ()
 {
 }
 
@@ -48,7 +48,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node)
   // the type maybe. In the latter, we just need typedefs for the type and all
   // associated _var, _out, and other types.
 
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->tdef ())
     {
@@ -81,7 +81,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->alias (0);
+      this->ctx_->alias (nullptr);
     }
   else
     {
@@ -90,7 +90,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node)
       this->ctx_->tdef (node);
 
       // Grab the immediate base type node.
-      bt = be_type::narrow_from_decl (node->base_type ());
+      bt = dynamic_cast<be_type*> (node->base_type ());
 
       if (!bt)
         {
@@ -130,7 +130,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node)
             }
         }
 
-      this->ctx_->tdef (0);
+      this->ctx_->tdef (nullptr);
     }
 
   return 0;
@@ -142,7 +142,7 @@ be_visitor_typedef_ch::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Is the base type an alias to an array node or an actual array node.
   if (this->ctx_->alias ())
@@ -203,11 +203,11 @@ be_visitor_typedef_ch::visit_array (be_array *node)
       // output statement.
 
       const char *static_decl = "";
-      AST_Module *scope = AST_Module::narrow_from_scope (tdef->defined_in ());
+      AST_Module *scope = dynamic_cast<AST_Module*> (tdef->defined_in ());
 
       // If the typedef is not declared globally or in a module, the
       // associated array memory management function must be static.
-      if (scope == 0)
+      if (scope == nullptr)
         {
           static_decl = "static ";
         }
@@ -230,7 +230,7 @@ be_visitor_typedef_ch::visit_array (be_array *node)
       *os << be_nl
           << "ACE_INLINE " << static_decl << be_nl
           << td_name << "_slice *" << be_nl
-          << td_name << "_alloc (void);" << be_nl;
+          << td_name << "_alloc ();" << be_nl;
       // _dup
       *os << be_nl
           << "ACE_INLINE " << static_decl << be_nl
@@ -261,7 +261,7 @@ be_visitor_typedef_ch::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
@@ -305,7 +305,7 @@ be_visitor_typedef_ch::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
@@ -343,7 +343,7 @@ int
 be_visitor_typedef_ch::visit_interface_fwd (be_interface_fwd *)
 {
 //  be_interface *fd =
-//    be_interface::narrow_from_decl (node->full_definition ());
+//    dynamic_cast<be_interface*> (node->full_definition ());
 //  return this->visit_interface (fd);
   return 0;
 }
@@ -354,7 +354,7 @@ be_visitor_typedef_ch::visit_predefined_type (be_predefined_type *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
@@ -433,7 +433,7 @@ be_visitor_typedef_ch::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
@@ -481,7 +481,7 @@ be_visitor_typedef_ch::visit_structure (be_structure *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
@@ -527,7 +527,7 @@ be_visitor_typedef_ch::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
@@ -573,7 +573,7 @@ be_visitor_typedef_ch::visit_valuebox (be_valuebox *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
@@ -609,7 +609,7 @@ be_visitor_typedef_ch::visit_valuetype (be_valuetype *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
index 2928526e184..c305d181e52 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
@@ -20,7 +20,7 @@ be_visitor_typedef_ci::be_visitor_typedef_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_typedef_ci::~be_visitor_typedef_ci (void)
+be_visitor_typedef_ci::~be_visitor_typedef_ci ()
 {
 }
 
@@ -48,7 +48,7 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node)
   // the type maybe. In the latter, we just need typedefs for the type and all
   // associated _var, _out, and other types.
 
-  be_type *bt = 0; // base type
+  be_type *bt = nullptr; // base type
 
   if (this->ctx_->tdef ())
     {
@@ -81,7 +81,7 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->alias (0);
+      this->ctx_->alias (nullptr);
     }
   else
     {
@@ -90,7 +90,7 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node)
       this->ctx_->tdef (node); // save the typedef node
 
       // grab the immediate base type node
-      bt = be_type::narrow_from_decl (node->base_type ());
+      bt = dynamic_cast<be_type*> (node->base_type ());
 
       if (!bt)
         {
@@ -111,7 +111,7 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->tdef (0);
+      this->ctx_->tdef (nullptr);
     }
 
   return 0;
@@ -122,7 +122,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // output stream
   be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // This doesn't catch 'typedef of a typedef' if the node is
   // imported, so we check for that below before generating
@@ -170,7 +170,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
       *os << be_nl
           << "ACE_INLINE" << be_nl
           << tdef->name () << "_slice *" << be_nl;
-      *os << tdef->name () << "_alloc (void)" << be_nl;
+      *os << tdef->name () << "_alloc ()" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "return " << bt->name () << "_alloc ();" << be_uidt_nl;
       *os << "}" << be_nl_2;
@@ -216,7 +216,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
 int
 be_visitor_typedef_ci::visit_sequence (be_sequence *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     {
@@ -247,7 +247,7 @@ be_visitor_typedef_ci::visit_sequence (be_sequence *node)
 int
 be_visitor_typedef_ci::visit_structure (be_structure *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     {
@@ -278,7 +278,7 @@ be_visitor_typedef_ci::visit_structure (be_structure *node)
 int
 be_visitor_typedef_ci::visit_union (be_union *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ()) // typedef of a typedef
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
index 4068d88b3b3..b8d5f78f02e 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
@@ -20,7 +20,7 @@ be_visitor_typedef_cs::be_visitor_typedef_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_typedef_cs::~be_visitor_typedef_cs (void)
+be_visitor_typedef_cs::~be_visitor_typedef_cs ()
 {
 }
 
@@ -48,7 +48,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node)
   // the type maybe. In the latter, we just need typedefs for the type and all
   // associated _var, _out, and other types.
 
-  be_type *bt = 0; // base type
+  be_type *bt = nullptr; // base type
 
   if (this->ctx_->tdef ())
     {
@@ -81,7 +81,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node)
                             -1);
         }
 
-      this->ctx_->alias (0);
+      this->ctx_->alias (nullptr);
     }
   else
     {
@@ -90,7 +90,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node)
       this->ctx_->tdef (node);
 
       // Grab the immediate base type node.
-      bt = be_type::narrow_from_decl (node->base_type ());
+      bt = dynamic_cast<be_type*> (node->base_type ());
 
       if (!bt)
         {
@@ -128,7 +128,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node)
 
         }
 
-      this->ctx_->tdef (0);
+      this->ctx_->tdef (nullptr);
     }
 
   return 0;
@@ -137,7 +137,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node)
 int
 be_visitor_typedef_cs::visit_sequence (be_sequence *node)
 {
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Typedef of a typedef?
   if (this->ctx_->alias ())
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 d7522094c26..b8b2a3eedc9 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
@@ -17,7 +17,7 @@ be_visitor_union_any_op_ch::be_visitor_union_any_op_ch (
 {
 }
 
-be_visitor_union_any_op_ch::~be_visitor_union_any_op_ch (void)
+be_visitor_union_any_op_ch::~be_visitor_union_any_op_ch ()
 {
 }
 
@@ -36,21 +36,21 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  be_module *module = 0;
+  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 = 0;
-          intf = be_interface::narrow_from_scope (node->defined_in ());
+          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 = be_module::narrow_from_scope (decl->defined_in ());
+          module = dynamic_cast<be_module*> (decl->defined_in ());
 
           if (!module)
             {
@@ -94,7 +94,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
@@ -106,8 +106,8 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
     {
       AST_Decl *d = si.item ();
 
-      be_enum *e = be_enum::narrow_from_decl (d);
-      if (e != 0)
+      be_enum *e = dynamic_cast<be_enum*> (d);
+      if (e != nullptr)
         {
           be_visitor_enum_any_op_ch visitor (&ctx);
 
@@ -131,7 +131,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
                         -1);
     }
 
-  node->cli_hdr_any_op_gen (1);
+  node->cli_hdr_any_op_gen (true);
   return 0;
 }
 
@@ -139,7 +139,7 @@ int
 be_visitor_union_any_op_ch::visit_union_branch (be_union_branch *node)
 {
   // First generate the type information.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
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 ed636e42cac..d0c95024982 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
@@ -17,7 +17,7 @@ be_visitor_union_any_op_cs::be_visitor_union_any_op_cs (
 {
 }
 
-be_visitor_union_any_op_cs::~be_visitor_union_any_op_cs (void)
+be_visitor_union_any_op_cs::~be_visitor_union_any_op_cs ()
 {
 }
 
@@ -70,21 +70,21 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = 0;
+  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 = 0;
-          intf = be_interface::narrow_from_scope (node->defined_in ());
+          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 = be_module::narrow_from_scope (decl->defined_in ());
+          module = dynamic_cast<be_module*> (decl->defined_in ());
 
           if (!module)
             {
@@ -209,7 +209,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
@@ -221,8 +221,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
     {
       AST_Decl *d = si.item ();
 
-      be_enum *e = be_enum::narrow_from_decl (d);
-      if (e != 0)
+      be_enum *e = dynamic_cast<be_enum*> (d);
+      if (e != nullptr)
         {
           be_visitor_enum_any_op_cs visitor (&ctx);
 
@@ -247,14 +247,14 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
                         -1);
     }
 
-  node->cli_stub_any_op_gen (1);
+  node->cli_stub_any_op_gen (true);
   return 0;
 }
 
 int
 be_visitor_union_any_op_cs::visit_union_branch (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
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 c703262324d..142279b0dbf 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
@@ -18,7 +18,7 @@ be_visitor_union_cdr_op_ch::be_visitor_union_cdr_op_ch (
 {
 }
 
-be_visitor_union_cdr_op_ch::~be_visitor_union_cdr_op_ch (void)
+be_visitor_union_cdr_op_ch::~be_visitor_union_cdr_op_ch ()
 {
 }
 
@@ -65,8 +65,8 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node)
     {
       AST_Decl *d = si.item ();
 
-      be_enum *e = be_enum::narrow_from_decl (d);
-      if (e != 0)
+      be_enum *e = dynamic_cast<be_enum*> (d);
+      if (e != nullptr)
         {
           be_visitor_enum_cdr_op_ch visitor (&ctx);
 
@@ -91,6 +91,6 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node)
                         -1);
     }
 
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
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 d182f67c0b6..f3173b1742b 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
@@ -17,7 +17,7 @@ be_visitor_union_cdr_op_cs::be_visitor_union_cdr_op_cs (
 {
 }
 
-be_visitor_union_cdr_op_cs::~be_visitor_union_cdr_op_cs (void)
+be_visitor_union_cdr_op_cs::~be_visitor_union_cdr_op_cs ()
 {
 }
 
@@ -42,8 +42,8 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
     {
       AST_Decl *d = si.item ();
 
-      be_enum *e = be_enum::narrow_from_decl (d);
-      if (e != 0)
+      be_enum *e = dynamic_cast<be_enum*> (d);
+      if (e != nullptr)
         {
           be_visitor_enum_cdr_op_cs visitor (&ctx);
 
@@ -159,7 +159,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
       << "{" << be_idt_nl;
 
   be_type* disc_type =
-    be_type::narrow_from_decl (node->disc_type ());
+    dynamic_cast<be_type*> (node->disc_type ());
 
   // Generate a temporary to store the discriminant
   *os << disc_type->full_name ()
@@ -240,7 +240,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   *os << "return result;" << be_uidt_nl
       << "}" << be_nl;
 
-  bool use_underscore = (this->ctx_->tdef () == 0);
+  bool use_underscore = (this->ctx_->tdef () == nullptr);
 
   if (be_global->gen_ostream_operators ())
     {
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 b8d565cf865..9f4f09196be 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
@@ -17,7 +17,7 @@ be_visitor_union_discriminant_ch::be_visitor_union_discriminant_ch (
 {
 }
 
-be_visitor_union_discriminant_ch::~be_visitor_union_discriminant_ch (void)
+be_visitor_union_discriminant_ch::~be_visitor_union_discriminant_ch ()
 {
 }
 
@@ -26,8 +26,8 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
 {
   // Get the enclosing union backend.
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -70,7 +70,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
   *os << be_nl_2
       << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl;
   // The get method.
-  *os << bt->nested_type_name (bu) << " _d (void) const;";
+  *os << bt->nested_type_name (bu) << " _d () const;";
 
   return 0;
 }
@@ -81,8 +81,8 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
 {
   // get the enclosing union backend.
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -103,7 +103,7 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
   *os << be_nl_2
       << "void _d ( " << bt->nested_type_name (bu) << ");" << be_nl;
   // The get method.
-  *os << bt->nested_type_name (bu) << " _d (void) const;";
+  *os << bt->nested_type_name (bu) << " _d () const;";
 
   return 0;
 }
@@ -125,6 +125,6 @@ be_visitor_union_discriminant_ch::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
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 1d1f5372921..ce1b7ca49e6 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
@@ -17,7 +17,7 @@ be_visitor_union_discriminant_ci::be_visitor_union_discriminant_ci (
 {
 }
 
-be_visitor_union_discriminant_ci::~be_visitor_union_discriminant_ci (void)
+be_visitor_union_discriminant_ci::~be_visitor_union_discriminant_ci ()
 {
 }
 
@@ -25,8 +25,8 @@ int
 be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
 {
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -100,7 +100,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
   *os << "// Accessor to get the discriminant." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << be_nl
-      << bu->name () << "::_d (void) const" << be_nl
+      << bu->name () << "::_d () const" << be_nl
       << "{" << be_idt_nl
       << "return this->disc_;" << be_uidt_nl
       << "}";
@@ -114,9 +114,9 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
   )
 {
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union*> (this->ctx_->node ());
 
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -210,7 +210,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
   *os << "// Accessor to get the discriminant." << be_nl
       << "ACE_INLINE" << be_nl
       << "::" << bt->name () << be_nl
-      << bu->name () << "::_d (void) const" << be_nl
+      << bu->name () << "::_d () const" << be_nl
       << "{" << be_idt_nl
       << "return this->disc_;" << be_uidt_nl
       << "}";
@@ -235,6 +235,6 @@ be_visitor_union_discriminant_ci::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp
index fcebbea9129..d147b318362 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp
@@ -18,7 +18,7 @@ be_visitor_union_discriminant_cs::be_visitor_union_discriminant_cs (
 {
 }
 
-be_visitor_union_discriminant_cs::~be_visitor_union_discriminant_cs (void)
+be_visitor_union_discriminant_cs::~be_visitor_union_discriminant_cs ()
 {
 }
 
@@ -26,8 +26,8 @@ int
 be_visitor_union_discriminant_cs::visit_enum (be_enum *node)
 {
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->node ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union.cpp b/TAO/TAO_IDL/be/be_visitor_union/union.cpp
index 9ed497927ac..ddee451480c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union.cpp
@@ -16,7 +16,7 @@ be_visitor_union::be_visitor_union (be_visitor_context *ctx)
 {
 }
 
-be_visitor_union::~be_visitor_union (void)
+be_visitor_union::~be_visitor_union ()
 {
 }
 
@@ -110,7 +110,7 @@ be_visitor_union::visit_union_branch (be_union_branch *node)
 be_visitor_union::BoolUnionBranch
 be_visitor_union::boolean_branch (be_union_branch *b)
 {
-  be_union *u = be_union::narrow_from_scope (b->defined_in ());
+  be_union *u = dynamic_cast<be_union*> (b->defined_in ());
   if (!u || u->udisc_type () != AST_Expression::EV_bool)
     return BUB_NONE;
 
@@ -131,7 +131,7 @@ be_visitor_union::boolean_branch (be_union_branch *b)
       u->field (f, i);
       if (*f != b)
         {
-          AST_UnionBranch *other = AST_UnionBranch::narrow_from_decl (*f);
+          AST_UnionBranch *other = dynamic_cast<AST_UnionBranch*> (*f);
           for (unsigned long j = 0; j < other->label_list_length (); ++j)
             {
               has_other = true;
@@ -162,10 +162,10 @@ be_visitor_union_cdr_op_cs::pre_process (be_decl *bd)
   TAO_OutStream *os = this->ctx_->stream ();
 
   be_union_branch* b =
-    be_union_branch::narrow_from_decl (bd);
+    dynamic_cast<be_union_branch*> (bd);
 
   // Could be a type decl.
-  if (b == 0)
+  if (b == nullptr)
     {
       return 0;
     }
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 5c8f1be9fb5..3943c07a55f 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
@@ -16,7 +16,7 @@ be_visitor_union_ch::be_visitor_union_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_union_ch::~be_visitor_union_ch (void)
+be_visitor_union_ch::~be_visitor_union_ch ()
 {
 }
 
@@ -49,11 +49,11 @@ int be_visitor_union_ch::visit_union (be_union *node)
       << "public:" << be_idt_nl
 
     // Generate default and copy constructors.
-      << node->local_name () << " (void);" << be_nl
+      << node->local_name () << " ();" << be_nl
       << node->local_name () << " (const " << node->local_name ()
       << " &);" << be_nl
     // Generate destructor.
-      << "~" << node->local_name () << " (void);";
+      << "~" << node->local_name () << " ();";
 
     // Generate assignment operator.
   *os << be_nl_2
@@ -61,7 +61,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
       << node->local_name () << " &);";
 
   // Retrieve the disriminant type.
-  be_type *bt = be_type::narrow_from_decl (node->disc_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->disc_type ());
 
   if (!bt)
     {
@@ -123,7 +123,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
       // Only if all cases are not covered AND there is no explicit
       // default, we get the _default () method.
       *os << be_nl_2
-          << "void _default (void);";
+          << "void _default ();";
     }
 
   *os << be_uidt_nl;
@@ -154,7 +154,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
   // The reset method (TAO extension).
   *os << be_nl_2
       << "/// TAO extension - frees any allocated storage." << be_nl;
-  *os << "void _reset (void);";
+  *os << "void _reset ();";
 
   *os << be_uidt_nl << "};";
 
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 873d95becad..47bab908e32 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -16,7 +16,7 @@ be_visitor_union_ci::be_visitor_union_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_union_ci::~be_visitor_union_ci (void)
+be_visitor_union_ci::~be_visitor_union_ci ()
 {
 }
 
@@ -43,7 +43,7 @@ int be_visitor_union_ci::visit_union (be_union *node)
   // the discriminant type may have to be defined here if it was an enum
   // declaration inside of the union statement.
 
-  be_type *bt = be_type::narrow_from_decl (node->disc_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->disc_type ());
 
   if (!bt)
     {
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 eb1cbd75784..5cfcba36781 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -16,7 +16,7 @@ be_visitor_union_cs::be_visitor_union_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_union_cs::~be_visitor_union_cs (void)
+be_visitor_union_cs::~be_visitor_union_cs ()
 {
 }
 
@@ -35,7 +35,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
   // declaration inside of the union statement. We need to generate its
   // typecode.
 
-  be_type *bt = be_type::narrow_from_decl (node->disc_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->disc_type ());
 
   if (!bt)
     {
@@ -77,7 +77,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
 
   // Generate the copy constructor and the assignment operator here.
   *os << be_nl_2
-      << node->name () << "::" << node->local_name () << " (void)" << be_nl
+      << node->name () << "::" << node->local_name () << " ()" << be_nl
       << "{" << be_idt_nl
       << "ACE_OS::memset (&this->u_, 0, sizeof (this->u_));" << be_nl;
 
@@ -89,16 +89,16 @@ int be_visitor_union_cs::visit_union (be_union *node)
   *os << "this->disc_ = ";
 
   UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-  be_union_branch *ub = 0;
+  be_union_branch *ub = nullptr;
 
   // In case we have some bogus enum values from an enum declared
   // in our scope.
-  while (ub == 0)
+  while (ub == nullptr)
     {
       // Just get the union's first member.
       AST_Decl *d = si.item ();
 
-      ub = be_union_branch::narrow_from_decl (d);
+      ub = dynamic_cast<be_union_branch*> (d);
       si.next ();
     }
 
@@ -189,7 +189,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
   *os << be_uidt_nl << "}" << be_nl_2;
 
   *os << node->name () << "::~" << node->local_name ()
-      << " (void)" << be_nl
+      << " ()" << be_nl
       << "{" << be_idt_nl
       << "// Finalize." << be_nl
       << "this->_reset ();" << be_uidt_nl
@@ -267,7 +267,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
   this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_RESET_CS);
 
   *os << "/// Reset method to reset old values of a union." << be_nl;
-  *os << "void " << node->name () << "::_reset (void)" << be_nl;
+  *os << "void " << node->name () << "::_reset ()" << be_nl;
   *os << "{" << be_idt_nl;
 
   if (!boolDisc)
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
index 5ff6f661324..997da7e73c5 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
@@ -16,14 +16,14 @@ be_visitor_union_branch_cdr_op_ch::be_visitor_union_branch_cdr_op_ch (
 {
 }
 
-be_visitor_union_branch_cdr_op_ch::~be_visitor_union_branch_cdr_op_ch (void)
+be_visitor_union_branch_cdr_op_ch::~be_visitor_union_branch_cdr_op_ch ()
 {
 }
 
 int
 be_visitor_union_branch_cdr_op_ch::visit_union_branch (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -167,7 +167,7 @@ be_visitor_union_branch_cdr_op_ch::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
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 f585aeada96..5fb6a632f95 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
@@ -28,14 +28,14 @@ be_visitor_union_branch_cdr_op_cs::be_visitor_union_branch_cdr_op_cs (
 {
 }
 
-be_visitor_union_branch_cdr_op_cs::~be_visitor_union_branch_cdr_op_cs (void)
+be_visitor_union_branch_cdr_op_cs::~be_visitor_union_branch_cdr_op_cs ()
 {
 }
 
 int
 be_visitor_union_branch_cdr_op_cs::visit_union_branch (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -85,9 +85,9 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node)
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -116,7 +116,7 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -185,9 +185,9 @@ be_visitor_union_branch_cdr_op_cs::visit_enum (be_enum *node)
 
   // Retrieve the union_branch node
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -260,9 +260,9 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -340,9 +340,9 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -425,9 +425,9 @@ be_visitor_union_branch_cdr_op_cs::emit_valuetype_common (be_type *node)
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -483,9 +483,9 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -671,9 +671,9 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node)
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ci::"
@@ -741,9 +741,9 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *node)
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ci::"
@@ -864,9 +864,9 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node)
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ci::"
@@ -928,7 +928,7 @@ be_visitor_union_branch_cdr_op_cs::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -961,9 +961,9 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node)
 
   // Retrieve the union_branch node.
   be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ci::"
@@ -1010,16 +1010,16 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node)
 }
 
 int
-be_visitor_union_branch_cdr_op_cs::explicit_default (void)
+be_visitor_union_branch_cdr_op_cs::explicit_default ()
 {
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->scope ()->decl ());
+    dynamic_cast<be_union*> (this->ctx_->scope ()->decl ());
   int def_index = bu->default_index ();
 
   if (def_index != -1)
     {
       be_union_branch *ub =
-        be_union_branch::narrow_from_decl (this->ctx_->node ());
+        dynamic_cast<be_union_branch*> (this->ctx_->node ());
 
       int i = 0;
 
@@ -1028,13 +1028,13 @@ be_visitor_union_branch_cdr_op_cs::explicit_default (void)
            !si.is_done ();
            si.next ())
         {
-          be_union_branch *bub = 0; // union branch node
+          be_union_branch *bub = nullptr; // union branch node
 
           AST_Decl *d = si.item ();
 
           if (!d->imported ())
             {
-              bub = be_union_branch::narrow_from_decl (d);
+              bub = dynamic_cast<be_union_branch*> (d);
             }
 
           if (bub == ub)
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 888f7230521..a9aef5adc87 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
@@ -25,7 +25,7 @@ be_visitor_union_branch_private_ch::be_visitor_union_branch_private_ch (
 }
 
 // Destructor.
-be_visitor_union_branch_private_ch::~be_visitor_union_branch_private_ch (void)
+be_visitor_union_branch_private_ch::~be_visitor_union_branch_private_ch ()
 {
 }
 
@@ -33,7 +33,7 @@ be_visitor_union_branch_private_ch::~be_visitor_union_branch_private_ch (void)
 int
 be_visitor_union_branch_private_ch::visit_union_branch (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -63,7 +63,7 @@ be_visitor_union_branch_private_ch::visit_array (be_array *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -113,7 +113,7 @@ be_visitor_union_branch_private_ch::visit_enum (be_enum *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -152,7 +152,7 @@ be_visitor_union_branch_private_ch::visit_interface (be_interface *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -191,7 +191,7 @@ be_visitor_union_branch_private_ch::visit_interface_fwd (be_interface_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -230,7 +230,7 @@ be_visitor_union_branch_private_ch::visit_valuebox (be_valuebox *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -269,7 +269,7 @@ be_visitor_union_branch_private_ch::visit_valuetype (be_valuetype *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -308,7 +308,7 @@ be_visitor_union_branch_private_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -349,11 +349,11 @@ be_visitor_union_branch_private_ch::visit_predefined_type (
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
   be_typedef *td = this->ctx_->alias ();
 
   // Check if we are visiting this node via a visit to a typedef node
-  if (td != 0)
+  if (td != nullptr)
     {
       bt = td;
     }
@@ -417,7 +417,7 @@ be_visitor_union_branch_private_ch::visit_sequence (be_sequence *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -492,7 +492,7 @@ be_visitor_union_branch_private_ch::visit_structure (be_structure *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -541,7 +541,7 @@ be_visitor_union_branch_private_ch::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -563,7 +563,7 @@ be_visitor_union_branch_private_ch::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -572,7 +572,7 @@ be_visitor_union_branch_private_ch::visit_union (be_union *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node
   if (this->ctx_->alias ())
@@ -613,7 +613,7 @@ be_visitor_union_branch_private_ch::visit_union_fwd (
   be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
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 994f676a660..d4cdcda11a2 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
@@ -25,7 +25,7 @@ be_visitor_union_branch_public_assign_cs (be_visitor_context *ctx)
 
 // destructor
 be_visitor_union_branch_public_assign_cs::
-~be_visitor_union_branch_public_assign_cs (void)
+~be_visitor_union_branch_public_assign_cs ()
 {
 }
 
@@ -78,7 +78,7 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch (
     }
 
   // first generate the type information
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -122,10 +122,10 @@ int
 be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -165,7 +165,7 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
 
       if (bt->is_nested ())
         {
-          be_decl *parent = be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+          be_decl *parent = dynamic_cast<be_scope*> (bt->defined_in ())->decl ();
           ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            bt->local_name ()->get_string ());
         }
@@ -194,11 +194,11 @@ int
 be_visitor_union_branch_public_assign_cs::visit_enum (be_enum *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_assign_cs::"
@@ -222,10 +222,10 @@ int
 be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -319,10 +319,10 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -434,10 +434,10 @@ int
 be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -504,10 +504,10 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -616,10 +616,10 @@ int
 be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -681,11 +681,11 @@ int
 be_visitor_union_branch_public_assign_cs::visit_string (be_string *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_assign_cs::"
@@ -717,10 +717,10 @@ int
 be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -791,7 +791,7 @@ be_visitor_union_branch_public_assign_cs::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -814,7 +814,7 @@ be_visitor_union_branch_public_assign_cs::visit_typedef (be_typedef *node)
                          ), -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -822,10 +822,10 @@ int
 be_visitor_union_branch_public_assign_cs::visit_union (be_union *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -888,7 +888,7 @@ be_visitor_union_branch_public_assign_cs::visit_union_fwd (
   be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
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 7453c27a662..566027008ec 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
@@ -22,14 +22,14 @@ be_visitor_union_branch_public_ch::be_visitor_union_branch_public_ch (
 {
 }
 
-be_visitor_union_branch_public_ch::~be_visitor_union_branch_public_ch (void)
+be_visitor_union_branch_public_ch::~be_visitor_union_branch_public_ch ()
 {
 }
 
 int
 be_visitor_union_branch_public_ch::visit_union_branch (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -62,7 +62,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -118,7 +118,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node)
           << "_" << bt->local_name () << ");" << be_nl;
       // The get method.
       *os << "_" << bt->local_name () << "_slice * " << ub->local_name ()
-          << " (void) const; // get method";
+          << " () const; // get method";
     }
   else
     {
@@ -133,7 +133,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node)
           << be_nl;
       // The get method.
       *os << bt->nested_type_name (bu, "_slice *") << " " << ub->local_name ()
-          << " (void) const;";
+          << " () const;";
     }
 
   return 0;
@@ -144,7 +144,7 @@ be_visitor_union_branch_public_ch::visit_enum (be_enum *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -196,7 +196,7 @@ be_visitor_union_branch_public_ch::visit_enum (be_enum *node)
       << be_nl;
   // the get method.
   *os << bt->nested_type_name (bu) << " " << ub->local_name ()
-      << " (void) const;";
+      << " () const;";
 
   return 0;
 }
@@ -206,7 +206,7 @@ be_visitor_union_branch_public_ch::visit_interface (be_interface *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -239,7 +239,7 @@ be_visitor_union_branch_public_ch::visit_interface (be_interface *node)
       << ");" << be_nl;
   // Get method.
   *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
-      << " (void) const;";
+      << " () const;";
 
   return 0;
 }
@@ -249,7 +249,7 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -282,7 +282,7 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node)
       << ");" << be_nl;
   // Get method.
   *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
-      << " (void) const;";
+      << " () const;";
 
   return 0;
 }
@@ -292,7 +292,7 @@ be_visitor_union_branch_public_ch::visit_valuebox (be_valuebox *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -325,7 +325,7 @@ be_visitor_union_branch_public_ch::visit_valuebox (be_valuebox *node)
       << ");" << be_nl;
   // Get method.
   *os << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
-      << " (void) const;";
+      << " () const;";
 
   return 0;
 }
@@ -335,7 +335,7 @@ be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -368,7 +368,7 @@ be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node)
       << ");" << be_nl;
   // Get method.
   *os << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
-      << " (void) const;";
+      << " () const;";
 
   return 0;
 }
@@ -378,7 +378,7 @@ be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -411,7 +411,7 @@ be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
       << ")" << be_nl;
   // Get method.
   *os << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
-      << " (void) const;";
+      << " () const;";
 
   return 0;
 }
@@ -421,11 +421,11 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
   be_typedef *td = this->ctx_->alias ();
 
   // Check if we are visiting this via a visit to a typedef node.
-  if (td != 0)
+  if (td != nullptr)
     {
       bt = td;
     }
@@ -457,23 +457,23 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no
           << "void " << ub->local_name () << " (const "
           << bt->nested_type_name (bu, "_ptr") << ");" << be_nl;
       *os << bt->nested_type_name (bu, "_ptr") << " "
-          << ub->local_name () << " (void) const;";
+          << ub->local_name () << " () const;";
       break;
     case AST_PredefinedType::PT_value:
       *os << be_nl_2
           << "void " << ub->local_name () << " ( "
           << bt->nested_type_name (bu, " *") << ");" << be_nl;
       *os << bt->nested_type_name (bu, " *") << " "
-          << ub->local_name () << " (void) const;";
+          << ub->local_name () << " () const;";
       break;
     case AST_PredefinedType::PT_any:
       *os << be_nl_2
           << "void " << ub->local_name () << " (const "
           << bt->nested_type_name (bu) << " &);" << be_nl;
       *os << "const " << bt->nested_type_name (bu) << " &"
-          << ub->local_name () << " (void) const;" << be_nl;
+          << ub->local_name () << " () const;" << be_nl;
       *os << bt->nested_type_name (bu) << " &"
-          << ub->local_name () << " (void);";
+          << ub->local_name () << " ();";
       break;
     case AST_PredefinedType::PT_void:
       break;
@@ -482,7 +482,7 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no
           << "void " << ub->local_name () << " ( "
           << bt->nested_type_name (bu) << ");" << be_nl;
       *os << bt->nested_type_name (bu) << " "
-          << ub->local_name () << " (void) const;";
+          << ub->local_name () << " () const;";
     }
 
   return 0;
@@ -493,7 +493,7 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -551,10 +551,10 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node)
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl;
   *os << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const;"
+      << ub->local_name  () << " () const;"
       << be_nl;
   *os << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void);";
+      << " ();";
 
   return 0;
 }
@@ -589,7 +589,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node)
       *os << "void " << ub->local_name () << " (const ::CORBA::String_var&);"
           << be_nl;
       *os << "const char *" << ub->local_name ()
-          << " (void) const;";
+          << " () const;";
     }
   else
     {
@@ -600,7 +600,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node)
       *os << "void " << ub->local_name () << " (const ::CORBA::WString_var&);"
           << be_nl;
       *os << "const ::CORBA::WChar *" << ub->local_name ()
-          << " (void) const;";
+          << " () const;";
     }
 
   return 0;
@@ -611,7 +611,7 @@ be_visitor_union_branch_public_ch::visit_structure (be_structure *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -659,10 +659,10 @@ be_visitor_union_branch_public_ch::visit_structure (be_structure *node)
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl
       << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const;"
+      << ub->local_name  () << " () const;"
       << be_nl
       << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void);";
+      << " ();";
 
   return 0;
 }
@@ -672,7 +672,7 @@ be_visitor_union_branch_public_ch::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -694,7 +694,7 @@ be_visitor_union_branch_public_ch::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -703,7 +703,7 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -752,10 +752,10 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node)
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl
       << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const;"
+      << ub->local_name  () << " () const;"
       << be_nl
       << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void);";
+      << " ();";
 
   return 0;
 }
@@ -764,7 +764,7 @@ int
 be_visitor_union_branch_public_ch::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
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 f5ff581f3e3..add0becee4e 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
@@ -24,7 +24,7 @@ be_visitor_union_branch_public_ci::be_visitor_union_branch_public_ci (
 }
 
 // destructor
-be_visitor_union_branch_public_ci::~be_visitor_union_branch_public_ci (void)
+be_visitor_union_branch_public_ci::~be_visitor_union_branch_public_ci ()
 {
 }
 
@@ -32,7 +32,7 @@ be_visitor_union_branch_public_ci::~be_visitor_union_branch_public_ci (void)
 int
 be_visitor_union_branch_public_ci::visit_union_branch (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -63,10 +63,10 @@ int
 be_visitor_union_branch_public_ci::visit_array (be_array *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -131,7 +131,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (bt->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -186,7 +186,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
   *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << fname << "_slice *" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
+      << bu->name () << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl
       << "}";
@@ -198,10 +198,10 @@ int
 be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // heck if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -257,7 +257,7 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
   *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
+      << bu->name () << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl
       << "}";
@@ -269,10 +269,10 @@ int
 be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -347,7 +347,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
   *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << "_ptr" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
+      << bu->name () << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl
       << "}";
@@ -359,10 +359,10 @@ int
 be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -437,7 +437,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
   *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << "_ptr" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
+      << bu->name () << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl
       << "}";
@@ -467,10 +467,10 @@ int
 be_visitor_union_branch_public_ci::emit_valuetype_common  (be_type *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -532,7 +532,7 @@ be_visitor_union_branch_public_ci::emit_valuetype_common  (be_type *node)
   *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << "*" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
+      << bu->name () << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl
       << "}";
@@ -546,10 +546,10 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -681,7 +681,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
             << "ACE_INLINE" << be_nl
             << "::" << bt->name () << "_ptr" << be_nl
             << bu->name () << "::" << ub->local_name ()
-            << " (void) const" << be_nl
+            << " () const" << be_nl
             << "{" << be_idt_nl;
         *os << "return this->u_." << ub->local_name ()
             << "_->in ();" << be_uidt_nl;
@@ -694,7 +694,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
             << "ACE_INLINE" << be_nl
             << "::" << bt->name () << "_ptr" << be_nl
             << bu->name () << "::" << ub->local_name ()
-            << " (void) const" << be_nl
+            << " () const" << be_nl
             << "{" << be_idt_nl;
         *os << "return this->u_." << ub->local_name ()
             << "_;" << be_uidt_nl;
@@ -707,7 +707,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
             << "ACE_INLINE" << be_nl
             << "::" << bt->name () << " *" << be_nl
             << bu->name () << "::" << ub->local_name ()
-            << " (void) const" << be_nl
+            << " () const" << be_nl
             << "{" << be_idt_nl;
         *os << "return this->u_." << ub->local_name ()
             << "_;" << be_uidt_nl;
@@ -720,7 +720,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
             << "ACE_INLINE" << be_nl
             << "const ::" << bt->name () << " &" << be_nl
             << bu->name () << "::" << ub->local_name ()
-            << " (void) const" << be_nl
+            << " () const" << be_nl
             << "{" << be_idt_nl
             << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
             << "}" << be_nl_2;
@@ -730,7 +730,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
             << "ACE_INLINE" << be_nl
             << "::" << bt->name () << " &" << be_nl
             << bu->name () << "::" << ub->local_name ()
-            << " (void)" << be_nl
+            << " ()" << be_nl
             << "{" << be_idt_nl
             << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
             << "}";
@@ -743,7 +743,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
             << "ACE_INLINE" << be_nl
             << "::" << bt->name () << be_nl
             << bu->name () << "::" << ub->local_name ()
-            << " (void) const" << be_nl
+            << " () const" << be_nl
             << "{" << be_idt_nl
             << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl
             << "}";
@@ -758,10 +758,10 @@ int
 be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -819,7 +819,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
   *os << "/// Readonly get method." << be_nl
       << "ACE_INLINE" << be_nl
       << "const " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
+      << bu->name () << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl
       << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
       << "}" << be_nl_2;
@@ -828,7 +828,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
   *os << "/// Read/write get method." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void)" << be_nl
+      << bu->name () << "::" << ub->local_name () << " ()" << be_nl
       << "{" << be_idt_nl
       << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
       << "}";
@@ -840,11 +840,11 @@ int
 be_visitor_union_branch_public_ci::visit_string (be_string *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_ci::"
@@ -999,7 +999,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
     }
 
   *os << bu->name () << "::" << ub->local_name ()
-      << " (void) const // get method" << be_nl
+      << " () const // get method" << be_nl
       << "{" << be_idt_nl
       << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl
       << "}";
@@ -1011,10 +1011,10 @@ int
 be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -1106,7 +1106,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
   *os << "// Readonly get method." << be_nl
       << "ACE_INLINE" << be_nl
       << "const " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
+      << bu->name () << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl;
 
   if (bt->size_type () == be_type::VARIABLE
@@ -1125,7 +1125,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
   *os << "// Read/write get method." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void)" << be_nl
+      << bu->name () << "::" << ub->local_name () << " ()" << be_nl
       << "{" << be_idt_nl;
 
   if (bt->size_type () == be_type::VARIABLE
@@ -1147,7 +1147,7 @@ int
 be_visitor_union_branch_public_ci::visit_structure_fwd (be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -1170,7 +1170,7 @@ be_visitor_union_branch_public_ci::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -1178,10 +1178,10 @@ int
 be_visitor_union_branch_public_ci::visit_union (be_union *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -1263,7 +1263,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
   *os << "// Readonly get method." << be_nl
       << "ACE_INLINE" << be_nl
       << "const " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
+      << bu->name () << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl
       << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
       << "}" << be_nl_2;
@@ -1272,7 +1272,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
   *os << "// Read/write get method." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void)" << be_nl
+      << bu->name () << "::" << ub->local_name () << " ()" << be_nl
       << "{" << be_idt_nl
       << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
       << "}";
@@ -1284,7 +1284,7 @@ int
 be_visitor_union_branch_public_ci::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
index d705678dc17..9e61b94757a 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
@@ -25,7 +25,7 @@ be_visitor_union_branch_public_constructor_cs (be_visitor_context *ctx)
 
 // destructor
 be_visitor_union_branch_public_constructor_cs::
-~be_visitor_union_branch_public_constructor_cs (void)
+~be_visitor_union_branch_public_constructor_cs ()
 {
 }
 
@@ -35,7 +35,7 @@ be_visitor_union_branch_public_constructor_cs::visit_union_branch (
     be_union_branch *node)
 {
   // first generate the type information
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -66,10 +66,10 @@ int
 be_visitor_union_branch_public_constructor_cs::visit_array (be_array *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -109,7 +109,7 @@ be_visitor_union_branch_public_constructor_cs::visit_array (be_array *node)
 
       if (bt->is_nested ())
         {
-          be_decl *parent = be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+          be_decl *parent = dynamic_cast<be_scope*> (bt->defined_in ())->decl ();
           ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            bt->local_name ()->get_string ());
         }
@@ -138,10 +138,10 @@ be_visitor_union_branch_public_constructor_cs::visit_predefined_type (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -184,10 +184,10 @@ int
 be_visitor_union_branch_public_constructor_cs::visit_sequence (be_sequence *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -221,10 +221,10 @@ int
 be_visitor_union_branch_public_constructor_cs::visit_structure (be_structure *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -262,7 +262,7 @@ be_visitor_union_branch_public_constructor_cs::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -285,7 +285,7 @@ be_visitor_union_branch_public_constructor_cs::visit_typedef (be_typedef *node)
                          ), -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -293,10 +293,10 @@ int
 be_visitor_union_branch_public_constructor_cs::visit_union (be_union *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -331,7 +331,7 @@ be_visitor_union_branch_public_constructor_cs::visit_union_fwd (
   be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
index 66141aeaa36..ff30a28028a 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
@@ -22,14 +22,14 @@ be_visitor_union_branch_public_cs::be_visitor_union_branch_public_cs (
 {
 }
 
-be_visitor_union_branch_public_cs::~be_visitor_union_branch_public_cs (void)
+be_visitor_union_branch_public_cs::~be_visitor_union_branch_public_cs ()
 {
 }
 
 int
 be_visitor_union_branch_public_cs::visit_union_branch (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -155,7 +155,7 @@ int
 be_visitor_union_branch_public_cs::visit_structure_fwd (be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -183,7 +183,7 @@ int
 be_visitor_union_branch_public_cs::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
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 ec3bb50f589..8f5be509a22 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
@@ -23,7 +23,7 @@ be_visitor_union_branch_public_reset_cs (be_visitor_context *ctx)
 }
 
 be_visitor_union_branch_public_reset_cs::
-~be_visitor_union_branch_public_reset_cs (void)
+~be_visitor_union_branch_public_reset_cs ()
 {
 }
 
@@ -33,7 +33,7 @@ be_visitor_union_branch_public_reset_cs::visit_union_branch (
     be_union_branch *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -109,10 +109,10 @@ int
 be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -123,7 +123,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
       bt = node;
     }
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -151,7 +151,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
 
       if (bt->is_nested ())
         {
-          be_decl *parent = be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+          be_decl *parent = dynamic_cast<be_scope*> (bt->defined_in ())->decl ();
           ACE_OS::sprintf (fname, "%s::_%s", parent->full_name (),
                            bt->local_name ()->get_string ());
         }
@@ -178,11 +178,11 @@ int
 be_visitor_union_branch_public_reset_cs::visit_enum (be_enum *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -198,11 +198,11 @@ int
 be_visitor_union_branch_public_reset_cs::visit_interface (be_interface *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -225,11 +225,11 @@ int
 be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -253,11 +253,11 @@ be_visitor_union_branch_public_reset_cs::visit_valuebox (
   be_valuebox *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -281,11 +281,11 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype (
   be_valuetype *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -309,11 +309,11 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd (
   be_valuetype_fwd *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -338,11 +338,11 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -390,11 +390,11 @@ be_visitor_union_branch_public_reset_cs::visit_sequence (
   be_sequence *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -419,11 +419,11 @@ be_visitor_union_branch_public_reset_cs::visit_string (
   be_string *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -456,10 +456,10 @@ be_visitor_union_branch_public_reset_cs::visit_structure (
   be_structure *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
-  be_type *bt = 0;
+    dynamic_cast<be_union*> (this->ctx_->scope ());
+  be_type *bt = nullptr;
 
   if (this->ctx_->alias ())
     {
@@ -470,7 +470,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure (
       bt = node;
     }
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -499,7 +499,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure_fwd (
   be_structure_fwd *node)
 {
   be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_structure*> (node->full_definition ());
 
   return this->visit_structure (s);
 }
@@ -521,7 +521,7 @@ be_visitor_union_branch_public_reset_cs::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -530,11 +530,11 @@ be_visitor_union_branch_public_reset_cs::visit_union (
   be_union *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_union_branch*> (this->ctx_->node ());
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    dynamic_cast<be_union*> (this->ctx_->scope ());
 
-  if (ub == 0 || bu == 0)
+  if (ub == nullptr || bu == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -558,7 +558,7 @@ be_visitor_union_branch_public_reset_cs::visit_union_fwd (
   be_union_fwd *node)
 {
   be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_union*> (node->full_definition ());
 
   return this->visit_union (u);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
index ae6aa99cb26..a85d4be6e2a 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
@@ -18,7 +18,7 @@ be_visitor_union_fwd_ch::be_visitor_union_fwd_ch (
 {
 }
 
-be_visitor_union_fwd_ch::~be_visitor_union_fwd_ch (void)
+be_visitor_union_fwd_ch::~be_visitor_union_fwd_ch ()
 {
 }
 
@@ -32,7 +32,7 @@ be_visitor_union_fwd_ch::visit_union_fwd (be_union_fwd *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  be_union *fd = be_union::narrow_from_decl (node->full_definition ());
+  be_union *fd = dynamic_cast<be_union*> (node->full_definition ());
 
   // This will be a no-op if it has already been done for this node.
   fd->gen_common_varout (os);
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 7e722cc43d7..7d17a24f206 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
@@ -23,7 +23,7 @@ be_visitor_valuebox_any_op_ch::be_visitor_valuebox_any_op_ch (
 {
 }
 
-be_visitor_valuebox_any_op_ch::~be_visitor_valuebox_any_op_ch (void)
+be_visitor_valuebox_any_op_ch::~be_visitor_valuebox_any_op_ch ()
 {
 }
 
@@ -42,12 +42,12 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
-      module = be_module::narrow_from_scope (node->defined_in ());
+      module = dynamic_cast<be_module*> (node->defined_in ());
 
       if (!module)
         {
@@ -97,11 +97,11 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
 
-  node->cli_hdr_any_op_gen (1);
+  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 ce748c930f4..082faf2daf5 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
@@ -24,7 +24,7 @@ be_visitor_valuebox_any_op_cs::be_visitor_valuebox_any_op_cs (
 {
 }
 
-be_visitor_valuebox_any_op_cs::~be_visitor_valuebox_any_op_cs (void)
+be_visitor_valuebox_any_op_cs::~be_visitor_valuebox_any_op_cs ()
 {
 }
 
@@ -67,12 +67,12 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
-      module = be_module::narrow_from_scope (node->defined_in ());
+      module = dynamic_cast<be_module*> (node->defined_in ());
 
       if (!module)
         {
@@ -184,11 +184,11 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
 
-  node->cli_stub_any_op_gen (1);
+  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 61198c688a9..30afffb23ee 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
@@ -19,7 +19,7 @@ be_visitor_valuebox_cdr_op_ch::be_visitor_valuebox_cdr_op_ch (
 {
 }
 
-be_visitor_valuebox_cdr_op_ch::~be_visitor_valuebox_cdr_op_ch (void)
+be_visitor_valuebox_cdr_op_ch::~be_visitor_valuebox_cdr_op_ch ()
 {
 }
 
@@ -50,6 +50,6 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
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 96b6b5bbae1..b1dd90b58f9 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
@@ -19,7 +19,7 @@ be_visitor_valuebox_cdr_op_cs::be_visitor_valuebox_cdr_op_cs (
 {
 }
 
-be_visitor_valuebox_cdr_op_cs::~be_visitor_valuebox_cdr_op_cs (void)
+be_visitor_valuebox_cdr_op_cs::~be_visitor_valuebox_cdr_op_cs ()
 {
 }
 
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 b2e000a6e67..fa546645e9b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
@@ -25,14 +25,14 @@ be_visitor_valuebox_field_ch::be_visitor_valuebox_field_ch (
 {
 }
 
-be_visitor_valuebox_field_ch::~be_visitor_valuebox_field_ch (void)
+be_visitor_valuebox_field_ch::~be_visitor_valuebox_field_ch ()
 {
 }
 
 int
 be_visitor_valuebox_field_ch::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -64,7 +64,7 @@ int
 be_visitor_valuebox_field_ch::visit_array (be_array *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -101,7 +101,7 @@ be_visitor_valuebox_field_ch::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent =
-                 be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+                 dynamic_cast<be_scope*> (bt->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -128,7 +128,7 @@ be_visitor_valuebox_field_ch::visit_array (be_array *node)
   *os << "void " << field->local_name () << " (" << fname << ");" << be_nl;
 
   *os << "const " << fname << "_slice *" << field->local_name ()
-      << " (void) const;" << be_nl;
+      << " () const;" << be_nl;
 
   return 0;
 }
@@ -137,7 +137,7 @@ int
 be_visitor_valuebox_field_ch::visit_enum (be_enum *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -173,7 +173,7 @@ int
 be_visitor_valuebox_field_ch::visit_interface (be_interface *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -209,7 +209,7 @@ int
 be_visitor_valuebox_field_ch::visit_interface_fwd (be_interface_fwd *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -259,7 +259,7 @@ int
 be_visitor_valuebox_field_ch::visit_predefined_type (be_predefined_type *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -312,7 +312,7 @@ int
 be_visitor_valuebox_field_ch::visit_sequence (be_sequence *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -350,7 +350,7 @@ int
 be_visitor_valuebox_field_ch::visit_string (be_string *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -401,7 +401,7 @@ int
 be_visitor_valuebox_field_ch::visit_structure (be_structure *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -451,7 +451,7 @@ be_visitor_valuebox_field_ch::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -459,7 +459,7 @@ int
 be_visitor_valuebox_field_ch::visit_union (be_union *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -520,5 +520,5 @@ be_visitor_valuebox_field_ch::emit_member_get (be_decl *field,
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << const_prefix << field_type->name () << type_suffix << " "
-      << field->local_name () << " (void) " << const_method << ";" << be_nl;
+      << field->local_name () << " () " << const_method << ";" << 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 e75c6c8f99b..31bbb25ea69 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
@@ -17,18 +17,18 @@ be_visitor_valuebox_field_ci::be_visitor_valuebox_field_ci (
     be_visitor_context *ctx
   )
   : be_visitor_decl (ctx),
-    vb_node_ (0)
+    vb_node_ (nullptr)
 {
 }
 
-be_visitor_valuebox_field_ci::~be_visitor_valuebox_field_ci (void)
+be_visitor_valuebox_field_ci::~be_visitor_valuebox_field_ci ()
 {
 }
 
 int
 be_visitor_valuebox_field_ci::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -42,7 +42,7 @@ be_visitor_valuebox_field_ci::visit_field (be_field *node)
   // Store the valuebox in the visitor member, then replace the
   // context value with the field node.
   this->vb_node_ =
-    be_valuebox::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_valuebox*> (this->ctx_->node ());
   this->ctx_->node (node);
 
   if (bt->accept (this) == -1)
@@ -63,7 +63,7 @@ int
 be_visitor_valuebox_field_ci::visit_array (be_array *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -99,7 +99,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent =
-                 be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+                 dynamic_cast<be_scope*> (bt->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -138,7 +138,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
 
   *os << "ACE_INLINE const " << fname << "_slice *" << be_nl
       << vb_node_->name () << "::" << field->local_name ()
-      << " (void) const" << be_nl
+      << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->" << field->local_name ()
       << ";" << be_uidt_nl
@@ -151,7 +151,7 @@ int
 be_visitor_valuebox_field_ci::visit_enum (be_enum *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -188,7 +188,7 @@ int
 be_visitor_valuebox_field_ci::visit_interface (be_interface *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -234,7 +234,7 @@ int
 be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -308,7 +308,7 @@ int
 be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -370,7 +370,7 @@ int
 be_visitor_valuebox_field_ci::visit_sequence (be_sequence *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -407,7 +407,7 @@ int
 be_visitor_valuebox_field_ci::visit_string (be_string *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -465,7 +465,7 @@ int
 be_visitor_valuebox_field_ci::visit_structure (be_structure *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -513,7 +513,7 @@ be_visitor_valuebox_field_ci::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -521,7 +521,7 @@ int
 be_visitor_valuebox_field_ci::visit_union (be_union *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -589,7 +589,7 @@ be_visitor_valuebox_field_ci::emit_member_get (be_decl *field,
   *os << "ACE_INLINE " << const_prefix << field_type->name () << type_suffix
       << be_nl
       << vb_node_->name () << "::" << field->local_name ()
-      << " (void) " << const_method << be_nl
+      << " () " << const_method << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->" << field->local_name () << access_modifier
       << ";" << be_uidt_nl
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 7e4b1b20af6..562a4fa0dea 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
@@ -17,18 +17,18 @@ be_visitor_valuebox_union_member_ci::be_visitor_valuebox_union_member_ci (
     be_visitor_context *ctx
   )
   : be_visitor_decl (ctx),
-    vb_node_ (0)
+    vb_node_ (nullptr)
 {
 }
 
-be_visitor_valuebox_union_member_ci::~be_visitor_valuebox_union_member_ci (void)
+be_visitor_valuebox_union_member_ci::~be_visitor_valuebox_union_member_ci ()
 {
 }
 
 int
 be_visitor_valuebox_union_member_ci::visit_union_member (be_union_branch *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -40,7 +40,7 @@ be_visitor_valuebox_union_member_ci::visit_union_member (be_union_branch *node)
     }
 
   this->vb_node_ =
-    be_valuebox::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_valuebox*> (this->ctx_->node ());
   this->ctx_->node (node);
 
   if (bt->accept (this) == -1)
@@ -61,7 +61,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -97,7 +97,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent =
-                 be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+                 dynamic_cast<be_scope*> (bt->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -135,7 +135,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
 
   *os << "ACE_INLINE const " << fname << "_slice *" << be_nl
       << vb_node_->name () << "::" << field->local_name ()
-      << " (void) const" << be_nl
+      << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->" << field->local_name ()
       << " ();" << be_uidt_nl
@@ -148,7 +148,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_enum (be_enum *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -185,7 +185,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_interface (be_interface *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -221,7 +221,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_interface_fwd (be_interface_fwd *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -271,7 +271,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_predefined_type (be_predefined_type *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -324,7 +324,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_sequence (be_sequence *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -361,7 +361,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_string (be_string *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -419,7 +419,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_structure (be_structure *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -467,7 +467,7 @@ be_visitor_valuebox_union_member_ci::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -475,7 +475,7 @@ int
 be_visitor_valuebox_union_member_ci::visit_union (be_union *node)
 {
   be_decl *field = this->ctx_->node ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -544,7 +544,7 @@ be_visitor_valuebox_union_member_ci::emit_member_get (
   *os << "ACE_INLINE " << const_prefix << field_type->name () << type_suffix
       << be_nl
       << vb_node_->name () << "::" << field->local_name ()
-      << " (void) " << const_method << be_nl
+      << " () " << const_method << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->" << field->local_name ()
       << " ();" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp
index e710cc01783..12bf1140718 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp
@@ -16,7 +16,7 @@ be_visitor_valuebox::be_visitor_valuebox (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuebox::~be_visitor_valuebox (void)
+be_visitor_valuebox::~be_visitor_valuebox ()
 {
 }
 
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 62a5ea3c573..56f8e7ee686 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
@@ -20,7 +20,7 @@ be_visitor_valuebox_ch::be_visitor_valuebox_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuebox_ch::~be_visitor_valuebox_ch (void)
+be_visitor_valuebox_ch::~be_visitor_valuebox_ch ()
 {
 }
 
@@ -72,17 +72,17 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
       << "_downcast ( ::CORBA::ValueBase *);" << be_nl;
 
   // _copy_value method
-  *os << "::CORBA::ValueBase * _copy_value (void);" << be_nl_2;
+  *os << "::CORBA::ValueBase * _copy_value ();" << be_nl_2;
 
   // repository id methods
   *os << "virtual const char* "
-      << "_tao_obv_repository_id (void) const;"
+      << "_tao_obv_repository_id () const;"
       << be_nl_2
       << "virtual void "
       << "_tao_obv_truncatable_repo_ids (Repository_Id_List &ids) const;"
       << be_nl_2
       << "static const char* "
-      << "_tao_obv_static_repository_id (void);" << be_nl_2;
+      << "_tao_obv_static_repository_id ();" << be_nl_2;
 
   // unmarshal method
   *os << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl
@@ -92,11 +92,11 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
 
   if (be_global->tc_support ())
     {
-      *os << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"
+      *os << "virtual ::CORBA::TypeCode_ptr _tao_type () const;"
           << be_nl_2;
     }
 
-  be_type *bt = be_type::narrow_from_decl (node->boxed_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->boxed_type ());
 
   // Emit the type specific elements.  The visit_* methods in this
   // module do that work.
@@ -117,7 +117,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
 
   *os << be_uidt_nl << be_nl << "protected:" << be_idt_nl;
 
-  *os << "virtual ~" << node->local_name () << " (void);" << be_nl;
+  *os << "virtual ~" << node->local_name () << " ();" << be_nl;
 
   // Methods for marshalling and unmarshalling the value
   *os << "virtual ::CORBA::Boolean "
@@ -183,9 +183,9 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
   *os << "// Accessors and modifier" << be_nl;
 
   *os << "const " << node->full_name () << "_slice* "
-      << "_value (void) const;" << be_nl;
+      << "_value () const;" << be_nl;
 
-  *os << node->full_name () << "_slice* " << "_value (void);" << be_nl;
+  *os << node->full_name () << "_slice* " << "_value ();" << be_nl;
 
   *os << "void" << " _value (const " << node->full_name () << " val);"
       << be_nl_2;
@@ -200,12 +200,12 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
 
   // Explicit conversion functions
   *os << "const " << node->full_name ()
-      << "_slice * _boxed_in (void) const;"
+      << "_slice * _boxed_in () const;"
       << be_nl;
 
-  *os << node->full_name () << "_slice * _boxed_inout (void);" << be_nl;
+  *os << node->full_name () << "_slice * _boxed_inout ();" << be_nl;
 
-  *os << node->full_name () << "_slice * _boxed_out (void);" << be_nl
+  *os << node->full_name () << "_slice * _boxed_out ();" << be_nl
       << be_nl;
 
   // Member variable of underlying type;
@@ -268,9 +268,9 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
 
   // Retrieve the base type since we will need to do some code
   // generation for it.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_ch::"
@@ -362,8 +362,8 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
     }
 
   *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl_2
-      << "::CORBA::ULong maximum (void) const;" << be_nl
-      << "::CORBA::ULong length (void) const;" << be_nl
+      << "::CORBA::ULong maximum () const;" << be_nl
+      << "::CORBA::ULong length () const;" << be_nl
       << "void length ( ::CORBA::ULong len);" << be_nl_2;
 
   // Member variable of underlying type;
@@ -435,7 +435,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
 
   // Accessor function takes no arguments and returns a const char *
   *os << "const " << node->full_name ()
-      << " _value (void) const;" << be_nl_2;
+      << " _value () const;" << be_nl_2;
 
   *os << "// Modifiers" << be_nl;
 
@@ -507,9 +507,9 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
   // member.  These functions have the same signatures as
   // acessor and modifier functions for union members.
 
-  AST_Decl *d = 0;
-  AST_Field *field = 0;
-  be_type *bt = 0;
+  AST_Decl *d = nullptr;
+  AST_Field *field = nullptr;
+  be_type *bt = nullptr;
   be_visitor_context ctx (*this->ctx_);
 
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
@@ -518,7 +518,7 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
     {
       d = si.item ();
 
-      if (d == 0 || (field = AST_Field::narrow_from_decl (d)) == 0)
+      if (d == nullptr || (field = dynamic_cast<AST_Field*> (d)) == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) be_visitor_valuebox_ch::visit_structure -"
@@ -526,10 +526,10 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
           break;
         }
 
-      bt = be_type::narrow_from_decl (field->field_type ());
+      bt = dynamic_cast<be_type*> (field->field_type ());
 
       // Set the node to be visited
-      ctx.node (be_decl::narrow_from_decl (d));
+      ctx.node (dynamic_cast<be_decl*> (d));
 
       // Create a visitor and use that to process the type.
       be_visitor_valuebox_field_ch visitor (&ctx);
@@ -608,9 +608,9 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
   // Now generate the accessor and modifier functions for each union
   // member.
 
-  AST_Decl *d = 0;
-  AST_Field *field = 0;
-  be_type *bt = 0;
+  AST_Decl *d = nullptr;
+  AST_Field *field = nullptr;
+  be_type *bt = nullptr;
   be_visitor_context ctx (*this->ctx_);
 
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
@@ -619,7 +619,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
     {
       d = si.item ();
 
-      if (d == 0 || (field = AST_Field::narrow_from_decl (d)) == 0)
+      if (d == nullptr || (field = dynamic_cast<AST_Field*> (d)) == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) be_visitor_valuebox_ch::visit_union -"
@@ -627,10 +627,10 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
           break;
         }
 
-      bt = be_type::narrow_from_decl (field->field_type ());
+      bt = dynamic_cast<be_type*> (field->field_type ());
 
       // Set the node to be visited
-      ctx.node (be_decl::narrow_from_decl (d));
+      ctx.node (dynamic_cast<be_decl*> (d));
 
       // Create a visitor and use that to process the type.
       be_visitor_valuebox_field_ch visitor (&ctx);
@@ -644,7 +644,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
     }
 
   // Retrieve the disriminant type.
-  bt = be_type::narrow_from_decl (node->disc_type ());
+  bt = dynamic_cast<be_type*> (node->disc_type ());
 
   if (!bt)
     {
@@ -725,7 +725,7 @@ be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node,
       *os << "// Accessor and modifier" << be_nl;
 
       *os << node->full_name () << type_suffix
-          << " _value (void) const;" << be_nl;
+          << " _value () const;" << be_nl;
 
       *os << "void" << " _value (" << node->full_name () << type_suffix
           << " val);" << be_nl_2;
@@ -741,7 +741,7 @@ be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node,
 }
 
 void
-be_visitor_valuebox_ch::emit_default_constructor (void)
+be_visitor_valuebox_ch::emit_default_constructor ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -751,7 +751,7 @@ be_visitor_valuebox_ch::emit_default_constructor (void)
   *os << be_nl_2 << "// Constructors" << be_nl;
 
   // Public default constructor
-  *os << vb_node->local_name () << " (void);" << be_nl;
+  *os << vb_node->local_name () << " ();" << be_nl;
 }
 
 void
@@ -771,7 +771,7 @@ be_visitor_valuebox_ch::emit_constructor_one_arg (be_decl *node,
 }
 
 void
-be_visitor_valuebox_ch::emit_copy_constructor (void)
+be_visitor_valuebox_ch::emit_copy_constructor ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -812,11 +812,11 @@ be_visitor_valuebox_ch::emit_boxed_access (be_decl *node,
 
   // Access to the boxed value for method signatures
   *os << const_prefix << node->full_name () << type_suffix << in_ref_modifier
-      << " _boxed_in (void) const;" << be_nl
+      << " _boxed_in () const;" << be_nl
       << node->full_name () << type_suffix << "&"
-      << " _boxed_inout (void);" << be_nl
+      << " _boxed_inout ();" << be_nl
       << node->full_name () << type_suffix << out_ref_modifier << "&"
-      << " _boxed_out (void);" << be_nl;
+      << " _boxed_out ();" << be_nl;
 }
 
 void
@@ -827,11 +827,11 @@ be_visitor_valuebox_ch::emit_accessor_modifier (be_decl *node)
   *os << "// Accessors and modifier" << be_nl;
 
   // Public accessor method (const)
-  *os << "const " << node->full_name () << "& _value (void) const;"
+  *os << "const " << node->full_name () << "& _value () const;"
       << be_nl;
 
   // Public accessor method
-  *os << node->full_name () << "& _value (void);" << be_nl;
+  *os << node->full_name () << "& _value ();" << be_nl;
 
   // Public modifier method
   *os << "void" << " _value (const " << node->full_name () << "& val);"
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 37efd925b18..1e1f560c15c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -16,7 +16,7 @@ be_visitor_valuebox_ci::be_visitor_valuebox_ci (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuebox_ci::~be_visitor_valuebox_ci (void)
+be_visitor_valuebox_ci::~be_visitor_valuebox_ci ()
 {
 }
 
@@ -33,7 +33,7 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
 
   this->ctx_->node (node); // save the node
 
-  be_type *bt = be_type::narrow_from_decl (node->boxed_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->boxed_type ());
 
   // Emit the type specific elements.  The visit_* methods in this
   // module do that work.
@@ -73,7 +73,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
 
   // Public default constructor
   *os << "ACE_INLINE" << be_nl
-      << vb_node->name () << "::" << vb_node->local_name () << " (void)"
+      << vb_node->name () << "::" << vb_node->local_name () << " ()"
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value = " << node->full_name () << "_alloc ();"
       << be_uidt_nl << "}" << be_nl_2;
@@ -111,13 +111,13 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
 
   // Public accessor and modifier methods
   *os << "ACE_INLINE const " << node->full_name () << "_slice*" << be_nl
-      << vb_node->name () << "::_value (void) const" << be_nl
+      << vb_node->name () << "::_value () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "_slice*" << be_nl
-      << vb_node->name () << "::_value (void)" << be_nl
+      << vb_node->name () << "::_value ()" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl_2;
@@ -146,19 +146,19 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
 
   // Explicit conversion functions
   *os << "ACE_INLINE const " << node->full_name () << "_slice *" << be_nl
-      << vb_node->name () << "::_boxed_in (void) const" << be_nl
+      << vb_node->name () << "::_boxed_in () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl
-      << vb_node->name () << "::_boxed_inout (void)" << be_nl
+      << vb_node->name () << "::_boxed_inout ()" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl
-      << vb_node->name () << "::_boxed_out (void)" << be_nl
+      << vb_node->name () << "::_boxed_out ()" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
       << "}" << be_nl_2;
@@ -228,14 +228,14 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
 
   // Generate maximum() accessor
   *os << "ACE_INLINE ::CORBA::ULong" << be_nl
-      << vb_node->name () << "::maximum (void) const" << be_nl
+      << vb_node->name () << "::maximum () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->maximum ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   // Generate length() accessor
   *os << "ACE_INLINE ::CORBA::ULong" << be_nl
-      << vb_node->name () << "::length (void) const" << be_nl
+      << vb_node->name () << "::length () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->length ();" << be_uidt_nl
       << "}" << be_nl_2;
@@ -325,7 +325,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
 
   // Accessor function takes no arguments and returns a const char *
   *os << "ACE_INLINE const " << node->full_name () << be_nl
-      << vb_node->name () << "::_value (void) const" << be_nl
+      << vb_node->name () << "::_value () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl_2;
@@ -356,19 +356,19 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
 
   // Access to the boxed value for method signatures
   *os << "ACE_INLINE const " << node->full_name () << be_nl
-      << vb_node->name () << "::_boxed_in (void) const" << be_nl
+      << vb_node->name () << "::_boxed_in () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
-      << vb_node->name () << "::_boxed_inout (void)" << be_nl
+      << vb_node->name () << "::_boxed_inout ()" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
-      << vb_node->name () << "::_boxed_out (void)" << be_nl
+      << vb_node->name () << "::_boxed_out ()" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
       << "}" << be_nl_2;
@@ -426,7 +426,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node)
     {
       d = si.item ();
 
-      if (d == 0 || (field = be_field::narrow_from_decl (d)) == 0)
+      if (d == nullptr || (field = dynamic_cast<be_field*> (d)) == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) be_visitor_valuebox_cs::visit_structure -"
@@ -485,7 +485,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
   this->emit_accessor_modifier (node);
 
   be_valuebox *vb_node =
-    be_valuebox::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_valuebox*> (this->ctx_->node ());
 
   if (node->size_type() == AST_Type::FIXED)
     {
@@ -508,7 +508,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
     {
       d = si.item ();
 
-      if (d == 0 || (member = be_union_branch::narrow_from_decl (d)) == 0)
+      if (d == nullptr || (member = dynamic_cast<be_union_branch*> (d)) == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) be_visitor_valuebox_ci::visit_union -"
@@ -534,8 +534,8 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
 
 
   // Retrieve the disriminant type.
-  be_type *bt = 0;
-  bt = be_type::narrow_from_decl (node->disc_type ());
+  be_type *bt = nullptr;
+  bt = dynamic_cast<be_type*> (node->disc_type ());
 
   if (!bt)
     {
@@ -555,7 +555,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << bt->nested_type_name (node) << be_nl
-      << vb_node->name () << "::_d (void) const" << be_nl
+      << vb_node->name () << "::_d () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->_d ();" << be_uidt_nl
       << "}" << be_nl_2;
@@ -596,7 +596,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
 
       // Public accessor method
       *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl
-          << vb_node->name () << "::_value (void) const" << be_nl
+          << vb_node->name () << "::_value () const" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
           << "}" << be_nl_2;
@@ -612,19 +612,19 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
 
       // Explicit conversion functions
       *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl
-          << vb_node->name () << "::_boxed_in (void) const" << be_nl
+          << vb_node->name () << "::_boxed_in () const" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
           << "}" << be_nl_2;
 
       *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl
-          << vb_node->name () << "::_boxed_inout (void)" << be_nl
+          << vb_node->name () << "::_boxed_inout ()" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
           << "}" << be_nl_2;
 
       *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl
-          << vb_node->name () << "::_boxed_out (void)" << be_nl
+          << vb_node->name () << "::_boxed_out ()" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
           << "}" << be_nl_2;
@@ -635,7 +635,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
 }
 
 void
-be_visitor_valuebox_ci::emit_default_constructor (void)
+be_visitor_valuebox_ci::emit_default_constructor ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -645,7 +645,7 @@ be_visitor_valuebox_ci::emit_default_constructor (void)
   // Public default constructor
   *os << "ACE_INLINE" << be_nl;
   *os << vb_node->name () << "::" << vb_node->local_name ()
-      << " (void)" << be_nl;
+      << " ()" << be_nl;
   *os << "{}" << be_nl_2;
 }
 
@@ -657,11 +657,11 @@ be_visitor_valuebox_ci::emit_default_constructor_alloc (be_decl *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ci
   be_decl * vb_node = this->ctx_->node ();
   bool node_not_pod =
-    be_type::narrow_from_decl (node)->size_type () == AST_Type::VARIABLE;
+    dynamic_cast<be_type*> (node)->size_type () == AST_Type::VARIABLE;
 
   // Public default constructor
   *os << "ACE_INLINE" << be_nl
-      << vb_node->name () << "::" << vb_node->local_name () << " (void)"
+      << vb_node->name () << "::" << vb_node->local_name () << " ()"
       << be_nl << "{" << be_idt_nl
       << node->full_name () << "* p = 0;" << be_nl
       << "ACE_NEW (" << be_idt_nl
@@ -712,7 +712,7 @@ be_visitor_valuebox_ci::emit_constructor_one_arg_alloc (be_decl *node)
 }
 
 void
-be_visitor_valuebox_ci::emit_copy_constructor (void)
+be_visitor_valuebox_ci::emit_copy_constructor ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -809,14 +809,14 @@ be_visitor_valuebox_ci::emit_accessor_modifier (be_decl *node)
 
   // Public accessor method (const)
   *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl
-      << vb_node->name () << "::_value (void) const" << be_nl
+      << vb_node->name () << "::_value () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   // Public accessor method
   *os << "ACE_INLINE " << node->full_name () << " &" << be_nl
-      << vb_node->name () << "::_value (void)" << be_nl
+      << vb_node->name () << "::_value ()" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl_2;
@@ -845,20 +845,20 @@ be_visitor_valuebox_ci::emit_boxed_access (be_decl *node,
 
   // Access to the boxed value for method signatures
   *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl
-      << vb_node->name () << "::_boxed_in (void) const" << be_nl
+      << vb_node->name () << "::_boxed_in () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
-      << vb_node->name () << "::_boxed_inout (void)" << be_nl
+      << vb_node->name () << "::_boxed_inout ()" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name ()
       << out_ref_modifier << "&" << be_nl
-      << vb_node->name () << "::_boxed_out (void)" << be_nl
+      << vb_node->name () << "::_boxed_out ()" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
       << "}" << be_nl_2;
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 b007c1311e2..97ee366b542 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -16,7 +16,7 @@ be_visitor_valuebox_cs::be_visitor_valuebox_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuebox_cs::~be_visitor_valuebox_cs (void)
+be_visitor_valuebox_cs::~be_visitor_valuebox_cs ()
 {
 }
 
@@ -94,7 +94,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   // _copy_value method
   *os << "::CORBA::ValueBase *" << be_nl
-      << node->name () << "::_copy_value (void)" << be_nl
+      << node->name () << "::_copy_value ()" << be_nl
       << "{" << be_idt_nl
       << "::CORBA::ValueBase *result = 0;" << be_nl
       << "ACE_NEW_RETURN (" << be_idt_nl
@@ -106,7 +106,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   // The _tao_obv_repository_id method.
   *os << "const char *" << be_nl
-      << node->name () << "::_tao_obv_repository_id (void) const"
+      << node->name () << "::_tao_obv_repository_id () const"
       << be_nl << "{" << be_idt_nl
       << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl
       << "}" << be_nl_2;
@@ -155,7 +155,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
     {
       *os << "// TAO extension - the virtual _type method." << be_nl;
       *os << "::CORBA::TypeCode_ptr " << node->name ()
-          << "::_tao_type (void) const" << be_nl;
+          << "::_tao_type () const" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
       *os << "}" << be_nl_2;
@@ -165,7 +165,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
   os = tao_cg->client_stubs ();
 
   AST_Type * at = node->boxed_type()->unaliased_type();
-  be_type *bt = be_type::narrow_from_decl (at);
+  be_type *bt = dynamic_cast<be_type*> (at);
 
   if (!bt)
     {
@@ -178,9 +178,9 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   bool is_array = false;
   const char * unmarshal_arg;
-  be_predefined_type *bpt = be_predefined_type::narrow_from_decl (bt);
+  be_predefined_type *bpt = dynamic_cast<be_predefined_type*> (bt);
 
-  if (bpt != 0)
+  if (bpt != nullptr)
     {
       switch (bpt->pt())
         {
@@ -214,7 +214,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
           unmarshal_arg = "vb_object->_pd_value";
         }
     }
-  else if (be_array::narrow_from_decl (bt) != 0)
+  else if (dynamic_cast<be_array*> (bt) != nullptr)
     {
       is_array = true;
       unmarshal_arg = "temp";
@@ -270,8 +270,8 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   *os << "return (strm >> ";
 
-  be_string *str = be_string::narrow_from_decl (bt);
-  if (str != 0 &&
+  be_string *str = dynamic_cast<be_string*> (bt);
+  if (str != nullptr &&
       str->max_size ()->ev ()->u.ulval != 0)
     {
       if (str->width () == (long) sizeof (char))
@@ -448,9 +448,9 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
 
   // Retrieve the base type since we will need to do some code
   // generation for it.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->base_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_cs::"
@@ -721,7 +721,7 @@ be_visitor_valuebox_cs::visit_union (be_union *)
 }
 
 void
-be_visitor_valuebox_cs::emit_destructor (void)
+be_visitor_valuebox_cs::emit_destructor ()
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
@@ -729,7 +729,7 @@ be_visitor_valuebox_cs::emit_destructor (void)
   be_decl * const vb_node = this->ctx_->node ();
 
   // Protected destructor
-  os << vb_node->name () << "::~" << vb_node->local_name () << " (void)"
+  os << vb_node->name () << "::~" << vb_node->local_name () << " ()"
      << be_nl << "{" << be_nl << "}" << be_nl_2;
 }
 
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 7eca7e52a20..e36744ab7c6 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
@@ -23,7 +23,7 @@ be_visitor_valuetype_any_op_ch::be_visitor_valuetype_any_op_ch (
 {
 }
 
-be_visitor_valuetype_any_op_ch::~be_visitor_valuetype_any_op_ch (void)
+be_visitor_valuetype_any_op_ch::~be_visitor_valuetype_any_op_ch ()
 {
 }
 
@@ -42,12 +42,12 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
-      module = be_module::narrow_from_scope (node->defined_in ());
+      module = dynamic_cast<be_module*> (node->defined_in ());
 
       if (!module)
         {
@@ -97,12 +97,12 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
 
-  node->cli_hdr_any_op_gen (1);
+  node->cli_hdr_any_op_gen (true);
   return 0;
 }
 
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 dfb80cfc402..e12e0aea8cf 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
@@ -23,7 +23,7 @@ be_visitor_valuetype_any_op_cs::be_visitor_valuetype_any_op_cs (
 {
 }
 
-be_visitor_valuetype_any_op_cs::~be_visitor_valuetype_any_op_cs (void)
+be_visitor_valuetype_any_op_cs::~be_visitor_valuetype_any_op_cs ()
 {
 }
 
@@ -66,12 +66,12 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
-      module = be_module::narrow_from_scope (node->defined_in ());
+      module = dynamic_cast<be_module*> (node->defined_in ());
 
       if (!module)
         {
@@ -202,12 +202,12 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   *os << be_global->core_versioning_end () << be_nl;
 
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
 
-  node->cli_stub_any_op_gen (1);
+  node->cli_stub_any_op_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index a6b3d354ecf..3047404a425 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -25,7 +25,7 @@ be_visitor_obv_operation_arglist::be_visitor_obv_operation_arglist (
 {
 }
 
-be_visitor_obv_operation_arglist::~be_visitor_obv_operation_arglist (void)
+be_visitor_obv_operation_arglist::~be_visitor_obv_operation_arglist ()
 {
 }
 
@@ -33,15 +33,15 @@ bool
 be_visitor_obv_operation_arglist::is_amh_exception_holder (be_operation *node)
 {
   UTL_Scope *scope = node->defined_in ();
-  be_interface *iface = be_interface::narrow_from_scope (scope);
+  be_interface *iface = dynamic_cast<be_interface*> (scope);
 
-  if (iface != 0)
+  if (iface != nullptr)
     {
       if (ACE_OS::strncmp (iface->local_name (), "AMH_", 4) == 0)
         {
           const char *last_E = ACE_OS::strrchr (iface->full_name (), 'E');
 
-          if (last_E != 0
+          if (last_E != nullptr
               && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0)
             {
               return true;
@@ -79,7 +79,7 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
     }
   else
     {
-      *os << "void)";
+      *os << ")";
     }
 
   be_visitor_context ctx = *this->ctx_;
@@ -121,16 +121,16 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node)
   // inside the scope of the interface node. In such cases, we would like to
   // generate the appropriate relative scoped names.
   be_operation *op =
-    be_operation::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_operation*> (this->ctx_->node ());
 
   // Sometimes the operation is stored in the context scope instead.
-  if (op == 0)
+  if (op == nullptr)
     {
       op =
-        be_operation::narrow_from_scope (this->ctx_->scope ());
+        dynamic_cast<be_operation*> (this->ctx_->scope ());
     }
 
-  if (op == 0)
+  if (op == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_arglist::"
@@ -144,8 +144,8 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node)
   // information from the context.
   // %! use AST_Interface
   be_interface *intf = this->ctx_->attribute ()
-    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_interface::narrow_from_scope (op->defined_in ());
+    ? dynamic_cast<be_interface*> (this->ctx_->attribute ()->defined_in ())
+    : dynamic_cast<be_interface*> (op->defined_in ());
 
   if (!intf)
     {
@@ -160,7 +160,7 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node)
   ctx.node (node); // save the argument node
 
   // Retrieve the type.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
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 51920f0783d..d25849117d9 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
@@ -19,7 +19,7 @@ be_visitor_valuetype_cdr_op_ch::be_visitor_valuetype_cdr_op_ch (
 {
 }
 
-be_visitor_valuetype_cdr_op_ch::~be_visitor_valuetype_cdr_op_ch (void)
+be_visitor_valuetype_cdr_op_ch::~be_visitor_valuetype_cdr_op_ch ()
 {
 }
 
@@ -87,7 +87,7 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       visitor.visit_valuetype (node);
     }
 
-  node->cli_hdr_cdr_op_gen (1);
+  node->cli_hdr_cdr_op_gen (true);
   return 0;
 }
 
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 4c2213e6315..2e5ba73463d 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
@@ -19,7 +19,7 @@ be_visitor_valuetype_cdr_op_cs::be_visitor_valuetype_cdr_op_cs (
 {
 }
 
-be_visitor_valuetype_cdr_op_cs::~be_visitor_valuetype_cdr_op_cs (void)
+be_visitor_valuetype_cdr_op_cs::~be_visitor_valuetype_cdr_op_cs ()
 {
 }
 
@@ -127,9 +127,9 @@ be_visitor_valuetype_cdr_op_cs::visit_eventtype (be_eventtype *node)
 int
 be_visitor_valuetype_cdr_op_cs::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
-  if (bt == 0)
+  if (bt == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_ci::"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
index fd41d88450a..4907f67849a 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
@@ -24,14 +24,14 @@ be_visitor_valuetype_field_cdr_ch::be_visitor_valuetype_field_cdr_ch (
 {
 }
 
-be_visitor_valuetype_field_cdr_ch::~be_visitor_valuetype_field_cdr_ch (void)
+be_visitor_valuetype_field_cdr_ch::~be_visitor_valuetype_field_cdr_ch ()
 {
 }
 
 int
 be_visitor_valuetype_field_cdr_ch::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -175,7 +175,7 @@ be_visitor_valuetype_field_cdr_ch::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
index bfdfe589c3d..53547d82e7d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
@@ -24,14 +24,14 @@ be_visitor_valuetype_field_cdr_cs::be_visitor_valuetype_field_cdr_cs (
 {
 }
 
-be_visitor_valuetype_field_cdr_cs::~be_visitor_valuetype_field_cdr_cs (void)
+be_visitor_valuetype_field_cdr_cs::~be_visitor_valuetype_field_cdr_cs ()
 {
 }
 
 int
 be_visitor_valuetype_field_cdr_cs::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -63,9 +63,9 @@ be_visitor_valuetype_field_cdr_cs::visit_array (be_array *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -92,7 +92,7 @@ be_visitor_valuetype_field_cdr_cs::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -168,9 +168,9 @@ be_visitor_valuetype_field_cdr_cs::visit_enum (be_enum *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -230,9 +230,9 @@ be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -280,9 +280,9 @@ be_visitor_valuetype_field_cdr_cs::visit_interface_fwd (be_interface_fwd *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -336,9 +336,9 @@ be_visitor_valuetype_field_cdr_cs::valuetype_common (be_type *)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -388,9 +388,9 @@ be_visitor_valuetype_field_cdr_cs::visit_valuetype_fwd (be_valuetype_fwd *)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -458,9 +458,9 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -563,9 +563,9 @@ be_visitor_valuetype_field_cdr_cs::visit_sequence (be_sequence *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -628,9 +628,9 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -644,7 +644,7 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      if (str != 0 && str->max_size ()->ev ()->u.ulval != 0)
+      if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0)
         {
           if (str->width () == (long) sizeof (char))
             {
@@ -666,7 +666,7 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str)
         }
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      if (str != 0 && str->max_size ()->ev ()->u.ulval != 0)
+      if (str != nullptr && str->max_size ()->ev ()->u.ulval != 0)
         {
           if (str->width () == (long) sizeof (char))
             {
@@ -710,9 +710,9 @@ be_visitor_valuetype_field_cdr_cs::visit_structure (
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -782,7 +782,7 @@ be_visitor_valuetype_field_cdr_cs::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -793,9 +793,9 @@ be_visitor_valuetype_field_cdr_cs::visit_union (be_union *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -869,7 +869,7 @@ be_visitor_valuetype_field_cdr_decl::be_visitor_valuetype_field_cdr_decl (
 int
 be_visitor_valuetype_field_cdr_decl::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -902,9 +902,9 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
 
   // Retrieve the field node.
   be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+    dynamic_cast<be_field*> (this->ctx_->node ());
 
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
@@ -915,7 +915,7 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
 
   // Retrieve the valuetype scope in which the code is generated.
   be_decl *sc = this->ctx_->scope ()->decl ();
-  be_valuetype *vt = be_valuetype::narrow_from_decl (sc);
+  be_valuetype *vt = dynamic_cast<be_valuetype*> (sc);
 
   if (!vt)
     {
@@ -944,7 +944,7 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -1006,6 +1006,6 @@ be_visitor_valuetype_field_cdr_decl::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
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 443537afbc7..772ff73a4b4 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -22,14 +22,14 @@ be_visitor_valuetype_field_ch::be_visitor_valuetype_field_ch (
   setenclosings ("", ";");
 }
 
-be_visitor_valuetype_field_ch::~be_visitor_valuetype_field_ch (void)
+be_visitor_valuetype_field_ch::~be_visitor_valuetype_field_ch ()
 {
 }
 
 int
 be_visitor_valuetype_field_ch::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -63,7 +63,7 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -117,10 +117,10 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node)
       // The get method.
       *os << pre_op () << "const _" << bt->local_name ()
           << "_slice * " << ub->local_name ()
-          << " (void) const" << post_op () << be_nl;
+          << " () const" << post_op () << be_nl;
       *os << pre_op () << "_" << bt->local_name ()
           << "_slice * " << ub->local_name ()
-          << " (void)" << post_op ();
+          << " ()" << post_op ();
     }
   else
     {
@@ -131,11 +131,11 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node)
       // The get method.
       *os << pre_op ()
           << bt->name () << "_slice *" << ub->local_name ()
-          << " (void)" << post_op () << be_nl;
+          << " ()" << post_op () << be_nl;
       // The get (read/write) method.
       *os << pre_op () << "const "
           << bt->name () << "_slice *" << ub->local_name ()
-          << " (void) const" << post_op ();
+          << " () const" << post_op ();
     }
 
   return 0;
@@ -146,7 +146,7 @@ be_visitor_valuetype_field_ch::visit_enum (be_enum *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -195,7 +195,7 @@ be_visitor_valuetype_field_ch::visit_enum (be_enum *node)
       << bt->name () << ")" << post_op () << be_nl;
   // The get method.
   *os << pre_op () << bt->name () << " " << ub->local_name ()
-      << " (void) const" << post_op ();
+      << " () const" << post_op ();
 
   return 0;
 }
@@ -205,7 +205,7 @@ be_visitor_valuetype_field_ch::visit_interface (be_interface *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -238,7 +238,7 @@ be_visitor_valuetype_field_ch::visit_interface (be_interface *node)
   // Get method.
   *os << pre_op ()
       << "::" << bt->name () << "_ptr " << ub->local_name ()
-      << " (void) const" << post_op ();
+      << " () const" << post_op ();
 
   return 0;
 }
@@ -248,7 +248,7 @@ be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -281,7 +281,7 @@ be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *node)
   // Get method.
   *os << pre_op ()
       << bt->name () << "_ptr " << ub->local_name ()
-      << " (void) const" << post_op ();
+      << " () const" << post_op ();
 
   return 0;
 }
@@ -291,7 +291,7 @@ be_visitor_valuetype_field_ch::visit_valuebox (be_valuebox *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -324,7 +324,7 @@ be_visitor_valuetype_field_ch::visit_valuebox (be_valuebox *node)
   // Get method.
   *os << pre_op ()
       << bt->name () << " *" << ub->local_name ()
-      << " (void) const" << post_op ();
+      << " () const" << post_op ();
 
   return 0;
 }
@@ -334,7 +334,7 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -367,7 +367,7 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node)
   // Get method.
   *os << pre_op ()
       << bt->name () << " *" << ub->local_name ()
-      << " (void) const" << post_op ();
+      << " () const" << post_op ();
 
   return 0;
 }
@@ -383,7 +383,7 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -416,7 +416,7 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
   // Get method.
   *os << pre_op ()
       << bt->name () << " *" << ub->local_name ()
-      << " (void) const" << post_op ();
+      << " () const" << post_op ();
 
   return 0;
 }
@@ -432,7 +432,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -469,7 +469,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
       // Get method.
       *os << pre_op ()
           << "::" << bt->name () << "_ptr " << ub->local_name ()
-          << " (void) const" << post_op ();
+          << " () const" << post_op ();
       break;
     case AST_PredefinedType::PT_any:
       // Set method.
@@ -478,11 +478,11 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
           << post_op () << be_nl;
       // Get method (read-only).
       *os << pre_op () << "const ::" << bt->name () << " &"
-          << ub->local_name () << " (void) const"
+          << ub->local_name () << " () const"
           << post_op () << be_nl;
       // Get method (read/write).
       *os << pre_op () << "::" << bt->name () << " &"
-          << ub->local_name () << " (void)"
+          << ub->local_name () << " ()"
           << post_op ();
       break;
     case AST_PredefinedType::PT_void:
@@ -495,7 +495,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
       // Get method.
       *os << pre_op () << "::" << bt->name ()
           << " " << ub->local_name ()
-          << " (void) const" << post_op ();
+          << " () const" << post_op ();
     }
 
   return 0;
@@ -506,7 +506,7 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -538,7 +538,7 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
       && this->ctx_->state () != TAO_CodeGen::TAO_VALUETYPE_OBV_CH)
     {
       be_field *member_node =
-        be_field::narrow_from_decl (this->ctx_->node ());
+        dynamic_cast<be_field*> (this->ctx_->node ());
       node->field_node (member_node);
 
       be_visitor_context ctx (*this->ctx_);
@@ -577,11 +577,11 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
       << post_op () << be_nl;
   // Read-only.
   *os << pre_op () << "const " << bt->name () << " &"
-      << ub->local_name  () << " (void) const"
+      << ub->local_name  () << " () const"
       << post_op () << be_nl;
   // Read/write.
   *os << pre_op () << bt->name () << " &" << ub->local_name ()
-      << " (void)"
+      << " ()"
       << post_op ();
 
   return 0;
@@ -621,7 +621,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node)
           << post_op () << be_nl;
       // Get method.
       *os << pre_op () << "const char *" << ub->local_name ()
-          << " (void) const" << post_op ();
+          << " () const" << post_op ();
     }
   else
     {
@@ -636,7 +636,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node)
           << post_op () << be_nl;
       // Get method.
       *os << pre_op() << "const ::CORBA::WChar *" << ub->local_name ()
-          << " (void) const" << post_op();
+          << " () const" << post_op();
     }
 
   return 0;
@@ -647,7 +647,7 @@ be_visitor_valuetype_field_ch::visit_structure (be_structure *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -697,11 +697,11 @@ be_visitor_valuetype_field_ch::visit_structure (be_structure *node)
       << post_op () << be_nl;
     // Read-only.
   *os << pre_op () << "const " << bt->name () << " &";
-  *os << ub->local_name  () << " (void) const"
+  *os << ub->local_name  () << " () const"
       << post_op () << be_nl
     // Read/write.
       << pre_op () << bt->name () << " &" << ub->local_name ()
-      << " (void)" << post_op ();
+      << " ()" << post_op ();
 
   return 0;
 }
@@ -723,7 +723,7 @@ be_visitor_valuetype_field_ch::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -732,7 +732,7 @@ be_visitor_valuetype_field_ch::visit_union (be_union *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_decl *bu = this->ctx_->scope ()->decl ();
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -782,11 +782,11 @@ be_visitor_valuetype_field_ch::visit_union (be_union *node)
       << post_op () << be_nl;
     // Read-only.
   *os << pre_op () << "const " << bt->name () << " &"
-      << ub->local_name  () << " (void) const"
+      << ub->local_name  () << " () const"
       << post_op () << be_nl;
     // Read/write.
   *os << pre_op () << bt->name () << " &" << ub->local_name ()
-      << " (void)" << post_op ();
+      << " ()" << post_op ();
 
   return 0;
 }
@@ -800,13 +800,13 @@ be_visitor_valuetype_field_ch::setenclosings (const char *pre,
 }
 
 const char*
-be_visitor_valuetype_field_ch::pre_op (void)
+be_visitor_valuetype_field_ch::pre_op ()
 {
   return pre_op_;
 }
 
 const char*
-be_visitor_valuetype_field_ch::post_op (void)
+be_visitor_valuetype_field_ch::post_op ()
 {
   return post_op_;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
index d4de857f18b..e765dc4fd1a 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
@@ -17,19 +17,19 @@ be_visitor_valuetype_field_ci::be_visitor_valuetype_field_ci (
     be_visitor_context *ctx
   )
   : be_visitor_decl (ctx),
-    in_obv_space_ (0)
+    in_obv_space_ (false)
 {
   setenclosings ("");
 }
 
-be_visitor_valuetype_field_ci::~be_visitor_valuetype_field_ci (void)
+be_visitor_valuetype_field_ci::~be_visitor_valuetype_field_ci ()
 {
 }
 
 int
 be_visitor_valuetype_field_ci::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -61,8 +61,8 @@ be_visitor_valuetype_field_ci::visit_array (be_array *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -108,8 +108,8 @@ be_visitor_valuetype_field_ci::visit_structure (be_structure *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -155,8 +155,8 @@ be_visitor_valuetype_field_ci::visit_union (be_union *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
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 1630607224e..1e591d5837d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -16,19 +16,19 @@
 be_visitor_valuetype_field_cs::be_visitor_valuetype_field_cs (
     be_visitor_context *ctx)
   : be_visitor_decl (ctx),
-    in_obv_space_ (0)
+    in_obv_space_ (false)
 {
   setenclosings ("");
 }
 
-be_visitor_valuetype_field_cs::~be_visitor_valuetype_field_cs (void)
+be_visitor_valuetype_field_cs::~be_visitor_valuetype_field_cs ()
 {
 }
 
 int
 be_visitor_valuetype_field_cs::visit_field (be_field *node)
 {
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
 
   if (!bt)
     {
@@ -60,8 +60,8 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -117,7 +117,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
       if (bt->is_nested ())
         {
           be_decl *parent =
-                 be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+                 dynamic_cast<be_scope*> (bt->defined_in ())->decl ();
           ACE_OS::sprintf (fname,
                            "%s::_%s",
                            parent->full_name (),
@@ -162,7 +162,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
   this->op_name (bu,
                  os);
 
-  *os << "::" << ub->local_name () << " (void) const" << be_nl
+  *os << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl;
   *os << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
@@ -175,7 +175,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
       this->op_name (bu,
                      os);
 
-  *os << "::" << ub->local_name () << " (void)" << be_nl
+  *os << "::" << ub->local_name () << " ()" << be_nl
       << "{" << be_idt_nl;
   *os << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
@@ -190,8 +190,8 @@ be_visitor_valuetype_field_cs::visit_enum (be_enum *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -259,8 +259,8 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -328,8 +328,8 @@ be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -402,8 +402,8 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -483,8 +483,8 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -559,8 +559,8 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -650,7 +650,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
                      os);
 
       *os << "::" << ub->local_name ()
-          << " (void) const" << be_nl
+          << " () const" << be_nl
           << "{" << be_idt_nl
           << "return this->"
           << bu->field_pd_prefix () << ub->local_name ()
@@ -666,7 +666,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
       this->op_name (bu, os);
 
       *os << "::" << ub->local_name ()
-          << " (void) const" << be_nl
+          << " () const" << be_nl
           << "{" << be_idt_nl
           << "return this->"
           << bu->field_pd_prefix () << ub->local_name ()
@@ -680,7 +680,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
       this->op_name (bu, os);
 
       *os << "::" << ub->local_name ()
-          << " (void)" << be_nl
+          << " ()" << be_nl
           << "{" << be_idt_nl
           << "return this->"
           << bu->field_pd_prefix () << ub->local_name ()
@@ -698,7 +698,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
       this->op_name (bu, os);
 
       *os << "::" << ub->local_name ()
-          << " (void) const" << be_nl
+          << " () const" << be_nl
           << "{" << be_idt_nl
           << "return this->"
           << bu->field_pd_prefix () << ub->local_name ()
@@ -717,8 +717,8 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -785,7 +785,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
                  os);
 
   *os << "::" << ub->local_name ()
-      << " (void) const" << be_nl
+      << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
@@ -799,7 +799,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
   this->op_name (bu,
                  os);
 
-  *os << "::" << ub->local_name () << " (void)" << be_nl
+  *os << "::" << ub->local_name () << " ()" << be_nl
       << "{" << be_idt_nl
       << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
@@ -815,7 +815,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
 
   if (!ub || !bu)
     {
@@ -942,7 +942,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
                  os);
 
   *os << "::" << ub->local_name ()
-      << " (void) const // get method" << be_nl
+      << " () const // get method" << be_nl
       << "{" << be_idt_nl
       << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
@@ -958,8 +958,8 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -1026,7 +1026,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
   this->op_name (bu,
                  os);
 
-  *os << "::" << ub->local_name () << " (void) const" << be_nl
+  *os << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl;
   *os << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
@@ -1040,7 +1040,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
   this->op_name (bu,
                  os);
 
-  *os << "::" << ub->local_name () << " (void)" << be_nl
+  *os << "::" << ub->local_name () << " ()" << be_nl
       << "{" << be_idt_nl;
   *os << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
@@ -1066,7 +1066,7 @@ be_visitor_valuetype_field_cs::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }
 
@@ -1075,8 +1075,8 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
 {
   be_decl *ub = this->ctx_->node ();
   be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
-  be_type *bt = 0;
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -1138,7 +1138,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
   this->op_name (bu,
                  os);
 
-  *os << "::" << ub->local_name () << " (void) const" << be_nl
+  *os << "::" << ub->local_name () << " () const" << be_nl
       << "{" << be_idt_nl
       << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
@@ -1152,7 +1152,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
   this->op_name (bu,
                  os);
 
-  *os << "::" << ub->local_name () << " (void)" << be_nl
+  *os << "::" << ub->local_name () << " ()" << be_nl
       << "{" << be_idt_nl
       << "return this->"
       << bu->field_pd_prefix () << ub->local_name ()
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 55750694cf7..c006b6c6384 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
@@ -23,7 +23,7 @@ be_visitor_valuetype_marshal_ch::be_visitor_valuetype_marshal_ch (
 {
 }
 
-be_visitor_valuetype_marshal_ch::~be_visitor_valuetype_marshal_ch (void)
+be_visitor_valuetype_marshal_ch::~be_visitor_valuetype_marshal_ch ()
 {
 }
 
@@ -47,7 +47,7 @@ be_visitor_valuetype_marshal_ch::visit_valuetype (be_valuetype *node)
 
         }
 
-      be_field *field = be_field::narrow_from_decl (d);
+      be_field *field = dynamic_cast<be_field*> (d);
 
       if (field)
         {
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 9ada107afd1..201b7a51ac1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -19,7 +19,7 @@ be_visitor_valuetype_marshal_cs::be_visitor_valuetype_marshal_cs (
 {
 }
 
-be_visitor_valuetype_marshal_cs::~be_visitor_valuetype_marshal_cs (void)
+be_visitor_valuetype_marshal_cs::~be_visitor_valuetype_marshal_cs ()
 {
 }
 
@@ -42,7 +42,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
 
   // If the valuetype has no fields, and no stateful inherit,
   // the stream arg is unused.
-  if (inh != 0 || node->data_members_count () > 0)
+  if (inh != nullptr || node->data_members_count () > 0)
     {
       *os << "strm";
     }
@@ -50,7 +50,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
   *os << ", TAO_ChunkInfo&";
   // If the valuetype has no fields, and no stateful inherit,
   // the chunking helper arg is unused.
-  if (inh != 0 || node->data_members_count () > 0)
+  if (inh != nullptr || node->data_members_count () > 0)
     {
       *os << "ci";
     }
@@ -137,7 +137,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
 
   // If the valuetype has no fields, and no stateful inherit,
   // the stream arg is unused.
-  if (inh != 0 || node->data_members_count () > 0)
+  if (inh != nullptr || node->data_members_count () > 0)
     {
       *os << "strm";
     }
@@ -145,7 +145,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
   *os << ", TAO_ChunkInfo&";
   // If the valuetype has no fields, and no stateful inherit,
   // the chunking helper arg is unused.
-  if (inh != 0 || node->data_members_count () > 0)
+  if (inh != nullptr || node->data_members_count () > 0)
     {
       *os << "ci";
     }
@@ -219,7 +219,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
 
   this->class_name (node, os);
 
-  *os << "::truncation_hook (void)" << be_nl
+  *os << "::truncation_hook ()" << be_nl
       << "{" << be_idt_nl
       << "this->require_truncation_ = true;" << be_uidt_nl
       << "}" << be_nl_2;
@@ -240,7 +240,7 @@ be_visitor_valuetype_marshal_cs::class_name (be_valuetype *node,
   if (node->opt_accessor ())
     {
       be_decl *scope =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
+        dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
       *os << scope->name () << "::"
           << node->local_name ();
@@ -277,11 +277,11 @@ be_visitor_valuetype_marshal_cs::gen_fields (be_valuetype *node,
 
       // (JP) 2010-10-21
       // be_attribute now inherits from be_field, so we need this check.
-      be_attribute *attr = be_attribute::narrow_from_decl (d);
+      be_attribute *attr = dynamic_cast<be_attribute*> (d);
 
-      be_field *field = be_field::narrow_from_decl (d);
+      be_field *field = dynamic_cast<be_field*> (d);
 
-      if (field != 0 && attr == 0)
+      if (field != nullptr && attr == nullptr)
         {
           if (n_processed > 0)
             {
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 c37e064e80e..584916719f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
@@ -22,7 +22,7 @@ be_visitor_obv_module::be_visitor_obv_module (be_visitor_context *ctx)
 {
 }
 
-be_visitor_obv_module::~be_visitor_obv_module (void)
+be_visitor_obv_module::~be_visitor_obv_module ()
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 473d87baf7c..89ec6a82ac8 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -16,7 +16,7 @@ be_visitor_valuetype::be_visitor_valuetype (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuetype::~be_visitor_valuetype (void)
+be_visitor_valuetype::~be_visitor_valuetype ()
 {
 }
 
@@ -39,7 +39,7 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
                             -1);
         }
 
-      be_decl *bd = be_decl::narrow_from_decl (d);
+      be_decl *bd = dynamic_cast<be_decl*> (d);
       // Set the scope node as "node" in which the code is being
       // generated so that elements in the node's scope can use it
       // for code generation.
@@ -48,9 +48,9 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
       this->ctx_->node (bd);
       this->elem_number_++;
 
-      AST_Field *field = AST_Field::narrow_from_decl (d);
+      AST_Field *field = dynamic_cast<AST_Field*> (d);
 
-      if (field != 0 && field->visibility () == AST_Field::vis_PRIVATE)
+      if (field != nullptr && field->visibility () == AST_Field::vis_PRIVATE)
         {
           this->begin_private ();
         }
@@ -59,7 +59,7 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
           this->begin_public ();
         }
 
-      if (bd == 0 || bd->accept (this) == -1)
+      if (bd == nullptr || bd->accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::visit_scope - "
@@ -96,8 +96,8 @@ be_visitor_valuetype::visit_attribute (be_attribute *node)
   be_operation get_op (node->field_type (),
                        AST_Operation::OP_noflags,
                        node->name (),
-                       0,
-                       0);
+                       false,
+                       false);
 
   get_op.set_name ((UTL_IdList *) node->name ()->copy ());
 
@@ -121,7 +121,7 @@ be_visitor_valuetype::visit_attribute (be_attribute *node)
   Identifier id ("void");
 
   UTL_ScopedName sn (&id,
-                     0);
+                     nullptr);
 
   be_predefined_type rt (AST_PredefinedType::PT_void,
                          &sn);
@@ -138,8 +138,8 @@ be_visitor_valuetype::visit_attribute (be_attribute *node)
   be_operation set_op (&rt,
                        AST_Operation::OP_noflags,
                        node->name (),
-                       0,
-                       0);
+                       false,
+                       false);
 
   set_op.set_name ((UTL_IdList *) node->name ()->copy ());
   set_op.be_add_argument (arg);
@@ -681,10 +681,10 @@ be_visitor_valuetype::gen_pd (be_valuetype *node)
                             -1);
         }
 
-      be_field *field = be_field::narrow_from_decl (d);
-      be_attribute *attr = be_attribute::narrow_from_decl (d);
+      be_field *field = dynamic_cast<be_field*> (d);
+      be_attribute *attr = dynamic_cast<be_attribute*> (d);
 
-      if (field == 0 || attr != 0)
+      if (field == nullptr || attr != nullptr)
         {
           continue;
         }
@@ -719,8 +719,8 @@ be_visitor_valuetype::gen_field_pd (be_field *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // First generate the type information.
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ());
+  be_type *bt = dynamic_cast<be_type*> (node->field_type ());
+  be_valuetype *vt = dynamic_cast<be_valuetype*> (node->defined_in ());
 
   if (!bt || !vt)
     {
@@ -764,10 +764,10 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node,
   AST_Type *parent = node->inherits_concrete ();
 
   // Generate for inherited members first.
-  if (parent != 0)
+  if (parent != nullptr)
     {
       be_valuetype *be_parent =
-        be_valuetype::narrow_from_decl (parent);
+        dynamic_cast<be_valuetype*> (parent);
       this->gen_obv_init_constructor_args (be_parent, index);
     }
 
@@ -780,11 +780,11 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node,
     {
       // be_attribute inherits from be_field
       // so we have to also screen out attributes
-      be_field *f = be_field::narrow_from_decl (si.item ());
+      be_field *f = dynamic_cast<be_field*> (si.item ());
       be_attribute *attr =
-        be_attribute::narrow_from_decl (si.item ());
+        dynamic_cast<be_attribute*> (si.item ());
 
-      if (f == 0 || attr != 0)
+      if (f == nullptr || attr != nullptr)
         {
           continue;
         }
@@ -794,8 +794,8 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node,
       ACE_CString arg_name ("_tao_init_");
       arg_name += f->local_name ()->get_string ();
       Identifier id (arg_name.c_str ());
-      UTL_ScopedName sn (&id, 0);
-      be_type *ft = be_type::narrow_from_decl (f->field_type ());
+      UTL_ScopedName sn (&id, nullptr);
+      be_type *ft = dynamic_cast<be_type*> (f->field_type ());
       bool seen = ft->seen_in_operation ();
 
       // This sets ft->seen_in_operation (true), so we have to
@@ -842,7 +842,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node)
   // Generate the body.
   *os << "{" << be_nl
       << "public:" << be_idt_nl
-      << "virtual ~" << node->local_name () << "_init (void);" << be_nl;
+      << "virtual ~" << node->local_name () << "_init ();" << be_nl;
 
   *os << "virtual const char* tao_repository_id (void);\n" << be_nl;
   *os << "// create () goes here" << be_nl;
@@ -880,11 +880,11 @@ be_visitor_valuetype::gen_init_impl (be_valuetype *node)
                    node->local_name ());
 
   // Destructor.
-  *os << fname << "::~" << lname << " (void)" << be_nl
+  *os << fname << "::~" << lname << " ()" << be_nl
       << "{" << be_nl << "}\n\n";
 
   *os << "const char*" << be_nl
-      << fname << "::tao_repository_id (void)" << be_nl
+      << fname << "::tao_repository_id ()" << be_nl
       << "{" << be_idt_nl
       <<   "return " << node->local_name ()
       <<                "::_tao_obv_static_repository_id ();"
@@ -900,9 +900,9 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node)
   for (int i = 0; i < node->n_inherits (); ++i)
     {
       be_valuetype *vt =
-        be_valuetype::narrow_from_decl (node->inherits ()[i]);
+        dynamic_cast<be_valuetype*> (node->inherits ()[i]);
 
-      if (vt != 0)
+      if (vt != nullptr)
         {
           if (be_visitor_valuetype::obv_have_ref_counter (vt))
             {
@@ -934,7 +934,7 @@ be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node)
 {
 
   // Just try to find a VT with concrete factory in inheritance tree.
-  if (node == 0)
+  if (node == nullptr)
     {
       return false;
     }
@@ -947,9 +947,9 @@ be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node)
   // Now go thru our base VTs.
   for (int i = 0; i < node->n_inherits (); ++i)
     {
-      be_valuetype *vt = be_valuetype::narrow_from_decl (node->inherits ()[i]);
+      be_valuetype *vt = dynamic_cast<be_valuetype*> (node->inherits ()[i]);
 
-      if (vt != 0)
+      if (vt != nullptr)
         {
           if (be_visitor_valuetype::obv_have_ref_counter (vt))
             {
@@ -969,7 +969,7 @@ be_visitor_valuetype::is_amh_exception_holder (be_valuetype *node)
      const char *last_E =
       ACE_OS::strrchr (node->full_name (), 'E');
 
-     if (last_E != 0
+     if (last_E != nullptr
          && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0)
        {
          return true;
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 2528d6619ec..08e9c233fbc 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -22,7 +22,7 @@ be_visitor_valuetype_ch::be_visitor_valuetype_ch (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuetype_ch::~be_visitor_valuetype_ch (void)
+be_visitor_valuetype_ch::~be_visitor_valuetype_ch ()
 {
 }
 
@@ -67,7 +67,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   *os << be_idt_nl << ": " << be_idt;
 
   long i;  // loop index
-  be_valuetype *inherited = 0;
+  be_valuetype *inherited = nullptr;
   long n_inherits = node->n_inherits ();
   int inherits_eventtype = 0;
 
@@ -76,7 +76,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       for (i = 0; i < n_inherits; ++i)
         {
           inherited =
-            be_valuetype::narrow_from_decl (node->inherits ()[i]);
+            dynamic_cast<be_valuetype*> (node->inherits ()[i]);
 
           if (inherited->node_type () == AST_Decl::NT_eventtype)
             {
@@ -88,13 +88,13 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
               *os << "," << be_nl;
             }
 
-          be_decl *scope = 0;
+          be_decl *scope = nullptr;
 
           if (inherited->is_nested ())
             {
               // Inherited node is used in the scope of "node" node.
               scope =
-                be_scope::narrow_from_scope (node->defined_in ())->decl ();
+                dynamic_cast<be_scope*> (node->defined_in ())->decl ();
             }
 
           // Dump the scoped name.
@@ -176,8 +176,8 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
           << node->local_name () << " ( ::CORBA::Exception *ex)" << be_idt_nl
           << ": exception (ex)" << be_uidt_nl
           << "{}" << be_nl_2
-          << "virtual ~" << node->local_name () << " (void);" << be_nl
-          << "virtual ::CORBA::ValueBase *_copy_value (void);";
+          << "virtual ~" << node->local_name () << " ();" << be_nl
+          << "virtual ::CORBA::ValueBase *_copy_value ();";
     }
 
   *os << be_nl_2
@@ -190,18 +190,18 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       << node->local_name () << " *&new_object);" << be_uidt
       << be_uidt_nl << be_nl
       << "virtual const char* "
-      << "_tao_obv_repository_id (void) const;"
+      << "_tao_obv_repository_id () const;"
       << be_nl_2
       << "virtual void "
       << "_tao_obv_truncatable_repo_ids (Repository_Id_List &) const;"
       << be_nl_2
       << "static const char* "
-      << "_tao_obv_static_repository_id (void);";
+      << "_tao_obv_static_repository_id ();";
 
   if (be_global->tc_support ())
     {
       *os << be_nl_2
-          << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;";
+          << "virtual ::CORBA::TypeCode_ptr _tao_type () const;";
     }
 
   // Generate code for the valuetype definition.
@@ -243,20 +243,20 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   if (node->n_supports () > 0)
     {
       *os << be_uidt_nl << be_nl << "public:" << be_idt_nl;
-      *os << be_nl << "virtual void _add_ref (void) = 0;" << be_nl;
-      *os << "virtual void _remove_ref (void) = 0;" << be_nl;
-      *os << "virtual ::CORBA::ValueBase *_tao_to_value (void);";
+      *os << be_nl << "virtual void _add_ref () = 0;" << be_nl;
+      *os << "virtual void _remove_ref () = 0;" << be_nl;
+      *os << "virtual ::CORBA::ValueBase *_tao_to_value ();";
     }
 
   // Generate the "protected" constructor so that users cannot
   // instantiate us.
   *os << be_uidt_nl << be_nl << "protected:" << be_idt_nl
       << node->local_name ()
-      << " (void);" << be_nl;
+      << " ();" << be_nl;
 
   if (!is_an_amh_exception_holder)
     {
-      *os << "virtual ~" << node->local_name () << " (void);"
+      *os << "virtual ~" << node->local_name () << " ();"
           << be_nl_2;
     }
 
@@ -307,7 +307,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
           << "::CORBA::Boolean "
           << "_tao_unmarshal_state (TAO_InputCDR &);" << be_nl
           << "virtual void "
-          << "truncation_hook (void);"
+          << "truncation_hook ();"
           << be_uidt_nl << be_nl;
       *os << "private:" << be_idt_nl;
 
@@ -398,7 +398,7 @@ be_visitor_valuetype_ch::visit_operation (be_operation *node)
   // Every operation is declared public and virtual in the client code.
   *os << be_uidt_nl << "public:" << be_idt_nl << "virtual ";
 
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -443,7 +443,7 @@ be_visitor_valuetype_ch::visit_operation (be_operation *node)
 int
 be_visitor_valuetype_ch::visit_field (be_field *node)
 {
-  be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ());
+  be_valuetype *vt = dynamic_cast<be_valuetype*> (node->defined_in ());
 
   if (!vt)
     {
@@ -475,7 +475,7 @@ be_visitor_valuetype_ch::visit_field (be_field *node)
 
 
 void
-be_visitor_valuetype_ch::begin_public (void)
+be_visitor_valuetype_ch::begin_public ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -484,7 +484,7 @@ be_visitor_valuetype_ch::begin_public (void)
 }
 
 void
-be_visitor_valuetype_ch::begin_private (void)
+be_visitor_valuetype_ch::begin_private ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -498,7 +498,7 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *,
                                             TAO_OutStream *os)
 {
 
-  AST_Decl *d = 0;
+  AST_Decl *d = nullptr;
   be_visitor_context ctx;
   ctx.stream (os);
 
@@ -508,7 +508,7 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *,
     {
       d = si.item ();
 
-      if (d == 0)
+      if (d == nullptr)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_valuetype_ch::")
@@ -522,7 +522,7 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *,
 
       if (nt == AST_Decl::NT_op)
         {
-          be_operation *op = be_operation::narrow_from_decl (d);
+          be_operation *op = dynamic_cast<be_operation*> (d);
 
           if (visitor.visit_operation (op) == -1)
             {
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 588c4a0204e..19f77f7a4be 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -17,11 +17,11 @@
 
 be_visitor_valuetype_ci::be_visitor_valuetype_ci (be_visitor_context *ctx)
   : be_visitor_valuetype (ctx),
-    opt_accessor_ (0)
+    opt_accessor_ (false)
 {
 }
 
-be_visitor_valuetype_ci::~be_visitor_valuetype_ci (void)
+be_visitor_valuetype_ci::~be_visitor_valuetype_ci ()
 {
 }
 
@@ -35,7 +35,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
 
   if (node->opt_accessor ())
     {
-      this->opt_accessor_ = 1;
+      this->opt_accessor_ = true;
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
@@ -44,7 +44,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::" << node->local_name () << " (void)" << be_nl;
+  *os << node->name () << "::" << node->local_name () << " ()" << be_nl;
 
   if (node->is_amh_excep_holder ())
     {
@@ -107,7 +107,7 @@ be_visitor_valuetype_ci::visit_field (be_field *node)
     {
       be_visitor_context ctx (*this->ctx_);
       be_visitor_valuetype_field_cs visitor (&ctx);
-      visitor.in_obv_space_ = 0;
+      visitor.in_obv_space_ = false;
       visitor.setenclosings ("ACE_INLINE ");
 
       if (visitor.visit_field (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 9426f4f5e19..f09a8cd5313 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -20,7 +20,7 @@ be_visitor_valuetype_cs::be_visitor_valuetype_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuetype_cs::~be_visitor_valuetype_cs (void)
+be_visitor_valuetype_cs::~be_visitor_valuetype_cs ()
 {
 }
 
@@ -97,7 +97,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   // The _tao_obv_repository_id method.
   *os << "const char *" << be_nl
       << node->name ()
-      << "::_tao_obv_repository_id (void) const" << be_nl
+      << "::_tao_obv_repository_id () const" << be_nl
       << "{" << be_idt_nl
       << "return this->_tao_obv_static_repository_id ();"
       << be_uidt_nl
@@ -146,7 +146,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
     {
       *os << "// TAO extension - the virtual _type method." << be_nl;
       *os << "::CORBA::TypeCode_ptr " << node->name ()
-          << "::_tao_type (void) const" << be_nl;
+          << "::_tao_type () const" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
       *os << "}" << be_nl_2;
@@ -161,7 +161,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   //    virtual functions, including virtual destructors, wreaks havoc
   //    with g++ >= 4.0 RTTI support when the
   //    "-fvisibility-inlines-hidden" command line option is used.
-  *os << node->name () << "::~" << node->local_name () << " (void)"
+  *os << node->name () << "::~" << node->local_name () << " ()"
       << be_nl
       << "{}" << be_nl_2;
 
@@ -183,7 +183,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       if (node->opt_accessor ())
         {
           be_decl *scope =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
           *os << scope->name () << "::"
               << node->local_name ()
@@ -210,7 +210,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       if (node->opt_accessor ())
         {
           be_decl *scope =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            dynamic_cast<be_scope*> (node->defined_in ())->decl ();
 
           *os << scope->name () << "::"
               << node->local_name ()
@@ -243,7 +243,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
 
       // The virtual _copy_value method.
       *os << "::CORBA::ValueBase *" << be_nl
-          << node->name () << "::_copy_value (void)" << be_nl
+          << node->name () << "::_copy_value ()" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::ValueBase *ret_val = 0;" << be_nl
           << "ACE_NEW_THROW_EX (" << be_idt_nl
@@ -323,7 +323,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << node->local_name () << " *&new_object" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "::CORBA::ValueBase *base = 0;" << be_nl
+      << "::CORBA::ValueBase *base {};" << be_nl
       << "::CORBA::Boolean is_indirected = false;" << be_nl
       << "::CORBA::Boolean is_null_object = false;" << be_nl
       << "::CORBA::Boolean const retval =" << be_idt_nl
@@ -360,7 +360,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
     {
       *os << be_nl_2
           << "::CORBA::ValueBase *" << be_nl
-          << node->name () << "::_tao_to_value (void)" << be_nl
+          << node->name () << "::_tao_to_value ()" << be_nl
           << "{" << be_idt_nl
           << "return this;" << be_uidt_nl
           << "}";
@@ -407,9 +407,9 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node)
     }
 
   be_valuetype *parent =
-    be_valuetype::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_valuetype*> (node->defined_in ());
 
-  if (parent == 0 || ! this->is_amh_exception_holder (parent))
+  if (parent == nullptr || ! this->is_amh_exception_holder (parent))
     {
       return 0;
     }
@@ -421,7 +421,7 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // STEP I: Generate the return type.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->return_type ());
 
   if (!bt)
     {
@@ -472,12 +472,8 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node)
   // explicitly take care of both cases (platforms with
   // and without native exception support).
   *os << be_nl
-      << "{"
-      << "\n#if defined (ACE_HAS_CPP11)" << be_idt_nl
-      << "std::unique_ptr< ::CORBA::Exception> safety (this->exception);"
-      << "\n#else" << be_nl
-      << "auto_ptr< ::CORBA::Exception> safety (this->exception);"
-      << "\n#endif /* ACE_HAS_CPP11 */" << be_nl
+      << "{" << be_idt_nl
+      << "std::unique_ptr< ::CORBA::Exception> safety (this->exception);" << be_nl
       << "this->exception->_raise ();" << be_uidt_nl
       << "}"
       << be_nl;
@@ -493,9 +489,9 @@ be_visitor_valuetype_cs::gen_ostream_operator_r (be_valuetype *node,
   AST_Type *parent = node->inherits_concrete ();
 
   // Recurse up the parent chain.
-  if (parent != 0)
+  if (parent != nullptr)
     {
-      this->gen_ostream_operator_r (be_valuetype::narrow_from_decl (parent),
+      this->gen_ostream_operator_r (dynamic_cast<be_valuetype*> (parent),
                                     index);
     }
 
@@ -504,14 +500,14 @@ be_visitor_valuetype_cs::gen_ostream_operator_r (be_valuetype *node,
        !i.is_done ();
        i.next ())
     {
-      be_field *f = be_field::narrow_from_decl (i.item ());
+      be_field *f = dynamic_cast<be_field*> (i.item ());
       be_attribute *attr =
-        be_attribute::narrow_from_decl (i.item ());
+        dynamic_cast<be_attribute*> (i.item ());
 
       // No way to access the private members from generated code.
-      if (f == 0
+      if (f == nullptr
           || f->visibility () != AST_Field::vis_PUBLIC
-          || attr != 0)
+          || attr != nullptr)
         {
           continue;
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
index 740b2e6f4bd..15329da1c61 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
@@ -19,16 +19,16 @@ be_visitor_valuetype_init::be_visitor_valuetype_init (
 {
 }
 
-be_visitor_valuetype_init::~be_visitor_valuetype_init (void)
+be_visitor_valuetype_init::~be_visitor_valuetype_init ()
 {
 }
 
 void
-be_visitor_valuetype_init::begin_public (void)
+be_visitor_valuetype_init::begin_public ()
 {
 }
 
 void
-be_visitor_valuetype_init::begin_private (void)
+be_visitor_valuetype_init::begin_private ()
 {
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
index 3023dc22c21..86bdaea0b8e 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
@@ -20,7 +20,7 @@ be_visitor_valuetype_init_arglist_ch::be_visitor_valuetype_init_arglist_ch (
 }
 
 be_visitor_valuetype_init_arglist_ch::~be_visitor_valuetype_init_arglist_ch (
-  void)
+  )
 {
 }
 
@@ -49,7 +49,7 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node)
     }
   else
     {
-      os << "void)";
+      os << ")";
     }
 
    return 0;
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 5d143a8b52c..2f5c07dc02b 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
@@ -19,7 +19,7 @@ be_visitor_valuetype_init_ch::be_visitor_valuetype_init_ch (
 {
 }
 
-be_visitor_valuetype_init_ch::~be_visitor_valuetype_init_ch (void)
+be_visitor_valuetype_init_ch::~be_visitor_valuetype_init_ch ()
 {
 }
 
@@ -70,7 +70,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
     {
       // Public constructor.
       os << be_nl
-         << node->local_name () << "_init (void);";
+         << node->local_name () << "_init ();";
     }
 
   if (this->visit_valuetype_scope (node) == -1)
@@ -93,13 +93,13 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
       // generate create_for_unmarshal
       os << be_nl_2
          << "virtual ::CORBA::ValueBase *" << be_nl
-         << "create_for_unmarshal (void);";
+         << "create_for_unmarshal ();";
 
       if (node->supports_abstract ())
         {
           os << be_nl_2
              << "virtual ::CORBA::AbstractBase_ptr" << be_nl
-             << "create_for_unmarshal_abstract (void);" << be_uidt;
+             << "create_for_unmarshal_abstract ();" << be_uidt;
         }
     }
 
@@ -109,20 +109,20 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
   os << "// TAO-specific extensions"
      << be_uidt_nl
      << "public:" << be_idt_nl;
-  os << "virtual const char* tao_repository_id (void);";
+  os << "virtual const char* tao_repository_id ();";
 
   if (factory_style == be_valuetype::FS_ABSTRACT_FACTORY)
     {
       // Protected constructor.
       os << be_uidt_nl << be_nl
          << "protected:" << be_idt_nl
-         << node->local_name () << "_init (void);";
+         << node->local_name () << "_init ();";
     }
 
   // Protected virtual destructor.
   os << be_uidt_nl << be_nl
      << "protected:" << be_idt_nl
-     << "virtual ~" << node->local_name () << "_init (void);"
+     << "virtual ~" << node->local_name () << "_init ();"
      << be_uidt_nl
      << "};";
 
@@ -142,7 +142,7 @@ be_visitor_valuetype_init_ch::visit_factory (be_factory *node)
   TAO_OutStream& os = *(this->ctx_->stream ());
 
   be_valuetype *vt =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ()->decl ());
+    dynamic_cast<be_valuetype*> (this->ctx_->scope ()->decl ());
 
 
   // STEP I: Generate preambule.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
index 66204d5609f..624345c7c66 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
@@ -19,7 +19,7 @@ be_visitor_valuetype_init_ci::be_visitor_valuetype_init_ci (
 {
 }
 
-be_visitor_valuetype_init_ci::~be_visitor_valuetype_init_ci (void)
+be_visitor_valuetype_init_ci::~be_visitor_valuetype_init_ci ()
 {
 }
 
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 b83e760999a..ed9631216f6 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
@@ -19,7 +19,7 @@ be_visitor_valuetype_init_cs::be_visitor_valuetype_init_cs (
 {
 }
 
-be_visitor_valuetype_init_cs::~be_visitor_valuetype_init_cs (void)
+be_visitor_valuetype_init_cs::~be_visitor_valuetype_init_cs ()
 {
 }
 
@@ -74,12 +74,12 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
 
   // ctor
   *os << be_nl_2
-      << fname << "::" << lname << " (void)" << be_nl
+      << fname << "::" << lname << " ()" << be_nl
       << "{" << be_nl << "}";
 
   // dtor
   *os << be_nl_2
-      << fname << "::~" << lname << " (void)" << be_nl
+      << fname << "::~" << lname << " ()" << be_nl
       << "{" << be_nl << "}";
 
   // The _downcast method.
@@ -94,7 +94,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
   // tao_repository_id
   *os << be_nl_2
       << "const char*" << be_nl
-      << fname << "::tao_repository_id (void)" << be_nl
+      << fname << "::tao_repository_id ()" << be_nl
       << "{" << be_idt_nl
       <<   "return ::" << node->full_name ()
       <<                "::_tao_obv_static_repository_id ();"
@@ -106,9 +106,9 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
       // generate create_for_unmarshal()
       *os << be_nl_2
           << "::CORBA::ValueBase *" << be_nl
-          << fname << "::create_for_unmarshal (void)" << be_nl
+          << fname << "::create_for_unmarshal ()" << be_nl
           << "{" << be_idt_nl
-          << "::CORBA::ValueBase *ret_val = 0;" << be_nl
+          << "::CORBA::ValueBase *ret_val = nullptr;" << be_nl
           << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl
           << "ret_val," << be_nl
           << "OBV_" << node->full_name () << "," << be_nl
@@ -121,9 +121,9 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
           {
             *os << be_nl_2
                 << "::CORBA::AbstractBase_ptr" << be_nl
-                << fname << "::create_for_unmarshal_abstract (void)" << be_nl
+                << fname << "::create_for_unmarshal_abstract ()" << be_nl
                 << "{" << be_idt_nl
-                << "::CORBA::AbstractBase *ret_val = 0;" << be_nl
+                << "::CORBA::AbstractBase *ret_val = nullptr;" << be_nl
                 << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl
                 << "ret_val," << be_nl
                 << "OBV_" << node->full_name () << "," << be_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 87ce9741cbb..4f3c0688e53 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
@@ -24,7 +24,7 @@ be_visitor_valuetype_obv_ch::be_visitor_valuetype_obv_ch (
 {
 }
 
-be_visitor_valuetype_obv_ch::~be_visitor_valuetype_obv_ch (void)
+be_visitor_valuetype_obv_ch::~be_visitor_valuetype_obv_ch ()
 {
 }
 
@@ -92,7 +92,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
       //
 
       int i = 0;
-      AST_Type *inherited = 0;
+      AST_Type *inherited = nullptr;
 
       for (; i < node->n_inherits (); ++i)
         {
@@ -145,8 +145,8 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
           *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
               << "// " << __FILE__ << ":" << __LINE__ ;
 
-          *os << be_nl_2 << "virtual void _add_ref (void);" << be_nl;
-          *os << "virtual void _remove_ref (void);";
+          *os << be_nl_2 << "virtual void _add_ref ();" << be_nl;
+          *os << "virtual void _remove_ref ();";
         }
 
       if (node->have_operation ())
@@ -166,7 +166,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
           *os << "OBV_";
         }
 
-      *os << node->local_name () << " (void);";
+      *os << node->local_name () << " ();";
 
       // Initializing constructor.
       if (node->has_member ())
@@ -193,7 +193,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
         {
           *os << "OBV_";
         }
-      *os << node->local_name () << " (void);";
+      *os << node->local_name () << " ();";
 
       // Virtual _copy_value() only provided in OBV_* class when
       // ::CORBA::DefaultValueRefCountBase has been included.
@@ -205,7 +205,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
       if (this->obv_need_ref_counter (node))
         {
           *os << be_uidt_nl << be_nl << "public:" << be_idt_nl
-              << "virtual ::CORBA::ValueBase *_copy_value (void);";
+              << "virtual ::CORBA::ValueBase *_copy_value ();";
         }
 
       // Map fields to private data.
@@ -228,7 +228,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
               << "_tao_unmarshal_state (TAO_InputCDR &, TAO_ChunkInfo &);"
               << be_nl
               << "virtual void "
-              << "truncation_hook (void);"
+              << "truncation_hook ();"
               << be_uidt_nl << be_nl;
 
           *os << "private:" << be_idt;
@@ -253,7 +253,7 @@ be_visitor_valuetype_obv_ch::visit_eventtype (be_eventtype *node)
 int
 be_visitor_valuetype_obv_ch::visit_field (be_field *node)
 {
-  be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ());
+  be_valuetype *vt = dynamic_cast<be_valuetype*> (node->defined_in ());
 
   if (!vt)
     {
@@ -281,7 +281,7 @@ be_visitor_valuetype_obv_ch::visit_field (be_field *node)
 }
 
 void
-be_visitor_valuetype_obv_ch::begin_public (void)
+be_visitor_valuetype_obv_ch::begin_public ()
 {
   AST_Decl::NodeType nt = this->ctx_->node ()->node_type ();
 
@@ -297,7 +297,7 @@ be_visitor_valuetype_obv_ch::begin_public (void)
 }
 
 void
-be_visitor_valuetype_obv_ch::begin_private (void)
+be_visitor_valuetype_obv_ch::begin_private ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
   *os << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
index f556cd9f0cb..05d34ef1a8a 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
@@ -26,7 +26,7 @@ be_visitor_valuetype_obv_ci::be_visitor_valuetype_obv_ci (
 {
 }
 
-be_visitor_valuetype_obv_ci::~be_visitor_valuetype_obv_ci (void)
+be_visitor_valuetype_obv_ci::~be_visitor_valuetype_obv_ci ()
 {
 }
 
@@ -77,7 +77,7 @@ be_visitor_valuetype_obv_ci::visit_field (be_field *node)
   be_visitor_context new_ctx (*this->ctx_);
   be_visitor_valuetype_field_ci visitor (&new_ctx);
 
-  visitor.in_obv_space_ = 1;
+  visitor.in_obv_space_ = true;
 
   if (visitor.visit_field (node) == -1)
     {
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 c904904a95e..4ddab60b5af 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
@@ -24,7 +24,7 @@ be_visitor_valuetype_obv_cs::be_visitor_valuetype_obv_cs (
 {
 }
 
-be_visitor_valuetype_obv_cs::~be_visitor_valuetype_obv_cs (void)
+be_visitor_valuetype_obv_cs::~be_visitor_valuetype_obv_cs ()
 {
 }
 
@@ -51,7 +51,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
       *os << "OBV_";
     }
 
-  *os << node->local_name () << " (void)" << be_nl;
+  *os << node->local_name () << " ()" << be_nl;
   *os << ": require_truncation_ (false)" << be_nl
       << "{}" << be_nl_2;
 
@@ -86,7 +86,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
     {
       *os << "OBV_";
     }
-  *os << node->local_name () << " (void)" << be_nl
+  *os << node->local_name () << " ()" << be_nl
       << "{}";
 
   // Virtual _copy_value() only provided in OBV_* class when
@@ -100,7 +100,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
     {
       *os << be_nl_2
           << "::CORBA::ValueBase *" << be_nl
-          << node->full_obv_skel_name () << "::_copy_value (void)" << be_nl
+          << node->full_obv_skel_name () << "::_copy_value ()" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::ValueBase *ret_val = 0;" << be_nl
           << "ACE_NEW_THROW_EX (" << be_idt_nl
@@ -160,7 +160,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
         {
           *os << be_nl_2 << "void" << be_nl
               << node->full_obv_skel_name ()
-              << "::_add_ref (void)" << be_nl
+              << "::_add_ref ()" << be_nl
               << "{" << be_idt_nl
               << "this->::CORBA::DefaultValueRefCountBase::_add_ref ();"
               << be_uidt_nl
@@ -168,7 +168,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
 
           *os << be_nl << "void" << be_nl
               << node->full_obv_skel_name ()
-              << "::_remove_ref (void)" << be_nl
+              << "::_remove_ref ()" << be_nl
               << "{" << be_idt_nl
               << "this->::CORBA::DefaultValueRefCountBase::_remove_ref ();"
               << be_uidt_nl
@@ -190,7 +190,7 @@ be_visitor_valuetype_obv_cs::visit_field (be_field *node)
 {
   be_visitor_context ctx = (*this->ctx_);
   be_visitor_valuetype_field_cs visitor (&ctx);
-  visitor.in_obv_space_ = 1;
+  visitor.in_obv_space_ = true;
 
   if (visitor.visit_field (node) == -1)
     {
@@ -214,10 +214,10 @@ be_visitor_valuetype_obv_cs::gen_obv_init_base_constructor_args (
   AST_Type *parent = node->inherits_concrete ();
 
   // Generate for inherited members first.
-  if (parent != 0)
+  if (parent != nullptr)
     {
       be_valuetype *be_parent =
-        be_valuetype::narrow_from_decl (parent);
+        dynamic_cast<be_valuetype*> (parent);
       this->gen_obv_init_base_constructor_args (be_parent, index);
     }
 
@@ -227,11 +227,11 @@ be_visitor_valuetype_obv_cs::gen_obv_init_base_constructor_args (
     {
       // be_attribute inherits from be_field
       // so we have to also screen out attributes
-      be_field *f = be_field::narrow_from_decl (si.item ());
+      be_field *f = dynamic_cast<be_field*> (si.item ());
       be_attribute *attr =
-        be_attribute::narrow_from_decl (si.item ());
+        dynamic_cast<be_attribute*> (si.item ());
 
-      if (f == 0 || attr != 0)
+      if (f == nullptr || attr != nullptr)
         {
           continue;
         }
@@ -250,9 +250,9 @@ be_visitor_valuetype_obv_cs::gen_obv_init_constructor_inits (
   AST_Type *parent = node->inherits_concrete ();
 
   // Generate for inherited members first.
-  if (parent != 0)
+  if (parent != nullptr)
     {
-      be_valuetype *be_parent = be_valuetype::narrow_from_decl (parent);
+      be_valuetype *be_parent = dynamic_cast<be_valuetype*> (parent);
       this->gen_obv_init_constructor_inits (be_parent);
     }
 
@@ -262,11 +262,11 @@ be_visitor_valuetype_obv_cs::gen_obv_init_constructor_inits (
     {
       // be_attribute inherits from be_field
       // so we have to also screen out attributes
-      be_field *f = be_field::narrow_from_decl (si.item ());
+      be_field *f = dynamic_cast<be_field*> (si.item ());
       be_attribute *attr =
-        be_attribute::narrow_from_decl (si.item ());
+        dynamic_cast<be_attribute*> (si.item ());
 
-      if (f == 0 || attr != 0)
+      if (f == nullptr || attr != nullptr)
         {
           continue;
         }
@@ -287,10 +287,10 @@ be_visitor_valuetype_obv_cs::gen_obv_call_base_constructor_args (
 
   // Generate for inherited members first.
   AST_Type *parent = node->inherits_concrete ();
-  if (parent != 0)
+  if (parent != nullptr)
     {
       be_valuetype *be_parent =
-        be_valuetype::narrow_from_decl (parent);
+        dynamic_cast<be_valuetype*> (parent);
       this->gen_obv_call_base_constructor_args (be_parent, index);
     }
 
@@ -301,8 +301,8 @@ be_visitor_valuetype_obv_cs::gen_obv_call_base_constructor_args (
     {
       // be_attribute inherits from be_field
       // so we have to also screen out attributes
-      be_field *f = be_field::narrow_from_decl (si.item ());
-      if (f && !be_attribute::narrow_from_decl (si.item ()))
+      be_field *f = dynamic_cast<be_field*> (si.item ());
+      if (f && !dynamic_cast<be_attribute*> (si.item ()))
         {
           if (index++) // comma before 2nd onwards
             *os << ",";
@@ -311,10 +311,10 @@ be_visitor_valuetype_obv_cs::gen_obv_call_base_constructor_args (
           *os << be_nl;
 
           // Check the member type for nested valuetypes
-          be_type *t = be_type::narrow_from_decl (f->field_type ());
-          if (be_valuetype_fwd::narrow_from_decl (t) ||
-              be_valuetype::narrow_from_decl (t) ||
-              be_valuebox::narrow_from_decl (t) )
+          be_type *t = dynamic_cast<be_type*> (f->field_type ());
+          if (dynamic_cast<be_valuetype_fwd*> (t) ||
+              dynamic_cast<be_valuetype*> (t) ||
+              dynamic_cast<be_valuebox*> (t) )
             {
               // Nested valuetypes/boxes need to be deep copied also
               *os << "(" << f->local_name () << " () ?" << be_idt_nl
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 6f61bfdb30e..c7032dde502 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
@@ -20,7 +20,7 @@ be_visitor_valuetype_sh::be_visitor_valuetype_sh (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuetype_sh::~be_visitor_valuetype_sh (void)
+be_visitor_valuetype_sh::~be_visitor_valuetype_sh ()
 {
 }
 
@@ -36,7 +36,7 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node)
 
   // We generate a skeleton class only if the valuetype supports a
   // non-abstract interface.
-  if (concrete == 0)
+  if (concrete == nullptr)
     {
       return 0;
     }
@@ -90,10 +90,10 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node)
   *os << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "protected:" << be_idt_nl
-      << class_name.c_str () << " (void);" << be_uidt_nl << be_nl
+      << class_name.c_str () << " ();" << be_uidt_nl << be_nl
       << "public:" << be_idt_nl;
 
-  *os << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_uidt_nl;
+  *os << "virtual ~" << class_name.c_str () << " ();" << be_nl << be_uidt_nl;
 
   // No copy constructor for locality constraint interface.
   *os << "private:" << be_idt_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 9f83d277dfb..2b4f1096991 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -21,7 +21,7 @@ be_visitor_valuetype_ss::be_visitor_valuetype_ss (be_visitor_context *ctx)
 {
 }
 
-be_visitor_valuetype_ss::~be_visitor_valuetype_ss (void)
+be_visitor_valuetype_ss::~be_visitor_valuetype_ss ()
 {
 }
 
@@ -37,7 +37,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
 
   // We generate a skeleton class only if the valuetype supports a
   // non-abstract interface.
-  if (concrete == 0)
+  if (concrete == nullptr)
     {
       return 0;
     }
@@ -73,7 +73,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
 
   *os << full_skel_name << "::"
       << local_name_prefix << node_local_name
-      << " (void)" << be_nl
+      << " ()" << be_nl
       << "{}" << be_nl_2;
 
 // @@@ (JP) I'm commenting out the copy constructor for now. The
@@ -102,7 +102,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
     }
   else
     {
-      be_interface *bd = be_interface::narrow_from_decl (concrete);
+      be_interface *bd = dynamic_cast<be_interface*> (concrete);
       *os << bd->full_skel_name () << " (rhs)," << be_nl;
     }
 
@@ -112,7 +112,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
 
   *os << full_skel_name << "::~"
       << local_name_prefix << node_local_name
-      << " (void)" << be_nl
+      << " ()" << be_nl
       << "{}";
 
   return 0;
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 711bc47368e..f2debe24349 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
@@ -23,7 +23,7 @@ be_visitor_valuetype_fwd_any_op_ch::be_visitor_valuetype_fwd_any_op_ch (
 {
 }
 
-be_visitor_valuetype_fwd_any_op_ch::~be_visitor_valuetype_fwd_any_op_ch (void)
+be_visitor_valuetype_fwd_any_op_ch::~be_visitor_valuetype_fwd_any_op_ch ()
 {
 }
 
@@ -54,12 +54,12 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  be_module *module = 0;
+  be_module *module = nullptr;
 
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
-      module = be_module::narrow_from_scope (node->defined_in ());
+      module = dynamic_cast<be_module*> (node->defined_in ());
 
       if (!module)
         {
@@ -110,12 +110,12 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
       << node->name () << " *&);";
 
   *os << be_global->core_versioning_end () << be_nl;
-  if (module != 0)
+  if (module != nullptr)
     {
       *os << "\n\n#endif";
     }
 
-  node->cli_hdr_any_op_gen (1);
+  node->cli_hdr_any_op_gen (true);
   return 0;
 }
 
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 6ff9d6fd264..026f4bcd769 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
@@ -19,7 +19,7 @@ be_visitor_valuetype_fwd_cdr_op_ch::be_visitor_valuetype_fwd_cdr_op_ch (
 {
 }
 
-be_visitor_valuetype_fwd_cdr_op_ch::~be_visitor_valuetype_fwd_cdr_op_ch (void)
+be_visitor_valuetype_fwd_cdr_op_ch::~be_visitor_valuetype_fwd_cdr_op_ch ()
 {
 }
 
@@ -29,7 +29,7 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
   )
 {
   AST_Interface *fd = node->full_definition ();
-  be_valuetype *bfd = be_valuetype::narrow_from_decl (fd);
+  be_valuetype *bfd = dynamic_cast<be_valuetype*> (fd);
 
   // If this forward declared vt is defined later in the file,
   // the CDR operator declaration (along with the corresponding
@@ -49,7 +49,7 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
   TAO_OutStream *os = this->ctx_->stream ();
 
   be_valuetype *fvd =
-    be_valuetype::narrow_from_decl (node->full_definition ());
+    dynamic_cast<be_valuetype*> (node->full_definition ());
 
   if (fvd->gen_helper_header () == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
index 620c1b4ca0e..164a40d4ebc 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
@@ -18,7 +18,7 @@ be_visitor_valuetype_fwd_ch::be_visitor_valuetype_fwd_ch (
 {
 }
 
-be_visitor_valuetype_fwd_ch::~be_visitor_valuetype_fwd_ch (void)
+be_visitor_valuetype_fwd_ch::~be_visitor_valuetype_fwd_ch ()
 {
 }
 
@@ -32,7 +32,7 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
     }
 
   AST_Interface *fd = node->full_definition ();
-  be_valuetype *bfd = be_valuetype::narrow_from_decl (fd);
+  be_valuetype *bfd = dynamic_cast<be_valuetype*> (fd);
 
   // This will be a no-op if it has already been done for this node.
   bfd->gen_var_out_seq_decls ();
diff --git a/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp
index 27e2839c71b..7ac895d80cc 100644
--- a/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp
@@ -44,13 +44,13 @@
 be_visitor_xplicit_pre_proc::be_visitor_xplicit_pre_proc (
       be_visitor_context *ctx)
   : be_visitor_ccm_pre_proc (ctx),
-    xplicit_ (0),
-    type_holder_ (0),
+    xplicit_ (nullptr),
+    type_holder_ (nullptr),
     ref_type_ (false)
 {
 }
 
-be_visitor_xplicit_pre_proc::~be_visitor_xplicit_pre_proc (void)
+be_visitor_xplicit_pre_proc::~be_visitor_xplicit_pre_proc ()
 {
 }
 
@@ -59,7 +59,7 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node)
 {
   UTL_NameList *parent_list = this->compute_inheritance (node);
 
-  FE_InterfaceHeader header (0,
+  FE_InterfaceHeader header (nullptr,
                              parent_list,
                              false,
                              false,
@@ -69,7 +69,7 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node)
   // for a minute so the correct repo id can be calculated at
   // interface construction time.
   AST_Module *m =
-    AST_Module::narrow_from_scope (node->defined_in ());
+    dynamic_cast<AST_Module*> (node->defined_in ());
 
   idl_global->scopes ().push (m);
 
@@ -80,7 +80,7 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node)
       "Explicit",
       m);
 
-  be_interface *i = 0;
+  be_interface *i = nullptr;
   ACE_NEW_RETURN (i,
                   be_interface (explicit_name,
                                 header.inherits (),
@@ -115,13 +115,13 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node)
 
   explicit_name->destroy ();
   delete explicit_name;
-  explicit_name = 0;
+  explicit_name = nullptr;
 
   header.destroy ();
 
   parent_list->destroy ();
   delete parent_list;
-  parent_list = 0;
+  parent_list = nullptr;
 
   // Through with the scope containing the home.
   idl_global->scopes ().pop ();
@@ -134,9 +134,9 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node)
 int
 be_visitor_xplicit_pre_proc::visit_operation (be_operation *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_operation *home_op = 0;
+  be_operation *home_op = nullptr;
   ACE_NEW_RETURN (home_op,
                   be_operation (node->return_type (),
                                 node->flags (),
@@ -146,7 +146,7 @@ be_visitor_xplicit_pre_proc::visit_operation (be_operation *node)
                   -1);
 
   UTL_ExceptList *excep_list = node->exceptions ();
-  if (0 != excep_list)
+  if (nullptr != excep_list)
     {
       home_op->be_add_exceptions (excep_list->copy ());
     }
@@ -171,12 +171,12 @@ be_visitor_xplicit_pre_proc::visit_operation (be_operation *node)
 int
 be_visitor_xplicit_pre_proc::visit_argument (be_argument *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   this->ref_type_ = true;
 
   be_type *ft =
-    be_type::narrow_from_decl (node->field_type ());
+    dynamic_cast<be_type*> (node->field_type ());
 
   if (ft->accept (this) != 0)
     {
@@ -190,9 +190,9 @@ be_visitor_xplicit_pre_proc::visit_argument (be_argument *node)
   this->ref_type_ = false;
 
   AST_Type *arg_type =
-    AST_Type::narrow_from_decl (this->type_holder_);
+    dynamic_cast<AST_Type*> (this->type_holder_);
 
-  be_argument *added_arg = 0;
+  be_argument *added_arg = nullptr;
   ACE_NEW_RETURN (added_arg,
                   be_argument (node->direction (),
                                arg_type,
@@ -207,12 +207,12 @@ be_visitor_xplicit_pre_proc::visit_argument (be_argument *node)
 int
 be_visitor_xplicit_pre_proc::visit_factory (be_factory *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Home *f_home =
-    AST_Home::narrow_from_scope (node->defined_in ());
+    dynamic_cast<AST_Home*> (node->defined_in ());
 
-  be_operation *added_factory = 0;
+  be_operation *added_factory = nullptr;
   ACE_NEW_RETURN (added_factory,
                   be_operation (f_home->managed_component (),
                                 AST_Operation::OP_noflags,
@@ -241,12 +241,12 @@ be_visitor_xplicit_pre_proc::visit_factory (be_factory *node)
 int
 be_visitor_xplicit_pre_proc::visit_finder (be_finder *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   AST_Home *f_home =
-    AST_Home::narrow_from_scope (node->defined_in ());
+    dynamic_cast<AST_Home*> (node->defined_in ());
 
-  be_operation *added_finder = 0;
+  be_operation *added_finder = nullptr;
   ACE_NEW_RETURN (added_finder,
                   be_operation (f_home->managed_component (),
                                 AST_Operation::OP_noflags,
@@ -321,9 +321,9 @@ be_visitor_xplicit_pre_proc::visit_structure (be_structure *node)
       return 0;
     }
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_structure *added_struct = 0;
+  be_structure *added_struct = nullptr;
   ACE_NEW_RETURN (added_struct,
                   be_structure (&sn,
                                 false,
@@ -349,16 +349,16 @@ int
 be_visitor_xplicit_pre_proc::visit_structure_fwd (
   be_structure_fwd *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_structure *dummy = 0;
+  be_structure *dummy = nullptr;
   ACE_NEW_RETURN (dummy,
                   be_structure (&sn,
                                 false,
                                 false),
                   -1);
 
-  be_structure_fwd *added_struct_fwd = 0;
+  be_structure_fwd *added_struct_fwd = nullptr;
   ACE_NEW_RETURN (added_struct_fwd,
                   be_structure_fwd (dummy,
                                     &sn),
@@ -374,9 +374,9 @@ be_visitor_xplicit_pre_proc::visit_structure_fwd (
 int
 be_visitor_xplicit_pre_proc::visit_exception (be_exception *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_exception *added_excep = 0;
+  be_exception *added_excep = nullptr;
   ACE_NEW_RETURN (added_excep,
                   be_exception (&sn,
                                 false,
@@ -409,9 +409,9 @@ be_visitor_xplicit_pre_proc::visit_enum (be_enum *node)
       return 0;
     }
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_enum *added_enum = 0;
+  be_enum *added_enum = nullptr;
   ACE_NEW_RETURN (added_enum,
                   be_enum (&sn,
                            false,
@@ -439,7 +439,7 @@ be_visitor_xplicit_pre_proc::visit_field (be_field *node)
   this->ref_type_ = true;
 
   be_type *ft =
-    be_type::narrow_from_decl (node->field_type ());
+    dynamic_cast<be_type*> (node->field_type ());
 
   if (ft->accept (this) != 0)
     {
@@ -452,11 +452,11 @@ be_visitor_xplicit_pre_proc::visit_field (be_field *node)
 
   this->ref_type_ = false;
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
   AST_Type *field_type =
-    AST_Type::narrow_from_decl (this->type_holder_);
+    dynamic_cast<AST_Type*> (this->type_holder_);
 
-  be_field *added_field = 0;
+  be_field *added_field = nullptr;
   ACE_NEW_RETURN (added_field,
                   be_field (field_type,
                             &sn,
@@ -472,7 +472,7 @@ int
 be_visitor_xplicit_pre_proc::visit_attribute (be_attribute *node)
 {
   be_type *ft =
-    be_type::narrow_from_decl (node->field_type ());
+    dynamic_cast<be_type*> (node->field_type ());
 
   this->ref_type_ = true;
 
@@ -488,11 +488,11 @@ be_visitor_xplicit_pre_proc::visit_attribute (be_attribute *node)
   this->ref_type_ = false;
 
   AST_Type *attr_type =
-    AST_Type::narrow_from_decl (this->type_holder_);
+    dynamic_cast<AST_Type*> (this->type_holder_);
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_attribute *added_attr = 0;
+  be_attribute *added_attr = nullptr;
   ACE_NEW_RETURN (added_attr,
                   be_attribute (node->readonly (),
                                 attr_type,
@@ -516,7 +516,7 @@ be_visitor_xplicit_pre_proc::visit_union (be_union *node)
     }
 
   be_type *ud =
-    be_type::narrow_from_decl (node->disc_type ());
+    dynamic_cast<be_type*> (node->disc_type ());
 
   this->ref_type_ = true;
 
@@ -532,11 +532,11 @@ be_visitor_xplicit_pre_proc::visit_union (be_union *node)
   this->ref_type_ = false;
 
   AST_ConcreteType *disc =
-    AST_ConcreteType::narrow_from_decl (this->type_holder_);
+    dynamic_cast<AST_ConcreteType*> (this->type_holder_);
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_union *added_union = 0;
+  be_union *added_union = nullptr;
   ACE_NEW_RETURN (added_union,
                   be_union (disc,
                             &sn,
@@ -562,17 +562,17 @@ be_visitor_xplicit_pre_proc::visit_union (be_union *node)
 int
 be_visitor_xplicit_pre_proc::visit_union_fwd (be_union_fwd *node)
 {
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_union *dummy = 0;
+  be_union *dummy = nullptr;
   ACE_NEW_RETURN (dummy,
-                  be_union (0,
+                  be_union (nullptr,
                             &sn,
                             false,
                             false),
                   -1);
 
-  be_union_fwd *added_union_fwd = 0;
+  be_union_fwd *added_union_fwd = nullptr;
   ACE_NEW_RETURN (added_union_fwd,
                   be_union_fwd (dummy,
                                 &sn),
@@ -590,7 +590,7 @@ be_visitor_xplicit_pre_proc::visit_union_branch (
   be_union_branch *node)
 {
   be_type *ft =
-    be_type::narrow_from_decl (node->field_type ());
+    dynamic_cast<be_type*> (node->field_type ());
 
   this->ref_type_ = true;
 
@@ -606,14 +606,14 @@ be_visitor_xplicit_pre_proc::visit_union_branch (
   this->ref_type_ = false;
 
   AST_Type *bt =
-    AST_Type::narrow_from_decl (this->type_holder_);
+    dynamic_cast<AST_Type*> (this->type_holder_);
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
   // The union branch owns its label list so we have to copy it.
   UTL_LabelList *ll = node->labels ()->copy ();
 
-  be_union_branch *added_branch = 0;
+  be_union_branch *added_branch = nullptr;
   ACE_NEW_RETURN (added_branch,
                   be_union_branch (ll, bt, &sn),
                   -1);
@@ -622,7 +622,7 @@ be_visitor_xplicit_pre_proc::visit_union_branch (
   // add_to_scope() so we need to reuse it.
 
   be_union *u =
-    be_union::narrow_from_scope (idl_global->scopes ().top ());
+    dynamic_cast<be_union*> (idl_global->scopes ().top ());
 
   u->be_add_union_branch (added_branch);
 
@@ -644,15 +644,15 @@ be_visitor_xplicit_pre_proc::visit_constant (be_constant *node)
       return 0;
     }
 
-  AST_Expression *new_v = 0;
+  AST_Expression *new_v = nullptr;
   ACE_NEW_RETURN (new_v,
                   AST_Expression (node->constant_value (),
                                   node->et ()),
                   -1);
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_constant *added_const = 0;
+  be_constant *added_const = nullptr;
   ACE_NEW_RETURN (added_const,
                   be_constant (node->et (),
                                new_v,
@@ -673,9 +673,9 @@ be_visitor_xplicit_pre_proc::visit_enum_val (be_enum_val *node)
       return 0;
     }
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_enum_val *added_enum_val = 0;
+  be_enum_val *added_enum_val = nullptr;
   ACE_NEW_RETURN (added_enum_val,
                   be_enum_val (node->constant_value ()->ev ()->u.ulval,
                                &sn),
@@ -690,7 +690,7 @@ int
 be_visitor_xplicit_pre_proc::visit_array (be_array *node)
 {
   be_type *bt =
-    be_type::narrow_from_decl (node->base_type ());
+    dynamic_cast<be_type*> (node->base_type ());
 
   bool tmp = this->ref_type_;
   this->ref_type_ = true;
@@ -706,8 +706,8 @@ be_visitor_xplicit_pre_proc::visit_array (be_array *node)
 
   this->ref_type_ = tmp;
 
-  AST_Expression *v = 0;
-  UTL_ExprList *v_list = 0;
+  AST_Expression *v = nullptr;
+  UTL_ExprList *v_list = nullptr;
 
   for (ACE_CDR::ULong i = 0; i < node->n_dims (); ++i)
     {
@@ -716,12 +716,12 @@ be_visitor_xplicit_pre_proc::visit_array (be_array *node)
                                       AST_Expression::EV_ulong),
                       -1);
 
-      UTL_ExprList *el = 0;
+      UTL_ExprList *el = nullptr;
       ACE_NEW_RETURN (el,
-                      UTL_ExprList (v, 0),
+                      UTL_ExprList (v, nullptr),
                       -1);
 
-      if (v_list == 0)
+      if (v_list == nullptr)
         {
           v_list = el;
         }
@@ -731,9 +731,9 @@ be_visitor_xplicit_pre_proc::visit_array (be_array *node)
         }
     }
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_array *added_array = 0;
+  be_array *added_array = nullptr;
   ACE_NEW_RETURN (added_array,
                   be_array (&sn,
                             node->n_dims (),
@@ -745,15 +745,15 @@ be_visitor_xplicit_pre_proc::visit_array (be_array *node)
   // No need to add this new node to any scope - it's anonymous
   // and owned by the node that references it.
 
-  if (v_list != 0)
+  if (v_list != nullptr)
     {
       v_list->destroy ();
       delete v_list;
-      v_list = 0;
+      v_list = nullptr;
     }
 
   AST_Type *base_type =
-    AST_Type::narrow_from_decl (this->type_holder_);
+    dynamic_cast<AST_Type*> (this->type_holder_);
 
   added_array->set_base_type (base_type);
 
@@ -766,7 +766,7 @@ int
 be_visitor_xplicit_pre_proc::visit_sequence (be_sequence *node)
 {
   be_type *bt =
-    be_type::narrow_from_decl (node->base_type ());
+    dynamic_cast<be_type*> (node->base_type ());
 
   bool tmp = this->ref_type_;
   this->ref_type_ = true;
@@ -784,17 +784,17 @@ be_visitor_xplicit_pre_proc::visit_sequence (be_sequence *node)
 
   AST_Expression *v = node->max_size ();
 
-  AST_Expression *bound = 0;
+  AST_Expression *bound = nullptr;
   ACE_NEW_RETURN (bound,
                   AST_Expression (v,
                                   AST_Expression::EV_ulong),
                   -1);
 
   Identifier id ("sequence");
-  UTL_ScopedName sn (&id, 0);
+  UTL_ScopedName sn (&id, nullptr);
 
   AST_Type *ft =
-    AST_Type::narrow_from_decl (this->type_holder_);
+    dynamic_cast<AST_Type*> (this->type_holder_);
 
   ACE_NEW_RETURN (this->type_holder_,
                   be_sequence (bound,
@@ -827,14 +827,14 @@ be_visitor_xplicit_pre_proc::visit_string (be_string *node)
       return 0;
     }
 
-  AST_Expression *bound = 0;
+  AST_Expression *bound = nullptr;
   ACE_NEW_RETURN (bound,
                   AST_Expression (b,
                                   AST_Expression::EV_ulong),
                   -1);
 
   Identifier id ("string");
-  UTL_ScopedName sn (&id, 0);
+  UTL_ScopedName sn (&id, nullptr);
 
   ACE_NEW_RETURN (this->type_holder_,
                   be_string (AST_Decl::NT_string,
@@ -856,7 +856,7 @@ be_visitor_xplicit_pre_proc::visit_typedef (be_typedef *node)
     }
 
   be_type *t =
-    be_type::narrow_from_decl (node->field_type ());
+    dynamic_cast<be_type*> (node->field_type ());
 
   this->ref_type_ = true;
 
@@ -871,11 +871,11 @@ be_visitor_xplicit_pre_proc::visit_typedef (be_typedef *node)
 
   this->ref_type_ = false;
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
   AST_Type *bt =
-    AST_Type::narrow_from_decl (this->type_holder_);
+    dynamic_cast<AST_Type*> (this->type_holder_);
 
-  be_typedef *added_typedef = 0;
+  be_typedef *added_typedef = nullptr;
   ACE_NEW_RETURN (added_typedef,
                   be_typedef (bt,
                               &sn,
@@ -897,9 +897,9 @@ be_visitor_xplicit_pre_proc::visit_native (be_native *node)
       return 0;
     }
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->local_name (), nullptr);
 
-  be_native *added_native = 0;
+  be_native *added_native = nullptr;
   ACE_NEW_RETURN (added_native,
                   be_native (&sn),
                   -1);
@@ -919,7 +919,7 @@ be_visitor_xplicit_pre_proc::visit_predefined_type (
 }
 
 be_interface *
-be_visitor_xplicit_pre_proc::xplicit (void) const
+be_visitor_xplicit_pre_proc::xplicit () const
 {
   return this->xplicit_;
 }
@@ -930,7 +930,7 @@ be_visitor_xplicit_pre_proc::check_and_store (AST_Decl *node)
   UTL_ScopedName *tmpl_tail =
     this->xplicit_iface_rel_name (node);
 
-  if (tmpl_tail != 0)
+  if (tmpl_tail != nullptr)
     {
       AST_Decl *d =
         idl_global->scopes ().top ()->lookup_by_name (
@@ -941,7 +941,7 @@ be_visitor_xplicit_pre_proc::check_and_store (AST_Decl *node)
 
       tmpl_tail->destroy ();
       delete tmpl_tail;
-      tmpl_tail = 0;
+      tmpl_tail = nullptr;
     }
   else
     {
@@ -955,9 +955,9 @@ be_visitor_xplicit_pre_proc::xplicit_iface_rel_name (AST_Decl *d)
   AST_Decl *tmp = d;
   ACE_CString name (d->full_name ());
 
-  while (tmp != 0)
+  while (tmp != nullptr)
     {
-      if (be_home::narrow_from_decl (tmp) != 0)
+      if (dynamic_cast<be_home*> (tmp) != nullptr)
         {
           ACE_CString head (tmp->local_name ()->get_string ());
 
@@ -971,5 +971,5 @@ be_visitor_xplicit_pre_proc::xplicit_iface_rel_name (AST_Decl *d)
       tmp = ScopeAsDecl (tmp->defined_in ());
     }
 
-  return 0;
+  return nullptr;
 }
diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h
index 1afc70b06a1..cc5c2ef4bef 100644
--- a/TAO/TAO_IDL/be_include/be_argument.h
+++ b/TAO/TAO_IDL/be_include/be_argument.h
@@ -32,10 +32,7 @@ public:
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_argument);
+  virtual void destroy ();
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
index 1d7e9dc6405..d021e5125be 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 (void);
+  ~be_array ();
 
   /// Generate dimensions. If slice == 1, generate dimensions for the slice
   /// definition.
@@ -50,17 +50,13 @@ public:
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_array);
+  virtual void destroy ();
 
 protected:
   /// Create a name for us.
-  virtual int create_name (void);
+  virtual int create_name ();
 
-  virtual void compute_tc_name (void);
+  virtual void compute_tc_name ();
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h
index 25398533978..40f1ccf330a 100644
--- a/TAO/TAO_IDL/be_include/be_attribute.h
+++ b/TAO/TAO_IDL/be_include/be_attribute.h
@@ -31,13 +31,13 @@ public:
                 bool abstract);
 
   // Non-virtual override of frontend method.
-  be_type *field_type (void) const;
+  be_type *field_type () const;
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   /// Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Sets the original attribute from which this one was created,
   /// applies only to implied IDL.
@@ -46,10 +46,6 @@ public:
   /// Returns the original attribute from which this one was created,
   /// applies only to implied IDL
   be_attribute *original_attribute ();
-
-  // Narrowing
-
-  DEF_NARROW_FROM_DECL (be_attribute);
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index abfa4b7cb1d..1369ca69e02 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -198,10 +198,10 @@ public:
     };
 
   /// Constructor
-  TAO_CodeGen (void);
+  TAO_CodeGen ();
 
   /// Destructor
-  ~TAO_CodeGen (void);
+  ~TAO_CodeGen ();
 
   /// Set the client header stream.
   int start_client_header (const char *fname);
@@ -249,16 +249,16 @@ public:
 
   /// Generate code at the end such as the <<= and >>= operators along
   /// with the ending #endif statement.
-  int end_client_header (void);
+  int end_client_header ();
 
   /// Generate necessary code at end of client inline file.
-  void end_client_inline (void);
+  void end_client_inline ();
 
   /// Generate necessary code at end of client stub file.
-  void end_client_stubs (void);
+  void end_client_stubs ();
 
   /// Put a last #endif in the server header.
-  int end_server_header (void);
+  int end_server_header ();
 
   /// Put a last #endif in the server header.
   int end_implementation_header (const char *fname);
@@ -267,102 +267,102 @@ public:
   int end_implementation_skeleton (const char *fname);
 
   /// Put a last #endif in the server template header.
-  int end_server_template_header (void);
+  int end_server_template_header ();
 
   /// Put a last #endif in the server skeletons.
-  int end_server_template_skeletons (void);
+  int end_server_template_skeletons ();
 
   /// Put a last #endif in the server skeletons.
-  int end_server_skeletons (void);
+  int end_server_skeletons ();
 
   /// Put a last #endif in the anyop header.
-  int end_anyop_header (void);
+  int end_anyop_header ();
 
   /// Make sure we end with a newline.
-  int end_anyop_source (void);
-
-  int end_ciao_svnt_header (void);
-  int end_ciao_svnt_source (void);
-  int end_ciao_svnt_template_header (void);
-  int end_ciao_svnt_template_source (void);
-  int end_ciao_exec_header (void);
-  int end_ciao_exec_source (void);
-  int end_ciao_exec_idl (void);
-  int end_ciao_conn_header (void);
-  int end_ciao_conn_source (void);
-  int end_ciao_ami_conn_idl (void);
+  int end_anyop_source ();
+
+  int end_ciao_svnt_header ();
+  int end_ciao_svnt_source ();
+  int end_ciao_svnt_template_header ();
+  int end_ciao_svnt_template_source ();
+  int end_ciao_exec_header ();
+  int end_ciao_exec_source ();
+  int end_ciao_exec_idl ();
+  int end_ciao_conn_header ();
+  int end_ciao_conn_source ();
+  int end_ciao_ami_conn_idl ();
 
   /// Get the client header stream.
-  TAO_OutStream *client_header (void);
+  TAO_OutStream *client_header ();
 
   /// Get the client stubs stream.
-  TAO_OutStream *client_stubs (void);
+  TAO_OutStream *client_stubs ();
 
   /// Get the client inline stream.
-  TAO_OutStream *client_inline (void);
+  TAO_OutStream *client_inline ();
 
   /// get the server header stream.
-  TAO_OutStream *server_header (void);
+  TAO_OutStream *server_header ();
 
   /// Get the implementation header stream.
-  TAO_OutStream *implementation_header (void);
+  TAO_OutStream *implementation_header ();
 
   /// Get the implementation skeleton stream.
-  TAO_OutStream *implementation_skeleton (void);
+  TAO_OutStream *implementation_skeleton ();
 
   /// Get the server header template stream.
-  TAO_OutStream *server_template_header (void);
+  TAO_OutStream *server_template_header ();
 
   /// Get the server skeletons stream.
-  TAO_OutStream *server_skeletons (void);
+  TAO_OutStream *server_skeletons ();
 
   /// Get the server template skeletons stream.
-  TAO_OutStream *server_template_skeletons (void);
+  TAO_OutStream *server_template_skeletons ();
 
   /// Get the server template inline stream.
-  TAO_OutStream *server_template_inline (void);
+  TAO_OutStream *server_template_inline ();
 
   /// Get the anyop header stream.
-  TAO_OutStream *anyop_header (void);
+  TAO_OutStream *anyop_header ();
 
   /// Get the anyop source stream.
-  TAO_OutStream *anyop_source (void);
+  TAO_OutStream *anyop_source ();
 
   /// Get the CIAO servant header stream.
-  TAO_OutStream *ciao_svnt_header (void);
+  TAO_OutStream *ciao_svnt_header ();
 
   /// Get the CIAO servant source stream.
-  TAO_OutStream *ciao_svnt_source (void);
+  TAO_OutStream *ciao_svnt_source ();
 
   /// Get the CIAO template servant header stream.
-  TAO_OutStream *ciao_svnt_template_header (void);
+  TAO_OutStream *ciao_svnt_template_header ();
 
   /// Get the CIAO template servant source stream.
-  TAO_OutStream *ciao_svnt_template_source (void);
+  TAO_OutStream *ciao_svnt_template_source ();
 
   /// Get the CIAO executor impl header stream.
-  TAO_OutStream *ciao_exec_header (void);
+  TAO_OutStream *ciao_exec_header ();
 
   /// Get the CIAO executor impl source stream.
-  TAO_OutStream *ciao_exec_source (void);
+  TAO_OutStream *ciao_exec_source ();
 
   /// Get the CIAO executor IDL source stream.
-  TAO_OutStream *ciao_exec_idl (void);
+  TAO_OutStream *ciao_exec_idl ();
 
   /// Get the CIAO connector impl header stream.
-  TAO_OutStream *ciao_conn_header (void);
+  TAO_OutStream *ciao_conn_header ();
 
   /// Get the CIAO connector impl source stream.
-  TAO_OutStream *ciao_conn_source (void);
+  TAO_OutStream *ciao_conn_source ();
 
   /// Get the CIAO AMI connector IDL stream.
-  TAO_OutStream *ciao_ami_conn_idl (void);
+  TAO_OutStream *ciao_ami_conn_idl ();
 
   /// Set the gperf input file stream.
   void gperf_input_stream (TAO_OutStream *gperf_input);
 
   /// Retrieve the gperf input stream being used.
-  TAO_OutStream *gperf_input_stream (void);
+  TAO_OutStream *gperf_input_stream ();
 
   /// Set the gperf input file name.
   void gperf_input_filename (char *filename);
@@ -373,7 +373,7 @@ public:
    * program. This is needed coz I do ACE_OS::open on this when I need
    * ACE_HANDLE for the file instead FILE*.
    */
-  char *gperf_input_filename (void);
+  char *gperf_input_filename ();
 
   /// Convert input string to all one case.
   const char *upcase (const char *str);
@@ -383,7 +383,7 @@ public:
   void gen_ident_string (TAO_OutStream *stream) const;
 
   /// Generates the export files selected on the command line.
-  void gen_export_files (void);
+  void gen_export_files ();
 
   /// Generate file include, with optional empty comment to
   /// short-circuit DOxygen.
@@ -392,7 +392,7 @@ public:
                              bool add_comment = false);
 
   /// Cleanup.
-  void destroy (void);
+  void destroy ();
 
 private:
   void gen_ifndef_string (const char *fname,
@@ -401,13 +401,13 @@ private:
                           const char *suffix);
 
   /// Utility methods for generating file includes.
-  void gen_stub_hdr_includes (void);
-  void gen_stub_src_includes (void);
-  void gen_skel_hdr_includes (void);
-  void gen_skel_src_includes (void);
-  void gen_seq_file_includes (void);
+  void gen_stub_hdr_includes ();
+  void gen_stub_src_includes ();
+  void gen_skel_hdr_includes ();
+  void gen_skel_src_includes ();
+  void gen_seq_file_includes ();
   void gen_any_file_includes (TAO_OutStream * stream) ;
-  void gen_var_file_includes (void);
+  void gen_var_file_includes ();
   void gen_stub_arg_file_includes (TAO_OutStream * stream);
   void gen_skel_arg_file_includes (TAO_OutStream * stream);
   void gen_cond_file_include (bool condition_green,
@@ -419,12 +419,12 @@ private:
   void gen_svnt_hdr_includes (TAO_OutStream *stream);
   void gen_svnt_src_includes (TAO_OutStream *stream);
   void gen_svnt_tmpl_hdr_includes (TAO_OutStream *stream);
-  void gen_exec_hdr_includes (void);
-  void gen_exec_src_includes (void);
-  void gen_exec_idl_includes (void);
-  void gen_conn_hdr_includes (void);
-  void gen_conn_src_includes (void);
-  void gen_ami_conn_idl_includes (void);
+  void gen_exec_hdr_includes ();
+  void gen_exec_src_includes ();
+  void gen_exec_idl_includes ();
+  void gen_conn_hdr_includes ();
+  void gen_conn_src_includes ();
+  void gen_ami_conn_idl_includes ();
 
   bool is_system_file (const char * idl_name) const;
 
diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h
index 8871023c2da..09766163811 100644
--- a/TAO/TAO_IDL/be_include/be_component.h
+++ b/TAO/TAO_IDL/be_include/be_component.h
@@ -33,17 +33,17 @@ public:
                 AST_Interface **supports_flat,
                 long n_supports_flat);
 
-  ~be_component (void);
+  ~be_component ();
 
   /// Override of the AST method to eliminate narrowing of
   /// the return value. Non-virtual.
-  be_component *base_component (void) const;
+  be_component *base_component () const;
 
   /// Catch BE-specific members before delegating to the base class.
   virtual void redefine (AST_Interface *from);
 
   /// Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Visiting.
   virtual int accept (be_visitor *visitor);
@@ -53,14 +53,14 @@ public:
   AST_Structure *be_add_structure (AST_Structure *t);
   AST_Typedef *be_add_typedef (AST_Typedef *t);
 
-  ACE_CDR::ULong n_provides (void) const;
-  ACE_CDR::ULong n_remote_provides (void) const;
-  ACE_CDR::ULong n_uses (void) const;
-  ACE_CDR::ULong n_remote_uses (void) const;
-  bool has_uses_multiple (void) const;
-  ACE_CDR::ULong n_publishes (void) const;
-  ACE_CDR::ULong n_consumes (void) const;
-  ACE_CDR::ULong n_emits (void) const;
+  ACE_CDR::ULong n_provides () const;
+  ACE_CDR::ULong n_remote_provides () const;
+  ACE_CDR::ULong n_uses () const;
+  ACE_CDR::ULong n_remote_uses () const;
+  bool has_uses_multiple () const;
+  ACE_CDR::ULong n_publishes () const;
+  ACE_CDR::ULong n_consumes () const;
+  ACE_CDR::ULong n_emits () const;
 
   /// Update the has_* members.
   void scan (UTL_Scope *s);
@@ -74,11 +74,6 @@ public:
   /// Generate the string compares for ancestors in _is_a().
   virtual int gen_is_a_ancestors (TAO_OutStream *os);
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_component);
-  DEF_NARROW_FROM_SCOPE (be_component);
-
 private:
   /// Specialized version for mirror ports.
   void mirror_scan (AST_PortType *p);
diff --git a/TAO/TAO_IDL/be_include/be_component_fwd.h b/TAO/TAO_IDL/be_include/be_component_fwd.h
index 828b6df2efc..01ef8cc5c6c 100644
--- a/TAO/TAO_IDL/be_include/be_component_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_component_fwd.h
@@ -29,17 +29,13 @@ public:
   be_component_fwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~be_component_fwd (void);
+  virtual ~be_component_fwd ();
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_component_fwd);
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_connector.h b/TAO/TAO_IDL/be_include/be_connector.h
index 07c0370cf72..da35bc73d82 100644
--- a/TAO/TAO_IDL/be_include/be_connector.h
+++ b/TAO/TAO_IDL/be_include/be_connector.h
@@ -13,23 +13,19 @@ public:
   be_connector (UTL_ScopedName *n,
                 AST_Connector *base_connector);
 
-  virtual ~be_connector (void);
+  virtual ~be_connector ();
 
   /// Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_connector);
-  DEF_NARROW_FROM_SCOPE (be_connector);
+  virtual void destroy ();
 
   /// Visiting.
   virtual int accept (be_visitor *visitor);
 
-  bool dds_connector (void);
-  bool ami_connector (void);
+  bool dds_connector ();
+  bool ami_connector ();
 
 private:
-  void check_ancestors (void);
+  void check_ancestors ();
 
 private:
   bool dds_connector_;
diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h
index 7fb2681e0f8..27f307b3813 100644
--- a/TAO/TAO_IDL/be_include/be_constant.h
+++ b/TAO/TAO_IDL/be_include/be_constant.h
@@ -32,10 +32,7 @@ public:
   virtual int accept (be_visitor *visitor);
 
   //Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_constant);
+  virtual void destroy ();
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_consumes.h b/TAO/TAO_IDL/be_include/be_consumes.h
index 40b7fbfe713..941d0381a08 100644
--- a/TAO/TAO_IDL/be_include/be_consumes.h
+++ b/TAO/TAO_IDL/be_include/be_consumes.h
@@ -16,19 +16,16 @@ public:
   be_consumes (UTL_ScopedName *n,
                AST_Type *consumes_type);
 
-  virtual ~be_consumes (void);
+  virtual ~be_consumes ();
 
   // Non-virtual override of frontend method.
-  be_eventtype *consumes_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_consumes);
+  be_eventtype *consumes_type () const;
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #endif // BE_CONSUMES_H
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index dce208816c2..1ae61b79451 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -34,7 +34,7 @@ public:
   be_decl (AST_Decl::NodeType type,
            UTL_ScopedName *n);
 
-  ~be_decl (void);
+  ~be_decl ();
 
   // Methods used by the interface type strategy.
   /// Both the arguments should be non-null!!!. Applies prefix and
@@ -52,63 +52,63 @@ public:
   // End of Methods use by the interface type strategy.
 
   /// Return the scope created by this node (if one exists).
-  virtual be_scope *scope (void);
+  virtual be_scope *scope ();
 
   // Visiting
   virtual int accept (be_visitor *visitor);
 
   /// Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Temporarily set this node's is_local_ flag.
   void set_local (bool val);
 
   // Boolean methods to test if code was already generated.
-  bool cli_hdr_gen (void);
-  bool cli_stub_gen (void);
-  bool cli_inline_gen (void);
-  bool srv_hdr_gen (void);
-  bool impl_hdr_gen (void);
-  bool srv_skel_gen (void);
-  bool impl_skel_gen (void);
-  bool srv_inline_gen (void);
-  bool tie_skel_gen (void);
-  bool cli_hdr_any_op_gen (void);
-  bool cli_stub_any_op_gen (void);
-  bool cli_hdr_cdr_op_gen (void);
-  bool cli_stub_cdr_op_gen (void);
-  bool cli_inline_cdr_op_gen (void);
-  bool cli_inline_cdr_decl_gen (void);
-  bool cli_traits_gen (void);
-  bool cli_arg_traits_gen (void);
-  bool srv_arg_traits_gen (void);
-  bool srv_sarg_traits_gen (void);
-  bool cli_pragma_inst_gen (void);
-  bool cli_inarg_tmpl_class_gen (void);
-  bool cli_inarg_pragma_inst_gen (void);
-  bool cli_inoutarg_tmpl_class_gen (void);
-  bool cli_inoutarg_pragma_inst_gen (void);
-  bool cli_outarg_tmpl_class_gen (void);
-  bool cli_outarg_pragma_inst_gen (void);
-  bool cli_retarg_tmpl_class_gen (void);
-  bool cli_retarg_pragma_inst_gen (void);
-  bool srv_tmpl_class_gen (void);
-  bool srv_pragma_inst_gen (void);
-  bool srv_inarg_tmpl_class_gen (void);
-  bool srv_inarg_pragma_inst_gen (void);
-  bool srv_inoutarg_tmpl_class_gen (void);
-  bool srv_inoutarg_pragma_inst_gen (void);
-  bool srv_outarg_tmpl_class_gen (void);
-  bool srv_outarg_pragma_inst_gen (void);
-  bool srv_retarg_tmpl_class_gen (void);
-  bool srv_retarg_pragma_inst_gen (void);
-  bool ccm_pre_proc_gen (void);
-  bool ex_idl_facet_gen (void);
-  bool svnt_hdr_facet_gen (void);
-  bool svnt_src_facet_gen (void);
-  bool exec_hdr_facet_gen (void);
-  bool exec_src_facet_gen (void);
-  bool ami4ccm_ex_idl_gen (void);
+  bool cli_hdr_gen ();
+  bool cli_stub_gen ();
+  bool cli_inline_gen ();
+  bool srv_hdr_gen ();
+  bool impl_hdr_gen ();
+  bool srv_skel_gen ();
+  bool impl_skel_gen ();
+  bool srv_inline_gen ();
+  bool tie_skel_gen ();
+  bool cli_hdr_any_op_gen ();
+  bool cli_stub_any_op_gen ();
+  bool cli_hdr_cdr_op_gen ();
+  bool cli_stub_cdr_op_gen ();
+  bool cli_inline_cdr_op_gen ();
+  bool cli_inline_cdr_decl_gen ();
+  bool cli_traits_gen ();
+  bool cli_arg_traits_gen ();
+  bool srv_arg_traits_gen ();
+  bool srv_sarg_traits_gen ();
+  bool cli_pragma_inst_gen ();
+  bool cli_inarg_tmpl_class_gen ();
+  bool cli_inarg_pragma_inst_gen ();
+  bool cli_inoutarg_tmpl_class_gen ();
+  bool cli_inoutarg_pragma_inst_gen ();
+  bool cli_outarg_tmpl_class_gen ();
+  bool cli_outarg_pragma_inst_gen ();
+  bool cli_retarg_tmpl_class_gen ();
+  bool cli_retarg_pragma_inst_gen ();
+  bool srv_tmpl_class_gen ();
+  bool srv_pragma_inst_gen ();
+  bool srv_inarg_tmpl_class_gen ();
+  bool srv_inarg_pragma_inst_gen ();
+  bool srv_inoutarg_tmpl_class_gen ();
+  bool srv_inoutarg_pragma_inst_gen ();
+  bool srv_outarg_tmpl_class_gen ();
+  bool srv_outarg_pragma_inst_gen ();
+  bool srv_retarg_tmpl_class_gen ();
+  bool srv_retarg_pragma_inst_gen ();
+  bool ccm_pre_proc_gen ();
+  bool ex_idl_facet_gen ();
+  bool svnt_hdr_facet_gen ();
+  bool svnt_src_facet_gen ();
+  bool exec_hdr_facet_gen ();
+  bool exec_src_facet_gen ();
+  bool ami4ccm_ex_idl_gen ();
 
   // Set the flag indicating that code generation is done.
   void cli_hdr_gen (bool);
@@ -157,10 +157,6 @@ public:
   void exec_src_facet_gen (bool);
   void ami4ccm_ex_idl_gen (bool);
 
-  // Narrowing
-
-  DEF_NARROW_FROM_DECL (be_decl);
-
 private:
   // Variables that indicate if the code generation for that node is already
   // been done. This way we avoid regenerating same code.
diff --git a/TAO/TAO_IDL/be_include/be_emits.h b/TAO/TAO_IDL/be_include/be_emits.h
index 96970a433b9..813b0aa303a 100644
--- a/TAO/TAO_IDL/be_include/be_emits.h
+++ b/TAO/TAO_IDL/be_include/be_emits.h
@@ -16,19 +16,16 @@ public:
   be_emits (UTL_ScopedName *n,
             AST_Type *emits_type);
 
-  virtual ~be_emits (void);
+  virtual ~be_emits ();
 
   // Non-virtual override of frontend method.
-  be_eventtype *emits_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_emits);
+  be_eventtype *emits_type () const;
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #endif // BE_EMITS_H
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
index 6d78edbb639..5154d85f2a1 100644
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ b/TAO/TAO_IDL/be_include/be_enum.h
@@ -35,14 +35,10 @@ public:
                                      bool use_underscore);
 
   /// Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_enum);
-  DEF_NARROW_FROM_SCOPE (be_enum);
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h
index 4dfc0305cc1..78959570fea 100644
--- a/TAO/TAO_IDL/be_include/be_enum_val.h
+++ b/TAO/TAO_IDL/be_include/be_enum_val.h
@@ -31,10 +31,7 @@ public:
   virtual int accept (be_visitor *visitor);
 
   //Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing
-  DEF_NARROW_FROM_DECL (be_enum_val);
+  virtual void destroy ();
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_eventtype.h b/TAO/TAO_IDL/be_include/be_eventtype.h
index 333f0571ed8..7b5e5fcfc39 100644
--- a/TAO/TAO_IDL/be_include/be_eventtype.h
+++ b/TAO/TAO_IDL/be_include/be_eventtype.h
@@ -37,17 +37,13 @@ public:
                 bool truncatable,
                 bool custom);
 
-  ~be_eventtype (void);
+  ~be_eventtype ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_eventtype);
-  DEF_NARROW_FROM_SCOPE (be_eventtype);
+  virtual void destroy ();
 };
 
 #endif  // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h
index 89b994ffa1b..3ee3c770bc1 100644
--- a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h
@@ -29,16 +29,13 @@ public:
   be_eventtype_fwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~be_eventtype_fwd (void);
+  virtual ~be_eventtype_fwd ();
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
 
   // Cleanup
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_eventtype_fwd);
+  virtual void destroy ();
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
index 23b831d80b1..39d42cea0d7 100644
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ b/TAO/TAO_IDL/be_include/be_exception.h
@@ -16,14 +16,10 @@ public:
                 bool abstract);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_exception);
-  DEF_NARROW_FROM_SCOPE (be_exception);
 };
 
 #endif // end of if !defined (...)
diff --git a/TAO/TAO_IDL/be_include/be_extended_port.h b/TAO/TAO_IDL/be_include/be_extended_port.h
index ba6af7aa6c5..992549a47ae 100644
--- a/TAO/TAO_IDL/be_include/be_extended_port.h
+++ b/TAO/TAO_IDL/be_include/be_extended_port.h
@@ -32,15 +32,13 @@ public:
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
 
-  virtual ~be_extended_port (void);
+  virtual ~be_extended_port ();
 
-  be_porttype *port_type (void) const;
+  be_porttype *port_type () const;
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual int accept (be_visitor *visitor);
-
-  DEF_NARROW_FROM_DECL (be_extended_port);
 };
 
 #endif // BE_EXTENDED_PORT_H
diff --git a/TAO/TAO_IDL/be_include/be_extern.h b/TAO/TAO_IDL/be_include/be_extern.h
index b6bb946bb8e..444fb4674ce 100644
--- a/TAO/TAO_IDL/be_include/be_extern.h
+++ b/TAO/TAO_IDL/be_include/be_extern.h
@@ -73,9 +73,9 @@ extern TAO_IDL_BE_Export BE_GlobalData *be_global;
 
 extern TAO_IDL_BE_Export int BE_init (int &, ACE_TCHAR*[]);
 extern TAO_IDL_BE_Export void BE_post_init (char *[], long);
-extern TAO_IDL_BE_Export void BE_version (void);
-extern TAO_IDL_BE_Export void BE_produce (void);
-extern TAO_IDL_BE_Export void BE_cleanup (void);
-extern TAO_IDL_BE_Export void BE_abort (void);
+extern TAO_IDL_BE_Export void BE_version ();
+extern TAO_IDL_BE_Export void BE_produce ();
+extern TAO_IDL_BE_Export void BE_cleanup ();
+extern TAO_IDL_BE_Export void BE_abort ();
 
 #endif           // _BE_EXTERN_BE_EXTERN_HH
diff --git a/TAO/TAO_IDL/be_include/be_factory.h b/TAO/TAO_IDL/be_include/be_factory.h
index 97b8fdabec2..5b9c3b4ac58 100644
--- a/TAO/TAO_IDL/be_include/be_factory.h
+++ b/TAO/TAO_IDL/be_include/be_factory.h
@@ -30,20 +30,16 @@ class be_factory : public virtual AST_Factory,
 public:
   be_factory (UTL_ScopedName *n);
 
-  ~be_factory (void);
+  ~be_factory ();
 
   /// Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Add an argument to the scope.
   virtual AST_Argument *be_add_argument (AST_Argument *arg);
-
-  // Narrowing
-  DEF_NARROW_FROM_DECL (be_factory);
-  DEF_NARROW_FROM_SCOPE (be_factory);
 };
 
 #endif // BE_FACTORY_H
diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h
index 3b860cf7390..0f61138f6d0 100644
--- a/TAO/TAO_IDL/be_include/be_field.h
+++ b/TAO/TAO_IDL/be_include/be_field.h
@@ -29,7 +29,7 @@ public:
             Visibility vis = vis_NA);
 
   // Non-virtual override of frontend method.
-  be_type *field_type (void) const;
+  be_type *field_type () const;
 
   // Generate debugging ostream operator for members.
   void gen_member_ostream_operator (TAO_OutStream *os,
@@ -38,18 +38,14 @@ public:
                                     bool accessor = false);
 
   // Accessors for the member.
-  bool port_name_prefixed (void) const;
+  bool port_name_prefixed () const;
   void port_name_prefixed (bool val);
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_field);
+  virtual void destroy ();
 
 private:
   // If the name of a provides or uses node has already been
diff --git a/TAO/TAO_IDL/be_include/be_finder.h b/TAO/TAO_IDL/be_include/be_finder.h
index c54090e5e3b..d6f7208aec6 100644
--- a/TAO/TAO_IDL/be_include/be_finder.h
+++ b/TAO/TAO_IDL/be_include/be_finder.h
@@ -24,17 +24,13 @@ class be_finder : public virtual AST_Finder,
 public:
   be_finder (UTL_ScopedName *n);
 
-  ~be_finder (void);
+  ~be_finder ();
 
   /// Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_FROM_DECL (be_finder);
-  DEF_NARROW_FROM_SCOPE (be_finder);
 };
 
 #endif // BE_FINDER_H
diff --git a/TAO/TAO_IDL/be_include/be_fixed.h b/TAO/TAO_IDL/be_include/be_fixed.h
index 7f9936c8b7d..617f5725cb3 100644
--- a/TAO/TAO_IDL/be_include/be_fixed.h
+++ b/TAO/TAO_IDL/be_include/be_fixed.h
@@ -17,8 +17,6 @@ public:
   virtual int accept (be_visitor *visitor);
 
   virtual void destroy ();
-
-  DEF_NARROW_FROM_DECL (be_fixed);
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index c989a617de9..01dfa862b74 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -55,14 +55,14 @@ public:
     COREDX
   };
 
-  BE_GlobalData (void);
-  ~BE_GlobalData (void);
+  BE_GlobalData ();
+  ~BE_GlobalData ();
 
   // To switch between changing or non-changing standard include
   // files (e.g. tao/corba.h)  so that #include statements can be
   // generated with ""s or <>s respectively.
   void changing_standard_include_files (size_t changing);
-  size_t changing_standard_include_files (void);
+  size_t changing_standard_include_files ();
 
   // Helper functions that generate the file names for the C++ mapping
   // generated code.
@@ -72,7 +72,7 @@ public:
   static const char *be_get_client_hdr_fname (
     bool base_name_only = false);
 
-  static const char *be_get_client_stub_fname (void);
+  static const char *be_get_client_stub_fname ();
 
   static const char *be_get_client_inline_fname (
     bool base_name_only = false);
@@ -89,9 +89,9 @@ public:
   static const char *be_get_server_template_hdr_fname (
     bool base_name_only = false);
 
-  static const char *be_get_server_skeleton_fname (void);
+  static const char *be_get_server_skeleton_fname ();
 
-  static const char *be_get_implementation_skeleton_fname (void);
+  static const char *be_get_implementation_skeleton_fname ();
 
   static const char *be_get_server_template_skeleton_fname (
     bool base_name_only = false);
@@ -250,14 +250,14 @@ public:
 
   /// Returns the macro name for exporting server side classes in Win32
   /// DLL.
-  const char* skel_export_macro (void) const;
+  const char* skel_export_macro () const;
 
   /// Set the macro name for export server side classes in Win32 DLL.
   void skel_export_macro (const char* s);
 
   /// Returns the name of the include file that contains the server
   /// side export macro definition.
-  const char* skel_export_include (void) const;
+  const char* skel_export_include () const;
 
   /// Set the name of the include file that contains the server side
   /// export macro definition.
@@ -265,7 +265,7 @@ public:
 
   /// Returns the name of the include file that will be generated for the
   /// server side export macro definition.
-  const char* skel_export_file (void) const;
+  const char* skel_export_file () const;
 
   /// Set the name of the include file that the will be generated for server
   /// side export macro definition.
@@ -273,14 +273,14 @@ public:
 
   /// Returns the macro name for exporting client side classes in Win32
   /// DLL.
-  const char* stub_export_macro (void) const;
+  const char* stub_export_macro () const;
 
   /// Set the macro name for export client side classes in Win32 DLL.
   void stub_export_macro (const char* s);
 
   /// Returns the name of the include file that contains the client
   /// side export macro definition.
-  const char* stub_export_include (void) const;
+  const char* stub_export_include () const;
 
   /// Set the name of the include file that contains the client side
   /// export macro definition.
@@ -288,7 +288,7 @@ public:
 
   /// Returns the name of the include file will be generated for the client
   /// side export macro definition.
-  const char* stub_export_file (void) const;
+  const char* stub_export_file () const;
 
   /// Set the name of the include file that will be generated for the client
   /// side export macro definition.
@@ -296,14 +296,14 @@ public:
 
   /// Returns the macro name for exporting *A.h file classes in Win32
   /// DLL.
-  const char* anyop_export_macro (void) const;
+  const char* anyop_export_macro () const;
 
   /// Set the macro name for export *A.h file classes in Win32 DLL.
   void anyop_export_macro (const char* s);
 
   /// Returns the name of the include file that contains the *A.h
   /// file export macro definition.
-  const char* anyop_export_include (void) const;
+  const char* anyop_export_include () const;
 
   /// Set the name of the include file that contains the *A.h file
   /// export macro definition.
@@ -311,14 +311,14 @@ public:
 
   /// Returns the macro name for exporting exec impl classes in Win32
   /// DLL.
-  const char* exec_export_macro (void) const;
+  const char* exec_export_macro () const;
 
   /// Set the macro name for export exec impl classes in Win32 DLL.
   void exec_export_macro (const char* s);
 
   /// Returns the name of the include file that contains the exec
   /// impl export macro definition.
-  const char* exec_export_include (void) const;
+  const char* exec_export_include () const;
 
   /// Set the name of the include file that contains the exec impl
   /// export macro definition.
@@ -326,14 +326,14 @@ public:
 
   /// Returns the macro name for exporting CIAO svnt classes in Win32
   /// DLL.
-  const char* svnt_export_macro (void) const;
+  const char* svnt_export_macro () const;
 
   /// Set the macro name for export CIAO svnt classes in Win32 DLL.
   void svnt_export_macro (const char* s);
 
   /// Returns the name of the include file that contains the CIAO
   /// svnt export macro definition.
-  const char* svnt_export_include (void) const;
+  const char* svnt_export_include () const;
 
   /// Set the name of the include file that contains the CIAO svnt
   /// export macro definition.
@@ -341,7 +341,7 @@ public:
 
   /// Returns the macro name for exporting CIAO connector
   /// classes in Win32 DLL.
-  const char* conn_export_macro (void) const;
+  const char* conn_export_macro () const;
 
   /// Set the macro name for export CIAO connector
   /// classes in Win32 DLL.
@@ -349,7 +349,7 @@ public:
 
   /// Returns the name of the include file that contains the CIAO
   /// connector export macro definition.
-  const char* conn_export_include (void) const;
+  const char* conn_export_include () const;
 
   /// Set the name of the include file that contains the CIAO
   /// connector export macro definition.
@@ -357,7 +357,7 @@ public:
 
   /// Returns the name of the include file to be used for precompiled
   /// header support.
-  const char* pch_include (void) const;
+  const char* pch_include () const;
 
   /// Set the name of the include file to be used for precompiled
   /// header support.
@@ -365,7 +365,7 @@ public:
 
   /// Returns the name of the include file to be put at the top of
   /// every header file.
-  const char* pre_include (void) const;
+  const char* pre_include () const;
 
   /// Set the name of the include file to be put at the top of every
   /// header file.
@@ -373,21 +373,21 @@ public:
 
   /// Returns the name of the include file to be put at the bottom of
   /// every header file.
-  const char* post_include (void) const;
+  const char* post_include () const;
 
   /// Set the name of the include file to be put at the bottom of every
   /// header file.
   void post_include (const char* s);
 
   /// Returns the guard that is placed in the client header file
-  const char* include_guard (void) const;
+  const char* include_guard () const;
 
   /// Set the guard that is placed in the client header file
   void include_guard (const char* s);
 
   /// Returns the name of the include file that is used instead of the own
   /// generated client header file
-  const char* safe_include (void) const;
+  const char* safe_include () const;
 
   /// set the name of the include file that is used instead of the own
   /// generated client header file
@@ -395,7 +395,7 @@ public:
 
   /// Returns the name of the include file that should on get
   /// generated in the client header file
-  const char* unique_include (void) const;
+  const char* unique_include () const;
 
   /// Set the name of the include file that should on get
   /// generated in the client header file
@@ -403,7 +403,7 @@ public:
 
   /// Returns the name of the include file that should be used as
   /// stripped_filename
-  const char* stripped_filename (void) const;
+  const char* stripped_filename () const;
 
   /// Set the name of the include file that should be used as stripped_filename
   void stripped_filename (const char* s);
@@ -412,27 +412,27 @@ public:
   void versioning_begin (const char* s);
 
   /// Get text that opens a "versioned" namespace.
-  const char * versioning_begin (void) const;
+  const char * versioning_begin () const;
 
   /// Set include file for "versioned" namespace.
   void versioning_include (const char* s);
 
   /// Get include file for "versioned" namespace.
-  const char * versioning_include (void) const;
+  const char * versioning_include () const;
 
   /// Get text that opens a "versioned" namespace for core TAO/orbsvcs
   /// related code.
-  const char * core_versioning_begin (void) const;
+  const char * core_versioning_begin () const;
 
   /// Set text that closes a "versioned" namespace.
   void versioning_end (const char* s);
 
   /// Get text that closes a "versioned" namespace.
-  const char * versioning_end (void) const;
+  const char * versioning_end () const;
 
   /// Get text that closes a "versioned" namespace for core TAO/orbsvcs
   /// related code.
-  const char * core_versioning_end (void) const;
+  const char * core_versioning_end () const;
 
   // = Set and get methods for different file name endings.
 
@@ -440,25 +440,25 @@ public:
   void client_hdr_ending (const char* s);
 
   /// Get the client_hdr_ending.
-  const char* client_hdr_ending (void) const;
+  const char* client_hdr_ending () const;
 
   /// Set the client_inline_ending.
   void client_inline_ending (const char* s);
 
   /// Get the client_inline_ending.
-  const char* client_inline_ending (void) const;
+  const char* client_inline_ending () const;
 
   /// Set the client_stub_ending.
   void  client_stub_ending (const char* s);
 
   /// Get the client_stub_ending.
-  const char* client_stub_ending (void) const;
+  const char* client_stub_ending () const;
 
   /// Set the server_hdr_ending.
   void server_hdr_ending (const char* s);
 
   /// Get the server_hdr_ending.
-  const char* server_hdr_ending (void) const;
+  const char* server_hdr_ending () const;
 
   /// Set the implementation_hdr_ending.
   void implementation_hdr_ending (const char* s);
@@ -473,121 +473,121 @@ public:
   void implementation_skel_ending (const char* s);
 
   /// Get the implementation_hdr_ending.
-  const char* implementation_hdr_ending (void) const;
+  const char* implementation_hdr_ending () const;
 
   ///Get implementation class prefix
-  const char* impl_class_prefix (void) const;
+  const char* impl_class_prefix () const;
 
   ///Get implementation class suffix
-  const char* impl_class_suffix (void) const;
+  const char* impl_class_suffix () const;
 
   /// Get the implementation_skel_ending.
-  const char* implementation_skel_ending (void) const;
+  const char* implementation_skel_ending () const;
 
   /// Set the server_template_hdr_ending.
   void server_template_hdr_ending (const char* s);
 
   /// Get the server_template_hdr_ending.
-  const char* server_template_hdr_ending (void) const;
+  const char* server_template_hdr_ending () const;
 
   /// Set the server_skeleton_ending.
   void server_skeleton_ending (const char* s);
 
   /// Get the server_skeleton_ending.
-  const char* server_skeleton_ending (void) const;
+  const char* server_skeleton_ending () const;
 
   /// Set the server_template_skeleton_ending.
   void server_template_skeleton_ending (const char* s);
 
   /// Get the server_template_skeleton_ending.
-  const char* server_template_skeleton_ending (void) const;
+  const char* server_template_skeleton_ending () const;
 
   /// Set the anyop_header_ending.
   void anyop_header_ending (const char* s);
 
   /// Get the anyop_header_ending.
-  const char* anyop_header_ending (void) const;
+  const char* anyop_header_ending () const;
 
   /// Set the anyop_source_ending.
   void anyop_source_ending (const char* s);
 
   /// Get the anyop_source_ending.
-  const char* anyop_source_ending (void) const;
+  const char* anyop_source_ending () const;
 
   /// Similar to above, but for CIAO servant and executor
   /// impl and executor IDL files, if generated.
   void ciao_svnt_header_template_ending (const char* s);
-  const char* ciao_svnt_header_template_ending (void) const;
+  const char* ciao_svnt_header_template_ending () const;
 
   void ciao_svnt_source_template_ending (const char* s);
-  const char* ciao_svnt_source_template_ending (void) const;
+  const char* ciao_svnt_source_template_ending () const;
 
   void ciao_svnt_header_ending (const char* s);
-  const char* ciao_svnt_header_ending (void) const;
+  const char* ciao_svnt_header_ending () const;
 
   void ciao_svnt_source_ending (const char* s);
-  const char* ciao_svnt_source_ending (void) const;
+  const char* ciao_svnt_source_ending () const;
 
   void ciao_exec_header_ending (const char* s);
-  const char* ciao_exec_header_ending (void) const;
+  const char* ciao_exec_header_ending () const;
 
   void ciao_exec_source_ending (const char* s);
-  const char* ciao_exec_source_ending (void) const;
+  const char* ciao_exec_source_ending () const;
 
   void ciao_exec_stub_header_ending (const char* s);
-  const char* ciao_exec_stub_header_ending (void) const;
+  const char* ciao_exec_stub_header_ending () const;
 
   void ciao_exec_idl_ending (const char* s);
-  const char* ciao_exec_idl_ending (void) const;
+  const char* ciao_exec_idl_ending () const;
 
   void ciao_conn_header_ending (const char* s);
-  const char* ciao_conn_header_ending (void) const;
+  const char* ciao_conn_header_ending () const;
 
   void ciao_conn_source_ending (const char* s);
-  const char* ciao_conn_source_ending (void) const;
+  const char* ciao_conn_source_ending () const;
 
   /// For generating TypeSupport header file includes.
   void dds_typesupport_hdr_ending (const char* s);
-  const char* dds_typesupport_hdr_ending (void) const;
+  const char* dds_typesupport_hdr_ending () const;
 
   /// For optionally generating CIAO AMI connector IDL file.
   void ciao_ami_conn_idl_ending (const char* s);
-  const char* ciao_ami_conn_idl_ending (void) const;
+  const char* ciao_ami_conn_idl_ending () const;
 
   /// For optionally generating CIAO AMI reply handler
   /// impl header file.
   void ciao_ami_conn_impl_hdr_ending (const char* s);
-  const char* ciao_ami_conn_impl_hdr_ending (void) const;
+  const char* ciao_ami_conn_impl_hdr_ending () const;
 
   /// For optionally generating CIAO AMI reply handler
   /// impl source file.
   void ciao_ami_conn_impl_src_ending (const char* s);
-  const char* ciao_ami_conn_impl_src_ending (void) const;
+  const char* ciao_ami_conn_impl_src_ending () const;
 
   /// For optionally controlling the container type, default is Session
   void ciao_container_type (const char* s);
-  const char* ciao_container_type (void) const;
+  const char* ciao_container_type () const;
 
   /// Set the clonable_in_args.
   void use_clonable_in_args (bool clonable);
 
   /// Get the clonable_in_args setting.
-  bool use_clonable_in_args (void) const;
+  bool use_clonable_in_args () const;
 
   /// Get the gen_seq_template_export_ member.
-  bool gen_template_export (void) const;
+  bool gen_template_export () const;
 
   /// Set the gen_seq_template_export_ member.
   void gen_template_export (bool val);
 
   /// Get the gen_ostream_operators_ member.
-  bool gen_ostream_operators (void) const;
+  bool gen_ostream_operators () const;
 
   /// Set the gen_ostream_operators_ member.
   void gen_ostream_operators (bool val);
 
   /// Get the gen_static_desc_operations_ member.
-  bool gen_static_desc_operations (void) const;
+  bool gen_static_desc_operations () const;
 
   /// Set the gen_static_desc_operations_ member.
   void gen_static_desc_operations (bool val);
@@ -605,7 +605,7 @@ public:
    * to be kept. Default is current directory from which the
    * <tao_idl> is called.
    */
-  const char* output_dir (void) const;
+  const char* output_dir () const;
 
   /// Set the path for all *C.* file includes.
   /// Default is local directory or $TAO_ROOT/tao.
@@ -613,7 +613,7 @@ public:
 
   /// Get the path for all *C.* file includes.
   /// Default is local directory or $TAO_ROOT/tao.
-  const char* stub_include_dir (void) const;
+  const char* stub_include_dir () const;
 
   /// Set the directory where all the *S.* files are
   /// to be kept. Default is output_dir_.
@@ -621,7 +621,7 @@ public:
 
   /// Get the directory where all the *S.* files are
   /// to be kept. Default is output_dir_.
-  const char* skel_output_dir (void) const;
+  const char* skel_output_dir () const;
 
   /// Set the directory where all the *A.* files are
   /// to be kept. Default is output_dir_.
@@ -629,7 +629,7 @@ public:
 
   /// Get the directory where all the *A.* files are
   /// to be kept. Default is output_dir_.
-  const char* anyop_output_dir (void) const;
+  const char* anyop_output_dir () const;
 
   /// Set the directory where all the *exec.* files are
   /// to be kept. Default is output_dir_.
@@ -637,10 +637,10 @@ public:
 
   /// Get the directory where all the *exec.* files are
   /// to be kept. Default is output_dir_.
-  const char* exec_output_dir (void) const;
+  const char* exec_output_dir () const;
 
   ///Get the flag for not overwriting already existing exec files.
-  bool overwrite_not_exec (void) const;
+  bool overwrite_not_exec () const;
 
   ///Set the flag for not overwriting already existing exec files.
   void overwrite_not_exec (bool val);
@@ -649,138 +649,138 @@ public:
   void any_support (bool);
 
   /// Check Any support.
-  bool any_support (void) const;
+  bool any_support () const;
 
   /// Set cdr support.
   void cdr_support (bool);
 
   /// Check cdr support.
-  bool cdr_support (void) const;
+  bool cdr_support () const;
 
   /// Set TypeCode support.
   void tc_support (bool);
 
   /// Check TypeCode support
-  bool tc_support (void) const;
+  bool tc_support () const;
 
   /// Set optimized valuetype member accessor generation.
   void obv_opt_accessor (bool);
 
   /// Check optimized valuetype member accessor generation.
-  bool obv_opt_accessor (void) const;
+  bool obv_opt_accessor () const;
 
   /// Set generation of implementation files.
   void gen_impl_files (bool);
 
   /// Check if we want to generate implementation files.
-  bool gen_impl_files (void) const;
+  bool gen_impl_files () const;
 
   /// Set generation of source file and line number for implementation files.
   void gen_impl_debug_info (bool);
 
   /// Check generation of source file and line number implementation files.
-  bool gen_impl_debug_info (void) const;
+  bool gen_impl_debug_info () const;
 
   /// Set generation of copy constructor.
   void gen_copy_ctor (bool);
 
   /// Check if we want to generate the copy constructor.
-  bool gen_copy_ctor (void) const;
+  bool gen_copy_ctor () const;
 
   /// Set the generation of the assignment operator.
   void gen_assign_op (bool);
 
   /// Check if we want to generate the assignment operator.
-  bool gen_assign_op (void) const;
+  bool gen_assign_op () const;
 
   /// Set whether we want to generate Thru_POA collocation stubs.
   void gen_thru_poa_collocation (bool);
 
   /// Check if we want to generate Thru_POA collocation stubs.
-  bool gen_thru_poa_collocation (void) const;
+  bool gen_thru_poa_collocation () const;
 
   /// Set whether we want to generate Direct collocation stubs.
   void gen_direct_collocation (bool);
 
   /// Check if we want to generate Direct collocation stubs.
-  bool gen_direct_collocation (void) const;
+  bool gen_direct_collocation () const;
 
   /// Set whether we want to generate for CORBA/e
   void gen_corba_e (bool);
 
   /// Check if we want to generate for CORBA/e
-  bool gen_corba_e (void) const;
+  bool gen_corba_e () const;
 
   /// Set whether we want to generate for Minimum CORBA
   void gen_minimum_corba (bool);
 
   /// Check if we want to generate for Minimum CORBA
-  bool gen_minimum_corba (void) const;
+  bool gen_minimum_corba () const;
 
   /// Set whether we want to generate for noeventCCM
   void gen_noeventccm (bool);
 
   /// Check if we want to generate for noeventCCM
-  bool gen_noeventccm (void) const;
+  bool gen_noeventccm () const;
 
   /// Set whether we want to generate for LwCCM
   void gen_lwccm (bool);
 
   /// Check if we want to generate for LwCCM
-  bool gen_lwccm (void) const;
+  bool gen_lwccm () const;
 
   /// Set optimized typecodes.
   void opt_tc (bool);
 
   /// Check if TypeCodes are optimized.
-  bool opt_tc (void) const;
+  bool opt_tc () const;
 
   /// To enable or disable AMI4CCM call back feature
   void ami4ccm_call_back (bool value);
 
   /// Return the flag.
-  bool ami4ccm_call_back (void) const;
+  bool ami4ccm_call_back () const;
 
   /// To enable or disable AMI call back feature of the Messaging
   /// specification in the generated code.
   void ami_call_back (bool value);
 
   /// Return the flag.
-  bool ami_call_back (void) const;
+  bool ami_call_back () const;
 
   /// To enable or disable AMH in the generated code.
   void gen_amh_classes (bool value);
 
   /// Return the flag.
-  bool gen_amh_classes (void) const;
+  bool gen_amh_classes () const;
 
   /// Set the generation of tie classes and files.
   void gen_tie_classes (bool value);
 
   /// Return the flag.
-  bool gen_tie_classes (void) const;
+  bool gen_tie_classes () const;
 
   /// To enable or disable AMI call back feature of the Messaging
   /// specification in the generated code.
   void gen_smart_proxies (bool value);
 
   /// Return the flag.
-  bool gen_smart_proxies (void) const;
+  bool gen_smart_proxies () const;
 
   /// Set the flag.
   void gen_inline_constants (bool value);
 
   /// Return the flag.
-  bool gen_inline_constants (void) const;
+  bool gen_inline_constants () const;
 
   /// Set the flag.
   void gen_orb_h_include (bool value);
 
   /// Return the flag.
-  bool gen_orb_h_include (void) const;
+  bool gen_orb_h_include () const;
 
   /// Generate an empty anyop header (A.h)
-  bool gen_empty_anyop_header (void) const;
+  bool gen_empty_anyop_header () const;
 
   /// Generate an empty anyop header (A.h)
   void gen_empty_anyop_header (bool value);
@@ -790,144 +790,144 @@ public:
 
   /// Return the enumerated value for the lookup strategy. Default is
   /// perfect hashing.
-  LOOKUP_STRATEGY lookup_strategy (void) const;
+  LOOKUP_STRATEGY lookup_strategy () const;
 
   /// Set the DDS implementation.
   void dds_impl (char const * const val);
 
   /// Return the enumerated value for the DDS implementation.
   /// Default is NDDS.
-  DDS_IMPL dds_impl (void) const;
+  DDS_IMPL dds_impl () const;
 
   /// Cleanup function.
-  void destroy (void);
+  void destroy ();
 
   /// Used in the generation of extern function declarations so we
   /// can use non-defined interfaces as members and parameters.
   ACE_Unbounded_Queue<be_interface_fwd *> non_defined_interfaces;
 
   /// Accessor for the member, sets it on the first call.
-  AST_PredefinedType *void_type (void);
+  AST_PredefinedType *void_type ();
 
   /// Accessor for the member, sets it on the first call.
-  be_interface *ccmobject (void);
+  be_interface *ccmobject ();
 
   /// Accessor for the member, sets it on the first call.
-  be_module *messaging (void);
+  be_module *messaging ();
 
   /// Accessor for the member, sets it on the first call.
-  be_valuetype *messaging_exceptionholder (void);
+  be_valuetype *messaging_exceptionholder ();
 
   /// Accessor for the member, sets it on the first call.
-  be_interface *messaging_replyhandler (void);
+  be_interface *messaging_replyhandler ();
 
   /// Accessors for the member.
-  bool gen_anyop_files (void) const;
+  bool gen_anyop_files () const;
   void gen_anyop_files (bool val);
 
   /// Accessors for the member gen_skel_files_.
-  bool gen_skel_files (void) const;
+  bool gen_skel_files () const;
   void gen_skel_files (bool val);
 
   /// Accessors for the member gen_svnt_cpp_files_.
-  bool gen_svnt_cpp_files (void) const;
+  bool gen_svnt_cpp_files () const;
   void gen_svnt_cpp_files (bool val);
 
   /// Accessors for the member gen_svnt_t_files_.
-  bool gen_svnt_t_files (void) const;
+  bool gen_svnt_t_files () const;
   void gen_svnt_t_files (bool val);
 
   /// Accessors for the member gen_client_inline_.
-  bool gen_client_inline (void) const;
+  bool gen_client_inline () const;
   void gen_client_inline (bool val);
 
   /// Accessors for the member gen_client_stub_.
-  bool gen_client_stub (void) const;
+  bool gen_client_stub () const;
   void gen_client_stub (bool val);
 
   /// Accessors for the member gen_client_header_.
-  bool gen_client_header (void) const;
+  bool gen_client_header () const;
   void gen_client_header (bool val);
 
   /// Accessors for the member gen_server_skeleton_.
-  bool gen_server_skeleton (void) const;
+  bool gen_server_skeleton () const;
   void gen_server_skeleton (bool val);
 
   /// Accessors for the member gen_server_header_.
-  bool gen_server_header (void) const;
+  bool gen_server_header () const;
   void gen_server_header (bool val);
 
   /// Accessors for the member gen_local_iface_anyops_.
-  bool gen_local_iface_anyops (void) const;
+  bool gen_local_iface_anyops () const;
   void gen_local_iface_anyops (bool val);
 
   /// Accessors for the member gen_custom_ending_.
-  bool gen_custom_ending (void) const;
+  bool gen_custom_ending () const;
   void gen_custom_ending (bool val);
 
   /// Accessors for the member gen_unique_guards_.
-  bool gen_unique_guards (void) const;
+  bool gen_unique_guards () const;
   void gen_unique_guards (bool val);
 
   /// Accessors for the corresponding members.
 
-  bool gen_ciao_svnt (void) const;
+  bool gen_ciao_svnt () const;
   void gen_ciao_svnt (bool val);
 
-  bool gen_ciao_exec_idl (void) const;
+  bool gen_ciao_exec_idl () const;
   void gen_ciao_exec_idl (bool val);
 
-  bool gen_ciao_exec_impl (void) const;
+  bool gen_ciao_exec_impl () const;
   void gen_ciao_exec_impl (bool val);
 
-  bool gen_ciao_exec_reactor_impl (void) const;
+  bool gen_ciao_exec_reactor_impl () const;
   void gen_ciao_exec_reactor_impl (bool val);
 
-  bool gen_ciao_conn_impl (void) const;
+  bool gen_ciao_conn_impl () const;
   void gen_ciao_conn_impl (bool val);
 
-  bool gen_dds_typesupport_idl (void) const;
+  bool gen_dds_typesupport_idl () const;
   void gen_dds_typesupport_idl (bool val);
 
-  bool gen_ciao_valuefactory_reg (void) const;
+  bool gen_ciao_valuefactory_reg () const;
   void gen_ciao_valuefactory_reg (bool val);
 
-  bool gen_stub_export_hdr_file (void) const;
+  bool gen_stub_export_hdr_file () const;
   void gen_stub_export_hdr_file (bool val);
 
-  bool gen_skel_export_hdr_file (void) const;
+  bool gen_skel_export_hdr_file () const;
   void gen_skel_export_hdr_file (bool val);
 
-  bool gen_svnt_export_hdr_file (void) const;
+  bool gen_svnt_export_hdr_file () const;
   void gen_svnt_export_hdr_file (bool val);
 
-  bool gen_exec_export_hdr_file (void) const;
+  bool gen_exec_export_hdr_file () const;
   void gen_exec_export_hdr_file (bool val);
 
-  bool gen_conn_export_hdr_file (void) const;
+  bool gen_conn_export_hdr_file () const;
   void gen_conn_export_hdr_file (bool val);
 
-  bool alt_mapping (void) const;
+  bool alt_mapping () const;
   void alt_mapping (bool val);
 
-  bool in_facet_servant (void) const;
+  bool in_facet_servant () const;
   void in_facet_servant (bool val);
 
-  bool gen_arg_traits (void) const;
+  bool gen_arg_traits () const;
   void gen_arg_traits (bool val);
 
-  bool gen_anytypecode_adapter (void) const;
+  bool gen_anytypecode_adapter () const;
   void gen_anytypecode_adapter (bool val);
 
   bool no_fixed_err () const;
   void no_fixed_err (bool val);
 
-  unsigned long tab_size (void) const;
+  unsigned long tab_size () const;
   void tab_size (unsigned long val);
 
   /// 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 the frontend did not recognize.
@@ -1276,7 +1276,6 @@ private:
   bool gen_unique_guards_;
 
   /// False by default, these flags trigger code generation
-  /// formerly done by the CIAO CIDL compiler.
   bool gen_ciao_svnt_;
   bool gen_ciao_exec_idl_;
   bool gen_ciao_exec_impl_;
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index eca14482979..1acdf87dbc5 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -17,10 +17,8 @@
 #include "ace/CDR_Base.h"
 #include "ace/SString.h"
 
-#if defined (ACE_HAS_CPP11)
 #include "ace/OS_NS_stdio.h"
 #include <type_traits>
-#endif /* ACE_HAS_CPP11 */
 
 class Identifier;
 class UTL_IdList;
@@ -30,12 +28,12 @@ class AST_Expression;
 // and use the current indentation for the succeeding line
 struct TAO_NL
 {
-  TAO_NL (void);
+  TAO_NL ();
 };
 
 struct TAO_NL_2
 {
-  TAO_NL_2 (void);
+  TAO_NL_2 ();
 };
 
 /**
@@ -125,9 +123,9 @@ public:
       CIAO_AMI_RH_IMPL_SRC
     };
 
-  TAO_OutStream (void);
+  TAO_OutStream ();
 
-  virtual ~TAO_OutStream (void);
+  virtual ~TAO_OutStream ();
 
   /// Open the underlying low-level handle for output.
   int open (const char *fname,
@@ -137,10 +135,10 @@ public:
   void stream_type (TAO_OutStream::STREAM_TYPE);
 
   /// Return the stream type
-  TAO_OutStream::STREAM_TYPE stream_type (void);
+  TAO_OutStream::STREAM_TYPE stream_type ();
 
   /// Return the underlying lowlevel file pointer.
-  FILE *&file (void);
+  FILE *&file ();
 
   /// Increment the indentation level and by default actually indent the output
   /// accordingly
@@ -151,13 +149,13 @@ public:
   int decr_indent (unsigned short flag = 1);
 
   /// Reset indentation level to 0
-  int reset (void);
+  int reset ();
 
   /// Indent starting next line
-  int indent (void);
+  int indent ();
 
   /// Put a newline and indent on the next line
-  int nl (void);
+  int nl ();
 
   /// "printf" style variable argument print
   int print (const char *format, ...)
@@ -169,10 +167,9 @@ public:
                        bool add_stream_type_suffix = true);
 
   /// Generate an endif statement
-  int gen_endif (void);
+  int gen_endif ();
 
   // =overloaded operators
-#if defined (ACE_HAS_CPP11)
   // Avoid duplication for the underlying type of size_t
   template <typename Dummy = TAO_OutStream &>
   typename std::enable_if<std::is_same<Dummy, TAO_OutStream &>::value &&
@@ -187,7 +184,6 @@ public:
 
     return *this;
   }
-#endif /* ACE_HAS_CPP11 */
 
   TAO_OutStream &operator<< (const char *str);
   TAO_OutStream &operator<< (const ACE_CString &str);
diff --git a/TAO/TAO_IDL/be_include/be_home.h b/TAO/TAO_IDL/be_include/be_home.h
index 23f86e45805..7f4156fdfe4 100644
--- a/TAO/TAO_IDL/be_include/be_home.h
+++ b/TAO/TAO_IDL/be_include/be_home.h
@@ -35,20 +35,15 @@ public:
            AST_Interface **supports_flat,
            long n_supports_flat);
 
-  virtual ~be_home (void);
+  virtual ~be_home ();
 
   void scan (UTL_Scope *s);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_home);
-  DEF_NARROW_FROM_SCOPE (be_home);
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 7edeb963495..55b5bb39736 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -50,15 +50,15 @@ public:
                 bool abstract);
 
   /// Destructor.
-  ~be_interface (void);
+  ~be_interface ();
 
   // Methods, which access the strategy.
 
   /// Return the local name.
-  const char *local_name (void);
+  const char *local_name ();
 
   /// Retrieve the fully scoped skel class name.
-  const char *full_skel_name (void);
+  const char *full_skel_name ();
 
   /// Retrieve the fully qualified collocated class name.
   const char *full_coll_name (int);
@@ -67,21 +67,21 @@ public:
   const char *local_coll_name (int);
 
   /// retrieve the name of the direct proxy implementation.
-  virtual const char *direct_proxy_impl_name (void);
+  virtual const char *direct_proxy_impl_name ();
 
   /// retrieve the fully qualified name of the direct proxy
   /// implementation.
-  virtual const char *full_direct_proxy_impl_name (void);
+  virtual const char *full_direct_proxy_impl_name ();
 
   /// Return the client scope that encloses the interface.
-  virtual const char *client_enclosing_scope (void);
+  virtual const char *client_enclosing_scope ();
 
   /// Return the "flattened" scope that encloses
   /// the interface.
-  virtual const char *flat_client_enclosing_scope (void);
+  virtual const char *flat_client_enclosing_scope ();
 
   /// Return the server scope that encloses the interface.
-  virtual const char *server_enclosing_scope (void);
+  virtual const char *server_enclosing_scope ();
 
   /// Retrieve skeleton name.
   const char *relative_skel_name (const char *skel_name);
@@ -107,7 +107,7 @@ public:
 
   /// Generate the declarations used by the template _var, _out
   /// classes for interfaces, and by sequence template classes.
-  void gen_var_out_seq_decls (void);
+  void gen_var_out_seq_decls ();
 
   // Each interface (to fix names "T") also defines two help classes,
   // the "collocated" class inherits from T, but delegates on the
@@ -148,28 +148,23 @@ public:
    * 0 => no
    * 1 => yes
    */
-  int in_mult_inheritance (void);
+  int in_mult_inheritance ();
 
   /// Set a new value.
   void in_mult_inheritance (int mi);
 
   /// Applies to interfaces, components, and homes.
-  bool has_rw_attributes (void) const;
+  bool has_rw_attributes () const;
 
   /// Pass along BE-specific member values when redefining a fwd decl.
   virtual void redefine (AST_Interface *from);
 
   /// Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_interface);
-  DEF_NARROW_FROM_SCOPE (be_interface);
-
   /// Helper method passed to the template method that generates code for the
   /// is_a method.
   static int is_a_helper (be_interface *,
@@ -242,10 +237,10 @@ public:
 
   /// Returns the original interface from which this one was created,
   /// applies only to implied IDL
-  be_interface *original_interface (void);
+  be_interface *original_interface ();
 
   /// Is EventConsumerBase our parent?
-  bool is_event_consumer (void);
+  bool is_event_consumer ();
 
   /**
    * Common code for facet generation, whether we are
@@ -257,14 +252,14 @@ public:
   /// Used with ami4ccm.
   int gen_ami4ccm_idl (TAO_OutStream *os);
 
-  bool is_ami_rh (void) const;
+  bool is_ami_rh () const;
   void is_ami_rh (bool val);
 
-  bool is_ami4ccm_rh (void) const;
+  bool is_ami4ccm_rh () const;
   void is_ami4ccm_rh (bool val);
 
   /// Accessors for the member.
-  bool dds_connector_traits_done (void) const;
+  bool dds_connector_traits_done () const;
   void dds_connector_traits_done (bool val);
 
   /// Generate the "public virtual" entries in the stub header.
@@ -432,7 +427,7 @@ public:
   /**
    * This is a no-op, simply put here to keep compilers happy.
    */
-  virtual ~TAO_IDL_Inheritance_Hierarchy_Worker (void);
+  virtual ~TAO_IDL_Inheritance_Hierarchy_Worker ();
 
   /// Define the method invoked during the inheritance traversal
   /**
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
index 912d2868972..29271083e30 100644
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h
@@ -33,7 +33,7 @@ public:
   be_interface_fwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~be_interface_fwd (void);
+  virtual ~be_interface_fwd ();
 
   /// Mutator overrides for be_type members. If we have been
   /// defined, we want the full definition to be set as well.
@@ -41,13 +41,10 @@ public:
   virtual void seen_in_operation (bool val);
 
   /// Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_interface_fwd);
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_mirror_port.h b/TAO/TAO_IDL/be_include/be_mirror_port.h
index 494d1a2676c..aa2737c7e29 100644
--- a/TAO/TAO_IDL/be_include/be_mirror_port.h
+++ b/TAO/TAO_IDL/be_include/be_mirror_port.h
@@ -31,13 +31,11 @@ public:
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
 
-  virtual ~be_mirror_port (void);
+  virtual ~be_mirror_port ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual int accept (be_visitor *visitor);
-
-  DEF_NARROW_FROM_DECL (be_mirror_port);
 };
 
 #endif // BE_MIRROR_PORT_H
diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h
index 8eea3b7c2d2..9fe8eb3118b 100644
--- a/TAO/TAO_IDL/be_include/be_module.h
+++ b/TAO/TAO_IDL/be_include/be_module.h
@@ -28,14 +28,10 @@ public:
   be_module (UTL_ScopedName *n, AST_Module *previous = 0);
 
   /// Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting
   virtual int accept (be_visitor *visitor);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_module);
-  DEF_NARROW_FROM_SCOPE (be_module);
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h
index a39e6238858..1a39721737a 100644
--- a/TAO/TAO_IDL/be_include/be_native.h
+++ b/TAO/TAO_IDL/be_include/be_native.h
@@ -30,22 +30,19 @@ class be_native : public virtual AST_Native,
 public:
   be_native (UTL_ScopedName *n);
 
-  virtual ~be_native (void) {}
+  virtual ~be_native () {}
 
   /// Generate the typecode description.
-  virtual int gen_typecode (void);
+  virtual int gen_typecode ();
 
   /// Return typecode size.
-  virtual long tc_size (void);
+  virtual long tc_size ();
 
   /// Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(be_native);
 };
 
 #endif /* BE_NATIVE_H */
diff --git a/TAO/TAO_IDL/be_include/be_null_return_emitter.h b/TAO/TAO_IDL/be_include/be_null_return_emitter.h
index 9bfc930ea6f..56fd4e89cff 100644
--- a/TAO/TAO_IDL/be_include/be_null_return_emitter.h
+++ b/TAO/TAO_IDL/be_include/be_null_return_emitter.h
@@ -23,7 +23,7 @@ class be_null_return_emitter
 {
 public:
   be_null_return_emitter (be_visitor_context *ctx);
-  ~be_null_return_emitter (void);
+  ~be_null_return_emitter ();
 
   int emit (be_type *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h
index 9e0481f35a0..3ecd2965573 100644
--- a/TAO/TAO_IDL/be_include/be_operation.h
+++ b/TAO/TAO_IDL/be_include/be_operation.h
@@ -35,10 +35,10 @@ public:
                 bool local,
                 bool abstract);
 
-  ~be_operation (void);
+  ~be_operation ();
 
   /// Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -49,19 +49,15 @@ public:
   /// Insert an exception at the head of the list.
   int be_insert_exception (AST_Exception *ex);
 
-  bool is_sendc_ami (void) const;
+  bool is_sendc_ami () const;
   void is_sendc_ami (bool val);
 
-  bool is_excep_ami (void) const;
+  bool is_excep_ami () const;
   void is_excep_ami (bool val);
 
-  bool is_attr_op (void) const;
+  bool is_attr_op () const;
   void is_attr_op (bool val);
 
-  // Narrowing
-  DEF_NARROW_FROM_DECL (be_operation);
-  DEF_NARROW_FROM_SCOPE (be_operation);
-
 protected:
   bool is_sendc_ami_;
   bool is_excep_ami_;
diff --git a/TAO/TAO_IDL/be_include/be_param_holder.h b/TAO/TAO_IDL/be_include/be_param_holder.h
index a0817afce82..2eecadb9e4a 100644
--- a/TAO/TAO_IDL/be_include/be_param_holder.h
+++ b/TAO/TAO_IDL/be_include/be_param_holder.h
@@ -26,13 +26,10 @@ public:
   be_param_holder (UTL_ScopedName *parameter_name,
                    FE_Utils::T_Param_Info *info);
 
-  virtual ~be_param_holder (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_param_holder);
+  virtual ~be_param_holder ();
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
diff --git a/TAO/TAO_IDL/be_include/be_porttype.h b/TAO/TAO_IDL/be_include/be_porttype.h
index c0a80088b0e..4a0464e3083 100644
--- a/TAO/TAO_IDL/be_include/be_porttype.h
+++ b/TAO/TAO_IDL/be_include/be_porttype.h
@@ -31,14 +31,11 @@ class be_porttype : public virtual AST_PortType,
 public:
   be_porttype (UTL_ScopedName *n);
 
-  virtual ~be_porttype (void);
+  virtual ~be_porttype ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual int accept (be_visitor *visitor);
-
-  DEF_NARROW_FROM_DECL (be_porttype);
-  DEF_NARROW_FROM_SCOPE (be_porttype);
 };
 
 #endif // BE_PORTTYPE_H
diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h
index 4695502db95..026095fd4e6 100644
--- a/TAO/TAO_IDL/be_include/be_predefined_type.h
+++ b/TAO/TAO_IDL/be_include/be_predefined_type.h
@@ -37,14 +37,11 @@ public:
   virtual int accept (be_visitor* visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_predefined_type);
+  virtual void destroy ();
 
 protected:
   /// Overridden method.
-  virtual void compute_tc_name (void);
+  virtual void compute_tc_name ();
 
   // Compute and return the value.
 
@@ -53,7 +50,7 @@ protected:
    * prefix, but the default compute_repoID() uses the #pragma's to
    * obtain prefixes.
    */
-  virtual void compute_repoID (void);
+  virtual void compute_repoID ();
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_provides.h b/TAO/TAO_IDL/be_include/be_provides.h
index cb47d6c2d07..0f73ab08577 100644
--- a/TAO/TAO_IDL/be_include/be_provides.h
+++ b/TAO/TAO_IDL/be_include/be_provides.h
@@ -17,19 +17,16 @@ public:
   be_provides (UTL_ScopedName *n,
                AST_Type *provides_type);
 
-  virtual ~be_provides (void);
+  virtual ~be_provides ();
 
   // Non-virtual override of frontend method.
-  be_type *provides_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(be_provides);
+  be_type *provides_type () const;
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #endif // BE_PROVIDES_H
diff --git a/TAO/TAO_IDL/be_include/be_publishes.h b/TAO/TAO_IDL/be_include/be_publishes.h
index ea3a41bff47..7a68c3fe304 100644
--- a/TAO/TAO_IDL/be_include/be_publishes.h
+++ b/TAO/TAO_IDL/be_include/be_publishes.h
@@ -16,19 +16,16 @@ public:
   be_publishes (UTL_ScopedName *n,
                 AST_Type *publishes_type);
 
-  virtual ~be_publishes (void);
+  virtual ~be_publishes ();
 
   // Non-virtual override of frontend method.
-  be_eventtype *publishes_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(be_publishes);
+  be_eventtype *publishes_type () const;
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #endif // BE_PUBLISHES_H
diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h
index d3ad85aaf57..44a6ac9118c 100644
--- a/TAO/TAO_IDL/be_include/be_root.h
+++ b/TAO/TAO_IDL/be_include/be_root.h
@@ -28,17 +28,13 @@ class be_root : public virtual AST_Root,
 public:
   be_root (UTL_ScopedName *n);
 
-  virtual ~be_root (void);
+  virtual ~be_root ();
 
   /// Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_root);
-  DEF_NARROW_FROM_SCOPE (be_root);
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h
index bbec9484162..6eab19ad9e0 100644
--- a/TAO/TAO_IDL/be_include/be_scope.h
+++ b/TAO/TAO_IDL/be_include/be_scope.h
@@ -33,13 +33,13 @@ class be_scope : public virtual UTL_Scope
 {
 public:
   /// Default constructor.
-  be_scope (void);
+  be_scope ();
 
   /// Constructor that sets the node type.
   be_scope (AST_Decl::NodeType nt);
 
   /// Destructor.
-  virtual ~be_scope (void);
+  virtual ~be_scope ();
 
   /// To access the protected base class method fe_add_field.
   AST_Field *be_add_field (AST_Field *f);
@@ -51,20 +51,17 @@ public:
   virtual void comma (unsigned short set);
 
   /// Get the comma producing state.
-  int comma (void) const;
+  int comma () const;
 
   /// Return the be_decl node corresponding to this scope node.
-  virtual be_decl *decl (void);
+  virtual be_decl *decl ();
 
   /// Recursively clean up scope members.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Visiting.
   virtual int accept (be_visitor *visitor);
 
-  // Narrowing.
-  DEF_NARROW_FROM_SCOPE (be_scope);
-
 private:
   /// If set, generate a comma after every element is handled.
   unsigned short comma_;
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index dcedb4e4155..6d2deb80317 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -54,37 +54,33 @@ public:
                bool abstract);
 
     // Non-virtual override of frontend method.
-  be_type *base_type (void) const;
+  be_type *base_type () const;
 
   /// Create a name for ourselves. If we are typedefed, then we get the name of
   /// the typedef node, else we generate a name for ourselves.
   virtual int create_name (be_typedef *node);
 
   /// Return the managed type.
-  virtual MANAGED_TYPE managed_type (void);
+  virtual MANAGED_TYPE managed_type ();
 
   // Scope management functions.
   virtual AST_Sequence *fe_add_sequence (AST_Sequence *);
 
   /// Overridden method on the be_scope class.
-  virtual be_decl *decl (void);
+  virtual be_decl *decl ();
 
   /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
 
   /// Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_sequence);
-
   /// Report the instance name for instantiation.
-  const char *instance_name (void);
+  const char *instance_name ();
 
   /// Common code for generating the name and parameters of our
   /// template sequence base class.
@@ -93,16 +89,16 @@ public:
                            AST_Decl *elem_scope);
 
   /// Accessors for the member.
-  be_field *field_node (void) const;
+  be_field *field_node () const;
   void field_node (be_field *node);
 
   /// Helper to create_name, also used by the traits visitor.
-  virtual char *gen_name (void);
+  virtual char *gen_name ();
 
 protected:
 
   /// Computes the fully scoped typecode name.
-  virtual void compute_tc_name (void);
+  virtual void compute_tc_name ();
 
 private:
   const char *smart_fwd_helper_name (AST_Decl *elem_scope,
diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h
index 96db83599b7..0535b0596a4 100644
--- a/TAO/TAO_IDL/be_include/be_string.h
+++ b/TAO/TAO_IDL/be_include/be_string.h
@@ -39,15 +39,11 @@ public:
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_string);
+  virtual void destroy ();
 
 protected:
   /// Overridden method to compute typecode name.
-  virtual void compute_tc_name (void);
+  virtual void compute_tc_name ();
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
index e46236e9b36..cb3014abab6 100644
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ b/TAO/TAO_IDL/be_include/be_structure.h
@@ -44,15 +44,10 @@ public:
                                      bool use_underscore);
 
   /// Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Visiting.
   virtual int accept (be_visitor *visitor);
-
- // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_structure);
-  DEF_NARROW_FROM_SCOPE (be_structure);
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_structure_fwd.h b/TAO/TAO_IDL/be_include/be_structure_fwd.h
index 528e6fae368..25a5ed2f5a5 100644
--- a/TAO/TAO_IDL/be_include/be_structure_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_structure_fwd.h
@@ -32,16 +32,13 @@ public:
   be_structure_fwd (AST_Structure *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~be_structure_fwd (void);
+  virtual ~be_structure_fwd ();
 
   /// Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_structure_fwd);
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_template_module.h b/TAO/TAO_IDL/be_include/be_template_module.h
index d797cd62c7b..7ca8bb91071 100644
--- a/TAO/TAO_IDL/be_include/be_template_module.h
+++ b/TAO/TAO_IDL/be_include/be_template_module.h
@@ -32,14 +32,11 @@ public:
     UTL_ScopedName *n,
     FE_Utils::T_PARAMLIST_INFO *template_params);
 
-  virtual ~be_template_module (void);
+  virtual ~be_template_module ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual int accept (be_visitor *visitor);
-
-  DEF_NARROW_FROM_DECL (be_template_module);
-  DEF_NARROW_FROM_SCOPE (be_template_module);
 };
 
 #endif /* TAO_BE_TEMPLATE_MODULE_H */
diff --git a/TAO/TAO_IDL/be_include/be_template_module_inst.h b/TAO/TAO_IDL/be_include/be_template_module_inst.h
index d798651700c..2d5c917761f 100644
--- a/TAO/TAO_IDL/be_include/be_template_module_inst.h
+++ b/TAO/TAO_IDL/be_include/be_template_module_inst.h
@@ -14,13 +14,10 @@ public:
                            AST_Template_Module *ref,
                            FE_Utils::T_ARGLIST *template_args);
 
-  virtual ~be_template_module_inst (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_template_module_inst);
+  virtual ~be_template_module_inst ();
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
diff --git a/TAO/TAO_IDL/be_include/be_template_module_ref.h b/TAO/TAO_IDL/be_include/be_template_module_ref.h
index 7046a7082fc..202d2a86b74 100644
--- a/TAO/TAO_IDL/be_include/be_template_module_ref.h
+++ b/TAO/TAO_IDL/be_include/be_template_module_ref.h
@@ -15,13 +15,10 @@ public:
                            AST_Template_Module *ref,
                            UTL_StrList *param_refs);
 
-  virtual ~be_template_module_ref (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_template_module_ref);
+  virtual ~be_template_module_ref ();
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index 6039fe8f359..e70c6e2c9fc 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -28,14 +28,14 @@ public:
   be_type (AST_Decl::NodeType nt,
            UTL_ScopedName *n);
 
-  virtual ~be_type (void);
+  virtual ~be_type ();
 
   /**
    * Return the typecode name. When both, the prefix and the suffix
    * are non null, it computes and returns a tc name. Else, it also
    * stores the result in a member variable.
    */
-  UTL_ScopedName *tc_name (void);
+  UTL_ScopedName *tc_name ();
 
   /// Type name of a node used when generating declarations for smart
   /// proxies.
@@ -44,7 +44,7 @@ public:
                                            const char *prefix = 0);
 
   /// Compute the value of the member.
-  void gen_fwd_helper_name (void);
+  void gen_fwd_helper_name ();
 
   /// No-op, overridden in derived classes.
   virtual void gen_ostream_operator (TAO_OutStream *os,
@@ -57,7 +57,7 @@ public:
                                             bool accessor = false);
 
   /// Accessor to the member.
-  const char *fwd_helper_name (void) const;
+  const char *fwd_helper_name () const;
   void fwd_helper_name (const char *name);
 
   /// Generate _var and _out typedefs for structs and unions.
@@ -67,11 +67,11 @@ public:
   void gen_stub_decls (TAO_OutStream *os);
 
   /// Accessors for the member.
-  bool seen_in_sequence (void) const;
+  bool seen_in_sequence () const;
   virtual void seen_in_sequence (bool val);
 
   /// Accessors for the member.
-  bool seen_in_operation (void) const;
+  bool seen_in_operation () const;
   virtual void seen_in_operation (bool val);
 
   /**
@@ -80,21 +80,17 @@ public:
    * recursive simply using "base_type->node_type()" will not work, so
    * the most "unaliased" type is needed.
    */
-  virtual AST_Decl::NodeType base_node_type (void) const;
+  virtual AST_Decl::NodeType base_node_type () const;
 
   /// Clean up allocated members.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_type);
-
 protected:
   /// Computes the fully scoped typecode name.
-  virtual void compute_tc_name (void);
+  virtual void compute_tc_name ();
 
   /// Typecode name.
   UTL_ScopedName *tc_name_;
diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h
index dc5de3bc184..b1f3bfb5708 100644
--- a/TAO/TAO_IDL/be_include/be_typedef.h
+++ b/TAO/TAO_IDL/be_include/be_typedef.h
@@ -31,16 +31,16 @@ public:
   /// Overrides for be_type members. If we have been
   /// defined, we want the underlying type to be set as well.
   virtual void seen_in_sequence (bool val);
-  virtual bool seen_in_operation (void) const;
+  virtual bool seen_in_operation () const;
   virtual void seen_in_operation (bool val);
 
   /// Return the most primitive base type by traversing the chain of typedefed
   /// base types.
-  be_type *primitive_base_type (void);
+  be_type *primitive_base_type ();
 
   /// Return the most "unaliased" type node for the base type (see
   /// be_type.h).
-  virtual AST_Decl::NodeType base_node_type (void) const;
+  virtual AST_Decl::NodeType base_node_type () const;
 
   /// Overridden from class be_type.
   virtual void gen_member_ostream_operator (TAO_OutStream *os,
@@ -49,14 +49,10 @@ public:
                                             bool accessor = false);
 
   /// Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_typedef);
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
index 18cc6818480..2ffb8c2a4e0 100644
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ b/TAO/TAO_IDL/be_include/be_union.h
@@ -35,33 +35,28 @@ public:
   virtual void redefine (AST_Structure *from);
 
   /// Do we have at least one member with multiple case labels?
-  virtual bool has_duplicate_case_labels (void);
+  virtual bool has_duplicate_case_labels ();
 
   /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
 
   /// Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   /// Visiting.
   virtual int accept (be_visitor *visitor);
 
   /// Decides whether a default switch case label in the generated copy
   /// constructor, assignment operator, etc. is needed.
-  bool gen_empty_default_label (void);
+  bool gen_empty_default_label ();
 
   /// Just a way to get at fe_add_union_branch() from the backend.
   AST_UnionBranch *be_add_union_branch (AST_UnionBranch *b);
 
   /// Returns total number of labels, useful when the union has
   /// multiple case labels.
-  ACE_UINT64 nlabels (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(be_union);
-  DEF_NARROW_FROM_SCOPE(be_union);
+  ACE_UINT64 nlabels ();
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h
index 1eb44df7c8b..e00a9419804 100644
--- a/TAO/TAO_IDL/be_include/be_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_union_branch.h
@@ -43,10 +43,7 @@ public:
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_union_branch);
+  virtual void destroy ();
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_union_fwd.h b/TAO/TAO_IDL/be_include/be_union_fwd.h
index 4ca5bc30936..76b5673dcc0 100644
--- a/TAO/TAO_IDL/be_include/be_union_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_union_fwd.h
@@ -31,16 +31,13 @@ public:
   be_union_fwd (AST_Union *dummy,
                 UTL_ScopedName *n);
 
-  virtual ~be_union_fwd (void);
+  virtual ~be_union_fwd ();
 
   /// Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_union_fwd);
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h
index 413a821b302..0d9416f464c 100644
--- a/TAO/TAO_IDL/be_include/be_union_label.h
+++ b/TAO/TAO_IDL/be_include/be_union_label.h
@@ -15,7 +15,7 @@ public:
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_uses.h b/TAO/TAO_IDL/be_include/be_uses.h
index 8384db531dd..873b0c57f36 100644
--- a/TAO/TAO_IDL/be_include/be_uses.h
+++ b/TAO/TAO_IDL/be_include/be_uses.h
@@ -17,19 +17,16 @@ public:
            AST_Type *uses_type,
            bool is_multiple);
 
-  virtual ~be_uses (void);
+  virtual ~be_uses ();
 
   // Non-virtual override of frontend method.
-  be_type *uses_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(be_uses);
+  be_type *uses_type () const;
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   void original_uses (be_uses *original_uses);
   // Sets the original uses from which this one was created,
diff --git a/TAO/TAO_IDL/be_include/be_util.h b/TAO/TAO_IDL/be_include/be_util.h
index ab65c5cafcd..159ae016118 100644
--- a/TAO/TAO_IDL/be_include/be_util.h
+++ b/TAO/TAO_IDL/be_include/be_util.h
@@ -48,15 +48,15 @@ public:
 
   /// Checks made after parsing args.
   static TAO_IDL_BE_Export void
-  arg_post_proc (void);
+  arg_post_proc ();
 
   /// Display usage of BE-specific options.
   static TAO_IDL_BE_Export void
-  usage (void);
+  usage ();
 
   /// Create an AST node generator.
   static TAO_IDL_BE_Export AST_Generator *
-  generator_init (void);
+  generator_init ();
 
   /// Called from various places.
   static const char *
@@ -67,7 +67,7 @@ public:
 
   /// Called from various places.
   static bool
-  overwrite_ciao_exec_files (void);
+  overwrite_ciao_exec_files ();
 
   // Called by each node upon construction.
   static void set_arg_seen_bit (be_type *);
diff --git a/TAO/TAO_IDL/be_include/be_valuebox.h b/TAO/TAO_IDL/be_include/be_valuebox.h
index edad870149e..9ae4448823d 100644
--- a/TAO/TAO_IDL/be_include/be_valuebox.h
+++ b/TAO/TAO_IDL/be_include/be_valuebox.h
@@ -30,10 +30,7 @@ public:
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing
-  DEF_NARROW_FROM_DECL (be_valuebox);
+  virtual void destroy ();
 };
 
 #endif /* TAO_BE_VALUEBOX_H */
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index ce0db7969b1..38c8a990ba7 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -41,12 +41,12 @@ public:
                 bool truncatable,
                 bool custom);
 
-  ~be_valuetype (void);
+  ~be_valuetype ();
 
   virtual void redefine (AST_Interface *from);
 
   /// Should generate optimized form?
-  bool opt_accessor (void);
+  bool opt_accessor ();
 
   /// Generate the helper functions definition.
   virtual int gen_helper_header (char *local_name = 0,
@@ -66,17 +66,17 @@ public:
 
   /// Generate the declarations used by the template _var, _out
   /// classes for valuetypes, and by sequence template classes.
-  void gen_var_out_seq_decls (void);
+  void gen_var_out_seq_decls ();
 
   /// Retrieve the fully scoped skel class name.
-  const char *full_obv_skel_name (void);
+  const char *full_obv_skel_name ();
 
-  const char *field_pd_prefix (void);
+  const char *field_pd_prefix ();
 
-  const char *field_pd_postfix (void);
+  const char *field_pd_postfix ();
 
   // For building the name for private data fields.
-  be_valuetype *statefull_inherit (void);
+  be_valuetype *statefull_inherit ();
 
   /// Load the insert queue with all the interfaces we support, and
   /// call the generic version of traverse_inheritance_graph().
@@ -95,21 +95,16 @@ public:
     );
 
   /// Do we support at least one abstract interface?
-  bool supports_abstract (void) const;
+  bool supports_abstract () const;
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
-
- // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_valuetype);
-  DEF_NARROW_FROM_SCOPE (be_valuetype);
+  virtual void destroy ();
 
   /// Compute the fully scoped skel class name.
-  void compute_fullobvskelname (void);
+  void compute_fullobvskelname ();
 
   /// Compute the count of private/public/all data members.
   ACE_CDR::ULong data_members_count (
@@ -123,7 +118,7 @@ public:
                                        TAO_OutStream *os);
 
   /// Accessor to the member.
-  const char *fwd_helper_name (void) const;
+  const char *fwd_helper_name () const;
 
   // There are three possible situations.
   // (1) If there is no initializers but at least one operation.
@@ -146,24 +141,24 @@ public:
   };
 
   /// Determine what kind of factory needed.
-  FactoryStyle determine_factory_style (void);
+  FactoryStyle determine_factory_style ();
 
   /// Recurse down the inheritance tree to determine
   /// if valuetype has at least one operation/attribute.
-  bool have_operation (void);
+  bool have_operation ();
 
   /// Check if VT supports an interface with at least 1 operation.
   static bool have_supported_op (be_interface *node);
 
   /// Use the above enum and methods to determine this after the
   /// node's scope is visited but before code generation.
-  virtual bool will_have_factory (void);
+  virtual bool will_have_factory ();
 
   /// Decides whether to generate the initializing contstructor or not.
-  bool has_member (void);
+  bool has_member ();
 
   /// Accessors for the member
-  bool is_amh_excep_holder (void) const;
+  bool is_amh_excep_holder () const;
   void is_amh_excep_holder (bool val);
 
 private:
diff --git a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
index 355b0998f29..4c0063ce7e9 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
@@ -31,16 +31,13 @@ public:
   be_valuetype_fwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~be_valuetype_fwd (void);
+  virtual ~be_valuetype_fwd ();
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
 
   // Cleanup
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (be_valuetype_fwd);
+  virtual void destroy ();
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h
index e6ec9470ee7..ca89ed5f9c8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor.h
@@ -85,7 +85,7 @@ class TAO_OutStream;
 class be_visitor
 {
 public:
-  virtual ~be_visitor (void);
+  virtual ~be_visitor ();
 
   virtual int visit_decl (be_decl *d);
   virtual int visit_scope (be_scope *node);
@@ -142,7 +142,7 @@ public:
 
 protected:
   // Not abstract but we want to force subclassing anyway.
-  be_visitor (void);
+  be_visitor ();
 };
 
 #endif // TAO_BE_VISITOR_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
index 0bee5dc3f84..14f2b23ff33 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
@@ -37,7 +37,7 @@ private:
 public:
   be_visitor_amh_pre_proc (be_visitor_context *ctx);
 
-  virtual ~be_visitor_amh_pre_proc (void);
+  virtual ~be_visitor_amh_pre_proc ();
 
   virtual int visit_root (be_root *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
index d1706c12e24..a2f9f2ff70a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
@@ -41,7 +41,7 @@ private:
 public:
   be_visitor_ami_pre_proc (be_visitor_context *ctx);
 
-  virtual ~be_visitor_ami_pre_proc (void);
+  virtual ~be_visitor_ami_pre_proc ();
 
   virtual int visit_root (be_root *node);
 
@@ -94,7 +94,7 @@ private:
                                       long &n_parents);
 
   /// Generate an *A.idl file for AMI4CCM.
-  int generate_ami4ccm_idl (void);
+  int generate_ami4ccm_idl ();
 };
 
 #endif // TAO_BE_VISITOR_AMI_PRE_PROC_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
index deec0954961..395dae51fd6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
@@ -29,7 +29,7 @@ class be_visitor_any_extracted_type_decl : public be_visitor_decl
 {
 public:
   be_visitor_any_extracted_type_decl (be_visitor_context *ctx);
-  virtual ~be_visitor_any_extracted_type_decl (void);
+  virtual ~be_visitor_any_extracted_type_decl ();
 
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
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 a9cb4413182..761859541eb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -24,7 +24,7 @@ public:
   be_visitor_arg_traits (const char *S,
                          be_visitor_context *ctx);
 
-  virtual ~be_visitor_arg_traits (void);
+  virtual ~be_visitor_arg_traits ();
 
   virtual int visit_root (be_root *node);
   virtual int visit_module (be_module *node);
@@ -58,7 +58,7 @@ private:
   void generated (be_decl *node,
                   bool val);
 
-  const char *insert_policy (void);
+  const char *insert_policy ();
 
 private:
   char *S_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
index 50bdba259e6..e1ae99ec493 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
@@ -35,7 +35,7 @@ public:
   be_visitor_args_arglist (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_args_arglist (void);
+  virtual ~be_visitor_args_arglist ();
 
   /// visit the argument node
   virtual int visit_argument (be_argument *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
index 0985975fce0..2f320a41943 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
@@ -36,7 +36,7 @@ public:
   be_visitor_args (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_args (void);
+  virtual ~be_visitor_args ();
 
   //= helper
   /// helper that produces either a nested name for
@@ -45,7 +45,7 @@ public:
                                  const char *suffix = 0);
 
   /// return the direction of the argument node
-  virtual AST_Argument::Direction direction (void);
+  virtual AST_Argument::Direction direction ();
 
   /// must be overridden by derived classes
   virtual int visit_argument (be_argument *node);
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 49a1a650456..023e96be6c2 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
@@ -32,7 +32,7 @@ public:
   be_visitor_args_invoke_cs (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_args_invoke_cs (void);
+  virtual ~be_visitor_args_invoke_cs ();
 
   /// visit the argument node
   virtual int visit_argument (be_argument *node);
@@ -93,7 +93,7 @@ public:
   virtual int visit_home (be_home *node);
 
  private:
-  int emit_common (void);
+  int emit_common ();
   int emit_common2 (be_type *node);
 
 };
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 c7cd4332015..05e7225bd3b 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
@@ -32,7 +32,7 @@ public:
   be_visitor_args_marshal_ss (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_args_marshal_ss (void);
+  virtual ~be_visitor_args_marshal_ss ();
 
   /// visit the argument node
   virtual int visit_argument (be_argument *node);
@@ -94,7 +94,7 @@ public:
   virtual int visit_home (be_home *node);
 
  private:
-  int emit_common (void);
+  int emit_common ();
   int emit_common2 (be_type *node);
 };
 
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 6a91ca39d3d..42b8d547675 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
@@ -32,7 +32,7 @@ public:
   be_visitor_args_upcall_ss (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_args_upcall_ss (void);
+  virtual ~be_visitor_args_upcall_ss ();
 
   /// visit the argument node
   virtual int visit_argument (be_argument *node);
@@ -91,7 +91,7 @@ public:
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 
  private:
-  int emit_common (void);
+  int emit_common ();
   int emit_common2 (be_type *node);
 };
 
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 6fee17d07a4..0fc6fd6c3a0 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
@@ -32,7 +32,7 @@ public:
   be_visitor_args_vardecl_ss (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_args_vardecl_ss (void);
+  virtual ~be_visitor_args_vardecl_ss ();
 
   /// visit the argument node
   virtual int visit_argument (be_argument *node);
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 5fd66b6c4ea..b6463d0753f 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
@@ -34,7 +34,7 @@ public:
   be_visitor_array_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array_any_op_ch (void);
+  ~be_visitor_array_any_op_ch ();
 
   /// visit array
   virtual int visit_array (be_array *node);
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 85040aae980..776a873402e 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
@@ -34,7 +34,7 @@ public:
   be_visitor_array_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array_any_op_cs (void);
+  ~be_visitor_array_any_op_cs ();
 
   /// visit array
   virtual int visit_array (be_array *node);
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 42fa8a82bc4..b44e9e6a4a2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array.h
@@ -31,7 +31,7 @@ public:
   be_visitor_array (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array (void);
+  ~be_visitor_array ();
 
   /// visit the array node
   virtual int visit_array (be_array *);
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 88742879048..4f0d219a1e6 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
@@ -31,7 +31,7 @@ public:
   be_visitor_array_ch (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_array_ch (void);
+  virtual ~be_visitor_array_ch ();
 
   /// visit the array node
   virtual int visit_array (be_array *node);
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 b4b1afeacc6..67ff101da07 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
@@ -31,7 +31,7 @@ public:
   be_visitor_array_ci (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_array_ci (void);
+  virtual ~be_visitor_array_ci ();
 
   /// visit the array node
   virtual int visit_array (be_array *node);
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 81be7e8326b..43f734b8916 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
@@ -31,7 +31,7 @@ public:
   be_visitor_array_cs (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_array_cs (void);
+  virtual ~be_visitor_array_cs ();
 
   /// visit the array node
   virtual int visit_array (be_array *node);
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 78e3f4614e0..fbcfc930785 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
@@ -34,7 +34,7 @@ public:
   be_visitor_array_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array_cdr_op_ch (void);
+  ~be_visitor_array_cdr_op_ch ();
 
   /// 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 73ea075826d..e7d71720731 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
@@ -38,7 +38,7 @@ public:
   be_visitor_array_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_array_cdr_op_cs (void);
+  ~be_visitor_array_cdr_op_cs ();
 
   /// visit array
   virtual int visit_array (be_array *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h b/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h
index 2366290a19b..a3d6a8c23e0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h
@@ -28,7 +28,7 @@ class be_visitor_attr_assign : public be_visitor_decl
 {
 public:
   be_visitor_attr_assign (be_visitor_context *ctx);
-  virtual ~be_visitor_attr_assign (void);
+  virtual ~be_visitor_attr_assign ();
 
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_init.h b/TAO/TAO_IDL/be_include/be_visitor_attr_init.h
index 19400767577..25b6bbdfdfb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attr_init.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attr_init.h
@@ -30,7 +30,7 @@ class be_visitor_attr_init : public be_visitor_decl
 {
 public:
   be_visitor_attr_init (be_visitor_context *ctx);
-  virtual ~be_visitor_attr_init (void);
+  virtual ~be_visitor_attr_init ();
 
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_return.h b/TAO/TAO_IDL/be_include/be_visitor_attr_return.h
index 32bc38e5b80..b29dad5b384 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attr_return.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attr_return.h
@@ -28,7 +28,7 @@ class be_visitor_attr_return : public be_visitor_decl
 {
 public:
   be_visitor_attr_return (be_visitor_context *ctx);
-  virtual ~be_visitor_attr_return (void);
+  virtual ~be_visitor_attr_return ();
 
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h b/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h
index 097d0f51695..e3acaf6a237 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h
@@ -28,7 +28,7 @@ class be_visitor_attr_setarg_type : public be_visitor_decl
 {
 public:
   be_visitor_attr_setarg_type (be_visitor_context *ctx);
-  virtual ~be_visitor_attr_setarg_type (void);
+  virtual ~be_visitor_attr_setarg_type ();
 
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
index d4345eb8312..61269d1923e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
@@ -33,7 +33,7 @@ public:
   be_visitor_attribute (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_attribute (void);
+  ~be_visitor_attribute ();
 
   /// visit attribute. We provide code for this method in the derived class
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h
index cdc80407df6..faf5717dc9f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h
@@ -21,7 +21,7 @@ class be_visitor_attribute_ccm_init
 {
 public:
   be_visitor_attribute_ccm_init (be_visitor_context *ctx);
-  ~be_visitor_attribute_ccm_init (void);
+  ~be_visitor_attribute_ccm_init ();
 
   virtual int visit_attribute (be_attribute *node);
 
@@ -41,10 +41,10 @@ public:
   virtual int visit_valuetype (be_valuetype *node);
 
 private:
-  void emit_init_block (void);
+  void emit_init_block ();
   void emit_error (const char *);
-  void open_if_block (void);
-  void close_if_block (void);
+  void open_if_block ();
+  void close_if_block ();
 
 private:
   be_attribute *attr_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
index 3f8c1451e37..dbf36935d64 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
@@ -23,7 +23,7 @@ class be_visitor_attribute_set_from_extracted
 {
 public:
   be_visitor_attribute_set_from_extracted (be_visitor_context *ctx);
-  virtual ~be_visitor_attribute_set_from_extracted (void);
+  virtual ~be_visitor_attribute_set_from_extracted ();
 
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
index e90a16bae17..16574898820 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
@@ -36,7 +36,7 @@ class be_visitor_ccm_pre_proc : public be_visitor_component_scope
 public:
   be_visitor_ccm_pre_proc (be_visitor_context *ctx);
 
-  virtual ~be_visitor_ccm_pre_proc (void);
+  virtual ~be_visitor_ccm_pre_proc ();
 
   virtual int visit_root (be_root *node);
   virtual int visit_module (be_module *node);
@@ -83,8 +83,8 @@ protected:
   // Utility functions to create and destroy the various things
   // needed by operations generated from CCM-related declarations.
 
-  int lookup_cookie (void);
-  int lookup_exceptions (void);
+  int lookup_cookie ();
+  int lookup_exceptions ();
   int lookup_one_exception (const char *name,
                             be_exception *&result);
 
@@ -130,7 +130,7 @@ protected:
 
 private:
   /// Generate a sendc_* receptacle for AMI4CCM.
-  int generate_ami4ccm_uses (void);
+  int generate_ami4ccm_uses ();
 };
 
 #endif // TAO_BE_VISITOR_CCM_PRE_PROC_H
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 fc6a2ae7d11..5e3975cb5ac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component.h
@@ -28,7 +28,7 @@ class be_visitor_component : public be_visitor_interface
 public:
   be_visitor_component (be_visitor_context *ctx);
 
-  ~be_visitor_component (void);
+  ~be_visitor_component ();
 
   /// This is the only type of declaration a component may contain.
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h
index 78fb8a14329..829b63ccccb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h
@@ -27,16 +27,16 @@ class be_visitor_component_ami_rh_ex_base
   //
 public:
   be_visitor_component_ami_rh_ex_base (be_visitor_context *ctx);
-  ~be_visitor_component_ami_rh_ex_base (void);
+  ~be_visitor_component_ami_rh_ex_base ();
 
   virtual int post_process (be_decl *node);
 
 protected:
-  void init (void);
+  void init ();
   void gen_excep_op (const char *prefix,
                      be_decl *node,
                      bool for_defn);
-  virtual void gen_op_body (void);
+  virtual void gen_op_body ();
   int gen_attr_op (be_attribute *node, bool for_defn);
 
 protected:
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h
index 37efdb86745..2ac3bf00095 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h
@@ -31,7 +31,7 @@ class be_visitor_component_ami_rh_exh
 {
 public:
   be_visitor_component_ami_rh_exh (be_visitor_context *ctx);
-  ~be_visitor_component_ami_rh_exh (void);
+  ~be_visitor_component_ami_rh_exh ();
 
   virtual int visit_uses (be_uses *node);
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h
index 739153e57e0..73abcca2ec0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h
@@ -26,7 +26,7 @@ class be_visitor_component_ami_rh_exs
 {
 public:
   be_visitor_component_ami_rh_exs (be_visitor_context *ctx);
-  ~be_visitor_component_ami_rh_exs (void);
+  ~be_visitor_component_ami_rh_exs ();
 
   virtual int visit_uses (be_uses *node);
   virtual int visit_operation (be_operation *node);
@@ -34,7 +34,7 @@ public:
   virtual int visit_argument (be_argument *node);
 
 private:
-  virtual void gen_op_body (void);
+  virtual void gen_op_body ();
 
 private:
   const char *your_code_here_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
index 5dd4a88f38a..77b70d453b1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
@@ -26,7 +26,7 @@ class be_visitor_component_ex_idl : public be_visitor_decl
 public:
   be_visitor_component_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_component_ex_idl (void);
+  ~be_visitor_component_ex_idl ();
 
   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/component_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h
index 2021bc1e6ff..61c3b1f1485 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h
@@ -24,7 +24,7 @@ class be_visitor_component_exh
 public:
   be_visitor_component_exh (be_visitor_context *ctx);
 
-  ~be_visitor_component_exh (void);
+  ~be_visitor_component_exh ();
 
   virtual int visit_component (be_component *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h
index fe7c1a0fb13..41a29abe673 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h
@@ -24,7 +24,7 @@ class be_visitor_component_exs
 public:
   be_visitor_component_exs (be_visitor_context *ctx);
 
-  ~be_visitor_component_exs (void);
+  ~be_visitor_component_exs ();
 
   virtual int visit_component (be_component *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h
index 45afd4bc706..f81b2d6028c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h
@@ -25,7 +25,7 @@ class be_visitor_component_svh : public be_visitor_component
 public:
   be_visitor_component_svh (be_visitor_context *ctx);
 
-  ~be_visitor_component_svh (void);
+  ~be_visitor_component_svh ();
 
   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/component_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h
index 0777596da3f..931064ae3f6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h
@@ -26,7 +26,7 @@ class be_visitor_component_svs : public be_visitor_component
 public:
   be_visitor_component_svs (be_visitor_context *ctx);
 
-  ~be_visitor_component_svs (void);
+  ~be_visitor_component_svs ();
 
   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/component_svth.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h
index c0ddc17c692..fb020ceb515 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h
@@ -25,7 +25,7 @@ class be_visitor_component_svth : public be_visitor_component
 public:
   be_visitor_component_svth (be_visitor_context *ctx);
 
-  ~be_visitor_component_svth (void);
+  ~be_visitor_component_svth ();
 
   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/component_svts.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h
index 0ece376fd87..778463cbb16 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h
@@ -26,7 +26,7 @@ class be_visitor_component_svts : public be_visitor_component
 public:
   be_visitor_component_svts (be_visitor_context *ctx);
 
-  ~be_visitor_component_svts (void);
+  ~be_visitor_component_svts ();
 
   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/context_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
index e4231f9943b..a534f6d12d9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
@@ -23,7 +23,7 @@ class be_visitor_context_ex_idl
 public:
   be_visitor_context_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_context_ex_idl (void);
+  ~be_visitor_context_ex_idl ();
 
   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/context_svth.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h
index b3156428bb8..0b6f076c0e9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h
@@ -27,7 +27,7 @@ class be_visitor_context_svth : public be_visitor_component_scope
 public:
   be_visitor_context_svth (be_visitor_context *ctx);
 
-  ~be_visitor_context_svth (void);
+  ~be_visitor_context_svth ();
 
   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/context_svts.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h
index 6feac150d01..853502b3bb2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h
@@ -27,7 +27,7 @@ class be_visitor_context_svts : public be_visitor_component_scope
 public:
   be_visitor_context_svts (be_visitor_context *ctx);
 
-  ~be_visitor_context_svts (void);
+  ~be_visitor_context_svts ();
 
   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/executor_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
index c10c1d73d01..e23af8df907 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
@@ -22,7 +22,7 @@ class be_visitor_executor_ex_idl
 public:
   be_visitor_executor_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_executor_ex_idl (void);
+  ~be_visitor_executor_ex_idl ();
 
   virtual int visit_component (be_component *node);
   virtual int visit_connector (be_connector *node);
@@ -39,7 +39,7 @@ public:
   virtual int visit_consumes (be_consumes *node);
 
 private:
-  void gen_supported (void);
+  void gen_supported ();
   void gen_exception_list (UTL_ExceptList *exceptions,
                            const char *prefix = "",
                            bool closed = true);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
index 84ee7523a66..1cd0a6e29d6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
@@ -23,7 +23,7 @@ class be_visitor_executor_exh
 public:
   be_visitor_executor_exh (be_visitor_context *ctx);
 
-  ~be_visitor_executor_exh (void);
+  ~be_visitor_executor_exh ();
 
   virtual int visit_attribute (be_attribute *node);
   virtual int visit_component (be_component *node);
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 a0298e2e982..114f5683ca8 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 (void);
+  ~be_visitor_executor_exs ();
 
   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/executor_exs_attr_init.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h
index 03bb5bd5045..4f0f18e75fe 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h
@@ -24,13 +24,13 @@ class be_visitor_executor_exs_attr_init
 {
 public:
   be_visitor_executor_exs_attr_init (be_visitor_context *ctx);
-  ~be_visitor_executor_exs_attr_init (void);
+  ~be_visitor_executor_exs_attr_init ();
 
   virtual int visit_attribute (be_attribute *node);
 
   virtual int pre_process (be_decl *);
 
-  bool attr_generated (void) const;
+  bool attr_generated () const;
 
 private:
   bool semicolon_generated_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h
index da954b17b92..0db0f40a4db 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h
@@ -24,7 +24,7 @@ class be_visitor_executor_private_exh
 public:
   be_visitor_executor_private_exh (be_visitor_context *ctx);
 
-  ~be_visitor_executor_private_exh (void);
+  ~be_visitor_executor_private_exh ();
 
   virtual int visit_provides (be_provides *node);
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
index 8a436a2f141..35ff340d2ea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
@@ -22,7 +22,7 @@ class be_visitor_facet_exh
 public:
   be_visitor_facet_exh (be_visitor_context *ctx);
 
-  ~be_visitor_facet_exh (void);
+  ~be_visitor_facet_exh ();
 
   virtual int visit_provides (be_provides *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h
index 54c1a9aaf2f..19afab63fd4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h
@@ -23,7 +23,7 @@ class be_visitor_facet_exs
 public:
   be_visitor_facet_exs (be_visitor_context *ctx);
 
-  ~be_visitor_facet_exs (void);
+  ~be_visitor_facet_exs ();
 
   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 f30c73b57ef..b9f017e416f 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 (void);
+  ~be_visitor_servant_svh ();
 
   virtual int visit_component (be_component *node);
   virtual int visit_connector (be_connector *node);
@@ -40,7 +40,7 @@ public:
 
 private:
   /// Base class overrides and CIAO-specific code.
-  void gen_non_type_specific (void);
+  void gen_non_type_specific ();
 };
 
 #endif /* _BE_COMPONENT_SERVANT_SVH_H_ */
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 659ef708fb6..f9cac557f89 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 (void);
+  ~be_visitor_servant_svs ();
 
   virtual int visit_component (be_component *node);
   virtual int visit_connector (be_connector *node);
@@ -37,15 +37,15 @@ public:
   virtual int visit_consumes (be_consumes *node);
 
 private:
-  void gen_provides_top (void);
-  void gen_uses_top (void);
-  void gen_publishes_top (void);
-  void gen_emits_top (void);
+  void gen_provides_top ();
+  void gen_uses_top ();
+  void gen_publishes_top ();
+  void gen_emits_top ();
 
   /// This method gets generated (unless we are
   /// generating the LwCCM profile) whether the
   /// comonent has any emitters or not.
-  void gen_get_all_emitters (void);
+  void gen_get_all_emitters ();
 
 private:
   be_interface *op_scope_;
@@ -59,7 +59,7 @@ class be_visitor_obv_factory_reg
 public:
   be_visitor_obv_factory_reg (be_visitor_context *ctx);
 
-  ~be_visitor_obv_factory_reg (void);
+  ~be_visitor_obv_factory_reg ();
 
   virtual int visit_publishes (be_publishes *node);
   virtual int visit_emits (be_emits *node);
@@ -76,7 +76,7 @@ class be_visitor_attr_set : public be_visitor_component_scope
 public:
   be_visitor_attr_set (be_visitor_context *ctx);
 
-  ~be_visitor_attr_set (void);
+  ~be_visitor_attr_set ();
 
   virtual int visit_attribute (be_attribute *node);
 
@@ -94,7 +94,7 @@ class be_visitor_facet_executor_block
 public:
   be_visitor_facet_executor_block (be_visitor_context *ctx);
 
-  ~be_visitor_facet_executor_block (void);
+  ~be_visitor_facet_executor_block ();
 
   virtual int visit_provides (be_provides *node);
 };
@@ -107,7 +107,7 @@ class be_visitor_connect_block
 public:
   be_visitor_connect_block (be_visitor_context *ctx);
 
-  ~be_visitor_connect_block (void);
+  ~be_visitor_connect_block ();
 
   virtual int visit_uses (be_uses *node);
 };
@@ -120,7 +120,7 @@ class be_visitor_disconnect_block
 public:
   be_visitor_disconnect_block (be_visitor_context *ctx);
 
-  ~be_visitor_disconnect_block (void);
+  ~be_visitor_disconnect_block ();
 
   virtual int visit_uses (be_uses *node);
 };
@@ -134,7 +134,7 @@ public:
   be_visitor_receptacle_desc (be_visitor_context *ctx,
                               be_component *node);
 
-  ~be_visitor_receptacle_desc (void);
+  ~be_visitor_receptacle_desc ();
 
   virtual int visit_uses (be_uses *node);
 
@@ -151,7 +151,7 @@ class be_visitor_subscribe_block
 public:
   be_visitor_subscribe_block (be_visitor_context *ctx);
 
-  ~be_visitor_subscribe_block (void);
+  ~be_visitor_subscribe_block ();
 
   virtual int visit_publishes (be_publishes *node);
 };
@@ -164,7 +164,7 @@ class be_visitor_unsubscribe_block
 public:
   be_visitor_unsubscribe_block (be_visitor_context *ctx);
 
-  ~be_visitor_unsubscribe_block (void);
+  ~be_visitor_unsubscribe_block ();
 
   virtual int visit_publishes (be_publishes *node);
 };
@@ -177,7 +177,7 @@ class be_visitor_event_source_desc
 public:
   be_visitor_event_source_desc (be_visitor_context *ctx);
 
-  ~be_visitor_event_source_desc (void);
+  ~be_visitor_event_source_desc ();
 
   virtual int visit_publishes (be_publishes *node);
 
@@ -193,7 +193,7 @@ class be_visitor_connect_consumer_block
 public:
   be_visitor_connect_consumer_block (be_visitor_context *ctx);
 
-  ~be_visitor_connect_consumer_block (void);
+  ~be_visitor_connect_consumer_block ();
 
   virtual int visit_emits (be_emits *node);
 };
@@ -206,7 +206,7 @@ class be_visitor_disconnect_consumer_block
 public:
   be_visitor_disconnect_consumer_block (be_visitor_context *ctx);
 
-  ~be_visitor_disconnect_consumer_block (void);
+  ~be_visitor_disconnect_consumer_block ();
 
   virtual int visit_emits (be_emits *node);
 };
@@ -219,7 +219,7 @@ class be_visitor_emitter_desc
 public:
   be_visitor_emitter_desc (be_visitor_context *ctx);
 
-  ~be_visitor_emitter_desc (void);
+  ~be_visitor_emitter_desc ();
 
   virtual int visit_emits (be_emits *node);
 
@@ -235,7 +235,7 @@ class be_visitor_populate_port_tables
 public:
   be_visitor_populate_port_tables (be_visitor_context *ctx);
 
-  ~be_visitor_populate_port_tables (void);
+  ~be_visitor_populate_port_tables ();
 
   virtual int visit_provides (be_provides *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 afc73f9840b..7aa27cfb24a 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
@@ -30,7 +30,7 @@ public:
   be_visitor_component_fwd_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_component_fwd_any_op_ch (void);
+  ~be_visitor_component_fwd_any_op_ch ();
 
   /// visit component_fwd
   virtual int visit_component_fwd (be_component_fwd *node);
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 85d1bb87ed8..69b53aaefe0 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
@@ -32,7 +32,7 @@ public:
   be_visitor_component_fwd_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_component_fwd_cdr_op_ch (void);
+  ~be_visitor_component_fwd_cdr_op_ch ();
 
   /// visit forward declared component.
   virtual int visit_component_fwd (be_component_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h
index f5c9d15989c..1d7ef30f688 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h
@@ -28,7 +28,7 @@ public:
   be_visitor_component_fwd_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_component_fwd_ch (void);
+  ~be_visitor_component_fwd_ch ();
 
   /// visit interface_fwd.
   virtual int visit_component_fwd (be_component_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
index 476efb13582..a41c1e25a8f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
@@ -30,7 +30,7 @@ class be_visitor_component_scope : public be_visitor_scope
 protected:
   be_visitor_component_scope (be_visitor_context *ctx);
 
-  virtual ~be_visitor_component_scope (void);
+  virtual ~be_visitor_component_scope ();
 
 public:
   virtual int visit_extended_port (be_extended_port *node);
@@ -52,10 +52,10 @@ public:
   void node (be_component *c);
 
 protected:
-  void gen_svnt_entrypoint_decl (void);
-  void gen_svnt_entrypoint_defn (void);
-  void gen_exec_entrypoint_decl (void);
-  void gen_exec_entrypoint_defn (void);
+  void gen_svnt_entrypoint_decl ();
+  void gen_svnt_entrypoint_defn ();
+  void gen_exec_entrypoint_decl ();
+  void gen_exec_entrypoint_defn ();
 
 protected:
   be_component *node_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h
index 7602b12b8d1..1e2ed19a3b2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h
@@ -31,12 +31,12 @@ class be_visitor_connector_ami_exh
 public:
   be_visitor_connector_ami_exh (be_visitor_context *ctx);
 
-  ~be_visitor_connector_ami_exh (void);
+  ~be_visitor_connector_ami_exh ();
 
   virtual int visit_connector (be_connector *node);
 
 private:
-  void gen_entrypoint (void);
+  void gen_entrypoint ();
 };
 
 #endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h
index f7da2c466ae..c83d58cdca7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h
@@ -32,12 +32,12 @@ class be_visitor_connector_ami_exs
 public:
   be_visitor_connector_ami_exs (be_visitor_context *ctx);
 
-  ~be_visitor_connector_ami_exs (void);
+  ~be_visitor_connector_ami_exs ();
 
   virtual int visit_connector (be_connector *node);
 
 private:
-  void gen_entrypoint (void);
+  void gen_entrypoint ();
 };
 
 #endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h
index a59c934d354..f26f839bbb8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h
@@ -31,7 +31,7 @@ class be_visitor_connector_dds_ex_base
 public:
   be_visitor_connector_dds_ex_base (be_visitor_context *ctx);
 
-  ~be_visitor_connector_dds_ex_base (void);
+  ~be_visitor_connector_dds_ex_base ();
 
 protected:
   bool begin (be_connector *node);
@@ -53,7 +53,7 @@ protected:
 
 private:
   void process_template_args (AST_Connector *node);
-  void match_template_args (void);
+  void match_template_args ();
 };
 
 #endif /* _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
index 292a965fb15..b1ea70cbc72 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
@@ -31,7 +31,7 @@ class be_visitor_connector_dds_exh
 public:
   be_visitor_connector_dds_exh (be_visitor_context *ctx);
 
-  ~be_visitor_connector_dds_exh (void);
+  ~be_visitor_connector_dds_exh ();
 
   virtual int visit_connector (be_connector *node);
 
@@ -47,7 +47,7 @@ private:
   /// Generate application-specific instantiations of
   /// middleware templates containing traits constructs.
   void gen_dds_traits (AST_Decl *datatype);
-  void gen_connector_traits (void);
+  void gen_connector_traits ();
 
   /// Common code triggered by provides and uses ports.
   void gen_interface_connector_trait (be_interface *iface,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
index 6b96a075509..78d220fa63d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
@@ -29,7 +29,7 @@ class be_visitor_connector_dds_exs
 public:
   be_visitor_connector_dds_exs (be_visitor_context *ctx);
 
-  ~be_visitor_connector_dds_exs (void);
+  ~be_visitor_connector_dds_exs ();
 
   virtual int visit_connector (be_connector *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h
index 7790f43bd33..fa00e192e4b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h
@@ -29,7 +29,7 @@ class be_visitor_executor_ami_exh
 public:
   be_visitor_executor_ami_exh (be_visitor_context *ctx);
 
-  ~be_visitor_executor_ami_exh (void);
+  ~be_visitor_executor_ami_exh ();
 
   virtual int visit_connector (be_connector *node);
   virtual int visit_provides (be_provides *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h
index 481e06f9eda..f831e4d8169 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h
@@ -29,7 +29,7 @@ class be_visitor_executor_ami_exs
 public:
   be_visitor_executor_ami_exs (be_visitor_context *ctx);
 
-  ~be_visitor_executor_ami_exs (void);
+  ~be_visitor_executor_ami_exs ();
 
   virtual int visit_connector (be_connector *node);
   virtual int visit_provides (be_provides *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
index 94b8e8a0dd0..67445f55335 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
@@ -28,7 +28,7 @@ class be_visitor_facet_ami_exh
 public:
   be_visitor_facet_ami_exh (be_visitor_context *ctx);
 
-  ~be_visitor_facet_ami_exh (void);
+  ~be_visitor_facet_ami_exh ();
 
   virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
@@ -49,8 +49,8 @@ protected:
   bool sync_;
 
 private:
-  int gen_reply_handler_class (void);
-  int gen_facet_executor_class (void);
+  int gen_reply_handler_class ();
+  int gen_facet_executor_class ();
 };
   //==============================================================
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
index cf98aa0efcd..d102e3ed6ab 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
@@ -28,7 +28,7 @@ class be_visitor_facet_ami_exs
 public:
   be_visitor_facet_ami_exs (be_visitor_context *ctx);
 
-  ~be_visitor_facet_ami_exs (void);
+  ~be_visitor_facet_ami_exs ();
 
   virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
@@ -39,9 +39,9 @@ public:
   virtual int post_process (be_decl *node);
 
 private:
-  void init (void);
-  int gen_reply_handler_class (void);
-  int gen_facet_executor_class (void);
+  void init ();
+  int gen_reply_handler_class ();
+  int gen_facet_executor_class ();
   int gen_reply_hander_op (be_operation *node);
   int gen_facet_executor_op (be_operation *node);
   int gen_facet_executor_sync_op (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
index f5575874d3a..49dab12db86 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
@@ -28,7 +28,7 @@ public:
   be_visitor_constant_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_constant_ch (void);
+  ~be_visitor_constant_ch ();
 
   /// visit constant.
   virtual int visit_constant (be_constant *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
index 342286a8510..4979beab82e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
@@ -28,7 +28,7 @@ public:
   be_visitor_constant_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_constant_cs (void);
+  ~be_visitor_constant_cs ();
 
   /// visit constant
   virtual int visit_constant (be_constant *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h
index 0951b14fbda..4fe7d901355 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_context.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_context.h
@@ -40,13 +40,13 @@ class be_visitor_context : public ast_visitor_context
 {
 public:
   /// default constructor
-  be_visitor_context (void);
+  be_visitor_context ();
 
   /// default constructor
   be_visitor_context (const be_visitor_context &ctx);
 
   /// destructor
-  ~be_visitor_context (void);
+  ~be_visitor_context ();
 
   /// assignment operator
   be_visitor_context &operator= (const be_visitor_context &ctx);
@@ -54,67 +54,67 @@ public:
   // =helpers
 
   /// reset the context
-  void reset (void);
+  void reset ();
 
   /// set the output stream
   void stream (TAO_OutStream *os);
 
   /// get the stream
-  TAO_OutStream *stream (void);
+  TAO_OutStream *stream ();
 
   /// set the scope
   void scope (be_scope *scope);
 
   /// get the scope in which code will be generated
-  be_scope *scope (void);
+  be_scope *scope ();
 
   /// current node being visited
   void node (be_decl *node);
 
   /// node being visited
-  be_decl *node (void);
+  be_decl *node ();
 
   /// code generation state
   void state (TAO_CodeGen::CG_STATE);
 
   /// return the code generation state
-  TAO_CodeGen::CG_STATE state (void);
+  TAO_CodeGen::CG_STATE state ();
 
   /// code generation state
   void sub_state (TAO_CodeGen::CG_SUB_STATE);
 
   /// return the code generation state
-  TAO_CodeGen::CG_SUB_STATE sub_state (void);
+  TAO_CodeGen::CG_SUB_STATE sub_state ();
 
   /// set the alias node (if any)
   void alias (be_typedef *node);
 
   /// return the aliased node (if any)
-  be_typedef *alias (void);
+  be_typedef *alias ();
 
   /// set the typedef node (if any)
   void tdef (be_typedef *node);
 
   /// return the typedef node (if any)
-  be_typedef *tdef (void);
+  be_typedef *tdef ();
 
   /// set the attribute node if any
   void attribute (be_attribute *attr);
 
   /// get the attribute node
-  be_attribute *attribute (void);
+  be_attribute *attribute ();
 
   /// is it the special ctor for exceptions?
   void exception (bool);
 
   /// is it the special ctor for exceptions?
-  bool exception (void);
+  bool exception ();
 
   /// scope supoorts generation of comma after each element
   void comma (bool);
 
   /// are we supposed to generate a comma?
-  bool comma (void);
+  bool comma ();
 
   /**
    * In some cases we need to generate the objects of one interface as
@@ -123,17 +123,17 @@ public:
    * *generating* code, as opposed to the interfaces where the methods
    * or structures are defined.
    */
-  be_interface *interface (void) const;
+  be_interface *interface () const;
   void interface (be_interface *);
 
   /// Accessor for the member.
-  ACE_CString &port_prefix (void);
+  ACE_CString &port_prefix ();
 
   /// return the export macro currently in force
-  const char *export_macro (void) const;
+  const char *export_macro () const;
 
   /// if anyop export macro is empty, check stub.
-  const char *non_null_export_macro (void) const;
+  const char *non_null_export_macro () const;
 
 private:
   /// code generation state
diff --git a/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h b/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h
index ca41373b041..03184b0fb39 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h
@@ -29,7 +29,7 @@ class be_visitor_dds_ts_idl : public be_visitor_scope
 public:
   be_visitor_dds_ts_idl (be_visitor_context *ctx);
 
-  ~be_visitor_dds_ts_idl (void);
+  ~be_visitor_dds_ts_idl ();
 
   virtual int visit_root (be_root *node);
   virtual int visit_module (be_module *node);
@@ -46,8 +46,8 @@ private:
   void gen_datareader (be_type *node);
 
   /// Manage streams and files.
-  int init_file (void);
-  void fini_file (void);
+  int init_file ();
+  void fini_file ();
 
 private:
   TAO_OutStream *os_ptr_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h
index 266e0376fae..cde8ecb37ef 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_decl.h
@@ -29,9 +29,9 @@ class be_visitor_decl : public be_visitor
 public:
   be_visitor_decl (be_visitor_context *ctx);
 
-  ~be_visitor_decl (void);
+  ~be_visitor_decl ();
 
-  be_visitor_context *ctx (void);
+  be_visitor_context *ctx ();
 
 protected:
   /// Any context information required by the visitor.
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 610382298d1..a5d46ffa8a7 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
@@ -30,7 +30,7 @@ public:
   be_visitor_enum_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_enum_any_op_ch (void);
+  ~be_visitor_enum_any_op_ch ();
 
   /// visit enum
   virtual int visit_enum (be_enum *node);
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 7f813cbfb5b..4fd3d8f6e4b 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
@@ -30,7 +30,7 @@ public:
   be_visitor_enum_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_enum_any_op_cs (void);
+  ~be_visitor_enum_any_op_cs ();
 
   /// visit enum
   virtual int visit_enum (be_enum *node);
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 bc2240a1b91..07e4f1b9609 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
@@ -30,7 +30,7 @@ public:
   be_visitor_enum_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_enum_cdr_op_ch (void);
+  ~be_visitor_enum_cdr_op_ch ();
 
   /// visit enum
   virtual int visit_enum (be_enum *node);
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 adcba1de635..c7a39686789 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
@@ -30,7 +30,7 @@ public:
   be_visitor_enum_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_enum_cdr_op_cs (void);
+  ~be_visitor_enum_cdr_op_cs ();
 
   /// visit enum
   virtual int visit_enum (be_enum *node);
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 e353754e3d1..c1514b5f712 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
@@ -28,7 +28,7 @@ public:
   be_visitor_enum_ch (be_visitor_context *ctx);
 
   /// deenumor
-  ~be_visitor_enum_ch (void);
+  ~be_visitor_enum_ch ();
 
   /// visit enum.
   virtual int visit_enum (be_enum *node);
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 d77ed23332b..dcb06a90627 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
@@ -28,7 +28,7 @@ public:
   be_visitor_enum_cs (be_visitor_context *ctx);
 
   /// deenumor
-  ~be_visitor_enum_cs (void);
+  ~be_visitor_enum_cs ();
 
   /// visit enum and generate the typecode
   virtual int visit_enum (be_enum *node);
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 262455138f7..e49da61f6f9 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
@@ -27,7 +27,7 @@ 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 (void);
+  ~be_visitor_exception_any_op_ch ();
 
   virtual int visit_exception (be_exception *node);
   virtual int visit_field (be_field *node);
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 d188a3115e5..4a252adef3d 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
@@ -27,7 +27,7 @@ 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 (void);
+  ~be_visitor_exception_any_op_cs ();
 
   virtual int visit_exception (be_exception *node);
   virtual int visit_field (be_field *node);
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 d8b357042af..462beb7214b 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
@@ -28,7 +28,7 @@ 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 (void);
+  ~be_visitor_exception_cdr_op_ch ();
 
   virtual int visit_exception (be_exception *node);
 };
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 b579bf99e2d..ed86886f347 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
@@ -28,7 +28,7 @@ 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 (void);
+  ~be_visitor_exception_cdr_op_cs ();
 
   virtual int visit_exception (be_exception *node);
 
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 ea9600d63d0..e7f10cd0346 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
@@ -24,7 +24,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_exception/ctor_assign.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
index 53c633473d6..17e7f4914a4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
@@ -24,7 +24,7 @@ class be_visitor_exception_ctor_assign : public be_visitor_scope
 {
 public:
   be_visitor_exception_ctor_assign (be_visitor_context *ctx);
-  ~be_visitor_exception_ctor_assign (void);
+  ~be_visitor_exception_ctor_assign ();
 
   virtual int visit_exception (be_exception *node);
   virtual int visit_field (be_field *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
index ee30eaa1aba..22c13ddfa7b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
@@ -25,7 +25,7 @@ class be_visitor_exception : public be_visitor_scope
 {
 public:
   be_visitor_exception (be_visitor_context *ctx);
-  ~be_visitor_exception (void);
+  ~be_visitor_exception ();
 
   virtual int visit_exception (be_exception *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
index 5bda48fbaec..063bb0a90ee 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
@@ -25,7 +25,7 @@ class be_visitor_exception_ch : public be_visitor_exception
 {
 public:
   be_visitor_exception_ch (be_visitor_context *ctx);
-  ~be_visitor_exception_ch (void);
+  ~be_visitor_exception_ch ();
 
   virtual int visit_exception (be_exception *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
index b73dfa93fff..a07e9017cd3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
@@ -25,7 +25,7 @@ class be_visitor_exception_ci : public be_visitor_exception
 {
 public:
   be_visitor_exception_ci (be_visitor_context *ctx);
-  ~be_visitor_exception_ci (void);
+  ~be_visitor_exception_ci ();
 
   virtual int visit_exception (be_exception *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
index 3bd79bb082f..97a5b221517 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
@@ -25,7 +25,7 @@ class be_visitor_exception_cs : public be_visitor_exception
 {
 public:
   be_visitor_exception_cs (be_visitor_context *ctx);
-  ~be_visitor_exception_cs (void);
+  ~be_visitor_exception_cs ();
 
   virtual int visit_exception (be_exception *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
index edcfb760650..04fb0dc86fe 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
@@ -25,7 +25,7 @@ class be_visitor_field_cdr_op_ch : public be_visitor_decl
 {
 public:
   be_visitor_field_cdr_op_ch (be_visitor_context *ctx);
-  ~be_visitor_field_cdr_op_ch (void);
+  ~be_visitor_field_cdr_op_ch ();
 
   virtual int visit_field (be_field *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
index 37a6ffd93eb..ee844d8c9dd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
@@ -24,7 +24,7 @@ class be_visitor_field_cdr_op_cs : public be_visitor_decl
 {
 public:
   be_visitor_field_cdr_op_cs (be_visitor_context *ctx);
-  ~be_visitor_field_cdr_op_cs (void);
+  ~be_visitor_field_cdr_op_cs ();
 
   /// visit the field node
   virtual int visit_field (be_field *node);
@@ -52,7 +52,7 @@ public:
   virtual int visit_union_fwd (be_union_fwd *node);
 
  private:
-  int emit_valuetype_common (void);
+  int emit_valuetype_common ();
 };
 
 /**
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
index 3078353f8a9..2145b282203 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
@@ -24,7 +24,7 @@ class be_visitor_field_ch : public be_visitor_decl
 {
 public:
   be_visitor_field_ch (be_visitor_context *ctx);
-  ~be_visitor_field_ch (void);
+  ~be_visitor_field_ch ();
 
   virtual int visit_field (be_field *node);
   virtual int visit_array (be_array *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
index a32d5d3b165..dd22e9f1682 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
@@ -25,7 +25,7 @@ class be_visitor_field_ci : public be_visitor_decl
 {
 public:
   be_visitor_field_ci (be_visitor_context *ctx);
-  ~be_visitor_field_ci (void);
+  ~be_visitor_field_ci ();
 
   virtual int visit_field (be_field *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
index 4c3768040dd..533b0a28dcd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
@@ -25,7 +25,7 @@ class be_visitor_field_cs : public be_visitor_decl
 {
 public:
   be_visitor_field_cs (be_visitor_context *ctx);
-  ~be_visitor_field_cs (void);
+  ~be_visitor_field_cs ();
 
   virtual int visit_field (be_field *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
index 67793591bf4..cf49e324489 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
@@ -27,7 +27,7 @@ class be_visitor_home_ex_idl : public be_visitor_scope
 public:
   be_visitor_home_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_home_ex_idl (void);
+  ~be_visitor_home_ex_idl ();
 
   virtual int visit_home (be_home *node);
 
@@ -42,24 +42,24 @@ public:
   virtual int visit_string (be_string *node);
 
 private:
-  void gen_implicit (void);
-  void gen_explicit (void);
-  void gen_derived (void);
+  void gen_implicit ();
+  void gen_explicit ();
+  void gen_derived ();
 
-  void gen_supported (void);
+  void gen_supported ();
 
   void gen_exception_list (UTL_ExceptList *exceptions,
                            const char *prefix = "",
                            bool init_op = false);
 
-  void gen_home_executor (void);
+  void gen_home_executor ();
 
   /// The CCM preproc visitor changed the scoped name and the
   /// defined_in() for the home's members to the implied
   /// *Explicit interface, which isn't a problem unless
   /// they include exceptions raised by a contained operation.
   /// factory or finder. So we restore the members just in case.
-  void restore_scope (void);
+  void restore_scope ();
 
 private:
   be_home *node_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h
index e5d1f190b25..4ac2060e25f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h
@@ -27,7 +27,7 @@ class be_visitor_home_exh : public be_visitor_scope
 public:
   be_visitor_home_exh (be_visitor_context *ctx);
 
-  ~be_visitor_home_exh (void);
+  ~be_visitor_home_exh ();
 
   virtual int visit_home (be_home *node);
   virtual int visit_operation (be_operation *node);
@@ -41,9 +41,9 @@ public:
                                   TAO_OutStream *);
 
 private:
-  int gen_exec_class (void);
+  int gen_exec_class ();
 
-  void gen_entrypoint (void);
+  void gen_entrypoint ();
 
 private:
   be_home *node_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h
index 5dd74ec96e7..a5bc812e282 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h
@@ -27,7 +27,7 @@ class be_visitor_home_exs : public be_visitor_scope
 public:
   be_visitor_home_exs (be_visitor_context *ctx);
 
-  ~be_visitor_home_exs (void);
+  ~be_visitor_home_exs ();
 
   virtual int visit_home (be_home *node);
   virtual int visit_operation (be_operation *node);
@@ -35,9 +35,9 @@ public:
   virtual int visit_factory (be_factory *node);
 
 private:
-  int gen_exec_class (void);
+  int gen_exec_class ();
 
-  void gen_entrypoint (void);
+  void gen_entrypoint ();
 
 private:
   be_home *node_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h
index 2bedc2de3bc..4feaa55bdc1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h
@@ -26,7 +26,7 @@ class be_visitor_home_svh : public be_visitor_scope
 public:
   be_visitor_home_svh (be_visitor_context *ctx);
 
-  ~be_visitor_home_svh (void);
+  ~be_visitor_home_svh ();
 
   virtual int visit_home (be_home *node);
   virtual int visit_operation (be_operation *node);
@@ -35,9 +35,9 @@ public:
   virtual int visit_finder (be_finder *node);
 
 private:
-  int gen_servant_class (void);
+  int gen_servant_class ();
 
-  void gen_entrypoint (void);
+  void gen_entrypoint ();
 
   /// Helper method passed to traverse_inheritance_graph(),
   /// collects supported operations and attributes.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h
index 8709485991d..8da752963f6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h
@@ -26,7 +26,7 @@ class be_visitor_home_svs : public be_visitor_scope
 public:
   be_visitor_home_svs (be_visitor_context *ctx);
 
-  ~be_visitor_home_svs (void);
+  ~be_visitor_home_svs ();
 
   virtual int visit_home (be_home *node);
   virtual int visit_operation (be_operation *node);
@@ -36,9 +36,9 @@ public:
   virtual int visit_finder (be_finder *node);
 
 private:
-  int gen_servant_class (void);
+  int gen_servant_class ();
 
-  void gen_entrypoint (void);
+  void gen_entrypoint ();
 
 private:
   be_home *node_;
@@ -69,7 +69,7 @@ class be_visitor_home_attr_set : public be_visitor_decl
 public:
   be_visitor_home_attr_set (be_visitor_context *ctx);
 
-  ~be_visitor_home_attr_set (void);
+  ~be_visitor_home_attr_set ();
 
   virtual int visit_home (be_home *node);
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h
index 3571db50638..6fbaa310ad3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h
@@ -30,7 +30,7 @@ public:
   be_visitor_amh_interface_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_amh_interface_ch (void);
+  ~be_visitor_amh_interface_ch ();
 
   /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h
index 49a7b0b011a..f0b65056463 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h
@@ -15,11 +15,11 @@
 class be_visitor_amh_rh_interface_sh : public be_visitor_interface_sh
 {
 public:
-  be_visitor_amh_rh_interface_sh (void);
+  be_visitor_amh_rh_interface_sh ();
 
   be_visitor_amh_rh_interface_sh (be_visitor_context *ctx);
 
-  ~be_visitor_amh_rh_interface_sh (void);
+  ~be_visitor_amh_rh_interface_sh ();
 
   virtual int visit_interface (be_interface *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h
index efb6bfe1e69..bdb2fe50e54 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h
@@ -22,7 +22,7 @@ public:
 
   int visit_operation (be_operation *node);
 
-  ~be_visitor_amh_rh_interface_ss (void);
+  ~be_visitor_amh_rh_interface_ss ();
 };
 
 #endif /* AMH_RH_INTERFACE_SS_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h
index 733c8f1de0d..9af9fd2202c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h
@@ -15,7 +15,7 @@ class be_visitor_amh_interface_sh : public be_visitor_interface_sh
 {
 public:
   be_visitor_amh_interface_sh (be_visitor_context *ctx);
-  ~be_visitor_amh_interface_sh (void);
+  ~be_visitor_amh_interface_sh ();
 
   int visit_interface (be_interface *node);
   int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h
index 238db0bb5b6..c0b9beac332 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h
@@ -23,7 +23,7 @@ public:
   int visit_operation (be_operation *node);
   int visit_attribute (be_attribute *node);
 
-  ~be_visitor_amh_interface_ss (void);
+  ~be_visitor_amh_interface_ss ();
 
 protected:
   virtual void this_method (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h
index db2bb9bde6e..a7a2d9fe2c5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h
@@ -26,7 +26,7 @@ class be_visitor_ami4ccm_conn_ex_idl : public be_visitor_scope
 public:
   be_visitor_ami4ccm_conn_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_ami4ccm_conn_ex_idl (void);
+  ~be_visitor_ami4ccm_conn_ex_idl ();
 
   virtual int visit_interface (be_interface *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h
index c3a7693c802..636e9e73e88 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h
@@ -26,7 +26,7 @@ class be_visitor_ami4ccm_rh_ex_idl : public be_visitor_scope
 public:
   be_visitor_ami4ccm_rh_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_ami4ccm_rh_ex_idl (void);
+  ~be_visitor_ami4ccm_rh_ex_idl ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h
index ccc9102d7a2..b26192722ba 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h
@@ -26,7 +26,7 @@ class be_visitor_ami4ccm_sendc_ex_idl : public be_visitor_scope
 public:
   be_visitor_ami4ccm_sendc_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_ami4ccm_sendc_ex_idl (void);
+  ~be_visitor_ami4ccm_sendc_ex_idl ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_operation (be_operation *node);
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 cf1eee4b14a..14423fd2e60 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
@@ -26,7 +26,7 @@ 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 (void);
+  ~be_visitor_interface_any_op_ch ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
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 7409ce3a65d..47ba221489f 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
@@ -26,7 +26,7 @@ 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 (void);
+  ~be_visitor_interface_any_op_cs ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
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 00a49c87100..478b6d191f9 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
@@ -28,7 +28,7 @@ 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 (void);
+  ~be_visitor_interface_cdr_op_ch ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
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 e95dd50c04a..79f212abee7 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
@@ -28,7 +28,7 @@ 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 (void);
+  ~be_visitor_interface_cdr_op_cs ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
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 6f8ab960b6b..1b10d9ab9d4 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
@@ -27,7 +27,7 @@ public:
   // -- Ctor/Dtor Decl. --
   be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx);
 
-  virtual ~be_visitor_interface_direct_proxy_impl_sh (void);
+  virtual ~be_visitor_interface_direct_proxy_impl_sh ();
 
   /// visit an interface
   virtual int visit_interface (be_interface *node);
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 1d298c1a2e5..cf818e8a44b 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
@@ -26,7 +26,7 @@ public:
   // -- Ctor/Dtor Decl. --
   be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx);
 
-  virtual ~be_visitor_interface_direct_proxy_impl_ss (void);
+  virtual ~be_visitor_interface_direct_proxy_impl_ss ();
 
   /// visit an interface
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h
index 679951ebead..b3f0d0ae183 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h
@@ -27,7 +27,7 @@ class be_visitor_facet_svth : public be_visitor_interface
 public:
   be_visitor_facet_svth (be_visitor_context *ctx);
 
-  ~be_visitor_facet_svth (void);
+  ~be_visitor_facet_svth ();
 
   virtual int visit_interface (be_interface *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h
index 7e8f26614d6..4fe718c369c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h
@@ -27,7 +27,7 @@ class be_visitor_facet_svts : public be_visitor_interface
 public:
   be_visitor_facet_svts (be_visitor_context *ctx);
 
-  ~be_visitor_facet_svts (void);
+  ~be_visitor_facet_svts ();
 
   virtual int visit_interface (be_interface *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
index 86e324fd121..00587d6fd9a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
@@ -45,7 +45,7 @@ class be_visitor_interface : public be_visitor_scope
 {
 public:
   be_visitor_interface (be_visitor_context *ctx);
-  ~be_visitor_interface (void);
+  ~be_visitor_interface ();
 
   virtual int visit_interface (be_interface *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
index 8a6b8323cea..a6d0bf77c9d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
@@ -27,7 +27,7 @@ class be_visitor_interface_ch : public be_visitor_interface
 {
 public:
   be_visitor_interface_ch (be_visitor_context *ctx);
-  ~be_visitor_interface_ch (void);
+  ~be_visitor_interface_ch ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
index 41b274c36ce..375a538c424 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
@@ -24,7 +24,7 @@ class be_visitor_interface_ci : public be_visitor_interface
 {
 public:
   be_visitor_interface_ci (be_visitor_context *ctx);
-  ~be_visitor_interface_ci (void);
+  ~be_visitor_interface_ci ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
index b3830240020..c78de386e5e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
@@ -24,7 +24,7 @@ class be_visitor_interface_cs : public be_visitor_interface
 {
 public:
   be_visitor_interface_cs (be_visitor_context *ctx);
-  ~be_visitor_interface_cs (void);
+  ~be_visitor_interface_cs ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h
index 6f6983ae890..b72b4f957d2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h
@@ -28,7 +28,7 @@ class be_visitor_interface_ex_idl : public be_visitor_interface
 public:
   be_visitor_interface_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_interface_ex_idl (void);
+  ~be_visitor_interface_ex_idl ();
 
   virtual int visit_interface (be_interface *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h
index d88faa13f2e..8b861ab6198 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h
@@ -29,7 +29,7 @@ public:
   be_visitor_interface_ih (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_interface_ih (void);
+  ~be_visitor_interface_ih ();
 
   /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h
index d4a54bd4945..85d6e612542 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h
@@ -28,7 +28,7 @@ public:
   be_visitor_interface_is (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_interface_is (void);
+  ~be_visitor_interface_is ();
 
   /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
index 9cded98fca5..2ef902215e7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
@@ -24,7 +24,7 @@ class be_visitor_interface_sh : public be_visitor_interface
 {
 public:
   be_visitor_interface_sh (be_visitor_context *ctx);
-  ~be_visitor_interface_sh (void);
+  ~be_visitor_interface_sh ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
index a859d496e89..d5caf5496ff 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
@@ -27,7 +27,7 @@ class be_visitor_interface_ss : public be_visitor_interface
 {
 public:
   be_visitor_interface_ss (be_visitor_context *ctx);
-  ~be_visitor_interface_ss (void);
+  ~be_visitor_interface_ss ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h
index 28e95dc4ca6..b62e1ebd3d4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h
@@ -28,7 +28,7 @@ class be_visitor_interface_svth : public be_visitor_interface
 public:
   be_visitor_interface_svth (be_visitor_context *ctx);
 
-  ~be_visitor_interface_svth (void);
+  ~be_visitor_interface_svth ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h
index d4dd4ea012c..16a5d734390 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h
@@ -28,7 +28,7 @@ class be_visitor_interface_svts : public be_visitor_interface
 public:
   be_visitor_interface_svts (be_visitor_context *ctx);
 
-  ~be_visitor_interface_svts (void);
+  ~be_visitor_interface_svts ();
 
   virtual int visit_interface (be_interface *node);
   virtual int visit_operation (be_operation *node);
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 f5f553ba0d4..dd15ff9eb80 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
@@ -28,7 +28,7 @@ public:
   be_visitor_interface_smart_proxy_ch (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_interface_smart_proxy_ch (void);
+  virtual ~be_visitor_interface_smart_proxy_ch ();
 
   /// visit an interface
   virtual int visit_interface (be_interface *node);
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 61ee835793d..d407b35f477 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
@@ -27,7 +27,7 @@ public:
   be_visitor_interface_smart_proxy_cs (be_visitor_context *ctx);
 
   /// destructor
-  virtual ~be_visitor_interface_smart_proxy_cs (void);
+  virtual ~be_visitor_interface_smart_proxy_cs ();
 
   /// visit interface
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
index a9e1162a554..159874fa2c2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
@@ -28,7 +28,7 @@ public:
   be_visitor_interface_tie_sh (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_interface_tie_sh (void);
+  ~be_visitor_interface_tie_sh ();
 
   /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
index 40c11251da1..f5055a655d6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
@@ -29,7 +29,7 @@ public:
   be_visitor_interface_tie_ss (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_interface_tie_ss (void);
+  ~be_visitor_interface_tie_ss ();
 
   /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
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 a0f374c208e..65986f49535 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
@@ -30,7 +30,7 @@ public:
   be_visitor_interface_fwd_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_interface_fwd_any_op_ch (void);
+  ~be_visitor_interface_fwd_any_op_ch ();
 
   /// visit interface_fwd
   virtual int visit_interface_fwd (be_interface_fwd *node);
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 eda0f278a6a..950f3d6914e 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
@@ -32,7 +32,7 @@ public:
   be_visitor_interface_fwd_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_interface_fwd_cdr_op_ch (void);
+  ~be_visitor_interface_fwd_cdr_op_ch ();
 
   /// visit forward declared interface
   virtual int visit_interface_fwd (be_interface_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
index f40ecff308d..33aff8865c0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
@@ -28,7 +28,7 @@ public:
   be_visitor_interface_fwd_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_interface_fwd_ch (void);
+  ~be_visitor_interface_fwd_ch ();
 
   /// visit interface_fwd.
   virtual int visit_interface_fwd (be_interface_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h b/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h
index 12835445a5a..45b2ea985fe 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h
@@ -28,7 +28,7 @@ class be_visitor_member_type_decl : public be_visitor_decl
 {
 public:
   be_visitor_member_type_decl (be_visitor_context *ctx);
-  virtual ~be_visitor_member_type_decl (void);
+  virtual ~be_visitor_member_type_decl ();
 
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
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 1ed876190fc..e18ae92a0f8 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
@@ -32,7 +32,7 @@ public:
   be_visitor_module_any_op (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_module_any_op (void);
+  ~be_visitor_module_any_op ();
 
   /// visit module
   virtual int visit_module (be_module *node);
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 31913a72908..c78e389a3b2 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
@@ -32,7 +32,7 @@ public:
   be_visitor_module_cdr_op (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_module_cdr_op (void);
+  ~be_visitor_module_cdr_op ();
 
   /// visit module
   virtual int visit_module (be_module *node);
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 edaebc17183..64c12a08c6d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
@@ -28,7 +28,7 @@ class be_visitor_module : public be_visitor_scope
 public:
   be_visitor_module (be_visitor_context *ctx);
 
-  ~be_visitor_module (void);
+  ~be_visitor_module ();
 
   virtual int visit_constant (be_constant *node);
   virtual int visit_enum (be_enum *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
index 74e4ed0243f..8fca169d567 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
@@ -29,7 +29,7 @@ public:
   be_visitor_module_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_module_ch (void);
+  ~be_visitor_module_ch ();
 
   /// visit module. We provide code for this method in the derived class
   virtual int visit_module (be_module *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h
index e6ce39f1690..afa981dab01 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h
@@ -30,7 +30,7 @@ public:
   be_visitor_module_ih (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_module_ih (void);
+  ~be_visitor_module_ih ();
 
   /// visit module. We provide code for this method in the derived class
   virtual int visit_module (be_module *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
index d6fa27007f7..1598f322820 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
@@ -29,7 +29,7 @@ public:
   be_visitor_module_sh (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_module_sh (void);
+  ~be_visitor_module_sh ();
 
   /// visit module. We provide code for this method in the derived class
   virtual int visit_module (be_module *node);
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 9dd04c79fd0..3e2e37c3562 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
@@ -28,7 +28,7 @@ public:
   be_visitor_native_ch (be_visitor_context *ctx);
 
   /// deenumor
-  ~be_visitor_native_ch (void);
+  ~be_visitor_native_ch ();
 
   /// visit native.
   virtual int visit_native (be_native *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h
index cdc71d47ccc..bc8322ceea4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h
@@ -30,7 +30,7 @@ class be_visitor_null_return_value : public be_visitor_decl
 {
 public:
   be_visitor_null_return_value (be_visitor_context *ctx);
-  virtual ~be_visitor_null_return_value (void);
+  virtual ~be_visitor_null_return_value ();
 
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
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 8c6cd8d2999..a3bb7bd730d 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
@@ -25,7 +25,7 @@ class be_visitor_amh_rh_operation_sh : public be_visitor_operation
  public:
     be_visitor_amh_rh_operation_sh (be_visitor_context *ctx);
 
-    ~be_visitor_amh_rh_operation_sh (void);
+    ~be_visitor_amh_rh_operation_sh ();
 
     int visit_operation (be_operation *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
index 1beb3814d9d..059e5ca2f3b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
@@ -25,7 +25,7 @@ class be_visitor_amh_rh_operation_ss : public be_visitor_operation
  public:
     be_visitor_amh_rh_operation_ss (be_visitor_context *ctx);
 
-    ~be_visitor_amh_rh_operation_ss (void);
+    ~be_visitor_amh_rh_operation_ss ();
 
     int visit_operation (be_operation *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h
index 31a72611e45..966574ab1f9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h
@@ -21,7 +21,7 @@ class be_visitor_amh_operation_sh : public be_visitor_operation
 {
 public:
   be_visitor_amh_operation_sh (be_visitor_context *ctx);
-  ~be_visitor_amh_operation_sh (void);
+  ~be_visitor_amh_operation_sh ();
 
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h
index 82024d5b74f..fa8dc6b614d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h
@@ -22,7 +22,7 @@ class be_visitor_amh_operation_ss : public be_visitor_operation
 public:
   be_visitor_amh_operation_ss (be_visitor_context *ctx);
 
-  ~be_visitor_amh_operation_ss (void);
+  ~be_visitor_amh_operation_ss ();
 
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h
index bc30ee7fce3..64a1b557ce5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h
@@ -31,7 +31,7 @@ public:
   be_visitor_operation_ami_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_ami_cs (void);
+  ~be_visitor_operation_ami_cs ();
 
   /// visit operation.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h
index 9f598031e3e..b222f25eec9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h
@@ -33,7 +33,7 @@ public:
   be_visitor_operation_ami_handler_reply_stub_operation_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_ami_handler_reply_stub_operation_cs (void);
+  ~be_visitor_operation_ami_handler_reply_stub_operation_cs ();
 
   /// visit operation.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
index ef1721f9765..a95c034822a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
@@ -30,7 +30,7 @@ class be_visitor_operation_arglist : public be_visitor_operation
 public:
   be_visitor_operation_arglist (be_visitor_context *ctx);
 
-  ~be_visitor_operation_arglist (void);
+  ~be_visitor_operation_arglist ();
 
   virtual int visit_operation (be_operation *node);
   virtual int visit_factory (be_factory *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
index ea31a1aaf4e..6ddf98cfad4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
@@ -33,7 +33,7 @@ public:
   be_visitor_operation_argument (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_argument (void);
+  ~be_visitor_operation_argument ();
 
   /// stuff to o/p after each element of the scope is handled
   virtual int post_process (be_decl *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
index 4828c66a4b1..46c5f0334d9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
@@ -35,7 +35,7 @@ public:
   be_visitor_operation_argument_invoke (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_argument_invoke (void);
+  ~be_visitor_operation_argument_invoke ();
 
   /// stuff to o/p before each element of the scope is handled
   virtual int pre_process (be_decl *bd);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
index 7e26cff6ce6..b0441621613 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
@@ -31,7 +31,7 @@ public:
   be_visitor_operation_argument_marshal (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_argument_marshal (void);
+  ~be_visitor_operation_argument_marshal ();
 
   /// stuff to o/p before each element of the scope is handled
   virtual int pre_process (be_decl *bd);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h
index ce17f859cc0..8a4a37e743b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h
@@ -28,7 +28,7 @@ public:
   be_visitor_operation_direct_proxy_impl_ss (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_direct_proxy_impl_ss (void);
+  ~be_visitor_operation_direct_proxy_impl_ss ();
 
   /// visit operation node.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
index c2f52642839..c2ef44f481f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
@@ -33,7 +33,7 @@ public:
   be_visitor_operation_exceptlist_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_exceptlist_cs (void);
+  ~be_visitor_operation_exceptlist_cs ();
 
   /// visit the operation
   int visit_operation (be_operation *node);
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 5052fd237f3..09a5a3eeb52 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
@@ -36,7 +36,7 @@ public:
   be_visitor_operation_exceptlist_ss (be_visitor_context * ctx);
 
   /// destructor
-  ~be_visitor_operation_exceptlist_ss (void);
+  ~be_visitor_operation_exceptlist_ss ();
 
   /// visit the operation
   int visit_operation (be_operation * node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
index a69ca530064..b41e2adfe36 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -32,7 +32,7 @@ public:
   be_visitor_operation (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation (void);
+  ~be_visitor_operation ();
 
   // =helper
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
index 3fd32942e60..79620cd71b6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
@@ -31,7 +31,7 @@ public:
   be_visitor_operation_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_ch (void);
+  ~be_visitor_operation_ch ();
 
   /// visit operation.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
index 67fb65ef842..843fc3c11b4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
@@ -31,7 +31,7 @@ public:
   be_visitor_operation_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_cs (void);
+  ~be_visitor_operation_cs ();
 
   /// visit operation.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
index 1a6e95c51bb..8d89781c20d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
@@ -30,7 +30,7 @@ class be_visitor_operation_exs : public be_visitor_scope
 public:
   be_visitor_operation_exs (be_visitor_context *ctx);
 
-  ~be_visitor_operation_exs (void);
+  ~be_visitor_operation_exs ();
 
   virtual int visit_operation (be_operation *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
index 752a4fd774a..11b4cd84301 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
@@ -31,7 +31,7 @@ public:
   be_visitor_operation_ih (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_ih (void);
+  ~be_visitor_operation_ih ();
 
   /// visit operation. We provide code for this method in the derived class
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
index 870fcd1bb81..b03de3f23b4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
@@ -31,7 +31,7 @@ public:
   be_visitor_operation_is (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_is (void);
+  ~be_visitor_operation_is ();
 
   /// visit operation. We provide code for this method in the derived class
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
index 7841f3a9066..2a081ad3c90 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
@@ -31,7 +31,7 @@ public:
   be_visitor_operation_sh (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_sh (void);
+  ~be_visitor_operation_sh ();
 
   /// visit operation.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
index e12a2a59669..80b971a25d0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
@@ -32,7 +32,7 @@ public:
   be_visitor_operation_ss (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_ss (void);
+  ~be_visitor_operation_ss ();
 
   /// visit operation. We provide code for this method in the derived class
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h
index 391bcfdf7d2..f739aaa5cc5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h
@@ -31,7 +31,7 @@ class be_visitor_operation_svs : public be_visitor_scope
 public:
   be_visitor_operation_svs (be_visitor_context *ctx);
 
-  ~be_visitor_operation_svs (void);
+  ~be_visitor_operation_svs ();
 
   virtual int visit_operation (be_operation *node);
   virtual int visit_argument (be_argument *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
index fd0555d206d..4c64e341371 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
@@ -28,7 +28,7 @@ public:
   be_visitor_operation_proxy_impl_xh (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_proxy_impl_xh (void);
+  ~be_visitor_operation_proxy_impl_xh ();
 
   /// visit operation.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
index 92138e2f332..e63c7c48cea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
@@ -32,7 +32,7 @@ public:
   be_visitor_operation_rettype (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_rettype (void);
+  ~be_visitor_operation_rettype ();
 
   /// visit an array node
   int visit_array (be_array *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
index 9462881b33c..25f367e66cb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
@@ -33,7 +33,7 @@ public:
   be_visitor_operation_rettype_return_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_rettype_return_cs (void);
+  ~be_visitor_operation_rettype_return_cs ();
 
   /// visit an array node
   int visit_array (be_array *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h
index 7111c0d3a56..5967764955f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h
@@ -33,7 +33,7 @@ public:
   be_visitor_operation_smart_proxy_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_smart_proxy_ch (void);
+  ~be_visitor_operation_smart_proxy_ch ();
 
   /// visit operation node.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h
index ae9032ad443..040bd528088 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h
@@ -30,7 +30,7 @@ public:
   be_visitor_operation_smart_proxy_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_smart_proxy_cs (void);
+  ~be_visitor_operation_smart_proxy_cs ();
 
   /// visit operation.
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
index a843454511b..d850c05d9eb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
@@ -32,7 +32,7 @@ public:
   be_visitor_operation_tie_sh (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_tie_sh (void);
+  ~be_visitor_operation_tie_sh ();
 
   /// set the right context and make a visitor
   virtual int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
index ad8831d311e..21c8b5e315d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
@@ -31,7 +31,7 @@ public:
   be_visitor_operation_tie_ss (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_operation_tie_ss (void);
+  ~be_visitor_operation_tie_ss ();
 
   /// set the right context and make a visitor
   virtual int visit_operation (be_operation *node);
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 10d6e7306ae..b35c5df1a10 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
@@ -23,7 +23,7 @@ public:
   be_visitor_operation_upcall_command_ss (be_visitor_context * ctx);
 
   /// destructor
-  ~be_visitor_operation_upcall_command_ss (void);
+  ~be_visitor_operation_upcall_command_ss ();
 
   /// Same as visit_operation() but override full_skel_name and
   /// upcall_command_name.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
index 31647f6923a..1012aec6909 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
@@ -28,7 +28,7 @@ class be_visitor_root_any_op : public be_visitor_root
 public:
   be_visitor_root_any_op (be_visitor_context *ctx);
 
-  ~be_visitor_root_any_op (void);
+  ~be_visitor_root_any_op ();
 
   virtual int visit_root (be_root *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
index 7dc9c68f544..646d97abc3f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
@@ -28,7 +28,7 @@ class be_visitor_root_cdr_op : public be_visitor_root
 public:
   be_visitor_root_cdr_op (be_visitor_context *ctx);
 
-  ~be_visitor_root_cdr_op (void);
+  ~be_visitor_root_cdr_op ();
 
   virtual int visit_root (be_root *node);
 };
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 cee348218ef..3322d73e1e3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
@@ -27,7 +27,7 @@ class be_visitor_root : public be_visitor_module
 public:
   be_visitor_root (be_visitor_context *ctx);
 
-  ~be_visitor_root (void);
+  ~be_visitor_root ();
 
   /// This is the only method that differs from that of the
   /// be_visitor_module bass class.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
index 501646291bc..3cf7f0ee1de 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
@@ -28,21 +28,21 @@ class be_visitor_root_ch : public be_visitor_root
 public:
   be_visitor_root_ch (be_visitor_context *ctx);
 
-  ~be_visitor_root_ch (void);
+  ~be_visitor_root_ch ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 
   /// Encapsulating various bits of code generation peculiar
   /// to the client header file, done either before or after
   /// the main scope traversal.
   int gen_arg_traits (be_root *node);
-  void gen_fwd_decls (void);
-  void gen_ref_counting_overrides (void);
-  void gen_static_corba_overrides (void);
+  void gen_fwd_decls ();
+  void gen_ref_counting_overrides ();
+  void gen_static_corba_overrides ();
   int gen_obv_decls (be_root *node);
   int gen_object_traits (be_root *node);
   int gen_template_exports (be_root *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
index d27a02b264c..7522d4f48a2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
@@ -28,13 +28,13 @@ class be_visitor_root_ci : public be_visitor_root
 public:
   be_visitor_root_ci (be_visitor_context *ctx);
 
-  ~be_visitor_root_ci (void);
+  ~be_visitor_root_ci ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 
   /// Generate OBV definitions in the client inline
   /// file, done after the main scope traversal.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h
index e3934f27152..0861de99d08 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h
@@ -28,13 +28,13 @@ class be_visitor_root_cnh : public be_visitor_root
 public:
   be_visitor_root_cnh (be_visitor_context *ctx);
 
-  ~be_visitor_root_cnh (void);
+  ~be_visitor_root_cnh ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_CNH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h
index aba97d8ca8d..0624821cd89 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h
@@ -28,12 +28,12 @@ class be_visitor_root_cns : public be_visitor_root
 public:
   be_visitor_root_cns (be_visitor_context *ctx);
 
-  ~be_visitor_root_cns (void);
+  ~be_visitor_root_cns ();
 
   virtual int visit_root (be_root *node);
 
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_CNS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
index 7b1d425ab19..46d255a924e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
@@ -28,13 +28,13 @@ class be_visitor_root_cs : public be_visitor_root
 public:
   be_visitor_root_cs (be_visitor_context *ctx);
 
-  ~be_visitor_root_cs (void);
+  ~be_visitor_root_cs ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 
   /// Encapsulating various bits of code generation peculiar
   /// to the client source file, done either before or after
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h
index 9f48060c23b..854795b07df 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h
@@ -28,13 +28,13 @@ class be_visitor_root_ex_idl : public be_visitor_root
 public:
   be_visitor_root_ex_idl (be_visitor_context *ctx);
 
-  ~be_visitor_root_ex_idl (void);
+  ~be_visitor_root_ex_idl ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_EX_IDL_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h
index f265526a375..c2fb5fcf70e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h
@@ -28,13 +28,13 @@ class be_visitor_root_exh : public be_visitor_root
 public:
   be_visitor_root_exh (be_visitor_context *ctx);
 
-  ~be_visitor_root_exh (void);
+  ~be_visitor_root_exh ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_EXH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h
index 10a24929673..4172a031627 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h
@@ -28,13 +28,13 @@ class be_visitor_root_exs : public be_visitor_root
 public:
   be_visitor_root_exs (be_visitor_context *ctx);
 
-  ~be_visitor_root_exs (void);
+  ~be_visitor_root_exs ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_EXS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h
index 7af2ca6939f..d8a37fa55bb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h
@@ -26,13 +26,13 @@ class be_visitor_root_ih : public be_visitor_root
 public:
   be_visitor_root_ih (be_visitor_context *ctx);
 
-  ~be_visitor_root_ih (void);
+  ~be_visitor_root_ih ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_IH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h
index 1228c06cea4..c41805268fc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h
@@ -26,13 +26,13 @@ class be_visitor_root_is : public be_visitor_root
 public:
   be_visitor_root_is (be_visitor_context *ctx);
 
-  ~be_visitor_root_is (void);
+  ~be_visitor_root_is ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_IS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
index eb69d3f11cb..db27baf64c1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
@@ -27,13 +27,13 @@ class be_visitor_root_sh : public be_visitor_root
 public:
   be_visitor_root_sh (be_visitor_context *ctx);
 
-  ~be_visitor_root_sh (void);
+  ~be_visitor_root_sh ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 
   /// Generate arg template trait specializations in
   /// the skeleton header file, done before the main
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
index f8ba08c106e..28d4c19288f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
@@ -27,13 +27,13 @@ class be_visitor_root_ss : public be_visitor_root
 public:
   be_visitor_root_ss (be_visitor_context *ctx);
 
-  ~be_visitor_root_ss (void);
+  ~be_visitor_root_ss ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h
index 2884d9459e9..7b22bac8e50 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h
@@ -28,7 +28,7 @@ class be_visitor_root_sth : public be_visitor_root
 public:
   be_visitor_root_sth (be_visitor_context *ctx);
 
-  ~be_visitor_root_sth (void);
+  ~be_visitor_root_sth ();
 
   virtual int visit_root (be_root *node);
 
@@ -40,7 +40,7 @@ public:
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_STH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h
index 8d1a21e2e96..1e56d0acec9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h
@@ -28,13 +28,13 @@ class be_visitor_root_svh : public be_visitor_root
 public:
   be_visitor_root_svh (be_visitor_context *ctx);
 
-  ~be_visitor_root_svh (void);
+  ~be_visitor_root_svh ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SVH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h
index 6d8202b0c5d..d9baf73eded 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h
@@ -28,13 +28,13 @@ class be_visitor_root_svs : public be_visitor_root
 public:
   be_visitor_root_svs (be_visitor_context *ctx);
 
-  ~be_visitor_root_svs (void);
+  ~be_visitor_root_svs ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Set the right context and make a visitor.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SVS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h
index 59abaf33ff5..9d557cb3c22 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h
@@ -28,13 +28,13 @@ class be_visitor_root_svth : public be_visitor_root
 public:
   be_visitor_root_svth (be_visitor_context *ctx);
 
-  ~be_visitor_root_svth (void);
+  ~be_visitor_root_svth ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SVTH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h
index 4b669c2118e..9dd2151e95e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h
@@ -28,13 +28,13 @@ class be_visitor_root_svts : public be_visitor_root
 public:
   be_visitor_root_svts (be_visitor_context *ctx);
 
-  ~be_visitor_root_svts (void);
+  ~be_visitor_root_svts ();
 
   virtual int visit_root (be_root *node);
 
 private:
   /// Set the right context and make a visitor.
-  int init (void);
+  int init ();
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SVTS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h
index 7c3b819b27b..2d6bce24001 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_scope.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_scope.h
@@ -31,7 +31,7 @@ public:
   be_visitor_scope (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_scope (void);
+  ~be_visitor_scope ();
 
   /// visit scope
   int visit_scope (be_scope *node);
@@ -44,7 +44,7 @@ public:
   virtual int pre_process (be_decl *);
 
   /// return the element number that is being processed
-  virtual int elem_number (void);
+  virtual int elem_number ();
 
   /// get the successor to elem
   virtual int next_elem (be_decl *elem, be_decl *&);
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 4cc76d38678..c1df47e39d3 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
@@ -32,7 +32,7 @@ public:
   be_visitor_sequence_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_sequence_any_op_ch (void);
+  ~be_visitor_sequence_any_op_ch ();
 
   /// visit sequence
   virtual int visit_sequence (be_sequence *node);
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 b96fa97cadb..916eaea173b 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
@@ -32,7 +32,7 @@ public:
   be_visitor_sequence_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_sequence_any_op_cs (void);
+  ~be_visitor_sequence_any_op_cs ();
 
   /// visit sequence
   virtual int visit_sequence (be_sequence *node);
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 10249ffc920..e43be03ecb5 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
@@ -31,7 +31,7 @@ public:
   be_visitor_sequence_buffer_type (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_sequence_buffer_type (void);
+  ~be_visitor_sequence_buffer_type ();
 
   // = Visitor methods.
   virtual int visit_predefined_type (be_predefined_type *node);
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 adec609812e..7d6ee5e5b29 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
@@ -32,7 +32,7 @@ public:
   be_visitor_sequence_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_sequence_cdr_op_ch (void);
+  ~be_visitor_sequence_cdr_op_ch ();
 
   /// visit sequence
   virtual int visit_sequence (be_sequence *node);
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 261e6a92479..530d6f85398 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
@@ -34,7 +34,7 @@ public:
   be_visitor_sequence_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_sequence_cdr_op_cs (void);
+  ~be_visitor_sequence_cdr_op_cs ();
 
   /// visit sequence
   virtual int visit_sequence (be_sequence *node);
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 3b6df9024ec..47313216b25 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
@@ -36,7 +36,7 @@ public:
   be_visitor_sequence_base (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_sequence_base (void);
+  ~be_visitor_sequence_base ();
 
   // = Visitor methods.
   virtual int visit_predefined_type (be_predefined_type *node);
@@ -80,7 +80,7 @@ public:
                                           be_sequence *node );
 
   ///Dtor
-  ~be_visitor_sequence_base_template_args (void);
+  ~be_visitor_sequence_base_template_args ();
 
   //= Visit methods
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
index 7c110967ce2..e4b106f3858 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
@@ -31,7 +31,7 @@ public:
   be_visitor_sequence_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_sequence_ch (void);
+  ~be_visitor_sequence_ch ();
 
   /// visit sequence node.
   virtual int visit_sequence (be_sequence *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
index c4b85929655..d6a6ba09009 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
@@ -32,7 +32,7 @@ public:
   be_visitor_sequence_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_sequence_cs (void);
+  ~be_visitor_sequence_cs ();
 
   /// visit sequence node
   virtual int visit_sequence (be_sequence *node);
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 ee0e57fdd13..c7d3270ab32 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
@@ -32,7 +32,7 @@ public:
   be_visitor_structure_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_structure_any_op_ch (void);
+  ~be_visitor_structure_any_op_ch ();
 
   /// 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 8a007981986..72d670410f6 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
@@ -32,7 +32,7 @@ public:
   be_visitor_structure_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_structure_any_op_cs (void);
+  ~be_visitor_structure_any_op_cs ();
 
   /// 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 3b93c14968b..a5d002c62e4 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
@@ -32,7 +32,7 @@ public:
   be_visitor_structure_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_structure_cdr_op_ch (void);
+  ~be_visitor_structure_cdr_op_ch ();
 
   /// 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 5b84cf62295..f307404d16a 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
@@ -32,7 +32,7 @@ public:
   be_visitor_structure_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_structure_cdr_op_cs (void);
+  ~be_visitor_structure_cdr_op_cs ();
 
   /// visit structure
   virtual int visit_structure (be_structure *node);
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 70054836d98..afc9cffa36e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
@@ -29,7 +29,7 @@ public:
   be_visitor_structure (be_visitor_context *ctx);
 
   /// destructureor
-  ~be_visitor_structure (void);
+  ~be_visitor_structure ();
 
   /// visit structure. We provide code for this method in the derived class
   virtual int visit_structure (be_structure *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
index 69f68c18def..bd08ad67e00 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
@@ -29,7 +29,7 @@ public:
   be_visitor_structure_ch (be_visitor_context *ctx);
 
   /// destructureor
-  ~be_visitor_structure_ch (void);
+  ~be_visitor_structure_ch ();
 
   /// visit structure. We provide code for this method in the derived class
   virtual int visit_structure (be_structure *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
index d3a9cd4e9b2..b31296115ab 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
@@ -29,7 +29,7 @@ public:
   be_visitor_structure_ci (be_visitor_context *ctx);
 
   /// destructureor
-  ~be_visitor_structure_ci (void);
+  ~be_visitor_structure_ci ();
 
   /// visit structure. We provide code for this method in the derived class
   virtual int visit_structure (be_structure *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
index 27238db835d..bc37fa3e55b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
@@ -29,7 +29,7 @@ public:
   be_visitor_structure_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_structure_cs (void);
+  ~be_visitor_structure_cs ();
 
   /// visit structure.
   virtual int visit_structure (be_structure *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h
index c01c8b17417..8325735282f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h
@@ -25,7 +25,7 @@ class be_visitor_structure_fwd_ch : public be_visitor_decl
 public:
   be_visitor_structure_fwd_ch (be_visitor_context *ctx);
 
-  ~be_visitor_structure_fwd_ch (void);
+  ~be_visitor_structure_fwd_ch ();
 
   virtual int visit_structure_fwd (be_structure_fwd *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_template_export.h b/TAO/TAO_IDL/be_include/be_visitor_template_export.h
index 6283dcf7382..a77fdd98b12 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_template_export.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_template_export.h
@@ -34,7 +34,7 @@ class be_visitor_template_export : public be_visitor_scope
 public:
   be_visitor_template_export (be_visitor_context *ctx);
 
-  virtual ~be_visitor_template_export (void);
+  virtual ~be_visitor_template_export ();
 
   virtual int visit_root (be_root *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_traits.h b/TAO/TAO_IDL/be_include/be_visitor_traits.h
index a5d1b3f4094..accc2411db1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_traits.h
@@ -25,7 +25,7 @@ class be_visitor_traits : public be_visitor_scope
 public:
   be_visitor_traits (be_visitor_context *ctx);
 
-  virtual ~be_visitor_traits (void);
+  virtual ~be_visitor_traits ();
 
   virtual int visit_root (be_root *node);
   virtual int visit_module (be_module *node);
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 a50ef718edf..6f6ae5b285b 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
@@ -26,7 +26,7 @@ class be_visitor_typecode_decl : public be_visitor_decl
 
 public:
   be_visitor_typecode_decl (be_visitor_context *ctx);
-  ~be_visitor_typecode_decl (void);
+  ~be_visitor_typecode_decl ();
 
   /// visit a generic be_type node.
   virtual int visit_type (be_type *node);
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 b2f551067ad..242f3b0c74e 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
@@ -35,7 +35,7 @@ class be_visitor_typecode_defn : public be_visitor_scope
 {
 public:
   be_visitor_typecode_defn (be_visitor_context *ctx);
-  ~be_visitor_typecode_defn (void);
+  ~be_visitor_typecode_defn ();
 
   virtual int visit_array (be_array *node);
   virtual int visit_interface (be_interface *node);
@@ -95,8 +95,8 @@ protected:
    * Utility methods to generate enclosing namespaces for
    * typecodes of bounded (w)strings, sequences and arrays.
    */
-  void gen_begin_NS_for_anon (void);
-  void gen_end_NS_for_anon (void);
+  void gen_begin_NS_for_anon ();
+  void gen_end_NS_for_anon ();
 
 protected:
 
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 d56e828a938..b56dc448931 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
@@ -33,7 +33,7 @@ public:
   be_visitor_typedef_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_typedef_any_op_ch (void);
+  ~be_visitor_typedef_any_op_ch ();
 
   /// visit typedef
   virtual int visit_typedef (be_typedef *node);
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 b9893f50635..aa4b7381f82 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
@@ -33,7 +33,7 @@ public:
   be_visitor_typedef_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_typedef_any_op_cs (void);
+  ~be_visitor_typedef_any_op_cs ();
 
   /// visit typedef
   virtual int visit_typedef (be_typedef *node);
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 08db072de62..087b3da6db2 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
@@ -32,7 +32,7 @@ public:
   be_visitor_typedef_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_typedef_cdr_op_ch (void);
+  ~be_visitor_typedef_cdr_op_ch ();
 
   /// visit typedef
   virtual int visit_typedef (be_typedef *node);
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 1c782481af2..10fc1214464 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
@@ -32,7 +32,7 @@ public:
   be_visitor_typedef_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_typedef_cdr_op_cs (void);
+  ~be_visitor_typedef_cdr_op_cs ();
 
   /// visit typedef
   virtual int visit_typedef (be_typedef *node);
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 2de5434f6c0..d287c2a4061 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
@@ -30,7 +30,7 @@ public:
   be_visitor_typedef (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_typedef (void);
+  ~be_visitor_typedef ();
 
   /// must be overridden
   virtual int visit_typedef (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
index ad27eb3dd52..8e88c8a599c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
@@ -30,7 +30,7 @@ public:
   be_visitor_typedef_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_typedef_ch (void);
+  ~be_visitor_typedef_ch ();
 
   /// visit typedef. We provide code for this method in the derived class
   virtual int visit_typedef (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
index 849f1ba2cbe..4580a68e7a0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
@@ -30,7 +30,7 @@ public:
   be_visitor_typedef_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_typedef_ci (void);
+  ~be_visitor_typedef_ci ();
 
   /// visit typedef. We provide code for this method in the derived class
   virtual int visit_typedef (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
index ae814c4ff69..83afa8278fd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
@@ -30,7 +30,7 @@ public:
   be_visitor_typedef_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_typedef_cs (void);
+  ~be_visitor_typedef_cs ();
 
   /// visit typedef. We provide code for this method in the derived class
   virtual int visit_typedef (be_typedef *node);
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 ff66c35eb52..3426539cbde 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
@@ -30,7 +30,7 @@ class be_visitor_union_any_op_ch : public be_visitor_union
 public:
   be_visitor_union_any_op_ch (be_visitor_context *ctx);
 
-  ~be_visitor_union_any_op_ch (void);
+  ~be_visitor_union_any_op_ch ();
 
   virtual int visit_union (be_union *node);
 
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 7c8bd1f0757..c8983f61874 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
@@ -30,7 +30,7 @@ class be_visitor_union_any_op_cs : public be_visitor_union
 public:
   be_visitor_union_any_op_cs (be_visitor_context *ctx);
 
-  ~be_visitor_union_any_op_cs (void);
+  ~be_visitor_union_any_op_cs ();
 
   virtual int visit_union (be_union *node);
 
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 f3a4c952259..1ce2eca9e79 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
@@ -32,7 +32,7 @@ public:
   be_visitor_union_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_cdr_op_ch (void);
+  ~be_visitor_union_cdr_op_ch ();
 
   /// visit union
   virtual int visit_union (be_union *node);
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 9ce9d00c75e..ecfbe0ef1a7 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
@@ -32,7 +32,7 @@ public:
   be_visitor_union_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_cdr_op_cs (void);
+  ~be_visitor_union_cdr_op_cs ();
 
   /// visit union
   virtual int visit_union (be_union *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
index 26a1c20e3ac..4264f931d36 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
@@ -31,7 +31,7 @@ public:
   be_visitor_union_discriminant_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_discriminant_ch (void);
+  ~be_visitor_union_discriminant_ch ();
 
   /// visit an enum
   virtual int visit_enum (be_enum *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
index 4397b39bfa5..eeb7f291462 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
@@ -31,7 +31,7 @@ public:
   be_visitor_union_discriminant_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_discriminant_ci (void);
+  ~be_visitor_union_discriminant_ci ();
 
   /// visit an enum
   virtual int visit_enum (be_enum *node);
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 3391c92ed24..037f3e95ada 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
@@ -31,7 +31,7 @@ public:
   be_visitor_union_discriminant_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_discriminant_cs (void);
+  ~be_visitor_union_discriminant_cs ();
 
   /// visit an enum. Required to generate the typecode for an enum definition
   /// appearing side the union
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union.h b/TAO/TAO_IDL/be_include/be_visitor_union/union.h
index c854e6e2e73..390655bc5f3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union.h
@@ -29,7 +29,7 @@ public:
   be_visitor_union (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union (void);
+  ~be_visitor_union ();
 
   /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
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 13cb7108fb3..a70a7905448 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
@@ -29,7 +29,7 @@ public:
   be_visitor_union_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_ch (void);
+  ~be_visitor_union_ch ();
 
   /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
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 2ec0e177681..c94dda604c1 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
@@ -29,7 +29,7 @@ public:
   be_visitor_union_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_ci (void);
+  ~be_visitor_union_ci ();
 
   /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
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 1ef3e1056dc..e7de0e48a79 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
@@ -29,7 +29,7 @@ public:
   be_visitor_union_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_cs (void);
+  ~be_visitor_union_cs ();
 
   /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
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 cedb2782d5a..af566f93483 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
@@ -28,7 +28,7 @@ public:
   be_visitor_union_branch_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_branch_cdr_op_ch (void);
+  ~be_visitor_union_branch_cdr_op_ch ();
 
   /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
index 20aa8847d06..6834916b463 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
@@ -28,7 +28,7 @@ public:
   be_visitor_union_branch_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_union_branch_cdr_op_cs (void);
+  ~be_visitor_union_branch_cdr_op_cs ();
 
   /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
@@ -50,7 +50,7 @@ public:
   virtual int visit_union (be_union *node);
 
   /// extra code generation for an explicit default case
-  virtual int explicit_default (void);
+  virtual int explicit_default ();
 
  private:
   int emit_valuetype_common (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
index 85845146063..b2a2272f31d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
@@ -28,7 +28,7 @@ class be_visitor_union_branch_private_ch : public be_visitor_decl
 {
 public:
   be_visitor_union_branch_private_ch (be_visitor_context *ctx);
-  ~be_visitor_union_branch_private_ch (void);
+  ~be_visitor_union_branch_private_ch ();
 
   virtual int visit_union_branch (be_union_branch *node);
 
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 79d3801b9f2..4159df97ac9 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
@@ -28,7 +28,7 @@ class be_visitor_union_branch_public_assign_cs
 {
 public:
   be_visitor_union_branch_public_assign_cs (be_visitor_context *ctx);
-  ~be_visitor_union_branch_public_assign_cs (void);
+  ~be_visitor_union_branch_public_assign_cs ();
 
   virtual int visit_union_branch (be_union_branch *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
index 9cbd194ff40..c8d55b282e0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
@@ -29,7 +29,7 @@ class be_visitor_union_branch_public_ch : public be_visitor_decl
 {
 public:
   be_visitor_union_branch_public_ch (be_visitor_context *ctx);
-  ~be_visitor_union_branch_public_ch (void);
+  ~be_visitor_union_branch_public_ch ();
 
   virtual int visit_union_branch (be_union_branch *node);
 
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 496c5c2e748..4667b8f4801 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
@@ -27,7 +27,7 @@ class be_visitor_union_branch_public_ci : public be_visitor_decl
 {
 public:
   be_visitor_union_branch_public_ci (be_visitor_context *ctx);
-  ~be_visitor_union_branch_public_ci (void);
+  ~be_visitor_union_branch_public_ci ();
 
   virtual int visit_union_branch (be_union_branch *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
index c30d1d0955a..2490a42ea32 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
@@ -25,7 +25,7 @@ class be_visitor_union_branch_public_constructor_cs : public be_visitor_decl
 {
 public:
   be_visitor_union_branch_public_constructor_cs (be_visitor_context *ctx);
-  ~be_visitor_union_branch_public_constructor_cs (void);
+  ~be_visitor_union_branch_public_constructor_cs ();
 
   virtual int visit_union_branch (be_union_branch *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
index 99fa4686efa..805d29f620c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
@@ -28,7 +28,7 @@ class be_visitor_union_branch_public_cs : public be_visitor_decl
 {
 public:
   be_visitor_union_branch_public_cs (be_visitor_context *ctx);
-  ~be_visitor_union_branch_public_cs (void);
+  ~be_visitor_union_branch_public_cs ();
 
   virtual int visit_union_branch (be_union_branch *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
index 64cea01a6f5..763de71c464 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
@@ -27,7 +27,7 @@ class be_visitor_union_branch_public_reset_cs : public be_visitor_decl
 {
 public:
   be_visitor_union_branch_public_reset_cs (be_visitor_context *ctx);
-  ~be_visitor_union_branch_public_reset_cs (void);
+  ~be_visitor_union_branch_public_reset_cs ();
 
   virtual int visit_union_branch (be_union_branch *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h
index 2d68892a6d2..96c3e7a7f5c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h
@@ -25,7 +25,7 @@ class be_visitor_union_fwd_ch : public be_visitor_decl
 public:
   be_visitor_union_fwd_ch (be_visitor_context *ctx);
 
-  ~be_visitor_union_fwd_ch (void);
+  ~be_visitor_union_fwd_ch ();
 
   virtual int visit_union_fwd (be_union_fwd *node);
 };
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 23bf51ed796..080cc5ae17b 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
@@ -30,7 +30,7 @@ public:
   be_visitor_valuebox_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_any_op_ch (void);
+  ~be_visitor_valuebox_any_op_ch ();
 
   /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
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 f218e2a22ad..cd90d608340 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
@@ -30,7 +30,7 @@ public:
   be_visitor_valuebox_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_any_op_cs (void);
+  ~be_visitor_valuebox_any_op_cs ();
 
   /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
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 aec6458437e..8b0036312bb 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
@@ -31,7 +31,7 @@ public:
   be_visitor_valuebox_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_cdr_op_ch (void);
+  ~be_visitor_valuebox_cdr_op_ch ();
 
   /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
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 c3b5a917306..37bf0fadb88 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
@@ -31,7 +31,7 @@ public:
   be_visitor_valuebox_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_cdr_op_cs (void);
+  ~be_visitor_valuebox_cdr_op_cs ();
 
   /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
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 38b0b3b0b31..34fefe71189 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
@@ -36,7 +36,7 @@ public:
   be_visitor_valuebox_field_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_field_ch (void);
+  ~be_visitor_valuebox_field_ch ();
 
   /// visit the union_branch node
   virtual int visit_field (be_field *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h
index d4670541979..809f453fbd7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h
@@ -31,7 +31,7 @@ public:
   be_visitor_valuebox_field_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_field_ci (void);
+  ~be_visitor_valuebox_field_ci ();
 
   /// visit the field node
   virtual int visit_field (be_field *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h
index fab13fc5d84..896e8b55351 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h
@@ -31,7 +31,7 @@ public:
   be_visitor_valuebox_union_member_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_union_member_ci (void);
+  ~be_visitor_valuebox_union_member_ci ();
 
   /// visit the field node
   virtual int visit_union_member (be_union_branch *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h
index b3709563f2f..1b2323c35fa 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h
@@ -28,7 +28,7 @@ public:
   be_visitor_valuebox (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox (void);
+  ~be_visitor_valuebox ();
 
   /// visit attribute. We provide code for this method in the derived class
   virtual int visit_valuebox (be_valuebox *node);
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 118a9668d65..a51de1e2bf3 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
@@ -29,7 +29,7 @@ public:
   be_visitor_valuebox_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_ch (void);
+  ~be_visitor_valuebox_ch ();
 
   /// visit valuebox.
   virtual int visit_valuebox (be_valuebox *node);
@@ -66,14 +66,14 @@ private:
                            const char * type_suffix,
                            bool is_any);
 
-  void emit_default_constructor (void);
+  void emit_default_constructor ();
 
   void emit_constructor_one_arg (be_decl *node,
                                  const char * type_suffix,
                                  const char * const_prefix,
                                  const char * ref_modifier);
 
-  void emit_copy_constructor (void);
+  void emit_copy_constructor ();
 
   void emit_assignment (be_decl *node,
                         const char * type_suffix,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
index 49dfaa4068d..9648cd6d43f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
@@ -29,7 +29,7 @@ public:
   be_visitor_valuebox_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_ci (void);
+  ~be_visitor_valuebox_ci ();
 
   /// visit valuebox.
   virtual int visit_valuebox (be_valuebox *node);
@@ -66,7 +66,7 @@ private:
                             const char * type_suffix,
                             bool is_any);
 
-  void emit_default_constructor (void);
+  void emit_default_constructor ();
 
   void emit_default_constructor_alloc (be_decl *node);
 
@@ -75,7 +75,7 @@ private:
 
   void emit_constructor_one_arg_alloc (be_decl *node);
 
-  void emit_copy_constructor (void);
+  void emit_copy_constructor ();
 
   void emit_copy_constructor_alloc (be_decl *node);
 
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 e796c1609f9..04f7d3c99f7 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
@@ -29,7 +29,7 @@ public:
   be_visitor_valuebox_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuebox_cs (void);
+  ~be_visitor_valuebox_cs ();
 
   /// visit valuebox.
   virtual int visit_valuebox (be_valuebox *node);
@@ -64,7 +64,7 @@ public:
 private:
 
   /// Generate virtual destructor.
-  void emit_destructor (void);
+  void emit_destructor ();
 
   int emit_for_predef_enum (char const * marshal_arg);
 
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 f5cc50396c7..8e3bb6945de 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
@@ -30,7 +30,7 @@ public:
   be_visitor_valuetype_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_any_op_ch (void);
+  ~be_visitor_valuetype_any_op_ch ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
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 93f11d5405e..59592143bf3 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
@@ -30,7 +30,7 @@ public:
   be_visitor_valuetype_any_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_any_op_cs (void);
+  ~be_visitor_valuetype_any_op_cs ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
index d2e366c65ab..72e09aa5740 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
@@ -30,7 +30,7 @@ public:
   be_visitor_obv_operation_arglist (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_obv_operation_arglist (void);
+  ~be_visitor_obv_operation_arglist ();
 
   /// special arglist generation for amh_exceptionholders
   bool is_amh_exception_holder (be_operation *node);
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 c4348820b8b..524ff9818ce 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
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_cdr_op_ch (void);
+  ~be_visitor_valuetype_cdr_op_ch ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *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 dfa3e35af76..8edf6514674 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
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_cdr_op_cs (void);
+  ~be_visitor_valuetype_cdr_op_cs ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h
index ad2c3f30bb8..a3f1302dac6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h
@@ -29,7 +29,7 @@ public:
   be_visitor_valuetype_field_cdr_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_field_cdr_ch (void);
+  ~be_visitor_valuetype_field_cdr_ch ();
 
   /// visit the field node
   virtual int visit_field (be_field *node);
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 1af6277b317..c85bb564e38 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
@@ -29,7 +29,7 @@ public:
   be_visitor_valuetype_field_cdr_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_field_cdr_cs (void);
+  ~be_visitor_valuetype_field_cdr_cs ();
 
   /// visit the field node
   virtual int visit_field (be_field *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
index 1d84862b461..cfe51a9af28 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
@@ -30,7 +30,7 @@ public:
   be_visitor_valuetype_field_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_field_ch (void);
+  ~be_visitor_valuetype_field_ch ();
 
   /// visit the field node
   virtual int visit_field (be_field *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
index 6a8153cac77..461bd00d1b8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_field_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_field_ci (void);
+  ~be_visitor_valuetype_field_ci ();
 
   /// visit the field node
   virtual int visit_field (be_field *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
index 856acd77c00..4680215ca15 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_field_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_field_cs (void);
+  ~be_visitor_valuetype_field_cs ();
 
   /// visit the field node
   virtual int visit_field (be_field *node);
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 4908c95737e..4363664d7db 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
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_marshal_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_marshal_ch (void);
+  ~be_visitor_valuetype_marshal_ch ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
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 c6024fa7087..8e23ed10fbe 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
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_marshal_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_marshal_cs (void);
+  ~be_visitor_valuetype_marshal_cs ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
index b25cce5d72f..60bbde6b4e2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
@@ -31,7 +31,7 @@ public:
   be_visitor_obv_module (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_obv_module (void);
+  ~be_visitor_obv_module ();
 
   virtual int visit_module (be_module *node);
 
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 6e5e5677ac8..fe09e70ad43 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
@@ -32,7 +32,7 @@ public:
   be_visitor_valuetype (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype (void);
+  ~be_visitor_valuetype ();
 
 public:
   /// visit the scope of the valuetype node
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
index 8affb65795e..290ea60d68d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
@@ -32,7 +32,7 @@ public:
   be_visitor_valuetype_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_ch (void);
+  ~be_visitor_valuetype_ch ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
@@ -40,8 +40,8 @@ public:
   virtual int visit_operation (be_operation *node);
   virtual int visit_field (be_field *node);
 
-  void begin_public (void);
-  void begin_private (void);
+  void begin_public ();
+  void begin_private ();
 
   /// Helper method passed to the template method to generate code for
   /// the operations of the parents of supported interfaces.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
index a0c02219945..47f4bd861b6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
@@ -28,7 +28,7 @@ public:
   be_visitor_valuetype_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_ci (void);
+  ~be_visitor_valuetype_ci ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
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 df723ab6b93..44e785a5013 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
@@ -26,7 +26,7 @@ class be_visitor_valuetype_cs : public be_visitor_valuetype
 public:
   be_visitor_valuetype_cs (be_visitor_context *ctx);
 
-  ~be_visitor_valuetype_cs (void);
+  ~be_visitor_valuetype_cs ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
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 fae38511a86..9157b6c534c 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
@@ -30,12 +30,12 @@ public:
   be_visitor_valuetype_init (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_init (void);
+  ~be_visitor_valuetype_init ();
 
 public:
 
-  void begin_public (void);
-  void begin_private (void);
+  void begin_public ();
+  void begin_private ();
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_INIT_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
index b9fc5cd7511..2aea1d11f76 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
@@ -29,7 +29,7 @@ public:
   be_visitor_valuetype_init_arglist_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_init_arglist_ch (void);
+  ~be_visitor_valuetype_init_arglist_ch ();
 
   /// visit factory construct
   virtual int visit_factory (be_factory *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
index 2d0ad7cff51..74c73677e06 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_init_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_init_ch (void);
+  ~be_visitor_valuetype_init_ch ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
index 93860a85d62..29c2cff6601 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_init_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_init_ci (void);
+  ~be_visitor_valuetype_init_ci ();
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
index fdc1e72a47b..674284dda70 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
@@ -31,7 +31,7 @@ public:
   be_visitor_valuetype_init_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_init_cs (void);
+  ~be_visitor_valuetype_init_cs ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
index 19b66bd1533..5fa1dd5cce6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
@@ -34,7 +34,7 @@ public:
   be_visitor_valuetype_obv_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_obv_ch (void);
+  ~be_visitor_valuetype_obv_ch ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
index fcd6bb5dbc7..232a30cb445 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
@@ -34,7 +34,7 @@ public:
   be_visitor_valuetype_obv_ci (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_obv_ci (void);
+  ~be_visitor_valuetype_obv_ci ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
index 29e984c2758..f05ac4cd831 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
@@ -30,7 +30,7 @@ public:
   be_visitor_valuetype_obv_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_obv_cs (void);
+  ~be_visitor_valuetype_obv_cs ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
index a51a01244fc..fb1d2e30603 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
@@ -28,7 +28,7 @@ public:
   be_visitor_valuetype_sh (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_sh (void);
+  ~be_visitor_valuetype_sh ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
index 0c844fae670..b28f0f8f191 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
@@ -29,7 +29,7 @@ public:
   be_visitor_valuetype_ss (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_ss (void);
+  ~be_visitor_valuetype_ss ();
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
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 4df1ecf1d02..1bb2b44360f 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
@@ -30,7 +30,7 @@ public:
   be_visitor_valuetype_fwd_any_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_fwd_any_op_ch (void);
+  ~be_visitor_valuetype_fwd_any_op_ch ();
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
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 8835cc726de..0a3761bf5f2 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
@@ -33,7 +33,7 @@ public:
   be_visitor_valuetype_fwd_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_fwd_cdr_op_ch (void);
+  ~be_visitor_valuetype_fwd_cdr_op_ch ();
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
index b19b47a1eb2..1b86d70af06 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
@@ -28,7 +28,7 @@ public:
   be_visitor_valuetype_fwd_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_valuetype_fwd_ch (void);
+  ~be_visitor_valuetype_fwd_ch ();
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h
index 0bcf140d4e8..4050b455279 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h
@@ -28,7 +28,7 @@ class be_visitor_xplicit_pre_proc : public be_visitor_ccm_pre_proc
 public:
   be_visitor_xplicit_pre_proc (be_visitor_context *ctx);
 
-  virtual ~be_visitor_xplicit_pre_proc (void);
+  virtual ~be_visitor_xplicit_pre_proc ();
 
   virtual int visit_home (be_home *node);
 
@@ -61,7 +61,7 @@ public:
   virtual int visit_predefined_type (be_predefined_type *node);
 
   // Member accessor
-  be_interface *xplicit (void) const;
+  be_interface *xplicit () const;
 
 private:
   void check_and_store (AST_Decl *node);
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index f2ef45176fa..94b811bb67a 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -118,7 +118,7 @@ DRV_prep_cpp_arg (char *s)
 
 // Print a usage message and exit.
 void
-DRV_usage (void)
+DRV_usage ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("%C: usage: %C [[flag|file] ...] [-- file ...]\n"),
@@ -184,7 +184,7 @@ void
 DRV_parse_args (long ac, char **av)
 {
   ACE_CString buffer;
-  char *s = 0;
+  char *s = nullptr;
   long i;
   bool has_space = false;
 
@@ -512,7 +512,7 @@ DRV_parse_args (long ac, char **av)
   be_util::arg_post_proc ();
 
   // Make sure the output directory is valid.
-  if (idl_global->temp_dir () == 0)
+  if (idl_global->temp_dir () == nullptr)
     {
       ACE_TCHAR tmpdir[MAXPATHLEN + 1];
 
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index f23ea5c2d7d..3e02a5c4ac1 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -90,9 +90,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // Storage for preprocessor args.
 unsigned long const DRV_MAX_ARGCOUNT = 1024;
 unsigned long DRV_argcount = 0;
-ACE_TCHAR const * DRV_arglist[DRV_MAX_ARGCOUNT] = { 0 };
+ACE_TCHAR const * DRV_arglist[DRV_MAX_ARGCOUNT] = { nullptr };
 
-static char const * output_arg_format = 0;
+static char const * output_arg_format = nullptr;
 static long output_arg_index = 0;
 
 ACE_TCHAR const TCHAR_DIR_DOT[] = ACE_TEXT(".");
@@ -112,7 +112,7 @@ static char tmp_ifile[MAXPATHLEN + 1] = { 0 };
 // Lines can be 1024 chars long intially -
 // it will expand as required.
 #define LINEBUF_SIZE 1024
-char* drv_line = 0;
+char* drv_line = nullptr;
 static size_t drv_line_size = LINEBUF_SIZE + 1;
 
 // Push the new CPP location if we got a -Yp argument.
@@ -140,7 +140,7 @@ DRV_cpp_putarg (const char *str)
 
   if (str && ACE_OS::strchr (str, ' '))
     {
-      ACE_TCHAR *buf = 0;
+      ACE_TCHAR *buf = nullptr;
       ACE_NEW_NORETURN (buf, ACE_TCHAR[ACE_OS::strlen (str) + 3]);
       if (buf)
         {
@@ -161,11 +161,11 @@ DRV_cpp_putarg (const char *str)
 void
 DRV_cpp_expand_output_arg (const char *filename)
 {
-  if (output_arg_format != 0)
+  if (output_arg_format != nullptr)
     {
       ACE::strdelete (const_cast<ACE_TCHAR *> (
                         DRV_arglist[output_arg_index]));
-      DRV_arglist[output_arg_index] = 0;
+      DRV_arglist[output_arg_index] = nullptr;
 
       ACE_NEW (DRV_arglist[output_arg_index],
                ACE_TCHAR [ACE_OS::strlen (output_arg_format)
@@ -181,11 +181,11 @@ DRV_cpp_expand_output_arg (const char *filename)
 
 // calculate the total size of all commandline arguments
 unsigned int
-DRV_cpp_calc_total_argsize(void)
+DRV_cpp_calc_total_argsize()
 {
   unsigned long size = 0;
   unsigned long ix = 0;
-  while (DRV_arglist[ix] != 0)
+  while (DRV_arglist[ix] != nullptr)
     {
       size += ACE_Utils::truncate_cast<unsigned long> (ACE_OS::strlen (DRV_arglist[ix]) + 1);
       ++ix;
@@ -233,7 +233,7 @@ DRV_get_line (FILE *file)
         {
           // Create a bigger buffer
           size_t temp_size = drv_line_size * 2;
-          char *temp = 0;
+          char *temp = nullptr;
           ACE_NEW_RETURN (temp, char [temp_size], false);
           ACE_OS::strcpy (temp, drv_line);
           delete [] drv_line;
@@ -251,7 +251,7 @@ DRV_get_line (FILE *file)
 
 // Initialize the cpp argument list.
 void
-DRV_cpp_init (void)
+DRV_cpp_init ()
 {
   // Create the line buffer.
   // (JP) Deleting this at the end or DRV_pre_proc() causes
@@ -280,7 +280,7 @@ DRV_cpp_init (void)
   const char *platform_cpp_args =
     FE_get_cpp_args_from_env ();
 
-  if (platform_cpp_args == 0)
+  if (platform_cpp_args == nullptr)
     {
       // If no cpp flag was defined by the user, we define some
       // platform specific flags here.
@@ -298,11 +298,11 @@ DRV_cpp_init (void)
 
       char* TAO_ROOT = ACE_OS::getenv ("TAO_ROOT");
 
-      if (TAO_ROOT != 0)
+      if (TAO_ROOT != nullptr)
         {
             DRV_add_include_path (include_path1,
                                   TAO_ROOT,
-                                  0,
+                                  nullptr,
                                   true);
 
             DRV_add_include_path (include_path2,
@@ -314,7 +314,7 @@ DRV_cpp_init (void)
         {
           char* ACE_ROOT = ACE_OS::getenv ("ACE_ROOT");
 
-          if (ACE_ROOT != 0)
+          if (ACE_ROOT != nullptr)
             {
               DRV_add_include_path (include_path1,
                                     ACE_ROOT,
@@ -343,7 +343,7 @@ DRV_cpp_init (void)
 #else
               DRV_add_include_path (include_path1,
                                     ".",
-                                    0,
+                                    nullptr,
                                     true);
 #endif  /* TAO_IDL_INCLUDE_DIR */
             }
@@ -360,13 +360,13 @@ DRV_cpp_init (void)
     {
       // Check for an argument that specifies
       // the preprocessor's output file.
-      if (ACE_OS::strstr (platform_arglist[i], ACE_TEXT ("%s")) != 0
-          && output_arg_format == 0)
+      if (ACE_OS::strstr (platform_arglist[i], ACE_TEXT ("%s")) != nullptr
+          && output_arg_format == nullptr)
         {
           output_arg_format =
             ACE::strnew (ACE_TEXT_ALWAYS_CHAR (platform_arglist[i]));
           output_arg_index = DRV_argcount;
-          DRV_cpp_putarg (0);
+          DRV_cpp_putarg (nullptr);
         }
       else
         {
@@ -381,7 +381,7 @@ DRV_sweep_dirs (const char *rel_path,
 {
   // Zero rel_path means we're not using this option, and
   // so we become a no-op.
-  if (rel_path == 0)
+  if (rel_path == nullptr)
     {
       return 0;
     }
@@ -400,9 +400,9 @@ DRV_sweep_dirs (const char *rel_path,
   bname += rel_path;
   bool include_added = false;
   char abspath[MAXPATHLEN] = "";
-  char *full_path = 0;
+  char *full_path = nullptr;
 
-  for (ACE_DIRENT *dir_entry; (dir_entry = dir.read ()) != 0;)
+  for (ACE_DIRENT *dir_entry; (dir_entry = dir.read ()) != nullptr;)
     {
       // Skip the ".." and "." files in each directory.
       if (ACE::isdotdir (dir_entry->d_name) == true)
@@ -448,7 +448,7 @@ DRV_sweep_dirs (const char *rel_path,
                   idl_global->add_rel_include_path (bname.c_str ());
                   full_path = ACE_OS::realpath ("", abspath);
 
-                  if (full_path != 0)
+                  if (full_path != nullptr)
                     {
                       idl_global->add_include_path (full_path,
                                                     false);
@@ -492,7 +492,7 @@ DRV_add_include_path (ACE_CString& include_path,
                       const char *suffix,
                       bool is_system)
 {
-  if (path == 0)
+  if (path == nullptr)
     {
       return include_path;
     }
@@ -530,7 +530,7 @@ DRV_add_include_path (ACE_CString& include_path,
                    ) )
                 );
 
-  if (suffix != 0)
+  if (suffix != nullptr)
     {
       if (!include_path.length ()
           && ((nativeDir == *suffix) || (foreignDir == *suffix)))
@@ -580,7 +580,7 @@ DRV_add_include_path (ACE_CString& include_path,
 // Adds additional include paths, but after parse_args() has
 // added user-defined include paths.
 void
-DRV_cpp_post_init (void)
+DRV_cpp_post_init ()
 {
   // Add include path for TAO_ROOT/orbsvcs.
   char* TAO_ROOT = ACE_OS::getenv ("TAO_ROOT");
@@ -589,7 +589,7 @@ DRV_cpp_post_init (void)
 
   // When adding new dirs here don't forget to update
   // FE_Utils::validate_orb_include accordingly.
-  if (TAO_ROOT != 0)
+  if (TAO_ROOT != nullptr)
     {
       DRV_add_include_path (include_path3,
                             TAO_ROOT,
@@ -601,7 +601,7 @@ DRV_cpp_post_init (void)
       // If TAO_ROOT isn't defined, assume it's under ACE_ROOT.
       char* ACE_ROOT = ACE_OS::getenv ("ACE_ROOT");
 
-      if (ACE_ROOT != 0)
+      if (ACE_ROOT != nullptr)
         {
           DRV_add_include_path (include_path3,
                                 ACE_ROOT,
@@ -620,7 +620,7 @@ DRV_cpp_post_init (void)
           // be a warning from DRV_preproc().
           DRV_add_include_path (include_path3,
                                 ".",
-                                0,
+                                nullptr,
                                 true);
 #endif  /* TAO_IDL_INCLUDE_DIR */
         }
@@ -631,11 +631,11 @@ DRV_cpp_post_init (void)
 
   // When adding new dirs here don't forget to update
   // FE_Utils::validate_orb_include accordingly.
-  if (CIAO_ROOT != 0)
+  if (CIAO_ROOT != nullptr)
     {
       DRV_add_include_path (include_path4,
                             CIAO_ROOT,
-                            0,
+                            nullptr,
                             true);
 
       DRV_add_include_path (include_path5,
@@ -656,7 +656,7 @@ DRV_cpp_post_init (void)
   // have to be restored.
   char cwd_path[MAXPATHLEN];
 
-  if (ACE_OS::getcwd (cwd_path, sizeof (cwd_path)) == 0)
+  if (ACE_OS::getcwd (cwd_path, sizeof (cwd_path)) == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   "DRV_cpp_post_init: ACE_OS::getcwd failed\n"));
@@ -906,15 +906,15 @@ namespace
 } // End of local/internal namespace
 
 void
-DRV_get_orb_idl_includes (void)
+DRV_get_orb_idl_includes ()
 {
   static char const orb_idl[] = "tao/orb.idl";
 
  // Search for orb.idl in supplied include file search paths.
-  char const * directory = 0;
+  char const * directory = nullptr;
   FILE * fp = FE_Utils::open_included_file (orb_idl, directory);
 
-  if (fp == 0)
+  if (fp == nullptr)
     {
       // Fall back on $TAO_ROOT/tao/orb.idl if orb.idl is not in the
       // include path.
@@ -924,7 +924,7 @@ DRV_get_orb_idl_includes (void)
 
       fp = ACE_OS::fopen (orb_idl_path.c_str (), "r");
 
-      if (fp == 0)
+      if (fp == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       "TAO_IDL: cannot open or find file: %C\n",
@@ -959,7 +959,7 @@ DRV_copy_input (FILE *fin,
                 const char *fn,
                 const char *orig_filename)
 {
-  if (f == 0)
+  if (f == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   "%C: cannot open temp file \"%C\" for copying from \"%C\": %p\n",
@@ -970,7 +970,7 @@ DRV_copy_input (FILE *fin,
       throw Bailout ();
     }
 
-  if (fin == 0)
+  if (fin == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   "%C: cannot open input file\n",
@@ -1035,9 +1035,9 @@ DRV_stripped_name (char *fn)
     char *n = fn;
     size_t l;
 
-    if (n == 0)
+    if (n == nullptr)
       {
-        return 0;
+        return nullptr;
       }
 
     l = ACE_OS::strlen (n);
@@ -1132,13 +1132,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 == 0)
+  if (file == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Unable to open file : %p\n",
+                  "%C: ERROR: Unable to open file : %p\n",
                   idl_global->prog_name (),
                   myfile));
 
@@ -1153,7 +1152,7 @@ DRV_pre_proc (const char *myfile)
                   myfile);
   ACE_OS::fclose (file);
 
-  UTL_String *utl_string = 0;
+  UTL_String *utl_string = nullptr;
 
 #if defined (ACE_OPENVMS)
   {
@@ -1187,13 +1186,13 @@ DRV_pre_proc (const char *myfile)
 
   ACE_Auto_String_Free safety (ACE_OS::strdup (myfile));
 
-  UTL_String *stripped_tmp = 0;
+  UTL_String *stripped_tmp = nullptr;
   ACE_NEW (stripped_tmp,
            UTL_String (DRV_stripped_name (safety.get ()), true));
 
   idl_global->set_stripped_filename (stripped_tmp);
 
-  UTL_String *real_tmp = 0;
+  UTL_String *real_tmp = nullptr;
   ACE_NEW (real_tmp,
            UTL_String (t_ifile, true));
 
@@ -1205,14 +1204,14 @@ DRV_pre_proc (const char *myfile)
 
   DRV_cpp_expand_output_arg (t_file);
   DRV_cpp_putarg (t_ifile);
-  DRV_cpp_putarg (0); // Null terminate the DRV_arglist.
+  DRV_cpp_putarg (nullptr); // Null terminate the DRV_arglist.
 
   // For complex builds, the default
   // command line buffer size of 1024
   // is often not enough. We determine
   // the required space and arg nr
   // dynamically here.
-  ACE_Process_Options cpp_options (1,       // Inherit environment.
+  ACE_Process_Options cpp_options (true,       // Inherit environment.
                                    DRV_cpp_calc_total_argsize (),
                                    16 * 1024,
                                    512,
@@ -1267,7 +1266,7 @@ DRV_pre_proc (const char *myfile)
 
   ACE_HANDLE fd = ACE_INVALID_HANDLE;
 
-  if (output_arg_format == 0)
+  if (output_arg_format == nullptr)
     {
       // If the following open() fails, then we're either being hit with a
       // symbolic link attack, or another process opened the file before
@@ -1348,7 +1347,7 @@ DRV_pre_proc (const char *myfile)
   DRV_argcount -= 2;
   ACE::strdelete (
     const_cast<ACE_TCHAR *> (DRV_arglist[DRV_argcount]));
-  DRV_arglist[DRV_argcount] = 0;
+  DRV_arglist[DRV_argcount] = nullptr;
   ACE_exitcode status = 0;
 
   if (process.wait (&status) == ACE_INVALID_PID)
@@ -1407,7 +1406,7 @@ DRV_pre_proc (const char *myfile)
 
   FILE * const yyin = ACE_OS::fopen (t_file, "r");
 
-  if (yyin == 0)
+  if (yyin == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   "%C: Could not open cpp "
@@ -1428,7 +1427,7 @@ DRV_pre_proc (const char *myfile)
       char buffer[ACE_MAXLOGMSGLEN];
       size_t bytes;
 
-      if (preproc == 0)
+      if (preproc == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       "%C: Could not open cpp "
diff --git a/TAO/TAO_IDL/fe/fe_component_header.cpp b/TAO/TAO_IDL/fe/fe_component_header.cpp
index 0fc0f6e1355..f7a8a4f2795 100644
--- a/TAO/TAO_IDL/fe/fe_component_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_component_header.cpp
@@ -20,42 +20,42 @@ FE_ComponentHeader::FE_ComponentHeader (UTL_ScopedName *n,
                         false,
                         false,
                         false),
-    base_component_ (0)
+    base_component_ (nullptr)
 {
   this->compile_inheritance (base_component);
   this->compile_supports (supports);
 }
 
-FE_ComponentHeader::~FE_ComponentHeader (void)
+FE_ComponentHeader::~FE_ComponentHeader ()
 {
 }
 
 AST_Component *
-FE_ComponentHeader::base_component (void) const
+FE_ComponentHeader::base_component () const
 {
   return this->base_component_;
 }
 
 AST_Type **
-FE_ComponentHeader::supports (void) const
+FE_ComponentHeader::supports () const
 {
   return this->inherits_;
 }
 
 long
-FE_ComponentHeader::n_supports (void) const
+FE_ComponentHeader::n_supports () const
 {
   return this->n_inherits_;
 }
 
 AST_Interface **
-FE_ComponentHeader::supports_flat (void) const
+FE_ComponentHeader::supports_flat () const
 {
   return this->inherits_flat_;
 }
 
 long
-FE_ComponentHeader::n_supports_flat (void) const
+FE_ComponentHeader::n_supports_flat () const
 {
   return this->n_inherits_flat_;
 }
@@ -65,7 +65,7 @@ FE_ComponentHeader::compile_inheritance (UTL_ScopedName *base_component)
 {
   // If there is a base component, look up the decl and assign our member.
   // We also inherit its supported interfaces.
-  if (base_component == 0)
+  if (base_component == nullptr)
     {
       return;
     }
@@ -74,7 +74,7 @@ FE_ComponentHeader::compile_inheritance (UTL_ScopedName *base_component)
   AST_Decl *d = s->lookup_by_name (base_component,
                                    true);
 
-  if (d == 0)
+  if (d == nullptr)
     {
       idl_global->err ()->lookup_error (base_component);
 
@@ -85,12 +85,12 @@ FE_ComponentHeader::compile_inheritance (UTL_ScopedName *base_component)
 
   if (d->node_type () == AST_Decl::NT_typedef)
     {
-      d = AST_Typedef::narrow_from_decl (d)->primitive_base_type ();
+      d = dynamic_cast<AST_Typedef*> (d)->primitive_base_type ();
     }
 
-  this->base_component_ = AST_Component::narrow_from_decl (d);
+  this->base_component_ = dynamic_cast<AST_Component*> (d);
 
-  if (this->base_component_ == 0)
+  if (this->base_component_ == nullptr)
     {
       idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_USE,
                                   d);
@@ -101,22 +101,22 @@ FE_ComponentHeader::compile_inheritance (UTL_ScopedName *base_component)
                               this->name (),
                               this->base_component_
                             );
-      this->base_component_ = 0;
+      this->base_component_ = nullptr;
     }
 }
 
 void
 FE_ComponentHeader::compile_supports (UTL_NameList *supports)
 {
-  if (supports == 0)
+  if (supports == nullptr)
     {
       return;
     }
 
-  AST_Decl *d = 0;
-  UTL_ScopedName *item = 0;
-  AST_Interface *iface = 0;
-  AST_Type *t = 0;
+  AST_Decl *d = nullptr;
+  UTL_ScopedName *item = nullptr;
+  AST_Interface *iface = nullptr;
+  AST_Type *t = nullptr;
   long j = 0;
   long k = 0;
 
@@ -128,7 +128,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
       item = l.item ();
 
       // Check that scope stack is valid.
-      if (idl_global->scopes ().top () == 0)
+      if (idl_global->scopes ().top () == nullptr)
         {
           idl_global->err ()->lookup_error (item);
 
@@ -142,20 +142,20 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
 
       d = s->lookup_by_name  (item, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           AST_Decl *sad = ScopeAsDecl (s);
 
           if (sad->node_type () == AST_Decl::NT_module)
             {
-              AST_Module *m = AST_Module::narrow_from_decl (sad);
+              AST_Module *m = dynamic_cast<AST_Module*> (sad);
 
               d = m->look_in_prev_mods_local (item->last_component ());
             }
         }
 
       // Not found?
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (item);
 
@@ -167,15 +167,15 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
       // Remove typedefs, if any.
       if (d->node_type () == AST_Decl::NT_typedef)
         {
-          d = AST_Typedef::narrow_from_decl (d)->primitive_base_type ();
+          d = dynamic_cast<AST_Typedef*> (d)->primitive_base_type ();
         }
 
       AST_Decl::NodeType nt = d->node_type ();
-      t = AST_Type::narrow_from_decl (d);
+      t = dynamic_cast<AST_Type*> (d);
 
       if (nt == AST_Decl::NT_interface)
         {
-          iface = AST_Interface::narrow_from_decl (d);
+          iface = dynamic_cast<AST_Interface*> (d);
 
           // Undefined interface?
           if (!iface->is_defined ())
@@ -200,7 +200,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
       else if (nt == AST_Decl::NT_param_holder)
         {
           AST_Param_Holder *ph =
-            AST_Param_Holder::narrow_from_decl (d);
+            dynamic_cast<AST_Param_Holder*> (d);
 
           nt = ph->info ()->type_;
 
diff --git a/TAO/TAO_IDL/fe/fe_declarator.cpp b/TAO/TAO_IDL/fe/fe_declarator.cpp
index d0de342fbb5..0bfee7929b2 100644
--- a/TAO/TAO_IDL/fe/fe_declarator.cpp
+++ b/TAO/TAO_IDL/fe/fe_declarator.cpp
@@ -87,23 +87,23 @@ FE_Declarator::FE_Declarator (UTL_ScopedName *n,
 AST_Type *
 FE_Declarator::compose (AST_Decl *d)
 {
-  AST_Type *ct = AST_Type::narrow_from_decl (d);
+  AST_Type *ct = dynamic_cast<AST_Type*> (d);
 
-  if (ct == 0)
+  if (ct == nullptr)
     {
       idl_global->err ()->not_a_type (d);
-      return 0;
+      return nullptr;
     }
   else if (ct->node_type () == AST_Decl::NT_param_holder)
     {
       AST_Param_Holder *ph =
-        AST_Param_Holder::narrow_from_decl (ct);
+        dynamic_cast<AST_Param_Holder*> (ct);
 
       // Every other template parameter kind is legal.
       if (ph->info ()->type_ == AST_Decl::NT_const)
         {
           idl_global->err ()->not_a_type (d);
-          return 0;
+          return nullptr;
         }
     }
 
@@ -119,11 +119,11 @@ FE_Declarator::compose (AST_Decl *d)
           idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_ADD,
                                       d);
 
-          return 0;
+          return nullptr;
         }
     }
 
-  AST_Array *arr = 0;
+  AST_Array *arr = nullptr;
 
   // All uses of forward declared types must
   // not have a different prefix from the place of declaration.
@@ -138,7 +138,7 @@ FE_Declarator::compose (AST_Decl *d)
           scope = ScopeAsDecl (scope->defined_in ());
 
           // Are we at global scope?
-          if (scope == 0)
+          if (scope == nullptr)
             {
               break;
             }
@@ -171,14 +171,14 @@ FE_Declarator::compose (AST_Decl *d)
       */
     }
 
-  if (this->pd_decl_type == FD_simple || this->pd_complex_part == 0)
+  if (this->pd_decl_type == FD_simple || this->pd_complex_part == nullptr)
     {
       return ct;
     }
 
   if (this->pd_complex_part->node_type () == AST_Decl::NT_array)
     {
-      arr = AST_Array::narrow_from_decl (this->pd_complex_part);
+      arr = dynamic_cast<AST_Array*> (this->pd_complex_part);
 
       // The base type of an array isn't set until after the array
       // has been created, so the check below gets done at this point.
@@ -194,36 +194,36 @@ FE_Declarator::compose (AST_Decl *d)
     }
 
   // We shouldn't get here.
-  return 0;
+  return nullptr;
 }
 
 void
-FE_Declarator::destroy (void)
+FE_Declarator::destroy ()
 {
   if (pd_name)
     {
       this->pd_name->destroy ();
       delete this->pd_name;
-      this->pd_name = 0;
+      this->pd_name = nullptr;
     }
 }
 
 // Data accessors.
 
 AST_Decl *
-FE_Declarator::complex_part (void)
+FE_Declarator::complex_part ()
 {
   return this->pd_complex_part;
 }
 
 UTL_ScopedName *
-FE_Declarator::name (void)
+FE_Declarator::name ()
 {
   return this->pd_name;
 }
 
 FE_Declarator::DeclaratorType
-FE_Declarator::decl_type (void)
+FE_Declarator::decl_type ()
 {
   return this->pd_decl_type;
 }
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
index 440d81cdc3c..0acc50532f7 100644
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ b/TAO/TAO_IDL/fe/fe_extern.cpp
@@ -77,7 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ace/UUID.h"
 
-extern int tao_yyparse (void);
+extern int tao_yyparse ();
 
 #ifdef USE_MCPP_BUFFER_LEXING
 char *tao_preproc_buffer = 0;
@@ -88,7 +88,7 @@ extern FILE *tao_yyin;
 #endif /* USE_MCPP_BUFFER_LEXING */
 
 int
-FE_yyparse (void)
+FE_yyparse ()
 {
   int const result = tao_yyparse ();
 
@@ -130,23 +130,23 @@ FE_set_yyin (FILE * f)
 // Constructor interfaces.
 
 UTL_Error *
-FE_new_UTL_Error (void)
+FE_new_UTL_Error ()
 {
-  UTL_Error *retval = 0;
+  UTL_Error *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   UTL_Error,
-                  0);
+                  nullptr);
 
   return retval;
 }
 
 UTL_Indenter *
-FE_new_UTL_Indenter (void)
+FE_new_UTL_Indenter ()
 {
-  UTL_Indenter *retval = 0;
+  UTL_Indenter *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   UTL_Indenter,
-                  0);
+                  nullptr);
 
   return retval;
 }
diff --git a/TAO/TAO_IDL/fe/fe_global.cpp b/TAO/TAO_IDL/fe/fe_global.cpp
index dc644b404a4..d863dcb9b11 100644
--- a/TAO/TAO_IDL/fe/fe_global.cpp
+++ b/TAO/TAO_IDL/fe/fe_global.cpp
@@ -1,3 +1,3 @@
 #include "global_extern.h"
 
-IDL_GlobalData *idl_global = 0;
+IDL_GlobalData *idl_global = nullptr;
diff --git a/TAO/TAO_IDL/fe/fe_home_header.cpp b/TAO/TAO_IDL/fe/fe_home_header.cpp
index 2fd9f9a1f3c..f5268bba4e8 100644
--- a/TAO/TAO_IDL/fe/fe_home_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_home_header.cpp
@@ -15,11 +15,11 @@ FE_HomeHeader::FE_HomeHeader (UTL_ScopedName *n,
                               UTL_ScopedName *managed_component,
                               UTL_ScopedName *primary_key)
   : FE_ComponentHeader (n,
-                        0,
+                        nullptr,
                         supports,
                         false),
-    base_home_ (0),
-    primary_key_ (0)
+    base_home_ (nullptr),
+    primary_key_ (nullptr)
 {
   // No need to call compile_supports(), it got done in
   // the call to the base class FE_ComponentHeader.
@@ -28,24 +28,24 @@ FE_HomeHeader::FE_HomeHeader (UTL_ScopedName *n,
   this->compile_primary_key (primary_key);
 }
 
-FE_HomeHeader::~FE_HomeHeader (void)
+FE_HomeHeader::~FE_HomeHeader ()
 {
 }
 
 AST_Home *
-FE_HomeHeader::base_home (void) const
+FE_HomeHeader::base_home () const
 {
   return this->base_home_;
 }
 
 AST_Component *
-FE_HomeHeader::managed_component (void) const
+FE_HomeHeader::managed_component () const
 {
   return this->managed_component_;
 }
 
 AST_Type *
-FE_HomeHeader::primary_key (void) const
+FE_HomeHeader::primary_key () const
 {
   return this->primary_key_;
 }
@@ -53,7 +53,7 @@ FE_HomeHeader::primary_key (void) const
 void
 FE_HomeHeader::compile_inheritance (UTL_ScopedName *base_home)
 {
-  if (base_home == 0)
+  if (base_home == nullptr)
     {
       return;
     }
@@ -62,7 +62,7 @@ FE_HomeHeader::compile_inheritance (UTL_ScopedName *base_home)
   AST_Decl *d = s->lookup_by_name (base_home,
                                    true);
 
-  if (d == 0)
+  if (d == nullptr)
     {
       idl_global->err ()->lookup_error (base_home);
 
@@ -73,12 +73,12 @@ FE_HomeHeader::compile_inheritance (UTL_ScopedName *base_home)
 
   if (d->node_type () == AST_Decl::NT_typedef)
     {
-      d = AST_Typedef::narrow_from_decl (d)->primitive_base_type ();
+      d = dynamic_cast<AST_Typedef*> (d)->primitive_base_type ();
     }
 
-  this->base_home_ = AST_Home::narrow_from_decl (d);
+  this->base_home_ = dynamic_cast<AST_Home*> (d);
 
-  if (this->base_home_ == 0)
+  if (this->base_home_ == nullptr)
     {
       idl_global->err ()->inheritance_error (this->name (), d);
     }
@@ -88,7 +88,7 @@ void
 FE_HomeHeader::compile_managed_component (
   UTL_ScopedName *mc_name)
 {
-  if (mc_name == 0)
+  if (mc_name == nullptr)
     {
       return;
     }
@@ -97,7 +97,7 @@ FE_HomeHeader::compile_managed_component (
   AST_Decl *d = s->lookup_by_name (mc_name,
                                    true);
 
-  if (d == 0)
+  if (d == nullptr)
     {
       idl_global->err ()->lookup_error (mc_name);
 
@@ -108,12 +108,12 @@ FE_HomeHeader::compile_managed_component (
 
   if (d->node_type () == AST_Decl::NT_typedef)
     {
-      d = AST_Typedef::narrow_from_decl (d)->primitive_base_type ();
+      d = dynamic_cast<AST_Typedef*> (d)->primitive_base_type ();
     }
 
-  this->managed_component_ = AST_Component::narrow_from_decl (d);
+  this->managed_component_ = dynamic_cast<AST_Component*> (d);
 
-  if (this->managed_component_ == 0)
+  if (this->managed_component_ == nullptr)
     {
       idl_global->err ()->error1 (UTL_Error::EIDL_ILLEGAL_USE,
                                   d);
@@ -123,7 +123,7 @@ FE_HomeHeader::compile_managed_component (
 void
 FE_HomeHeader::compile_primary_key (UTL_ScopedName *primary_key)
 {
-  if (primary_key == 0)
+  if (primary_key == nullptr)
     {
       return;
     }
@@ -132,7 +132,7 @@ FE_HomeHeader::compile_primary_key (UTL_ScopedName *primary_key)
   AST_Decl *d = s->lookup_by_name (primary_key,
                                    true);
 
-  if (d == 0)
+  if (d == nullptr)
     {
       idl_global->err ()->lookup_error (primary_key);
 
@@ -145,12 +145,12 @@ FE_HomeHeader::compile_primary_key (UTL_ScopedName *primary_key)
 
   if (nt == AST_Decl::NT_typedef)
     {
-      d = AST_Typedef::narrow_from_decl (d)->primitive_base_type ();
+      d = dynamic_cast<AST_Typedef*> (d)->primitive_base_type ();
     }
 
-  this->primary_key_ = AST_Type::narrow_from_decl (d);
+  this->primary_key_ = dynamic_cast<AST_Type*> (d);
 
-  if (this->primary_key_ == 0)
+  if (this->primary_key_ == nullptr)
     {
       idl_global->err ()->valuetype_expected (d);
     }
@@ -163,7 +163,7 @@ FE_HomeHeader::compile_primary_key (UTL_ScopedName *primary_key)
           case AST_Decl::NT_param_holder:
             {
               AST_Param_Holder *ph =
-                AST_Param_Holder::narrow_from_decl (d);
+                dynamic_cast<AST_Param_Holder*> (d);
 
               nt = ph->info ()->type_;
 
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index ce7b65beb8b..24c8284bf4d 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -79,17 +79,17 @@ const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024;
 
 // Populate the global scope with all predefined entities.
 void
-fe_populate_global_scope (void)
+fe_populate_global_scope ()
 {
   // No need to created a scoped name for the basic types, the
   // AST_PredefinedType constructor will do that.
 
-  AST_PredefinedType *pdt = 0;
+  AST_PredefinedType *pdt = nullptr;
   AST_Root *root =
-    AST_Root::narrow_from_scope (idl_global->root ());
+    dynamic_cast<AST_Root*> (idl_global->root ());
 
   Identifier void_id ("void");
-  UTL_ScopedName void_name (&void_id, 0);
+  UTL_ScopedName void_name (&void_id, nullptr);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
@@ -104,7 +104,7 @@ fe_populate_global_scope (void)
   idl_global->pragma_prefixes ().push (prefix);
 
   Identifier corba_id ("CORBA");
-  UTL_ScopedName sn (&corba_id, 0);
+  UTL_ScopedName sn (&corba_id, nullptr);
 
   AST_Module *m =
     idl_global->gen ()->create_module (root, &sn);
@@ -115,103 +115,103 @@ fe_populate_global_scope (void)
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_long,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_ulong,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_longlong,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type(pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_ulonglong,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_short,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_ushort,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_float,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_double,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_longdouble,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_char,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_wchar,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_octet,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_any,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_boolean,
-      0);
+      nullptr);
 
   m->fe_add_predefined_type (pdt);
 
   Identifier Object_id ("Object");
-  UTL_ScopedName Object_name (&Object_id, 0);
+  UTL_ScopedName Object_name (&Object_id, nullptr);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
@@ -223,7 +223,7 @@ fe_populate_global_scope (void)
 // Add these to make all keywords protected even in different spellings
 
   Identifier ValueBase_id ("ValueBase");
-  UTL_ScopedName ValueBase_name (&ValueBase_id, 0);
+  UTL_ScopedName ValueBase_name (&ValueBase_id, nullptr);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
@@ -233,7 +233,7 @@ fe_populate_global_scope (void)
   m->fe_add_predefined_type (pdt);
 
   Identifier AbstractBase_id ("AbstractBase");
-  UTL_ScopedName AbstractBase_name (&AbstractBase_id, 0);
+  UTL_ScopedName AbstractBase_name (&AbstractBase_id, nullptr);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
@@ -243,7 +243,7 @@ fe_populate_global_scope (void)
   m->fe_add_predefined_type (pdt);
 
   Identifier TypeCode_id ("TypeCode");
-  UTL_ScopedName TypeCode_name (&TypeCode_id, 0);
+  UTL_ScopedName TypeCode_name (&TypeCode_id, nullptr);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
@@ -252,7 +252,7 @@ fe_populate_global_scope (void)
 
   m->fe_add_predefined_type (pdt);
 
-  char *trash = 0;
+  char *trash = nullptr;
   idl_global->pragma_prefixes ().pop (trash);
   ACE::strdelete (trash);
 }
@@ -260,7 +260,7 @@ fe_populate_global_scope (void)
 // Populate idl_global's hash map with upper case versions of
 // all the IDL keywords
 void
-fe_populate_idl_keywords (void)
+fe_populate_idl_keywords ()
 {
   static const char *keywords[] =
     {
@@ -353,26 +353,26 @@ fe_populate_idl_keywords (void)
 
 // FE initialization
 void
-FE_init (void)
+FE_init ()
 {
   // Initialize FE global data object.
   ACE_NEW (idl_global,
            IDL_GlobalData);
 
   // Initialize some of its data.
-  idl_global->set_root (0);
-  idl_global->set_gen (0);
+  idl_global->set_root (nullptr);
+  idl_global->set_gen (nullptr);
   idl_global->set_err (FE_new_UTL_Error ());
   idl_global->set_err_count (0);
   idl_global->set_indent (FE_new_UTL_Indenter ());
-  idl_global->set_filename (0);
-  idl_global->set_main_filename (0);
-  idl_global->set_real_filename (0);
-  idl_global->set_stripped_filename (0);
+  idl_global->set_filename (nullptr);
+  idl_global->set_main_filename (nullptr);
+  idl_global->set_real_filename (nullptr);
+  idl_global->set_stripped_filename (nullptr);
   idl_global->set_import (true);
   idl_global->set_in_main_file (false);
   idl_global->set_lineno (-1);
-  idl_global->set_prog_name (0);
+  idl_global->set_prog_name (nullptr);
 
   char local_escapes[LOCAL_ESCAPES_BUFFER_SIZE];
   ACE_OS::memset (&local_escapes,
@@ -381,7 +381,7 @@ FE_init (void)
 
   idl_global->set_local_escapes (local_escapes);
   idl_global->set_compile_flags (0);
-  idl_global->set_include_file_names (0);
+  idl_global->set_include_file_names (nullptr);
   idl_global->set_n_include_file_names (0);
   idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
   idl_global->preserve_cpp_keywords (false);
@@ -391,12 +391,12 @@ FE_init (void)
 }
 
 void
-FE_populate (void)
+FE_populate ()
 {
-  AST_Root *r = 0;
+  AST_Root *r = nullptr;
 
   // Check that the BE init created a generator object
-  if (idl_global->gen () == 0)
+  if (idl_global->gen () == nullptr)
     {
       ACE_ERROR ((
           LM_ERROR,
@@ -408,11 +408,11 @@ FE_populate (void)
 
   // Create a global root for the AST. Note that the AST root has no name.
   Identifier root_id ("");
-  UTL_ScopedName root_name (&root_id, 0);
+  UTL_ScopedName root_name (&root_id, nullptr);
   r = idl_global->gen ()->create_root (&root_name);
   idl_global->set_root (r);
 
-  if (r == 0)
+  if (r == nullptr)
     {
       ACE_ERROR ((
           LM_ERROR,
@@ -439,10 +439,10 @@ void
 FE_extract_env_include_paths (ACE_Unbounded_Queue<ACE_CString> &list)
 {
   ACE_Env_Value<char*> incl_paths (ACE_TEXT ("INCLUDE"),
-                                   (char *) 0);
+                                   (char *) nullptr);
   const char *aggr_str = incl_paths;
 
-  if (aggr_str != 0)
+  if (aggr_str != nullptr)
     {
       char separator;
 #if defined (ACE_WIN32)
@@ -464,12 +464,12 @@ FE_extract_env_include_paths (ACE_Unbounded_Queue<ACE_CString> &list)
 
 // Store include paths from the environment variable, if any.
 void
-FE_store_env_include_paths (void)
+FE_store_env_include_paths ()
 {
   ACE_Unbounded_Queue<ACE_CString> list;
   FE_extract_env_include_paths (list);
 
-  ACE_CString *path_tmp = 0;
+  ACE_CString *path_tmp = nullptr;
   for (ACE_Unbounded_Queue_Iterator<ACE_CString>iter (list);
        !iter.done (); iter.advance ())
     {
@@ -481,13 +481,13 @@ FE_store_env_include_paths (void)
 }
 
 const char *
-FE_get_cpp_loc_from_env (void)
+FE_get_cpp_loc_from_env ()
 {
-  const char *cpp_loc = 0;
+  const char *cpp_loc = nullptr;
 
   // See if TAO_IDL_PREPROCESSOR is defined.
   ACE_Env_Value<char*> preprocessor (ACE_TEXT ("TAO_IDL_PREPROCESSOR"),
-                                     (char *) 0);
+                                     (char *) nullptr);
 
   // Set cpp_loc to the built in location, unless it has been overriden by
   // environment variables.
@@ -499,7 +499,7 @@ FE_get_cpp_loc_from_env (void)
     {
       // Check for the deprecated CPP_LOCATION environment variable
       ACE_Env_Value<char*> cpp_path (ACE_TEXT ("CPP_LOCATION"),
-                                     (char *) 0);
+                                     (char *) nullptr);
 
       if (cpp_path != 0)
         {
@@ -521,13 +521,13 @@ FE_get_cpp_loc_from_env (void)
 }
 
 const char *
-FE_get_cpp_args_from_env (void)
+FE_get_cpp_args_from_env ()
 {
-  const char *cpp_args = 0;
+  const char *cpp_args = nullptr;
 
   // Added some customizable preprocessor options
   ACE_Env_Value<char*> args1 (ACE_TEXT ("TAO_IDL_PREPROCESSOR_ARGS"),
-                              (char *) 0);
+                              (char *) nullptr);
 
   if (args1 != 0)
     {
@@ -538,7 +538,7 @@ FE_get_cpp_args_from_env (void)
       // Check for the deprecated TAO_IDL_DEFAULT_CPP_FLAGS environment
       // variable.
       ACE_Env_Value<char*> args2 (ACE_TEXT ("TAO_IDL_DEFAULT_CPP_FLAGS"),
-                                  (char *) 0);
+                                  (char *) nullptr);
 
       if (args2 != 0)
         {
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 95c990a523a..fbf3b33693a 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -139,14 +139,14 @@ FE_InterfaceHeader::FE_InterfaceHeader (UTL_ScopedName *n,
                                         bool compile_now)
   : interface_name_ (n),
     has_template_parent_ (false),
-    inherits_ (0),
+    inherits_ (nullptr),
     n_inherits_ (0),
-    inherits_flat_ (0),
+    inherits_flat_ (nullptr),
     n_inherits_flat_ (0),
     is_local_ (is_local),
     is_abstract_ (is_abstract),
-    iseen_ (0),
-    iseen_flat_ (0),
+    iseen_ (nullptr),
+    iseen_flat_ (nullptr),
     iallocated_ (0),
     iused_ (0),
     iallocated_flat_ (0),
@@ -159,30 +159,30 @@ FE_InterfaceHeader::FE_InterfaceHeader (UTL_ScopedName *n,
     }
 }
 
-FE_InterfaceHeader::~FE_InterfaceHeader (void)
+FE_InterfaceHeader::~FE_InterfaceHeader ()
 {
 }
 
 bool
-FE_InterfaceHeader::is_local (void) const
+FE_InterfaceHeader::is_local () const
 {
   return this->is_local_;
 }
 
 bool
-FE_InterfaceHeader::is_abstract (void) const
+FE_InterfaceHeader::is_abstract () const
 {
   return this->is_abstract_;
 }
 
 void
-FE_InterfaceHeader::destroy (void)
+FE_InterfaceHeader::destroy ()
 {
-  if (0 != this->interface_name_)
+  if (nullptr != this->interface_name_)
     {
       this->interface_name_->destroy ();
       delete this->interface_name_;
-      this->interface_name_ = 0;
+      this->interface_name_ = nullptr;
     }
 
   delete [] this->iseen_;
@@ -194,7 +194,7 @@ void
 FE_InterfaceHeader::compile_one_inheritance (AST_Type *i)
 {
   // Check for badly formed interface.
-  if (i == 0)
+  if (i == nullptr)
     {
       return;
     }
@@ -209,9 +209,9 @@ FE_InterfaceHeader::compile_one_inheritance (AST_Type *i)
   this->add_inheritance (i);
 
   AST_Interface *iface =
-    AST_Interface::narrow_from_decl (i);
+    dynamic_cast<AST_Interface*> (i);
 
-  if (iface == 0)
+  if (iface == nullptr)
     {
       // If a template parameter as parent appears at any time,
       // we bag the flat list until instantiation time.
@@ -233,9 +233,9 @@ FE_InterfaceHeader::compile_one_inheritance (AST_Type *i)
       for (long j = 0; j < num_parents; ++j)
         {
           AST_Interface *tmp =
-            AST_Interface::narrow_from_decl (parents[j]);
+            dynamic_cast<AST_Interface*> (parents[j]);
 
-          if (tmp == 0)
+          if (tmp == nullptr)
             {
               // If a template parameter as parent appears at any time,
               // we bag the flat list until instantiation time.
@@ -261,14 +261,14 @@ void
 FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
                                          bool for_valuetype)
 {
-  if (ifaces == 0)
+  if (ifaces == nullptr)
     {
       return;
     }
 
-  AST_Decl *d = 0;
-  UTL_ScopedName *item = 0;
-  AST_Interface *i = 0;
+  AST_Decl *d = nullptr;
+  UTL_ScopedName *item = nullptr;
+  AST_Interface *i = nullptr;
 
   // Compute expanded flattened non-repeating list of interfaces
   // which this one inherits from.
@@ -282,7 +282,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
       UTL_Scope *s = idl_global->scopes ().top ();
 
       // Check that scope stack is valid.
-      if (s == 0)
+      if (s == nullptr)
         {
           idl_global->err ()->lookup_error (item);
 
@@ -296,36 +296,36 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
                               true); // full_def_only
 
        // Undefined interface?
-      if (0 == d)
+      if (nullptr == d)
         {
           // If the lookup now succeeds, without the full_def_only
           // constraint, it's an error.
           d = s->lookup_by_name (item, false);
 
-          if (0 != d)
+          if (nullptr != d)
             {
               idl_global->err ()->inheritance_fwd_error (
                                       this->interface_name_,
-                                      AST_Interface::narrow_from_decl (d)
+                                      dynamic_cast<AST_Interface*> (d)
                                     );
               break;
             }
         }
 
-     if (0 == d)
+     if (nullptr == d)
         {
           AST_Decl *sad = ScopeAsDecl (s);
 
           if (sad->node_type () == AST_Decl::NT_module)
             {
-              AST_Module *m = AST_Module::narrow_from_decl (sad);
+              AST_Module *m = dynamic_cast<AST_Module*> (sad);
 
               d = m->look_in_prev_mods_local (item->last_component ());
             }
         }
 
       // Not found?
-      if (0 == d)
+      if (nullptr == d)
         {
           idl_global->err ()->lookup_error (item);
 
@@ -339,12 +339,12 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
       // Not an appropriate interface?
       if (nt == AST_Decl::NT_typedef)
         {
-          d = AST_Typedef::narrow_from_decl (d)->primitive_base_type ();
+          d = dynamic_cast<AST_Typedef*> (d)->primitive_base_type ();
         }
 
-      i = AST_Interface::narrow_from_decl (d);
+      i = dynamic_cast<AST_Interface*> (d);
 
-      if (i != 0)
+      if (i != nullptr)
         {
           if (this->check_inherit (i, for_valuetype) == -1)
             {
@@ -364,7 +364,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
       else if (nt == AST_Decl::NT_param_holder)
         {
           AST_Param_Holder *ph =
-            AST_Param_Holder::narrow_from_decl (d);
+            dynamic_cast<AST_Param_Holder*> (d);
 
           nt = ph->info ()->type_;
 
@@ -390,7 +390,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
       // OK, see if we have to add this to the list of interfaces
       // inherited from.
       this->compile_one_inheritance (
-        AST_Type::narrow_from_decl (d));
+        dynamic_cast<AST_Type*> (d));
     }
 
   // OK, install in interface header.
@@ -403,7 +403,7 @@ FE_InterfaceHeader::check_inherit (AST_Interface *i,
 {
   // We use the narrow instead of node_type() here so we can get a
   // match with both valuetypes and eventtypes.
-  bool is_valuetype = (AST_ValueType::narrow_from_decl (i) != 0);
+  bool is_valuetype = (dynamic_cast<AST_ValueType*> (i) != nullptr);
 
   if (
       // Non-local interfaces may not inherit from local ones.
@@ -424,7 +424,7 @@ FE_InterfaceHeader::check_inherit (AST_Interface *i,
 void
 FE_InterfaceHeader::add_inheritance (AST_Type *i)
 {
-  AST_Type  **oiseen = 0;
+  AST_Type  **oiseen = nullptr;
 
   // Make sure there's space for one more.
   if (this->iallocated_ == this->iused_)
@@ -461,7 +461,7 @@ FE_InterfaceHeader::add_inheritance (AST_Type *i)
 void
 FE_InterfaceHeader::add_inheritance_flat (AST_Interface *i)
 {
-  AST_Interface **oiseen_flat = 0;
+  AST_Interface **oiseen_flat = nullptr;
 
   // Make sure there's space for one more.
   if (this->iallocated_flat_ == this->iused_flat_)
@@ -499,21 +499,21 @@ bool
 FE_InterfaceHeader::already_seen (AST_Type *ip)
 {
   AST_Param_Holder *ph =
-    AST_Param_Holder::narrow_from_decl (ip);
+    dynamic_cast<AST_Param_Holder*> (ip);
 
   for (long i = 0; i < this->iused_; ++i)
     {
       AST_Param_Holder *tmp =
-        AST_Param_Holder::narrow_from_decl (this->iseen_[i]);
+        dynamic_cast<AST_Param_Holder*> (this->iseen_[i]);
 
-      if (ph != 0 && tmp != 0)
+      if (ph != nullptr && tmp != nullptr)
         {
           if (ph->info ()->name_ == tmp->info ()->name_)
             {
               idl_global->err ()->duplicate_param_id (ph->name ());
               ph->destroy ();
               delete ph;
-              ph = 0;
+              ph = nullptr;
               return true;
             }
         }
@@ -542,7 +542,7 @@ FE_InterfaceHeader::already_seen_flat (AST_Interface *ip)
 }
 
 void
-FE_InterfaceHeader::install_in_header (void)
+FE_InterfaceHeader::install_in_header ()
 {
   long j = 0;
   long k = 0;
@@ -579,42 +579,42 @@ FE_InterfaceHeader::install_in_header (void)
 // Data accessors.
 
 UTL_ScopedName *
-FE_InterfaceHeader::name (void) const
+FE_InterfaceHeader::name () const
 {
   return this->interface_name_;
 }
 
 AST_Type **
-FE_InterfaceHeader::inherits (void) const
+FE_InterfaceHeader::inherits () const
 {
   return this->inherits_;
 }
 
 long
-FE_InterfaceHeader::n_inherits (void) const
+FE_InterfaceHeader::n_inherits () const
 {
   return this->n_inherits_;
 }
 
 AST_Interface **
-FE_InterfaceHeader::inherits_flat (void) const
+FE_InterfaceHeader::inherits_flat () const
 {
   return this->inherits_flat_;
 }
 
 long
-FE_InterfaceHeader::n_inherits_flat (void) const
+FE_InterfaceHeader::n_inherits_flat () const
 {
   return this->n_inherits_flat_;
 }
 
 void
-FE_InterfaceHeader::destroy_flat_arrays (void)
+FE_InterfaceHeader::destroy_flat_arrays ()
 {
   delete [] this->inherits_flat_;
-  this->inherits_flat_ = 0;
+  this->inherits_flat_ = nullptr;
   delete [] this->iseen_flat_;
-  this->iseen_flat_ = 0;
+  this->iseen_flat_ = nullptr;
   this->n_inherits_flat_ = 0;
   this->iallocated_flat_ = 0;
   this->iused_flat_ = 0;
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index 9a130541e72..2756a6bd529 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -43,134 +43,134 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
 
   static const struct TAO_IDL_CPP_Keyword_Entry wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"delete",  "_cxx_delete"},
       {"mutable",  "_cxx_mutable"},
-      {"",0},
+      {"",nullptr},
       {"enum",  "_cxx_enum"},
-      {"",0},
+      {"",nullptr},
       {"double",  "_cxx_double"},
       {"do",  "_cxx_do"},
       {"unsigned",  "_cxx_unsigned"},
-      {"",0},
+      {"",nullptr},
       {"union",  "_cxx_union"},
-      {"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},
       {"goto",  "_cxx_goto"},
-      {"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},
       {"and",  "_cxx_and"},
       {"auto",  "_cxx_auto"},
-      {"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"namespace",  "_cxx_namespace"},
       {"using",  "_cxx_using"},
-      {"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},
       {"else",  "_cxx_else"},
-      {"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},
       {"asm",  "_cxx_asm"},
-      {"",0},
+      {"",nullptr},
       {"while",  "_cxx_while"},
-      {"",0},{"",0},
+      {"",nullptr},{"",nullptr},
       {"new",  "_cxx_new"},
       {"long",  "_cxx_long"},
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"return",  "_cxx_return"},
-      {"",0},{"",0},
+      {"",nullptr},{"",nullptr},
       {"void",  "_cxx_void"},
       {"false",  "_cxx_false"},
-      {"",0},{"",0},
+      {"",nullptr},{"",nullptr},
       {"volatile",  "_cxx_volatile"},
-      {"",0},{"",0},
+      {"",nullptr},{"",nullptr},
       {"switch",  "_cxx_switch"},
-      {"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"not_eq",  "_cxx_not_eq"},
       {"private",  "_cxx_private"},
-      {"",0},
+      {"",nullptr},
       {"protected",  "_cxx_protected"},
-      {"",0},
+      {"",nullptr},
       {"inline",  "_cxx_inline"},
-      {"",0},
+      {"",nullptr},
       {"operator",  "_cxx_operator"},
       {"bool",  "_cxx_bool"},
-      {"",0},
+      {"",nullptr},
       {"and_eq",  "_cxx_and_eq"},
-      {"",0},
+      {"",nullptr},
       {"continue",  "_cxx_continue"},
-      {"",0},
+      {"",nullptr},
       {"break",  "_cxx_break"},
       {"friend",  "_cxx_friend"},
-      {"",0},
+      {"",nullptr},
       {"for",  "_cxx_for"},
       {"case",  "_cxx_case"},
       {"catch",  "_cxx_catch"},
       {"signed",  "_cxx_signed"},
       {"or",  "_cxx_or"},
       {"register",  "_cxx_register"},
-      {"",0},{"",0},
+      {"",nullptr},{"",nullptr},
       {"public",  "_cxx_public"},
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"or_eq",  "_cxx_or_eq"},
       {"bitand",  "_cxx_bitand"},
-      {"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},
       {"compl",  "_cxx_compl"},
       {"extern",  "_cxx_extern"},
-      {"",0},{"",0},
+      {"",nullptr},{"",nullptr},
       {"char",  "_cxx_char"},
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"default",  "_cxx_default"},
       {"template",  "_cxx_template"},
-      {"",0},
+      {"",nullptr},
       {"class",  "_cxx_class"},
       {"sizeof",  "_cxx_sizeof"},
-      {"",0},
+      {"",nullptr},
       {"not",  "_cxx_not"},
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"if",  "_cxx_if"},
-      {"",0},
+      {"",nullptr},
       {"this",  "_cxx_this"},
       {"short",  "_cxx_short"},
-      {"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"bitor",  "_cxx_bitor"},
-      {"",0},
+      {"",nullptr},
       {"virtual",  "_cxx_virtual"},
       {"xor",  "_cxx_xor"},
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"throw",  "_cxx_throw"},
-      {"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},
       {"true",  "_cxx_true"},
-      {"",0},
+      {"",nullptr},
       {"xor_eq",  "_cxx_xor_eq"},
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"reinterpret_cast",  "_cxx_reinterpret_cast"},
-      {"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"typeid",  "_cxx_typeid"},
-      {"",0},
+      {"",nullptr},
       {"typename",  "_cxx_typename"},
-      {"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},
       {"dynamic_cast",  "_cxx_dynamic_cast"},
       {"int",  "_cxx_int"},
-      {"",0},
+      {"",nullptr},
       {"float",  "_cxx_float"},
-      {"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"const",  "_cxx_const"},
-      {"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"const_cast",  "_cxx_const_cast"},
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-      {"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+      {"",nullptr},
       {"static",  "_cxx_static"},
-      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"typedef",  "_cxx_typedef"},
       {"try",  "_cxx_try"},
-      {"",0},{"",0},
+      {"",nullptr},{"",nullptr},
       {"export",  "_cxx_export"},
-      {"",0},
+      {"",nullptr},
       {"explicit",  "_cxx_explicit"},
-      {"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},
       {"wchar_t",  "_cxx_wchar_t"},
-      {"",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},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+      {"",nullptr},
       {"struct",  "_cxx_struct"},
-      {"",0},{"",0},{"",0},{"",0},
+      {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
       {"static_cast",  "_cxx_static_cast"},
     };
 
@@ -186,5 +186,5 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
             return &wordlist[key];
         }
     }
-  return 0;
+  return nullptr;
 }
diff --git a/TAO/TAO_IDL/fe/fe_obv_header.cpp b/TAO/TAO_IDL/fe/fe_obv_header.cpp
index f0c4644c87a..0532f2eb9af 100644
--- a/TAO/TAO_IDL/fe/fe_obv_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_obv_header.cpp
@@ -66,10 +66,10 @@ FE_OBVHeader::FE_OBVHeader (UTL_ScopedName *n,
                         false,
                         false,
                         false),
-    supports_ (0),
+    supports_ (nullptr),
     n_supports_ (0),
-    inherits_concrete_ (0),
-    supports_concrete_ (0),
+    inherits_concrete_ (nullptr),
+    supports_concrete_ (nullptr),
     truncatable_ (truncatable)
 {
   this->compile_inheritance (inherits,
@@ -81,42 +81,42 @@ FE_OBVHeader::FE_OBVHeader (UTL_ScopedName *n,
     }
 }
 
-FE_OBVHeader::~FE_OBVHeader (void)
+FE_OBVHeader::~FE_OBVHeader ()
 {
 }
 
 AST_Type **
-FE_OBVHeader::supports (void) const
+FE_OBVHeader::supports () const
 {
   return this->supports_;
 }
 
 long
-FE_OBVHeader::n_supports (void) const
+FE_OBVHeader::n_supports () const
 {
   return this->n_supports_;
 }
 
 AST_Type *
-FE_OBVHeader::inherits_concrete (void) const
+FE_OBVHeader::inherits_concrete () const
 {
   return this->inherits_concrete_;
 }
 
 AST_Type *
-FE_OBVHeader::supports_concrete (void) const
+FE_OBVHeader::supports_concrete () const
 {
   return this->supports_concrete_;
 }
 
 bool
-FE_OBVHeader::truncatable (void) const
+FE_OBVHeader::truncatable () const
 {
   return this->truncatable_;
 }
 
 void
-FE_OBVHeader::destroy (void)
+FE_OBVHeader::destroy ()
 {
   this->FE_InterfaceHeader::destroy ();
 }
@@ -131,9 +131,9 @@ FE_OBVHeader::compile_inheritance (UTL_NameList *vtypes,
   if (this->n_inherits_ > 0)
     {
       AST_Type *t = this->inherits_[0];
-      AST_ValueType *vt = AST_ValueType::narrow_from_decl (t);
+      AST_ValueType *vt = dynamic_cast<AST_ValueType*> (t);
 
-      if (vt != 0
+      if (vt != nullptr
           && vt->is_abstract () == false)
         {
           this->inherits_concrete_ = vt;
@@ -166,9 +166,9 @@ FE_OBVHeader::compile_inheritance (UTL_NameList *vtypes,
 void
 FE_OBVHeader::compile_supports (UTL_NameList *supports)
 {
-  if (supports == 0)
+  if (supports == nullptr)
     {
-      this->supports_ = 0;
+      this->supports_ = nullptr;
       this->n_supports_ = 0;
       return;
     }
@@ -179,10 +179,10 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
   ACE_NEW (this->supports_,
            AST_Type *[length]);
 
-  AST_Decl *d = 0;
-  UTL_ScopedName *item = 0;
-  AST_Interface *iface = 0;
-  AST_Type *t = 0;
+  AST_Decl *d = nullptr;
+  UTL_ScopedName *item = nullptr;
+  AST_Interface *iface = nullptr;
+  AST_Type *t = nullptr;
   int i = 0;
 
   for (UTL_NamelistActiveIterator l (supports); !l.is_done (); l.next ())
@@ -190,7 +190,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
       item = l.item ();
 
       // Check that scope stack is valid.
-      if (idl_global->scopes ().top () == 0)
+      if (idl_global->scopes ().top () == nullptr)
         {
           idl_global->err ()->lookup_error (item);
 
@@ -204,20 +204,20 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
 
       d = s->lookup_by_name  (item, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           AST_Decl *sad = ScopeAsDecl (s);
 
           if (sad->node_type () == AST_Decl::NT_module)
             {
-              AST_Module *m = AST_Module::narrow_from_decl (sad);
+              AST_Module *m = dynamic_cast<AST_Module*> (sad);
 
               d = m->look_in_prev_mods_local (item->last_component ());
             }
         }
 
       // Not found?
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (item);
 
@@ -229,20 +229,20 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
       // Remove typedefs, if any.
       if (d->node_type () == AST_Decl::NT_typedef)
         {
-          d = AST_Typedef::narrow_from_decl (d)->primitive_base_type ();
+          d = dynamic_cast<AST_Typedef*> (d)->primitive_base_type ();
         }
 
       AST_Decl::NodeType nt = d->node_type ();
-      t = AST_Type::narrow_from_decl (d);
+      t = dynamic_cast<AST_Type*> (d);
 
       if (nt == AST_Decl::NT_interface)
         {
-          iface = AST_Interface::narrow_from_decl (d);
+          iface = dynamic_cast<AST_Interface*> (d);
         }
       else if (nt == AST_Decl::NT_param_holder)
         {
           AST_Param_Holder *ph =
-            AST_Param_Holder::narrow_from_decl (d);
+            dynamic_cast<AST_Param_Holder*> (d);
 
           nt = ph->info ()->type_;
 
@@ -263,14 +263,14 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
         }
 
       // Forward declared interface?
-      if (iface != 0 && !iface->is_defined ())
+      if (iface != nullptr && !iface->is_defined ())
         {
           idl_global->err ()->supports_fwd_error (this->interface_name_,
                                                   iface);
           continue;
         }
 
-      if (iface != 0 && !iface->is_abstract ())
+      if (iface != nullptr && !iface->is_abstract ())
         {
           if (i == 0)
             {
@@ -303,16 +303,16 @@ FE_OBVHeader::check_concrete_supported_inheritance (AST_Interface *d)
       return true;
     }
 
-  AST_ValueType *vt = 0;
-  AST_Type *concrete = 0;
-  AST_Interface *ancestor = 0;
+  AST_ValueType *vt = nullptr;
+  AST_Type *concrete = nullptr;
+  AST_Interface *ancestor = nullptr;
 
   for (long i = 0; i < this->n_inherits_; ++i)
     {
-      vt = AST_ValueType::narrow_from_decl (this->inherits_[i]);
+      vt = dynamic_cast<AST_ValueType*> (this->inherits_[i]);
       concrete = vt->supports_concrete ();
 
-      if (0 == concrete)
+      if (nullptr == concrete)
         {
           return true;
         }
diff --git a/TAO/TAO_IDL/fe/fe_private.cpp b/TAO/TAO_IDL/fe/fe_private.cpp
index 64c0f8b0e9b..83cecd041d8 100644
--- a/TAO/TAO_IDL/fe/fe_private.cpp
+++ b/TAO/TAO_IDL/fe/fe_private.cpp
@@ -65,4 +65,4 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "fe_private.h"
 #include "utl_strlist.h"
 
-UTL_StrList *DRV_global_pragmas = 0;
+UTL_StrList *DRV_global_pragmas = nullptr;
diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp
index 7e4ac13855b..0279f5a5e0a 100644
--- a/TAO/TAO_IDL/fe/fe_utils.cpp
+++ b/TAO/TAO_IDL/fe/fe_utils.cpp
@@ -24,10 +24,10 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-FE_Utils::T_Param_Info::T_Param_Info (void)
+FE_Utils::T_Param_Info::T_Param_Info ()
   : type_ (AST_Decl::NT_fixed),
     const_type_ (AST_Expression::EV_none),
-    enum_const_type_decl_ (0)
+    enum_const_type_decl_ (nullptr)
 {
 }
 
@@ -41,8 +41,8 @@ FE_Utils::duplicate_param_id (T_PARAMLIST_INFO *params)
        !i.done ();
        i.advance (), ++cur_pos)
     {
-      FE_Utils::T_Param_Info *this_one = 0;
-      FE_Utils::T_Param_Info *that_one = 0;
+      FE_Utils::T_Param_Info *this_one = nullptr;
+      FE_Utils::T_Param_Info *that_one = nullptr;
 
       i.next (this_one);
 
@@ -61,9 +61,9 @@ FE_Utils::duplicate_param_id (T_PARAMLIST_INFO *params)
 }
 
 void
-FE_Utils::T_ARGLIST::destroy (void)
+FE_Utils::T_ARGLIST::destroy ()
 {
-  AST_Decl **d = 0;
+  AST_Decl **d = nullptr;
 
   for (T_ARGLIST::ITERATOR i (this->begin ());
        !i.done ();
@@ -183,10 +183,10 @@ FE_Utils::ExprTypeToPredefinedType (AST_Expression::ExprType et)
 UTL_ScopedName *
 FE_Utils::string_to_scoped_name (const char *s)
 {
-  UTL_ScopedName *retval = 0;
+  UTL_ScopedName *retval = nullptr;
   ACE_CString str (s);
-  Identifier *id = 0;
-  UTL_ScopedName *sn = 0;
+  Identifier *id = nullptr;
+  UTL_ScopedName *sn = nullptr;
 
   while (! str.empty ())
     {
@@ -204,15 +204,15 @@ FE_Utils::string_to_scoped_name (const char *s)
       // Construct a UTL_ScopedName segment.
       ACE_NEW_RETURN (id,
                       Identifier (lname.c_str ()),
-                      0);
+                      nullptr);
 
       ACE_NEW_RETURN (sn,
-                      UTL_ScopedName (id, 0),
-                      0);
+                      UTL_ScopedName (id, nullptr),
+                      nullptr);
 
       // Either make it the head of a new list or the tail of
       // an existing one.
-      if (retval == 0)
+      if (retval == nullptr)
         {
           retval = sn;
         }
@@ -260,14 +260,14 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
   struct_name += u->local_name ()->get_string ();
   struct_name += "Connection";
   Identifier struct_id (struct_name.c_str ());
-  UTL_ScopedName sn (&struct_id, 0);
+  UTL_ScopedName sn (&struct_id, nullptr);
 
   // In case this call comes from the backend. We
   // will pop the scope before returning.
   idl_global->scopes ().push (c);
 
   AST_Structure *connection =
-    idl_global->gen ()->create_structure (&sn, 0, 0);
+    idl_global->gen ()->create_structure (&sn, false, false);
 
   struct_id.destroy ();
 
@@ -277,11 +277,11 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
   UTL_ScopedName *fn = u->uses_type ()->name ();
   AST_Decl *d =
     idl_global->root ()->lookup_by_name (fn, true, false);
-  AST_Type *ft = AST_Type::narrow_from_decl (d);
+  AST_Type *ft = dynamic_cast<AST_Type*> (d);
 
   Identifier object_id ("objref");
   UTL_ScopedName object_name (&object_id,
-                              0);
+                              nullptr);
   AST_Field *object_field =
     idl_global->gen ()->create_field (ft,
                                       &object_name,
@@ -291,7 +291,7 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
 
   Identifier local_id ("Cookie");
   UTL_ScopedName local_name (&local_id,
-                             0);
+                             nullptr);
   Identifier module_id ("Components");
   UTL_ScopedName scoped_name (&module_id,
                               &local_name);
@@ -300,18 +300,18 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
   local_id.destroy ();
   module_id.destroy ();
 
-  if (d == 0)
+  if (d == nullptr)
     {
       // This would happen if we haven't included Components.idl.
       idl_global->err ()->lookup_error (&scoped_name);
       return;
     }
 
-  AST_ValueType *cookie = AST_ValueType::narrow_from_decl (d);
+  AST_ValueType *cookie = dynamic_cast<AST_ValueType*> (d);
 
   Identifier cookie_id ("ck");
   UTL_ScopedName cookie_name (&cookie_id,
-                              0);
+                              nullptr);
   AST_Field *cookie_field =
     idl_global->gen ()->create_field (cookie,
                                       &cookie_name,
@@ -328,20 +328,20 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
   AST_Sequence *sequence =
     idl_global->gen ()->create_sequence (bound_expr,
                                          connection,
-                                         0,
-                                         0,
-                                         0);
+                                         nullptr,
+                                         false,
+                                         false);
 
   ACE_CString seq_string (struct_name);
   seq_string += 's';
   Identifier seq_id (seq_string.c_str ());
   UTL_ScopedName seq_name (&seq_id,
-                           0);
+                           nullptr);
   AST_Typedef *connections =
     idl_global->gen ()->create_typedef (sequence,
                                         &seq_name,
-                                        0,
-                                        0);
+                                        false,
+                                        false);
   seq_id.destroy ();
 
   (void) c->fe_add_typedef (connections);
@@ -351,7 +351,7 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
 }
 
 void
-FE_Utils::create_implied_ami_uses_stuff (void)
+FE_Utils::create_implied_ami_uses_stuff ()
 {
   if (idl_global->included_ami_receps_done ())
     {
@@ -363,7 +363,7 @@ FE_Utils::create_implied_ami_uses_stuff (void)
        ! i.done ();
        i.advance ())
     {
-      char **item = 0;
+      char **item = nullptr;
       i.next (item);
 
       UTL_ScopedName *sn =
@@ -372,24 +372,24 @@ FE_Utils::create_implied_ami_uses_stuff (void)
       AST_Decl *d =
         idl_global->root ()->lookup_by_name (sn, true);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (sn);
 
           sn->destroy ();
           delete sn;
-          sn = 0;
+          sn = nullptr;
 
           continue;
         }
 
       sn->destroy ();
       delete sn;
-      sn = 0;
+      sn = nullptr;
 
-      AST_Uses *u = AST_Uses::narrow_from_decl (d);
+      AST_Uses *u = dynamic_cast<AST_Uses*> (d);
 
-      if (u == 0)
+      if (u == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("idl_global::create_")
@@ -406,9 +406,9 @@ FE_Utils::create_implied_ami_uses_stuff (void)
         }
 
       AST_Component *c =
-        AST_Component::narrow_from_scope (u->defined_in ());
+        dynamic_cast<AST_Component*> (u->defined_in ());
 
-      if (c == 0)
+      if (c == nullptr)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("idl_global::create_")
@@ -476,7 +476,7 @@ FE_Utils::check_for_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list)
        !i.done ();
        i.advance (), ++index)
     {
-      FE_Utils::T_Param_Info *param = 0;
+      FE_Utils::T_Param_Info *param = nullptr;
       i.next (param);
 
       if (param->name_.find (pattern) == 0)
@@ -501,26 +501,26 @@ FILE *
 FE_Utils::open_included_file (char const * filename,
                               char const *& directory)
 {
-  FILE * f = 0;
+  FILE * f = nullptr;
   ACE_CString const the_file (ACE_CString ('/')
                               + ACE_CString (filename));
 
   for (IDL_GlobalData::Unbounded_Paths_Queue_Iterator i (
          idl_global->include_paths ());
-       !i.done () && f == 0;
+       !i.done () && f == nullptr;
        i.advance ())
     {
-      IDL_GlobalData::Include_Path_Info *path_info = 0;
+      IDL_GlobalData::Include_Path_Info *path_info = nullptr;
       (void) i.next (path_info);
 
-      if (path_info->path_ != 0)
+      if (path_info->path_ != nullptr)
         {
           ACE_CString const complete_filename (ACE_CString (path_info->path_)
                                                + the_file);
 
           f = ACE_OS::fopen (complete_filename.c_str (), "r");
 
-          if (f != 0)
+          if (f != nullptr)
             directory = path_info->path_;
         }
     }
@@ -533,7 +533,7 @@ FE_Utils::is_include_file_found (ACE_CString & inc_file,
                                  UTL_String * idl_file_name)
 {
   char abspath[MAXPATHLEN] = "";
-  char *full_path = 0;
+  char *full_path = nullptr;
 
   // If the include path has literal "s (because of an include
   // of a Windows path with spaces), we must remove them here.
@@ -552,11 +552,11 @@ FE_Utils::is_include_file_found (ACE_CString & inc_file,
   full_path =
     ACE_OS::realpath (inc_file.c_str (), abspath);
 
-  if (full_path != 0)
+  if (full_path != nullptr)
     {
       FILE *test = ACE_OS::fopen (abspath, "r");
 
-      if (test == 0)
+      if (test == nullptr)
         {
           return false;
         }
@@ -576,7 +576,7 @@ FE_Utils::is_include_file_found (ACE_CString & inc_file,
 /// Validate the included idl files, some files might have been
 /// ignored by the preprocessor.
 void
-FE_Utils::validate_included_idl_files (void)
+FE_Utils::validate_included_idl_files ()
 {
   // Flag to make sure we don't repeat things.
   static bool already_done = false;
@@ -605,9 +605,9 @@ FE_Utils::validate_included_idl_files (void)
 
   char pre_abspath [MAXPATHLEN] = "";
   char post_abspath [MAXPATHLEN] = "";
-  IDL_GlobalData::Include_Path_Info *path_info = 0;
-  char *post_tmp = 0;
-  char *full_path = 0;
+  IDL_GlobalData::Include_Path_Info *path_info = nullptr;
+  char *post_tmp = nullptr;
+  char *full_path = nullptr;
 
   // We are going to assemble a list of the include files found in
   // the top level file in the order that they are found in the pre-
@@ -690,7 +690,7 @@ FE_Utils::validate_included_idl_files (void)
                     }
 
                   // Reduce length and zero the discarded element
-                  pre_preproc_includes [--n_pre_preproc_includes] = 0;
+                  pre_preproc_includes [--n_pre_preproc_includes] = nullptr;
 
                   // Break out to next entry in pre-processor
                   // output
@@ -709,7 +709,7 @@ FE_Utils::validate_included_idl_files (void)
   for (size_t l = 0u; l < n_pre_preproc_includes; ++l)
     {
       delete [] pre_preproc_includes [l];
-      pre_preproc_includes [l] = 0;
+      pre_preproc_includes [l] = nullptr;
     }
 
   // Copy list back
@@ -745,7 +745,7 @@ FE_Utils::validate_orb_include (UTL_String * idl_file_name)
        !iter.done ();
        iter.advance ())
     {
-      IDL_GlobalData::Include_Path_Info *path_info = 0;
+      IDL_GlobalData::Include_Path_Info *path_info = nullptr;
       iter.next (path_info);
 
       ACE_CString partial = path_info->path_;
@@ -800,7 +800,7 @@ FE_Utils::original_local_name (Identifier *local_name)
       const TAO_IDL_CPP_Keyword_Entry *entry =
         cpp_key_tbl.lookup (lname + 5, len);
 
-      if (entry != 0)
+      if (entry != nullptr)
         {
           ACE_CString tmp (lname + 5);
           local_name->replace_string (tmp.c_str ());
@@ -834,10 +834,10 @@ FE_Utils::can_be_redefined (AST_Decl *prev_decl,
 
   UTL_Scope *prev_scope = prev_decl->defined_in ();
   UTL_Scope *curr_scope = curr_decl->defined_in ();
-  AST_Structure *s = 0;
-  AST_StructureFwd *s_fwd = 0;
-  AST_Template_Module *ptm = 0;
-  AST_Template_Module *ctm = 0;
+  AST_Structure *s = nullptr;
+  AST_StructureFwd *s_fwd = nullptr;
+  AST_Template_Module *ptm = nullptr;
+  AST_Template_Module *ctm = nullptr;
 
   bool nt_eq = (pnt == cnt);
   bool s_eq = (prev_scope == curr_scope);
@@ -852,9 +852,9 @@ FE_Utils::can_be_redefined (AST_Decl *prev_decl,
         }
 
       /// Neither can be a template module.
-      ptm = AST_Template_Module::narrow_from_decl (prev_decl);
-      ctm = AST_Template_Module::narrow_from_decl (curr_decl);
-      return (ptm == 0 && ctm == 0);
+      ptm = dynamic_cast<AST_Template_Module*> (prev_decl);
+      ctm = dynamic_cast<AST_Template_Module*> (curr_decl);
+      return (ptm == nullptr && ctm == nullptr);
     /// For the *_fwd types, if scopes aren't related, it's ok.
     /// If they are related, then we need another fwd or a full decl.
     case AST_Decl::NT_component_fwd:
@@ -874,9 +874,9 @@ FE_Utils::can_be_redefined (AST_Decl *prev_decl,
     /// in a derived interface type is ok.
     case AST_Decl::NT_struct:
     case AST_Decl::NT_union:
-      s = AST_Structure::narrow_from_decl (prev_decl);
-      s_fwd = (s == 0 ? 0 : s->fwd_decl ());
-      return (!s_eq || s_fwd != 0);
+      s = dynamic_cast<AST_Structure*> (prev_decl);
+      s_fwd = (s == nullptr ? nullptr : s->fwd_decl ());
+      return (!s_eq || s_fwd != nullptr);
     /// Only 2 or more full definitions in the same scope are illegal,
     /// and that is caught elsewhere.
     case AST_Decl::NT_interface:
@@ -910,7 +910,7 @@ void
 FE_Utils::tmpl_mod_ref_check (AST_Decl *context,
                               AST_Decl *ref)
 {
-  if (ref == 0
+  if (ref == nullptr
       || ref->node_type () == AST_Decl::NT_param_holder
       || idl_global->in_tmpl_mod_alias ())
     {
@@ -962,7 +962,7 @@ FE_Utils::check_one_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list,
           break;
         }
 
-      FE_Utils::T_Param_Info *info = 0;
+      FE_Utils::T_Param_Info *info = nullptr;
       i.next (info);
 
       if (info->name_ == param_id)
@@ -979,12 +979,12 @@ FE_Utils::get_tm_container (AST_Decl *contained)
 {
   AST_Decl *d = contained;
 
-  while (d != 0)
+  while (d != nullptr)
     {
       AST_Template_Module *tm =
-        AST_Template_Module::narrow_from_decl (d);
+        dynamic_cast<AST_Template_Module*> (d);
 
-      if (tm != 0)
+      if (tm != nullptr)
         {
           return tm;
         }
@@ -992,5 +992,5 @@ FE_Utils::get_tm_container (AST_Decl *contained)
       d = ScopeAsDecl (d->defined_in ());
     }
 
-  return 0;
+  return nullptr;
 }
diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp
index 5fecde985c4..f87f408f96f 100644
--- a/TAO/TAO_IDL/fe/idl.tab.cpp
+++ b/TAO/TAO_IDL/fe/idl.tab.cpp
@@ -146,14 +146,14 @@
 #include <fe_utils.h>
 
 void tao_yyerror (const char *);
-int tao_yylex (void);
+int tao_yylex ();
 extern "C" int tao_yywrap (void);
 
 extern char tao_yytext[];
 extern int tao_yyleng;
 
-AST_Enum *tao_enum_constant_decl = 0;
-AST_String *tao_string_decl = 0;
+AST_Enum *tao_enum_constant_decl = nullptr;
+AST_String *tao_string_decl = nullptr;
 AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none;
 bool stack_based_lookup_for_primary_expr = false;
 
@@ -354,7 +354,7 @@ typedef union YYSTYPE YYSTYPE;
 
 extern YYSTYPE tao_yylval;
 
-int tao_yyparse (void);
+int tao_yyparse ();
 
 #endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED  */
 /* Symbol kind.  */
@@ -2530,7 +2530,7 @@ int yynerrs;
 `----------*/
 
 int
-yyparse (void)
+yyparse ()
 {
     yy_state_fast_t yystate;
     /* Number of tokens to shift before error messages enabled.  */
@@ -3038,7 +3038,7 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           yyerrok;
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 3044 "fe/idl.tab.cpp"
     break;
@@ -3076,13 +3076,13 @@ yyreduce:
                 IDL_GlobalData::PS_ModuleIDSeen);
             }
 
-          AST_Module *m = 0;
+          AST_Module *m = nullptr;
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
 
           /*
            * Make a new module and add it to the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               m = idl_global->gen ()->create_module (s, (yyvsp[0].idlist));
               (void) s->fe_add_module (m);
@@ -3090,7 +3090,7 @@ yyreduce:
 
           (yyvsp[0].idlist)->destroy ();
           delete (yyvsp[0].idlist);
-          (yyvsp[0].idlist) = 0;
+          (yyvsp[0].idlist) = nullptr;
 
           /*
            * Push it on the stack
@@ -3186,7 +3186,7 @@ yyreduce:
 
           // We've probably tried to reopen a template module,
           // going further will cause a crash.
-          if (m == 0)
+          if (m == nullptr)
             {
               return 1;
             }
@@ -3238,9 +3238,9 @@ yyreduce:
 
           // Clear the pointer so scoped name lookup will know
           // that we are no longer in a template module scope.
-          idl_global->current_params (0);
+          idl_global->current_params (nullptr);
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 3246 "fe/idl.tab.cpp"
     break;
@@ -3273,16 +3273,16 @@ yyreduce:
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-6].idlist));
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[-6].idlist));
               return 1;
             }
 
           AST_Template_Module *ref =
-            AST_Template_Module::narrow_from_decl (d);
+            dynamic_cast<AST_Template_Module*> (d);
 
-          if (ref == 0)
+          if (ref == nullptr)
             {
               idl_global->err ()->template_module_expected (d);
               return 1;
@@ -3298,7 +3298,7 @@ yyreduce:
               return 1;
             }
 
-          UTL_ScopedName sn ((yyvsp[0].idval), 0);
+          UTL_ScopedName sn ((yyvsp[0].idval), nullptr);
 
           AST_Template_Module_Ref *tmr =
             idl_global->gen ()->create_template_module_ref (
@@ -3311,7 +3311,7 @@ yyreduce:
           sn.destroy ();
           (yyvsp[-6].idlist)->destroy ();
           delete (yyvsp[-6].idlist);
-          (yyvsp[-6].idlist) = 0;
+          (yyvsp[-6].idlist) = nullptr;
 
           // Save the current flag value to be restored below.
           bool itmna_flag = idl_global->in_tmpl_mod_no_alias ();
@@ -3371,19 +3371,19 @@ yyreduce:
 
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName *sn = (yyvsp[-5].idlist);
-          AST_Template_Module *ref = 0;
+          AST_Template_Module *ref = nullptr;
           AST_Decl *d = s->lookup_by_name (sn);
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error (sn);
               return 1;
             }
           else
             {
-              ref = AST_Template_Module::narrow_from_decl (d);
+              ref = dynamic_cast<AST_Template_Module*> (d);
 
-              if (ref == 0)
+              if (ref == nullptr)
                 {
                   idl_global->err ()->template_module_expected (d);
                   return 1;
@@ -3392,8 +3392,8 @@ yyreduce:
 
           sn->destroy ();
           delete sn;
-          sn = 0;
-          (yyvsp[-5].idlist) = 0;
+          sn = nullptr;
+          (yyvsp[-5].idlist) = nullptr;
 
           if (! ref->match_arg_names ((yyvsp[-3].alval)))
             {
@@ -3402,7 +3402,7 @@ yyreduce:
 
           ACE_NEW_RETURN (sn,
                           UTL_ScopedName ((yyvsp[0].idval),
-                                           0),
+                                           nullptr),
                           1);
 
           AST_Template_Module_Inst *tmi =
@@ -3426,7 +3426,7 @@ yyreduce:
               idl_global->set_err_count (idl_global->err_count () + 1);
             }
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 3432 "fe/idl.tab.cpp"
     break;
@@ -3435,10 +3435,10 @@ yyreduce:
 #line 916 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Interface *i = 0;
+          AST_Interface *i = nullptr;
 
           FE_InterfaceHeader *header = (yyvsp[0].ihval);
-          (yyvsp[0].ihval) = 0;
+          (yyvsp[0].ihval) = nullptr;
 
           /*
            * Make a new interface node and add it to its enclosing scope.
@@ -3525,7 +3525,7 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
 
-          if ((yyvsp[0].nlval) != 0 && (yyvsp[0].nlval)->truncatable ())
+          if ((yyvsp[0].nlval) != nullptr && (yyvsp[0].nlval)->truncatable ())
             {
               idl_global->err ()->syntax_error (
                                       IDL_GlobalData::PS_InheritColonSeen
@@ -3538,9 +3538,9 @@ yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
+          UTL_ScopedName *n = nullptr;
           ACE_NEW_RETURN (n,
-                          UTL_ScopedName ((yyvsp[-1].idval), 0),
+                          UTL_ScopedName ((yyvsp[-1].idval), nullptr),
                           1);
           ACE_NEW_RETURN ((yyval.ihval),
                           FE_InterfaceHeader (n,
@@ -3550,11 +3550,11 @@ yyreduce:
                                               true),
                           1);
 
-          if (0 != (yyvsp[0].nlval))
+          if (nullptr != (yyvsp[0].nlval))
             {
               (yyvsp[0].nlval)->destroy ();
               delete (yyvsp[0].nlval);
-              (yyvsp[0].nlval) = 0;
+              (yyvsp[0].nlval) = nullptr;
             }
         }
 #line 3561 "fe/idl.tab.cpp"
@@ -3571,9 +3571,9 @@ yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
+          UTL_ScopedName *n = nullptr;
           ACE_NEW_RETURN (n,
-                          UTL_ScopedName ((yyvsp[-1].idval), 0),
+                          UTL_ScopedName ((yyvsp[-1].idval), nullptr),
                           1);
           ACE_NEW_RETURN ((yyval.ihval),
                           FE_InterfaceHeader (n,
@@ -3583,11 +3583,11 @@ yyreduce:
                                               true),
                           1);
 
-          if (0 != (yyvsp[0].nlval))
+          if (nullptr != (yyvsp[0].nlval))
             {
               (yyvsp[0].nlval)->destroy ();
               delete (yyvsp[0].nlval);
-              (yyvsp[0].nlval) = 0;
+              (yyvsp[0].nlval) = nullptr;
             }
         }
 #line 3594 "fe/idl.tab.cpp"
@@ -3604,9 +3604,9 @@ yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
+          UTL_ScopedName *n = nullptr;
           ACE_NEW_RETURN (n,
-                          UTL_ScopedName ((yyvsp[-1].idval), 0),
+                          UTL_ScopedName ((yyvsp[-1].idval), nullptr),
                           1);
           ACE_NEW_RETURN ((yyval.ihval),
                           FE_InterfaceHeader (n,
@@ -3616,11 +3616,11 @@ yyreduce:
                                               true),
                           1);
 
-          if (0 != (yyvsp[0].nlval))
+          if (nullptr != (yyvsp[0].nlval))
             {
               (yyvsp[0].nlval)->destroy ();
               delete (yyvsp[0].nlval);
-              (yyvsp[0].nlval) = 0;
+              (yyvsp[0].nlval) = nullptr;
             }
         }
 #line 3627 "fe/idl.tab.cpp"
@@ -3646,7 +3646,7 @@ yyreduce:
   case 77:
 #line 1095 "fe/idl.ypp"
         {
-          (yyval.nlval) = 0;
+          (yyval.nlval) = nullptr;
         }
 #line 3652 "fe/idl.tab.cpp"
     break;
@@ -3665,7 +3665,7 @@ yyreduce:
         {
           FE_OBVHeader *&valuetype_header = (yyvsp[0].vhval);
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
-          AST_ValueType *valuetype = 0;
+          AST_ValueType *valuetype = nullptr;
 
           if (scope && valuetype_header)
             {
@@ -3698,7 +3698,7 @@ yyreduce:
               // FE_OBVHeader is not automatically destroyed in the AST
               valuetype_header->destroy ();
               delete valuetype_header;
-              valuetype_header = 0;
+              valuetype_header = nullptr;
             }
 
           /*
@@ -3733,11 +3733,11 @@ yyreduce:
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
 
           AST_ValueType *vt =
-            AST_ValueType::narrow_from_scope (
+            dynamic_cast<AST_ValueType*> (
                 idl_global->scopes ().top_non_null ()
               );
 
-          if (vt != 0 && vt->will_have_factory ())
+          if (vt != nullptr && vt->will_have_factory ())
             {
               idl_global->valuefactory_seen_ = true;
             }
@@ -3756,10 +3756,10 @@ yyreduce:
 #line 1198 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_ValueType *v = 0;
-          AST_Interface *i = 0;
+          AST_ValueType *v = nullptr;
+          AST_Interface *i = nullptr;
 
-          if (s != 0 && (yyvsp[0].vhval) != 0)
+          if (s != nullptr && (yyvsp[0].vhval) != nullptr)
             {
               v =
                 idl_global->gen ()->create_valuetype (
@@ -3776,19 +3776,19 @@ yyreduce:
                     false,
                     false
                   );
-              i = AST_Interface::narrow_from_decl (v);
+              i = dynamic_cast<AST_Interface*> (v);
               AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the valuetype to its definition scope
                */
-              v = AST_ValueType::narrow_from_decl (i);
+              v = dynamic_cast<AST_ValueType*> (i);
               (void) s->fe_add_valuetype (v);
 
               // FE_OBVHeader is not automatically destroyed in the AST
               (yyvsp[0].vhval)->destroy ();
               delete (yyvsp[0].vhval);
-              (yyvsp[0].vhval) = 0;
+              (yyvsp[0].vhval) = nullptr;
             }
 
           /*
@@ -3825,7 +3825,7 @@ yyreduce:
            */
           idl_global->scopes ().pop ();
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 3831 "fe/idl.tab.cpp"
     break;
@@ -3843,31 +3843,31 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
 
-          UTL_ScopedName *sn = 0;
+          UTL_ScopedName *sn = nullptr;
           ACE_NEW_RETURN (sn,
-                          UTL_ScopedName ((yyvsp[-3].idval), 0),
+                          UTL_ScopedName ((yyvsp[-3].idval), nullptr),
                           1);
           ACE_NEW_RETURN ((yyval.vhval),
                           FE_OBVHeader (sn,
                                         (yyvsp[-2].nlval),
                                         (yyvsp[0].nlval),
-                                        ((yyvsp[-2].nlval) != 0
+                                        ((yyvsp[-2].nlval) != nullptr
                                            ? (yyvsp[-2].nlval)->truncatable ()
                                            : false)),
                           1);
 
-          if (0 != (yyvsp[0].nlval))
+          if (nullptr != (yyvsp[0].nlval))
             {
               (yyvsp[0].nlval)->destroy ();
               delete (yyvsp[0].nlval);
-              (yyvsp[0].nlval) = 0;
+              (yyvsp[0].nlval) = nullptr;
             }
 
-          if (0 != (yyvsp[-2].nlval))
+          if (nullptr != (yyvsp[-2].nlval))
             {
               (yyvsp[-2].nlval)->destroy ();
               delete (yyvsp[-2].nlval);
-              (yyvsp[-2].nlval) = 0;
+              (yyvsp[-2].nlval) = nullptr;
             }
         }
 #line 3874 "fe/idl.tab.cpp"
@@ -3917,7 +3917,7 @@ yyreduce:
   case 99:
 #line 1330 "fe/idl.ypp"
         {
-          (yyval.nlval) = 0;
+          (yyval.nlval) = nullptr;
         }
 #line 3923 "fe/idl.tab.cpp"
     break;
@@ -3927,15 +3927,15 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_ValueTypeFwd *f = 0;
+                            nullptr);
+          AST_ValueTypeFwd *f = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeForwardSeen);
 
           /*
            * Create a node representing a forward declaration of an
            * valuetype. Store it in the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
                                                             true);
@@ -3944,7 +3944,7 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
         }
 #line 3950 "fe/idl.tab.cpp"
     break;
@@ -3954,15 +3954,15 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_ValueTypeFwd *f = 0;
+                            nullptr);
+          AST_ValueTypeFwd *f = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeForwardSeen);
 
           /*
            * Create a node representing a forward declaration of an
            * valuetype. Store it in the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
                                                             false);
@@ -3971,9 +3971,9 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 3979 "fe/idl.tab.cpp"
     break;
@@ -3985,27 +3985,27 @@ yyreduce:
 
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[-1].idval),
-                            0);
+                            nullptr);
 
-          if (s != 0 && (yyvsp[0].dcval) != 0)
+          if (s != nullptr && (yyvsp[0].dcval) != nullptr)
             {
               /*
               * Get the type_spec associated with the valuebox
               */
-              AST_Type *tp = 0;
+              AST_Type *tp = nullptr;
               AST_Typedef *td
-                = AST_Typedef::narrow_from_decl ((yyvsp[0].dcval));
+                = dynamic_cast<AST_Typedef*> ((yyvsp[0].dcval));
 
-              if (td == 0)
+              if (td == nullptr)
                 {
-                  tp = AST_Type::narrow_from_decl ((yyvsp[0].dcval));
+                  tp = dynamic_cast<AST_Type*> ((yyvsp[0].dcval));
                 }
               else
                 {
                   tp = td->primitive_base_type ();
                 }
 
-              if (tp == 0)
+              if (tp == nullptr)
                 {
                   // The <type_spec> given is a valid type
                   idl_global->err ()->not_a_type ((yyvsp[0].dcval));
@@ -4038,9 +4038,9 @@ yyreduce:
 
           (yyvsp[-1].idval)->destroy ();
           delete (yyvsp[-1].idval);
-          (yyvsp[-1].idval) = 0;
+          (yyvsp[-1].idval) = nullptr;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 4046 "fe/idl.tab.cpp"
     break;
@@ -4080,7 +4080,7 @@ yyreduce:
 #line 1484 "fe/idl.ypp"
         {
           AST_Decl *&node = (yyvsp[0].dcval);
-          AST_Decls *value = 0;
+          AST_Decls *value = nullptr;
           if (node)
             {
               value = new AST_Decls;
@@ -4095,7 +4095,7 @@ yyreduce:
 #line 1495 "fe/idl.ypp"
         {
           AST_Decl *&node = (yyvsp[0].dcval);
-          AST_Decls *value = 0;
+          AST_Decls *value = nullptr;
           if (node)
             {
               value = new AST_Decls;
@@ -4296,7 +4296,7 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
           yyerrok;
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 4302 "fe/idl.tab.cpp"
     break;
@@ -4325,13 +4325,13 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen);
 
-          UTL_NameList *nl = 0;
+          UTL_NameList *nl = nullptr;
           ACE_NEW_RETURN (nl,
                           UTL_NameList ((yyvsp[0].idlist),
-                                        0),
+                                        nullptr),
                           1);
 
-          if ((yyvsp[-3].nlval) == 0)
+          if ((yyvsp[-3].nlval) == nullptr)
             {
               (yyval.nlval) = nl;
             }
@@ -4347,7 +4347,7 @@ yyreduce:
   case 136:
 #line 1673 "fe/idl.ypp"
         {
-          (yyval.nlval) = 0;
+          (yyval.nlval) = nullptr;
         }
 #line 4353 "fe/idl.tab.cpp"
     break;
@@ -4359,7 +4359,7 @@ yyreduce:
 
           ACE_NEW_RETURN ((yyval.idlist),
                           UTL_IdList ((yyvsp[0].idval),
-                                      0),
+                                      nullptr),
                           1);
         }
 #line 4366 "fe/idl.tab.cpp"
@@ -4378,16 +4378,16 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
 
-          Identifier *id = 0;
+          Identifier *id = nullptr;
           ACE_NEW_RETURN (id,
                           Identifier ((yyvsp[-2].strval)),
                           1);
           ACE::strdelete ((yyvsp[-2].strval));
-          (yyvsp[-2].strval) = 0;
-          UTL_IdList *sn = 0;
+          (yyvsp[-2].strval) = nullptr;
+          UTL_IdList *sn = nullptr;
           ACE_NEW_RETURN (sn,
                           UTL_IdList ((yyvsp[0].idval),
-                                      0),
+                                      nullptr),
                           1);
           ACE_NEW_RETURN ((yyval.idlist),
                           UTL_IdList (id,
@@ -4406,7 +4406,7 @@ yyreduce:
           // If there is a global one, it gets put into the UTL_IdList,
           // so we clean it up in the case above.
           ACE::strdelete ((yyvsp[0].strval));
-          (yyvsp[0].strval) = 0;
+          (yyvsp[0].strval) = nullptr;
         }
 #line 4412 "fe/idl.tab.cpp"
     break;
@@ -4416,10 +4416,10 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
 
-          UTL_IdList *sn = 0;
+          UTL_IdList *sn = nullptr;
           ACE_NEW_RETURN (sn,
                           UTL_IdList ((yyvsp[0].idval),
-                                      0),
+                                      nullptr),
                           1);
           (yyvsp[-3].idlist)->nconc (sn);
           (yyval.idlist) = (yyvsp[-3].idlist);
@@ -4434,7 +4434,7 @@ yyreduce:
                           Identifier ((yyvsp[0].strval)),
                           1);
           ACE::strdelete ((yyvsp[0].strval));
-          (yyvsp[0].strval) = 0;
+          (yyvsp[0].strval) = nullptr;
         }
 #line 4440 "fe/idl.tab.cpp"
     break;
@@ -4446,7 +4446,7 @@ yyreduce:
              whereas id is usually a reference to a defining identifier */
           ACE_NEW_RETURN ((yyval.idval), Identifier ((yyvsp[0].strval)), 1);
           ACE::strdelete ((yyvsp[0].strval));
-          (yyvsp[0].strval) = 0;
+          (yyvsp[0].strval) = nullptr;
         }
 #line 4452 "fe/idl.tab.cpp"
     break;
@@ -4455,7 +4455,7 @@ yyreduce:
 #line 1759 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ((yyvsp[0].idval), 0);
+          UTL_ScopedName n ((yyvsp[0].idval), nullptr);
 
           if (ACE_OS::strcmp ((yyvsp[0].idval)->get_string (),
                               "TypeCode") == 0
@@ -4471,29 +4471,29 @@ yyreduce:
 
               (yyvsp[0].idval)->destroy ();
               delete (yyvsp[0].idval);
-              (yyvsp[0].idval) = 0;
+              (yyvsp[0].idval) = nullptr;
 
               break;
             }
 
-          AST_InterfaceFwd *f = 0;
+          AST_InterfaceFwd *f = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceForwardSeen);
 
           /*
            * Create a node representing a forward declaration of an
            * interface. Store it in the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               f = idl_global->gen ()->create_interface_fwd (&n,
-                                                            0,
-                                                            0);
+                                                            false,
+                                                            false);
               (void) s->fe_add_interface_fwd (f);
             }
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
         }
 #line 4499 "fe/idl.tab.cpp"
     break;
@@ -4503,8 +4503,8 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_InterfaceFwd *f = 0;
+                            nullptr);
+          AST_InterfaceFwd *f = nullptr;
           idl_global->set_parse_state (
                           IDL_GlobalData::PS_InterfaceForwardSeen
                         );
@@ -4513,17 +4513,17 @@ yyreduce:
            * Create a node representing a forward declaration of an
            * interface. Store it in the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               f = idl_global->gen ()->create_interface_fwd (&n,
-                                                            1,
-                                                            0);
+                                                            true,
+                                                            false);
               (void) s->fe_add_interface_fwd (f);
             }
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
         }
 #line 4529 "fe/idl.tab.cpp"
     break;
@@ -4533,8 +4533,8 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_InterfaceFwd *f = 0;
+                            nullptr);
+          AST_InterfaceFwd *f = nullptr;
           idl_global->set_parse_state (
                           IDL_GlobalData::PS_InterfaceForwardSeen
                         );
@@ -4543,17 +4543,17 @@ yyreduce:
            * Create a node representing a forward declaration of an
            * interface. Store it in the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               f = idl_global->gen ()->create_interface_fwd (&n,
-                                                            0,
-                                                            1);
+                                                            false,
+                                                            true);
               (void) s->fe_add_interface_fwd (f);
             }
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           (yyval.dcval) = dynamic_cast<AST_Decl *> (f);
         }
@@ -4595,39 +4595,39 @@ yyreduce:
   case 151:
 #line 1877 "fe/idl.ypp"
         {
-          (yyval.dcval) = 0;
-          UTL_ScopedName n ((yyvsp[-4].idval), 0);
+          (yyval.dcval) = nullptr;
+          UTL_ScopedName n ((yyvsp[-4].idval), nullptr);
 
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Constant *c = 0;
+          AST_Constant *c = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_ConstExprSeen);
 
           /*
            * Create a node representing a constant declaration. Store
            * it in the enclosing scope.
            */
-          if ((yyvsp[0].exval) != 0 && s != 0)
+          if ((yyvsp[0].exval) != nullptr && s != nullptr)
             {
               AST_Param_Holder *param_holder = (yyvsp[0].exval)->param_holder ();
 
               AST_Expression::AST_ExprValue *result =
                 (yyvsp[0].exval)->check_and_coerce ((yyvsp[-6].etval), tao_enum_constant_decl);
-              tao_enum_constant_decl = 0;
+              tao_enum_constant_decl = nullptr;
 
               // If the expression is a template parameter place
               // holder, 'result' will be 0, but it's ok.
-              if (result == 0 && param_holder == 0)
+              if (result == nullptr && param_holder == nullptr)
                 {
                   idl_global->err ()->coercion_error ((yyvsp[0].exval), (yyvsp[-6].etval));
                   (yyvsp[0].exval)->destroy ();
                   delete (yyvsp[0].exval);
-                  (yyvsp[0].exval) = 0;
+                  (yyvsp[0].exval) = nullptr;
                 }
               else
                 {
                   AST_Expression::ExprType et = (yyvsp[-6].etval);
 
-                  if (param_holder != 0
+                  if (param_holder != nullptr
                       && et != param_holder->info ()->const_type_)
                     {
                       idl_global->err ()->mismatched_template_param (
@@ -4642,12 +4642,12 @@ yyreduce:
                 }
 
               delete result;
-              result = 0;
+              result = nullptr;
             }
 
           (yyvsp[-4].idval)->destroy ();
           delete (yyvsp[-4].idval);
-          (yyvsp[-4].idval) = 0;
+          (yyvsp[-4].idval) = nullptr;
         }
 #line 4653 "fe/idl.tab.cpp"
     break;
@@ -4672,8 +4672,8 @@ yyreduce:
 #line 1950 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_PredefinedType *c = 0;
-          AST_Typedef *t = 0;
+          AST_PredefinedType *c = nullptr;
+          AST_Typedef *t = nullptr;
           UTL_ScopedName *sn = (yyvsp[0].idlist);
 
           /*
@@ -4683,16 +4683,16 @@ yyreduce:
           AST_Decl *d =
             s->lookup_by_name (sn);
 
-          if (s != 0 && d != 0)
+          if (s != nullptr && d != nullptr)
             {
               /*
                * Look through typedefs.
                */
               while (d->node_type () == AST_Decl::NT_typedef)
                 {
-                  t = AST_Typedef::narrow_from_decl (d);
+                  t = dynamic_cast<AST_Typedef*> (d);
 
-                  if (t == 0)
+                  if (t == nullptr)
                     {
                       break;
                     }
@@ -4702,7 +4702,7 @@ yyreduce:
 
               if (d->node_type () == AST_Decl::NT_pre_defined)
                 {
-                  c = AST_PredefinedType::narrow_from_decl (d);
+                  c = dynamic_cast<AST_PredefinedType*> (d);
 
                   (yyval.etval) = FE_Utils::PredefinedTypeToExprType (c->pt ());
                 }
@@ -4718,7 +4718,7 @@ yyreduce:
                 {
                   (yyval.etval) = AST_Expression::EV_enum;
                   tao_enum_constant_decl =
-                    AST_Enum::narrow_from_decl (d);
+                    dynamic_cast<AST_Enum*> (d);
                 }
               else
                 {
@@ -4732,8 +4732,8 @@ yyreduce:
 
           sn->destroy ();
           delete sn;
-          sn = 0;
-          (yyvsp[0].idlist) = 0;
+          sn = nullptr;
+          (yyvsp[0].idlist) = nullptr;
         }
 #line 4739 "fe/idl.tab.cpp"
     break;
@@ -4875,7 +4875,7 @@ yyreduce:
             idl_global->gen ()->create_expr (
                                     AST_Expression::EC_u_plus,
                                     (yyvsp[0].exval),
-                                    0
+                                    nullptr
                                   );
         }
 #line 4882 "fe/idl.tab.cpp"
@@ -4888,7 +4888,7 @@ yyreduce:
             idl_global->gen ()->create_expr (
                                    AST_Expression::EC_u_minus,
                                    (yyvsp[0].exval),
-                                   0
+                                   nullptr
                                  );
         }
 #line 4895 "fe/idl.tab.cpp"
@@ -4901,7 +4901,7 @@ yyreduce:
             idl_global->gen ()->create_expr (
                                    AST_Expression::EC_bit_neg,
                                    (yyvsp[0].exval),
-                                   0
+                                   nullptr
                                  );
         }
 #line 4908 "fe/idl.tab.cpp"
@@ -4917,7 +4917,7 @@ yyreduce:
            * but only when it is evaluated (such as when it is assigned
            * as a constant value).
            */
-          AST_Expression *expr = 0;
+          AST_Expression *expr = nullptr;
 
           AST_Decl *node = stack_based_lookup_for_primary_expr ?
             idl_global->scopes ().lookup_by_name (name) :
@@ -4963,7 +4963,7 @@ yyreduce:
           (yyval.exval) = expr;
           name->destroy ();
           delete name;
-          (yyvsp[0].idlist) = name = 0;
+          (yyvsp[0].idlist) = name = nullptr;
         }
 #line 4969 "fe/idl.tab.cpp"
     break;
@@ -4999,7 +4999,7 @@ yyreduce:
           (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval));
           (yyvsp[0].sval)->destroy ();
           delete (yyvsp[0].sval);
-          (yyvsp[0].sval) = 0;
+          (yyvsp[0].sval) = nullptr;
         }
 #line 5005 "fe/idl.tab.cpp"
     break;
@@ -5010,7 +5010,7 @@ yyreduce:
           char *wide_string = (yyvsp[0].wsval);
           (yyval.exval) = idl_global->gen ()->create_expr (wide_string);
           ACE_OS::free (wide_string);
-          (yyvsp[0].wsval) = 0;
+          (yyvsp[0].wsval) = nullptr;
         }
 #line 5016 "fe/idl.tab.cpp"
     break;
@@ -5076,7 +5076,7 @@ yyreduce:
            * AST_Constant), the AST_ExprValue will probably not be set,
            * but there's no need to check anyway
            */
-          if (ev != 0)
+          if (ev != nullptr)
             {
               switch (ev->et)
               {
@@ -5143,7 +5143,7 @@ yyreduce:
             }
 
           Identifier *id = (yyvsp[-1].idval);
-          UTL_ScopedName name (id, 0);
+          UTL_ScopedName name (id, nullptr);
           AST_Annotation_Decl::escape_name (&name);
           AST_Annotation_Decl *annotation_decl = idl_global->gen ()->
             create_annotation_decl (&name);
@@ -5162,7 +5162,7 @@ yyreduce:
           id->destroy ();
           delete id;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 5168 "fe/idl.tab.cpp"
     break;
@@ -5186,7 +5186,7 @@ yyreduce:
           Identifier *name = (yyvsp[-2].idval);
           // Annotation member names can't clash with C++ keywords
           FE_Utils::original_local_name (name);
-          UTL_ScopedName *scoped_name = new UTL_ScopedName (name, 0);
+          UTL_ScopedName *scoped_name = new UTL_ScopedName (name, nullptr);
           AST_Expression *default_value = (yyvsp[-1].exval);
 
           AST_Decl * type_obj;
@@ -5204,7 +5204,7 @@ yyreduce:
             }
 
           FE_Declarator *declarator = new FE_Declarator (
-            scoped_name, FE_Declarator::FD_simple, 0);
+            scoped_name, FE_Declarator::FD_simple, nullptr);
           AST_Annotation_Member *member = idl_global->gen ()->
             create_annotation_member (
               type, declarator->compose (type_obj), declarator->name ());
@@ -5218,7 +5218,7 @@ yyreduce:
               // Check if types are compatible, else report error
               AST_Expression::AST_ExprValue *result =
                 default_value->check_and_coerce (type, tao_enum_constant_decl);
-              tao_enum_constant_decl = 0;
+              tao_enum_constant_decl = nullptr;
               if (result)
                 {
                   member->value (default_value);
@@ -5244,7 +5244,7 @@ yyreduce:
   case 210:
 #line 2462 "fe/idl.ypp"
         {
-          (yyval.exval) = 0;
+          (yyval.exval) = nullptr;
         }
 #line 5250 "fe/idl.tab.cpp"
     break;
@@ -5294,7 +5294,7 @@ yyreduce:
                 "Annotations are an IDL4 feature");
             }
 
-          AST_Annotation_Decl *decl = 0;
+          AST_Annotation_Decl *decl = nullptr;
           UTL_ScopedName *name = (yyvsp[0].idlist);
           AST_Annotation_Decl::escape_name (name);
 
@@ -5303,7 +5303,7 @@ yyreduce:
             lookup_by_name (name);
           if (d)
             {
-              decl = AST_Annotation_Decl::narrow_from_decl (d);
+              decl = dynamic_cast<AST_Annotation_Decl*> (d);
               if (decl)
                 {
                   idl_global->scopes ().push (decl);
@@ -5351,7 +5351,7 @@ yyreduce:
         {
           idl_global->ignore_lookup_errors_ = false;
           stack_based_lookup_for_primary_expr = false;
-          AST_Annotation_Appl *appl = 0;
+          AST_Annotation_Appl *appl = nullptr;
           UTL_ScopedName *name = (yyvsp[-2].idlist);
           AST_Annotation_Decl *decl = (yyvsp[-1].annotation_decl_val);
           AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val);
@@ -5389,7 +5389,7 @@ yyreduce:
   case 217:
 #line 2591 "fe/idl.ypp"
         {
-          (yyval.annotation_params_val) = 0;
+          (yyval.annotation_params_val) = nullptr;
         }
 #line 5395 "fe/idl.tab.cpp"
     break;
@@ -5399,7 +5399,7 @@ yyreduce:
         {
           AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params;
           AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param;
-          param->id = 0;
+          param->id = nullptr;
           param->expr = (yyvsp[0].exval);
           params->push (param);
           (yyval.annotation_params_val) = params;
@@ -5501,14 +5501,14 @@ yyreduce:
 #line 2668 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Native *node = 0;
+          AST_Native *node = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_NativeSeen);
 
           /*
            * Create a node representing a Native and add it to its
            * enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               node =
                 idl_global->gen ()->create_native (
@@ -5522,9 +5522,9 @@ yyreduce:
 
           (yyvsp[0].deval)->destroy ();
           delete (yyvsp[0].deval);
-          (yyvsp[0].deval) = 0;
+          (yyvsp[0].deval) = nullptr;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 5530 "fe/idl.tab.cpp"
     break;
@@ -5532,7 +5532,7 @@ yyreduce:
   case 230:
 #line 2696 "fe/idl.ypp"
         {
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 5538 "fe/idl.tab.cpp"
     break;
@@ -5552,8 +5552,8 @@ yyreduce:
           UTL_DeclList *decls = (yyvsp[0].dlval);
 
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          FE_Declarator *d = 0;
-          AST_Typedef *t = 0;
+          FE_Declarator *d = nullptr;
+          AST_Typedef *t = nullptr;
           unsigned long index = 0UL;
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclaratorsSeen);
 
@@ -5566,13 +5566,13 @@ yyreduce:
               for (UTL_DecllistActiveIterator l (decls); !l.is_done (); l.next ())
                 {
                   d = l.item ();
-                  if (d == 0)
+                  if (d == nullptr)
                     {
                       continue;
                     }
 
                   AST_Type *tp = d->compose (type_spec);
-                  if (tp == 0)
+                  if (tp == nullptr)
                     {
                       continue;
                     }
@@ -5605,7 +5605,7 @@ yyreduce:
               // This FE_Declarator class isn't destroyed with the AST.
               decls->destroy ();
               delete decls;
-              (yyvsp[0].dlval) = decls = 0;
+              (yyvsp[0].dlval) = decls = nullptr;
             }
 
           (yyval.dcval) = t;
@@ -5628,15 +5628,15 @@ yyreduce:
 #line 2787 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Decl *d = 0;
+          AST_Decl *d = nullptr;
 
-          if (s != 0)
+          if (s != nullptr)
             {
               d =
                 s->lookup_by_name ((yyvsp[0].idlist));
             }
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[0].idlist));
             }
@@ -5675,13 +5675,13 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
 
-          UTL_DeclList *dl = 0;
+          UTL_DeclList *dl = nullptr;
           ACE_NEW_RETURN (dl,
                           UTL_DeclList ((yyvsp[0].deval),
-                                        0),
+                                        nullptr),
                           1);
 
-          if ((yyvsp[-3].dlval) == 0)
+          if ((yyvsp[-3].dlval) == nullptr)
             {
               (yyval.dlval) = dl;
             }
@@ -5697,7 +5697,7 @@ yyreduce:
   case 258:
 #line 2877 "fe/idl.ypp"
         {
-          (yyval.dlval) = 0;
+          (yyval.dlval) = nullptr;
         }
 #line 5703 "fe/idl.tab.cpp"
     break;
@@ -5726,13 +5726,13 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
 
-          UTL_DeclList *dl = 0;
+          UTL_DeclList *dl = nullptr;
           ACE_NEW_RETURN (dl,
                           UTL_DeclList ((yyvsp[0].deval),
-                                        0),
+                                        nullptr),
                           1);
 
-          if ((yyvsp[-3].dlval) == 0)
+          if ((yyvsp[-3].dlval) == nullptr)
             {
               (yyval.dlval) = dl;
             }
@@ -5748,7 +5748,7 @@ yyreduce:
   case 264:
 #line 2924 "fe/idl.ypp"
         {
-          (yyval.dlval) = 0;
+          (yyval.dlval) = nullptr;
         }
 #line 5754 "fe/idl.tab.cpp"
     break;
@@ -5756,15 +5756,15 @@ yyreduce:
   case 265:
 #line 2931 "fe/idl.ypp"
         {
-          UTL_ScopedName *sn = 0;
+          UTL_ScopedName *sn = nullptr;
           ACE_NEW_RETURN (sn,
                           UTL_ScopedName ((yyvsp[0].idval),
-                                          0),
+                                          nullptr),
                           1);
           ACE_NEW_RETURN ((yyval.deval),
                           FE_Declarator (sn,
                                          FE_Declarator::FD_simple,
-                                         0),
+                                         nullptr),
                           1);
         }
 #line 5771 "fe/idl.tab.cpp"
@@ -5773,11 +5773,11 @@ yyreduce:
   case 266:
 #line 2947 "fe/idl.ypp"
         {
-          UTL_ScopedName *sn = 0;
+          UTL_ScopedName *sn = nullptr;
           ACE_NEW_RETURN (sn,
                           UTL_ScopedName (
                               (yyvsp[0].dcval)->local_name ()->copy (),
-                              0
+                              nullptr
                             ),
                           1);
           ACE_NEW_RETURN ((yyval.deval),
@@ -5938,14 +5938,14 @@ yyreduce:
 #line 3074 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ((yyvsp[0].idval), 0);
-          AST_Structure *d = 0;
+          UTL_ScopedName n ((yyvsp[0].idval), nullptr);
+          AST_Structure *d = nullptr;
 
           /*
            * Create a node representing a struct declaration. Add it
            * to the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               d =
                 idl_global->gen ()->create_structure (
@@ -5964,7 +5964,7 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
         }
 #line 5970 "fe/idl.tab.cpp"
     break;
@@ -5993,7 +5993,7 @@ yyreduce:
           /*
            * Done with this struct. Pop its scope off the scopes stack.
            */
-          (yyval.dcval) = AST_Structure::narrow_from_scope (
+          (yyval.dcval) = dynamic_cast<AST_Structure*> (
                    idl_global->scopes ().top_non_null ()
                  );
           idl_global->scopes ().pop ();
@@ -6039,15 +6039,15 @@ yyreduce:
 #line 3160 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          FE_Declarator *d = 0;
-          AST_Field *f = 0;
+          FE_Declarator *d = nullptr;
+          AST_Field *f = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsCompleted);
-          AST_Decls *members = 0;
+          AST_Decls *members = nullptr;
 
           /*
            * Check for illegal recursive use of type.
            */
-          if ((yyvsp[-4].dcval) != 0
+          if ((yyvsp[-4].dcval) != nullptr
               && AST_illegal_recursive_type ((yyvsp[-4].dcval)))
             {
               idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE,
@@ -6066,14 +6066,14 @@ yyreduce:
                 {
                   d = l.item ();
 
-                  if (d == 0)
+                  if (d == nullptr)
                     {
                       continue;
                     }
 
                   AST_Type *tp = d->compose ((yyvsp[-4].dcval));
 
-                  if (tp == 0)
+                  if (tp == nullptr)
                     {
                       continue;
                     }
@@ -6086,7 +6086,7 @@ yyreduce:
 
           (yyvsp[-2].dlval)->destroy ();
           delete (yyvsp[-2].dlval);
-          (yyvsp[-2].dlval) = 0;
+          (yyvsp[-2].dlval) = nullptr;
 
           (yyval.decls_val) = members;
         }
@@ -6139,24 +6139,24 @@ yyreduce:
 #line 3242 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ((yyvsp[-3].idval), 0);
-          AST_Union *u = 0;
+          UTL_ScopedName n ((yyvsp[-3].idval), nullptr);
+          AST_Union *u = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchOpenParSeen);
 
           /*
            * Create a node representing an empty union. Add it to its enclosing
            * scope.
            */
-          if (s != 0)
+          if (s != nullptr)
             {
-              u = idl_global->gen ()->create_union (0,
+              u = idl_global->gen ()->create_union (nullptr,
                                                     &n,
                                                     s->is_local (),
                                                     s->is_abstract ());
 
-              AST_Structure *st = AST_Structure::narrow_from_decl (u);
+              AST_Structure *st = dynamic_cast<AST_Structure*> (u);
               AST_Structure::fwd_redefinition_helper (st, s);
-              u = AST_Union::narrow_from_decl (st);
+              u = dynamic_cast<AST_Union*> (st);
               (void) s->fe_add_union (u);
             }
 
@@ -6194,32 +6194,32 @@ yyreduce:
           AST_Annotation_Appls *disc_annotations = (yyvsp[-3].annotations_val);
 
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ((yyvsp[-8].idval), 0);
+          UTL_ScopedName n ((yyvsp[-8].idval), nullptr);
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchCloseParSeen);
 
           /*
            * Create a node representing a union.
            */
-          if ((yyvsp[-2].dcval) != 0 && s != 0)
+          if ((yyvsp[-2].dcval) != nullptr && s != nullptr)
             {
               AST_ConcreteType *tp =
-                AST_ConcreteType::narrow_from_decl ((yyvsp[-2].dcval));
+                dynamic_cast<AST_ConcreteType*> ((yyvsp[-2].dcval));
 
-              if (tp == 0)
+              if (tp == nullptr)
                 {
                   idl_global->err ()->not_a_type ((yyvsp[-2].dcval));
                 }
               else
                 {
                   /* Create a union with a correct discriminator. */
-                  AST_Union *u = 0;
+                  AST_Union *u = nullptr;
                   u = idl_global->gen ()->create_union (tp,
                                                         &n,
                                                         s->is_local (),
                                                         s->is_abstract ());
 
                   /* Narrow the enclosing scope. */
-                  AST_Union *e = AST_Union::narrow_from_scope (top);
+                  AST_Union *e = dynamic_cast<AST_Union*> (top);
 
                   e->redefine (u);
                   e->disc_annotations (*disc_annotations); // Set Discriminator Annotations
@@ -6236,7 +6236,7 @@ yyreduce:
 
           (yyvsp[-8].idval)->destroy ();
           delete (yyvsp[-8].idval);
-          (yyvsp[-8].idval) = 0;
+          (yyvsp[-8].idval) = nullptr;
 
           delete disc_annotations;
         }
@@ -6267,11 +6267,11 @@ yyreduce:
           /*
            * Done with this union. Pop its scope from the scopes stack.
            */
-          (yyval.dcval) = AST_Union::narrow_from_scope (
+          (yyval.dcval) = dynamic_cast<AST_Union*> (
                    idl_global->scopes ().top_non_null ()
                  );
 
-          if ((yyval.dcval) != 0)
+          if ((yyval.dcval) != nullptr)
             {
               idl_global->scopes ().pop ();
             }
@@ -6335,9 +6335,9 @@ yyreduce:
 #line 3402 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Decl *d = 0;
-          AST_PredefinedType *p = 0;
-          AST_Typedef *t = 0;
+          AST_Decl *d = nullptr;
+          AST_PredefinedType *p = nullptr;
+          AST_Typedef *t = nullptr;
           bool found = false;
 
           /*
@@ -6349,7 +6349,7 @@ yyreduce:
           d =
             s->lookup_by_name ((yyvsp[0].idlist));
 
-          if (s != 0 && d != 0)
+          if (s != nullptr && d != nullptr)
             {
               while (!found)
                 {
@@ -6360,9 +6360,9 @@ yyreduce:
                       found = true;
                       break;
                     case AST_Decl::NT_pre_defined:
-                      p = AST_PredefinedType::narrow_from_decl (d);
+                      p = dynamic_cast<AST_PredefinedType*> (d);
 
-                      if (p != 0)
+                      if (p != nullptr)
                         {
                           switch (p->pt ())
                           {
@@ -6383,33 +6383,33 @@ yyreduce:
                               idl_global->err ()->error0 (
                                   UTL_Error::EIDL_DISC_TYPE
                                 );
-                              (yyval.dcval) = 0;
+                              (yyval.dcval) = nullptr;
                               found = true;
                               break;
                             default:
-                              (yyval.dcval) = 0;
+                              (yyval.dcval) = nullptr;
                               found = true;
                               break;
                           }
                         }
                       else
                         {
-                          (yyval.dcval) = 0;
+                          (yyval.dcval) = nullptr;
                           found = true;
                         }
 
                       break;
                     case AST_Decl::NT_typedef:
-                      t = AST_Typedef::narrow_from_decl (d);
+                      t = dynamic_cast<AST_Typedef*> (d);
 
-                      if (t != 0)
+                      if (t != nullptr)
                         {
                           d = t->base_type ();
                         }
 
                       break;
                     default:
-                      (yyval.dcval) = 0;
+                      (yyval.dcval) = nullptr;
                       found = true;
                       break;
                   }
@@ -6417,16 +6417,16 @@ yyreduce:
             }
           else
             {
-              (yyval.dcval) = 0;
+              (yyval.dcval) = nullptr;
             }
 
-          if ((yyval.dcval) == 0)
+          if ((yyval.dcval) == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[0].idlist));
 
               (yyvsp[0].idlist)->destroy ();
               delete (yyvsp[0].idlist);
-              (yyvsp[0].idlist) = 0;
+              (yyvsp[0].idlist) = nullptr;
 
               /* If we don't return here, we'll crash later.*/
               if (!idl_global->ignore_lookup_errors_)
@@ -6437,7 +6437,7 @@ yyreduce:
 
           (yyvsp[0].idlist)->destroy ();
           delete (yyvsp[0].idlist);
-          (yyvsp[0].idlist) = 0;
+          (yyvsp[0].idlist) = nullptr;
         }
 #line 6443 "fe/idl.tab.cpp"
     break;
@@ -6462,7 +6462,7 @@ yyreduce:
 #line 3527 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_UnionBranch *b = 0;
+          AST_UnionBranch *b = nullptr;
           AST_Annotation_Appls *annotations = (yyvsp[-3].annotations_val);
           AST_Field *f = (yyvsp[-2].ffval);
           idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemCompleted);
@@ -6471,7 +6471,7 @@ yyreduce:
            * Create several nodes representing branches of a union.
            * Add them to the enclosing scope (the union scope)
            */
-          if (s != 0 && (yyvsp[-5].llval) != 0 && (yyvsp[-2].ffval) != 0)
+          if (s != nullptr && (yyvsp[-5].llval) != nullptr && (yyvsp[-2].ffval) != nullptr)
             {
               b =
                 idl_global->gen ()->create_union_branch (
@@ -6486,7 +6486,7 @@ yyreduce:
               // but the rest still needs to be cleaned up.
               f->AST_Decl::destroy ();
               delete f;
-              f = 0;
+              f = nullptr;
             }
 
           delete annotations;
@@ -6525,13 +6525,13 @@ yyreduce:
   case 324:
 #line 3581 "fe/idl.ypp"
         {
-          UTL_LabelList *ll = 0;
+          UTL_LabelList *ll = nullptr;
           ACE_NEW_RETURN (ll,
                           UTL_LabelList ((yyvsp[0].ulval),
-                                         0),
+                                         nullptr),
                           1);
 
-          if ((yyvsp[-1].llval) == 0)
+          if ((yyvsp[-1].llval) == nullptr)
             {
               (yyval.llval) = ll;
             }
@@ -6547,7 +6547,7 @@ yyreduce:
   case 325:
 #line 3599 "fe/idl.ypp"
         {
-          (yyval.llval) = 0;
+          (yyval.llval) = nullptr;
         }
 #line 6553 "fe/idl.tab.cpp"
     break;
@@ -6567,7 +6567,7 @@ yyreduce:
 
           (yyval.ulval) = idl_global->gen ()->create_union_label (
                                        AST_UnionLabel::UL_default,
-                                       0
+                                       nullptr
                                      );
         }
 #line 6574 "fe/idl.tab.cpp"
@@ -6618,28 +6618,28 @@ yyreduce:
           /*
            * Check for illegal recursive use of type
            */
-          if ((yyvsp[-2].dcval) != 0
+          if ((yyvsp[-2].dcval) != nullptr
               && AST_illegal_recursive_type ((yyvsp[-2].dcval)))
             {
               idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, (yyvsp[-2].dcval));
 
-              (yyval.ffval) = 0;
+              (yyval.ffval) = nullptr;
             }
           /*
            * Create a field in a union branch
            */
-          else if ((yyvsp[-2].dcval) == 0
-                   || (yyvsp[0].deval) == 0)
+          else if ((yyvsp[-2].dcval) == nullptr
+                   || (yyvsp[0].deval) == nullptr)
             {
-              (yyval.ffval) = 0;
+              (yyval.ffval) = nullptr;
             }
           else
             {
               AST_Type *tp = (yyvsp[0].deval)->compose ((yyvsp[-2].dcval));
 
-              if (tp == 0)
+              if (tp == nullptr)
                 {
-                  (yyval.ffval) = 0;
+                  (yyval.ffval) = nullptr;
                 }
               else
                 {
@@ -6651,7 +6651,7 @@ yyreduce:
 
               (yyvsp[0].deval)->destroy ();
               delete (yyvsp[0].deval);
-              (yyvsp[0].deval) = 0;
+              (yyvsp[0].deval) = nullptr;
             }
         }
 #line 6658 "fe/idl.tab.cpp"
@@ -6662,13 +6662,13 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_StructureFwd *d = 0;
+                            nullptr);
+          AST_StructureFwd *d = nullptr;
 
           /*
            * Create a node representing a forward declaration of a struct.
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               d = idl_global->gen ()->create_structure_fwd (&n);
               (void) s->fe_add_structure_fwd (d);
@@ -6676,7 +6676,7 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           (yyval.dcval) = d;
         }
@@ -6688,13 +6688,13 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_UnionFwd *u = 0;
+                            nullptr);
+          AST_UnionFwd *u = nullptr;
 
           /*
            * Create a node representing a forward declaration of a union.
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               u = idl_global->gen ()->create_union_fwd (&n);
               (void) s->fe_add_union_fwd (u);
@@ -6702,7 +6702,7 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
         }
 #line 6708 "fe/idl.tab.cpp"
     break;
@@ -6719,15 +6719,15 @@ yyreduce:
 #line 3741 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ((yyvsp[0].idval), 0);
-          AST_Enum *e = 0;
+          UTL_ScopedName n ((yyvsp[0].idval), nullptr);
+          AST_Enum *e = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_EnumIDSeen);
 
           /*
            * Create a node representing an enum and add it to its
            * enclosing scope.
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               e = idl_global->gen ()->create_enum (&n,
                                                    s->is_local (),
@@ -6745,7 +6745,7 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
         }
 #line 6751 "fe/idl.tab.cpp"
     break;
@@ -6774,13 +6774,13 @@ yyreduce:
           /*
            * Done with this enum. Pop its scope from the scopes stack.
            */
-          if (idl_global->scopes ().top () == 0)
+          if (idl_global->scopes ().top () == nullptr)
             {
-              (yyval.dcval) = 0;
+              (yyval.dcval) = nullptr;
             }
           else
             {
-              (yyval.dcval) = AST_Enum::narrow_from_scope (
+              (yyval.dcval) = dynamic_cast<AST_Enum*> (
                        idl_global->scopes ().top_non_null ()
                      );
               idl_global->scopes ().pop ();
@@ -6804,21 +6804,21 @@ yyreduce:
           AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
           Identifier id ((yyvsp[0].strval));
           ACE::strdelete ((yyvsp[0].strval));
-          (yyvsp[0].strval) = 0;
-          UTL_ScopedName n (&id, 0);
-          AST_EnumVal *e = 0;
-          AST_Enum *c = 0;
+          (yyvsp[0].strval) = nullptr;
+          UTL_ScopedName n (&id, nullptr);
+          AST_EnumVal *e = nullptr;
+          AST_Enum *c = nullptr;
 
           /*
            * Create a node representing one enumerator in an enum
            * Add it to the enclosing scope (the enum scope)
            */
-          if (s != 0
+          if (s != nullptr
               && s->scope_node_type () == AST_Decl::NT_enum)
             {
-              c = AST_Enum::narrow_from_scope (s);
+              c = dynamic_cast<AST_Enum*> (s);
 
-              if (c != 0)
+              if (c != nullptr)
                 {
                   e = idl_global->gen ()->create_enum_val (
                                               c->next_enum_val (),
@@ -6857,10 +6857,10 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
 
-          AST_Sequence *seq = 0;
+          AST_Sequence *seq = nullptr;
           Decl_Annotations_Pair *seq_head = (yyvsp[-5].decl_annotations_pair_val);
-          AST_Decl *type = 0;
-          AST_Annotation_Appls *type_annotations = 0;
+          AST_Decl *type = nullptr;
+          AST_Annotation_Appls *type_annotations = nullptr;
           if (seq_head)
             {
               type = seq_head->decl;
@@ -6871,7 +6871,7 @@ yyreduce:
           /*
            * Remove sequence marker from scopes stack.
            */
-          if (idl_global->scopes ().top () == 0)
+          if (idl_global->scopes ().top () == nullptr)
             {
               idl_global->scopes ().pop ();
             }
@@ -6881,10 +6881,10 @@ yyreduce:
           /*
            * Create a node representing a sequence
            */
-          AST_Expression::AST_ExprValue *ev = 0;
-          AST_Param_Holder *param_holder = 0;
+          AST_Expression::AST_ExprValue *ev = nullptr;
+          AST_Param_Holder *param_holder = nullptr;
 
-          if ((yyvsp[-2].exval) != 0)
+          if ((yyvsp[-2].exval) != nullptr)
             {
               param_holder =
                 (yyvsp[-2].exval)->param_holder ();
@@ -6895,17 +6895,17 @@ yyreduce:
           // If the expression corresponds to a template parameter,
           // it's ok for the coercion to fail at this point. We check
           // for a type mismatch below.
-          if (0 == (yyvsp[-2].exval)
-              || (0 == ev && 0 == param_holder))
+          if (nullptr == (yyvsp[-2].exval)
+              || (nullptr == ev && nullptr == param_holder))
             {
               idl_global->err ()->coercion_error ((yyvsp[-2].exval),
                                                   AST_Expression::EV_ulong);
             }
           else if (type)
             {
-              AST_Type *tp = AST_Type::narrow_from_decl (type);
+              AST_Type *tp = dynamic_cast<AST_Type*> (type);
 
-              if (0 == tp)
+              if (nullptr == tp)
                 {
                   ; // Error will be caught in FE_Declarator.
                 }
@@ -6913,7 +6913,7 @@ yyreduce:
                 {
                   Identifier id ("sequence");
                   UTL_ScopedName sn (&id,
-                                     0);
+                                     nullptr);
 
                   seq =
                     idl_global->gen ()->create_sequence (
@@ -6931,7 +6931,7 @@ yyreduce:
 
           delete type_annotations;
           delete ev;
-          ev = 0;
+          ev = nullptr;
           (yyval.dcval) = seq;
         }
 #line 6938 "fe/idl.tab.cpp"
@@ -6942,10 +6942,10 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
 
-          AST_Sequence *seq = 0;
+          AST_Sequence *seq = nullptr;
           Decl_Annotations_Pair *seq_head = (yyvsp[-1].decl_annotations_pair_val);
-          AST_Decl *type = 0;
-          AST_Annotation_Appls *type_annotations = 0;
+          AST_Decl *type = nullptr;
+          AST_Annotation_Appls *type_annotations = nullptr;
           if (seq_head)
             {
               type = seq_head->decl;
@@ -6956,7 +6956,7 @@ yyreduce:
           /*
            * Remove sequence marker from scopes stack.
            */
-          if (idl_global->scopes ().top () == 0)
+          if (idl_global->scopes ().top () == nullptr)
             {
              idl_global->scopes ().pop ();
             }
@@ -6968,16 +6968,16 @@ yyreduce:
            */
           if (type)
             {
-              AST_Type *tp = AST_Type::narrow_from_decl (type);
+              AST_Type *tp = dynamic_cast<AST_Type*> (type);
 
-              if (tp == 0)
+              if (tp == nullptr)
                 {
                   ; // Error will be caught in FE_Declarator.
                 }
               else
                 {
                   Identifier id ("sequence");
-                  UTL_ScopedName sn (&id, 0);
+                  UTL_ScopedName sn (&id, nullptr);
                   ACE_CDR::ULong bound = 0UL;
 
                   seq =
@@ -7011,7 +7011,7 @@ yyreduce:
           /*
            * Push a sequence marker on scopes stack.
            */
-          idl_global->scopes ().push (0);
+          idl_global->scopes ().push (nullptr);
         }
 #line 7017 "fe/idl.tab.cpp"
     break;
@@ -7069,18 +7069,18 @@ yyreduce:
           /*
            * Create a node representing a string.
            */
-          AST_Expression::AST_ExprValue *ev = 0;
+          AST_Expression::AST_ExprValue *ev = nullptr;
 
-          if ((yyvsp[-2].exval) != 0)
+          if ((yyvsp[-2].exval) != nullptr)
             {
               ev = (yyvsp[-2].exval)->coerce (AST_Expression::EV_ulong);
             }
 
-          if (0 == (yyvsp[-2].exval) || 0 == ev)
+          if (nullptr == (yyvsp[-2].exval) || nullptr == ev)
             {
               idl_global->err ()->coercion_error ((yyvsp[-2].exval),
                                                   AST_Expression::EV_ulong);
-              (yyval.dcval) = 0;
+              (yyval.dcval) = nullptr;
             }
           else
             {
@@ -7090,7 +7090,7 @@ yyreduce:
                * Add this AST_String to the types defined in the global scope.
                */
               idl_global->root ()->fe_add_string (
-                AST_String::narrow_from_decl (
+                dynamic_cast<AST_String*> (
                   tao_string_decl));
 
               idl_global->err ()->anonymous_type_diagnostic ();
@@ -7099,7 +7099,7 @@ yyreduce:
             }
 
           delete ev;
-          ev = 0;
+          ev = nullptr;
         }
 #line 7105 "fe/idl.tab.cpp"
     break;
@@ -7123,7 +7123,7 @@ yyreduce:
            * Add this AST_String to the types defined in the global scope.
            */
           idl_global->root ()->fe_add_string (
-            AST_String::narrow_from_decl (
+            dynamic_cast<AST_String*> (
               tao_string_decl));
 
           (yyval.dcval) = tao_string_decl;
@@ -7163,12 +7163,12 @@ yyreduce:
           /*
            * Create a node representing a string.
            */
-          if ((yyvsp[-2].exval) == 0
-              || (yyvsp[-2].exval)->coerce (AST_Expression::EV_ulong) == 0)
+          if ((yyvsp[-2].exval) == nullptr
+              || (yyvsp[-2].exval)->coerce (AST_Expression::EV_ulong) == nullptr)
             {
               idl_global->err ()->coercion_error ((yyvsp[-2].exval),
                                                   AST_Expression::EV_ulong);
-              (yyval.dcval) = 0;
+              (yyval.dcval) = nullptr;
             }
           else
             {
@@ -7178,7 +7178,7 @@ yyreduce:
                * Add this AST_String to the types defined in the global scope.
                */
               idl_global->root ()->fe_add_string (
-                AST_String::narrow_from_decl (
+                dynamic_cast<AST_String*> (
                   string));
 
               idl_global->err ()->anonymous_type_diagnostic ();
@@ -7208,7 +7208,7 @@ yyreduce:
            * Add this AST_String to the types defined in the global scope.
            */
           idl_global->root ()->fe_add_string (
-            AST_String::narrow_from_decl (
+            dynamic_cast<AST_String*> (
               string));
 
           (yyval.dcval) = string;
@@ -7237,7 +7237,7 @@ yyreduce:
         {
           idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted);
 
-          AST_Array *array = 0;
+          AST_Array *array = nullptr;
           AST_Annotation_Appls *base_type_annotations = (yyvsp[-1].annotations_val);
           UTL_ExprList *array_dims = (yyvsp[0].elval);
 
@@ -7247,14 +7247,14 @@ yyreduce:
           if (array_dims)
             {
               UTL_ScopedName sn ((yyvsp[-3].idval),
-                                 0);
+                                 nullptr);
               array =
                 idl_global->gen ()->create_array (
                                         &sn,
                                         array_dims->length (),
                                         array_dims,
-                                        0,
-                                        0
+                                        false,
+                                        false
                                       );
               array->base_type_annotations (*base_type_annotations);
               sn.destroy ();
@@ -7286,13 +7286,13 @@ yyreduce:
   case 366:
 #line 4246 "fe/idl.ypp"
         {
-          UTL_ExprList *el = 0;
+          UTL_ExprList *el = nullptr;
           ACE_NEW_RETURN (el,
                           UTL_ExprList ((yyvsp[0].exval),
-                                        0),
+                                        nullptr),
                           1);
 
-          if ((yyvsp[-1].elval) == 0)
+          if ((yyvsp[-1].elval) == nullptr)
             {
               (yyval.elval) = el;
             }
@@ -7308,7 +7308,7 @@ yyreduce:
   case 367:
 #line 4264 "fe/idl.ypp"
         {
-          (yyval.elval) = 0;
+          (yyval.elval) = nullptr;
         }
 #line 7314 "fe/idl.tab.cpp"
     break;
@@ -7338,10 +7338,10 @@ yyreduce:
            * Array dimensions are expressions which must be coerced to
            * positive integers.
            */
-          AST_Expression::AST_ExprValue *ev = 0;
-          AST_Param_Holder *param_holder = 0;
+          AST_Expression::AST_ExprValue *ev = nullptr;
+          AST_Param_Holder *param_holder = nullptr;
 
-          if ((yyvsp[-2].exval) != 0)
+          if ((yyvsp[-2].exval) != nullptr)
             {
               param_holder =
                 (yyvsp[-2].exval)->param_holder ();
@@ -7350,16 +7350,16 @@ yyreduce:
                 (yyvsp[-2].exval)->coerce (AST_Expression::EV_ulong);
             }
 
-          if (0 == (yyvsp[-2].exval)
-              || (ev == 0 && param_holder == 0))
+          if (nullptr == (yyvsp[-2].exval)
+              || (ev == nullptr && param_holder == nullptr))
             {
               idl_global->err ()->coercion_error ((yyvsp[-2].exval),
                                                   AST_Expression::EV_ulong);
-              (yyval.exval) = 0;
+              (yyval.exval) = nullptr;
             }
           else
             {
-              if (param_holder != 0)
+              if (param_holder != nullptr)
                 {
                   AST_Expression::ExprType et =
                     param_holder->info ()->const_type_;
@@ -7373,7 +7373,7 @@ yyreduce:
                         param_holder->info ()->name_.c_str ());
 
                       delete ev;
-                      ev = 0;
+                      ev = nullptr;
                       return 1;
                     }
                 }
@@ -7382,7 +7382,7 @@ yyreduce:
             }
 
           delete ev;
-          ev = 0;
+          ev = nullptr;
         }
 #line 7388 "fe/idl.tab.cpp"
     break;
@@ -7423,8 +7423,8 @@ yyreduce:
 #line 4357 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Attribute *a = 0;
-          FE_Declarator *d = 0;
+          AST_Attribute *a = nullptr;
+          FE_Declarator *d = nullptr;
 
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
 
@@ -7432,20 +7432,20 @@ yyreduce:
            * Create nodes representing attributes and add them to the
            * enclosing scope.
            */
-          if (s != 0 && (yyvsp[-4].dcval) != 0 && (yyvsp[-2].dlval) != 0)
+          if (s != nullptr && (yyvsp[-4].dcval) != nullptr && (yyvsp[-2].dlval) != nullptr)
             {
               for (UTL_DecllistActiveIterator l ((yyvsp[-2].dlval)); !l.is_done (); l.next ())
                 {
                   d = l.item ();
 
-                  if (d == 0)
+                  if (d == nullptr)
                     {
                       continue;
                     }
 
                   AST_Type *tp = d->compose ((yyvsp[-4].dcval));
 
-                  if (tp == 0)
+                  if (tp == nullptr)
                     {
                       continue;
                     }
@@ -7453,13 +7453,13 @@ yyreduce:
                   a = idl_global->gen ()->create_attribute (
                     true, tp, d->name (), s->is_local (), s->is_abstract ());
 
-                  if ((yyvsp[0].nlval) != 0)
+                  if ((yyvsp[0].nlval) != nullptr)
                     {
                       (void) a->fe_add_get_exceptions ((yyvsp[0].nlval));
 
                       (yyvsp[0].nlval)->destroy ();
                       delete (yyvsp[0].nlval);
-                      (yyvsp[0].nlval) = 0;
+                      (yyvsp[0].nlval) = nullptr;
                     }
 
                   (void) s->fe_add_attribute (a);
@@ -7468,7 +7468,7 @@ yyreduce:
 
           (yyvsp[-2].dlval)->destroy ();
           delete (yyvsp[-2].dlval);
-          (yyvsp[-2].dlval) = 0;
+          (yyvsp[-2].dlval) = nullptr;
 
           (yyval.dcval) = a;
         }
@@ -7511,8 +7511,8 @@ yyreduce:
 #line 4428 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Attribute *a = 0;
-          FE_Declarator *d = 0;
+          AST_Attribute *a = nullptr;
+          FE_Declarator *d = nullptr;
 
           idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseCompleted);
 
@@ -7520,20 +7520,20 @@ yyreduce:
            * Create nodes representing attributes and add them to the
            * enclosing scope.
            */
-          if (s != 0 && (yyvsp[-6].dcval) != 0 && (yyvsp[-4].dlval) != 0)
+          if (s != nullptr && (yyvsp[-6].dcval) != nullptr && (yyvsp[-4].dlval) != nullptr)
             {
               for (UTL_DecllistActiveIterator l ((yyvsp[-4].dlval)); !l.is_done (); l.next ())
                 {
                   d = l.item ();
 
-                  if (d == 0)
+                  if (d == nullptr)
                     {
                       continue;
                     }
 
                   AST_Type *tp = d->compose ((yyvsp[-6].dcval));
 
-                  if (tp == 0)
+                  if (tp == nullptr)
                     {
                       continue;
                     }
@@ -7541,22 +7541,22 @@ yyreduce:
                   a = idl_global->gen ()->create_attribute (
                    false, tp, d->name (), s->is_local (), s->is_abstract ());
 
-                  if ((yyvsp[-2].nlval) != 0)
+                  if ((yyvsp[-2].nlval) != nullptr)
                     {
                       (void) a->fe_add_get_exceptions ((yyvsp[-2].nlval));
 
                       (yyvsp[-2].nlval)->destroy ();
                       delete (yyvsp[-2].nlval);
-                      (yyvsp[-2].nlval) = 0;
+                      (yyvsp[-2].nlval) = nullptr;
                     }
 
-                  if ((yyvsp[0].nlval) != 0)
+                  if ((yyvsp[0].nlval) != nullptr)
                     {
                       (void) a->fe_add_set_exceptions ((yyvsp[0].nlval));
 
                       (yyvsp[0].nlval)->destroy ();
                       delete (yyvsp[0].nlval);
-                      (yyvsp[0].nlval) = 0;
+                      (yyvsp[0].nlval) = nullptr;
                     }
 
                   (void) s->fe_add_attribute (a);
@@ -7565,7 +7565,7 @@ yyreduce:
 
           (yyvsp[-4].dlval)->destroy ();
           delete (yyvsp[-4].dlval);
-          (yyvsp[-4].dlval) = 0;
+          (yyvsp[-4].dlval) = nullptr;
 
           (yyval.dcval) = a;
         }
@@ -7585,8 +7585,8 @@ yyreduce:
         {
           Identifier *&id = (yyvsp[0].idval);
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName scoped_name (id, 0);
-          AST_Exception *exception = 0;
+          UTL_ScopedName scoped_name (id, nullptr);
+          AST_Exception *exception = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_ExceptIDSeen);
 
           /*
@@ -7609,7 +7609,7 @@ yyreduce:
 
           id->destroy ();
           delete id;
-          id = 0;
+          id = nullptr;
 
           (yyval.dcval) = exception;
         }
@@ -7657,28 +7657,28 @@ yyreduce:
   case 389:
 #line 4553 "fe/idl.ypp"
         {
-          AST_Operation *op = 0;
+          AST_Operation *op = nullptr;
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
 
           AST_Operation::Flags op_flags = (yyvsp[-3].ofval);
           AST_Decl *type_node = (yyvsp[-2].dcval);
-          (yyvsp[-2].dcval) = 0;
+          (yyvsp[-2].dcval) = nullptr;
           Identifier id ((yyvsp[0].strval));
           ACE::strdelete ((yyvsp[0].strval));
-          (yyvsp[0].strval) = 0;
+          (yyvsp[0].strval) = nullptr;
 
-          UTL_ScopedName name (&id, 0);
+          UTL_ScopedName name (&id, nullptr);
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
 
           /*
            * Create a node representing an operation on an interface
            * and add it to its enclosing scope.
            */
-          if (scope != 0 && type_node != 0)
+          if (scope != nullptr && type_node != nullptr)
             {
-              AST_Type *type = AST_Type::narrow_from_decl (type_node);
+              AST_Type *type = dynamic_cast<AST_Type*> (type_node);
 
-              if (type == 0)
+              if (type == nullptr)
                 {
                   idl_global->err ()->not_a_type (type_node);
                 }
@@ -7702,7 +7702,7 @@ yyreduce:
                       idl_global->err ()->local_remote_mismatch (type, op);
                       op->destroy ();
                       delete op;
-                      op = 0;
+                      op = nullptr;
                     }
                   else
                     {
@@ -7739,22 +7739,22 @@ yyreduce:
 #line 4622 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Operation *o = 0;
+          AST_Operation *o = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpCompleted);
 
           /*
            * Add exceptions and context to the operation.
            */
-          if (s != 0 && s->scope_node_type () == AST_Decl::NT_op)
+          if (s != nullptr && s->scope_node_type () == AST_Decl::NT_op)
             {
-              o = AST_Operation::narrow_from_scope (s);
+              o = dynamic_cast<AST_Operation*> (s);
 
-              if ((yyvsp[-2].nlval) != 0 && o != 0)
+              if ((yyvsp[-2].nlval) != nullptr && o != nullptr)
                 {
                   (void) o->fe_add_exceptions ((yyvsp[-2].nlval));
                 }
 
-              if ((yyvsp[0].slval) != 0)
+              if ((yyvsp[0].slval) != nullptr)
                 {
                   (void) o->fe_add_context ((yyvsp[0].slval));
                 }
@@ -7836,18 +7836,18 @@ yyreduce:
 
           Identifier id ((yyvsp[0].strval));
           ACE::strdelete ((yyvsp[0].strval));
-          (yyvsp[0].strval) = 0;
+          (yyvsp[0].strval) = nullptr;
 
           UTL_ScopedName n (&id,
-                            0);
-          AST_Factory *factory = 0;
+                            nullptr);
+          AST_Factory *factory = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
 
           /*
            * Create a node representing an factory construct
            * and add it to its enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               factory = idl_global->gen ()->create_factory (&n);
               (void) s->fe_add_factory (factory);
@@ -7879,7 +7879,7 @@ yyreduce:
           if ((yyvsp[0].nlval))
             {
               UTL_Scope *s = idl_global->scopes ().top_non_null ();
-              AST_Factory *f = AST_Factory::narrow_from_scope (s);
+              AST_Factory *f = dynamic_cast<AST_Factory*> (s);
               (void) f->fe_add_exceptions ((yyvsp[0].nlval));
             }
 
@@ -7950,20 +7950,20 @@ yyreduce:
 #line 4794 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Argument *a = 0;
+          AST_Argument *a = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParDeclSeen);
 
           /*
            * Create a node representing an argument to an operation
            * Add it to the enclosing scope (the operation scope).
            */
-          if ((yyvsp[-2].dcval) != 0
-              && (yyvsp[0].deval) != 0 &&
-              s != 0)
+          if ((yyvsp[-2].dcval) != nullptr
+              && (yyvsp[0].deval) != nullptr &&
+              s != nullptr)
             {
               AST_Type *tp = (yyvsp[0].deval)->compose ((yyvsp[-2].dcval));
 
-              if (tp != 0)
+              if (tp != nullptr)
                 {
                   a = idl_global->gen ()->create_argument (
                           AST_Argument::dir_IN,
@@ -7977,7 +7977,7 @@ yyreduce:
 
           (yyvsp[0].deval)->destroy ();
           delete (yyvsp[0].deval);
-          (yyvsp[0].deval) = 0;
+          (yyvsp[0].deval) = nullptr;
         }
 #line 7983 "fe/idl.tab.cpp"
     break;
@@ -8042,20 +8042,20 @@ yyreduce:
 #line 4869 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Argument *a = 0;
+          AST_Argument *a = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpParDeclSeen);
 
           /*
            * Create a node representing an argument to an operation
            * Add it to the enclosing scope (the operation scope).
            */
-          if ((yyvsp[-2].dcval) != 0
-              && (yyvsp[0].deval) != 0
-              && s != 0)
+          if ((yyvsp[-2].dcval) != nullptr
+              && (yyvsp[0].deval) != nullptr
+              && s != nullptr)
             {
               AST_Type *tp = (yyvsp[0].deval)->compose ((yyvsp[-2].dcval));
 
-              if (tp != 0)
+              if (tp != nullptr)
                 {
                   if (!s->is_local () && tp->is_local ())
                     {
@@ -8076,7 +8076,7 @@ yyreduce:
 
           (yyvsp[0].deval)->destroy ();
           delete (yyvsp[0].deval);
-          (yyvsp[0].deval) = 0;
+          (yyvsp[0].deval) = nullptr;
         }
 #line 8082 "fe/idl.tab.cpp"
     break;
@@ -8096,19 +8096,19 @@ yyreduce:
 #line 4920 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Decl *d = 0;
+          AST_Decl *d = nullptr;
           UTL_ScopedName *n = (yyvsp[0].idlist);
 
-          if (s != 0)
+          if (s != nullptr)
             {
               d = s->lookup_by_name (n, false, false);
             }
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error (n);
               (yyvsp[0].idlist)->destroy ();
-              (yyvsp[0].idlist) = 0;
+              (yyvsp[0].idlist) = nullptr;
 
               /* If we don't return here, we'll crash later.*/
               return 1;
@@ -8117,8 +8117,8 @@ yyreduce:
             {
               d->last_referenced_as ((yyvsp[0].idlist));
               AST_Decl::NodeType nt = d->node_type ();
-              AST_Type *t = AST_Type::narrow_from_decl (d);
-              AST_Typedef *td = 0;
+              AST_Type *t = dynamic_cast<AST_Type*> (d);
+              AST_Typedef *td = nullptr;
               bool can_be_undefined = false;
 
               if (nt == AST_Decl::NT_typedef)
@@ -8126,14 +8126,14 @@ yyreduce:
                   // This code block ensures that a sequence of
                   // as-yet-undefined struct or union isn't used
                   // as a return type or argument.
-                  td = AST_Typedef::narrow_from_decl (d);
+                  td = dynamic_cast<AST_Typedef*> (d);
                   AST_Type *pbt = td->primitive_base_type ();
 
                   if (pbt->node_type () == AST_Decl::NT_sequence)
                     {
                       t = pbt;
                       AST_Sequence *seq_type =
-                        AST_Sequence::narrow_from_decl (pbt);
+                        dynamic_cast<AST_Sequence*> (pbt);
                       AST_Type *elem_type =
                         seq_type->base_type ();
                       AST_Decl::NodeType elem_nt =
@@ -8142,7 +8142,7 @@ yyreduce:
                       if (elem_nt == AST_Decl::NT_typedef)
                         {
                           AST_Typedef *elem_td =
-                            AST_Typedef::narrow_from_decl (elem_type);
+                            dynamic_cast<AST_Typedef*> (elem_type);
                           elem_type = elem_td->primitive_base_type ();
                           elem_nt = elem_type->node_type ();
                         }
@@ -8174,9 +8174,9 @@ yyreduce:
                   // want the full definition, but we need to
                   // check that it's been fully defined.
                   AST_StructureFwd *fwd =
-                    AST_StructureFwd::narrow_from_decl (d);
+                    dynamic_cast<AST_StructureFwd*> (d);
 
-                  if (fwd != 0)
+                  if (fwd != nullptr)
                     {
                       t = fwd->full_definition ();
 
@@ -8252,7 +8252,7 @@ yyreduce:
   case 434:
 #line 5056 "fe/idl.ypp"
         {
-          (yyval.nlval) = 0;
+          (yyval.nlval) = nullptr;
         }
 #line 8258 "fe/idl.tab.cpp"
     break;
@@ -8285,7 +8285,7 @@ yyreduce:
   case 438:
 #line 5077 "fe/idl.ypp"
         {
-          (yyval.nlval) = 0;
+          (yyval.nlval) = nullptr;
         }
 #line 8291 "fe/idl.tab.cpp"
     break;
@@ -8318,7 +8318,7 @@ yyreduce:
   case 442:
 #line 5098 "fe/idl.ypp"
         {
-          (yyval.nlval) = 0;
+          (yyval.nlval) = nullptr;
         }
 #line 8324 "fe/idl.tab.cpp"
     break;
@@ -8351,7 +8351,7 @@ yyreduce:
   case 446:
 #line 5119 "fe/idl.ypp"
         {
-          (yyval.slval) = 0;
+          (yyval.slval) = nullptr;
         }
 #line 8357 "fe/idl.tab.cpp"
     break;
@@ -8378,13 +8378,13 @@ yyreduce:
   case 449:
 #line 5141 "fe/idl.ypp"
         {
-          UTL_StrList *sl = 0;
+          UTL_StrList *sl = nullptr;
           ACE_NEW_RETURN (sl,
                           UTL_StrList ((yyvsp[0].sval),
-                                       0),
+                                       nullptr),
                           1);
 
-          if ((yyvsp[-3].slval) == 0)
+          if ((yyvsp[-3].slval) == nullptr)
             {
               (yyval.slval) = sl;
             }
@@ -8400,7 +8400,7 @@ yyreduce:
   case 450:
 #line 5159 "fe/idl.ypp"
         {
-          (yyval.slval) = 0;
+          (yyval.slval) = nullptr;
         }
 #line 8406 "fe/idl.tab.cpp"
     break;
@@ -8412,7 +8412,7 @@ yyreduce:
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-1].idlist));
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
             }
@@ -8425,13 +8425,13 @@ yyreduce:
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyvsp[0].sval)->destroy ();
           delete (yyvsp[0].sval);
-          (yyvsp[0].sval) = 0;
+          (yyvsp[0].sval) = nullptr;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 8437 "fe/idl.tab.cpp"
     break;
@@ -8452,7 +8452,7 @@ yyreduce:
                 s->lookup_by_name ((yyvsp[-1].idlist));
             }
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
             }
@@ -8465,13 +8465,13 @@ yyreduce:
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyvsp[0].sval)->destroy ();
           delete (yyvsp[0].sval);
-          (yyvsp[0].sval) = 0;
+          (yyvsp[0].sval) = nullptr;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 8477 "fe/idl.tab.cpp"
     break;
@@ -8481,8 +8481,8 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_ComponentFwd *f = 0;
+                            nullptr);
+          AST_ComponentFwd *f = nullptr;
           idl_global->set_parse_state (
                           IDL_GlobalData::PS_ComponentForwardSeen
                         );
@@ -8491,7 +8491,7 @@ yyreduce:
            * Create a node representing a forward declaration of a
            * component. Store it in the enclosing scope.
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               f = idl_global->gen ()->create_component_fwd (&n);
               (void) s->fe_add_component_fwd (f);
@@ -8499,9 +8499,9 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 8507 "fe/idl.tab.cpp"
     break;
@@ -8511,7 +8511,7 @@ yyreduce:
         {
           FE_ComponentHeader *&component_header = (yyvsp[0].chval);
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
-          AST_Component *component = 0;
+          AST_Component *component = nullptr;
 
           /*
            * Make a new component node and add it to the enclosing scope.
@@ -8539,7 +8539,7 @@ yyreduce:
               // This FE_ComponentHeader class isn't destroyed with the AST.
               component_header->destroy ();
               delete component_header;
-              component_header = 0;
+              component_header = nullptr;
             }
 
           /*
@@ -8608,10 +8608,10 @@ yyreduce:
            * Create an AST representation of the information in the header
            * part of a component.
            */
-          UTL_ScopedName *n = 0;
+          UTL_ScopedName *n = nullptr;
           ACE_NEW_RETURN (n,
                           UTL_ScopedName ((yyvsp[-4].idval),
-                                          0),
+                                          nullptr),
                           1);
           ACE_NEW_RETURN ((yyval.chval),
                           FE_ComponentHeader (n,
@@ -8620,18 +8620,18 @@ yyreduce:
                                               false),
                           1);
 
-          if (0 != (yyvsp[0].nlval))
+          if (nullptr != (yyvsp[0].nlval))
             {
               (yyvsp[0].nlval)->destroy ();
               delete (yyvsp[0].nlval);
-              (yyvsp[0].nlval) = 0;
+              (yyvsp[0].nlval) = nullptr;
             }
 
-          if (0 != (yyvsp[-2].idlist))
+          if (nullptr != (yyvsp[-2].idlist))
             {
               (yyvsp[-2].idlist)->destroy ();
               delete (yyvsp[-2].idlist);
-              (yyvsp[-2].idlist) = 0;
+              (yyvsp[-2].idlist) = nullptr;
             }
         }
 #line 8638 "fe/idl.tab.cpp"
@@ -8656,7 +8656,7 @@ yyreduce:
   case 465:
 #line 5388 "fe/idl.ypp"
         {
-          (yyval.idlist) = 0;
+          (yyval.idlist) = nullptr;
         }
 #line 8662 "fe/idl.tab.cpp"
     break;
@@ -8805,12 +8805,12 @@ yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
           AST_Decl::NodeType nt = AST_Decl::NT_type;
-          AST_Param_Holder *ph = 0;
+          AST_Param_Holder *ph = nullptr;
 
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-1].idlist), true, false);
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
               so_far_so_good = false;
@@ -8825,7 +8825,7 @@ yyreduce:
                   case AST_Decl::NT_interface:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -8861,18 +8861,18 @@ yyreduce:
                 }
             }
 
-          AST_Provides *provides = 0;
+          AST_Provides *provides = nullptr;
 
           if (so_far_so_good)
             {
               AST_Type *port_interface_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ((yyvsp[0].idval));
 
               UTL_ScopedName sn ((yyvsp[0].idval),
-                                 0);
+                                 nullptr);
 
               provides = idl_global->gen ()->create_provides (
                 &sn, port_interface_type);
@@ -8882,11 +8882,11 @@ yyreduce:
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           (yyval.dcval) = dynamic_cast<AST_Decl *> (provides);
         }
@@ -8906,16 +8906,16 @@ yyreduce:
   case 485:
 #line 5579 "fe/idl.ypp"
         {
-          Identifier *corba_id = 0;
+          Identifier *corba_id = nullptr;
 
           ACE_NEW_RETURN (corba_id,
                           Identifier ("Object"),
                           1);
 
-          UTL_IdList *conc_name = 0;
+          UTL_IdList *conc_name = nullptr;
           ACE_NEW_RETURN (conc_name,
                           UTL_IdList (corba_id,
-                                      0),
+                                      nullptr),
                           1);
 
           ACE_NEW_RETURN (corba_id,
@@ -8936,12 +8936,12 @@ yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
           AST_Decl::NodeType nt = AST_Decl::NT_type;
-          AST_Param_Holder *ph = 0;
+          AST_Param_Holder *ph = nullptr;
 
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-1].idlist), true, false);
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
               so_far_so_good = false;
@@ -8956,7 +8956,7 @@ yyreduce:
                   case AST_Decl::NT_interface:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -8992,27 +8992,27 @@ yyreduce:
                 }
             }
 
-          AST_Uses *uses = 0;
+          AST_Uses *uses = nullptr;
 
           if (so_far_so_good)
             {
               AST_Type *port_interface_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ((yyvsp[0].idval));
 
               UTL_ScopedName sn ((yyvsp[0].idval),
-                                 0);
+                                 nullptr);
 
               uses = idl_global->gen ()->create_uses (
                 &sn, port_interface_type, (yyvsp[-2].bval));
               s->fe_add_uses (uses);
 
               AST_Component *c =
-                AST_Component::narrow_from_scope (s);
+                dynamic_cast<AST_Component*> (s);
 
-              if (c != 0
+              if (c != nullptr
                   && uses->is_multiple ()
                   && !idl_global->using_ifr_backend ()
                   && !idl_global->ignore_idl3 ()
@@ -9027,11 +9027,11 @@ yyreduce:
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           (yyval.dcval) = uses;
         }
@@ -9070,12 +9070,12 @@ yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
           AST_Decl::NodeType nt = AST_Decl::NT_type;
-          AST_Param_Holder *ph = 0;
+          AST_Param_Holder *ph = nullptr;
 
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-1].idlist), true, false);
 
-          if (0 == d)
+          if (nullptr == d)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
               so_far_so_good = false;
@@ -9089,7 +9089,7 @@ yyreduce:
                   case AST_Decl::NT_eventtype:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -9109,18 +9109,18 @@ yyreduce:
                 }
             }
 
-          AST_Emits *e = 0;
+          AST_Emits *e = nullptr;
 
           if (so_far_so_good)
             {
               AST_Type *event_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ((yyvsp[0].idval));
 
               UTL_ScopedName sn ((yyvsp[0].idval),
-                                 0);
+                                 nullptr);
 
               e = idl_global->gen ()->create_emits (&sn, event_type);
 
@@ -9129,11 +9129,11 @@ yyreduce:
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           (yyval.dcval) = e;
         }
@@ -9146,12 +9146,12 @@ yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
           AST_Decl::NodeType nt = AST_Decl::NT_type;
-          AST_Param_Holder *ph = 0;
+          AST_Param_Holder *ph = nullptr;
 
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-1].idlist), true, false);
 
-          if (0 == d)
+          if (nullptr == d)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
               so_far_so_good = false;
@@ -9165,7 +9165,7 @@ yyreduce:
                   case AST_Decl::NT_eventtype:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -9185,28 +9185,28 @@ yyreduce:
                 }
             }
 
-          AST_Publishes *p = 0;
+          AST_Publishes *p = nullptr;
 
           if (so_far_so_good)
             {
               AST_Type *event_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ((yyvsp[0].idval));
 
-              UTL_ScopedName sn ((yyvsp[0].idval), 0);
+              UTL_ScopedName sn ((yyvsp[0].idval), nullptr);
               p = idl_global->gen ()->create_publishes (&sn, event_type);
               s->fe_add_publishes (p);
             }
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           (yyval.dcval) = p;
         }
@@ -9219,12 +9219,12 @@ yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           bool so_far_so_good = true;
           AST_Decl::NodeType nt = AST_Decl::NT_type;
-          AST_Param_Holder *ph = 0;
+          AST_Param_Holder *ph = nullptr;
 
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-1].idlist), true, false);
 
-          if (0 == d)
+          if (nullptr == d)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
               so_far_so_good = false;
@@ -9238,7 +9238,7 @@ yyreduce:
                   case AST_Decl::NT_eventtype:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -9258,18 +9258,18 @@ yyreduce:
                 }
             }
 
-          AST_Consumes *c = 0;
+          AST_Consumes *c = nullptr;
 
           if (so_far_so_good)
             {
               AST_Type *event_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ((yyvsp[0].idval));
 
               UTL_ScopedName sn ((yyvsp[0].idval),
-                                 0);
+                                 nullptr);
 
               c = idl_global->gen ()->create_consumes (&sn, event_type);
 
@@ -9278,11 +9278,11 @@ yyreduce:
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           (yyval.dcval) = c;
        }
@@ -9293,12 +9293,12 @@ yyreduce:
 #line 5953 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Home *h = 0;
+          AST_Home *h = nullptr;
 
           /*
            * Make a new home node and add it to the enclosing scope.
            */
-          if (s != 0 && (yyvsp[0].hhval) != 0)
+          if (s != nullptr && (yyvsp[0].hhval) != nullptr)
             {
               h =
                 idl_global->gen ()->create_home (
@@ -9319,7 +9319,7 @@ yyreduce:
               // This FE_HomeHeader class isn't destroyed with the AST.
               (yyvsp[0].hhval)->destroy ();
               delete (yyvsp[0].hhval);
-              (yyvsp[0].hhval) = 0;
+              (yyvsp[0].hhval) = nullptr;
             }
 
           /*
@@ -9338,7 +9338,7 @@ yyreduce:
            */
           idl_global->scopes ().pop ();
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 9344 "fe/idl.tab.cpp"
     break;
@@ -9400,9 +9400,9 @@ yyreduce:
            * Create an AST representation of the information in the header
            * part of a component home.
            */
-          UTL_ScopedName *n = 0;
+          UTL_ScopedName *n = nullptr;
           ACE_NEW_RETURN (n,
-                          UTL_ScopedName ((yyvsp[-10].idval), 0),
+                          UTL_ScopedName ((yyvsp[-10].idval), nullptr),
                           1);
 
           ACE_NEW_RETURN ((yyval.hhval),
@@ -9415,27 +9415,27 @@ yyreduce:
 
           (yyvsp[-2].idlist)->destroy ();
           delete (yyvsp[-2].idlist);
-          (yyvsp[-2].idlist) = 0;
+          (yyvsp[-2].idlist) = nullptr;
 
-          if (0 != (yyvsp[-8].idlist))
+          if (nullptr != (yyvsp[-8].idlist))
             {
               (yyvsp[-8].idlist)->destroy ();
               delete (yyvsp[-8].idlist);
-              (yyvsp[-8].idlist) = 0;
+              (yyvsp[-8].idlist) = nullptr;
             }
 
-          if (0 != (yyvsp[0].idlist))
+          if (nullptr != (yyvsp[0].idlist))
             {
               (yyvsp[0].idlist)->destroy ();
               delete (yyvsp[0].idlist);
-              (yyvsp[0].idlist) = 0;
+              (yyvsp[0].idlist) = nullptr;
             }
 
-          if (0 != (yyvsp[-6].nlval))
+          if (nullptr != (yyvsp[-6].nlval))
             {
               (yyvsp[-6].nlval)->destroy ();
               delete (yyvsp[-6].nlval);
-              (yyvsp[-6].nlval) = 0;
+              (yyvsp[-6].nlval) = nullptr;
             }
         }
 #line 9442 "fe/idl.tab.cpp"
@@ -9460,7 +9460,7 @@ yyreduce:
   case 504:
 #line 6083 "fe/idl.ypp"
         {
-          (yyval.idlist) = 0;
+          (yyval.idlist) = nullptr;
         }
 #line 9466 "fe/idl.tab.cpp"
     break;
@@ -9476,7 +9476,7 @@ yyreduce:
   case 506:
 #line 6095 "fe/idl.ypp"
         {
-          (yyval.idlist) = 0;
+          (yyval.idlist) = nullptr;
         }
 #line 9482 "fe/idl.tab.cpp"
     break;
@@ -9542,7 +9542,7 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
+                            nullptr);
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
 
           /*
@@ -9554,7 +9554,7 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           /*
            * Push the factory scope onto the scopes stack.
@@ -9581,7 +9581,7 @@ yyreduce:
           /*
            * Add exceptions and context to the factory.
            */
-          if ((yyvsp[0].nlval) != 0)
+          if ((yyvsp[0].nlval) != nullptr)
             {
               (void) s->fe_add_exceptions ((yyvsp[0].nlval));
             }
@@ -9599,7 +9599,7 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
+                            nullptr);
 
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
 
@@ -9615,7 +9615,7 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
           /*
            * Push the operation scope onto the scopes stack.
@@ -9642,7 +9642,7 @@ yyreduce:
           /*
            * Add exceptions and context to the finder.
            */
-          if ((yyvsp[0].nlval) != 0)
+          if ((yyvsp[0].nlval) != nullptr)
             {
               (void) s->fe_add_exceptions ((yyvsp[0].nlval));
             }
@@ -9660,15 +9660,15 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_EventTypeFwd *f = 0;
+                            nullptr);
+          AST_EventTypeFwd *f = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeForwardSeen);
 
           /*
            * Create a node representing a forward declaration of an
            * eventtype. Store it in the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               f = idl_global->gen ()->create_eventtype_fwd (&n,
                                                             false);
@@ -9677,9 +9677,9 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 9685 "fe/idl.tab.cpp"
     break;
@@ -9689,15 +9689,15 @@ yyreduce:
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((yyvsp[0].idval),
-                            0);
-          AST_EventTypeFwd *f = 0;
+                            nullptr);
+          AST_EventTypeFwd *f = nullptr;
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeForwardSeen);
 
           /*
            * Create a node representing a forward declaration of an
            * eventtype. Store it in the enclosing scope
            */
-          if (s != 0)
+          if (s != nullptr)
             {
               f = idl_global->gen ()->create_eventtype_fwd (&n,
                                                             true);
@@ -9706,9 +9706,9 @@ yyreduce:
 
           (yyvsp[0].idval)->destroy ();
           delete (yyvsp[0].idval);
-          (yyvsp[0].idval) = 0;
+          (yyvsp[0].idval) = nullptr;
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 9714 "fe/idl.tab.cpp"
     break;
@@ -9717,13 +9717,13 @@ yyreduce:
 #line 6315 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_EventType *e = 0;
-          AST_Interface *i = 0;
+          AST_EventType *e = nullptr;
+          AST_Interface *i = nullptr;
 
-          if (s != 0 && (yyvsp[-1].idval) != 0)
+          if (s != nullptr && (yyvsp[-1].idval) != nullptr)
             {
               UTL_ScopedName sn ((yyvsp[-1].idval),
-                                 0);
+                                 nullptr);
               e =
                 idl_global->gen ()->create_eventtype (
                     &sn,
@@ -9739,13 +9739,13 @@ yyreduce:
                     false,
                     false
                   );
-              i = AST_Interface::narrow_from_decl (e);
+              i = dynamic_cast<AST_Interface*> (e);
               AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the eventetype to its definition scope
                */
-              e = AST_EventType::narrow_from_decl (i);
+              e = dynamic_cast<AST_EventType*> (i);
               (void) s->fe_add_eventtype (e);
             }
 
@@ -9756,7 +9756,7 @@ yyreduce:
 
           (yyvsp[-1].idval)->destroy ();
           delete (yyvsp[-1].idval);
-          (yyvsp[-1].idval) = 0;
+          (yyvsp[-1].idval) = nullptr;
         }
 #line 9762 "fe/idl.tab.cpp"
     break;
@@ -9787,7 +9787,7 @@ yyreduce:
            */
           idl_global->scopes ().pop ();
 
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 9793 "fe/idl.tab.cpp"
     break;
@@ -9812,7 +9812,7 @@ yyreduce:
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Sorry, I (TAO_IDL) can't handle")
                       ACE_TEXT (" custom yet\n")));
-          (yyval.idval) = 0;
+          (yyval.idval) = nullptr;
         }
 #line 9818 "fe/idl.tab.cpp"
     break;
@@ -9842,7 +9842,7 @@ yyreduce:
 
           ACE_NEW_RETURN ((yyval.vhval),
                           FE_OBVHeader (
-                            0,
+                            nullptr,
                             (yyvsp[-2].nlval),
                             (yyvsp[0].nlval),
                             (yyvsp[-2].nlval)
@@ -9851,18 +9851,18 @@ yyreduce:
                             true),
                           1);
 
-          if (0 != (yyvsp[0].nlval))
+          if (nullptr != (yyvsp[0].nlval))
             {
               (yyvsp[0].nlval)->destroy ();
               delete (yyvsp[0].nlval);
-              (yyvsp[0].nlval) = 0;
+              (yyvsp[0].nlval) = nullptr;
             }
 
-          if (0 != (yyvsp[-2].nlval))
+          if (nullptr != (yyvsp[-2].nlval))
             {
               (yyvsp[-2].nlval)->destroy ();
               delete (yyvsp[-2].nlval);
-              (yyvsp[-2].nlval) = 0;
+              (yyvsp[-2].nlval) = nullptr;
             }
         }
 #line 9869 "fe/idl.tab.cpp"
@@ -9874,13 +9874,13 @@ yyreduce:
           UTL_Scope *scope = idl_global->scopes ().top_non_null ();
           Identifier *&event_id = (yyvsp[-1].idval);
           FE_OBVHeader *&event_header = (yyvsp[0].vhval);
-          AST_EventType *eventtype = 0;
+          AST_EventType *eventtype = nullptr;
 
           if (scope && event_header)
             {
               // We create the scoped name here instead of with the
               // FE_OBVHeader because there is a token for it only here.
-              UTL_ScopedName sn (event_id, 0);
+              UTL_ScopedName sn (event_id, nullptr);
               eventtype = idl_global->gen ()->create_eventtype (
                 &sn,
                 event_header->inherits (),
@@ -9908,7 +9908,7 @@ yyreduce:
               // FE_OBVHeader is not automatically destroyed in the AST
               event_header->destroy ();
               delete event_header;
-              event_header = 0;
+              event_header = nullptr;
 
               sn.destroy ();
             }
@@ -10054,14 +10054,14 @@ yyreduce:
   case 555:
 #line 6583 "fe/idl.ypp"
         {
-          if ((yyvsp[0].plval) == 0)
+          if ((yyvsp[0].plval) == nullptr)
             {
               ACE_NEW_RETURN ((yyvsp[0].plval), FE_Utils::T_PARAMLIST_INFO, 1);
             }
 
           (yyvsp[0].plval)->enqueue_head (*(yyvsp[-1].pival));
           delete (yyvsp[-1].pival);
-          (yyvsp[-1].pival) = 0;
+          (yyvsp[-1].pival) = nullptr;
 
           // The param added above is always the last one parsed,
           // so we check for matches between sequence<T> & T here.
@@ -10072,7 +10072,7 @@ yyreduce:
           if (!bad_id.empty ())
             {
               delete (yyvsp[0].plval);
-              (yyvsp[0].plval) = 0;
+              (yyvsp[0].plval) = nullptr;
 
               idl_global->err ()->mismatch_seq_of_param (bad_id.c_str ());
               return 1;
@@ -10086,7 +10086,7 @@ yyreduce:
   case 556:
 #line 6614 "fe/idl.ypp"
         {
-          if ((yyvsp[-2].plval) == 0)
+          if ((yyvsp[-2].plval) == nullptr)
             {
               ACE_NEW_RETURN ((yyvsp[-2].plval), FE_Utils::T_PARAMLIST_INFO, 1);
             }
@@ -10095,7 +10095,7 @@ yyreduce:
           (yyval.plval) = (yyvsp[-2].plval);
 
           delete (yyvsp[0].pival);
-          (yyvsp[0].pival) = 0;
+          (yyvsp[0].pival) = nullptr;
         }
 #line 10101 "fe/idl.tab.cpp"
     break;
@@ -10103,7 +10103,7 @@ yyreduce:
   case 557:
 #line 6627 "fe/idl.ypp"
         {
-          (yyval.plval) = 0;
+          (yyval.plval) = nullptr;
         }
 #line 10109 "fe/idl.tab.cpp"
     break;
@@ -10121,7 +10121,7 @@ yyreduce:
           (yyval.pival)->type_ = nt;
           (yyval.pival)->name_ = (yyvsp[0].strval);
           ACE::strdelete ((yyvsp[0].strval));
-          (yyvsp[0].strval) = 0;
+          (yyvsp[0].strval) = nullptr;
 
           if (nt == AST_Decl::NT_const)
             {
@@ -10131,7 +10131,7 @@ yyreduce:
 
               // Reset these values.
               t_param_const_type = AST_Expression::EV_none;
-              tao_enum_constant_decl = 0;
+              tao_enum_constant_decl = nullptr;
             }
         }
 #line 10138 "fe/idl.tab.cpp"
@@ -10149,9 +10149,9 @@ yyreduce:
           (yyval.pival)->name_ += (yyvsp[0].strval);
 
           ACE::strdelete ((yyvsp[-2].strval));
-          (yyvsp[-2].strval) = 0;
+          (yyvsp[-2].strval) = nullptr;
           ACE::strdelete ((yyvsp[0].strval));
-          (yyvsp[0].strval) = 0;
+          (yyvsp[0].strval) = nullptr;
         }
 #line 10157 "fe/idl.tab.cpp"
     break;
@@ -10167,10 +10167,10 @@ yyreduce:
   case 561:
 #line 6684 "fe/idl.ypp"
         {
-          UTL_StrList *sl = 0;
-          ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1);
+          UTL_StrList *sl = nullptr;
+          ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), nullptr), 1);
 
-          if ((yyvsp[-2].slval) == 0)
+          if ((yyvsp[-2].slval) == nullptr)
             {
               (yyval.slval) = sl;
             }
@@ -10186,7 +10186,7 @@ yyreduce:
   case 562:
 #line 6699 "fe/idl.ypp"
         {
-          (yyval.slval) = 0;
+          (yyval.slval) = nullptr;
         }
 #line 10192 "fe/idl.tab.cpp"
     break;
@@ -10218,9 +10218,9 @@ yyreduce:
 
           Identifier id (id_value);
           ACE::strdelete (id_value);
-          id_value = 0;
+          id_value = nullptr;
 
-          UTL_ScopedName scoped_name (&id, 0);
+          UTL_ScopedName scoped_name (&id, nullptr);
           AST_PortType *porttype = idl_global->gen ()->create_porttype (
             &scoped_name);
           scope->fe_add_porttype (porttype);
@@ -10303,19 +10303,19 @@ yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-1].idlist));
-          AST_PortType *pt = 0;
+          AST_PortType *pt = nullptr;
           bool so_far_so_good = true;
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
               so_far_so_good = false;
             }
           else
             {
-              pt = AST_PortType::narrow_from_decl (d);
+              pt = dynamic_cast<AST_PortType*> (d);
 
-              if (pt == 0)
+              if (pt == nullptr)
                 {
                   idl_global->err ()->error1 (UTL_Error::EIDL_PORTTYPE_EXPECTED,
                                               d);
@@ -10323,15 +10323,15 @@ yyreduce:
                 }
             }
 
-          AST_Extended_Port *ep = 0;
+          AST_Extended_Port *ep = nullptr;
 
           if (so_far_so_good)
             {
               Identifier id ((yyvsp[0].strval));
               ACE::strdelete ((yyvsp[0].strval));
-              (yyvsp[0].strval) = 0;
+              (yyvsp[0].strval) = nullptr;
 
-              UTL_ScopedName sn (&id, 0);
+              UTL_ScopedName sn (&id, nullptr);
               ep = idl_global->gen ()->create_extended_port (&sn, pt);
               s->fe_add_extended_port (ep);
 
@@ -10343,12 +10343,12 @@ yyreduce:
                 {
                   d = i.item ();
 
-                  AST_Uses *u = AST_Uses::narrow_from_decl (d);
+                  AST_Uses *u = dynamic_cast<AST_Uses*> (d);
 
-                  if (u != 0 && u->is_multiple ())
+                  if (u != nullptr && u->is_multiple ())
                     {
                       AST_Component *c =
-                        AST_Component::narrow_from_scope (s);
+                        dynamic_cast<AST_Component*> (s);
 
                       FE_Utils::create_uses_multiple_stuff (
                         c,
@@ -10360,7 +10360,7 @@ yyreduce:
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyval.dcval) = ep;
         }
@@ -10374,19 +10374,19 @@ yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d =
             s->lookup_by_name ((yyvsp[-1].idlist));
-          AST_PortType *pt = 0;
+          AST_PortType *pt = nullptr;
           bool so_far_so_good = true;
 
-          if (d == 0)
+          if (d == nullptr)
             {
               idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
               so_far_so_good = false;
             }
            else
              {
-               pt = AST_PortType::narrow_from_decl (d);
+               pt = dynamic_cast<AST_PortType*> (d);
 
-               if (pt == 0)
+               if (pt == nullptr)
                  {
                    idl_global->err ()->error1 (UTL_Error::EIDL_PORTTYPE_EXPECTED,
                                                d);
@@ -10394,22 +10394,22 @@ yyreduce:
                  }
              }
 
-          AST_Mirror_Port *mp = 0;
+          AST_Mirror_Port *mp = nullptr;
 
           if (so_far_so_good)
             {
               Identifier id ((yyvsp[0].strval));
               ACE::strdelete ((yyvsp[0].strval));
-              (yyvsp[0].strval) = 0;
+              (yyvsp[0].strval) = nullptr;
 
-              UTL_ScopedName sn (&id, 0);
+              UTL_ScopedName sn (&id, nullptr);
               mp = idl_global->gen ()->create_mirror_port (&sn, pt);
               s->fe_add_mirror_port (mp);
             }
 
           (yyvsp[-1].idlist)->destroy ();
           delete (yyvsp[-1].idlist);
-          (yyvsp[-1].idlist) = 0;
+          (yyvsp[-1].idlist) = nullptr;
 
           (yyval.dcval) = mp;
         }
@@ -10419,7 +10419,7 @@ yyreduce:
   case 579:
 #line 6914 "fe/idl.ypp"
         {
-          if ((yyvsp[0].alval) == 0)
+          if ((yyvsp[0].alval) == nullptr)
             {
               ACE_NEW_RETURN ((yyvsp[0].alval),
                               FE_Utils::T_ARGLIST,
@@ -10436,7 +10436,7 @@ yyreduce:
   case 580:
 #line 6930 "fe/idl.ypp"
         {
-          if ((yyvsp[-3].alval) == 0)
+          if ((yyvsp[-3].alval) == nullptr)
             {
               ACE_NEW_RETURN ((yyvsp[-3].alval),
                               FE_Utils::T_ARGLIST,
@@ -10453,7 +10453,7 @@ yyreduce:
   case 581:
 #line 6943 "fe/idl.ypp"
         {
-          (yyval.alval) = 0;
+          (yyval.alval) = nullptr;
         }
 #line 10459 "fe/idl.tab.cpp"
     break;
@@ -10470,14 +10470,14 @@ yyreduce:
           // arg list.
           AST_Expression *ex = (yyvsp[0].exval);
           UTL_ScopedName *sn = ex->n ();
-          AST_Decl *d = 0;
+          AST_Decl *d = nullptr;
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
 
-          if (sn != 0)
+          if (sn != nullptr)
             {
               d = s->lookup_by_name (sn);
 
-              if (d == 0)
+              if (d == nullptr)
                 {
                   idl_global->err ()->lookup_error (sn);
                   return 1;
@@ -10512,7 +10512,7 @@ yyreduce:
                 idl_global->gen ()->create_constant (
                   (yyvsp[0].exval)->ev ()->et,
                   (yyvsp[0].exval),
-                  0);
+                  nullptr);
             }
         }
 #line 10519 "fe/idl.tab.cpp"
@@ -10521,7 +10521,7 @@ yyreduce:
   case 583:
 #line 7009 "fe/idl.ypp"
         {
-          (yyval.dcval) = 0;
+          (yyval.dcval) = nullptr;
         }
 #line 10527 "fe/idl.tab.cpp"
     break;
@@ -10546,30 +10546,30 @@ yyreduce:
 #line 7024 "fe/idl.ypp"
         {
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Connector *parent = 0;
+          AST_Connector *parent = nullptr;
           bool so_far_so_good = true;
 
           Identifier id ((yyvsp[-2].strval));
           ACE::strdelete ((yyvsp[-2].strval));
-          (yyvsp[-2].strval) = 0;
+          (yyvsp[-2].strval) = nullptr;
 
-          UTL_ScopedName sn (&id, 0);
+          UTL_ScopedName sn (&id, nullptr);
 
-          if ((yyvsp[0].idlist) != 0)
+          if ((yyvsp[0].idlist) != nullptr)
             {
               AST_Decl *d =
                 s->lookup_by_name ((yyvsp[0].idlist));
 
-              if (d == 0)
+              if (d == nullptr)
                 {
                   idl_global->err ()->lookup_error ((yyvsp[0].idlist));
                   so_far_so_good = false;
                 }
 
               parent =
-                AST_Connector::narrow_from_decl (d);
+                dynamic_cast<AST_Connector*> (d);
 
-              if (parent == 0)
+              if (parent == nullptr)
                 {
                   idl_global->err ()->error1 (
                     UTL_Error::EIDL_CONNECTOR_EXPECTED,
@@ -10580,7 +10580,7 @@ yyreduce:
 
               (yyvsp[0].idlist)->destroy ();
               delete (yyvsp[0].idlist);
-              (yyvsp[0].idlist) = 0;
+              (yyvsp[0].idlist) = nullptr;
             }
 
           if (so_far_so_good)
@@ -10772,7 +10772,7 @@ yyerrlab:
 yyerrorlab:
   /* Pacify compilers when the user code never invokes YYERROR and the
      label yyerrorlab therefore never appears in user code.  */
-  if (0)
+  if (false)
     YYERROR;
 
   /* Do not reclaim the symbols of the rule whose action triggered
diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp
index fbe1e9b75cc..354e713e626 100644
--- a/TAO/TAO_IDL/fe/idl.tab.hpp
+++ b/TAO/TAO_IDL/fe/idl.tab.hpp
@@ -203,6 +203,6 @@ typedef union YYSTYPE YYSTYPE;
 
 extern YYSTYPE tao_yylval;
 
-int tao_yyparse (void);
+int tao_yyparse ();
 
 #endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED  */
diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp
index a2f6d5ae21b..2f168d1af31 100644
--- a/TAO/TAO_IDL/fe/idl.ypp
+++ b/TAO/TAO_IDL/fe/idl.ypp
@@ -765,7 +765,7 @@ template_module_ref
             }
 
           AST_Template_Module *ref =
-            AST_Template_Module::narrow_from_decl (d);
+            dynamic_cast<AST_Template_Module*> (d);
 
           if (ref == 0)
             {
@@ -857,7 +857,7 @@ template_module_inst
             }
           else
             {
-              ref = AST_Template_Module::narrow_from_decl (d);
+              ref = dynamic_cast<AST_Template_Module*> (d);
 
               if (ref == 0)
                 {
@@ -1174,7 +1174,7 @@ value_concrete_decl :
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
 
           AST_ValueType *vt =
-            AST_ValueType::narrow_from_scope (
+            dynamic_cast<AST_ValueType*> (
                 idl_global->scopes ().top_non_null ()
               );
 
@@ -1217,13 +1217,13 @@ value_abs_decl :
                     false,
                     false
                   );
-              i = AST_Interface::narrow_from_decl (v);
+              i = dynamic_cast<AST_Interface*> (v);
               AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the valuetype to its definition scope
                */
-              v = AST_ValueType::narrow_from_decl (i);
+              v = dynamic_cast<AST_ValueType*> (i);
               (void) s->fe_add_valuetype (v);
 
               // FE_OBVHeader is not automatically destroyed in the AST
@@ -1401,11 +1401,11 @@ value_box_decl
               */
               AST_Type *tp = 0;
               AST_Typedef *td
-                = AST_Typedef::narrow_from_decl ($2);
+                = dynamic_cast<AST_Typedef*> ($2);
 
               if (td == 0)
                 {
-                  tp = AST_Type::narrow_from_decl ($2);
+                  tp = dynamic_cast<AST_Type*> ($2);
                 }
               else
                 {
@@ -1967,7 +1967,7 @@ const_type
                */
               while (d->node_type () == AST_Decl::NT_typedef)
                 {
-                  t = AST_Typedef::narrow_from_decl (d);
+                  t = dynamic_cast<AST_Typedef*> (d);
 
                   if (t == 0)
                     {
@@ -1979,7 +1979,7 @@ const_type
 
               if (d->node_type () == AST_Decl::NT_pre_defined)
                 {
-                  c = AST_PredefinedType::narrow_from_decl (d);
+                  c = dynamic_cast<AST_PredefinedType*> (d);
 
                   $$ = FE_Utils::PredefinedTypeToExprType (c->pt ());
                 }
@@ -1995,7 +1995,7 @@ const_type
                 {
                   $$ = AST_Expression::EV_enum;
                   tao_enum_constant_decl =
-                    AST_Enum::narrow_from_decl (d);
+                    dynamic_cast<AST_Enum*> (d);
                 }
               else
                 {
@@ -2512,7 +2512,7 @@ annotation_appl
             lookup_by_name (name);
           if (d)
             {
-              decl = AST_Annotation_Decl::narrow_from_decl (d);
+              decl = dynamic_cast<AST_Annotation_Decl*> (d);
               if (decl)
                 {
                   idl_global->scopes ().push (decl);
@@ -3116,7 +3116,7 @@ struct_type
           /*
            * Done with this struct. Pop its scope off the scopes stack.
            */
-          $$ = AST_Structure::narrow_from_scope (
+          $$ = dynamic_cast<AST_Structure*> (
                    idl_global->scopes ().top_non_null ()
                  );
           idl_global->scopes ().pop ();
@@ -3256,9 +3256,9 @@ union_type
                                                     s->is_local (),
                                                     s->is_abstract ());
 
-              AST_Structure *st = AST_Structure::narrow_from_decl (u);
+              AST_Structure *st = dynamic_cast<AST_Structure*> (u);
               AST_Structure::fwd_redefinition_helper (st, s);
-              u = AST_Union::narrow_from_decl (st);
+              u = dynamic_cast<AST_Union*> (st);
               (void) s->fe_add_union (u);
             }
 
@@ -3297,7 +3297,7 @@ union_type
           if ($7 != 0 && s != 0)
             {
               AST_ConcreteType *tp =
-                AST_ConcreteType::narrow_from_decl ($7);
+                dynamic_cast<AST_ConcreteType*> ($7);
 
               if (tp == 0)
                 {
@@ -3313,7 +3313,7 @@ union_type
                                                         s->is_abstract ());
 
                   /* Narrow the enclosing scope. */
-                  AST_Union *e = AST_Union::narrow_from_scope (top);
+                  AST_Union *e = dynamic_cast<AST_Union*> (top);
 
                   e->redefine (u);
                   e->disc_annotations (*disc_annotations); // Set Discriminator Annotations
@@ -3349,7 +3349,7 @@ union_type
           /*
            * Done with this union. Pop its scope from the scopes stack.
            */
-          $$ = AST_Union::narrow_from_scope (
+          $$ = dynamic_cast<AST_Union*> (
                    idl_global->scopes ().top_non_null ()
                  );
 
@@ -3426,7 +3426,7 @@ switch_type_spec :
                       found = true;
                       break;
                     case AST_Decl::NT_pre_defined:
-                      p = AST_PredefinedType::narrow_from_decl (d);
+                      p = dynamic_cast<AST_PredefinedType*> (d);
 
                       if (p != 0)
                         {
@@ -3466,7 +3466,7 @@ switch_type_spec :
 
                       break;
                     case AST_Decl::NT_typedef:
-                      t = AST_Typedef::narrow_from_decl (d);
+                      t = dynamic_cast<AST_Typedef*> (d);
 
                       if (t != 0)
                         {
@@ -3789,7 +3789,7 @@ enum_type :
             }
           else
             {
-              $$ = AST_Enum::narrow_from_scope (
+              $$ = dynamic_cast<AST_Enum*> (
                        idl_global->scopes ().top_non_null ()
                      );
               idl_global->scopes ().pop ();
@@ -3828,7 +3828,7 @@ enumerator :
           if (s != 0
               && s->scope_node_type () == AST_Decl::NT_enum)
             {
-              c = AST_Enum::narrow_from_scope (s);
+              c = dynamic_cast<AST_Enum*> (s);
 
               if (c != 0)
                 {
@@ -3907,7 +3907,7 @@ sequence_type_spec
             }
           else if (type)
             {
-              AST_Type *tp = AST_Type::narrow_from_decl (type);
+              AST_Type *tp = dynamic_cast<AST_Type*> (type);
 
               if (0 == tp)
                 {
@@ -3969,7 +3969,7 @@ sequence_type_spec
            */
           if (type)
             {
-              AST_Type *tp = AST_Type::narrow_from_decl (type);
+              AST_Type *tp = dynamic_cast<AST_Type*> (type);
 
               if (tp == 0)
                 {
@@ -4073,7 +4073,7 @@ string_type_spec
                * Add this AST_String to the types defined in the global scope.
                */
               idl_global->root ()->fe_add_string (
-                AST_String::narrow_from_decl (
+                dynamic_cast<AST_String*> (
                   tao_string_decl));
 
               idl_global->err ()->anonymous_type_diagnostic ();
@@ -4102,7 +4102,7 @@ string_type_spec
            * Add this AST_String to the types defined in the global scope.
            */
           idl_global->root ()->fe_add_string (
-            AST_String::narrow_from_decl (
+            dynamic_cast<AST_String*> (
               tao_string_decl));
 
           $$ = tao_string_decl;
@@ -4148,7 +4148,7 @@ wstring_type_spec
                * Add this AST_String to the types defined in the global scope.
                */
               idl_global->root ()->fe_add_string (
-                AST_String::narrow_from_decl (
+                dynamic_cast<AST_String*> (
                   string));
 
               idl_global->err ()->anonymous_type_diagnostic ();
@@ -4174,7 +4174,7 @@ wstring_type_spec
            * Add this AST_String to the types defined in the global scope.
            */
           idl_global->root ()->fe_add_string (
-            AST_String::narrow_from_decl (
+            dynamic_cast<AST_String*> (
               string));
 
           $$ = string;
@@ -4570,7 +4570,7 @@ operation
            */
           if (scope != 0 && type_node != 0)
             {
-              AST_Type *type = AST_Type::narrow_from_decl (type_node);
+              AST_Type *type = dynamic_cast<AST_Type*> (type_node);
 
               if (type == 0)
                 {
@@ -4629,7 +4629,7 @@ operation
            */
           if (s != 0 && s->scope_node_type () == AST_Decl::NT_op)
             {
-              o = AST_Operation::narrow_from_scope (s);
+              o = dynamic_cast<AST_Operation*> (s);
 
               if ($8 != 0 && o != 0)
                 {
@@ -4739,7 +4739,7 @@ init_decl
           if ($7)
             {
               UTL_Scope *s = idl_global->scopes ().top_non_null ();
-              AST_Factory *f = AST_Factory::narrow_from_scope (s);
+              AST_Factory *f = dynamic_cast<AST_Factory*> (s);
               (void) f->fe_add_exceptions ($7);
             }
 
@@ -4940,7 +4940,7 @@ param_type_spec
             {
               d->last_referenced_as ($1);
               AST_Decl::NodeType nt = d->node_type ();
-              AST_Type *t = AST_Type::narrow_from_decl (d);
+              AST_Type *t = dynamic_cast<AST_Type*> (d);
               AST_Typedef *td = 0;
               bool can_be_undefined = false;
 
@@ -4949,14 +4949,14 @@ param_type_spec
                   // This code block ensures that a sequence of
                   // as-yet-undefined struct or union isn't used
                   // as a return type or argument.
-                  td = AST_Typedef::narrow_from_decl (d);
+                  td = dynamic_cast<AST_Typedef*> (d);
                   AST_Type *pbt = td->primitive_base_type ();
 
                   if (pbt->node_type () == AST_Decl::NT_sequence)
                     {
                       t = pbt;
                       AST_Sequence *seq_type =
-                        AST_Sequence::narrow_from_decl (pbt);
+                        dynamic_cast<AST_Sequence*> (pbt);
                       AST_Type *elem_type =
                         seq_type->base_type ();
                       AST_Decl::NodeType elem_nt =
@@ -4965,7 +4965,7 @@ param_type_spec
                       if (elem_nt == AST_Decl::NT_typedef)
                         {
                           AST_Typedef *elem_td =
-                            AST_Typedef::narrow_from_decl (elem_type);
+                            dynamic_cast<AST_Typedef*> (elem_type);
                           elem_type = elem_td->primitive_base_type ();
                           elem_nt = elem_type->node_type ();
                         }
@@ -4997,7 +4997,7 @@ param_type_spec
                   // want the full definition, but we need to
                   // check that it's been fully defined.
                   AST_StructureFwd *fwd =
-                    AST_StructureFwd::narrow_from_decl (d);
+                    dynamic_cast<AST_StructureFwd*> (d);
 
                   if (fwd != 0)
                     {
@@ -5501,7 +5501,7 @@ provides_decl : IDL_PROVIDES interface_type id
                   case AST_Decl::NT_interface:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -5542,7 +5542,7 @@ provides_decl : IDL_PROVIDES interface_type id
           if (so_far_so_good)
             {
               AST_Type *port_interface_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ($3);
@@ -5625,7 +5625,7 @@ uses_decl : uses_opt_multiple interface_type id
                   case AST_Decl::NT_interface:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -5666,7 +5666,7 @@ uses_decl : uses_opt_multiple interface_type id
           if (so_far_so_good)
             {
               AST_Type *port_interface_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ($3);
@@ -5679,7 +5679,7 @@ uses_decl : uses_opt_multiple interface_type id
               s->fe_add_uses (uses);
 
               AST_Component *c =
-                AST_Component::narrow_from_scope (s);
+                dynamic_cast<AST_Component*> (s);
 
               if (c != 0
                   && uses->is_multiple ()
@@ -5751,7 +5751,7 @@ emits_decl
                   case AST_Decl::NT_eventtype:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -5776,7 +5776,7 @@ emits_decl
           if (so_far_so_good)
             {
               AST_Type *event_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ($3);
@@ -5826,7 +5826,7 @@ publishes_decl
                   case AST_Decl::NT_eventtype:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -5851,7 +5851,7 @@ publishes_decl
           if (so_far_so_good)
             {
               AST_Type *event_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ($3);
@@ -5898,7 +5898,7 @@ consumes_decl
                   case AST_Decl::NT_eventtype:
                     break;
                   case AST_Decl::NT_param_holder:
-                    ph = AST_Param_Holder::narrow_from_decl (d);
+                    ph = dynamic_cast<AST_Param_Holder*> (d);
                     nt = ph->info ()->type_;
 
                     if (nt != AST_Decl::NT_type
@@ -5923,7 +5923,7 @@ consumes_decl
           if (so_far_so_good)
             {
               AST_Type *event_type =
-                AST_Type::narrow_from_decl (d);
+                dynamic_cast<AST_Type*> (d);
 
               // Strip off _cxx_, if any, for port name.
               FE_Utils::original_local_name ($3);
@@ -6336,13 +6336,13 @@ event_abs_decl :
                     false,
                     false
                   );
-              i = AST_Interface::narrow_from_decl (e);
+              i = dynamic_cast<AST_Interface*> (e);
               AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the eventetype to its definition scope
                */
-              e = AST_EventType::narrow_from_decl (i);
+              e = dynamic_cast<AST_EventType*> (i);
               (void) s->fe_add_eventtype (e);
             }
 
@@ -6811,7 +6811,7 @@ extended_port_decl
             }
           else
             {
-              pt = AST_PortType::narrow_from_decl (d);
+              pt = dynamic_cast<AST_PortType*> (d);
 
               if (pt == 0)
                 {
@@ -6841,12 +6841,12 @@ extended_port_decl
                 {
                   d = i.item ();
 
-                  AST_Uses *u = AST_Uses::narrow_from_decl (d);
+                  AST_Uses *u = dynamic_cast<AST_Uses*> (d);
 
                   if (u != 0 && u->is_multiple ())
                     {
                       AST_Component *c =
-                        AST_Component::narrow_from_scope (s);
+                        dynamic_cast<AST_Component*> (s);
 
                       FE_Utils::create_uses_multiple_stuff (
                         c,
@@ -6878,7 +6878,7 @@ extended_port_decl
             }
            else
              {
-               pt = AST_PortType::narrow_from_decl (d);
+               pt = dynamic_cast<AST_PortType*> (d);
 
                if (pt == 0)
                  {
@@ -7044,7 +7044,7 @@ connector_header
                 }
 
               parent =
-                AST_Connector::narrow_from_decl (d);
+                dynamic_cast<AST_Connector*> (d);
 
               if (parent == 0)
                 {
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp
index bcb099c813a..c919be1d965 100644
--- a/TAO/TAO_IDL/fe/idl.yy.cpp
+++ b/TAO/TAO_IDL/fe/idl.yy.cpp
@@ -506,7 +506,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = nullptr; /**< 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
@@ -528,7 +528,7 @@ static int yy_n_chars;        /* number of characters read into yy_ch_buf */
 int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = 0;
+static char *yy_c_buf_p = nullptr;
 static int yy_init = 0;        /* whether we need to initialize */
 static int yy_start = 0;    /* start state number */
 
@@ -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 )
 
@@ -582,7 +582,7 @@ void yyfree ( void *  );
 /* Begin user sect3 */
 typedef flex_uint8_t YY_CHAR;
 
-FILE *yyin = 0, *yyout = 0;
+FILE *yyin = nullptr, *yyout = nullptr;
 
 typedef int yy_state_type;
 
@@ -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
@@ -1315,34 +1315,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  );
 
@@ -1374,7 +1374,7 @@ 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 );
 #endif
@@ -1461,7 +1461,7 @@ 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)
 #endif /* !YY_DECL */
@@ -1524,7 +1524,7 @@ YY_DECL
 
 #line 1528 "fe/idl.yy.cpp"
 
-    while ( /*CONSTCOND*/1 )        /* loops until end-of-file is reached */
+    while ( /*CONSTCOND*/true )        /* loops until end-of-file is reached */
         {
         yy_cp = (yy_c_buf_p);
 
@@ -1965,7 +1965,7 @@ YY_RULE_SETUP
   // regular expression is to handle EBCDIC, as well as ASCII.
 
   TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
-  const TAO_IDL_CPP_Keyword_Entry *entry = 0;
+  const TAO_IDL_CPP_Keyword_Entry *entry = nullptr;
   if (!idl_global->preserve_cpp_keywords())
     {
       // This check will ensure that escaped C++ keywords will be
@@ -2273,7 +2273,7 @@ YY_RULE_SETUP
                           if (next == '/')
                             break;
                           else
-                            yyunput (c, 0);
+                            yyunput (c, nullptr);
                         }
                       else if (c == '\n')
                         {
@@ -2449,7 +2449,7 @@ case YY_STATE_EOF(INITIAL):
  *    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);
@@ -2523,7 +2523,7 @@ static int yy_get_next_buffer (void)
                 }
             else
                 /* Can't grow it, we don't own it. */
-                b->yy_ch_buf = 0;
+                b->yy_ch_buf = nullptr;
 
             if ( ! b->yy_ch_buf )
                 YY_FATAL_ERROR(
@@ -2587,7 +2587,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;
@@ -2686,9 +2686,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
 
 {
@@ -2813,7 +2813,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;
@@ -2862,7 +2862,7 @@ static void yy_load_buffer_state  (void)
         return;
 
     if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-        YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+        YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) nullptr;
 
     if ( b->yy_is_our_buffer )
         yyfree( (void *) b->yy_ch_buf  );
@@ -2933,7 +2933,7 @@ static void yy_load_buffer_state  (void)
  */
 void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
-        if (new_buffer == 0)
+        if (new_buffer == nullptr)
         return;
 
     yyensure_buffer_stack();
@@ -2961,13 +2961,13 @@ 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;
 
     yy_delete_buffer(YY_CURRENT_BUFFER );
-    YY_CURRENT_BUFFER_LVALUE = 0;
+    YY_CURRENT_BUFFER_LVALUE = nullptr;
     if ((yy_buffer_stack_top) > 0)
         --(yy_buffer_stack_top);
 
@@ -2980,7 +2980,7 @@ 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;
 
@@ -3037,7 +3037,7 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
          base[size-2] != YY_END_OF_BUFFER_CHAR ||
          base[size-1] != YY_END_OF_BUFFER_CHAR )
         /* They forgot to leave room for the EOB's. */
-        return 0;
+        return nullptr;
 
     b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
     if ( ! b )
@@ -3046,7 +3046,7 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
     b->yy_buf_size = (int) (size - 2);    /* "- 2" to take care of EOB's */
     b->yy_buf_pos = b->yy_ch_buf = base;
     b->yy_is_our_buffer = 0;
-    b->yy_input_file = 0;
+    b->yy_input_file = nullptr;
     b->yy_n_chars = b->yy_buf_size;
     b->yy_is_interactive = 0;
     b->yy_at_bol = 1;
@@ -3141,7 +3141,7 @@ static void yynoreturn yy_fatal_error (const char* msg )
 /** Get the current line number.
  *
  */
-int yyget_lineno  (void)
+int yyget_lineno  ()
 {
 
     return yylineno;
@@ -3150,7 +3150,7 @@ int yyget_lineno  (void)
 /** Get the input stream.
  *
  */
-FILE *yyget_in  (void)
+FILE *yyget_in  ()
 {
         return yyin;
 }
@@ -3158,7 +3158,7 @@ FILE *yyget_in  (void)
 /** Get the output stream.
  *
  */
-FILE *yyget_out  (void)
+FILE *yyget_out  ()
 {
         return yyout;
 }
@@ -3166,7 +3166,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  *
  */
-int yyget_leng  (void)
+int yyget_leng  ()
 {
         return yyleng;
 }
@@ -3175,7 +3175,7 @@ int yyget_leng  (void)
  *
  */
 
-char *yyget_text  (void)
+char *yyget_text  ()
 {
         return yytext;
 }
@@ -3206,7 +3206,7 @@ void yyset_out (FILE *  _out_str )
         yyout = _out_str ;
 }
 
-int yyget_debug  (void)
+int yyget_debug  ()
 {
         return yy_flex_debug;
 }
@@ -3216,16 +3216,16 @@ 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.
      */
 
-    (yy_buffer_stack) = 0;
+    (yy_buffer_stack) = nullptr;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = 0;
+    (yy_c_buf_p) = nullptr;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -3234,8 +3234,8 @@ static int yy_init_globals (void)
     yyin = stdin;
     yyout = stdout;
 #else
-    yyin = 0;
-    yyout = 0;
+    yyin = nullptr;
+    yyout = nullptr;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
@@ -3245,19 +3245,19 @@ 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  );
-        YY_CURRENT_BUFFER_LVALUE = 0;
+        YY_CURRENT_BUFFER_LVALUE = nullptr;
         yypop_buffer_state();
     }
 
     /* Destroy the stack itself. */
     yyfree((yy_buffer_stack) );
-    (yy_buffer_stack) = 0;
+    (yy_buffer_stack) = nullptr;
 
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * yylex() is called, initialization will occur. */
@@ -3330,7 +3330,7 @@ same_file (char *path1, char *path2)
   char *fp2 = ACE_OS::realpath (path2, fullpath2);
 
   return
-    (fp1 == 0 || fp2 == 0)
+    (fp1 == nullptr || fp2 == nullptr)
       ? false
       : FE_Utils::path_cmp (fullpath1,fullpath2) == 0;
 }
@@ -3340,8 +3340,8 @@ static void
 idl_parse_line_and_file (char *buf)
 {
   char *r = buf;
-  char *h = 0;
-  UTL_String *nm = 0;
+  char *h = nullptr;
+  UTL_String *nm = nullptr;
 
   // Skip initial '#'.
   if (*r != '#')
@@ -3394,7 +3394,7 @@ idl_parse_line_and_file (char *buf)
     }
 
   *r = 0;
-  UTL_String *tmp = 0;
+  UTL_String *tmp = nullptr;
 
   if (*h == '\0')
     {
@@ -3539,13 +3539,13 @@ idl_store_pragma (char *buf)
   sp -= crunched;
   *sp = '\0';
 
-  if (ACE_OS::strstr (buf + 8, "import") != 0)
+  if (ACE_OS::strstr (buf + 8, "import") != nullptr)
     {
       idl_global->set_import (true);
       return;
     }
 
-  if (ACE_OS::strstr (buf + 8, "include") != 0)
+  if (ACE_OS::strstr (buf + 8, "include") != nullptr)
     {
       idl_global->set_import (false);
       return;
@@ -3555,14 +3555,14 @@ idl_store_pragma (char *buf)
     {
       char *new_prefix = idl_get_pragma_string (buf);
 
-      if (new_prefix != 0)
+      if (new_prefix != nullptr)
         {
           unsigned long depth = idl_global->scopes ().depth ();
 
           // We replace the prefix only if there is a prefix already
           // associated with this file, otherwise we add the prefix.
           char *ext_id = idl_global->filename ()->get_string ();
-          ACE_Hash_Map_Entry<char *, char *> *entry = 0;
+          ACE_Hash_Map_Entry<char *, char *> *entry = nullptr;
           int const status =
             idl_global->file_prefixes ().find (ext_id, entry);
 
@@ -3570,7 +3570,7 @@ idl_store_pragma (char *buf)
             {
               if (ACE_OS::strcmp (entry->int_id_, "") != 0)
                 {
-                  char *trash = 0;
+                  char *trash = nullptr;
                   idl_global->pragma_prefixes ().pop (trash);
                   delete [] trash;
                 }
@@ -3624,7 +3624,7 @@ idl_store_pragma (char *buf)
 
       char *number = ACE_OS::strchr (tmp, ' ');
 
-      if (number == 0)
+      if (number == nullptr)
         {
           number = ACE_OS::strchr (tmp, '\t');
         }
@@ -3634,7 +3634,7 @@ idl_store_pragma (char *buf)
 
       // Most likely this means there is only a version number
       // without an identifier to apply it to.
-      if (number == 0)
+      if (number == nullptr)
         {
           const char *msg = "no identifier or scoped name";
           idl_global->err ()->version_syntax_error (msg);
@@ -3663,7 +3663,7 @@ idl_store_pragma (char *buf)
       // do it here.
       AST_Decl *d = idl_find_node (tmp);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           return;
         }
@@ -3694,14 +3694,14 @@ idl_store_pragma (char *buf)
 
       AST_Decl *d = idl_find_node (work.c_str ());
 
-      if (d == 0)
+      if (d == nullptr)
         {
           return;
         }
 
       char *new_id = idl_get_pragma_string (buf);
 
-      if (new_id != 0)
+      if (new_id != nullptr)
         {
           if (d->typeid_set ())
             {
@@ -4153,33 +4153,33 @@ idl_get_pragma_string (char *pragma)
   // Get pointers to each end of the substring between the quotes.
   const char *firstquote = ACE_OS::strchr (pragma, '"');
 
-  if (firstquote == 0)
+  if (firstquote == nullptr)
     {
       idl_global->err ()->syntax_error (
           IDL_GlobalData::PS_PragmaPrefixSyntax
         );
 
-      return 0;
+      return nullptr;
     }
 
   const char *start = firstquote + 1;
   const char *end = ACE_OS::strchr (start, '"');
 
-  if (end == 0)
+  if (end == nullptr)
     {
       idl_global->err ()->syntax_error (
           IDL_GlobalData::PS_PragmaPrefixSyntax
         );
 
-      return 0;
+      return nullptr;
     }
 
   int len = static_cast<int> (end - start);
-  char *retval = 0;
+  char *retval = nullptr;
 
   ACE_NEW_RETURN (retval,
                   char[len + 1],
-                  0);
+                  nullptr);
 
   ACE_OS::strncpy (retval,
                    start,
@@ -4195,22 +4195,22 @@ idl_valid_version (char *s)
   // Nothing preceding decimal point.
   if (*s == '.')
     {
-      return 0;
+      return false;
     }
 
   char *minor = ACE_OS::strchr (s, '.');
   int i;
 
-  if (minor == 0)
+  if (minor == nullptr)
     {
       // No decimal point.
-      return 0;
+      return false;
     }
 
   if (*(minor + 1) == '\0')
     {
       // Nothing following decimal point.
-      return 0;
+      return false;
     }
 
   char *tmp = minor + 1;
@@ -4219,7 +4219,7 @@ idl_valid_version (char *s)
     {
       if (!isdigit (tmp[i]))
         {
-          return 0;
+          return false;
         }
     }
 
@@ -4229,7 +4229,7 @@ idl_valid_version (char *s)
     {
       if (!isdigit (s[i]))
         {
-          return 0;
+          return false;
         }
     }
 
@@ -4237,23 +4237,23 @@ idl_valid_version (char *s)
   if (ACE_OS::atoi (minor + 1) > ACE_UINT16_MAX
       || ACE_OS::atoi (s) > ACE_UINT16_MAX)
     {
-      return 0;
+      return false;
     }
 
-  return 1;
+  return true;
 }
 
 static AST_Decl *
 idl_find_node (const char *s)
 {
   UTL_ScopedName * node = FE_Utils::string_to_scoped_name (s);
-  AST_Decl * d = 0;
+  AST_Decl * d = nullptr;
 
-  if (node != 0)
+  if (node != nullptr)
     {
       d = idl_global->scopes ().top_non_null ()->lookup_by_name (node);
 
-      if (d == 0)
+      if (d == nullptr)
         {
           idl_global->err ()->lookup_error (node);
         }
diff --git a/TAO/TAO_IDL/include/ast_annotation_appl.h b/TAO/TAO_IDL/include/ast_annotation_appl.h
index 85567255021..941a8ab0883 100644
--- a/TAO/TAO_IDL/include/ast_annotation_appl.h
+++ b/TAO/TAO_IDL/include/ast_annotation_appl.h
@@ -47,12 +47,6 @@ public:
 
   virtual ~AST_Annotation_Appl ();
 
-  /// Narrowing
-  ///{
-  DEF_NARROW_FROM_DECL (AST_Annotation_Appl);
-  DEF_NARROW_FROM_SCOPE (AST_Annotation_Appl);
-  ///}
-
   /// AST Dumping
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
diff --git a/TAO/TAO_IDL/include/ast_annotation_decl.h b/TAO/TAO_IDL/include/ast_annotation_decl.h
index 0ee0fd2eab7..28ae96220e4 100644
--- a/TAO/TAO_IDL/include/ast_annotation_decl.h
+++ b/TAO/TAO_IDL/include/ast_annotation_decl.h
@@ -18,12 +18,6 @@ public:
 
   virtual ~AST_Annotation_Decl ();
 
-  /// Narrowing
-  ///{
-  DEF_NARROW_FROM_DECL (AST_Annotation_Decl);
-  DEF_NARROW_FROM_SCOPE (AST_Annotation_Decl);
-  ///}
-
   /// AST Dumping
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
diff --git a/TAO/TAO_IDL/include/ast_annotation_member.h b/TAO/TAO_IDL/include/ast_annotation_member.h
index 5686a2f639f..883512bb053 100644
--- a/TAO/TAO_IDL/include/ast_annotation_member.h
+++ b/TAO/TAO_IDL/include/ast_annotation_member.h
@@ -37,12 +37,6 @@ public:
   /// Cleanup
   virtual void destroy ();
 
-  /// Narrowing
-  ///{
-  DEF_NARROW_FROM_DECL (AST_Annotation_Member);
-  DEF_NARROW_FROM_SCOPE (AST_Annotation_Member);
-  ///}
-
   /// AST Dumping
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
index 17d9ef41401..6f90a060c00 100644
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ b/TAO/TAO_IDL/include/ast_argument.h
@@ -87,14 +87,10 @@ public:
                 AST_Type *ft,
                 UTL_ScopedName *n);
 
-  virtual ~AST_Argument (void);
+  virtual ~AST_Argument ();
 
   // Data Accessors.
-  Direction direction (void);
-
-  // Narrowing
-
-  DEF_NARROW_FROM_DECL(AST_Argument);
+  Direction direction ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -103,7 +99,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
index 2eb72f84859..b82000a4a50 100644
--- a/TAO/TAO_IDL/include/ast_array.h
+++ b/TAO/TAO_IDL/include/ast_array.h
@@ -77,7 +77,6 @@ class ast_visitor;
 
 // Representation of array declaration:
 // An array is a combination of a list of dimensions and a base type.
-
 class TAO_IDL_FE_Export AST_Array : public virtual AST_ConcreteType
 {
 public:
@@ -87,30 +86,26 @@ public:
              bool local,
              bool abstract);
 
-  virtual ~AST_Array (void);
+  virtual ~AST_Array ();
 
   // Data Accessors.
 
-  ACE_CDR::ULong n_dims (void);
+  ACE_CDR::ULong n_dims ();
 
-  AST_Expression **dims (void);
+  AST_Expression **dims ();
   void set_dims (AST_Expression **,
                  ACE_CDR::ULong);
 
-  AST_Type *base_type (void) const;
+  AST_Type *base_type () const;
   void set_base_type (AST_Type *nbt);
 
   // 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 (void) const;
+  virtual bool legal_for_primary_key () const;
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Array);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -129,7 +124,7 @@ public:
   ///}
 
 protected:
-  virtual int compute_size_type (void);
+  virtual int compute_size_type ();
   // Compute the size type if it is unknown.
 
 private:
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
index 6a5b10ce5d5..b8be84250cc 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -81,17 +81,13 @@ public:
                  bool local,
                  bool abstract);
 
-  virtual ~AST_Attribute (void);
+  virtual ~AST_Attribute ();
 
   // Data Accessors.
 
-  bool readonly (void) const;
-  UTL_ExceptList *get_get_exceptions (void) const;
-  UTL_ExceptList *get_set_exceptions (void) const;
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Attribute);
+  bool readonly () const;
+  UTL_ExceptList *get_get_exceptions () const;
+  UTL_ExceptList *get_set_exceptions () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -100,7 +96,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Methods to add exceptions directly, used when copying node.
   UTL_ExceptList *be_add_get_exceptions (UTL_ExceptList *t);
@@ -123,7 +119,7 @@ private:
 
   // Scope Management Protocol.
 
-  friend int tao_yyparse (void);
+  friend int tao_yyparse ();
   virtual UTL_NameList *fe_add_get_exceptions (UTL_NameList *e);
   virtual UTL_NameList *fe_add_set_exceptions (UTL_NameList *e);
 };
diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h
index 2a8e15758f3..7d45a7b455b 100644
--- a/TAO/TAO_IDL/include/ast_component.h
+++ b/TAO/TAO_IDL/include/ast_component.h
@@ -24,7 +24,7 @@ public:
                  AST_Interface **supports_flat,
                  long n_supports_flat);
 
-  virtual ~AST_Component (void);
+  virtual ~AST_Component ();
 
   // This also calls the base class version.
   virtual void redefine (AST_Interface *from);
@@ -39,11 +39,11 @@ public:
 
   // Accessors.
 
-  AST_Component *base_component (void) const;
+  AST_Component *base_component () const;
 
-  AST_Type **supports (void) const;
+  AST_Type **supports () const;
 
-  long n_supports (void) const;
+  long n_supports () const;
 
   // Override for component of UTL_Scope method.
   virtual AST_Decl *special_lookup (UTL_ScopedName *e,
@@ -51,7 +51,7 @@ public:
                                     AST_Decl *&final_parent_decl);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Allows adding an uses to a later point
   // The port i is inserted after port ix, if
@@ -59,11 +59,6 @@ public:
   int be_add_uses (AST_Uses *i,
                    AST_Uses *ix = 0);
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (AST_Component);
-  DEF_NARROW_FROM_SCOPE (AST_Component);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
 
diff --git a/TAO/TAO_IDL/include/ast_component_fwd.h b/TAO/TAO_IDL/include/ast_component_fwd.h
index 1c356431df0..61b721beff6 100644
--- a/TAO/TAO_IDL/include/ast_component_fwd.h
+++ b/TAO/TAO_IDL/include/ast_component_fwd.h
@@ -12,14 +12,10 @@ public:
   AST_ComponentFwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~AST_ComponentFwd (void);
+  virtual ~AST_ComponentFwd ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_ComponentFwd);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
@@ -28,7 +24,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Is this decl a forward declared type (Yes)
-  virtual bool is_fwd (void);
+  virtual bool is_fwd ();
 
   static AST_Decl::NodeType const NT;
 };
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
index edac0ba5211..3d15bc1ba7b 100644
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO/TAO_IDL/include/ast_concrete_type.h
@@ -77,13 +77,10 @@ public:
   AST_ConcreteType (AST_Decl::NodeType nt,
                     UTL_ScopedName *n);
 
-  virtual ~AST_ConcreteType (void);
+  virtual ~AST_ConcreteType ();
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_ConcreteType);
+  virtual void destroy ();
 
   virtual bool annotatable () const { return true; }
 };
diff --git a/TAO/TAO_IDL/include/ast_connector.h b/TAO/TAO_IDL/include/ast_connector.h
index 60dd5360f99..d1748e5853e 100644
--- a/TAO/TAO_IDL/include/ast_connector.h
+++ b/TAO/TAO_IDL/include/ast_connector.h
@@ -9,22 +9,17 @@ class TAO_IDL_FE_Export AST_Connector
   : public virtual AST_Component
 {
 public:
-  AST_Connector (void);
+  AST_Connector ();
 
   AST_Connector (UTL_ScopedName *n,
                  AST_Connector *base_connector);
 
-  virtual ~AST_Connector (void);
+  virtual ~AST_Connector ();
 
-  AST_Connector *base_connector (void) const;
+  AST_Connector *base_connector () const;
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (AST_Connector);
-  DEF_NARROW_FROM_SCOPE (AST_Connector);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
index 01196eb790a..b974e63a842 100644
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ b/TAO/TAO_IDL/include/ast_constant.h
@@ -92,29 +92,25 @@ public:
                 AST_Expression *ev,
                 UTL_ScopedName *n);
 
-  virtual ~AST_Constant (void);
+  virtual ~AST_Constant ();
 
   // Data Accessors.
-  AST_Expression *constant_value (void);
-  AST_Expression::ExprType et (void);
+  AST_Expression *constant_value ();
+  AST_Expression::ExprType et ();
 
   // Accessors for the private member.
-  bool ifr_added (void);
+  bool ifr_added ();
   void ifr_added (bool val);
 
-  const char *exprtype_to_string (void);
+  const char *exprtype_to_string ();
   // Returns the appropriate type.
 
   static const char *exprtype_to_string (AST_Expression::ExprType et);
   // For use with ORBs without the CORBA namespace.
 
-  UTL_ScopedName *enum_full_name (void);
+  UTL_ScopedName *enum_full_name ();
   // If our type is enum, we have to generate the scoped name.
 
-  // Narrowing
-
-  DEF_NARROW_FROM_DECL(AST_Constant);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
@@ -122,7 +118,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
diff --git a/TAO/TAO_IDL/include/ast_consumes.h b/TAO/TAO_IDL/include/ast_consumes.h
index 24407232a0e..9060876b5c3 100644
--- a/TAO/TAO_IDL/include/ast_consumes.h
+++ b/TAO/TAO_IDL/include/ast_consumes.h
@@ -12,13 +12,10 @@ public:
   AST_Consumes (UTL_ScopedName *n,
                 AST_Type *consumes_type);
 
-  virtual ~AST_Consumes (void);
+  virtual ~AST_Consumes ();
 
   // Data Accessor.
-  AST_Type *consumes_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_Consumes);
+  AST_Type *consumes_type () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -27,7 +24,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 };
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 161f71115d9..c018be50aba 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -67,7 +67,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _AST_DECL_AST_DECL_HH
 
 #include "utl_scoped_name.h"
-#include "idl_narrow.h"
 #include "ast_annotation_appls.h"
 
 #include "ace/os_include/sys/os_types.h"
@@ -94,17 +93,17 @@ protected:
   COMMON_Base (bool local = false,
                bool abstract = false);
 
-  virtual ~COMMON_Base (void);
+  virtual ~COMMON_Base ();
 
 public:
   // A no-op, overridden in the child classes.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Accessor needs to get overridden for a few types.
-  virtual bool is_local (void);
+  virtual bool is_local ();
   void is_local (bool val);
 
-  bool is_abstract (void) const;
+  bool is_abstract () const;
   void is_abstract (bool val);
 
 protected:
@@ -196,10 +195,10 @@ public:
     UTL_ScopedName *name,
     AST_Decl *other);
 
-  virtual ~AST_Decl (void);
+  virtual ~AST_Decl ();
 
   // Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // If this decl has been found, some types need to be
   // moved onto their true definitions etc. Defaults to
@@ -207,28 +206,28 @@ public:
   virtual AST_Decl *adjust_found (bool ignore_fwd, bool full_def_only);
 
   // Is this decl a forward declared type (default false)
-  virtual bool is_fwd (void);
+  virtual bool is_fwd ();
 
   // Data Accessors.
 
-  bool imported (void);
+  bool imported ();
   void set_imported (bool is_it);
 
-  bool in_main_file (void);
+  bool in_main_file ();
   void set_in_main_file (bool is_it);
 
-  UTL_Scope *defined_in (void);
+  UTL_Scope *defined_in ();
   void set_defined_in (UTL_Scope *);
 
-  NodeType node_type (void);
+  NodeType node_type ();
 
-  long line (void);
+  long line ();
   void set_line (long l);
 
-  ACE_CString & file_name (void);
+  ACE_CString & file_name ();
   void set_file_name (ACE_CString s);
 
-  UTL_ScopedName *name (void);
+  UTL_ScopedName *name ();
 
   UTL_ScopedName *compute_name (const char *prefix,
                                 const char *suffix);
@@ -237,36 +236,36 @@ public:
 
   void set_name (UTL_ScopedName *n);
 
-  Identifier *local_name (void);
+  Identifier *local_name ();
   void local_name (Identifier *id);
 
   Identifier *compute_local_name (const char *prefix,
                                   const char *sufix);
   // Apply prefix and suffix to the local name and return.
 
-  virtual const char *full_name (void);
+  virtual const char *full_name ();
   // Return the stringified full name.
 
-  virtual const char *flat_name (void);
+  virtual const char *flat_name ();
   // Return the flattened full scoped name.
 
-  const char *repoID (void);
+  const char *repoID ();
   void repoID (char *value);
   // Accessors for the repository ID.
 
-  const char *prefix (void);
+  const char *prefix ();
   void prefix (const char *value);
   // Accessors for the repository ID prefix.
 
-  const char *version (void);
+  const char *version ();
   void version (char *value);
   // Accessors for the version_ member.
 
-  bool anonymous (void) const;
+  bool anonymous () const;
   void anonymous (bool val);
   // Accessors for the anonymous_ member.
 
-  bool typeid_set (void) const;
+  bool typeid_set () const;
   void typeid_set (bool val);
   // Accessors for the typeid_set_ member.
 
@@ -281,16 +280,12 @@ public:
   // prefix to the all the reserved keywords. But when we invoke the
   // operation remotely, we should be sending only the name with out
   // "_cxx_" prefix.
-  Identifier *original_local_name (void);
+  Identifier *original_local_name ();
   void original_local_name (Identifier *);
 
   // To be overridden by the subclasses interface, struct, union, and
   // the corresponding forward declaration classes.
-  virtual bool is_defined (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Decl);
+  virtual bool is_defined ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -306,18 +301,18 @@ public:
   // Return TRUE if "this" is a child of "s".
   bool is_child (AST_Decl *s);
 
-  bool is_nested (void);
+  bool is_nested ();
   // Determines if we are inside of a nested scope or not.
 
-  UTL_ScopedName *last_referenced_as (void) const;
+  UTL_ScopedName *last_referenced_as () const;
   void last_referenced_as (UTL_ScopedName *n);
 
   // Accessors for the prefix_scope_ member.
-  UTL_Scope *prefix_scope (void);
+  UTL_Scope *prefix_scope ();
   void prefix_scope (UTL_Scope *s);
 
   // Useful for GIOP to know if a wstring is being marshaled.
-  virtual int contains_wstring (void);
+  virtual int contains_wstring ();
   void contains_wstring (int val);
 
   // Additional checks when we think we have caught an IDL
@@ -326,7 +321,7 @@ public:
   bool masking_checks (AST_Decl *mod);
 
   // Accessors for the member.
-  bool in_tmpl_mod_not_aliased (void) const;
+  bool in_tmpl_mod_not_aliased () const;
   void in_tmpl_mod_not_aliased (bool val);
 
   /// Set and get annotations for this IDL element
@@ -410,13 +405,13 @@ protected:
 
   void dump_i (ACE_OSTREAM_TYPE &o, const char *s) const ;
 
-  void compute_repoID (void);
+  void compute_repoID ();
   // Computes the repoID.
 
-  void compute_full_name (void);
+  void compute_full_name ();
   // Computes the stringified scoped name.
 
-  void compute_flat_name (void);
+  void compute_flat_name ();
   // Compute the flattened fully scoped name.
 
   const char *node_type_to_string (NodeType nt);
diff --git a/TAO/TAO_IDL/include/ast_emits.h b/TAO/TAO_IDL/include/ast_emits.h
index 20c8b276b9c..423a5f8a76a 100644
--- a/TAO/TAO_IDL/include/ast_emits.h
+++ b/TAO/TAO_IDL/include/ast_emits.h
@@ -12,13 +12,10 @@ public:
   AST_Emits (UTL_ScopedName *n,
              AST_Type *emits_type);
 
-  virtual ~AST_Emits (void);
+  virtual ~AST_Emits ();
 
   // Data Accessor.
-  AST_Type *emits_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_Emits);
+  AST_Type *emits_type () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -27,7 +24,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 };
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
index 3ab61916e3b..32b18f78a4c 100644
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ b/TAO/TAO_IDL/include/ast_enum.h
@@ -80,12 +80,7 @@ public:
             bool local,
             bool abstract);
 
-  virtual ~AST_Enum (void);
-
-  // Narrowing
-
-  DEF_NARROW_FROM_DECL(AST_Enum);
-  DEF_NARROW_FROM_SCOPE(AST_Enum);
+  virtual ~AST_Enum ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
@@ -94,16 +89,16 @@ public:
   AST_EnumVal *lookup_by_value (const AST_Expression *v);
 
   // Get value to be assigned to next enumerator.
-  unsigned long next_enum_val (void);
+  unsigned long next_enum_val ();
 
   // Return the count of members
-  virtual int member_count (void);
+  virtual int member_count ();
 
   // Convert a numeric value to the enum's string name for it.
   UTL_ScopedName *value_to_name (const unsigned long v);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
@@ -113,7 +108,7 @@ public:
   virtual bool annotatable () const { return true; }
 
 private:
-  friend int tao_yyparse (void);
+  friend int tao_yyparse ();
 
   unsigned long pd_enum_counter;
   // Value for next enumerator.
@@ -121,7 +116,7 @@ private:
   int member_count_;
   // Number of members.
 
-  int compute_member_count (void);
+  int compute_member_count ();
   // Count the number of members.
 
   virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v);
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
index 6339f5280cf..f1667000d0b 100644
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ b/TAO/TAO_IDL/include/ast_enum_val.h
@@ -78,10 +78,7 @@ public:
   AST_EnumVal (ACE_CDR::ULong v,
                UTL_ScopedName *n);
 
-  virtual ~AST_EnumVal (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_EnumVal);
+  virtual ~AST_EnumVal ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h
index f47c01def16..f7243863e8c 100644
--- a/TAO/TAO_IDL/include/ast_eventtype.h
+++ b/TAO/TAO_IDL/include/ast_eventtype.h
@@ -20,15 +20,10 @@ public:
                  bool truncatable,
                  bool custom);
 
-  virtual ~AST_EventType (void);
+  virtual ~AST_EventType ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_EventType);
-  DEF_NARROW_FROM_SCOPE(AST_EventType);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/ast_eventtype_fwd.h b/TAO/TAO_IDL/include/ast_eventtype_fwd.h
index a928e482232..c859663a582 100644
--- a/TAO/TAO_IDL/include/ast_eventtype_fwd.h
+++ b/TAO/TAO_IDL/include/ast_eventtype_fwd.h
@@ -12,14 +12,10 @@ public:
   AST_EventTypeFwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~AST_EventTypeFwd (void);
+  virtual ~AST_EventTypeFwd ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_EventTypeFwd);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
index 996b6c63114..76556795479 100644
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ b/TAO/TAO_IDL/include/ast_exception.h
@@ -83,16 +83,11 @@ public:
                  bool local,
                  bool abstract);
 
-  virtual ~AST_Exception (void);
+  virtual ~AST_Exception ();
 
   virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Check if we or the parameter node is in recursion.
 
-  // Narrowing
-
-  DEF_NARROW_FROM_DECL(AST_Exception);
-  DEF_NARROW_FROM_SCOPE(AST_Exception);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
@@ -100,7 +95,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 };
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index ec2dfc4eb22..9a975bf9502 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -161,7 +161,7 @@ public:
   // Structure to describe value of constant expression and its type.
   struct AST_ExprValue
     {
-      AST_ExprValue (void);
+      AST_ExprValue ();
 
       union
         {
@@ -232,30 +232,30 @@ public:
   AST_Expression (const ACE_CDR::Fixed &f);
 
   // Destructor.
-  virtual ~AST_Expression (void);
+  virtual ~AST_Expression ();
 
   // Data Accessors.
-  UTL_Scope *defined_in (void);
+  UTL_Scope *defined_in ();
   void set_defined_in (UTL_Scope *d);
 
-  long line (void);
+  long line ();
   void set_line (long l);
 
-  UTL_String *file_name (void);
+  UTL_String *file_name ();
   void set_file_name (UTL_String *f);
 
-  ExprComb ec (void);
+  ExprComb ec ();
 
-  AST_ExprValue *ev (void);
+  AST_ExprValue *ev ();
   void set_ev (AST_ExprValue *new_ev);
 
-  AST_Expression *v1 (void);
+  AST_Expression *v1 ();
   void set_v1 (AST_Expression *e);
 
-  AST_Expression *v2 (void);
+  AST_Expression *v2 ();
   void set_v2 (AST_Expression *e);
 
-  UTL_ScopedName *n (void);
+  UTL_ScopedName *n ();
   void set_n (UTL_ScopedName *new_n);
 
   // AST Dumping.
@@ -265,7 +265,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Other operations.
 
@@ -286,10 +286,10 @@ public:
   long compare (AST_Expression *vc);
 
   // Accessor for the member.
-  AST_Decl *get_tdef (void) const;
+  AST_Decl *get_tdef () const;
 
   // Accessor for the member.
-  AST_Param_Holder *param_holder (void) const;
+  AST_Param_Holder *param_holder () const;
 
   static const char *exprtype_to_string (ExprType t);
 
@@ -345,7 +345,7 @@ private:
   // Non-zero if we were created from a reference template param.
 
   // Fill out the lineno, filename and definition scope details.
-  void fill_definition_details (void);
+  void fill_definition_details ();
 
   // Internal evaluation.
   virtual AST_ExprValue *eval_internal (EvalKind ek);
diff --git a/TAO/TAO_IDL/include/ast_extended_port.h b/TAO/TAO_IDL/include/ast_extended_port.h
index 3b49cefc994..dd0fb686581 100644
--- a/TAO/TAO_IDL/include/ast_extended_port.h
+++ b/TAO/TAO_IDL/include/ast_extended_port.h
@@ -13,16 +13,12 @@ public:
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
 
-  virtual ~AST_Extended_Port (void);
+  virtual ~AST_Extended_Port ();
 
-  AST_PortType *port_type (void) const;
+  AST_PortType *port_type () const;
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (AST_Extended_Port);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
index c2c9e0f00af..480182b2467 100644
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ b/TAO/TAO_IDL/include/ast_extern.h
@@ -79,7 +79,7 @@ class AST_Decl;
 // type the full definition was also seen.
 
 extern void AST_record_fwd_decl (AST_Type *i);
-extern TAO_IDL_FE_Export void AST_check_fwd_decls (void);
+extern TAO_IDL_FE_Export void AST_check_fwd_decls ();
 extern bool AST_illegal_recursive_type (AST_Decl *t);
 extern bool AST_illegal_interface_recursion (AST_Decl *t);
 
diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h
index ad2996b0a23..d83aeacfd84 100644
--- a/TAO/TAO_IDL/include/ast_factory.h
+++ b/TAO/TAO_IDL/include/ast_factory.h
@@ -81,32 +81,27 @@ class TAO_IDL_FE_Export AST_Factory : public virtual AST_Decl,
 public:
   AST_Factory (UTL_ScopedName *n);
 
-  virtual ~AST_Factory (void);
+  virtual ~AST_Factory ();
 
-  UTL_ExceptList *exceptions (void);
+  UTL_ExceptList *exceptions ();
   // Return exception list.
 
-  int n_exceptions (void);
+  int n_exceptions ();
   // Return exception count.
 
-  virtual int argument_count (void);
+  virtual int argument_count ();
   // Return the count of members.
 
-  virtual int has_native (void);
+  virtual int has_native ();
   // Any of the arguments or the return value is a <native> type.
   // This is important because in that case no code should be
   // generated for the stubs.
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Factory);
-  DEF_NARROW_FROM_SCOPE(AST_Factory);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
@@ -134,12 +129,12 @@ protected:
 private:
   // Operations.
 
-  int compute_argument_attr (void);
+  int compute_argument_attr ();
   // Count the number of arguments.
 
   // Scope Management Protocol.
 
-  friend int tao_yyparse (void);
+  friend int tao_yyparse ();
   virtual AST_Argument *fe_add_argument (AST_Argument *a);
   virtual UTL_NameList *fe_add_exceptions (UTL_NameList *e);
 };
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index 03adc8d793d..2949a69b97e 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -109,10 +109,10 @@ public:
     UTL_ScopedName *name,
     AST_Field *other);
 
-  virtual ~AST_Field (void);
+  virtual ~AST_Field ();
 
   // Data Accessors.
-  AST_Type *field_type (void) const;
+  AST_Type *field_type () const;
 
   /// Get and Set Visibility
   ///{
@@ -121,16 +121,12 @@ public:
   ///}
 
   // Are we or do we contain a wstring?
-  virtual int contains_wstring (void);
+  virtual int contains_wstring ();
 
   // Determine this bit of state after we have
   // be added to our aggregate type and before
   // we are destroyed.
-  void set_recursive_flag (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (AST_Field);
+  void set_recursive_flag ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -139,7 +135,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
diff --git a/TAO/TAO_IDL/include/ast_finder.h b/TAO/TAO_IDL/include/ast_finder.h
index ce0403c6936..f66e44d910f 100644
--- a/TAO/TAO_IDL/include/ast_finder.h
+++ b/TAO/TAO_IDL/include/ast_finder.h
@@ -12,17 +12,13 @@ public:
 
   AST_Finder (UTL_ScopedName *n);
 
-  virtual ~AST_Finder (void);
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Finder);
-  DEF_NARROW_FROM_SCOPE(AST_Finder);
+  virtual ~AST_Finder ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
diff --git a/TAO/TAO_IDL/include/ast_fixed.h b/TAO/TAO_IDL/include/ast_fixed.h
index 2c7a8793375..afd9311e6df 100644
--- a/TAO/TAO_IDL/include/ast_fixed.h
+++ b/TAO/TAO_IDL/include/ast_fixed.h
@@ -17,8 +17,6 @@ public:
 
   virtual ~AST_Fixed ();
 
-  DEF_NARROW_FROM_DECL (AST_Fixed);
-
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   virtual void destroy ();
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index d4fd9fbac16..36c34f517d4 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -103,9 +103,9 @@ class AST_Annotation_Member;
 class TAO_IDL_FE_Export AST_Generator
 {
 public:
-  AST_Generator (void) {}
+  AST_Generator () {}
 
-  virtual ~AST_Generator (void) {}
+  virtual ~AST_Generator () {}
 
   // Operations.
 
diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h
index d12a3624009..045c1357e8b 100644
--- a/TAO/TAO_IDL/include/ast_home.h
+++ b/TAO/TAO_IDL/include/ast_home.h
@@ -20,7 +20,7 @@ public:
             AST_Interface **supports_flat,
             long n_supports_flat);
 
-  virtual ~AST_Home (void);
+  virtual ~AST_Home ();
 
   // Extend lookup to the base home.
   virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
@@ -37,25 +37,20 @@ public:
 
   // Accessors.
 
-  AST_Home *base_home (void) const;
+  AST_Home *base_home () const;
 
-  AST_Type **supports (void) const;
+  AST_Type **supports () const;
 
-  long n_supports (void) const;
+  long n_supports () const;
 
-  AST_Component *managed_component (void) const;
+  AST_Component *managed_component () const;
 
-  AST_Type *primary_key (void) const;
+  AST_Type *primary_key () const;
 
   void transfer_scope_elements (AST_Interface *dst);
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Home);
-  DEF_NARROW_FROM_SCOPE(AST_Home);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -68,7 +63,7 @@ public:
 private:
   // Scope Management Protocol.
 
-  friend int tao_yyparse (void);
+  friend int tao_yyparse ();
   friend class ast_visitor_tmpl_module_inst;
 
   virtual AST_Factory *fe_add_factory (AST_Factory *f);
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 2be8cee24f3..a5fe7b023f5 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -85,7 +85,7 @@ public:
                  bool local,
                  bool abstract);
 
-  virtual ~AST_Interface (void);
+  virtual ~AST_Interface ();
 
   // This serves for interfaces, value types, components, and eventtypes.
   static void fwd_redefinition_helper (AST_Interface *&i,
@@ -94,16 +94,16 @@ public:
   // Overridden for valuetypes, components, and eventtypes.
   virtual void redefine (AST_Interface *from);
 
-  AST_Type **inherits (void) const;
+  AST_Type **inherits () const;
 
-  long n_inherits (void) const;
+  long n_inherits () const;
 
-  AST_Interface **inherits_flat (void) const;
+  AST_Interface **inherits_flat () const;
 
-  long n_inherits_flat (void) const;
+  long n_inherits_flat () const;
 
-  ACE_Unbounded_Queue<AST_Type *> &get_insert_queue (void);
-  ACE_Unbounded_Queue<AST_Type *> &get_del_queue (void);
+  ACE_Unbounded_Queue<AST_Type *> &get_insert_queue ();
+  ACE_Unbounded_Queue<AST_Type *> &get_del_queue ();
 
   AST_Operation *be_add_operation (AST_Operation *);
 
@@ -113,18 +113,18 @@ public:
   // Is this interface defined? This predicate returns FALSE when an
   // interface was forward declared but not defined yet, and TRUE in
   // all other cases.
-  bool is_defined (void);
+  bool is_defined ();
 
   // Check if we have redefined any of our parents' operations or attributes,
   // and check if there is such a clash among the parents
-  bool redef_clash (void);
+  bool redef_clash ();
 
   // Accessors for the member.
-  bool home_equiv (void) const;
+  bool home_equiv () const;
   void home_equiv (bool val);
 
   // Accessors for the member.
-  AST_InterfaceFwd *fwd_decl (void) const;
+  AST_InterfaceFwd *fwd_decl () const;
   void fwd_decl (AST_InterfaceFwd *node);
 
   // Look through inherited interfaces.
@@ -135,34 +135,29 @@ public:
                                      bool full_def_only = false);
 
   /// Do we have both abstract and concrete parents?
-  int has_mixed_parentage (void);
+  int has_mixed_parentage ();
 
   /// Compute whether or not we have both abstract and concrete parents,
   /// and make a list of the abstract parents, if any.
-  void analyze_parentage (void);
+  void analyze_parentage ();
 
   // 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 (void) const;
+  virtual bool legal_for_primary_key () const;
 
   virtual AST_Decl *special_lookup (UTL_ScopedName *e,
                                     bool full_def_only,
                                     AST_Decl *&final_parent_decl);
 
   /// Accessors for the members.
-  AST_Interface *ami_handler (void) const;
+  AST_Interface *ami_handler () const;
   void ami_handler (AST_Interface *handler);
-  AST_Interface *ami4ccm_uses (void) const;
+  AST_Interface *ami4ccm_uses () const;
   void ami4ccm_uses (AST_Interface *implied);
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Interface);
-  DEF_NARROW_FROM_SCOPE(AST_Interface);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 34a4ff22828..101b39fd6d6 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -77,9 +77,9 @@ public:
   AST_InterfaceFwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~AST_InterfaceFwd (void);
+  virtual ~AST_InterfaceFwd ();
 
-  AST_Interface *full_definition (void);
+  AST_Interface *full_definition ();
 
   /**
    * Sets the full definition. If there is an existing dummy definition, it
@@ -87,7 +87,7 @@ public:
    */
   void set_full_definition (AST_Interface *nfd);
 
-  virtual bool is_defined (void);
+  virtual bool is_defined ();
   void set_as_defined ();
 
   /**
@@ -98,18 +98,14 @@ public:
    */
   void disown_full_definition ();
 
-  virtual bool is_local (void);
-  virtual bool is_valuetype (void);
-  virtual bool is_abstract_valuetype (void);
+  virtual bool is_local ();
+  virtual bool is_valuetype ();
+  virtual bool is_abstract_valuetype ();
 
-  bool full_def_seen (void);
+  bool full_def_seen ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_InterfaceFwd);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
@@ -118,7 +114,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Is this decl a forward declared type (Yes)
-  virtual bool is_fwd (void);
+  virtual bool is_fwd ();
 
   // We don't actually want the forward declaration,
   // but want to return the full definition member,
diff --git a/TAO/TAO_IDL/include/ast_mirror_port.h b/TAO/TAO_IDL/include/ast_mirror_port.h
index a5fbc761b4f..3195c88da4a 100644
--- a/TAO/TAO_IDL/include/ast_mirror_port.h
+++ b/TAO/TAO_IDL/include/ast_mirror_port.h
@@ -12,14 +12,10 @@ public:
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
 
-  virtual ~AST_Mirror_Port (void);
+  virtual ~AST_Mirror_Port ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (AST_Mirror_Port);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index 03998ee62f0..d697dcb785e 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -87,21 +87,17 @@ public:
   AST_Module (UTL_ScopedName *n, AST_Module *prev = 0);
 
   // Destructor.
-  virtual ~AST_Module (void);
+  virtual ~AST_Module ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_Module);
-  DEF_NARROW_FROM_SCOPE(AST_Module);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Involved in OBV_ namespace generation.
-  void set_has_nested_valuetype (void);
-  bool has_nested_valuetype (void);
+  void set_has_nested_valuetype ();
+  bool has_nested_valuetype ();
 
   // Allows adding an interface at a later point.
   // The interface i is inserted after interface ix, if
@@ -135,11 +131,11 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Accessors for the member.
-  AST_Template_Module_Inst *from_inst (void) const;
+  AST_Template_Module_Inst *from_inst () const;
   void from_inst (AST_Template_Module_Inst *node);
 
   // Accessors for the member.
-  AST_Template_Module_Ref *from_ref (void) const;
+  AST_Template_Module_Ref *from_ref () const;
   void from_ref (AST_Template_Module_Ref *node);
 
   // Override that looks in previous openings.
@@ -238,7 +234,7 @@ public:
   // (called by AST_Root::destroy on the CORBA module containing
   // the basic types, since it isn't destroyed between processing
   // multiple IDL files.
-  void reset_last_in_same_parent_scope (void);
+  void reset_last_in_same_parent_scope ();
 
   virtual bool annotatable () const { return true; }
 
diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h
index 04a5fec2681..2a56f19a152 100644
--- a/TAO/TAO_IDL/include/ast_native.h
+++ b/TAO/TAO_IDL/include/ast_native.h
@@ -15,13 +15,10 @@ class TAO_IDL_FE_Export AST_Native : public virtual AST_Exception
 public:
   AST_Native (UTL_ScopedName *n);
 
-  virtual ~AST_Native (void);
+  virtual ~AST_Native ();
 
   // Cleanup.
-  virtual void destroy (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_Native);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
index f226d57780d..008fcc4616f 100644
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ b/TAO/TAO_IDL/include/ast_operation.h
@@ -90,28 +90,28 @@ public:
                  bool local,
                  bool abstract);
 
-  virtual ~AST_Operation (void);
+  virtual ~AST_Operation ();
 
   // Data Accessors.
 
-  AST_Type *return_type (void);
+  AST_Type *return_type ();
 
-  Flags flags (void);
+  Flags flags ();
 
-  UTL_StrList *context (void);
+  UTL_StrList *context ();
 
-  UTL_ExceptList *exceptions (void);
+  UTL_ExceptList *exceptions ();
 
   // Public operations.
 
-  bool void_return_type (void);
+  bool void_return_type ();
   /// Returns 1 if the operation has a void return type.
 
   /// Return the number of arguments
-  virtual int argument_count (void);
+  virtual int argument_count ();
 
   /// Return the flag indicating a request sends argument data
-  virtual bool has_in_arguments (void);
+  virtual bool has_in_arguments ();
 
   /// Count the number of arguments of a certain type.
   /**
@@ -125,21 +125,16 @@ public:
    */
   int count_arguments_with_direction (int direction_mask);
 
-  virtual int has_native (void);
+  virtual int has_native ();
   // Any of the arguments or the return value is a <native> type.
   // This is important because in that case no code should be
   // generated for the stubs.
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Operation);
-  DEF_NARROW_FROM_SCOPE(AST_Operation);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
@@ -177,12 +172,12 @@ protected:
 
   // Operations.
 
-  int compute_argument_attr (void);
+  int compute_argument_attr ();
   // Count the number of arguments.
 
   // Scope Management Protocol.
 
-  friend int tao_yyparse (void);
+  friend int tao_yyparse ();
   virtual AST_Argument *fe_add_argument (AST_Argument *a);
   virtual UTL_StrList *fe_add_context (UTL_StrList *c);
   virtual UTL_NameList *fe_add_exceptions (UTL_NameList *e);
diff --git a/TAO/TAO_IDL/include/ast_param_holder.h b/TAO/TAO_IDL/include/ast_param_holder.h
index e3c99455c5c..17f4d66f41b 100644
--- a/TAO/TAO_IDL/include/ast_param_holder.h
+++ b/TAO/TAO_IDL/include/ast_param_holder.h
@@ -13,18 +13,15 @@ public:
   AST_Param_Holder (UTL_ScopedName *parameter_name,
                     FE_Utils::T_Param_Info *info);
 
-  virtual ~AST_Param_Holder (void);
+  virtual ~AST_Param_Holder ();
 
-  FE_Utils::T_Param_Info const *info (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (AST_Param_Holder);
+  FE_Utils::T_Param_Info const *info () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
diff --git a/TAO/TAO_IDL/include/ast_porttype.h b/TAO/TAO_IDL/include/ast_porttype.h
index 1a745e2ad87..20b0e92ea26 100644
--- a/TAO/TAO_IDL/include/ast_porttype.h
+++ b/TAO/TAO_IDL/include/ast_porttype.h
@@ -18,15 +18,10 @@ class TAO_IDL_FE_Export AST_PortType
 public:
   AST_PortType (UTL_ScopedName *n);
 
-  virtual ~AST_PortType (void);
+  virtual ~AST_PortType ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (AST_PortType);
-  DEF_NARROW_FROM_SCOPE (AST_PortType);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
index 311e89c3e04..3969936f4ce 100644
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ b/TAO/TAO_IDL/include/ast_predefined_type.h
@@ -100,13 +100,10 @@ public:
   AST_PredefinedType (PredefinedType t,
                       UTL_ScopedName *n);
 
-  virtual ~AST_PredefinedType (void);
+  virtual ~AST_PredefinedType ();
 
   // Data Accessors.
-  PredefinedType pt (void);
-
-  // Narrowing
-  DEF_NARROW_FROM_DECL(AST_PredefinedType);
+  PredefinedType pt ();
 
   // AST Dumping
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -115,12 +112,12 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
 protected:
-  virtual int compute_size_type (void);
+  virtual int compute_size_type ();
   // Compute the size type if it is unknown.
 
 private:
diff --git a/TAO/TAO_IDL/include/ast_provides.h b/TAO/TAO_IDL/include/ast_provides.h
index 6074f47e09d..3d5b3f5c52b 100644
--- a/TAO/TAO_IDL/include/ast_provides.h
+++ b/TAO/TAO_IDL/include/ast_provides.h
@@ -10,13 +10,10 @@ public:
   AST_Provides (UTL_ScopedName *n,
                 AST_Type *provides_type);
 
-  virtual ~AST_Provides (void);
+  virtual ~AST_Provides ();
 
   // Data Accessor.
-  AST_Type *provides_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_Provides);
+  AST_Type *provides_type () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -25,7 +22,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 };
diff --git a/TAO/TAO_IDL/include/ast_publishes.h b/TAO/TAO_IDL/include/ast_publishes.h
index 1ef752f8f9c..96295e30067 100644
--- a/TAO/TAO_IDL/include/ast_publishes.h
+++ b/TAO/TAO_IDL/include/ast_publishes.h
@@ -12,13 +12,10 @@ public:
   AST_Publishes (UTL_ScopedName *n,
                  AST_Type *publishes_type);
 
-  virtual ~AST_Publishes (void);
+  virtual ~AST_Publishes ();
 
   // Data Accessor.
-  AST_Type *publishes_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_Publishes);
+  AST_Type *publishes_type () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -27,7 +24,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 };
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
index 542de927785..8c3b50d01f1 100644
--- a/TAO/TAO_IDL/include/ast_root.h
+++ b/TAO/TAO_IDL/include/ast_root.h
@@ -75,14 +75,9 @@ class TAO_IDL_FE_Export AST_Root : public virtual AST_Module
 public:
   AST_Root (UTL_ScopedName *n);
 
-  virtual ~AST_Root (void);
+  virtual ~AST_Root ();
 
-  virtual unsigned long nmembers (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Root);
-  DEF_NARROW_FROM_SCOPE(AST_Root);
+  virtual unsigned long nmembers ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -94,13 +89,13 @@ public:
   virtual void destroy ();
 
   // Final cleanup.
-  void fini (void);
+  void fini ();
 
   static AST_Decl::NodeType const NT;
 
 private:
   friend class FE_Declarator;
-  friend int tao_yyparse (void);
+  friend int tao_yyparse ();
 
   // Add protocol.
 
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
index 228a579dd43..d1f1d94abda 100644
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ b/TAO/TAO_IDL/include/ast_sequence.h
@@ -81,34 +81,30 @@ public:
                 bool local,
                 bool abstract);
 
-  virtual ~AST_Sequence (void);
+  virtual ~AST_Sequence ();
 
   virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Are we or the node represented by node involved in recursion.
 
   // Data Accessors.
-  AST_Expression *max_size (void);
+  AST_Expression *max_size ();
 
-  AST_Type *base_type (void) const;
+  AST_Type *base_type () const;
 
-  virtual bool unbounded (void) const;
+  virtual bool unbounded () const;
   // Is this sequence bounded or not.
 
   // 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 (void) const;
+  virtual bool legal_for_primary_key () const;
 
   // Is the element type a forward declared struct or union
   // that hasn't yet been fully defined?
-  virtual bool is_defined (void);
+  virtual bool is_defined ();
 
   // Cleanup method.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Sequence);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
index 5fbd6631885..71ad8c1e935 100644
--- a/TAO/TAO_IDL/include/ast_string.h
+++ b/TAO/TAO_IDL/include/ast_string.h
@@ -82,14 +82,11 @@ public:
               AST_Expression *max_size,
               long wide = 1);
 
-  virtual ~AST_String (void);
+  virtual ~AST_String ();
 
   // Data Accessors.
-  AST_Expression *max_size (void);
-  long width (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_String);
+  AST_Expression *max_size ();
+  long width ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -98,7 +95,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
index 7ccf834cf66..15eb9c2dd65 100644
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ b/TAO/TAO_IDL/include/ast_structure.h
@@ -94,7 +94,7 @@ public:
                  bool local,
                  bool abstract);
 
-  virtual ~AST_Structure (void);
+  virtual ~AST_Structure ();
 
   // This serves for both structs and unions.
   static void fwd_redefinition_helper (AST_Structure *&i,
@@ -103,55 +103,50 @@ public:
   // Overridden for unions.
   virtual void redefine (AST_Structure *from);
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Structure);
-  DEF_NARROW_FROM_SCOPE(AST_Structure);
-
-  virtual int member_count (void);
+  virtual int member_count ();
   // Return the count of members.
 
-  virtual ACE_CDR::ULong nfields (void) const;
+  virtual ACE_CDR::ULong nfields () const;
   // Return the count of actual fields.
 
   virtual int field (AST_Field **&result,
                      ACE_CDR::ULong slot) const;
   // Get an individual field node.
 
-  virtual bool is_local (void);
+  virtual bool is_local ();
   // Overwrite the is_local method.
 
   virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Are we or the node represented by node involved in recursion.
 
-  virtual int contains_wstring (void);
+  virtual int contains_wstring ();
   // Do we contain a wstring at some nesting level?
 
   // Is this struct or union defined? This predicate returns FALSE when a
   // forward declaration is not defined yet, and TRUE in
   // all other cases.
-  virtual bool is_defined (void);
+  virtual bool is_defined ();
 
   // 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 (void) const;
+  virtual bool legal_for_primary_key () const;
 
   // Accessors for the member.
-  AST_StructureFwd *fwd_decl (void) const;
+  AST_StructureFwd *fwd_decl () const;
   void fwd_decl (AST_StructureFwd *node);
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
   // Accessor for the member.
-  ACE_Unbounded_Queue<AST_Field *> &fields (void);
+  ACE_Unbounded_Queue<AST_Field *> &fields ();
 
   static AST_Decl::NodeType const NT;
 
@@ -166,7 +161,7 @@ public:
   ///}
 
 protected:
-  friend int tao_yyparse (void);
+  friend int tao_yyparse ();
   // Scope Management Protocol.
 
   virtual AST_Union *fe_add_union (AST_Union *u);
@@ -177,7 +172,7 @@ protected:
 
   virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v);
 
-  virtual int compute_size_type (void);
+  virtual int compute_size_type ();
   // Compute the size type if it is unknown.
 
   ACE_Unbounded_Queue<AST_Field *> fields_;
@@ -186,7 +181,7 @@ protected:
   // the struct.
 
 private:
-  int compute_member_count (void);
+  int compute_member_count ();
   // Count the number of members.
 
   int member_count_;
diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h
index 8481a85fea2..f459c558505 100644
--- a/TAO/TAO_IDL/include/ast_structure_fwd.h
+++ b/TAO/TAO_IDL/include/ast_structure_fwd.h
@@ -13,20 +13,16 @@ public:
   AST_StructureFwd (AST_Structure *full_defn,
                     UTL_ScopedName *n);
 
-  virtual ~AST_StructureFwd (void);
+  virtual ~AST_StructureFwd ();
 
-  AST_Structure *full_definition (void);
+  AST_Structure *full_definition ();
   void set_full_definition (AST_Structure *nfd);
 
-  virtual bool is_defined (void);
-  void set_as_defined (void);
+  virtual bool is_defined ();
+  void set_as_defined ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_StructureFwd);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
@@ -35,7 +31,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Is this decl a forward declared type (Yes)
-  virtual bool is_fwd (void);
+  virtual bool is_fwd ();
 
   // We don't actually want the forward declaration,
   // but want to return the full definition member,
diff --git a/TAO/TAO_IDL/include/ast_template_module.h b/TAO/TAO_IDL/include/ast_template_module.h
index bfc44bc6f74..5f1e5d4e8f2 100644
--- a/TAO/TAO_IDL/include/ast_template_module.h
+++ b/TAO/TAO_IDL/include/ast_template_module.h
@@ -15,10 +15,10 @@ public:
   AST_Template_Module (UTL_ScopedName *n,
                        FE_Utils::T_PARAMLIST_INFO *template_params);
 
-  virtual ~AST_Template_Module (void);
+  virtual ~AST_Template_Module ();
 
   FE_Utils::T_PARAMLIST_INFO *
-  template_params (void) const;
+  template_params () const;
 
   // Checks for errors in the template args of an instantiation.
   bool match_arg_names (FE_Utils::T_ARGLIST *args);
@@ -26,15 +26,11 @@ public:
   // Checks for errors in the template param refs of an alias.
   bool match_param_refs (UTL_StrList *refs, UTL_Scope *decl_scope);
 
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (AST_Template_Module);
-  DEF_NARROW_FROM_SCOPE (AST_Template_Module);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
diff --git a/TAO/TAO_IDL/include/ast_template_module_inst.h b/TAO/TAO_IDL/include/ast_template_module_inst.h
index 4b2031cbcaa..d56fc150dc1 100644
--- a/TAO/TAO_IDL/include/ast_template_module_inst.h
+++ b/TAO/TAO_IDL/include/ast_template_module_inst.h
@@ -15,21 +15,18 @@ public:
                             AST_Template_Module *ref,
                             FE_Utils::T_ARGLIST *template_args);
 
-  virtual ~AST_Template_Module_Inst (void);
+  virtual ~AST_Template_Module_Inst ();
 
-  AST_Template_Module *ref (void) const;
+  AST_Template_Module *ref () const;
 
   FE_Utils::T_ARGLIST const *
-  template_args (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (AST_Template_Module_Inst);
+  template_args () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
diff --git a/TAO/TAO_IDL/include/ast_template_module_ref.h b/TAO/TAO_IDL/include/ast_template_module_ref.h
index 5abdba89e19..7273bc0e381 100644
--- a/TAO/TAO_IDL/include/ast_template_module_ref.h
+++ b/TAO/TAO_IDL/include/ast_template_module_ref.h
@@ -15,20 +15,17 @@ public:
                            AST_Template_Module *ref,
                            UTL_StrList *param_refs);
 
-  virtual ~AST_Template_Module_Ref (void);
+  virtual ~AST_Template_Module_Ref ();
 
-  AST_Template_Module *ref (void) const;
+  AST_Template_Module *ref () const;
 
-  UTL_StrList *param_refs (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (AST_Template_Module_Ref);
+  UTL_StrList *param_refs () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
@@ -42,7 +39,7 @@ public:
   virtual AST_Decl *adjust_found (bool ignore_fwd, bool full_def_only);
 
   /// Accessors for the member.
-  bool processed (void) const;
+  bool processed () const;
   void processed (bool val);
 
   static AST_Decl::NodeType const NT;
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
index e3698c729c9..5cda580cf1c 100644
--- a/TAO/TAO_IDL/include/ast_type.h
+++ b/TAO/TAO_IDL/include/ast_type.h
@@ -90,7 +90,7 @@ public:
   AST_Type (AST_Decl::NodeType nt,
             UTL_ScopedName *n);
 
-  virtual ~AST_Type (void);
+  virtual ~AST_Type ();
 
   virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Determine if we are involved in some kind of limited recursion.
@@ -101,21 +101,21 @@ public:
   virtual void size_type (SIZE_TYPE);
   // Set the size type.
 
-  virtual SIZE_TYPE size_type (void);
+  virtual SIZE_TYPE size_type ();
   // Return our size type.
 
   // Accessors/mutators for the private members.
 
-  bool has_constructor (void);
+  bool has_constructor ();
   // Accessor for protected member.
 
   void has_constructor (bool value);
   // Mutator for protected member.
 
-  bool ifr_added (void);
+  bool ifr_added ();
   void ifr_added (bool val);
 
-  bool ifr_fwd_added (void);
+  bool ifr_fwd_added ();
   void ifr_fwd_added (bool val);
 
   const char *nested_type_name (AST_Decl *d,
@@ -123,26 +123,22 @@ public:
                                 const char *prefix = 0);
   // Type name of a node used when generating declarations.
 
-  AST_Type *unaliased_type (void);
+  AST_Type *unaliased_type ();
   // Utility function to make sure we are using the unaliased type.
 
-  virtual bool legal_for_primary_key (void) const;
+  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.
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Type);
-
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 protected:
-  virtual int compute_size_type (void);
+  virtual int compute_size_type ();
   // Determine our size type and set it if it is unknown.
 
   const char *nested_name (const char *local_name,
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index 91a3819f840..b1181cb18e8 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -81,30 +81,27 @@ public:
                bool local,
                bool abstract);
 
-  virtual ~AST_Typedef (void);
+  virtual ~AST_Typedef ();
 
-  AST_Type *primitive_base_type (void) const;
+  AST_Type *primitive_base_type () const;
   // Return the most primitive base type by traversing the chain of typedefed
   // base types.
 
   // Data Accessors.
-  AST_Type *base_type (void) const;
+  AST_Type *base_type () const;
 
-  virtual bool legal_for_primary_key (void) const;
+  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 is_local (void);
+  virtual bool is_local ();
   // Override the base class method.
 
-  bool owns_base_type (void) const;
+  bool owns_base_type () const;
   void owns_base_type (bool val);
   // Sometimes this has to be accessed or managed from outside.
 
-  // Narrowing.
-  DEF_NARROW_FROM_DECL (AST_Typedef);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
@@ -112,7 +109,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
@@ -124,7 +121,7 @@ public:
   virtual AST_Annotation_Appls &annotations ();
 
 protected:
-  virtual int compute_size_type (void);
+  virtual int compute_size_type ();
   // Compute the size type if it is unknown.
 
   /**
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
index 4aada429a1b..dafa8e704de 100644
--- a/TAO/TAO_IDL/include/ast_union.h
+++ b/TAO/TAO_IDL/include/ast_union.h
@@ -84,7 +84,7 @@ public:
              bool local,
              bool abstract);
 
-  virtual ~AST_Union (void);
+  virtual ~AST_Union ();
 
   // This also calls the base class version.
   virtual void redefine (AST_Structure *from);
@@ -94,13 +94,9 @@ public:
 
   // Data Accessors.
 
-  AST_ConcreteType *disc_type (void);
+  AST_ConcreteType *disc_type ();
 
-  AST_Expression::ExprType udisc_type (void);
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_Union);
-  DEF_NARROW_FROM_SCOPE(AST_Union);
+  AST_Expression::ExprType udisc_type ();
 
   struct DefaultValue
   {
@@ -127,7 +123,7 @@ public:
   int default_value (DefaultValue &);
   // Get the default value.
 
-  virtual int default_index (void);
+  virtual int default_index ();
   // Return the default index used.
 
   // AST Dumping.
@@ -147,7 +143,7 @@ public:
   ///}
 
 protected:
-  virtual int compute_size_type (void);
+  virtual int compute_size_type ();
   // Compute the size type if it is unknown.
 
   virtual AST_UnionBranch *fe_add_union_branch (AST_UnionBranch *b);
@@ -169,7 +165,7 @@ private:
   AST_UnionBranch *lookup_branch (AST_UnionBranch *branch);
 
   // Look up the branch with the "default" label.
-  AST_UnionBranch *lookup_default (void);
+  AST_UnionBranch *lookup_default ();
 
   // Look up a branch given a branch with a label. This is used to
   // check for duplicate labels.
@@ -179,7 +175,7 @@ private:
   // check for duplicate enum labels.
   AST_UnionBranch *lookup_enum (AST_UnionBranch *b);
 
-  friend int tao_yyparse (void);
+  friend int tao_yyparse ();
   friend class ast_visitor_tmpl_module_inst;
 
   // Scope Management Protocol.
@@ -192,10 +188,10 @@ private:
 
   virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v);
 
-  virtual int compute_default_value (void);
+  virtual int compute_default_value ();
   // Compute the default value (if any).
 
-  int compute_default_index (void);
+  int compute_default_index ();
   // Count the default index.
 
   DefaultValue default_value_;
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
index 955f9e0c8e3..988b06811da 100644
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ b/TAO/TAO_IDL/include/ast_union_branch.h
@@ -84,13 +84,13 @@ public:
                    AST_Type *ft,
                    UTL_ScopedName *n);
 
-  virtual ~AST_UnionBranch (void);
+  virtual ~AST_UnionBranch ();
 
-  UTL_LabelList *labels (void) const;
+  UTL_LabelList *labels () const;
 
   AST_UnionLabel *label (unsigned long index = 0);
 
-  unsigned long label_list_length (void);
+  unsigned long label_list_length ();
 
   // Called if our labels are enum values - adds them to the
   // enclosing scope's name_referenced list.
@@ -103,10 +103,6 @@ public:
   // we call this at the end of fe_add_union_branch.
   void coerce_labels (AST_Union *u);
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (AST_UnionBranch);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
@@ -114,7 +110,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
diff --git a/TAO/TAO_IDL/include/ast_union_fwd.h b/TAO/TAO_IDL/include/ast_union_fwd.h
index 13d391677cd..14a6121d7e3 100644
--- a/TAO/TAO_IDL/include/ast_union_fwd.h
+++ b/TAO/TAO_IDL/include/ast_union_fwd.h
@@ -14,14 +14,10 @@ public:
   AST_UnionFwd (AST_Union *dummy,
                 UTL_ScopedName *n);
 
-  virtual ~AST_UnionFwd (void);
+  virtual ~AST_UnionFwd ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_UnionFwd);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
index 87f66e08704..28c5e0275f2 100644
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ b/TAO/TAO_IDL/include/ast_union_label.h
@@ -87,11 +87,11 @@ public:
   AST_UnionLabel (UnionLabel lk,
                   AST_Expression *lv);
 
-  virtual ~AST_UnionLabel (void);
+  virtual ~AST_UnionLabel ();
 
-  UnionLabel label_kind (void);
+  UnionLabel label_kind ();
 
-  AST_Expression *label_val (void);
+  AST_Expression *label_val ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -100,7 +100,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   // Data.
diff --git a/TAO/TAO_IDL/include/ast_uses.h b/TAO/TAO_IDL/include/ast_uses.h
index 10115d09a77..9da57a5327f 100644
--- a/TAO/TAO_IDL/include/ast_uses.h
+++ b/TAO/TAO_IDL/include/ast_uses.h
@@ -11,14 +11,11 @@ public:
             AST_Type *uses_type,
             bool is_multiple);
 
-  virtual ~AST_Uses (void);
+  virtual ~AST_Uses ();
 
   // Data Accessors.
-  AST_Type *uses_type (void) const;
-  bool is_multiple (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_Uses);
+  AST_Type *uses_type () const;
+  bool is_multiple () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -27,7 +24,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h
index cd8e3366031..4ea5ec52eb5 100644
--- a/TAO/TAO_IDL/include/ast_valuebox.h
+++ b/TAO/TAO_IDL/include/ast_valuebox.h
@@ -10,13 +10,10 @@ public:
   AST_ValueBox (UTL_ScopedName *n,
                 AST_Type       *boxed_type);
 
-  virtual ~AST_ValueBox (void);
+  virtual ~AST_ValueBox ();
 
   // Data Accessors.
-  AST_Type            *boxed_type (void) const;
-
-  // Narrowing.
-  DEF_NARROW_FROM_DECL(AST_ValueBox);
+  AST_Type            *boxed_type () const;
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -25,7 +22,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   static AST_Decl::NodeType const NT;
 
diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h
index f8398efce68..9309da49809 100644
--- a/TAO/TAO_IDL/include/ast_valuetype.h
+++ b/TAO/TAO_IDL/include/ast_valuetype.h
@@ -21,7 +21,7 @@ public:
                  bool truncatable,
                  bool custom);
 
-  virtual ~AST_ValueType (void);
+  virtual ~AST_ValueType ();
 
   virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Are we or the node represented by node involved in recursion.
@@ -29,18 +29,18 @@ public:
   // This also calls the base class version.
   virtual void redefine (AST_Interface *from);
 
-  AST_Type **supports (void) const;
+  AST_Type **supports () const;
 
-  long n_supports (void) const;
+  long n_supports () const;
 
-  AST_Type *inherits_concrete (void) const;
+  AST_Type *inherits_concrete () const;
 
-  AST_Type *supports_concrete (void) const;
+  AST_Type *supports_concrete () const;
 
-  bool truncatable (void) const;
-  bool custom (void) const;
+  bool truncatable () const;
+  bool custom () const;
 
-  virtual bool will_have_factory (void);
+  virtual bool will_have_factory ();
   // Called from y.tab.cpp to set the factory decl seen bit.
 
   // Look up a scoped name in the supported interface list.
@@ -55,15 +55,10 @@ public:
   // 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 (void) const;
+  virtual bool legal_for_primary_key () const;
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_ValueType);
-  DEF_NARROW_FROM_SCOPE(AST_ValueType);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -89,7 +84,7 @@ protected:
 
   bool derived_from_primary_key_base (const AST_ValueType *node,
                                       const AST_ValueType *pk_base) const;
-  AST_ValueType *lookup_primary_key_base (void) const;
+  AST_ValueType *lookup_primary_key_base () const;
 };
 
 #endif           // _AST_INTERFACE_AST_VALUETYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_valuetype_fwd.h b/TAO/TAO_IDL/include/ast_valuetype_fwd.h
index b31b56f1b7d..6e9e9ce38b4 100644
--- a/TAO/TAO_IDL/include/ast_valuetype_fwd.h
+++ b/TAO/TAO_IDL/include/ast_valuetype_fwd.h
@@ -12,14 +12,10 @@ public:
   AST_ValueTypeFwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
-  virtual ~AST_ValueTypeFwd (void);
+  virtual ~AST_ValueTypeFwd ();
 
   // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_ValueTypeFwd);
+  virtual void destroy ();
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &);
diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h
index 3a45c23a461..70c4fc73f7e 100644
--- a/TAO/TAO_IDL/include/ast_visitor.h
+++ b/TAO/TAO_IDL/include/ast_visitor.h
@@ -85,7 +85,7 @@ class AST_Annotation_Decl;
 class TAO_IDL_FE_Export ast_visitor
 {
 public:
-  virtual ~ast_visitor (void);
+  virtual ~ast_visitor ();
 
   virtual int visit_decl (AST_Decl *d) = 0;
   virtual int visit_scope (UTL_Scope *node) = 0;
@@ -143,7 +143,7 @@ public:
 
 protected:
   // For abstract class.
-  ast_visitor (void);
+  ast_visitor ();
 };
 
 #endif /* TAO_IDL_FE_DLL_AST_VISITOR_H */
diff --git a/TAO/TAO_IDL/include/ast_visitor_context.h b/TAO/TAO_IDL/include/ast_visitor_context.h
index 2c8ddd419db..7890633316a 100644
--- a/TAO/TAO_IDL/include/ast_visitor_context.h
+++ b/TAO/TAO_IDL/include/ast_visitor_context.h
@@ -23,18 +23,18 @@
 class TAO_IDL_FE_Export ast_visitor_context
 {
 public:
-  ast_visitor_context (void);
+  ast_visitor_context ();
 
   ast_visitor_context (const ast_visitor_context &ctx);
 
-  ~ast_visitor_context (void);
+  ~ast_visitor_context ();
 
   // Accessors/mutators for template-related storage.
 
-  FE_Utils::T_PARAMLIST_INFO *template_params (void) const;
+  FE_Utils::T_PARAMLIST_INFO *template_params () const;
   void template_params (FE_Utils::T_PARAMLIST_INFO *args);
 
-  FE_Utils::T_ARGLIST const *template_args (void) const;
+  FE_Utils::T_ARGLIST const *template_args () const;
   void template_args (FE_Utils::T_ARGLIST const *args);
 
 protected:
diff --git a/TAO/TAO_IDL/include/ast_visitor_reifying.h b/TAO/TAO_IDL/include/ast_visitor_reifying.h
index 2ad0fdceea1..6c7c5ef2981 100644
--- a/TAO/TAO_IDL/include/ast_visitor_reifying.h
+++ b/TAO/TAO_IDL/include/ast_visitor_reifying.h
@@ -42,9 +42,9 @@ class ast_visitor_reifying : public ast_visitor
 public:
   ast_visitor_reifying (ast_visitor_context *ctx);
 
-  virtual ~ast_visitor_reifying (void);
+  virtual ~ast_visitor_reifying ();
 
-  AST_Decl *reified_node (void) const;
+  AST_Decl *reified_node () const;
 
   virtual int visit_decl (AST_Decl *d);
   virtual int visit_scope (UTL_Scope *node);
diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
index c9270d73a14..1a0dafdd241 100644
--- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
+++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
@@ -38,7 +38,7 @@ public:
   ast_visitor_tmpl_module_inst (ast_visitor_context *ctx,
                                 bool ref_only = false);
 
-  virtual ~ast_visitor_tmpl_module_inst (void);
+  virtual ~ast_visitor_tmpl_module_inst ();
 
   virtual int visit_decl (AST_Decl *d);
   virtual int visit_scope (UTL_Scope *node);
diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
index 4b45f2a5abf..9ac63d648f9 100644
--- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
+++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
@@ -29,7 +29,7 @@ class ast_visitor_tmpl_module_ref
 public:
   ast_visitor_tmpl_module_ref (ast_visitor_context *ctx);
 
-  virtual ~ast_visitor_tmpl_module_ref (void);
+  virtual ~ast_visitor_tmpl_module_ref ();
 
   virtual int visit_template_module_ref (AST_Template_Module_Ref *node);
 };
diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h
index 757d14db7e1..03a543b161f 100644
--- a/TAO/TAO_IDL/include/drv_extern.h
+++ b/TAO/TAO_IDL/include/drv_extern.h
@@ -67,17 +67,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // External functions for the IDL compiler driver program.
 extern void DRV_parse_args (long, char **);
-extern void DRV_usage (void);
+extern void DRV_usage ();
 extern void DRV_pre_proc (char const * myfile);
-extern void DRV_store_env_include_paths (void);
-extern void DRV_cpp_init (void);
+extern void DRV_store_env_include_paths ();
+extern void DRV_cpp_init ();
 extern ACE_CString& DRV_add_include_path (ACE_CString&,
                                           const char* p, const char* suffix,
                                           bool is_system);
-extern void DRV_cpp_post_init (void);
+extern void DRV_cpp_post_init ();
 extern void DRV_cpp_putarg (char const * str);
 extern void DRV_cpp_new_location (char const * new_loc);
-extern void DRV_get_orb_idl_includes (void);
+extern void DRV_get_orb_idl_includes ();
 
 // Not used by all backends.
 extern void DRV_push_file (char const * s);
diff --git a/TAO/TAO_IDL/include/fe_component_header.h b/TAO/TAO_IDL/include/fe_component_header.h
index 4e14c6426d4..55280e7ade4 100644
--- a/TAO/TAO_IDL/include/fe_component_header.h
+++ b/TAO/TAO_IDL/include/fe_component_header.h
@@ -20,14 +20,14 @@ public:
                       UTL_ScopedName *base_component,
                       UTL_NameList *supports,
                       bool compile_now);
-  virtual ~FE_ComponentHeader (void);
+  virtual ~FE_ComponentHeader ();
 
   // Data Accessors.
-  AST_Component *base_component (void) const;
-  AST_Type **supports (void) const;
-  long n_supports (void) const;
-  AST_Interface **supports_flat (void) const;
-  long n_supports_flat (void) const;
+  AST_Component *base_component () const;
+  AST_Type **supports () const;
+  long n_supports () const;
+  AST_Interface **supports_flat () const;
+  long n_supports_flat () const;
 
 protected:
   void compile_inheritance (UTL_ScopedName *base_component);
diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h
index d55d8c3a735..98f5ce06a95 100644
--- a/TAO/TAO_IDL/include/fe_declarator.h
+++ b/TAO/TAO_IDL/include/fe_declarator.h
@@ -86,19 +86,19 @@ public:
   FE_Declarator (UTL_ScopedName *n,
                  DeclaratorType dt,
                  AST_Decl *cp);
-  virtual ~FE_Declarator (void) {}
+  virtual ~FE_Declarator () {}
 
   // Data Accessors.
-  AST_Decl *complex_part (void);
-  UTL_ScopedName *name (void);
-  DeclaratorType decl_type (void);
+  AST_Decl *complex_part ();
+  UTL_ScopedName *name ();
+  DeclaratorType decl_type ();
 
   // Other Operations.
 
   // Compose an FE_Declarator into an AST_Type once all the needed information
   // is available.
   AST_Type *compose (AST_Decl* tc);
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   // Data.
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
index 47f95a109c5..206f1ed679e 100644
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ b/TAO/TAO_IDL/include/fe_extern.h
@@ -71,15 +71,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Declares all global functions for the FE
 
-TAO_IDL_FE_Export void FE_init (void);
-TAO_IDL_FE_Export void FE_populate (void);
+TAO_IDL_FE_Export void FE_init ();
+TAO_IDL_FE_Export void FE_populate ();
 TAO_IDL_FE_Export void FE_extract_env_include_paths (ACE_Unbounded_Queue<ACE_CString> &list);
-TAO_IDL_FE_Export void FE_store_env_include_paths (void);
-TAO_IDL_FE_Export const char *FE_get_cpp_loc_from_env (void);
-TAO_IDL_FE_Export const char *FE_get_cpp_args_from_env (void);
+TAO_IDL_FE_Export void FE_store_env_include_paths ();
+TAO_IDL_FE_Export const char *FE_get_cpp_loc_from_env ();
+TAO_IDL_FE_Export const char *FE_get_cpp_args_from_env ();
 
 TAO_IDL_FE_Export int
-FE_yyparse (void);
+FE_yyparse ();
 
 TAO_IDL_FE_Export void
 FE_yydebug (bool);
@@ -97,10 +97,10 @@ class UTL_Error;
 class UTL_Indenter;
 
 TAO_IDL_FE_Export UTL_Error *
-FE_new_UTL_Error (void);
+FE_new_UTL_Error ();
 
 TAO_IDL_FE_Export UTL_Indenter *
-FE_new_UTL_Indenter (void);
+FE_new_UTL_Indenter ();
 
 /**
  * Exception thrown when exiting prematurely in the front end.
diff --git a/TAO/TAO_IDL/include/fe_home_header.h b/TAO/TAO_IDL/include/fe_home_header.h
index 7583a75a398..ae13bc609cc 100644
--- a/TAO/TAO_IDL/include/fe_home_header.h
+++ b/TAO/TAO_IDL/include/fe_home_header.h
@@ -23,12 +23,12 @@ public:
                  UTL_ScopedName *managed_component,
                  UTL_ScopedName *primary_key);
 
-  virtual ~FE_HomeHeader (void);
+  virtual ~FE_HomeHeader ();
 
   // Data Accessors.
-  AST_Home *base_home (void) const;
-  AST_Component *managed_component (void) const;
-  AST_Type *primary_key (void) const;
+  AST_Home *base_home () const;
+  AST_Component *managed_component () const;
+  AST_Type *primary_key () const;
 
 protected:
   AST_Home *base_home_;
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
index 243e5dda333..55394c44e90 100644
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ b/TAO/TAO_IDL/include/fe_interface_header.h
@@ -84,22 +84,22 @@ public:
                       bool is_abstract,
                       bool compile_now);
 
-  virtual ~FE_InterfaceHeader (void);
+  virtual ~FE_InterfaceHeader ();
 
   // Data Accessors.
-  UTL_ScopedName *name (void) const;
-  AST_Type **inherits (void) const;
-  long n_inherits (void) const;
-  AST_Interface **inherits_flat (void) const;
-  long n_inherits_flat (void) const;
+  UTL_ScopedName *name () const;
+  AST_Type **inherits () const;
+  long n_inherits () const;
+  AST_Interface **inherits_flat () const;
+  long n_inherits_flat () const;
 
-  bool is_local (void) const;
+  bool is_local () const;
   // See if we are a local interface.
 
-  bool is_abstract (void) const;
+  bool is_abstract () const;
   // See if we are an abstract interface.
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Destroy anything allocated for this class.
 
   // Operations.
@@ -121,9 +121,9 @@ protected:
   bool already_seen (AST_Type *ip);
   bool already_seen_flat (AST_Interface *ip);
 
-  void install_in_header (void);
+  void install_in_header ();
 
-  void destroy_flat_arrays (void);
+  void destroy_flat_arrays ();
 
   // Data.
 protected:
diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h
index 0a25d4310c1..0dc51b91176 100644
--- a/TAO/TAO_IDL/include/fe_obv_header.h
+++ b/TAO/TAO_IDL/include/fe_obv_header.h
@@ -18,16 +18,16 @@ public:
                 UTL_NameList *supports,
                 bool truncatable,
                 bool is_eventtype = false);
-  virtual ~FE_OBVHeader (void);
+  virtual ~FE_OBVHeader ();
 
   // Data Accessors.
-  AST_Type **supports (void) const;
-  long n_supports (void) const;
-  AST_Type *inherits_concrete (void) const;
-  AST_Type *supports_concrete (void) const;
-  bool truncatable (void) const;
+  AST_Type **supports () const;
+  long n_supports () const;
+  AST_Type *inherits_concrete () const;
+  AST_Type *supports_concrete () const;
+  bool truncatable () const;
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Destroy anything allocated for this class.
 
 protected:
diff --git a/TAO/TAO_IDL/include/fe_utils.h b/TAO/TAO_IDL/include/fe_utils.h
index 6cf66a62418..fddc6e5202d 100644
--- a/TAO/TAO_IDL/include/fe_utils.h
+++ b/TAO/TAO_IDL/include/fe_utils.h
@@ -27,7 +27,7 @@ struct TAO_IDL_FE_Export FE_Utils
     ACE_CString name_;
     ACE_CString seq_param_ref_;
 
-    T_Param_Info (void);
+    T_Param_Info ();
   };
 
   typedef ACE_Unbounded_Queue<T_Param_Info> T_PARAMLIST_INFO;
@@ -36,7 +36,7 @@ struct TAO_IDL_FE_Export FE_Utils
 
   struct T_ARGLIST : ACE_Unbounded_Queue<AST_Decl *>
   {
-    void destroy (void);
+    void destroy ();
   };
 
   /// Convert from a predefined type to an expression type.
@@ -68,7 +68,7 @@ struct TAO_IDL_FE_Export FE_Utils
   /// For the executor IDL file, when a pragma ciao ami receptacle
   /// name is multiplex.
   static void
-  create_implied_ami_uses_stuff (void);
+  create_implied_ami_uses_stuff ();
 
   /// Case insensitive for Windows, otherwise not.
   static int
@@ -97,7 +97,7 @@ struct TAO_IDL_FE_Export FE_Utils
   /// Validate the included idl files, somefiles might have been
   /// ignored by the preprocessor.
   static void
-  validate_included_idl_files (void);
+  validate_included_idl_files ();
 
   /// Check if included file is in TAO specific include dirs.
   static bool
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index d00dffdcbd8..485486a60dd 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -311,77 +311,77 @@ public:
     UNKNOWN_ANNOTATIONS_IGNORE
   };
 
-  IDL_GlobalData (void);
-  ~IDL_GlobalData (void);
+  IDL_GlobalData ();
+  ~IDL_GlobalData ();
 
   // Operations
-  UTL_ScopeStack   &scopes (void);              // Scopes stack
+  UTL_ScopeStack   &scopes ();              // Scopes stack
 
-  AST_Root         *root (void);                // Root of AST
+  AST_Root         *root ();                // Root of AST
   void             set_root (AST_Root *);       // Set it
 
-  AST_Generator    *gen (void);                 // Generator
+  AST_Generator    *gen ();                 // Generator
   void             set_gen (AST_Generator *);   // Set it
 
-  AST_ValueType    *primary_key_base (void);    // PrimaryKeyBase
+  AST_ValueType    *primary_key_base ();    // PrimaryKeyBase
   void             primary_key_base (AST_ValueType *);   // Set it
 
-  UTL_Error        *err (void);                 // Error reporter
+  UTL_Error        *err ();                 // Error reporter
   void             set_err (UTL_Error *);       // Set it
 
-  int              err_count (void);            // How many errors?
+  int              err_count ();            // How many errors?
   void             set_err_count (int);         // Set it
 
-  long             lineno (void);               // Where in file?
+  long             lineno ();               // Where in file?
   void             set_lineno (long);           // Set it
 
-  UTL_String       *filename (void);            // What file?
+  UTL_String       *filename ();            // What file?
   void             set_filename (UTL_String *); // Set it
 
-  UTL_String       *main_filename (void);       // What's the main
+  UTL_String       *main_filename ();       // What's the main
                                                 // file name?
   void             set_main_filename (UTL_String *);
                                                 // Set it
 
-  UTL_String       *real_filename (void);       // What's the real
+  UTL_String       *real_filename ();       // What's the real
                                                 // file name?
   void             set_real_filename (UTL_String *);
                                                 // Set it
 
-  UTL_String       *stripped_filename (void);   // Stripped filename
+  UTL_String       *stripped_filename ();   // Stripped filename
   void             set_stripped_filename (UTL_String *);  // Set it
 
-  bool             imported (void);             // Are we imported?
-  bool             import (void);               // Is import on?
+  bool             imported ();             // Are we imported?
+  bool             import ();               // Is import on?
   void             set_import (bool);           // Set it
 
-  bool             in_main_file (void);         // Are we?
+  bool             in_main_file ();         // Are we?
   void             set_in_main_file (bool);     // Set it
 
-  const char       *prog_name (void);           // Invoked as..
+  const char       *prog_name ();           // Invoked as..
   void             set_prog_name (const char *);  // Set it
 
-  const char       *cpp_location (void);        // Where's CPP?
+  const char       *cpp_location ();        // Where's CPP?
   void             set_cpp_location (const char *);// Set it
 
-  long             compile_flags (void);        // What flags are on?
+  long             compile_flags ();        // What flags are on?
   void             set_compile_flags (long);    // Turn some on or off
 
-  char             *local_escapes (void);       // Get local escapes
+  char             *local_escapes ();       // Get local escapes
   void             set_local_escapes (const char *);// Set it
 
-  UTL_Indenter     *indent (void);              // Get indenter
+  UTL_Indenter     *indent ();              // Get indenter
   void             set_indent (UTL_Indenter *); // Set it
 
   void             store_include_file_name (UTL_String *);
 
-  UTL_String       **include_file_names (void); // Array of file names
+  UTL_String       **include_file_names (); // Array of file names
   void             set_include_file_names (UTL_String **); // Set it
 
-  unsigned long    n_include_file_names (void); // How many
+  unsigned long    n_include_file_names (); // How many
   void             set_n_include_file_names (unsigned long n);
 
-  void             reset_flag_seen (void);
+  void             reset_flag_seen ();
 
   // = Types & methods supporting DDS DCPS sequence definitions (from #pragma)
   typedef ACE_Unbounded_Queue<char *> DCPS_Sequence_Types_List;
@@ -418,7 +418,7 @@ public:
   void dcps_support_zero_copy_read (bool value);
 
   // BE calls to check the status of zero-copy read support
-  bool dcps_support_zero_copy_read (void) const;
+  bool dcps_support_zero_copy_read () const;
 
   // FE calls when #pragma DCPS_DATA_SEQUENCE_TYPE is processed
   void set_dcps_sequence_type (const char* seq_type);
@@ -430,7 +430,7 @@ public:
   void dcps_gen_zero_copy_read (bool value);
 
   // BE calls to check the status of zero-copy read support
-  bool dcps_gen_zero_copy_read (void) const;
+  bool dcps_gen_zero_copy_read () const;
 
   // = Access methods to deal with other IDL files included in the main
   //   IDL file. These IDL files are exactly the same strings that are
@@ -441,20 +441,20 @@ public:
   void add_to_included_idl_files (const char *file_name);
 
   // Get all the files.
-  char** included_idl_files (void);
+  char** included_idl_files ();
 
   // The number of currently availabe include files.
-  size_t n_included_idl_files (void);
+  size_t n_included_idl_files ();
 
   // Set the number of included_idl_files. Use this carefully. This
   // method is used when we validate all the #included idl files,
   // against the ones that we get after preprocessing.
   void n_included_idl_files (size_t n);
 
-  ParseState parse_state (void);       // What state we're in
+  ParseState parse_state ();       // What state we're in
   void set_parse_state (ParseState s); // Set it
 
-  UTL_String *idl_src_file (void);
+  UTL_String *idl_src_file ();
   // Returns the IDL source file being compiled.
 
   void idl_src_file (UTL_String *);
@@ -465,7 +465,7 @@ public:
   // files. By default, IDL compiler looks for TEMP env variable and
   // if it is not set,  "/tmp/" is assigned.
 
-  const char *temp_dir (void) const;
+  const char *temp_dir () const;
   // Get the directory where the IDL compiler can keep all its temp
   // files. By default, IDL compiler looks for TEMP env variable and
   // if it is not set,  "/tmp/" is assigned.
@@ -473,49 +473,49 @@ public:
   void tao_root (const char *s);
   // Set the path of TAO_ROOT.
 
-  const char *tao_root (void) const;
+  const char *tao_root () const;
   // Get the path for TAO_ROOT.
 
   void gperf_path (const char *s);
   // Set the path for the perfect hashing program (GPERF).
 
-  const char *gperf_path (void) const;
+  const char *gperf_path () const;
   // Get the path for the perfect hashing program (GPERF).
 
   void ident_string (const char *s);
   // Set the value of the #ident string.
 
-  const char *ident_string (void) const;
+  const char *ident_string () const;
   // Get the value of the #ident string.
 
   void case_diff_error (bool);
   // report an error (1) for indentifiers in the same scope
   // that differ only by case, or report a warning (0).
 
-  bool case_diff_error (void);
+  bool case_diff_error ();
   // are we strict about case-only differences or not?
 
   void nest_orb (bool);
   // Set on or off whether we are using the NEST ORB.
 
-  bool nest_orb (void);
+  bool nest_orb ();
   // are we beIng used with the NEST ORB?
 
-  void destroy (void);
+  void destroy ();
   // Cleanup function.
 
   void append_idl_flag (const char *s);
   // Save each flag passed to the IDL compiler.
 
-  const char *idl_flags (void) const;
+  const char *idl_flags () const;
   // Get a string representation of the flags
   // passed to the idl compiler.
 
   ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> &
-  idl_keywords (void);
+  idl_keywords ();
   // Accessor for the IDL keyword container.
 
-  ACE_Unbounded_Stack<char *> & pragma_prefixes (void);
+  ACE_Unbounded_Stack<char *> & pragma_prefixes ();
   // Accessor for the pragma prefix container.
 
   void update_prefix (char *filename);
@@ -524,11 +524,11 @@ public:
   long seen_include_file_before (char *);
   // Seen this include before?
 
-  long last_seen_index (void) const;
+  long last_seen_index () const;
   void last_seen_index (long val);
   // Accessors for last_seen_index_ member.
 
-  bool preserve_cpp_keywords (void);
+  bool preserve_cpp_keywords ();
   // Whether we should not mung idl element names that are
   // C++ keywords e.g. delete, operator etc. with _cxx_ prefix.
   // Should be true when being used by the IFR Service
@@ -543,98 +543,98 @@ public:
   // specific paths and false for paths provided by user.
 
   void add_rel_include_path (const char *s);
-  ACE_Unbounded_Queue<char *> const & rel_include_paths (void) const;
+  ACE_Unbounded_Queue<char *> const & rel_include_paths () const;
   // Accessor/mutator for the rel_include_paths_ member.
 
   void add_ciao_lem_file_names (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_lem_file_names (void);
+  ACE_Unbounded_Queue<char *> & ciao_lem_file_names ();
   // Accessor/mutator for the ciao_lem_file_names_ member.
 
   void add_ciao_rti_ts_file_names (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_rti_ts_file_names (void);
+  ACE_Unbounded_Queue<char *> & ciao_rti_ts_file_names ();
   // Accessor/mutator for the ciao_rti_ts_file_names_ member.
 
   void add_ciao_spl_ts_file_names (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_spl_ts_file_names (void);
+  ACE_Unbounded_Queue<char *> & ciao_spl_ts_file_names ();
   // Accessor/mutator for the ciao_spl_ts_file_names_ member.
 
   void add_ciao_oci_ts_file_names (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names (void);
+  ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names ();
   // Accessor/mutator for the ciao_oci_ts_file_names_ member.
 
     void add_ciao_coredx_ts_file_names (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_coredx_ts_file_names (void);
+  ACE_Unbounded_Queue<char *> & ciao_coredx_ts_file_names ();
   // Accessor/mutator for the ciao_coredx_ts_file_names_ member.
 
   void add_ciao_ami_iface_names (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_ami_iface_names (void);
+  ACE_Unbounded_Queue<char *> & ciao_ami_iface_names ();
   // Accessor/mutator for the ciao_ami_iface_names_ member.
 
   void add_ciao_ami_recep_names (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_ami_recep_names (void);
+  ACE_Unbounded_Queue<char *> & ciao_ami_recep_names ();
   // Accessor/mutator for the ciao_ami_recep_names_ member.
 
   void add_included_ami_recep_names (const char *s);
-  ACE_Unbounded_Queue<char *> & included_ami_recep_names (void);
+  ACE_Unbounded_Queue<char *> & included_ami_recep_names ();
   // Accessor/mutator for the included_ami_recep_names_ member.
 
-  bool included_ami_receps_done (void) const;
+  bool included_ami_receps_done () const;
   void included_ami_receps_done (bool val);
 
   void add_ciao_ami_idl_fnames (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames (void);
+  ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames ();
   // Accessor/mutator for the included_ami_idl_fnames_ member.
 
   void add_dds4ccm_impl_fnames (const char *s);
-  ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames (void);
+  ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames ();
   // Accessor mutator for the dds4ccm_impl_fnames_ member.
 
-  ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces (void);
+  ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces ();
   // Accessor for the member
 
   ACE_Hash_Map_Manager<char *, char *, ACE_Null_Mutex> &
-  file_prefixes (void);
+  file_prefixes ();
   // Accessor for the IDL file prefix container.
 
-  bool pass_orb_idl (void) const;
+  bool pass_orb_idl () const;
   void pass_orb_idl (bool val);
   // Accessor for the pass_orb_idl_ member.
 
-  bool using_ifr_backend (void) const;
+  bool using_ifr_backend () const;
   void using_ifr_backend (bool val);
   // Accessor for the using_ifr_backend_ member.
 
-  bool ignore_idl3 (void) const;
+  bool ignore_idl3 () const;
   void ignore_idl3 (bool val);
   // Accessor for the ignore_idl3_ member.
 
-  int check_gperf (void);
+  int check_gperf ();
   // Currently called only from IDL backend, but could be useful elsewhere.
 
-  void fini (void);
+  void fini ();
   // Do final cleanup just before process exits.
 
-  ACE_Unbounded_Queue<AST_ValueType *> &primary_keys (void);
+  ACE_Unbounded_Queue<AST_ValueType *> &primary_keys ();
   // Accessor for the member.
 
-  void check_primary_keys (void);
+  void check_primary_keys ();
   // Called affer yy_parse() returns - iterates over our list
   // of primary keys. Must be called this late so that we can
   // be sure that all forward declared stucts or unions that
   // might be used in such a valuetype are fully defined.
 
-  const char *recursion_start (void) const;
+  const char *recursion_start () const;
   void recursion_start (const char *val);
   // Accessors for the member.
 
-  bool multi_file_input (void) const;
+  bool multi_file_input () const;
   void multi_file_input (bool val);
   // Accessors for the member.
 
-  const char *big_file_name (void) const;
+  const char *big_file_name () const;
   // Just get the const string.
 
-  FE_Utils::T_PARAMLIST_INFO const *current_params (void) const;
+  FE_Utils::T_PARAMLIST_INFO const *current_params () const;
   void current_params (FE_Utils::T_PARAMLIST_INFO *params);
   // Accessors for the member. If UTL_Scope::lookup_by_name()
   // has a 0 result, it will check this param list (if it is not
@@ -643,14 +643,14 @@ public:
   // referenced template parameter of the eclosing template
   // module.
 
-  UTL_StrList const *alias_params (void) const;
+  UTL_StrList const *alias_params () const;
   void alias_params (UTL_StrList *params);
   // Accessors for the member. If we are parsing a template
   // module reference, we traverse the scope of the referenced
   // template module, but create param holders with the
   // alias names.
 
-  UTL_StrList const *for_new_holder (void) const;
+  UTL_StrList const *for_new_holder () const;
   void for_new_holder (UTL_StrList *params);
   // Accessors for the member. If a lookup matches something
   // from current_params(), the actual created param holder must
@@ -661,7 +661,7 @@ public:
   static char* translateName (const char* name, char *name_buf);
 #endif
 
-  AST_Module *corba_module (void) const;
+  AST_Module *corba_module () const;
   void corba_module (AST_Module *m);
   // Accessors for the member.
 
@@ -676,7 +676,7 @@ public:
   typedef ACE_Unbounded_Queue_Iterator<Include_Path_Info>
     Unbounded_Paths_Queue_Iterator;
 
-  Unbounded_Paths_Queue &include_paths (void);
+  Unbounded_Paths_Queue &include_paths ();
   // Accessor for the member.
 
   enum ANON_TYPE_DIAGNOSTIC
@@ -694,20 +694,20 @@ public:
   /// Has anon_type_diagnostic () been called?
   bool explicit_anon_type_diagnostic () const;
 
-  bool anon_error (void) const;
-  bool anon_warning (void) const;
-  bool anon_silent (void) const;
+  bool anon_error () const;
+  bool anon_warning () const;
+  bool anon_silent () const;
   // Simple checks for the value of anon_type_diagnostic_.
 
-  bool in_typedef (void) const;
+  bool in_typedef () const;
   void in_typedef (bool val);
   // Accessors for the member.
 
-  bool in_tmpl_mod_no_alias (void) const;
+  bool in_tmpl_mod_no_alias () const;
   void in_tmpl_mod_no_alias (bool val);
   // Accessors for the member.
 
-  bool in_tmpl_mod_alias (void) const;
+  bool in_tmpl_mod_alias () const;
   void in_tmpl_mod_alias (bool val);
   // Accessors for the member.
 
diff --git a/TAO/TAO_IDL/include/idl_narrow.h b/TAO/TAO_IDL/include/idl_narrow.h
deleted file mode 100644
index c787d641b1c..00000000000
--- a/TAO/TAO_IDL/include/idl_narrow.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_NARROW_IDL_NARROW_HH
-#define _IDL_NARROW_IDL_NARROW_HH
-
-#define DEF_NARROW_FROM_DECL(TYPE)              \
-static  TYPE* narrow_from_decl(AST_Decl *t)
-
-#define IMPL_NARROW_FROM_DECL(TYPE)             \
-TYPE *                                          \
-TYPE::narrow_from_decl (AST_Decl *t) {          \
-  return dynamic_cast<TYPE *> (t);              \
-}
-
-#define DEF_NARROW_FROM_SCOPE(TYPE)             \
-static TYPE * narrow_from_scope(UTL_Scope *t)
-
-#define IMPL_NARROW_FROM_SCOPE(TYPE)            \
-TYPE *                                          \
-TYPE::narrow_from_scope (UTL_Scope *t) {        \
-  return dynamic_cast<TYPE *> (t);              \
-}
-
-#endif  // _IDL_NARROW_IDL_NARROW_HH
diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h
index 5f0528977bf..ab2818f9bf8 100644
--- a/TAO/TAO_IDL/include/utl_decllist.h
+++ b/TAO/TAO_IDL/include/utl_decllist.h
@@ -88,10 +88,10 @@ public:
                 UTL_DeclList *cdr);
 
   // Get element
-  FE_Declarator *head (void);
+  FE_Declarator *head ();
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   // Data
@@ -109,7 +109,7 @@ public:
   UTL_DecllistActiveIterator (UTL_DeclList *s);
 
   // Get current item
-  FE_Declarator *item (void);
+  FE_Declarator *item ();
 };
 
 #endif           // _UTL_DECLLIST_UTL_DECLLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index b80970dbe42..4fc0afe033e 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -245,7 +245,7 @@ public:
   void version_syntax_error (const char *msg);
 
   // Repost an attempt to reset the version.
-  void version_reset_error (void);
+  void version_reset_error ();
 
   // Report an attempt to change the id once set.
   void id_reset_error (const char *o,
@@ -381,7 +381,7 @@ public:
 
   // Report illegal infix operator error (they can be used
   // only with integer, floating point or fixed point expressions.
-  void illegal_infix (void);
+  void illegal_infix ();
 
   // Report local type used in remote operation.
   void local_remote_mismatch (AST_Decl *l,
@@ -411,7 +411,7 @@ public:
                             AST_Decl *loc);
 
   // Error (default) or warning (set by command line option).
-  void anonymous_type_diagnostic (void);
+  void anonymous_type_diagnostic ();
 
   // Reference to an item in the scope of a template
   // module was not via an alias.
diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h
index a04f6276994..5ba9bbbcfb7 100644
--- a/TAO/TAO_IDL/include/utl_exceptlist.h
+++ b/TAO/TAO_IDL/include/utl_exceptlist.h
@@ -84,14 +84,14 @@ public:
                   UTL_ExceptList *cdr);
 
   // Get list item.
-  AST_Type *head (void);
+  AST_Type *head ();
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Copies the UTL_ExceptList pointers but not the
   // contained AST_Exceptions.
-  virtual UTL_ExceptList *copy (void);
+  virtual UTL_ExceptList *copy ();
 
 private:
   // Data.
@@ -106,7 +106,7 @@ public:
   UTL_ExceptlistActiveIterator (UTL_ExceptList *s);
 
   // Get current item
-  AST_Type *item (void);
+  AST_Type *item ();
 };
 
 #endif           // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h
index 3a7f8ebc875..21ff96e039f 100644
--- a/TAO/TAO_IDL/include/utl_exprlist.h
+++ b/TAO/TAO_IDL/include/utl_exprlist.h
@@ -84,10 +84,10 @@ public:
                 UTL_ExprList *cdr);
 
   // Get list item.
-  AST_Expression *head (void);
+  AST_Expression *head ();
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   // Data.
@@ -101,7 +101,7 @@ public:
   UTL_ExprlistActiveIterator (UTL_ExprList *s);
 
   // Get current item.
-  AST_Expression *item (void);
+  AST_Expression *item ();
 };
 
 #endif           // _UTL_EXPRLIST_UTL_EXPRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h
index bae3e637400..85ceadbf06d 100644
--- a/TAO/TAO_IDL/include/utl_identifier.h
+++ b/TAO/TAO_IDL/include/utl_identifier.h
@@ -72,7 +72,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class TAO_IDL_FE_Export Identifier
 {
 public:
-  Identifier (void);
+  Identifier ();
   // Default Constructor.
 
   Identifier (const char *s);
@@ -80,7 +80,7 @@ public:
 
   Identifier (const Identifier &other);
 
-  virtual ~Identifier (void);
+  virtual ~Identifier ();
   // Destructor.
 
   // Operations
@@ -89,7 +89,7 @@ public:
    * Get the underlying string.
    */
   ///{
-  char *get_string (void);
+  char *get_string ();
   const char *get_string () const;
   ///}
 
@@ -107,16 +107,16 @@ public:
   bool case_compare_quiet (Identifier *other);
   // Like the above but suppressing error or warning I/O
 
-  Identifier *copy (void);
+  Identifier *copy ();
   // Create a deep copy.
 
-  bool escaped (void) const;
+  bool escaped () const;
   // Accessor for the member.
 
   virtual void dump (ACE_OSTREAM_TYPE &o);
   // Dump to an ostream.
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Cleanup function.
 
   bool operator== (const Identifier &other) const;
diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h
index ea59e45aca8..a382a35963e 100644
--- a/TAO/TAO_IDL/include/utl_idlist.h
+++ b/TAO/TAO_IDL/include/utl_idlist.h
@@ -90,25 +90,25 @@ public:
               UTL_IdList *cdr);
   // Constructor(s)
 
-  virtual ~UTL_IdList (void) {}
+  virtual ~UTL_IdList () {}
   // destructor
 
   virtual void dump (ACE_OSTREAM_TYPE &o);
   // Dump to ostream.
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Cleanup function.
 
-  virtual UTL_IdList *copy (void);
+  virtual UTL_IdList *copy ();
   // Copy the list.
 
-  Identifier *head (void);
+  Identifier *head ();
   // Get element.
 
-  Identifier *last_component (void);
+  Identifier *last_component ();
   // Get last element in this list.
 
-  Identifier *first_component (void);
+  Identifier *first_component ();
   // Get first element in this list holding a non-empty string.
 
   int compare (UTL_IdList *other);
@@ -141,7 +141,7 @@ public:
   UTL_IdListActiveIterator (UTL_IdList *s);
 
   /// Retrieves the next item.
-  Identifier *item (void);
+  Identifier *item ();
 };
 
 #endif          // _UTL_IDLIST_UTL_IDLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h
index 8fe36f5b7db..da328055426 100644
--- a/TAO/TAO_IDL/include/utl_indenter.h
+++ b/TAO/TAO_IDL/include/utl_indenter.h
@@ -78,17 +78,17 @@ class UTL_Indenter
   // =DESCRIPTION
   //  useful in generating indented output
 public:
-  UTL_Indenter (void);
+  UTL_Indenter ();
 
-  ~UTL_Indenter (void) {}
+  ~UTL_Indenter () {}
 
-  void reset (void);
+  void reset ();
   // Reset indentation level to 0.
 
-  void increase (void);
+  void increase ();
   // Increase indentation level.
 
-  void decrease (void);
+  void decrease ();
   // Decrease indentation level.
 
   void skip_to (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h
index 161b294503f..d2e71a94204 100644
--- a/TAO/TAO_IDL/include/utl_labellist.h
+++ b/TAO/TAO_IDL/include/utl_labellist.h
@@ -84,13 +84,13 @@ public:
                  UTL_LabelList *cdr);
 
   // Get list item.
-  AST_UnionLabel *head (void);
+  AST_UnionLabel *head ();
 
   // Override of base class method.
-  virtual UTL_LabelList *copy (void);
+  virtual UTL_LabelList *copy ();
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   AST_UnionLabel *pd_car_data;
@@ -103,7 +103,7 @@ public:
   UTL_LabellistActiveIterator (UTL_LabelList *source);
 
   // Get current item.
-  AST_UnionLabel *item (void);
+  AST_UnionLabel *item ();
 };
 
 #endif           // _UTL_LABELLIST_UTL_LABELLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h
index 7e7ed5d781f..a70b9d0ff5d 100644
--- a/TAO/TAO_IDL/include/utl_list.h
+++ b/TAO/TAO_IDL/include/utl_list.h
@@ -85,25 +85,25 @@ class TAO_IDL_FE_Export UTL_List
 public:
   UTL_List (UTL_List *c);
 
-  virtual ~UTL_List (void);
+  virtual ~UTL_List ();
 
   // Smash last cdr pointer in "this" with l.
   void nconc (UTL_List *l);
 
   // Copy the list starting at "this".
-  virtual UTL_List *copy (void);
+  virtual UTL_List *copy ();
 
   // Get next list.
-  UTL_List *tail (void);
+  UTL_List *tail ();
 
   // Set next list
   void set_tail (UTL_List *l);
 
   // How long is this list?
-  ACE_CDR::Long length (void);
+  ACE_CDR::Long length ();
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   // The next list.
@@ -123,13 +123,13 @@ public:
 
   UTL_ListActiveIterator (UTL_List *s);
 
-  virtual ~UTL_ListActiveIterator (void) {}
+  virtual ~UTL_ListActiveIterator () {}
 
   // Get next list.
-  virtual void next (void);
+  virtual void next ();
 
   // Are we at the end of this list?
-  virtual bool is_done (void);
+  virtual bool is_done ();
 
 protected:
   // On what to iterate?
diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h
index 46b946faa5b..2a1d7ab02af 100644
--- a/TAO/TAO_IDL/include/utl_namelist.h
+++ b/TAO/TAO_IDL/include/utl_namelist.h
@@ -82,14 +82,14 @@ public:
                 UTL_NameList *cdr);
 
   // Get list item.
-  UTL_ScopedName *head (void);
+  UTL_ScopedName *head ();
 
   // Accessors.
-  bool truncatable (void) const;
+  bool truncatable () const;
   void truncatable (bool val);
 
   // Cleanup.
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   // List item.
@@ -106,7 +106,7 @@ public:
   UTL_NamelistActiveIterator (UTL_NameList *source);
 
   // Get current item.
-  UTL_ScopedName *item (void);
+  UTL_ScopedName *item ();
 };
 
 #endif           // _UTL_NAMELIST_UTL_NAMELIST_HH
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index ef20c534e08..1b1a5c41e54 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -155,22 +155,18 @@ public:
   // Operations.
 
   // Constructor(s).
-  UTL_Scope (void);
+  UTL_Scope ();
   UTL_Scope (AST_Decl::NodeType nt);
 
   // Destructor.
-  virtual ~UTL_Scope (void);
+  virtual ~UTL_Scope ();
 
   // Data Accessors.
-  AST_Decl::NodeType scope_node_type (void)
+  AST_Decl::NodeType scope_node_type ()
   {
     return pd_scope_node_type;
   }
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_SCOPE(UTL_Scope);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
@@ -210,7 +206,7 @@ public:
                                     AST_Decl *&final_parent_decl);
 
   // How many entries are used?
-  virtual unsigned long nmembers (void);
+  virtual unsigned long nmembers ();
 
   // If the Identifier string (from the scoped name which has been
   // already determined to be of length 1) matches a param,
@@ -231,11 +227,11 @@ public:
   void add_to_name_referenced (Identifier *id);
 
   // Accessors for the has_prefix_ member.
-  bool has_prefix (void);
+  bool has_prefix ();
   void has_prefix (bool val);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
@@ -537,19 +533,19 @@ public:
                            UTL_Scope::ScopeIterationKind ik);
 
   // Advance to next item.
-  void next (void);
+  void next ();
 
   // Get current item.
-  AST_Decl *item (void);
+  AST_Decl *item ();
 
   // Have we iterated over entire scope?
-  bool is_done (void);
+  bool is_done ();
 
   // What kind of iterator is this?
-  UTL_Scope::ScopeIterationKind iteration_kind (void);
+  UTL_Scope::ScopeIterationKind iteration_kind ();
 
   // What stage are we in with this iterator?
-  UTL_Scope::ScopeIterationKind iteration_stage (void);
+  UTL_Scope::ScopeIterationKind iteration_stage ();
 
 private:
   // Scope to iterate over.
diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h
index d83159b6db7..ffc7f909668 100644
--- a/TAO/TAO_IDL/include/utl_stack.h
+++ b/TAO/TAO_IDL/include/utl_stack.h
@@ -79,35 +79,35 @@ class UTL_ScopeStackActiveIterator;
 class TAO_IDL_FE_Export UTL_ScopeStack
 {
 public:
-  UTL_ScopeStack (void);
-  ~UTL_ScopeStack (void);
+  UTL_ScopeStack ();
+  ~UTL_ScopeStack ();
 
   /// The initial capacity and how much to increment the capacity when needed.
   static const size_t increments;
 
   // Return top element.
-  UTL_Scope *top (void);
+  UTL_Scope *top ();
 
   // Pop top element.
-  void pop (void);
+  void pop ();
 
   // Clear entire stack.
-  void clear (void);
+  void clear ();
 
   // Push an element on the stack and return stack.
   UTL_ScopeStack *push (UTL_Scope *el);
 
   // How deep is the stack now?
-  unsigned long depth (void);
+  unsigned long depth ();
 
   // Return bottom element.
-  UTL_Scope *bottom (void);
+  UTL_Scope *bottom ();
 
   // Return (top - 1) element.
-  UTL_Scope *next_to_top (void);
+  UTL_Scope *next_to_top ();
 
   // return topmost non-NULL element.
-  UTL_Scope *top_non_null (void);
+  UTL_Scope *top_non_null ();
 
   /**
    * Call lookup_by_name on all the scopes from the top down.
@@ -136,13 +136,13 @@ public:
   UTL_ScopeStackActiveIterator (UTL_ScopeStack &s);
 
   // Advance to next element.
-  void next (void);
+  void next ();
 
   // Get current item.
-  UTL_Scope* item (void);
+  UTL_Scope* item ();
 
   // Is the iteration finished?
-  bool is_done (void) const;
+  bool is_done () const;
 
 private:
   // On what to iterate?
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index 9489421c04f..7b6d788df13 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -79,24 +79,24 @@ class TAO_IDL_FE_Export UTL_String
   // =DESCRIPTION
   //  string class to store identifiers
 public:
-  UTL_String (void);
+  UTL_String ();
 
   UTL_String (const char *str, bool take_copy= false);
 
   UTL_String (UTL_String *s, bool force_copy= false);
 
-  virtual ~UTL_String (void);
+  virtual ~UTL_String ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
   // Cleanup function.
 
   virtual void dump (ACE_OSTREAM_TYPE &o);
   // Dump to the ostream.
 
-  char *get_string (void) {return this->p_str;}
+  char *get_string () {return this->p_str;}
   // Get contents of utl_string.
 
-  char *get_canonical_rep (void);
+  char *get_canonical_rep ();
   // Get canonical representation. This is (implemented as) the all upper
   // case corresponding string.
 
diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h
index f355ba746b8..2a6c8f60c5f 100644
--- a/TAO/TAO_IDL/include/utl_strlist.h
+++ b/TAO/TAO_IDL/include/utl_strlist.h
@@ -84,25 +84,25 @@ public:
   UTL_StrList (UTL_String *s,
                UTL_StrList *cdr);
 
-  virtual ~UTL_StrList (void);
+  virtual ~UTL_StrList ();
 
   // AST Dumping
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
   // Copy a list of strings
-  virtual UTL_List *copy (void);
+  virtual UTL_List *copy ();
 
   // Cleanup method.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Get list element
-  UTL_String *head (void);
+  UTL_String *head ();
 
   // Set the list element
   void set_head (UTL_String *);
 
   // Get last element in this list
-  UTL_String *last_component (void);
+  UTL_String *last_component ();
 
 private:
   // The list item
@@ -117,7 +117,7 @@ public:
   UTL_StrlistActiveIterator(UTL_StrList *s);
 
   // Get current item.
-  UTL_String *item (void);
+  UTL_String *item ();
 };
 
 #endif           // _UTL_STRLIST_UTL_STRLIST_HH
diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp
index 180ac2888df..c4e67c16404 100644
--- a/TAO/TAO_IDL/narrow/narrow.cpp
+++ b/TAO/TAO_IDL/narrow/narrow.cpp
@@ -86,51 +86,51 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 TAO_IDL_FE_Export AST_Decl *
 ScopeAsDecl (UTL_Scope *s)
 {
-  if (s == 0)
+  if (s == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   switch (s->scope_node_type ())
   {
     case AST_Decl::NT_module:
-      return AST_Module::narrow_from_scope (s);
+      return dynamic_cast<AST_Module*> (s);
     case AST_Decl::NT_root:
-      return AST_Root::narrow_from_scope (s);
+      return dynamic_cast<AST_Root*> (s);
     case AST_Decl::NT_interface:
-      return AST_Interface::narrow_from_scope (s);
+      return dynamic_cast<AST_Interface*> (s);
     case AST_Decl::NT_valuetype:
-      return AST_ValueType::narrow_from_scope (s);
+      return dynamic_cast<AST_ValueType*> (s);
     case AST_Decl::NT_eventtype:
-      return AST_EventType::narrow_from_scope (s);
+      return dynamic_cast<AST_EventType*> (s);
     case AST_Decl::NT_component:
-      return AST_Component::narrow_from_scope (s);
+      return dynamic_cast<AST_Component*> (s);
     case AST_Decl::NT_porttype:
-      return AST_PortType::narrow_from_scope (s);
+      return dynamic_cast<AST_PortType*> (s);
     case AST_Decl::NT_connector:
-      return AST_Connector::narrow_from_scope (s);
+      return dynamic_cast<AST_Connector*> (s);
     case AST_Decl::NT_home:
-      return AST_Home::narrow_from_scope (s);
+      return dynamic_cast<AST_Home*> (s);
     case AST_Decl::NT_op:
-      return AST_Operation::narrow_from_scope (s);
+      return dynamic_cast<AST_Operation*> (s);
     case AST_Decl::NT_factory:
-      return AST_Factory::narrow_from_scope (s);
+      return dynamic_cast<AST_Factory*> (s);
     case AST_Decl::NT_finder:
-      return AST_Finder::narrow_from_scope (s);
+      return dynamic_cast<AST_Finder*> (s);
     case AST_Decl::NT_except:
-      return AST_Exception::narrow_from_scope (s);
+      return dynamic_cast<AST_Exception*> (s);
     case AST_Decl::NT_union:
-      return AST_Union::narrow_from_scope (s);
+      return dynamic_cast<AST_Union*> (s);
     case AST_Decl::NT_struct:
-      return AST_Structure::narrow_from_scope (s);
+      return dynamic_cast<AST_Structure*> (s);
     case AST_Decl::NT_enum:
-      return AST_Enum::narrow_from_scope (s);
+      return dynamic_cast<AST_Enum*> (s);
     case AST_Decl::NT_annotation_decl:
-      return AST_Annotation_Decl::narrow_from_scope (s);
+      return dynamic_cast<AST_Annotation_Decl*> (s);
     case AST_Decl::NT_annotation_appl:
-      return AST_Annotation_Appl::narrow_from_scope (s);
+      return dynamic_cast<AST_Annotation_Appl*> (s);
     default:
-      return 0;
+      return nullptr;
   }
 }
 
@@ -140,9 +140,9 @@ ScopeAsDecl (UTL_Scope *s)
 TAO_IDL_FE_Export UTL_Scope *
 DeclAsScope (AST_Decl *d)
 {
-  if (d == 0)
+  if (d == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   switch (d->node_type ())
@@ -152,41 +152,41 @@ DeclAsScope (AST_Decl *d)
        * Resolve forward declared interface by looking at full_definition()
        * field and iterating
        */
-      d = (AST_InterfaceFwd::narrow_from_decl (d))->full_definition ();
+      d = (dynamic_cast<AST_InterfaceFwd*> (d))->full_definition ();
       // fallthrough
     case AST_Decl::NT_interface:
-      return AST_Interface::narrow_from_decl (d);
+      return dynamic_cast<AST_Interface*> (d);
     case AST_Decl::NT_valuetype:
-      return AST_ValueType::narrow_from_decl (d);
+      return dynamic_cast<AST_ValueType*> (d);
     case AST_Decl::NT_eventtype:
-      return AST_EventType::narrow_from_decl (d);
+      return dynamic_cast<AST_EventType*> (d);
     case AST_Decl::NT_component:
-      return AST_Component::narrow_from_decl (d);
+      return dynamic_cast<AST_Component*> (d);
     case AST_Decl::NT_porttype:
-      return AST_PortType::narrow_from_decl (d);
+      return dynamic_cast<AST_PortType*> (d);
     case AST_Decl::NT_connector:
-      return AST_Connector::narrow_from_decl (d);
+      return dynamic_cast<AST_Connector*> (d);
     case AST_Decl::NT_home:
-      return AST_Home::narrow_from_decl (d);
+      return dynamic_cast<AST_Home*> (d);
     case AST_Decl::NT_module:
-      return AST_Module::narrow_from_decl (d);
+      return dynamic_cast<AST_Module*> (d);
     case AST_Decl::NT_root:
-      return AST_Root::narrow_from_decl (d);
+      return dynamic_cast<AST_Root*> (d);
     case AST_Decl::NT_except:
-      return AST_Exception::narrow_from_decl (d);
+      return dynamic_cast<AST_Exception*> (d);
     case AST_Decl::NT_union:
-      return AST_Union::narrow_from_decl (d);
+      return dynamic_cast<AST_Union*> (d);
     case AST_Decl::NT_struct:
-      return AST_Structure::narrow_from_decl (d);
+      return dynamic_cast<AST_Structure*> (d);
     case AST_Decl::NT_enum:
-      return AST_Enum::narrow_from_decl (d);
+      return dynamic_cast<AST_Enum*> (d);
     case AST_Decl::NT_op:
-      return AST_Operation::narrow_from_decl (d);
+      return dynamic_cast<AST_Operation*> (d);
     case AST_Decl::NT_factory:
-      return AST_Factory::narrow_from_decl (d);
+      return dynamic_cast<AST_Factory*> (d);
     case AST_Decl::NT_finder:
-      return AST_Finder::narrow_from_decl (d);
+      return dynamic_cast<AST_Finder*> (d);
     default:
-      return 0;
+      return nullptr;
   }
 }
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
index c8d9811e690..7cbbca9ed78 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -96,7 +96,7 @@ long DRV_nfiles = 0;
 long DRV_file_index = -1;
 
 void
-DRV_version (void)
+DRV_version ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%C\n"
@@ -134,19 +134,19 @@ DRV_init (int &argc, ACE_TCHAR *argv[])
 }
 
 void
-DRV_refresh (void)
+DRV_refresh ()
 {
   idl_global->set_err_count (0);
-  idl_global->set_filename (0);
-  idl_global->set_main_filename (0);
-  idl_global->set_real_filename (0);
-  idl_global->set_stripped_filename (0);
+  idl_global->set_filename (nullptr);
+  idl_global->set_main_filename (nullptr);
+  idl_global->set_real_filename (nullptr);
+  idl_global->set_stripped_filename (nullptr);
   idl_global->set_lineno (-1);
   idl_global->reset_flag_seen ();
 }
 
 void
-DRV_cleanup (void)
+DRV_cleanup ()
 {
   // In case we got here via an init error or
   // usage/version option - otherwise it's idempotent.
@@ -154,11 +154,11 @@ DRV_cleanup (void)
 
   be_global->destroy ();
   delete be_global;
-  be_global = 0;
+  be_global = nullptr;
 
   idl_global->fini ();
   delete idl_global;
-  idl_global = 0;
+  idl_global = nullptr;
 
   for (DRV_file_index = 0;
        DRV_file_index < DRV_nfiles;
@@ -193,7 +193,7 @@ DRV_drive (const char *s)
 {
   // Set the name of the IDL file we are parsing. This is useful to
   // the backend when it generates C++ headers and files.
-  UTL_String *utl_string = 0;
+  UTL_String *utl_string = nullptr;
   ACE_NEW (utl_string,
            UTL_String (s, true));
 
@@ -362,7 +362,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       AST_Generator *gen = be_util::generator_init ();
 
-      if (0 == gen)
+      if (nullptr == gen)
         {
           ACE_ERROR ((
               LM_ERROR,
@@ -399,7 +399,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // If there are no input files, and we are not using the
       // directory recursion option, there's no sense going any further.
-      if (0 == DRV_nfiles && 0 == idl_global->recursion_start ())
+      if (0 == DRV_nfiles && nullptr == idl_global->recursion_start ())
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("IDL: No input files\n")));
@@ -407,7 +407,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           throw Bailout ();
         }
 
-      FILE *output_file = 0;
+      FILE *output_file = nullptr;
 
       if (idl_global->multi_file_input ())
         {
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 475529bdb6a..bc922467772 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-cr
-project(TAO_IDL_EXE) : aceexe, install, tao_output, tao_idl_fe {
+project(TAO_IDL_EXE) : aceexe, install, tao_rules, tao_output, tao_idl_fe {
   exename      = tao_idl
   exeout       = $(ACE_ROOT)/bin
   after       += TAO_IDL_BE gperf
diff --git a/TAO/TAO_IDL/tao_idl_be.mpc b/TAO/TAO_IDL/tao_idl_be.mpc
index a121b594e73..427916eb512 100644
--- a/TAO/TAO_IDL/tao_idl_be.mpc
+++ b/TAO/TAO_IDL/tao_idl_be.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
-project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE) : acelib, conv_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   includes    += $(TAO_ROOT)
diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc
index 020936b5c89..80ed849937f 100644
--- a/TAO/TAO_IDL/tao_idl_fe.mpc
+++ b/TAO/TAO_IDL/tao_idl_fe.mpc
@@ -50,7 +50,7 @@ project(TAO_IDL_GEN) {
   }
 }
 
-project(TAO_IDL_FE) : acelib, conv_lib, tao_output {
+project(TAO_IDL_FE) : acelib, conv_lib, tao_rules, tao_output {
   sharedname   = TAO_IDL_FE
   dynamicflags += TAO_IDL_FE_BUILD_DLL
   includes    += $(TAO_ROOT)
diff --git a/TAO/TAO_IDL/util/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_decllist.cpp
index 4e370719019..6e11b5db44a 100644
--- a/TAO/TAO_IDL/util/utl_decllist.cpp
+++ b/TAO/TAO_IDL/util/utl_decllist.cpp
@@ -88,19 +88,19 @@ UTL_DeclList::UTL_DeclList (FE_Declarator *s,
 
 // Get list item
 FE_Declarator *
-UTL_DeclList::head (void)
+UTL_DeclList::head ()
 {
   return pd_car_data;
 }
 
 void
-UTL_DeclList::destroy (void)
+UTL_DeclList::destroy ()
 {
-  if (this->pd_car_data != 0)
+  if (this->pd_car_data != nullptr)
     {
       this->pd_car_data->destroy ();
       delete this->pd_car_data;
-      this->pd_car_data = 0;
+      this->pd_car_data = nullptr;
     }
 
   this->UTL_List::destroy ();
@@ -131,11 +131,11 @@ UTL_DecllistActiveIterator::UTL_DecllistActiveIterator (UTL_DeclList *s)
 
 // Get current item
 FE_Declarator *
-UTL_DecllistActiveIterator::item (void)
+UTL_DecllistActiveIterator::item ()
 {
-  if (source == 0)
+  if (source == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   return ((UTL_DeclList *) source)->head ();
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index c9639fc9f6c..2a080172dda 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -259,7 +259,7 @@ error_string (UTL_Error::ErrorCode c)
  * Get filename from node or from idl_global if node is null.
  */
 static const char *
-get_filename (AST_Decl *node = 0)
+get_filename (AST_Decl *node = nullptr)
 {
   return node ? node->file_name ().c_str ()
     : idl_global->filename ()->get_string ();
@@ -269,7 +269,7 @@ get_filename (AST_Decl *node = 0)
  * Get line number from node or from idl_global if node is null.
  */
 static long
-get_lineno (AST_Decl *node = 0)
+get_lineno (AST_Decl *node = nullptr)
 {
   return node ? node->line () : idl_global->lineno ();
 }
@@ -293,7 +293,7 @@ idl_error_header (UTL_Error::ErrorCode c, long lineno, ACE_CString s)
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
 static void
-idl_error_header (UTL_Error::ErrorCode c, AST_Decl *node = 0)
+idl_error_header (UTL_Error::ErrorCode c, AST_Decl *node = nullptr)
 {
   idl_error_header (c, get_lineno (node), get_filename (node));
 }
@@ -317,7 +317,7 @@ idl_warning_header (UTL_Error::ErrorCode c, long lineno, ACE_CString s)
               error_string (c)));
 }
 static void
-idl_warning_header (UTL_Error::ErrorCode c, AST_Decl *node = 0)
+idl_warning_header (UTL_Error::ErrorCode c, AST_Decl *node = nullptr)
 {
   idl_warning_header (c, get_lineno (node), get_filename (node));
 }
@@ -915,7 +915,7 @@ UTL_Error::version_syntax_error (const char *msg)
 
 // Report an attempt to set the version a second time.
 void
-UTL_Error::version_reset_error (void)
+UTL_Error::version_reset_error ()
 {
   idl_error_header (EIDL_VERSION_RESET);
   ACE_ERROR ((LM_ERROR,
@@ -1096,7 +1096,7 @@ UTL_Error::incompatible_disc_error (AST_Decl *d,
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR, " does not contain "));
   UTL_ScopedName *sn = e->n ();
-  (sn != 0
+  (sn != nullptr
     ? sn->dump (*ACE_DEFAULT_LOG_STREAM)
     : e->dump (*ACE_DEFAULT_LOG_STREAM));
   ACE_ERROR ((LM_ERROR, "\n"));
@@ -1360,7 +1360,7 @@ void
 UTL_Error::not_a_type (AST_Decl *d)
 {
   idl_error_header (EIDL_NOT_A_TYPE);
-  if (d == 0 || d->name () == 0)
+  if (d == nullptr || d->name () == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   "unknown symbol"));
@@ -1393,7 +1393,7 @@ UTL_Error::back_end (long lineno,
 }
 
 void
-UTL_Error::illegal_infix (void)
+UTL_Error::illegal_infix ()
 {
   idl_error_header (EIDL_ILLEGAL_INFIX);
   ACE_ERROR ((LM_ERROR,
@@ -1511,7 +1511,7 @@ UTL_Error::scope_masking_error (AST_Decl *masked,
 }
 
 void
-UTL_Error::anonymous_type_diagnostic (void)
+UTL_Error::anonymous_type_diagnostic ()
 {
   if (idl_global->anon_silent () || idl_global->in_typedef ())
     {
diff --git a/TAO/TAO_IDL/util/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_exceptlist.cpp
index f7fbdaba704..93e55ebbb17 100644
--- a/TAO/TAO_IDL/util/utl_exceptlist.cpp
+++ b/TAO/TAO_IDL/util/utl_exceptlist.cpp
@@ -85,7 +85,7 @@ UTL_ExceptList::UTL_ExceptList (AST_Type *s,
 
 // Get list item.
 AST_Type *
-UTL_ExceptList::head (void)
+UTL_ExceptList::head ()
 {
   return this->pd_car_data;
 }
@@ -97,9 +97,9 @@ UTL_ExceptList::head (void)
 // AST_Exception.
 
 void
-UTL_ExceptList::destroy (void)
+UTL_ExceptList::destroy ()
 {
-  if (this->tail () != 0)
+  if (this->tail () != nullptr)
     {
       this->tail ()->destroy ();
     }
@@ -108,15 +108,15 @@ UTL_ExceptList::destroy (void)
 }
 
 UTL_ExceptList *
-UTL_ExceptList::copy (void)
+UTL_ExceptList::copy ()
 {
-  UTL_ExceptList *retval = 0;
+  UTL_ExceptList *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   UTL_ExceptList (this->pd_car_data,
-                                  0),
-                  0);
+                                  nullptr),
+                  nullptr);
 
-  if (this->tail () != 0)
+  if (this->tail () != nullptr)
     {
       retval->nconc ((UTL_ExceptList *) this->tail ()->copy ());
     }
@@ -131,11 +131,11 @@ UTL_ExceptlistActiveIterator::UTL_ExceptlistActiveIterator (UTL_ExceptList *s)
 
 // Get current item.
 AST_Type *
-UTL_ExceptlistActiveIterator::item (void)
+UTL_ExceptlistActiveIterator::item ()
 {
-  if (source == 0)
+  if (source == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   return ((UTL_ExceptList *) source)->head ();
diff --git a/TAO/TAO_IDL/util/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_exprlist.cpp
index 5e8bb062aa1..26bc07b18ad 100644
--- a/TAO/TAO_IDL/util/utl_exprlist.cpp
+++ b/TAO/TAO_IDL/util/utl_exprlist.cpp
@@ -82,19 +82,19 @@ UTL_ExprList::UTL_ExprList (AST_Expression *s,
 
 // Get list item.
 AST_Expression *
-UTL_ExprList::head (void)
+UTL_ExprList::head ()
 {
   return this->pd_car_data;
 }
 
 void
-UTL_ExprList::destroy (void)
+UTL_ExprList::destroy ()
 {
-  if (this->pd_car_data != 0)
+  if (this->pd_car_data != nullptr)
     {
       this->pd_car_data->destroy ();
       delete this->pd_car_data;
-      this->pd_car_data = 0;
+      this->pd_car_data = nullptr;
     }
 
   this->UTL_List::destroy ();
@@ -107,11 +107,11 @@ UTL_ExprlistActiveIterator::UTL_ExprlistActiveIterator (UTL_ExprList *s)
 
 // Get current item.
 AST_Expression *
-UTL_ExprlistActiveIterator::item (void)
+UTL_ExprlistActiveIterator::item ()
 {
-  if (source == 0)
+  if (source == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   return ((UTL_ExprList *) source)->head ();
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 63e2931a6e3..1c9a20bd53b 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -91,7 +91,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #undef INCREMENT
 #define INCREMENT 64
 
-static long *pSeenOnce = 0;
+static long *pSeenOnce = nullptr;
 
 #if defined (ACE_OPENVMS)
 #include <unixlib.h>
@@ -110,7 +110,7 @@ char* IDL_GlobalData::translateName(const char* name, char *name_buf)
 }
 #endif
 
-IDL_GlobalData::IDL_GlobalData (void)
+IDL_GlobalData::IDL_GlobalData ()
   : syntax_only_ (false),
     parse_args_exit_ (false),
     parse_args_exit_status_ (0),
@@ -122,35 +122,35 @@ IDL_GlobalData::IDL_GlobalData (void)
     ignore_files_ (false),
     ignore_lookup_errors_ (false),
     unknown_annotations_ (UNKNOWN_ANNOTATIONS_WARN_ONCE),
-    pd_root (0),
-    pd_gen (0),
-    pd_primary_key_base (0),
-    pd_err (0),
+    pd_root (nullptr),
+    pd_gen (nullptr),
+    pd_primary_key_base (nullptr),
+    pd_err (nullptr),
     pd_err_count (0),
     pd_lineno (0),
-    pd_filename (0),
-    pd_main_filename (0),
-    pd_real_filename (0),
-    pd_stripped_filename (0),
+    pd_filename (nullptr),
+    pd_main_filename (nullptr),
+    pd_real_filename (nullptr),
+    pd_stripped_filename (nullptr),
     pd_import (false),
     pd_in_main_file (false),
-    pd_prog_name (0),
-    pd_cpp_location (0),
+    pd_prog_name (nullptr),
+    pd_cpp_location (nullptr),
     pd_compile_flags (0),
-    pd_local_escapes (0),
-    pd_indent (0),
-    pd_include_file_names (0),
+    pd_local_escapes (nullptr),
+    pd_indent (nullptr),
+    pd_include_file_names (nullptr),
     pd_n_include_file_names (0),
     pd_n_alloced_file_names (0),
-    included_idl_files_ (0),
+    included_idl_files_ (nullptr),
     n_included_idl_files_ (0),
     n_allocated_idl_files_ (0),
     pd_parse_state (PS_NoState),
-    pd_idl_src_file (0),
-    tao_root_ (0),
-    gperf_path_ (0),
-    temp_dir_ (0),
-    ident_string_ (0),
+    pd_idl_src_file (nullptr),
+    tao_root_ (nullptr),
+    gperf_path_ (nullptr),
+    temp_dir_ (nullptr),
+    ident_string_ (nullptr),
     case_diff_error_ (true),
     nest_orb_ (false),
     idl_flags_ (""),
@@ -160,14 +160,14 @@ IDL_GlobalData::IDL_GlobalData (void)
     ignore_idl3_ (false),
     dcps_support_zero_copy_read_ (false),
     dcps_gen_zero_copy_read_ (false),
-    recursion_start_ (0),
+    recursion_start_ (nullptr),
     multi_file_input_ (false),
     big_file_name_ ("PICML_IDL_file_bag"),
-    current_params_ (0),
-    alias_params_ (0),
-    for_new_holder_ (0),
+    current_params_ (nullptr),
+    alias_params_ (nullptr),
+    for_new_holder_ (nullptr),
     included_ami_receps_done_ (false),
-    corba_module_ (0),
+    corba_module_ (nullptr),
     anon_type_diagnostic_ (ANON_TYPE_ERROR),
     explicit_anon_type_diagnostic_ (false),
     in_typedef_ (false),
@@ -181,7 +181,7 @@ IDL_GlobalData::IDL_GlobalData (void)
   // Form the absolute pathname.
   char* ace_root = ACE_OS::getenv ("ACE_ROOT");
 
-  if (ace_root == 0)
+  if (ace_root == nullptr)
     // This may not cause any problem if -g option is used to specify
     // the correct path for the  gperf program. Let us ignore this
     // error here. It will be caught when we check the existence of
@@ -198,7 +198,7 @@ IDL_GlobalData::IDL_GlobalData (void)
                        "%s",
                        ace_gperf);
 #else
-      this->gperf_path_ = 0;
+      this->gperf_path_ = nullptr;
 #endif
     }
   else
@@ -241,13 +241,13 @@ IDL_GlobalData::IDL_GlobalData (void)
   this->reset_flag_seen ();
 }
 
-IDL_GlobalData::~IDL_GlobalData (void)
+IDL_GlobalData::~IDL_GlobalData ()
 {
 }
 
 // When starting to process the next command line input idl file, reset.
 void
-IDL_GlobalData::reset_flag_seen (void)
+IDL_GlobalData::reset_flag_seen ()
 {
   abstract_iface_seen_ = false;
   abstractbase_seen_ = false;
@@ -314,14 +314,14 @@ IDL_GlobalData::reset_flag_seen (void)
 
 // Get or set scopes stack
 UTL_ScopeStack &
-IDL_GlobalData::scopes (void)
+IDL_GlobalData::scopes ()
 {
   return this->pd_scopes;
 }
 
 // Get or set root of AST
 AST_Root *
-IDL_GlobalData::root (void)
+IDL_GlobalData::root ()
 {
   return this->pd_root;
 }
@@ -334,7 +334,7 @@ IDL_GlobalData::set_root (AST_Root *r)
 
 // Get or set generator object
 AST_Generator *
-IDL_GlobalData::gen (void)
+IDL_GlobalData::gen ()
 {
   return this->pd_gen;
 }
@@ -347,7 +347,7 @@ IDL_GlobalData::set_gen (AST_Generator *g)
 
 // Get or set PrimaryKeyBase object
 AST_ValueType *
-IDL_GlobalData::primary_key_base (void)
+IDL_GlobalData::primary_key_base ()
 {
   return this->pd_primary_key_base;
 }
@@ -360,7 +360,7 @@ IDL_GlobalData::primary_key_base (AST_ValueType *v)
 
 // Get or set error object
 UTL_Error *
-IDL_GlobalData::err (void)
+IDL_GlobalData::err ()
 {
   return this->pd_err;
 }
@@ -373,7 +373,7 @@ IDL_GlobalData::set_err (UTL_Error *e)
 
 // Get or set error count
 int
-IDL_GlobalData::err_count (void)
+IDL_GlobalData::err_count ()
 {
   return this->pd_err_count;
 }
@@ -386,7 +386,7 @@ IDL_GlobalData::set_err_count (int c)
 
 // Get or set line number
 long
-IDL_GlobalData::lineno (void)
+IDL_GlobalData::lineno ()
 {
   return this->pd_lineno;
 }
@@ -399,7 +399,7 @@ IDL_GlobalData::set_lineno (long n)
 
 // Get or set file name being read now
 UTL_String *
-IDL_GlobalData::filename (void)
+IDL_GlobalData::filename ()
 {
   return this->pd_filename;
 }
@@ -407,11 +407,11 @@ IDL_GlobalData::filename (void)
 void
 IDL_GlobalData::set_filename (UTL_String *s)
 {
-  if (this->pd_filename != 0)
+  if (this->pd_filename != nullptr)
     {
       this->pd_filename->destroy ();
       delete this->pd_filename;
-      this->pd_filename = 0;
+      this->pd_filename = nullptr;
     }
 
   this->pd_filename = s;
@@ -419,7 +419,7 @@ IDL_GlobalData::set_filename (UTL_String *s)
 
 // Get or set main file name
 UTL_String *
-IDL_GlobalData::main_filename (void)
+IDL_GlobalData::main_filename ()
 {
   return this->pd_main_filename;
 }
@@ -427,18 +427,18 @@ IDL_GlobalData::main_filename (void)
 void
 IDL_GlobalData::set_main_filename (UTL_String *n)
 {
-  if (this->pd_main_filename != 0)
+  if (this->pd_main_filename != nullptr)
     {
       this->pd_main_filename->destroy ();
       delete this->pd_main_filename;
-      this->pd_main_filename = 0;
+      this->pd_main_filename = nullptr;
     }
   this->pd_main_filename = n;
 }
 
 // Get or set real file name
 UTL_String *
-IDL_GlobalData::real_filename (void)
+IDL_GlobalData::real_filename ()
 {
   return this->pd_real_filename;
 }
@@ -446,11 +446,11 @@ IDL_GlobalData::real_filename (void)
 void
 IDL_GlobalData::set_real_filename (UTL_String *n)
 {
-  if (this->pd_real_filename != 0)
+  if (this->pd_real_filename != nullptr)
     {
       this->pd_real_filename->destroy ();
       delete this->pd_real_filename;
-      this->pd_real_filename = 0;
+      this->pd_real_filename = nullptr;
     }
 
   this->pd_real_filename = n;
@@ -458,13 +458,13 @@ IDL_GlobalData::set_real_filename (UTL_String *n)
 
 // Get or set indicator whether import is on
 bool
-IDL_GlobalData::imported (void)
+IDL_GlobalData::imported ()
 {
   return this->pd_in_main_file ? false : pd_import;
 }
 
 bool
-IDL_GlobalData::import (void)
+IDL_GlobalData::import ()
 {
   return this->pd_import;
 }
@@ -477,7 +477,7 @@ IDL_GlobalData::set_import (bool is_in)
 
 // Get or set indicator whether we're reading the main file now
 bool
-IDL_GlobalData::in_main_file (void)
+IDL_GlobalData::in_main_file ()
 {
   return this->pd_in_main_file;
 }
@@ -490,7 +490,7 @@ IDL_GlobalData::set_in_main_file (bool is_in)
 
 // Get or set stripped file name
 UTL_String *
-IDL_GlobalData::stripped_filename (void)
+IDL_GlobalData::stripped_filename ()
 {
   return this->pd_stripped_filename;
 }
@@ -498,7 +498,7 @@ IDL_GlobalData::stripped_filename (void)
 void
 IDL_GlobalData::set_stripped_filename (UTL_String *nm)
 {
-  if (this->pd_stripped_filename != 0)
+  if (this->pd_stripped_filename != nullptr)
     {
       delete this->pd_stripped_filename;
     }
@@ -508,7 +508,7 @@ IDL_GlobalData::set_stripped_filename (UTL_String *nm)
 
 // Get or set cache value for argv[0]
 const char *
-IDL_GlobalData::prog_name (void)
+IDL_GlobalData::prog_name ()
 {
   return this->pd_prog_name;
 }
@@ -521,7 +521,7 @@ IDL_GlobalData::set_prog_name (const char *pn)
 
 // Get or set location to find C preprocessor
 const char *
-IDL_GlobalData::cpp_location (void)
+IDL_GlobalData::cpp_location ()
 {
   return this->pd_cpp_location;
 }
@@ -534,7 +534,7 @@ IDL_GlobalData::set_cpp_location (const char *l)
 
 // Get or set IDL compiler flags
 long
-IDL_GlobalData::compile_flags (void)
+IDL_GlobalData::compile_flags ()
 {
   return this->pd_compile_flags;
 }
@@ -556,7 +556,7 @@ IDL_GlobalData::set_compile_flags (long cf)
 // Get or set local escapes string. This provides an additional
 // mechanism to pass information to a BE.
 char *
-IDL_GlobalData::local_escapes (void)
+IDL_GlobalData::local_escapes ()
 {
   return this->pd_local_escapes;
 }
@@ -564,7 +564,7 @@ IDL_GlobalData::local_escapes (void)
 void
 IDL_GlobalData::set_local_escapes (const char *e)
 {
-  if (this->pd_local_escapes != 0)
+  if (this->pd_local_escapes != nullptr)
     {
       delete [] this->pd_local_escapes;
     }
@@ -574,7 +574,7 @@ IDL_GlobalData::set_local_escapes (const char *e)
 
 // Get or set indent object
 UTL_Indenter *
-IDL_GlobalData::indent (void)
+IDL_GlobalData::indent ()
 {
   return this->pd_indent;
 }
@@ -590,7 +590,7 @@ long
 IDL_GlobalData::seen_include_file_before (char *n)
 {
   unsigned long i;
-  char *incl = 0;
+  char *incl = nullptr;
   char *tmp = n;
 
   for (i = 0; i < this->pd_n_include_file_names; ++i)
@@ -665,7 +665,7 @@ IDL_GlobalData::set_include_file_names (UTL_String **ns)
 }
 
 UTL_String **
-IDL_GlobalData::include_file_names (void)
+IDL_GlobalData::include_file_names ()
 {
   return this->pd_include_file_names;
 }
@@ -677,7 +677,7 @@ IDL_GlobalData::set_n_include_file_names (unsigned long n)
 }
 
 unsigned long
-IDL_GlobalData::n_include_file_names (void)
+IDL_GlobalData::n_include_file_names ()
 {
   return pd_n_include_file_names;
 }
@@ -735,13 +735,13 @@ IDL_GlobalData::add_to_included_idl_files (const char *file_name)
 }
 
 char**
-IDL_GlobalData::included_idl_files (void)
+IDL_GlobalData::included_idl_files ()
 {
   return this->included_idl_files_;
 }
 
 size_t
-IDL_GlobalData::n_included_idl_files (void)
+IDL_GlobalData::n_included_idl_files ()
 {
   return this->n_included_idl_files_;
 }
@@ -762,13 +762,13 @@ IDL_GlobalData::set_parse_state(ParseState ps)
 }
 
 IDL_GlobalData::ParseState
-IDL_GlobalData::parse_state (void)
+IDL_GlobalData::parse_state ()
 {
   return pd_parse_state;
 }
 
 // returns the IDL source file being copiled
-UTL_String* IDL_GlobalData::idl_src_file (void)
+UTL_String* IDL_GlobalData::idl_src_file ()
 {
   return this->pd_idl_src_file;
 }
@@ -784,7 +784,7 @@ IDL_GlobalData::temp_dir (const char *s)
 {
   // Delete the old pointer.
   delete [] this->temp_dir_;
-  this->temp_dir_ = 0; // In case the ACE_NEW fails below.
+  this->temp_dir_ = nullptr; // In case the ACE_NEW fails below.
 
   const size_t lengthSep = sizeof (ACE_DIRECTORY_SEPARATOR_STR_A) - 1u;
   const size_t lengthPath = ACE_OS::strlen (s);
@@ -810,7 +810,7 @@ IDL_GlobalData::temp_dir (const char *s)
 }
 
 const char *
-IDL_GlobalData::temp_dir (void) const
+IDL_GlobalData::temp_dir () const
 {
   return this->temp_dir_;
 }
@@ -823,7 +823,7 @@ IDL_GlobalData::tao_root (const char *s)
 }
 
 const char *
-IDL_GlobalData::tao_root (void) const
+IDL_GlobalData::tao_root () const
 {
   return this->tao_root_;
 }
@@ -836,7 +836,7 @@ IDL_GlobalData::gperf_path (const char *s)
 }
 
 const char *
-IDL_GlobalData::gperf_path (void) const
+IDL_GlobalData::gperf_path () const
 {
   return this->gperf_path_;
 }
@@ -849,7 +849,7 @@ IDL_GlobalData::ident_string (const char *s)
 }
 
 const char *
-IDL_GlobalData::ident_string (void) const
+IDL_GlobalData::ident_string () const
 {
   return this->ident_string_;
 }
@@ -861,7 +861,7 @@ IDL_GlobalData::case_diff_error (bool val)
 }
 
 bool
-IDL_GlobalData::case_diff_error (void)
+IDL_GlobalData::case_diff_error ()
 {
   return this->case_diff_error_;
 }
@@ -873,57 +873,57 @@ IDL_GlobalData::nest_orb (bool val)
 }
 
 bool
-IDL_GlobalData::nest_orb (void)
+IDL_GlobalData::nest_orb ()
 {
   return this->nest_orb_;
 }
 
 void
-IDL_GlobalData::destroy (void)
+IDL_GlobalData::destroy ()
 {
-  if (this->pd_filename != 0)
+  if (this->pd_filename != nullptr)
     {
       this->pd_filename->destroy ();
       delete this->pd_filename;
-      this->pd_filename = 0;
+      this->pd_filename = nullptr;
     }
 
-  if (this->pd_main_filename != 0)
+  if (this->pd_main_filename != nullptr)
     {
       this->pd_main_filename->destroy ();
       delete this->pd_main_filename;
-      this->pd_main_filename = 0;
+      this->pd_main_filename = nullptr;
     }
 
-  if (this->pd_real_filename != 0)
+  if (this->pd_real_filename != nullptr)
     {
       this->pd_real_filename->destroy ();
       delete this->pd_real_filename;
-      this->pd_real_filename = 0;
+      this->pd_real_filename = nullptr;
     }
 
-  if (this->pd_stripped_filename != 0)
+  if (this->pd_stripped_filename != nullptr)
     {
       this->pd_stripped_filename->destroy ();
       delete this->pd_stripped_filename;
-      this->pd_stripped_filename = 0;
+      this->pd_stripped_filename = nullptr;
     }
 
-  if (this->pd_idl_src_file != 0)
+  if (this->pd_idl_src_file != nullptr)
     {
       this->pd_idl_src_file->destroy ();
       delete this->pd_idl_src_file;
-      this->pd_idl_src_file = 0;
+      this->pd_idl_src_file = nullptr;
     }
 
   size_t size = this->pragma_prefixes ().size  ();
-  char *trash = 0;
+  char *trash = nullptr;
 
   for (size_t i = 0; i < size; ++i)
     {
       this->pragma_prefixes ().pop (trash);
       delete [] trash;
-      trash = 0;
+      trash = nullptr;
     }
 
   // Clean up each included file name - the array allocation itself
@@ -932,7 +932,7 @@ IDL_GlobalData::destroy (void)
     {
       this->pd_include_file_names[j]->destroy ();
       delete this->pd_include_file_names[j];
-      this->pd_include_file_names[j] = 0;
+      this->pd_include_file_names[j] = nullptr;
     }
 
   this->pd_n_include_file_names = 0;
@@ -940,26 +940,26 @@ IDL_GlobalData::destroy (void)
   for (size_t k = 0; k < n_included_idl_files_; ++k)
     {
       ACE::strdelete (this->included_idl_files_[k]);
-      this->included_idl_files_[k] = 0;
+      this->included_idl_files_[k] = nullptr;
     }
 
   this->n_included_idl_files_ = 0;
   this->n_allocated_idl_files_ = 0;
   delete [] this->included_idl_files_;
-  this->included_idl_files_ = 0;
+  this->included_idl_files_ = nullptr;
 
   ACE::strdelete (this->recursion_start_);
-  this->recursion_start_ = 0;
+  this->recursion_start_ = nullptr;
 
   // Reset the member of the CORBA module containing the basic types
   // to point to itself, since all the other CORBA modules (if any)
   // will be destroyed.
-  if (this->corba_module_ != 0)
+  if (this->corba_module_ != nullptr)
     {
       this->corba_module_->reset_last_in_same_parent_scope ();
     }
 
-  if (0 != this->pd_root)
+  if (nullptr != this->pd_root)
     {
       this->pd_root->destroy ();
     }
@@ -972,19 +972,19 @@ IDL_GlobalData::append_idl_flag (const char *s)
 }
 
 const char *
-IDL_GlobalData::idl_flags (void) const
+IDL_GlobalData::idl_flags () const
 {
   return this->idl_flags_.c_str ();
 }
 
 ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> &
-IDL_GlobalData::idl_keywords (void)
+IDL_GlobalData::idl_keywords ()
 {
   return this->idl_keywords_;
 }
 
 ACE_Unbounded_Stack<char *> &
-IDL_GlobalData::pragma_prefixes (void)
+IDL_GlobalData::pragma_prefixes ()
 {
   return this->pragma_prefixes_;
 }
@@ -994,7 +994,7 @@ IDL_GlobalData::update_prefix (char *filename)
 {
   // If we are just starting up and processing the temporary filename,
   // there are no prefix issues to deal with yet.
-  if (this->pd_main_filename == 0 || this->pd_filename == 0)
+  if (this->pd_main_filename == nullptr || this->pd_filename == nullptr)
     {
       return;
     }
@@ -1012,10 +1012,10 @@ IDL_GlobalData::update_prefix (char *filename)
       return;
     }
 
-  ACE_CString tmp ("", 0, false);
+  ACE_CString tmp ("", nullptr, false);
   char *main_filename = this->pd_main_filename->get_string ();
 
-  char *prefix = 0;
+  char *prefix = nullptr;
   int status = this->file_prefixes_.find (filename, prefix);
 
   if (status == 0)
@@ -1055,7 +1055,7 @@ IDL_GlobalData::update_prefix (char *filename)
           // pop it.
           if (status == 0 && ACE_OS::strcmp (prefix, "") != 0)
             {
-              char *trash = 0;
+              char *trash = nullptr;
               this->pragma_prefixes_.pop (trash);
               delete [] trash;
             }
@@ -1073,7 +1073,7 @@ IDL_GlobalData::update_prefix (char *filename)
  Should be true when being used by the IFR Service
  */
 bool
-IDL_GlobalData::preserve_cpp_keywords (void)
+IDL_GlobalData::preserve_cpp_keywords ()
 {
   return preserve_cpp_keywords_;
 }
@@ -1103,7 +1103,7 @@ IDL_GlobalData::add_rel_include_path (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> const &
-IDL_GlobalData::rel_include_paths (void) const
+IDL_GlobalData::rel_include_paths () const
 {
   return this->rel_include_paths_;
 }
@@ -1115,7 +1115,7 @@ IDL_GlobalData::add_ciao_lem_file_names (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_lem_file_names (void)
+IDL_GlobalData::ciao_lem_file_names ()
 {
   return this->ciao_lem_file_names_;
 }
@@ -1127,7 +1127,7 @@ IDL_GlobalData::add_ciao_rti_ts_file_names (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_rti_ts_file_names (void)
+IDL_GlobalData::ciao_rti_ts_file_names ()
 {
   return this->ciao_rti_ts_file_names_;
 }
@@ -1139,7 +1139,7 @@ IDL_GlobalData::add_ciao_spl_ts_file_names (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_spl_ts_file_names (void)
+IDL_GlobalData::ciao_spl_ts_file_names ()
 {
   return this->ciao_spl_ts_file_names_;
 }
@@ -1151,7 +1151,7 @@ IDL_GlobalData::add_ciao_oci_ts_file_names (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_oci_ts_file_names (void)
+IDL_GlobalData::ciao_oci_ts_file_names ()
 {
   return this->ciao_oci_ts_file_names_;
 }
@@ -1163,7 +1163,7 @@ IDL_GlobalData::add_ciao_coredx_ts_file_names (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_coredx_ts_file_names (void)
+IDL_GlobalData::ciao_coredx_ts_file_names ()
 {
   return this->ciao_coredx_ts_file_names_;
 }
@@ -1175,7 +1175,7 @@ IDL_GlobalData::add_ciao_ami_iface_names (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_ami_iface_names (void)
+IDL_GlobalData::ciao_ami_iface_names ()
 {
   return this->ciao_ami_iface_names_;
 }
@@ -1187,7 +1187,7 @@ IDL_GlobalData::add_ciao_ami_recep_names (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_ami_recep_names (void)
+IDL_GlobalData::ciao_ami_recep_names ()
 {
   return this->ciao_ami_recep_names_;
 }
@@ -1199,13 +1199,13 @@ IDL_GlobalData::add_included_ami_recep_names (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::included_ami_recep_names (void)
+IDL_GlobalData::included_ami_recep_names ()
 {
   return this->included_ami_recep_names_;
 }
 
 bool
-IDL_GlobalData::included_ami_receps_done (void) const
+IDL_GlobalData::included_ami_receps_done () const
 {
   return this->included_ami_receps_done_;
 }
@@ -1223,7 +1223,7 @@ IDL_GlobalData::add_ciao_ami_idl_fnames (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_ami_idl_fnames (void)
+IDL_GlobalData::ciao_ami_idl_fnames ()
 {
   return this->ciao_ami_idl_fnames_;
 }
@@ -1235,25 +1235,25 @@ IDL_GlobalData::add_dds4ccm_impl_fnames (const char *s)
 }
 
 ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::dds4ccm_impl_fnames (void)
+IDL_GlobalData::dds4ccm_impl_fnames ()
 {
   return this->dds4ccm_impl_fnames_;
 }
 
 ACE_Unbounded_Queue<AST_Interface *> &
-IDL_GlobalData::mixed_parentage_interfaces (void)
+IDL_GlobalData::mixed_parentage_interfaces ()
 {
   return this->mixed_parentage_interfaces_;
 }
 
 ACE_Hash_Map_Manager<char *, char *, ACE_Null_Mutex> &
-IDL_GlobalData::file_prefixes (void)
+IDL_GlobalData::file_prefixes ()
 {
   return this->file_prefixes_;
 }
 
 bool
-IDL_GlobalData::pass_orb_idl (void) const
+IDL_GlobalData::pass_orb_idl () const
 {
   return this->pass_orb_idl_;
 }
@@ -1265,7 +1265,7 @@ IDL_GlobalData::pass_orb_idl (bool val)
 }
 
 bool
-IDL_GlobalData::using_ifr_backend (void) const
+IDL_GlobalData::using_ifr_backend () const
 {
   return this->using_ifr_backend_;
 }
@@ -1277,7 +1277,7 @@ IDL_GlobalData::using_ifr_backend (bool val)
 }
 
 bool
-IDL_GlobalData::ignore_idl3 (void) const
+IDL_GlobalData::ignore_idl3 () const
 {
   return this->ignore_idl3_;
 }
@@ -1289,7 +1289,7 @@ IDL_GlobalData::ignore_idl3 (bool val)
 }
 
 bool
-IDL_GlobalData::dcps_support_zero_copy_read (void) const
+IDL_GlobalData::dcps_support_zero_copy_read () const
 {
   return this->dcps_support_zero_copy_read_;
 }
@@ -1301,7 +1301,7 @@ IDL_GlobalData::dcps_support_zero_copy_read (bool val)
 }
 
 bool
-IDL_GlobalData::dcps_gen_zero_copy_read (void) const
+IDL_GlobalData::dcps_gen_zero_copy_read () const
 {
   return this->dcps_gen_zero_copy_read_;
 }
@@ -1315,11 +1315,11 @@ IDL_GlobalData::dcps_gen_zero_copy_read (bool val)
 // Return 0 on success, -1 failure. The <errno> corresponding to the
 // error that caused the GPERF execution is also set.
 int
-IDL_GlobalData::check_gperf (void)
+IDL_GlobalData::check_gperf ()
 {
   // If absolute path is not specified yet, let us call just
   // "gperf". Hopefully PATH is set up correctly to locate the gperf.
-  if (this->gperf_path_ == 0)
+  if (this->gperf_path_ == nullptr)
     {
       // If ACE_GPERF is defined then use that gperf program instead of "gperf."
 #if defined (ACE_GPERF)
@@ -1420,35 +1420,35 @@ IDL_GlobalData::check_gperf (void)
 }
 
 void
-IDL_GlobalData::fini (void)
+IDL_GlobalData::fini ()
 {
-  if (0 != this->pd_root)
+  if (nullptr != this->pd_root)
     {
       this->pd_root->fini ();
       delete this->pd_root;
-      this->pd_root = 0;
+      this->pd_root = nullptr;
     }
 
   delete this->pd_err;
-  this->pd_err = 0;
+  this->pd_err = nullptr;
   delete this->pd_gen;
-  this->pd_gen = 0;
+  this->pd_gen = nullptr;
   delete this->pd_indent;
-  this->pd_indent = 0;
+  this->pd_indent = nullptr;
   delete [] this->pd_local_escapes;
-  this->pd_local_escapes = 0;
+  this->pd_local_escapes = nullptr;
   delete [] this->tao_root_;
-  this->tao_root_ = 0;
+  this->tao_root_ = nullptr;
   delete [] this->gperf_path_;
-  this->gperf_path_ = 0;
+  this->gperf_path_ = nullptr;
   delete [] this->temp_dir_;
-  this->temp_dir_ = 0;
+  this->temp_dir_ = nullptr;
   delete [] this->ident_string_;
-  this->ident_string_ = 0;
+  this->ident_string_ = nullptr;
   delete [] this->pd_include_file_names;
-  this->pd_include_file_names = 0;
+  this->pd_include_file_names = nullptr;
 
-  Include_Path_Info *path_info = 0;
+  Include_Path_Info *path_info = nullptr;
 
   for (Unbounded_Paths_Queue_Iterator qiter (this->include_paths_);
        qiter.done () == 0;
@@ -1458,7 +1458,7 @@ IDL_GlobalData::fini (void)
       ACE::strdelete (path_info->path_);
     }
 
-  char **path_tmp  = 0;
+  char **path_tmp  = nullptr;
 
   for (ACE_Unbounded_Queue_Iterator<char *>riter (
             this->rel_include_paths_
@@ -1561,7 +1561,7 @@ IDL_GlobalData::fini (void)
     }
 
 
-  ACE_Hash_Map_Entry<char *, char *> *entry = 0;
+  ACE_Hash_Map_Entry<char *, char *> *entry = nullptr;
 
   for (ACE_Hash_Map_Iterator<char *, char *, ACE_Null_Mutex> hiter (
            this->file_prefixes_
@@ -1574,7 +1574,7 @@ IDL_GlobalData::fini (void)
       ACE::strdelete (entry->int_id_);
     }
 
-  DCPS_Type_Info_Map::ENTRY *dcps_entry = 0;
+  DCPS_Type_Info_Map::ENTRY *dcps_entry = nullptr;
 
   for (DCPS_Type_Info_Map::ITERATOR dcps_iter (
          this->dcps_type_info_map_);
@@ -1585,7 +1585,7 @@ IDL_GlobalData::fini (void)
 
       dcps_entry->int_id_->name_->destroy ();
       delete dcps_entry->int_id_->name_;
-      dcps_entry->int_id_->name_ = 0;
+      dcps_entry->int_id_->name_ = nullptr;
 
       delete dcps_entry->int_id_;
       dcps_entry->int_id_ = 0;
@@ -1596,15 +1596,15 @@ IDL_GlobalData::fini (void)
 }
 
 ACE_Unbounded_Queue<AST_ValueType *> &
-IDL_GlobalData::primary_keys (void)
+IDL_GlobalData::primary_keys ()
 {
   return this->primary_keys_;
 }
 
 void
-IDL_GlobalData::check_primary_keys (void)
+IDL_GlobalData::check_primary_keys ()
 {
-  AST_ValueType *holder = 0;
+  AST_ValueType *holder = nullptr;
 
   while (!this->primary_keys_.is_empty ())
     {
@@ -1625,7 +1625,7 @@ IDL_GlobalData::check_primary_keys (void)
 }
 
 const char *
-IDL_GlobalData::recursion_start (void) const
+IDL_GlobalData::recursion_start () const
 {
   return this->recursion_start_;
 }
@@ -1651,7 +1651,7 @@ IDL_GlobalData::recursion_start (const char *val)
 }
 
 bool
-IDL_GlobalData::multi_file_input (void) const
+IDL_GlobalData::multi_file_input () const
 {
   return this->multi_file_input_;
 }
@@ -1663,13 +1663,13 @@ IDL_GlobalData::multi_file_input (bool val)
 }
 
 const char *
-IDL_GlobalData::big_file_name (void) const
+IDL_GlobalData::big_file_name () const
 {
   return this->big_file_name_;
 }
 
 FE_Utils::T_PARAMLIST_INFO const *
-IDL_GlobalData::current_params (void) const
+IDL_GlobalData::current_params () const
 {
   return this->current_params_;
 }
@@ -1682,7 +1682,7 @@ FE_Utils::T_PARAMLIST_INFO *params)
 }
 
 UTL_StrList const *
-IDL_GlobalData::alias_params (void) const
+IDL_GlobalData::alias_params () const
 {
   return this->alias_params_;
 }
@@ -1695,7 +1695,7 @@ UTL_StrList *params)
 }
 
 UTL_StrList const *
-IDL_GlobalData::for_new_holder (void) const
+IDL_GlobalData::for_new_holder () const
 {
   return this->for_new_holder_;
 }
@@ -1716,7 +1716,7 @@ IDL_GlobalData::set_dcps_sequence_type (const char* seq_type)
 bool
 IDL_GlobalData::dcps_sequence_type_defined (const char* seq_type)
 {
-  char **tmp = 0;
+  char **tmp = nullptr;
 
   for (ACE_Unbounded_Queue_Iterator<char *>riter (
          this->dcps_sequence_types_list_);
@@ -1776,7 +1776,7 @@ bool
 IDL_GlobalData::add_dcps_data_key (const char* id, const char* key)
 {
   // Search the map for the type.
-  DCPS_Data_Type_Info* newinfo = 0;
+  DCPS_Data_Type_Info* newinfo = nullptr;
 
   if (this->dcps_type_info_map_.find (id, newinfo) == 0)
     {
@@ -1814,11 +1814,11 @@ IDL_GlobalData::is_dcps_type (UTL_ScopedName* target)
     }
 
   // No joy.
-  return 0;
+  return nullptr;
 }
 
 AST_Module *
-IDL_GlobalData::corba_module (void) const
+IDL_GlobalData::corba_module () const
 {
   return this->corba_module_;
 }
@@ -1830,7 +1830,7 @@ IDL_GlobalData::corba_module (AST_Module *m)
 }
 
 IDL_GlobalData::Unbounded_Paths_Queue &
-IDL_GlobalData::include_paths (void)
+IDL_GlobalData::include_paths ()
 {
   return this->include_paths_;
 }
@@ -1850,7 +1850,7 @@ IDL_GlobalData::explicit_anon_type_diagnostic () const
 }
 
 bool
-IDL_GlobalData::anon_error (void) const
+IDL_GlobalData::anon_error () const
 {
   if (idl_version_ >= IDL_VERSION_4 && !explicit_anon_type_diagnostic_) {
     return false;
@@ -1859,7 +1859,7 @@ IDL_GlobalData::anon_error (void) const
 }
 
 bool
-IDL_GlobalData::anon_warning (void) const
+IDL_GlobalData::anon_warning () const
 {
   if (idl_version_ >= IDL_VERSION_4 && !explicit_anon_type_diagnostic_) {
     return false;
@@ -1868,7 +1868,7 @@ IDL_GlobalData::anon_warning (void) const
 }
 
 bool
-IDL_GlobalData::anon_silent (void) const
+IDL_GlobalData::anon_silent () const
 {
   if (idl_version_ >= IDL_VERSION_4 && !explicit_anon_type_diagnostic_) {
     return true;
@@ -1877,7 +1877,7 @@ IDL_GlobalData::anon_silent (void) const
 }
 
 bool
-IDL_GlobalData::in_typedef (void) const
+IDL_GlobalData::in_typedef () const
 {
   return this->in_typedef_;
 }
@@ -1889,7 +1889,7 @@ IDL_GlobalData::in_typedef (bool val)
 }
 
 bool
-IDL_GlobalData::in_tmpl_mod_no_alias (void) const
+IDL_GlobalData::in_tmpl_mod_no_alias () const
 {
   return this->in_tmpl_mod_no_alias_;
 }
@@ -1901,7 +1901,7 @@ IDL_GlobalData::in_tmpl_mod_no_alias (bool val)
 }
 
 bool
-IDL_GlobalData::in_tmpl_mod_alias (void) const
+IDL_GlobalData::in_tmpl_mod_alias () const
 {
   return this->in_tmpl_mod_alias_;
 }
@@ -1953,7 +1953,7 @@ namespace
   {
   public:
     explicit OldState (bool disable_output = false)
-        : old_filename_ (idl_global->filename () ? new UTL_String (idl_global->filename (), true) : 0),
+        : old_filename_ (idl_global->filename () ? new UTL_String (idl_global->filename (), true) : nullptr),
           // need a copy because IDL_GlobalData::set_filename() destroys previous value
           old_lineno_ (idl_global->lineno ()),
           old_idl_src_file_ (idl_global->idl_src_file ()),
@@ -1964,7 +1964,7 @@ namespace
         idl_global->in_eval_ = true;
 
         idl_global->set_lineno (1);
-        idl_global->set_filename (0);
+        idl_global->set_filename (nullptr);
 
         // Name this pseudo-file "builtin-N"
         static char buffer[64];
@@ -1977,7 +1977,7 @@ namespace
 
         if (disable_output_)
           {
-            ACE_DEFAULT_LOG_STREAM->rdbuf (0);
+            ACE_DEFAULT_LOG_STREAM->rdbuf (nullptr);
             ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
             ACE_LOG_MSG->clr_flags (ACE_LOG_MSG->flags ());
          }
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
index 9ee1561e12b..9598bf0aee0 100644
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ b/TAO/TAO_IDL/util/utl_identifier.cpp
@@ -72,29 +72,29 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/streams.h"
 #include "ace/OS_NS_string.h"
 
-Identifier::Identifier (void)
-  : pv_string (0),
+Identifier::Identifier ()
+  : pv_string (nullptr),
     escaped_ (false)
 {
 }
 
 Identifier::Identifier (const char *s)
-  : pv_string (0),
+  : pv_string (nullptr),
     escaped_ (false)
 {
   preprocess_and_replace_string (s);
 }
 
 Identifier::Identifier (const Identifier &other)
-  : pv_string (0),
+  : pv_string (nullptr),
     escaped_ (other.escaped ())
 {
   *this = other;
 }
 
-Identifier::~Identifier (void)
+Identifier::~Identifier ()
 {
-  if (this->pv_string != 0)
+  if (this->pv_string != nullptr)
     {
       ACE::strdelete (this->pv_string);
     }
@@ -103,13 +103,13 @@ Identifier::~Identifier (void)
 // Operations.
 
 char *
-Identifier::get_string (void)
+Identifier::get_string ()
 {
   return this->pv_string;
 }
 
 const char *
-Identifier::get_string (void) const
+Identifier::get_string () const
 {
   return this->pv_string;
 }
@@ -121,7 +121,7 @@ Identifier::replace_string (const char * s)
     {
       delete [] this->pv_string;
     }
-  this->pv_string = s ? ACE::strnew (s) : 0;
+  this->pv_string = s ? ACE::strnew (s) : nullptr;
 }
 
 void
@@ -166,7 +166,7 @@ Identifier::preprocess_and_replace_string (const char * s)
           const TAO_IDL_CPP_Keyword_Entry *entry =
             cpp_key_tbl.lookup (str.c_str (), len);
 
-          if (entry != 0)
+          if (entry != nullptr)
             {
               shift = false;
             }
@@ -206,12 +206,12 @@ Identifier::case_compare_quiet (Identifier *o)
 }
 
 Identifier *
-Identifier::copy (void)
+Identifier::copy ()
 {
-  Identifier *retval = 0;
+  Identifier *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   Identifier (this->pv_string),
-                  0);
+                  nullptr);
 
   retval->escaped_ = this->escaped_;
 
@@ -219,7 +219,7 @@ Identifier::copy (void)
 }
 
 bool
-Identifier::escaped (void) const
+Identifier::escaped () const
 {
   return this->escaped_;
 }
@@ -228,7 +228,7 @@ Identifier::escaped (void) const
 void
 Identifier::dump (ACE_OSTREAM_TYPE &o)
 {
-  if (this->pv_string == 0)
+  if (this->pv_string == nullptr)
     {
       return;
     }
@@ -241,7 +241,7 @@ Identifier::dump (ACE_OSTREAM_TYPE &o)
 }
 
 void
-Identifier::destroy (void)
+Identifier::destroy ()
 {
 }
 
diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp
index c2445916e77..4dbc54f91d5 100644
--- a/TAO/TAO_IDL/util/utl_idlist.cpp
+++ b/TAO/TAO_IDL/util/utl_idlist.cpp
@@ -90,15 +90,15 @@ UTL_IdList::UTL_IdList (Identifier *s,
 
 // Copy an IdList.
 UTL_IdList *
-UTL_IdList::copy (void)
+UTL_IdList::copy ()
 {
-  UTL_IdList *retval = 0;
+  UTL_IdList *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   UTL_IdList (this->head ()->copy (),
-                              0),
-                  0);
+                              nullptr),
+                  nullptr);
 
-  if (this->tail () != 0)
+  if (this->tail () != nullptr)
     {
       retval->nconc ((UTL_IdList *) this->tail ()->copy ());
     }
@@ -108,16 +108,16 @@ UTL_IdList::copy (void)
 
 // Get list item.
 Identifier *
-UTL_IdList::head (void)
+UTL_IdList::head ()
 {
   return this->pd_car_data;
 }
 
 // Get last item of this list.
 Identifier *
-UTL_IdList::last_component (void)
+UTL_IdList::last_component ()
 {
-  if (this->tail () == 0)
+  if (this->tail () == nullptr)
     {
       return this->head ();
     }
@@ -127,7 +127,7 @@ UTL_IdList::last_component (void)
 
 // Get first item of this list holding a non-empty string.
 Identifier *
-UTL_IdList::first_component (void)
+UTL_IdList::first_component ()
 {
   if (ACE_OS::strlen (this->pd_car_data->get_string ()) > 0)
     {
@@ -148,7 +148,7 @@ UTL_IdList::compare (UTL_IdList *other)
     {
       UTL_List *this_tail = this->tail ();
 
-      if (this_tail == 0)
+      if (this_tail == nullptr)
         {
           return 1;
         }
@@ -160,7 +160,7 @@ UTL_IdList::compare (UTL_IdList *other)
     {
       UTL_List *other_tail = other->tail ();
 
-      if (other_tail == 0)
+      if (other_tail == nullptr)
         {
           return 1;
         }
@@ -173,8 +173,8 @@ UTL_IdList::compare (UTL_IdList *other)
       return 1;
    }
 
-  Identifier *this_id = 0;
-  Identifier *other_id = 0;
+  Identifier *this_id = nullptr;
+  Identifier *other_id = nullptr;
 
   for (UTL_IdListActiveIterator this_iter (this), other_iter (other);
        !this_iter.is_done ();
@@ -238,13 +238,13 @@ UTL_IdList::dump (ACE_OSTREAM_TYPE &o)
 }
 
 void
-UTL_IdList::destroy (void)
+UTL_IdList::destroy ()
 {
-  if (this->pd_car_data != 0)
+  if (this->pd_car_data != nullptr)
     {
       this->pd_car_data->destroy ();
       delete this->pd_car_data;
-      this->pd_car_data = 0;
+      this->pd_car_data = nullptr;
     }
 
   this->UTL_List::destroy ();
@@ -262,11 +262,11 @@ UTL_IdListActiveIterator::UTL_IdListActiveIterator (UTL_IdList *s)
 
 // Get current item.
 Identifier *
-UTL_IdListActiveIterator::item (void)
+UTL_IdListActiveIterator::item ()
 {
-    if (this->source == 0)
+    if (this->source == nullptr)
       {
-        return 0;
+        return nullptr;
       }
 
     return ((UTL_IdList *) source)->head ();
diff --git a/TAO/TAO_IDL/util/utl_indenter.cpp b/TAO/TAO_IDL/util/utl_indenter.cpp
index cfe6a9374ea..fc0aefb1c19 100644
--- a/TAO/TAO_IDL/util/utl_indenter.cpp
+++ b/TAO/TAO_IDL/util/utl_indenter.cpp
@@ -74,21 +74,21 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 /*
  * Constructors
  */
-UTL_Indenter::UTL_Indenter (void)
+UTL_Indenter::UTL_Indenter ()
   : pd_indent_level (0)
 {
 }
 
 // Reset indentation level.
 void
-UTL_Indenter::reset (void)
+UTL_Indenter::reset ()
 {
   this->pd_indent_level = 0;
 }
 
 // Increase indentation level.
 void
-UTL_Indenter::increase (void)
+UTL_Indenter::increase ()
 {
   ++this->pd_indent_level;
 }
diff --git a/TAO/TAO_IDL/util/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_labellist.cpp
index f00665cdf06..1d598da3637 100644
--- a/TAO/TAO_IDL/util/utl_labellist.cpp
+++ b/TAO/TAO_IDL/util/utl_labellist.cpp
@@ -88,33 +88,33 @@ UTL_LabelList::UTL_LabelList (AST_UnionLabel *s,
 
 // Get list item.
 AST_UnionLabel *
-UTL_LabelList::head (void)
+UTL_LabelList::head ()
 {
   return this->pd_car_data;
 }
 
 // Copy a label list.
 UTL_LabelList *
-UTL_LabelList::copy (void)
+UTL_LabelList::copy ()
 {
   AST_Expression *val = this->pd_car_data->label_val ();
 
-  AST_Expression *val_copy = 0;
+  AST_Expression *val_copy = nullptr;
   ACE_NEW_RETURN (val_copy,
                   AST_Expression (val, val->ev ()->et),
-                  0);
+                  nullptr);
 
   AST_UnionLabel *label_copy =
     idl_global->gen ()->create_union_label (this->pd_car_data->label_kind (),
                                             val_copy);
 
-  UTL_LabelList *retval = 0;
+  UTL_LabelList *retval = nullptr;
   ACE_NEW_RETURN (retval,
                   UTL_LabelList (label_copy,
-                                 0),
-                  0);
+                                 nullptr),
+                  nullptr);
 
-  if (this->tail () != 0)
+  if (this->tail () != nullptr)
     {
       retval->nconc ((UTL_LabelList *) this->tail ()->copy ());
     }
@@ -123,11 +123,11 @@ UTL_LabelList::copy (void)
 }
 
 void
-UTL_LabelList::destroy (void)
+UTL_LabelList::destroy ()
 {
   this->pd_car_data->destroy ();
   delete this->pd_car_data;
-  this->pd_car_data = 0;
+  this->pd_car_data = nullptr;
 
   this->UTL_List::destroy ();
 }
@@ -139,15 +139,15 @@ UTL_LabellistActiveIterator::UTL_LabellistActiveIterator (UTL_LabelList *s)
 
 // Get current item.
 AST_UnionLabel *
-UTL_LabellistActiveIterator::item (void)
+UTL_LabellistActiveIterator::item ()
 {
-  if (this->source == 0)
+  if (this->source == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   UTL_LabelList *llist = dynamic_cast<UTL_LabelList *> (this->source);
 
-  return (llist != 0 ? llist->head () : 0);
+  return (llist != nullptr ? llist->head () : nullptr);
 }
 
diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp
index 6e5a60e188f..e3f2672cd74 100644
--- a/TAO/TAO_IDL/util/utl_list.cpp
+++ b/TAO/TAO_IDL/util/utl_list.cpp
@@ -78,7 +78,7 @@ UTL_List::UTL_List (UTL_List *c)
 {
 }
 
-UTL_List::~UTL_List (void)
+UTL_List::~UTL_List ()
 {
 }
 
@@ -86,7 +86,7 @@ UTL_List::~UTL_List (void)
 ACE_CDR::Long
 UTL_List::list_length (ACE_CDR::Long n)
 {
-  if (this->pd_cdr_data == 0)
+  if (this->pd_cdr_data == nullptr)
     {
       return n;
     }
@@ -100,7 +100,7 @@ UTL_List::list_length (ACE_CDR::Long n)
 void
 UTL_List::nconc (UTL_List *l)
 {
-  if (this->pd_cdr_data == 0)
+  if (this->pd_cdr_data == nullptr)
     {
       this->pd_cdr_data = l;
     }
@@ -112,21 +112,21 @@ UTL_List::nconc (UTL_List *l)
 
 // Override this operation to copy lists of other types.
 UTL_List *
-UTL_List::copy (void)
+UTL_List::copy ()
 {
-  UTL_List *retval = 0;
+  UTL_List *retval = nullptr;
 
-  if (this->pd_cdr_data == 0)
+  if (this->pd_cdr_data == nullptr)
     {
       ACE_NEW_RETURN (retval,
-                      UTL_List (0),
-                      0);
+                      UTL_List (nullptr),
+                      nullptr);
     }
   else
     {
       ACE_NEW_RETURN (retval,
                       UTL_List (this->pd_cdr_data->copy ()),
-                      0);
+                      nullptr);
     }
 
   return retval;
@@ -134,7 +134,7 @@ UTL_List::copy (void)
 
 // Get next list.
 UTL_List *
-UTL_List::tail (void)
+UTL_List::tail ()
 {
   return pd_cdr_data;
 }
@@ -150,19 +150,19 @@ UTL_List::set_tail (UTL_List *l)
 
 // Compute list length.
 ACE_CDR::Long
-UTL_List::length (void)
+UTL_List::length ()
 {
   return list_length (1);
 }
 
 void
-UTL_List::destroy (void)
+UTL_List::destroy ()
 {
-  if (this->pd_cdr_data != 0)
+  if (this->pd_cdr_data != nullptr)
     {
       this->pd_cdr_data->destroy ();
       delete this->pd_cdr_data;
-      this->pd_cdr_data = 0;
+      this->pd_cdr_data = nullptr;
     }
 }
 
@@ -175,16 +175,16 @@ UTL_ListActiveIterator::UTL_ListActiveIterator (UTL_List *s)
 
 // Is iterator done?
 bool
-UTL_ListActiveIterator::is_done (void)
+UTL_ListActiveIterator::is_done ()
 {
-  return (this->source == 0) ? true : false;
+  return (this->source == nullptr) ? true : false;
 }
 
 // Advance to next item.
 void
-UTL_ListActiveIterator::next (void)
+UTL_ListActiveIterator::next ()
 {
-  if (this->source != 0)
+  if (this->source != nullptr)
     {
       this->source = this->source->tail ();
     }
diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp
index b41b655bbc8..1b3413a21a4 100644
--- a/TAO/TAO_IDL/util/utl_namelist.cpp
+++ b/TAO/TAO_IDL/util/utl_namelist.cpp
@@ -82,13 +82,13 @@ UTL_NameList::UTL_NameList (UTL_ScopedName *s,
 
 // Get list item.
 UTL_ScopedName *
-UTL_NameList::head (void)
+UTL_NameList::head ()
 {
   return this->pd_car_data;
 }
 
 bool
-UTL_NameList::truncatable (void) const
+UTL_NameList::truncatable () const
 {
   return this->pd_truncatable;
 }
@@ -100,11 +100,11 @@ UTL_NameList::truncatable (bool val)
 }
 
 void
-UTL_NameList::destroy (void)
+UTL_NameList::destroy ()
 {
   this->pd_car_data->destroy ();
   delete this->pd_car_data;
-  this->pd_car_data = 0;
+  this->pd_car_data = nullptr;
 
   this->UTL_List::destroy ();
 }
@@ -116,11 +116,11 @@ UTL_NamelistActiveIterator::UTL_NamelistActiveIterator (UTL_NameList *s)
 
 // Get current item.
 UTL_ScopedName *
-UTL_NamelistActiveIterator::item (void)
+UTL_NamelistActiveIterator::item ()
 {
-  if (source == 0)
+  if (source == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   return ((UTL_NameList *) source)->head ();
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 347182d76f6..1ed63df688b 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -120,46 +120,46 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 //  Constructors.
 
-UTL_Scope::UTL_Scope (void)
+UTL_Scope::UTL_Scope ()
   : pd_scope_node_type (AST_Decl::NT_module),
-    pd_decls (0),
+    pd_decls (nullptr),
     pd_decls_allocated (0),
     pd_decls_used (0),
-    pd_local_types (0),
+    pd_local_types (nullptr),
     pd_locals_allocated (0),
     pd_locals_used (0),
-    pd_referenced (0),
+    pd_referenced (nullptr),
     pd_referenced_allocated (0),
     pd_referenced_used (0),
-    pd_name_referenced (0),
+    pd_name_referenced (nullptr),
     pd_name_referenced_allocated (0),
     pd_name_referenced_used (0),
-    has_prefix_ (0),
+    has_prefix_ (false),
     which_pseudo_ (PSEUDO_ABSTRACTBASE)
 {
 }
 
 UTL_Scope::UTL_Scope (AST_Decl::NodeType nt)
   : pd_scope_node_type (nt),
-    pd_decls (0),
+    pd_decls (nullptr),
     pd_decls_allocated (0),
     pd_decls_used (0),
-    pd_local_types (0),
+    pd_local_types (nullptr),
     pd_locals_allocated (0),
     pd_locals_used (0),
-    pd_referenced (0),
+    pd_referenced (nullptr),
     pd_referenced_allocated (0),
     pd_referenced_used (0),
-    pd_name_referenced (0),
+    pd_name_referenced (nullptr),
     pd_name_referenced_allocated (0),
     pd_name_referenced_used (0),
-    has_prefix_ (0),
+    has_prefix_ (false),
     which_pseudo_ (PSEUDO_ABSTRACTBASE)
 {
 }
 
 // Destructor.
-UTL_Scope::~UTL_Scope (void)
+UTL_Scope::~UTL_Scope ()
 {
   for (UTL_ScopeActiveIterator iter (this, IK_both);
        !iter.is_done ();
@@ -185,7 +185,7 @@ UTL_Scope::~UTL_Scope (void)
 }
 
 void
-UTL_Scope::destroy (void)
+UTL_Scope::destroy ()
 {
   for (UTL_ScopeActiveIterator iter (this, IK_both);
        !iter.is_done ();
@@ -197,17 +197,17 @@ UTL_Scope::destroy (void)
     }
 
   delete [] this->pd_decls;
-  this->pd_decls = 0;
+  this->pd_decls = nullptr;
   this->pd_decls_allocated = 0;
   this->pd_decls_used = 0;
 
   delete [] this->pd_local_types;
-  this->pd_local_types = 0;
+  this->pd_local_types = nullptr;
   this->pd_locals_allocated = 0;
   this->pd_locals_used = 0;
 
   delete [] this->pd_referenced;
-  this->pd_referenced = 0;
+  this->pd_referenced = nullptr;
   this->pd_referenced_allocated = 0;
   this->pd_referenced_used = 0;
 
@@ -219,7 +219,7 @@ UTL_Scope::destroy (void)
     }
 
   delete [] this->pd_name_referenced;
-  this->pd_name_referenced = 0;
+  this->pd_name_referenced = nullptr;
   this->pd_name_referenced_allocated = 0;
   this->pd_name_referenced_used = 0;
 }
@@ -234,13 +234,13 @@ UTL_Scope::lookup_for_add (AST_Decl *d)
 {
   if (!d)
     {
-      return 0;
+      return nullptr;
     }
 
   Identifier *id = d->local_name ();
   if (this->idl_keyword_clash (id))
     {
-      return 0;
+      return nullptr;
     }
 
   return this->lookup_by_name_local (id, false);
@@ -337,7 +337,7 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
       return;
     }
 
-  AST_Type *bt = 0;
+  AST_Type *bt = nullptr;
   AST_Decl::NodeType nt = d->node_type ();
 
   // We are interested only in members, arguments and typedefs.
@@ -347,11 +347,11 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
     case AST_Decl::NT_union_branch:
     case AST_Decl::NT_attr:
     case AST_Decl::NT_argument:
-      bt = AST_Field::narrow_from_decl (d)->field_type ();
+      bt = dynamic_cast<AST_Field*> (d)->field_type ();
       break;
 
     case AST_Decl::NT_typedef:
-      bt = AST_Typedef::narrow_from_decl (d)->base_type ();
+      bt = dynamic_cast<AST_Typedef*> (d)->base_type ();
       break;
 
     default:
@@ -364,7 +364,7 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
       return;
     }
 
-  bt = AST_Typedef::narrow_from_decl (bt)->base_type ();
+  bt = dynamic_cast<AST_Typedef*> (bt)->base_type ();
   nt = bt->node_type ();
 
   // Must be a sequence with only one level of typedef.
@@ -381,7 +381,7 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
     }
 
   // We know this narrowing will be successful.
-  bt = AST_Sequence::narrow_from_decl (bt)->base_type ();
+  bt = dynamic_cast<AST_Sequence*> (bt)->base_type ();
   nt = bt->node_type ();
 
   // First check for string or wstring base type.
@@ -398,7 +398,7 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
     }
 
   // Now check for predefined base type.
-  AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (bt);
+  AST_PredefinedType *pdt = dynamic_cast<AST_PredefinedType*> (bt);
   if (!pdt)
     {
       return;
@@ -480,7 +480,7 @@ UTL_Scope::fe_add_decl (AST_Decl *t)
   // Already defined and cannot be redefined? Or already used?
   AST_Decl *d = this->lookup_for_add (t);
 
-  if (d != 0)
+  if (d != nullptr)
     {
       if (!FE_Utils::can_be_redefined (d, t))
         {
@@ -488,7 +488,7 @@ UTL_Scope::fe_add_decl (AST_Decl *t)
                                       t,
                                       ScopeAsDecl (this),
                                       d);
-          return 0;
+          return nullptr;
         }
 
       // For convenience, AST_Template_Module_Inst inherits
@@ -510,23 +510,23 @@ UTL_Scope::fe_add_decl (AST_Decl *t)
                                       t,
                                       ScopeAsDecl (this),
                                       d);
-          return 0;
+          return nullptr;
         }
 
       if (t->has_ancestor (d))
         {
           idl_global->err ()->redefinition_in_scope (t, d);
-          return 0;
+          return nullptr;
         }
     }
   else if (this->inherited_op_attr_clash (t))
     {
-      return 0;
+      return nullptr;
     }
 
   if (this->arg_specific_error (t))
     {
-      return 0;
+      return nullptr;
     }
 
   this->smart_local_add (t);
@@ -562,13 +562,13 @@ UTL_Scope::fe_add_ref_decl (AST_Field *t)
 
   // Catches struct/union/exception which all maintain a queue
   // for fields as distinct from decls and enum values.
-  AST_Structure *s = AST_Structure::narrow_from_scope (this);
+  AST_Structure *s = dynamic_cast<AST_Structure*> (this);
   if (s)
     {
       s->fields ().enqueue_tail (t);
     }
 
-  return AST_Field::narrow_from_decl (d);
+  return dynamic_cast<AST_Field*> (d);
 }
 
 AST_Structure *
@@ -584,7 +584,7 @@ UTL_Scope::fe_add_full_struct_type (AST_Structure *t)
                                       t,
                                       ScopeAsDecl (this),
                                       predef);
-          return 0;
+          return nullptr;
         }
 
       if (referenced (predef, t->local_name ()) && !t->is_defined ())
@@ -593,7 +593,7 @@ UTL_Scope::fe_add_full_struct_type (AST_Structure *t)
                                       t,
                                       ScopeAsDecl (this),
                                       predef);
-          return 0;
+          return nullptr;
         }
     }
 
@@ -634,7 +634,7 @@ UTL_Scope::fe_add_fwd_struct_type (AST_StructureFwd *t)
       // value, but the result is what we want.
       if (d->node_type () == AST_Decl::NT_struct)
         {
-          t->set_full_definition (AST_Structure::narrow_from_decl (d));
+          t->set_full_definition (dynamic_cast<AST_Structure*> (d));
         }
       else if (!FE_Utils::can_be_redefined (d, t))
         {
@@ -642,7 +642,7 @@ UTL_Scope::fe_add_fwd_struct_type (AST_StructureFwd *t)
                                       t,
                                       ScopeAsDecl (this),
                                       d);
-          return 0;
+          return nullptr;
         }
       else if (this->referenced (d, t->local_name ()))
         {
@@ -650,7 +650,7 @@ UTL_Scope::fe_add_fwd_struct_type (AST_StructureFwd *t)
                                       t,
                                       ScopeAsDecl (this),
                                       d);
-          return 0;
+          return nullptr;
         }
     }
 
@@ -671,271 +671,271 @@ UTL_Scope::fe_add_fwd_struct_type (AST_StructureFwd *t)
 AST_PredefinedType *
 UTL_Scope::fe_add_predefined_type (AST_PredefinedType *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Module *
 UTL_Scope::fe_add_module (AST_Module *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Template_Module_Inst *
 UTL_Scope::fe_add_template_module_inst (AST_Template_Module_Inst *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Template_Module_Ref *
 UTL_Scope::fe_add_template_module_ref (AST_Template_Module_Ref *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Interface *
 UTL_Scope::fe_add_interface (AST_Interface *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_InterfaceFwd *
 UTL_Scope::fe_add_interface_fwd (AST_InterfaceFwd *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_ValueBox *
 UTL_Scope::fe_add_valuebox (AST_ValueBox *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_ValueType *
 UTL_Scope::fe_add_valuetype (AST_ValueType *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_ValueTypeFwd *
 UTL_Scope::fe_add_valuetype_fwd (AST_ValueTypeFwd *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_EventType *
 UTL_Scope::fe_add_eventtype (AST_EventType *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_EventTypeFwd *
 UTL_Scope::fe_add_eventtype_fwd (AST_EventTypeFwd *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Component *
 UTL_Scope::fe_add_component (AST_Component *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_ComponentFwd *
 UTL_Scope::fe_add_component_fwd (AST_ComponentFwd *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Home *
 UTL_Scope::fe_add_home (AST_Home *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Exception *
 UTL_Scope::fe_add_exception (AST_Exception *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Constant *
 UTL_Scope::fe_add_constant (AST_Constant *)
 {
-  return 0;
+  return nullptr;
 }
 
 UTL_StrList *
 UTL_Scope::fe_add_context (UTL_StrList *)
 {
-  return 0;
+  return nullptr;
 }
 
 UTL_NameList *
 UTL_Scope::fe_add_exceptions (UTL_NameList *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Attribute *
 UTL_Scope::fe_add_attribute (AST_Attribute *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Operation *
 UTL_Scope::fe_add_operation (AST_Operation *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Argument *
 UTL_Scope::fe_add_argument (AST_Argument *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Union *
 UTL_Scope::fe_add_union (AST_Union *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_UnionFwd *
 UTL_Scope::fe_add_union_fwd (AST_UnionFwd *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_UnionBranch *
 UTL_Scope::fe_add_union_branch (AST_UnionBranch *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Structure *
 UTL_Scope::fe_add_structure (AST_Structure *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_StructureFwd *
 UTL_Scope::fe_add_structure_fwd (AST_StructureFwd *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Field *
 UTL_Scope::fe_add_field (AST_Field *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Enum *
 UTL_Scope::fe_add_enum (AST_Enum *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_EnumVal *
 UTL_Scope::fe_add_enum_val (AST_EnumVal *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Typedef *
 UTL_Scope::fe_add_typedef (AST_Typedef *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Sequence *
 UTL_Scope::fe_add_sequence (AST_Sequence *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_String *
 UTL_Scope::fe_add_string (AST_String *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Array *
 UTL_Scope::fe_add_array (AST_Array *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Native *
 UTL_Scope::fe_add_native (AST_Native *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Factory *
 UTL_Scope::fe_add_factory (AST_Factory *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Finder *
 UTL_Scope::fe_add_finder (AST_Finder *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_PortType *
 UTL_Scope::fe_add_porttype (AST_PortType *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Provides *
 UTL_Scope::fe_add_provides (AST_Provides *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Uses *
 UTL_Scope::fe_add_uses (AST_Uses *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Publishes *
 UTL_Scope::fe_add_publishes (AST_Publishes *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Emits *
 UTL_Scope::fe_add_emits (AST_Emits *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Consumes *
 UTL_Scope::fe_add_consumes (AST_Consumes *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Extended_Port *
 UTL_Scope::fe_add_extended_port (AST_Extended_Port *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Mirror_Port *
 UTL_Scope::fe_add_mirror_port (AST_Mirror_Port *)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Connector *
 UTL_Scope::fe_add_connector (AST_Connector *)
 {
-  return 0;
+  return nullptr;
 }
 
 // Private lookup mechanism.
@@ -946,10 +946,10 @@ UTL_Scope::lookup_pseudo (Identifier *e)
 {
   if (e->escaped ())
     {
-      return 0;
+      return nullptr;
     }
 
-  bool *seen = 0;
+  bool *seen = nullptr;
   char *name_string = e->get_string ();
   UTL_Scope *start_scope = idl_global->corba_module ();
 
@@ -977,7 +977,7 @@ UTL_Scope::lookup_pseudo (Identifier *e)
     }
   else
     {
-      return 0;
+      return nullptr;
     }
 
   for (UTL_ScopeActiveIterator i (start_scope, IK_decls);
@@ -1003,7 +1003,7 @@ UTL_Scope::lookup_pseudo (Identifier *e)
     {
       AST_Decl *d = this->look_in_prev_mods_local (e);
 
-      if (d != 0)
+      if (d != nullptr)
         {
           // Generation of #includes for Typecode.h
           // checks this bit, so we set it for TCKind as well.
@@ -1012,14 +1012,14 @@ UTL_Scope::lookup_pseudo (Identifier *e)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 AST_Decl *
 UTL_Scope::look_in_prev_mods_local (Identifier *,
                                     bool /* ignore_fwd */)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Decl *
@@ -1027,7 +1027,7 @@ UTL_Scope::special_lookup (UTL_ScopedName *,
                            bool /* full_def_only */,
                            AST_Decl *&/*final_parent_decl*/)
 {
-  return 0;
+  return nullptr;
 }
 
 // Lookup the node for a primitive (built-in) type.
@@ -1043,7 +1043,7 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et)
   /// for the ExprType.
   if (pdt == AST_PredefinedType::PT_pseudo)
     {
-      return 0;
+      return nullptr;
     }
 
   /// The only 'predefined type' not in the CORBA module.
@@ -1061,7 +1061,7 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et)
       if (as_decl->node_type () == AST_Decl::NT_pre_defined)
         {
           AST_PredefinedType *t =
-            AST_PredefinedType::narrow_from_decl (as_decl);
+            dynamic_cast<AST_PredefinedType*> (as_decl);
 
           if (t->pt () == pdt)
             {
@@ -1085,7 +1085,7 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Look through inherited list. Overridden in AST_Interface.
@@ -1093,7 +1093,7 @@ AST_Decl *
 UTL_Scope::look_in_inherited (UTL_ScopedName *,
                               bool )
 {
-  return 0;
+  return nullptr;
 }
 
 // Look through supported interface list. Overridden where necessary.
@@ -1101,7 +1101,7 @@ AST_Decl *
 UTL_Scope::look_in_supported (UTL_ScopedName *,
                               bool)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Decl *
@@ -1120,7 +1120,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
 
   if (this->idl_keyword_clash (e))
     {
-      return 0;
+      return nullptr;
     }
 
   bool in_corba = (ACE_OS::strcmp (e->get_string (), "CORBA") == 0);
@@ -1133,11 +1133,11 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
     {
       d = i.item ()->adjust_found (true, full_def_only);
 
-      if (d != 0)
+      if (d != nullptr)
         {
           Identifier *item_name = d->local_name ();
 
-          if (item_name != 0
+          if (item_name != nullptr
           // Right now we populate the global scope with all the CORBA basic
           // types, so something like 'ULong' in an IDL file will find a
           // match, unless we skip over these items. This is a workaround until
@@ -1153,7 +1153,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
 
   // Ok the name wasn't found in the current scope, if this
   // scope is a module, we can check it's previous openings!
-  AST_Module *m = AST_Module::narrow_from_scope (this);
+  AST_Module *m = dynamic_cast<AST_Module*> (this);
   if (m)
     {
       d = m->look_in_prev_mods_local (e);
@@ -1166,7 +1166,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
     {
       // Or if this scope is an interface, we can check if
       // it was inherited!
-      AST_Interface *i = AST_Interface::narrow_from_scope (this);
+      AST_Interface *i = dynamic_cast<AST_Interface*> (this);
       if (i)
         {
           d = i->look_in_inherited_local (e);
@@ -1192,7 +1192,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 AST_Decl *
@@ -1203,7 +1203,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
   // Empty name? Exit immediately.
   if (!e)
     {
-      return 0;
+      return nullptr;
     }
 
   UTL_Scope *work = this;
@@ -1219,7 +1219,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
       UTL_List* tail = e->tail ();
       if (!tail)
         {
-          return 0;
+          return nullptr;
         }
       // Remove the preceeding "::" or "" from the scopename
       e = static_cast<UTL_ScopedName *> (tail);
@@ -1229,21 +1229,21 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
       work = idl_global->root ();
     }
 
-  AST_Decl *first_found_final_parent_decl = 0;
+  AST_Decl *first_found_final_parent_decl = nullptr;
   const bool searching_module_path = (e->length () != 1);
   AST_Decl *d = searching_module_path ?
     work->lookup_by_name_r (e, full_def_only, first_found_final_parent_decl) :
     work->lookup_by_name_r (e, full_def_only);
-  if (d == 0)
+  if (d == nullptr)
     {
       // If all else fails, look though each outer scope.
       for (UTL_Scope *outer = ScopeAsDecl (work)->defined_in ();
            outer;
            outer = ScopeAsDecl (outer)->defined_in ())
         {
-          AST_Decl *next_found_final_parent_decl= 0;
+          AST_Decl *next_found_final_parent_decl= nullptr;
           d = outer->lookup_by_name_r (e, full_def_only, next_found_final_parent_decl);
-          if (d != 0)
+          if (d != nullptr)
             {
               work = outer;
               if (first_found_final_parent_decl)
@@ -1252,7 +1252,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                   // find this one because the "first_found_final_parent_decl" was found and
                   // this one just found is hidden by it.
                   idl_global->err ()->scope_masking_error (d, first_found_final_parent_decl);
-                  d = 0; // Ignore this one; continue searching to report other ambiguous matches.
+                  d = nullptr; // Ignore this one; continue searching to report other ambiguous matches.
                 }
               else
                 {
@@ -1279,7 +1279,7 @@ AST_Decl *
 UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
                              bool full_def_only)
 {
-  AST_Decl *ignored= 0;
+  AST_Decl *ignored= nullptr;
   return UTL_Scope::lookup_by_name_r (e, full_def_only, ignored);
 }
 
@@ -1290,7 +1290,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
 {
   bool work_another_level;
   UTL_Scope *work = this;
-  final_parent_decl= (e->length () == 1) ? ScopeAsDecl (work) : 0;
+  final_parent_decl= (e->length () == 1) ? ScopeAsDecl (work) : nullptr;
 
   do
     {
@@ -1306,7 +1306,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
 
       if (work->idl_keyword_clash (e->head ()))
         {
-          return 0;
+          return nullptr;
         }
 
       // Before proceeding to normal lookup, check if the name
@@ -1361,7 +1361,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
                   work = next;
                   work_another_level = true;
                   e = static_cast<UTL_ScopedName *> (e->tail ());
-                  final_parent_decl= (e->length () == 1) ? d : 0;
+                  final_parent_decl= (e->length () == 1) ? d : nullptr;
                   break;
                 }
 
@@ -1413,7 +1413,7 @@ UTL_Scope::add_to_referenced (AST_Decl *e,
   if (   nt == AST_Decl::NT_interface
       || nt == AST_Decl::NT_component)
     {
-      AST_Interface *itf = AST_Interface::narrow_from_decl (e);
+      AST_Interface *itf = dynamic_cast<AST_Interface*> (e);
       if (itf
           && itf->defined_in () == this
           && !itf->is_defined ())
@@ -1437,7 +1437,7 @@ UTL_Scope::add_to_referenced (AST_Decl *e,
       long oreferenced_allocated = this->pd_referenced_allocated;
       this->pd_referenced_allocated += INCREMENT;
 
-      AST_Decl **tmp = 0;
+      AST_Decl **tmp = nullptr;
       ACE_NEW (tmp, AST_Decl *[this->pd_referenced_allocated]);
 
       for (long i = 0; i < oreferenced_allocated; ++i)
@@ -1495,7 +1495,7 @@ UTL_Scope::add_to_name_referenced (Identifier *id)
       long name_referenced_allocated = this->pd_name_referenced_allocated;
       this->pd_name_referenced_allocated += INCREMENT;
 
-      Identifier **name_tmp = 0;
+      Identifier **name_tmp = nullptr;
       ACE_NEW (name_tmp, Identifier *[this->pd_name_referenced_allocated]);
 
       for (long i = 0; i < name_referenced_allocated; ++i)
@@ -1694,7 +1694,7 @@ UTL_Scope::add_to_local_types (AST_Decl *e)
       long olocals_allocated = this->pd_locals_allocated;
       this->pd_locals_allocated += INCREMENT;
 
-      AST_Decl **tmp = 0;
+      AST_Decl **tmp = nullptr;
       ACE_NEW (tmp, AST_Decl *[this->pd_locals_allocated]);
       for (long i = 0; i < olocals_allocated; ++i)
         {
@@ -1795,7 +1795,7 @@ UTL_Scope::referenced (AST_Decl *e,
 }
 
 bool
-UTL_Scope::has_prefix (void)
+UTL_Scope::has_prefix ()
 {
   return this->has_prefix_;
 }
@@ -1814,7 +1814,7 @@ UTL_Scope::dump (ACE_OSTREAM_TYPE &o)
 {
   if (!idl_global->indent ())
     {
-      UTL_Indenter *idnt = 0;
+      UTL_Indenter *idnt = nullptr;
       ACE_NEW (idnt, UTL_Indenter);
       idl_global->set_indent (idnt);
     }
@@ -1871,7 +1871,7 @@ UTL_Scope::ast_accept (ast_visitor *visitor)
 
 // How many entries are defined?
 unsigned long
-UTL_Scope::nmembers (void)
+UTL_Scope::nmembers ()
 {
   return this->pd_decls_used;
 }
@@ -1884,25 +1884,25 @@ UTL_Scope::match_param (UTL_ScopedName *e)
   FE_Utils::T_PARAMLIST_INFO const *params =
     idl_global->current_params ();
 
-  if (params == 0)
+  if (params == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   const char *name = e->first_component ()->get_string ();
-  FE_Utils::T_Param_Info *param = 0;
+  FE_Utils::T_Param_Info *param = nullptr;
   unsigned long index = 0;
 
   UTL_StrList *alias_params =
     const_cast<UTL_StrList *> (idl_global->for_new_holder ());
 
-  if (alias_params == 0)
+  if (alias_params == nullptr)
     {
       alias_params =
         const_cast<UTL_StrList *> (idl_global->alias_params ());
     }
 
-  UTL_String *alias_param = 0;
+  UTL_String *alias_param = nullptr;
 
   for (FE_Utils::T_PARAMLIST_INFO::CONST_ITERATOR i (*params);
        i.next (param);
@@ -1913,7 +1913,7 @@ UTL_Scope::match_param (UTL_ScopedName *e)
           /// If we are parsing this template module as a
           /// reference, the param holder we create must have
           /// the name of the corresponding aliased param.
-          if (alias_params != 0)
+          if (alias_params != nullptr)
             {
               unsigned long slot = 0;
 
@@ -1928,7 +1928,7 @@ UTL_Scope::match_param (UTL_ScopedName *e)
                     }
                 }
 
-              if (alias_param == 0)
+              if (alias_param == nullptr)
                 {
                   ACE_ERROR_RETURN ((LM_ERROR,
                                      ACE_TEXT ("UTL_Scope::match_param - ")
@@ -1937,7 +1937,7 @@ UTL_Scope::match_param (UTL_ScopedName *e)
                 }
 
               Identifier id (alias_param->get_string ());
-              UTL_ScopedName sn (&id, 0);
+              UTL_ScopedName sn (&id, nullptr);
 
               return
                 idl_global->gen ()->create_param_holder (
@@ -1954,13 +1954,13 @@ UTL_Scope::match_param (UTL_ScopedName *e)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 bool
 UTL_Scope::inherited_op_attr_clash (AST_Decl *t)
 {
-  AST_Interface *i = AST_Interface::narrow_from_scope (this);
+  AST_Interface *i = dynamic_cast<AST_Interface*> (this);
   if (!i)
     {
       return false;
@@ -1987,13 +1987,13 @@ UTL_Scope::inherited_op_attr_clash (AST_Decl *t)
 bool
 UTL_Scope::arg_specific_error (AST_Decl *t)
 {
-  AST_Operation *op = AST_Operation::narrow_from_scope (this);
+  AST_Operation *op = dynamic_cast<AST_Operation*> (this);
   if (!op)
     {
       return false;
     }
 
-  AST_Argument *arg = AST_Argument::narrow_from_decl (t);
+  AST_Argument *arg = dynamic_cast<AST_Argument*> (t);
   AST_Argument::Direction d = arg->direction ();
 
   // Cannot add OUT or INOUT argument to oneway operation.
@@ -2023,10 +2023,10 @@ void
 UTL_Scope::smart_local_add (AST_Decl *t)
 {
   // Catches struct, union * exception
-  AST_Structure *s = AST_Structure::narrow_from_scope (this);
+  AST_Structure *s = dynamic_cast<AST_Structure*> (this);
 
   // Catches AST_Field and AST_UnionBranch.
-  AST_Field *f = AST_Field::narrow_from_decl (t);
+  AST_Field *f = dynamic_cast<AST_Field*> (t);
 
   // Decls inside a struct/union/exception are also referenced by
   // fields, and so must be handled differently.
@@ -2042,8 +2042,8 @@ UTL_Scope::smart_local_add (AST_Decl *t)
   // If we have an enum discriminator, add the label names to
   // the name_referenced list before we add the union branch,
   // so a branch name clash with a label name will be caught.
-  AST_Union *u = AST_Union::narrow_from_scope (this);
-  AST_UnionBranch *ub = AST_UnionBranch::narrow_from_decl (t);
+  AST_Union *u = dynamic_cast<AST_Union*> (this);
+  AST_UnionBranch *ub = dynamic_cast<AST_UnionBranch*> (t);
   if (u && ub)
     {
       if (u->udisc_type () == AST_Expression::EV_enum)
@@ -2066,7 +2066,7 @@ UTL_Scope::is_global_name (Identifier *i)
       return false;
     }
 
-  ACE_CString cmp (i->get_string (), 0, false);
+  ACE_CString cmp (i->get_string (), nullptr, false);
   return (cmp == "" || cmp == "::");
 }
 
@@ -2078,10 +2078,10 @@ UTL_Scope::iter_lookup_by_name_local (AST_Decl *d,
   // Remove all the layers of typedefs.
   while (d && d->node_type () == AST_Decl::NT_typedef)
     {
-      AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+      AST_Typedef *td = dynamic_cast<AST_Typedef*> (d);
       if (!td)
         {
-          return 0;
+          return nullptr;
         }
 
       d = td->base_type ();
@@ -2089,17 +2089,17 @@ UTL_Scope::iter_lookup_by_name_local (AST_Decl *d,
 
   if (!d)
     {
-      return 0;
+      return nullptr;
     }
 
   // Try to convert the AST_Decl to a UTL_Scope.
   UTL_Scope *sc = DeclAsScope (d);
   if (!sc)
     {
-      return 0;
+      return nullptr;
     }
 
-  AST_Decl *result = 0;
+  AST_Decl *result = nullptr;
   if (0 < sc->nmembers ())
     {
       // Look up the first component of the scoped name.
@@ -2108,7 +2108,7 @@ UTL_Scope::iter_lookup_by_name_local (AST_Decl *d,
     }
   else
     {
-      AST_Interface *i = AST_Interface::narrow_from_decl (d);
+      AST_Interface *i = dynamic_cast<AST_Interface*> (d);
       result = i ? i->look_in_inherited_local (e->head ())
                  : sc->look_in_prev_mods_local (e->head (), true);
     }
@@ -2132,8 +2132,6 @@ UTL_Scope::iter_lookup_by_name_local (AST_Decl *d,
   return result;
 }
 
-IMPL_NARROW_FROM_SCOPE(UTL_Scope)
-
 // UTL_SCOPE_ACTIVE_ITERATOR
 
 // Constructor.
@@ -2152,18 +2150,18 @@ UTL_ScopeActiveIterator::UTL_ScopeActiveIterator (
 
 // Advance to next item.
 void
-UTL_ScopeActiveIterator::next (void)
+UTL_ScopeActiveIterator::next ()
 {
   this->il++;
 }
 
 // Get current item.
 AST_Decl *
-UTL_ScopeActiveIterator::item (void)
+UTL_ScopeActiveIterator::item ()
 {
   if (this->is_done ())
     {
-      return 0;
+      return nullptr;
     }
 
   if (stage == UTL_Scope::IK_decls)
@@ -2176,12 +2174,12 @@ UTL_ScopeActiveIterator::item (void)
       return this->iter_source->pd_local_types[il];
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Is this iteration done?
 bool
-UTL_ScopeActiveIterator::is_done (void)
+UTL_ScopeActiveIterator::is_done ()
 {
   long limit =
     (stage == UTL_Scope::IK_decls)
@@ -2217,14 +2215,14 @@ UTL_ScopeActiveIterator::is_done (void)
 
 // What kind of iterator is this?
 UTL_Scope::ScopeIterationKind
-UTL_ScopeActiveIterator::iteration_kind (void)
+UTL_ScopeActiveIterator::iteration_kind ()
 {
   return this->ik;
 }
 
 // And where are we in the iteration?
 UTL_Scope::ScopeIterationKind
-UTL_ScopeActiveIterator::iteration_stage (void)
+UTL_ScopeActiveIterator::iteration_stage ()
 {
   return this->stage;
 }
@@ -2232,19 +2230,19 @@ UTL_ScopeActiveIterator::iteration_stage (void)
 AST_Annotation_Decl *
 UTL_Scope::fe_add_annotation_decl (AST_Annotation_Decl * /*annotation_decl*/)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Annotation_Member *
 UTL_Scope::fe_add_annotation_member (AST_Annotation_Member * /*annotation_member*/)
 {
-  return 0;
+  return nullptr;
 }
 
 AST_Decl *
 UTL_Scope::lookup_by_name (const char *name)
 {
-  AST_Decl *node = 0;
+  AST_Decl *node = nullptr;
   UTL_ScopedName *scoped_name = FE_Utils::string_to_scoped_name (name);
   node = lookup_by_name (scoped_name);
   scoped_name->destroy ();
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
index c2faa7df607..dd93042e7fa 100644
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ b/TAO/TAO_IDL/util/utl_stack.cpp
@@ -70,16 +70,16 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 const size_t UTL_ScopeStack::increments = 64;
 
-UTL_ScopeStack::UTL_ScopeStack (void)
+UTL_ScopeStack::UTL_ScopeStack ()
   : pd_stack_data_nalloced (increments),
     pd_stack_top (0)
 {
   ACE_NEW (this->pd_stack_data, UTL_Scope *[increments]);
 }
 
-UTL_ScopeStack::~UTL_ScopeStack (void)
+UTL_ScopeStack::~UTL_ScopeStack ()
 {
-  if (this->pd_stack_data != 0)
+  if (this->pd_stack_data != nullptr)
     {
       delete [] this->pd_stack_data;
     }
@@ -89,7 +89,7 @@ UTL_ScopeStack::~UTL_ScopeStack (void)
 UTL_ScopeStack *
 UTL_ScopeStack::push (UTL_Scope *el)
 {
-  UTL_Scope **tmp = 0;
+  UTL_Scope **tmp = nullptr;
   long ostack_data_nalloced;
   long i;
 
@@ -101,7 +101,7 @@ UTL_ScopeStack::push (UTL_Scope *el)
 
       ACE_NEW_RETURN (tmp,
                       UTL_Scope *[this->pd_stack_data_nalloced],
-                      0);
+                      nullptr);
 
       for (i = 0; i < ostack_data_nalloced; ++i)
         {
@@ -120,7 +120,7 @@ UTL_ScopeStack::push (UTL_Scope *el)
 
 // Pop an element from the stack.
 void
-UTL_ScopeStack::pop (void)
+UTL_ScopeStack::pop ()
 {
   if (this->pd_stack_top <= 0)
     {
@@ -131,9 +131,9 @@ UTL_ScopeStack::pop (void)
 
   // If our top scope has a #pragma prefix associated with it,
   // it goes away with the scope.
-  if (current != 0 && current->has_prefix ())
+  if (current != nullptr && current->has_prefix ())
     {
-      char *trash = 0;
+      char *trash = nullptr;
       idl_global->pragma_prefixes ().pop (trash);
       delete [] trash;
     }
@@ -143,11 +143,11 @@ UTL_ScopeStack::pop (void)
 
 // Return top element on stack.
 UTL_Scope *
-UTL_ScopeStack::top (void)
+UTL_ScopeStack::top ()
 {
   if (this->pd_stack_top <= 0)
     {
-      return 0;
+      return nullptr;
     }
 
   return this->pd_stack_data[pd_stack_top - 1];
@@ -155,11 +155,11 @@ UTL_ScopeStack::top (void)
 
 // Return bottom element on stack.
 UTL_Scope *
-UTL_ScopeStack::bottom (void)
+UTL_ScopeStack::bottom ()
 {
   if (this->pd_stack_top == 0)
     {
-      return 0;
+      return nullptr;
     }
 
   return this->pd_stack_data[0];
@@ -167,27 +167,27 @@ UTL_ScopeStack::bottom (void)
 
 // Clear entire stack.
 void
-UTL_ScopeStack::clear (void)
+UTL_ScopeStack::clear ()
 {
   this->pd_stack_top = 0;
 }
 
 // How deep is the stack?
 unsigned long
-UTL_ScopeStack::depth (void)
+UTL_ScopeStack::depth ()
 {
   return this->pd_stack_top;
 }
 
 // Return (top - 1) element on stack.
 UTL_Scope *
-UTL_ScopeStack::next_to_top (void)
+UTL_ScopeStack::next_to_top ()
 {
   UTL_Scope  *tmp, *retval;
 
   if (this->depth () < 2)
     {
-      return 0;
+      return nullptr;
     }
 
   tmp = top ();    // Save top
@@ -199,17 +199,17 @@ UTL_ScopeStack::next_to_top (void)
 
 // Return topmost non-NULL element.
 UTL_Scope *
-UTL_ScopeStack::top_non_null (void)
+UTL_ScopeStack::top_non_null ()
 {
   for (long i = this->pd_stack_top - 1; i >= 0; --i)
     {
-      if (this->pd_stack_data[i] != 0)
+      if (this->pd_stack_data[i] != nullptr)
         {
           return this->pd_stack_data[i];
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 AST_Decl *
@@ -225,7 +225,7 @@ UTL_ScopeStack::lookup_by_name (
           if (node) return node;
         }
     }
-  return 0;
+  return nullptr;
 }
 
 UTL_ScopeStackActiveIterator::UTL_ScopeStackActiveIterator (UTL_ScopeStack &s)
@@ -236,26 +236,26 @@ UTL_ScopeStackActiveIterator::UTL_ScopeStackActiveIterator (UTL_ScopeStack &s)
 
 // Advance to next item
 void
-UTL_ScopeStackActiveIterator::next (void)
+UTL_ScopeStackActiveIterator::next ()
 {
   il--;
 }
 
 // Get current item.
 UTL_Scope *
-UTL_ScopeStackActiveIterator::item (void)
+UTL_ScopeStackActiveIterator::item ()
 {
   if (this->il >= 0)
     {
       return this->source.pd_stack_data[il];
     }
 
-  return 0;
+  return nullptr;
 }
 
 // Is this iteration done?
 bool
-UTL_ScopeStackActiveIterator::is_done (void) const
+UTL_ScopeStackActiveIterator::is_done () const
 {
   if (this->il >= 0)
     {
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
index 3e44e85e94a..d9070dfa65f 100644
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ b/TAO/TAO_IDL/util/utl_string.cpp
@@ -184,10 +184,10 @@ UTL_String::get_canonical_rep (ACE_CString &cstr)
 
 //////////////////////////////////////////////////////////////////////
 
-UTL_String::UTL_String (void)
+UTL_String::UTL_String ()
   : copy_taken (false),
-    p_str      (0),
-    c_str      (0)
+    p_str      (nullptr),
+    c_str      (nullptr)
 {
 }
 
@@ -195,7 +195,7 @@ UTL_String::UTL_String (const char *str, bool take_copy)
   : copy_taken (str ? take_copy : false),
     p_str      (this->copy_taken ? ACE::strnew (str)
                                  : const_cast<char *>(str)),
-    c_str      (0)
+    c_str      (nullptr)
 {
 }
 
@@ -203,11 +203,11 @@ UTL_String::UTL_String (UTL_String *s, bool force_copy)
   : copy_taken (force_copy ? true : s->copy_taken),
     p_str      (this->copy_taken ? ACE::strnew (s->p_str)
                                  : const_cast<char *> (s->p_str)),
-    c_str      (0)
+    c_str      (nullptr)
 {
 }
 
-UTL_String::~UTL_String (void)
+UTL_String::~UTL_String ()
 {
   delete [] this->c_str;
   if (copy_taken)
@@ -217,16 +217,16 @@ UTL_String::~UTL_String (void)
 }
 
 void
-UTL_String::destroy (void)
+UTL_String::destroy ()
 {
   delete [] this->c_str;
-  this->c_str = 0;
+  this->c_str = nullptr;
   if (this->copy_taken)
     {
        ACE::strdelete (this->p_str);
-       this->copy_taken = 0;
+       this->copy_taken = false;
     }
-  this->p_str = 0;
+  this->p_str = nullptr;
 }
 
 // Compare two UTL_String *.
@@ -246,7 +246,7 @@ UTL_String::compare_quiet (UTL_String *s)
 
 // Get the canonical representation from a String.
 char *
-UTL_String::get_canonical_rep (void)
+UTL_String::get_canonical_rep ()
 {
   if (!this->c_str && this->p_str)
     {
diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp
index 1db9b62ab5c..3d835c292bb 100644
--- a/TAO/TAO_IDL/util/utl_strlist.cpp
+++ b/TAO/TAO_IDL/util/utl_strlist.cpp
@@ -86,13 +86,13 @@ UTL_StrList::UTL_StrList (UTL_String *s,
 {
 }
 
-UTL_StrList::~UTL_StrList (void)
+UTL_StrList::~UTL_StrList ()
 {
 }
 
 // Get list item.
 UTL_String *
-UTL_StrList::head (void)
+UTL_StrList::head ()
 {
   return this->pd_car_data;
 }
@@ -106,9 +106,9 @@ UTL_StrList::set_head (UTL_String *s)
 
 // Get last item of this list
 UTL_String *
-UTL_StrList::last_component (void)
+UTL_StrList::last_component ()
 {
-  if (this->tail () == 0)
+  if (this->tail () == nullptr)
     {
       return pd_car_data;
     }
@@ -118,39 +118,39 @@ UTL_StrList::last_component (void)
 
 // Copy a list.
 UTL_List *
-UTL_StrList::copy (void)
+UTL_StrList::copy ()
 {
-  UTL_List *retval = 0;
+  UTL_List *retval = nullptr;
 
-  if (this->tail () == 0)
+  if (this->tail () == nullptr)
     {
       ACE_NEW_RETURN (retval,
                       UTL_StrList (head (),
-                                   0),
-                      0);
+                                   nullptr),
+                      nullptr);
     }
   else
     {
       ACE_NEW_RETURN (retval,
                       UTL_StrList (head (),
                                    (UTL_StrList *) this->tail ()->copy ()),
-                      0);
+                      nullptr);
     }
 
   return retval;
 }
 
 void
-UTL_StrList::destroy (void)
+UTL_StrList::destroy ()
 {
-  UTL_String *str = 0;
+  UTL_String *str = nullptr;
 
   for (UTL_StrlistActiveIterator i (this); !i.is_done (); i.next ())
     {
       str = i.item ();
       str->destroy ();
       delete str;
-      str = 0;
+      str = nullptr;
     }
 }
 
@@ -158,7 +158,7 @@ UTL_StrList::destroy (void)
 void
 UTL_StrList::dump (ACE_OSTREAM_TYPE &o)
 {
-  char *s = 0;
+  char *s = nullptr;
   bool first = true;
   bool second = false;
 
@@ -215,11 +215,11 @@ UTL_StrlistActiveIterator::UTL_StrlistActiveIterator (UTL_StrList *s)
 
 // Get current item
 UTL_String *
-UTL_StrlistActiveIterator::item (void)
+UTL_StrlistActiveIterator::item ()
 {
-  if (source == 0)
+  if (source == nullptr)
     {
-      return 0;
+      return nullptr;
     }
 
   return ((UTL_StrList *) source)->head ();
diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt
index 60ad1c28b6a..de53a1d46af 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.11, released Mon Aug 17 10:04:17 CEST 2020
+This is TAO version 2.5.12, released Tue Oct 27 12:46:14 CET 2020
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index 5218f2b7e39..67cf0476eec 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -432,7 +432,6 @@ TAO/tests/Transport_Cache_Manager/run_test.pl
 TAO/tests/UNKNOWN_Exception/run_test.pl:
 TAO/tests/Native_Exceptions/run_test.pl:
 TAO/tests/Servant_To_Reference_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
-TAO/tests/Sequence_Iterators/run_test.pl:
 TAO/tests/Sequence_Unit_Tests/run_test.pl:
 TAO/tests/Typedef_String_Array/run_test.pl:
 TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl: !CORBA_E_MICRO
diff --git a/TAO/docs/TAO-metrics.html b/TAO/docs/TAO-metrics.html
index ff1fab67e83..e02ba134ff5 100644
--- a/TAO/docs/TAO-metrics.html
+++ b/TAO/docs/TAO-metrics.html
@@ -12,7 +12,7 @@ bgcolor="#ffffff">
 <HR>
 <H3> TAO (ACE ORB) Performance Metrics</H3>
 
-<A HREf="http://www.dre.vanderbilt.edu/TAO">TAO</A>'s
+<A HREf="https://www.dre.vanderbilt.edu/TAO">TAO</A>'s
 efficiency, scalability, and predictability have been measured on many
 different real-time operating systems with different features.  Here
 are some pointers to obtain more information on the evaluation and
diff --git a/TAO/docs/notification/monitor.html b/TAO/docs/notification/monitor.html
index 2fcfb390a51..ef7bd41b18b 100644
--- a/TAO/docs/notification/monitor.html
+++ b/TAO/docs/notification/monitor.html
@@ -109,7 +109,7 @@ method.  The Data union has the following definition:</p>
   };
 </pre>
 <p>The <b>get_statistic_names()</b> method returns a <b>NameList</b> which
-contains the names that are currently known by the statistic monitor. 
+contains the names that are currently known by the statistic monitor.
 This list will change over time.</p>
 <p>The <b>get_statistic(in string name)</b> returns a <b>Data</b> union which
 contains either a <b>Numeric</b> object or a <b>NameList</b>, depending upon
@@ -119,7 +119,7 @@ thrown.
 </p>
 <p> The <b>get_statistics(in NameList names)</b> returns a
 <b>DataList</b>, which is a sequence of <b>Data</b>.  The order of the
-<b>DataList</b> is the same order as provided within the <b>NameList</b>. 
+<b>DataList</b> is the same order as provided within the <b>NameList</b>.
 If any one name provided within the list does not correspond to a known
 statistic, the <b>InvalidName</b> exception will be thrown.
 </p>
@@ -141,36 +141,36 @@ thrown.
 If ACE and TAO are built as static libraries, follow the instructions above
 with these modifications:
 <ul>
-<li>On the mwc.pl command used to generate the build files, add the 
+<li>On the mwc.pl command used to generate the build files, add the
 -features -features "notify_monitor_control=1" option.  For example
-to build for VC9, the mwc commmand would look like:
+to build for VC9, the mwc command would look like:
 <ul><li><pre>
 mwc.pl -type vc9 -static -features "notify_monitor_control=1" TAO_ACE.mwc
 </pre></li></ul>
 </li>
 <li>Replace the "dynamic" service configuration commands with a "static"
-commands.  <i>Note that these commands have different syntaxes.</i>   
+commands.  <i>Note that these commands have different syntaxes.</i>
 <br/>For example if
 the service configuration commands for a dynamic build are (Lines wrapped
 for illustrative purposes.  In the service conf file the following should
 appear on two lines):
 <ul><li><pre>
-  dynamic TAO_MonitorAndControl Service_Object * 
-    TAO_CosNotification_MC:_make_TAO_MonitorAndControl () 
-    "-o monitor.ior 
+  dynamic TAO_MonitorAndControl Service_Object *
+    TAO_CosNotification_MC:_make_TAO_MonitorAndControl ()
+    "-o monitor.ior
     -ORBArg \"-ORBInitRef -ORBArg NameService=corbaloc:iiop:localhost:10637/NameService\""
-    
+
   dynamic TAO_MC_Notify_Service Service_Object *
     TAO_CosNotification_MC_Ext:_make_TAO_MC_Notify_Service ()
     "-DispatchingThreads 1"
-    
+
 </pre></li></ul>  you should replace them with
 <ul><li><pre>
-  static TAO_MonitorAndControl 
-    "-o monitor.ior 
-    -ORBArg -ORBInitRef 
+  static TAO_MonitorAndControl
+    "-o monitor.ior
+    -ORBArg -ORBInitRef
       -ORBArg NameService=corbaloc:iiop:localhost:10637/NameService"
-  
+
   static TAO_MC_Notify_Service "-DispatchingThreads 1"
 </pre></li></ul>
 Please note that the parser for the static service configuration directives
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 5622c0f7219..b4d8c117ded 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -15,7 +15,7 @@
 Release Information for The ACE ORB (TAO)</h3></center>
 This document contains information on the following topics related to the
 <a href="../../VERSION.txt">current
-release</a> of <a href="http://www.dre.vanderbilt.edu/TAO">TAO</a>:
+release</a> of <a href="https://www.dre.vanderbilt.edu/TAO">TAO</a>:
 
 <table BORDER=0 CELLSPACING=0 CELLPADDING=10 >
 <tr>
diff --git a/TAO/docs/releasenotes/trader.html b/TAO/docs/releasenotes/trader.html
index 175743ff7cd..95c1126de98 100644
--- a/TAO/docs/releasenotes/trader.html
+++ b/TAO/docs/releasenotes/trader.html
@@ -978,7 +978,7 @@ loop. </p>
 
 <h1><a name="RunningtheTradingServiceTests">Running the Trading Service Tests</a></h1>
 
-<p>There are two executables that test the Trading Service funtionality --- one to test
+<p>There are two executables that test the Trading Service functionality --- one to test
 the exporter role, and the other, the importer role. To run the tests simply launch the <tt>Trading_Service</tt>
 application, then run the <tt>export_test</tt> executable found in the <tt>orbsvcs/tests/Trading</tt>
 directory. When the <tt>export_test</tt> ceases to output data and enters the event loop,
diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen
index 4e2199d3fdc..b27e239c262 100644
--- a/TAO/etc/tao.doxygen
+++ b/TAO/etc/tao.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1218,9 +1235,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1326,7 +1343,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1488,6 +1505,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1508,8 +1536,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1537,7 +1571,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1579,7 +1613,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1776,9 +1810,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen
index 741dec934f1..09919052117 100644
--- a/TAO/etc/tao_anytypecode.doxygen
+++ b/TAO/etc/tao_anytypecode.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen
index 4bd9a6bc3d3..bb1caa238f4 100644
--- a/TAO/etc/tao_av.doxygen
+++ b/TAO/etc/tao_av.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -844,8 +859,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1219,9 +1236,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1327,7 +1344,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1489,6 +1506,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1509,8 +1537,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1538,7 +1572,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1580,7 +1614,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1777,9 +1811,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen
index cd8db10747e..8ce353c0f23 100644
--- a/TAO/etc/tao_compression.doxygen
+++ b/TAO/etc/tao_compression.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen
index a21cd94f304..ade28282c21 100644
--- a/TAO/etc/tao_cosevent.doxygen
+++ b/TAO/etc/tao_cosevent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -843,8 +858,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1218,9 +1235,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1326,7 +1343,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1488,6 +1505,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1508,8 +1536,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1537,7 +1571,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1579,7 +1613,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1776,9 +1810,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen
index 13098bfb6bd..30102b42227 100644
--- a/TAO/etc/tao_cosnaming.doxygen
+++ b/TAO/etc/tao_cosnaming.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -842,8 +857,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1217,9 +1234,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,7 +1342,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1487,6 +1504,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1507,8 +1535,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1536,7 +1570,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1578,7 +1612,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1775,9 +1809,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen
index c66a32b082b..5c34e976e94 100644
--- a/TAO/etc/tao_cosnotification.doxygen
+++ b/TAO/etc/tao_cosnotification.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -848,8 +863,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1222,9 +1239,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1330,7 +1347,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1492,6 +1509,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1512,8 +1540,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1541,7 +1575,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1583,7 +1617,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1780,9 +1814,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen
index adb3ac1642d..9b321be48ea 100644
--- a/TAO/etc/tao_costime.doxygen
+++ b/TAO/etc/tao_costime.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -842,8 +857,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1217,9 +1234,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,7 +1342,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1487,6 +1504,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1507,8 +1535,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1536,7 +1570,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1578,7 +1612,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1775,9 +1809,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen
index eb351a053e0..aa51c232e5f 100644
--- a/TAO/etc/tao_costrader.doxygen
+++ b/TAO/etc/tao_costrader.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -844,8 +859,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1218,9 +1235,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1326,7 +1343,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1488,6 +1505,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1508,8 +1536,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1537,7 +1571,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1579,7 +1613,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1776,9 +1810,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen
index edad2820081..bb2c6a3f9ab 100644
--- a/TAO/etc/tao_dynamicany.doxygen
+++ b/TAO/etc/tao_dynamicany.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen
index aaa50d8a5fe..3620e446565 100644
--- a/TAO/etc/tao_dynamicinterface.doxygen
+++ b/TAO/etc/tao_dynamicinterface.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen
index 2401194fe0e..cee366f6ee7 100644
--- a/TAO/etc/tao_esf.doxygen
+++ b/TAO/etc/tao_esf.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1216,9 +1233,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1324,7 +1341,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1486,6 +1503,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1506,8 +1534,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1535,7 +1569,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1577,7 +1611,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1774,9 +1808,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen
index 595a9385e78..d992fb8d971 100644
--- a/TAO/etc/tao_ifr.doxygen
+++ b/TAO/etc/tao_ifr.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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
@@ -1213,9 +1230,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1321,7 +1338,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1483,6 +1500,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1503,8 +1531,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1532,7 +1566,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1574,7 +1608,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1771,9 +1805,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen
index e40fe46d510..0db535239ab 100644
--- a/TAO/etc/tao_implrepo.doxygen
+++ b/TAO/etc/tao_implrepo.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen
index cf5aef0c74d..f26d3578a69 100644
--- a/TAO/etc/tao_iormanip.doxygen
+++ b/TAO/etc/tao_iormanip.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen
index c5dff5bc3c5..88f4bbd90d2 100644
--- a/TAO/etc/tao_iortable.doxygen
+++ b/TAO/etc/tao_iortable.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen
index b148d459deb..55a8182a5f2 100644
--- a/TAO/etc/tao_pi.doxygen
+++ b/TAO/etc/tao_pi.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen
index ef2c58a35b8..f954f08e697 100644
--- a/TAO/etc/tao_pi_server.doxygen
+++ b/TAO/etc/tao_pi_server.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen
index e9d89ab0bd5..dc1025f5b94 100644
--- a/TAO/etc/tao_portablegroup.doxygen
+++ b/TAO/etc/tao_portablegroup.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -843,8 +858,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1217,9 +1234,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1325,7 +1342,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1487,6 +1504,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1507,8 +1535,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1536,7 +1570,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1578,7 +1612,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1775,9 +1809,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen
index fc56a89f6df..13a9ea048bb 100644
--- a/TAO/etc/tao_portableserver.doxygen
+++ b/TAO/etc/tao_portableserver.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen
index 3e49971fab5..b4454e478b2 100644
--- a/TAO/etc/tao_rtcorba.doxygen
+++ b/TAO/etc/tao_rtcorba.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen
index ff4bfb09283..674ab3609c7 100644
--- a/TAO/etc/tao_rtevent.doxygen
+++ b/TAO/etc/tao_rtevent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -850,8 +865,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1227,9 +1244,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1335,7 +1352,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1497,6 +1514,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1517,8 +1545,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1546,7 +1580,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1588,7 +1622,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1785,9 +1819,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen
index f8a76f6869b..95c36a17018 100644
--- a/TAO/etc/tao_rtportableserver.doxygen
+++ b/TAO/etc/tao_rtportableserver.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen
index 225186b1134..2a51d0c3873 100644
--- a/TAO/etc/tao_security.doxygen
+++ b/TAO/etc/tao_security.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -846,8 +861,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1221,9 +1238,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1329,7 +1346,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1491,6 +1508,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1511,8 +1539,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1540,7 +1574,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1582,7 +1616,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1779,9 +1813,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen
index a138a7626f3..9d5d2db2579 100644
--- a/TAO/etc/tao_smartproxies.doxygen
+++ b/TAO/etc/tao_smartproxies.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen
index 4d4190bef1f..9545419b146 100644
--- a/TAO/etc/tao_ssliop.doxygen
+++ b/TAO/etc/tao_ssliop.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -846,8 +861,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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 \
@@ -1221,9 +1238,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1329,7 +1346,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1491,6 +1508,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1511,8 +1539,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1540,7 +1574,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1582,7 +1616,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1779,9 +1813,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen
index 999247b2bd2..ee1aa66811a 100644
--- a/TAO/etc/tao_strategies.doxygen
+++ b/TAO/etc/tao_strategies.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen
index 4075de9ef98..597b3743360 100644
--- a/TAO/etc/tao_transportcurrent.doxygen
+++ b/TAO/etc/tao_transportcurrent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen
index 850e9c2771f..c97766824e2 100644
--- a/TAO/etc/tao_ziop.doxygen
+++ b/TAO/etc/tao_ziop.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.20
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -217,6 +217,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -253,12 +261,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # 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,
+# 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:
 # 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), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -445,6 +447,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# 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
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -525,8 +540,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -549,7 +564,7 @@ INTERNAL_DOCS          = YES
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# (including Cygwin) and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
@@ -841,8 +856,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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (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,9 +1232,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1323,7 +1340,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1485,6 +1502,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1533,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1568,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # 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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1610,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1773,9 +1807,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff --git a/TAO/examples/Borland/README b/TAO/examples/Borland/README
index 227a0176906..07881888ffd 100644
--- a/TAO/examples/Borland/README
+++ b/TAO/examples/Borland/README
@@ -1,5 +1,3 @@
-
-
 Before compiling the example in The Borland C++ Builder IDE
 you must generate the client and server stubs using build_idl.bat.
 Please update the location of the tao_idl dependent on your build
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index 84c39803f86..efab29f4187 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -9,28 +9,25 @@
 
 class FooServantList
 {
-  public:
+public:
+  FooServantList(const ACE_TCHAR* prefix,
+                  unsigned num_servants,
+                  unsigned num_clients,
+                  CORBA::ORB_ptr orb);
+  ~FooServantList();
 
-    FooServantList(const ACE_TCHAR* prefix,
-                   unsigned num_servants,
-                   unsigned num_clients,
-                   CORBA::ORB_ptr orb);
-    ~FooServantList();
+  void create_and_activate(PortableServer::POA_ptr poa);
 
-    void create_and_activate(PortableServer::POA_ptr poa);
+  void client_done(void);
 
-    void client_done(void);
+private:
+  PortableServer::ServantBase_var* servants_;
+  ACE_TString prefix_;
+  unsigned num_servants_;
 
+  ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_;
 
-  private:
-
-    PortableServer::ServantBase_var* servants_;
-    ACE_TString prefix_;
-    unsigned num_servants_;
-
-    ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_;
-
-    CORBA::ORB_var  orb_;
+  CORBA::ORB_var  orb_;
 };
 
 #endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index df548468b7a..3e127b18a6c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -11,7 +11,6 @@ class FooServantList;
 class Foo_i : public virtual POA_Foo
 {
   public:
-
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
@@ -27,55 +26,42 @@ class Foo_i : public virtual POA_Foo
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
-        char *& message
-      );
+        char *& message);
 
     virtual void test_unbounded_string_arg (
-        const char * message
-      );
+        const char * message);
 
     virtual void test_bounded_string_arg (
-        const char * message
-      );
+        const char * message);
 
     virtual void test_fixed_array_arg (
-        const ::Fixed_Array message
-      );
+        const ::Fixed_Array message);
 
     virtual void test_var_array_arg (
-        const ::Var_Array messages
-      );
+        const ::Var_Array messages);
 
     virtual void test_bounded_var_size_arg (
-        const ::Bounded_Var_Size & message
-      );
+        const ::Bounded_Var_Size & message);
 
     virtual void test_unbounded_var_size_arg (
-        const ::Unbounded_Var_Size & message
-      );
+        const ::Unbounded_Var_Size & message);
 
     virtual void test_fixed_size_arg (
-        const ::TimeOfDay & t
-      );
+        const ::TimeOfDay & t);
 
     virtual void test_fixed_size_arg_two_way (
-        const ::TimeOfDay & t
-      );
+        const ::TimeOfDay & t);
 
     virtual void test_special_basic_arg (
-        ::CORBA::Boolean value
-      );
+        ::CORBA::Boolean value);
 
     virtual void test_objref_arg (
-        ::Callback_ptr cb
-      );
+        ::Callback_ptr cb);
 
     virtual void callback_object (
-        ::Callback_ptr cb
-      );
+        ::Callback_ptr cb);
 
-    virtual void test_callback (
-      );
+    virtual void test_callback ();
 
     virtual void done(void);
 
@@ -84,7 +70,6 @@ class Foo_i : public virtual POA_Foo
     bool active ();
 
   private:
-
     typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> AtomicLong;
     typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> AtomicUnsigned;
     typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> AtomicBool;
diff --git a/TAO/examples/Content_Server/README b/TAO/examples/Content_Server/README
index 1f58eb4d8b1..b0c2b545185 100644
--- a/TAO/examples/Content_Server/README
+++ b/TAO/examples/Content_Server/README
@@ -1,28 +1,26 @@
-
-
 This directory contains a number of example applications that
 illustrate how to transmit large files using standard CORBA and TAO.
 The individual directories contain READMEs on how to run the following
 examples:
 
-        . SMI_Iterator
+. SMI_Iterator
 
-          Illustrates how to use the Iterator pattern to download
-          large files one chunk at a time using synchronous
-          method invocations that are "pulled" by the client
-          from the server.
+  Illustrates how to use the Iterator pattern to download
+  large files one chunk at a time using synchronous
+  method invocations that are "pulled" by the client
+  from the server.
 
-        . AMI_Iterator
+. AMI_Iterator
 
-          Illustrates how to use the Iterator pattern to download
-          large files one chunk at a time using asynchronous
-          method invocations that are "pulled" by the client
-          from the server.
+  Illustrates how to use the Iterator pattern to download
+  large files one chunk at a time using asynchronous
+  method invocations that are "pulled" by the client
+  from the server.
 
-        . AMI_Observer
+. AMI_Observer
 
-          Illustrates how to use the Observer pattern to download
-          large files one chunk at a time using asynchronous
-          method invocations that are "pushed" from the server
-          to the client.
+  Illustrates how to use the Observer pattern to download
+  large files one chunk at a time using asynchronous
+  method invocations that are "pushed" from the server
+  to the client.
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index ba3caeee9c2..a78ae87523a 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -74,7 +74,7 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
   Kokyu::DSRT_Dispatcher_Factory<FP_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
     tmp( Kokyu::DSRT_Dispatcher_Factory<FP_Scheduler_Traits>::
          create_DSRT_dispatcher (config) );
-  kokyu_dispatcher_ = tmp;
+  kokyu_dispatcher_ = std::move(tmp);
 
   CORBA::Object_var object =
     orb->resolve_initial_references ("RTScheduler_Current");
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index 0639728d996..e46604a305c 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -74,7 +74,7 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
   Kokyu::DSRT_Dispatcher_Factory<MIF_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
     tmp( Kokyu::DSRT_Dispatcher_Factory<MIF_Scheduler_Traits>::
          create_DSRT_dispatcher (config) );
-  kokyu_dispatcher_ = tmp;
+  kokyu_dispatcher_ = std::move(tmp);
 
   CORBA::Object_var object =
     orb->resolve_initial_references ("RTScheduler_Current");
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 5193fbbae92..2972bb05325 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -74,7 +74,7 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
   Kokyu::DSRT_Dispatcher_Factory<MUF_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
     tmp( Kokyu::DSRT_Dispatcher_Factory<MUF_Scheduler_Traits>::
          create_DSRT_dispatcher (config) );
-  kokyu_dispatcher_ = tmp;
+  kokyu_dispatcher_ = std::move(tmp);
 
   CORBA::Object_var object =
     orb->resolve_initial_references ("RTScheduler_Current");
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/README b/TAO/examples/Kokyu_dsrt_schedulers/README
index 4844394c04f..2a957c6b9c6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/README
+++ b/TAO/examples/Kokyu_dsrt_schedulers/README
@@ -1,5 +1,3 @@
-
-
 Design approaches for the Kokyu based DSRT scheduler/dispatcher
 --------------------------------------------------------
 
@@ -92,7 +90,7 @@ To aid (1), we have created a Svc_Ctxt_DSRT_QoS idl
 interface (see ./Kokyu_qos.pidl). This interface
 currently has the necessary things to be propagated
 for FP, MIF and MUF schedulers. This can be altered
-if necessary to accomodate new sched params. The
+if necessary to accommodate new sched params. The
 idea here is to let the IDL compiler generate the
 marshalling code (including Any operators) so that
 these parameters can be shipped across in the
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index 46ee9caa3bd..fd1f91d685c 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -180,8 +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 (void) = 0;
 
   /**
    * Returns an object with the specified <Member_ID>.  If this
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 190798281df..cd60a1a87f7 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -219,8 +219,7 @@ public:
    * ``round robin.''  If the group contains no members, <no_such_member>
    * exception is thrown.
    */
-  char * resolve (void)
-    = 0;
+  char * resolve (void) = 0;
 
   /**
    * Returns an object with the specified <Member_ID>.  If this
diff --git a/TAO/examples/Persistent_Grid/README b/TAO/examples/Persistent_Grid/README
index 8a461344dbe..35b652a46b1 100644
--- a/TAO/examples/Persistent_Grid/README
+++ b/TAO/examples/Persistent_Grid/README
@@ -1,5 +1,3 @@
-
-
 This example shows how to store the state of CORBA servants in
 persistent memory.  The example is a variation of the Grid example in
 $TAO_ROOT/examples/Simple/grid.
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index 31cf6f21b4c..a56465d759a 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -229,6 +229,7 @@ Quoter_Generic_Factory_Server::parse_args (void)
         ACE_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
+        // fallthrough
       case '?':
         ACE_DEBUG ((LM_DEBUG,
                     "usage:  %s"
diff --git a/TAO/examples/README b/TAO/examples/README
index a08edc25fb5..df27ae980cc 100644
--- a/TAO/examples/README
+++ b/TAO/examples/README
@@ -1,114 +1,112 @@
-
-
 This directory contains a number of example applications that
 illustrate how to program with standard CORBA using TAO.  The
 individual directories contain READMEs on how to run the following
 examples:
 
-        . Advanced
+. Advanced
 
-          Contains example code from "Advanced CORBA Programming with
-          C++" by Michi Henning and Steve Vinoski with slight
-          adaptations for TAO.
+  Contains example code from "Advanced CORBA Programming with
+  C++" by Michi Henning and Steve Vinoski with slight
+  adaptations for TAO.
 
-        . AMH
+. AMH
 
-          Example code that illustrates working of a simple AMH 'Sink-Server'
-          and a more sophisticated AMH 'Middle-Sever' that uses both
-          AMH and AMI. Sample 'one-button' perl scripts are provided that
-          show how to run the servers.
+  Example code that illustrates working of a simple AMH 'Sink-Server'
+  and a more sophisticated AMH 'Middle-Sever' that uses both
+  AMH and AMI. Sample 'one-button' perl scripts are provided that
+  show how to run the servers.
 
-        . Borland
+. Borland
 
-          This directory illustrates how to write a Borland C++
-          Builder application using ACE+TAO.
+  This directory illustrates how to write a Borland C++
+  Builder application using ACE+TAO.
 
-        . Buffered _AMI
+. Buffered _AMI
 
-          This is a simple test for buffered AMI calls.  It invokes
-          multiple AMI calls.  Due to buffering in the ORB, the calls
-          are automatically bunched together instead of being
-          delivered to the server upon every invocation.
+  This is a simple test for buffered AMI calls.  It invokes
+  multiple AMI calls.  Due to buffering in the ORB, the calls
+  are automatically bunched together instead of being
+  delivered to the server upon every invocation.
 
-        . Buffered _Oneways
+. Buffered _Oneways
 
-          This is a simple test for buffered oneways.  It invokes
-          multiple oneway calls.  Due to buffering in the ORB, the
-          calls are automatically bunched together instead of being
-          delivered to the server upon every invocation.
+  This is a simple test for buffered oneways.  It invokes
+  multiple oneway calls.  Due to buffering in the ORB, the
+  calls are automatically bunched together instead of being
+  delivered to the server upon every invocation.
 
-        . Callback_Quoter
+. Callback_Quoter
 
-          Illustrates how to implement distributed callbacks using
-          TAO.
+  Illustrates how to implement distributed callbacks using
+  TAO.
 
-        . Content_Server
+. Content_Server
 
-          Three examples that illustrate how to program client/server
-          applications for downloading large file content via SMI,
-          AMI, and the Iterator and Observer patterns.
+  Three examples that illustrate how to program client/server
+  applications for downloading large file content via SMI,
+  AMI, and the Iterator and Observer patterns.
 
-        . Event_Comm
+. Event_Comm
 
-          Another illustration of how to implement distributed
-          callbacks using TAO.
+  Another illustration of how to implement distributed
+  callbacks using TAO.
 
-        . Load_Balancing
+. Load_Balancing
 
-          A simple CORBA load balancing service that allows clients to
-          treat a group of objects as an equivalence class to improve
-          distributed load balancing.
+  A simple CORBA load balancing service that allows clients to
+  treat a group of objects as an equivalence class to improve
+  distributed load balancing.
 
-        . Load_Balancing_persistent
+. Load_Balancing_persistent
 
-          A variant of the preceding example that keeps the state of
-          the load balancer persistent.
+  A variant of the preceding example that keeps the state of
+  the load balancer persistent.
 
-        . Logging
+. Logging
 
-          This example implements a simple logging service using TAO.
+  This example implements a simple logging service using TAO.
 
-        . mfc
+. mfc
 
-          This is an short example to show how to integrate TAO and
-          MFC base GUI applications.
+  This is an short example to show how to integrate TAO and
+  MFC base GUI applications.
 
-        . OBV
+. OBV
 
-          This is a demonstration of the CORBA 2.3 valuetype feature from
-          the Object-by-Value specification.
+  This is a demonstration of the CORBA 2.3 valuetype feature from
+  the Object-by-Value specification.
 
-        . Persistent_Grid
+. Persistent_Grid
 
-          This example shows how to store the state of CORBA servants in
-          persistent memory.
+  This example shows how to store the state of CORBA servants in
+  persistent memory.
 
-        . PluggableUDP
+. PluggableUDP
 
-          This example tests the UDP Pluggable Protocol (DIOP) implementation by
-          sending oneway requests to a server.
+  This example tests the UDP Pluggable Protocol (DIOP) implementation by
+  sending oneway requests to a server.
 
-        . POA
+. POA
 
-          Contains various small examples of POA features based on
-          the OMG POA specification.
+  Contains various small examples of POA features based on
+  the OMG POA specification.
 
-        . Quoter
+. Quoter
 
-          Illustrates how to use the Global POA options with multiple
-          threads.  This example also shows how to use the Lifecycle
-          service.
+  Illustrates how to use the Global POA options with multiple
+  threads.  This example also shows how to use the Lifecycle
+  service.
 
-        . Simple
+. Simple
 
-          Contains a number of simple CORBA examples, which also
-          illustrate how to write canonical Orbix/VisiBroker/OmniORB
-          examples in TAO using standard CORBA features rather than
-          proprietary ORB features.
+  Contains a number of simple CORBA examples, which also
+  illustrate how to write canonical Orbix/VisiBroker/OmniORB
+  examples in TAO using standard CORBA features rather than
+  proprietary ORB features.
 
-        . Simulator
+. Simulator
 
-          This is a demonstration of the TAO "Distributed Object
-          Visualization Environment" (DOVE), which shows how the TAO
-          Real-time Event Service can be used to transport monitoring
-          events.
+  This is a demonstration of the TAO "Distributed Object
+  Visualization Environment" (DOVE), which shows how the TAO
+  Real-time Event Service can be used to transport monitoring
+  events.
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index f4707507c05..28563f1378f 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -1,9 +1,9 @@
 #include "FP_Scheduler.h"
-#include "ace/Atomic_Op.h"
 #include "tao/RTScheduling/Request_Interceptor.h"
 #include "test.h"
+#include <atomic>
 
-ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
+std::atomic<long> server_guid_counter;
 
 RTCORBA::Priority
 Segment_Sched_Param_Policy::value (void)
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index d1a9f4b6ba2..a26d17387d1 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -1,9 +1,9 @@
 #include "MIF_Scheduler.h"
-#include "ace/Atomic_Op.h"
 #include "tao/RTScheduling/Request_Interceptor.h"
 #include "test.h"
+#include <atomic>
 
-ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
+std::atomic<long> server_guid_counter;
 
 DT::DT (TAO_SYNCH_MUTEX &lock,
         int guid)
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 005f514c9b0..b2df4e6925a 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -28,7 +28,7 @@
  * A template server definition. This template can be used by
  * single server/client projects for definition of their
  * server/clients.  See the directories time, bank, echo for
- * further details of implemenatation.
+ * further details of implementation.
  */
 template <class Servant>
 class Server
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 3590aaad0f8..2774ca20bfb 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -151,7 +151,7 @@ BE_produce (void)
 
       // Get the root node.
       AST_Decl *d = idl_global->root ();
-      AST_Root *root = AST_Root::narrow_from_decl (d);
+      AST_Root *root = dynamic_cast<AST_Root*> (d);
 
       if (root == 0)
         {
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index da0846fb285..057e05a5013 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -1021,7 +1021,7 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
     }
 
   AST_Component *c =
-    AST_Component::narrow_from_decl (node->full_definition ());
+    dynamic_cast<AST_Component*> (node->full_definition ());
 
   try
     {
@@ -1872,7 +1872,7 @@ ifr_adding_visitor::visit_field (AST_Field *node)
       return this->create_value_member (node);
     }
 
-  AST_Type *ft = AST_Type::narrow_from_decl (node->field_type ());
+  AST_Type *ft = dynamic_cast<AST_Type*> (node->field_type ());
 
   if (ft == 0)
     {
@@ -2738,7 +2738,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
       for (CORBA::ULong i = 0; i < n_parents; ++i)
         {
           AST_Interface *intf =
-            AST_Interface::narrow_from_decl (parents[i]);
+            dynamic_cast<AST_Interface*> (parents[i]);
 
           if (intf == 0)
             {
@@ -2800,7 +2800,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
       for (CORBA::ULong i = 0; i < n_parents; ++i)
         {
           AST_Interface *intf =
-            AST_Interface::narrow_from_decl (parents[i]);
+            dynamic_cast<AST_Interface*> (parents[i]);
 
           if (intf == 0)
             {
@@ -3719,21 +3719,21 @@ ifr_adding_visitor::fill_supported_interfaces (CORBA::InterfaceDefSeq &result,
       case AST_Decl::NT_valuetype:
       case AST_Decl::NT_eventtype:
         {
-          AST_ValueType *v = AST_ValueType::narrow_from_decl (node);
+          AST_ValueType *v = dynamic_cast<AST_ValueType*> (node);
           s_length = v->n_supports ();
           list = v->supports ();
           break;
         }
       case AST_Decl::NT_component:
         {
-          AST_Component *c = AST_Component::narrow_from_decl (node);
+          AST_Component *c = dynamic_cast<AST_Component*> (node);
           s_length = c->n_supports ();
           list = c->supports ();
           break;
         }
       case AST_Decl::NT_home:
         {
-          AST_Home *h = AST_Home::narrow_from_decl (node);
+          AST_Home *h = dynamic_cast<AST_Home*> (node);
           s_length = h->n_supports ();
           list = h->supports ();
           break;
@@ -3788,7 +3788,7 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
 
       if (item->node_type () == AST_Decl::NT_factory)
         {
-          factories.push_back (AST_Factory::narrow_from_decl (item));
+          factories.push_back (dynamic_cast<AST_Factory*> (item));
         }
     }
 
@@ -3819,7 +3819,7 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
            !f_iter.is_done ();
            f_iter.next (), ++index)
         {
-          arg = AST_Argument::narrow_from_decl (f_iter.item ());
+          arg = dynamic_cast<AST_Argument*> (f_iter.item ());
           result[i].members[index].name =
             CORBA::string_dup (arg->local_name ()->get_string ());
           result[i].members[index].type =
@@ -3850,7 +3850,7 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
            !ei.is_done ();
            ei.next ())
         {
-          excp = AST_Exception::narrow_from_decl (ei.item ());
+          excp = dynamic_cast<AST_Exception*> (ei.item ());
           result[i].exceptions[index].name =
             CORBA::string_dup (excp->local_name ()->get_string ());
           result[i].exceptions[index].id = excp->repoID ();
@@ -3887,7 +3887,7 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
     {
       case AST_Decl::NT_op:
         {
-          AST_Operation *op = AST_Operation::narrow_from_decl (node);
+          AST_Operation *op = dynamic_cast<AST_Operation*> (node);
           this->fill_exceptions (result,
                                  op->exceptions ());
           return;
@@ -3895,7 +3895,7 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
       case AST_Decl::NT_factory:
       case AST_Decl::NT_finder:
         {
-          AST_Factory *f = AST_Factory::narrow_from_decl (node);
+          AST_Factory *f = dynamic_cast<AST_Factory*> (node);
           this->fill_exceptions (result,
                                  f->exceptions ());
           return;
@@ -3954,7 +3954,7 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
        ! iter.is_done ();
        iter.next (), ++index)
     {
-      arg = AST_Argument::narrow_from_decl (iter.item ());
+      arg = dynamic_cast<AST_Argument*> (iter.item ());
       result[index].name =
         CORBA::string_dup (arg->local_name ()->get_string ());
       result[index].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
@@ -3989,7 +3989,7 @@ ifr_adding_visitor::visit_all_factories (AST_Home *node,
           continue;
         }
 
-      AST_Factory *f = AST_Factory::narrow_from_decl (d);
+      AST_Factory *f = dynamic_cast<AST_Factory*> (d);
 
       CORBA::ParDescriptionSeq params;
       this->fill_params (params, f);
@@ -4018,7 +4018,7 @@ ifr_adding_visitor::visit_all_finders (AST_Home *node,
        !h_iter.is_done ();
        h_iter.next ())
     {
-      f = AST_Finder::narrow_from_decl (h_iter.item ());
+      f = dynamic_cast<AST_Finder*> (h_iter.item ());
 
       if (f == 0)
         {
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 085e7f1d617..e1bc9432a95 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -35,9 +35,9 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
       return ifr_adding_visitor::visit_scope (node);
     }
 
-  AST_Exception *e = AST_Exception::narrow_from_scope (node);
+  AST_Exception *e = dynamic_cast<AST_Exception*> (node);
 
-  CORBA::ULong nfields = static_cast<CORBA::ULong> (e->nfields ());
+  CORBA::ULong const nfields = static_cast<CORBA::ULong> (e->nfields ());
 
   this->members_.length (nfields);
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index b2ef423353d..19227166b8e 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -29,8 +29,8 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
       return ifr_adding_visitor::visit_scope (node);
     }
 
-  AST_Structure *s = AST_Structure::narrow_from_scope (node);
-  CORBA::ULong nfields = static_cast<CORBA::ULong> (s->nfields ());
+  AST_Structure *s = dynamic_cast<AST_Structure*> (node);
+  CORBA::ULong const nfields = static_cast<CORBA::ULong> (s->nfields ());
   this->members_.length (nfields);
   AST_Field **f = 0;
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 0ef2385edad..37915ca0a5f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -33,9 +33,9 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
       return ifr_adding_visitor::visit_scope (node);
     }
 
-  AST_Union *u = AST_Union::narrow_from_scope (node);
+  AST_Union *u = dynamic_cast<AST_Union*> (node);
 
-  CORBA::ULong nfields = static_cast<CORBA::ULong> (u->nfields ());
+  CORBA::ULong const nfields = static_cast<CORBA::ULong> (u->nfields ());
 
   this->members_.length (nfields);
 
@@ -111,7 +111,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
           // Get the case label(s).
 
           AST_UnionLabel *case_label = 0;
-          AST_UnionBranch *ub = AST_UnionBranch::narrow_from_decl (*f);
+          AST_UnionBranch *ub = dynamic_cast<AST_UnionBranch*> (*f);
           unsigned long len = ub->label_list_length ();
 
           // If there are multiple case labels, we will have an element
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index a64e2292b94..a5714ebb4c1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -37,9 +37,10 @@ private:
   ACE_Auto_Ptr<ImR_Activator_ORB_Runner> runner_;
 
 private:
-  // Disallow copying and assignment.
-  ImR_Activator_Loader (const ImR_Activator_Loader &);
-  ImR_Activator_Loader &operator = (const ImR_Activator_Loader &);
+  ImR_Activator_Loader (const ImR_Activator_Loader &) = delete;
+  ImR_Activator_Loader &operator = (const ImR_Activator_Loader &) = delete;
+  ImR_Activator_Loader (ImR_Activator_Loader &&) = delete;
+  ImR_Activator_Loader &operator = (ImR_Activator_Loader &&) = delete;
 };
 
 ACE_FACTORY_DECLARE (Activator, ImR_Activator_Loader)
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
index 101a0ceb880..6fe0271458d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h
@@ -19,11 +19,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 #include "LiveCheck.h"
 
 class Locator_Repository;
@@ -78,11 +74,7 @@ class AsyncListManager
   CORBA::ULong first_;
   CORBA::ULong how_many_;
   CORBA::ULong waiters_;
-#if defined (ACE_HAS_CPP11)
   std::atomic<int> refcount_;
-#else
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> refcount_;
-#endif /* ACE_HAS_CPP11 */
 };
 
 typedef TAO_Intrusive_Ref_Count_Handle<AsyncListManager> AsyncListManager_ptr;
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
index 6437f7c289c..4d0602ddfca 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
@@ -22,11 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 class LiveCheck;
 class LiveEntry;
@@ -96,11 +92,7 @@ class Locator_Export LiveListener
   ACE_CString server_;
 
  private:
-#if defined (ACE_HAS_CPP11)
   std::atomic<int> refcount_;
-#else
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> refcount_;
-#endif /* ACE_HAS_CPP11 */
 };
 
 typedef TAO_Intrusive_Ref_Count_Handle<LiveListener> LiveListener_ptr;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index 31735821a36..d5b154f929c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -35,9 +35,10 @@ private:
   Options opts_;
   ACE_Auto_Ptr<ImR_Locator_ORB_Runner> runner_;
 private:
-  // Disallow copying and assignment.
-  ImR_Locator_Loader (const ImR_Locator_Loader &);
-  ImR_Locator_Loader &operator = (const ImR_Locator_Loader &);
+  ImR_Locator_Loader (const ImR_Locator_Loader &) = delete;
+  ImR_Locator_Loader &operator = (const ImR_Locator_Loader &) = delete;
+  ImR_Locator_Loader (ImR_Locator_Loader &&) = delete;
+  ImR_Locator_Loader &operator = (ImR_Locator_Loader &&) = delete;
 };
 
 ACE_FACTORY_DECLARE (Locator, ImR_Locator_Loader)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index 4d1a0915e3c..8f06171529d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -161,11 +161,7 @@ namespace {
 #endif
     }
 
-#if defined (ACE_HAS_CPP11)
     std::unique_ptr <ACE_File_Lock> file_lock_;
-#else
-    auto_ptr<ACE_File_Lock> file_lock_;
-#endif
     FILE* file_;
     int flags_;
     bool locked_;
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.h b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
index 056bb8eed41..cb4e34f81d1 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
@@ -36,7 +36,6 @@
 class TAO_LB_Push_Handler : public ACE_Event_Handler
 {
 public:
-
   /// Constructor
   TAO_LB_Push_Handler (CosLoadBalancing::LoadMonitor_ptr monitor,
                        const PortableGroup::Location & location,
@@ -47,7 +46,6 @@ public:
                               const void *arg);
 
 private:
-
   /// Reference to the LoadMonitor.
   CosLoadBalancing::LoadMonitor_var monitor_;
 
@@ -56,7 +54,6 @@ private:
 
   /// Reference to the LoadManager.
   CosLoadBalancing::LoadManager_var manager_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/LoadBalancer/README b/TAO/orbsvcs/LoadBalancer/README
index d854a2ccf8e..ec94ce5359d 100644
--- a/TAO/orbsvcs/LoadBalancer/README
+++ b/TAO/orbsvcs/LoadBalancer/README
@@ -1,5 +1,3 @@
-
-
 This directory contains the sources for two binaries:
 
   1) LoadManager
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
index a79d1cde06c..ffdd776b6b7 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
@@ -42,7 +42,6 @@
 class TAO_LB_Signal_Handler : public ACE_Task_Base
 {
 public:
-
   /// Constructor.
   TAO_LB_Signal_Handler (CORBA::ORB_ptr orb,
                          PortableServer::POA_ptr poa);
@@ -72,12 +71,10 @@ public:
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
 
 protected:
-
   /// Template method that initiates the cleanup process.
   virtual int perform_cleanup (int signum);
 
 private:
-
 #ifdef ACE_HAS_THREADS
   /// Block all signals before spawning the threads.  Then, unblock
   /// these signals when this handler is destroyed.
@@ -93,7 +90,6 @@ private:
   /// Reference to the POA within which the LoadManager servant is
   /// registered.
   PortableServer::POA_var poa_;
-
 };
 
 #endif  /* TAO_LB_SIGNAL_HANDLER_H */
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index f2bd24e4225..94e2e8b6403 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -47,7 +47,6 @@ class ServerRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   ServerRequestInterceptor (void);
 
@@ -82,7 +81,6 @@ public:
   CORBA::Long request_count (void);
 
 protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce correct memory management via
@@ -91,10 +89,8 @@ protected:
   ~ServerRequestInterceptor (void);
 
 private:
-
   /// The number of requests that have arrived on the server.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> request_count_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl b/TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl
index e0e6dceed43..d9b990ffa73 100755
--- a/TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl
+++ b/TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 
 # ************************************************************
 # Description   : Front end for the Notify Service Monitor
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 1fad41a8e47..baafac90542 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // TAO_AV_Qos
 //------------------------------------------------------------
 
-TAO_AV_QoS::TAO_AV_QoS (void)
+TAO_AV_QoS::TAO_AV_QoS ()
 {
 }
 
@@ -48,11 +48,11 @@ TAO_AV_QoS::convert (AVStreams::streamQoS &/*network_qos*/)
 // ----------------------------------------------------------------------
 // AV_Null_MediaCtrl
 // ----------------------------------------------------------------------
-AV_Null_MediaCtrl::AV_Null_MediaCtrl (void)
+AV_Null_MediaCtrl::AV_Null_MediaCtrl ()
 {
 }
 
-AV_Null_MediaCtrl::~AV_Null_MediaCtrl (void)
+AV_Null_MediaCtrl::~AV_Null_MediaCtrl ()
 {
 }
 
@@ -62,7 +62,7 @@ AV_Null_MediaCtrl::~AV_Null_MediaCtrl (void)
 // ----------------------------------------------------------------------
 
 // Constructor
-TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void)
+TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl ()
   :flow_count_ (0)
 {
 }
@@ -288,7 +288,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
   }
 }
 
-TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
+TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl ()
 {
 }
 
@@ -312,7 +312,7 @@ TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */,
 const int MMDevice_Map_Hash_Key::hash_maximum_ = 10000;
 
 //default constructor.
-MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key (void)
+MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key ()
 {
   this->mmdevice_ = AVStreams::MMDevice::_nil ();
 }
@@ -330,7 +330,7 @@ MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key (const MMDevice_Map_Hash_Key& hash_
 }
 
 // destructor.
-MMDevice_Map_Hash_Key::~MMDevice_Map_Hash_Key (void)
+MMDevice_Map_Hash_Key::~MMDevice_Map_Hash_Key ()
 {
   CORBA::release (this->mmdevice_);
 }
@@ -380,7 +380,7 @@ operator < (const MMDevice_Map_Hash_Key &left,
 }
 
 u_long
-MMDevice_Map_Hash_Key::hash (void)  const
+MMDevice_Map_Hash_Key::hash ()  const
 {
   u_long result = 0;
   try
@@ -399,7 +399,7 @@ MMDevice_Map_Hash_Key::hash (void)  const
 // TAO_StreamCtrl
 // ----------------------------------------------------------------------
 
-TAO_StreamCtrl::TAO_StreamCtrl (void)
+TAO_StreamCtrl::TAO_StreamCtrl ()
   :mcastconfigif_ (0)
 {
   try
@@ -418,7 +418,7 @@ TAO_StreamCtrl::TAO_StreamCtrl (void)
     }
 }
 
-TAO_StreamCtrl::~TAO_StreamCtrl (void)
+TAO_StreamCtrl::~TAO_StreamCtrl ()
 {
   delete this->mcastconfigif_;
 }
@@ -1146,7 +1146,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
 }
 
 void
-TAO_StreamCtrl::unbind (void)
+TAO_StreamCtrl::unbind ()
 {
   try
     {
@@ -1296,12 +1296,12 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
 // TAO_MCastConfigIf
 // ----------------------------------------------------------------------
 
-TAO_MCastConfigIf::TAO_MCastConfigIf (void)
+TAO_MCastConfigIf::TAO_MCastConfigIf ()
   :peer_list_iterator_ (peer_list_)
 {
 }
 
-TAO_MCastConfigIf::~TAO_MCastConfigIf (void)
+TAO_MCastConfigIf::~TAO_MCastConfigIf ()
 {
   //no-op
 }
@@ -1428,17 +1428,17 @@ TAO_MCastConfigIf::in_flowSpec (const AVStreams::flowSpec& flow_spec, const char
 // TAO_Base_StreamEndPoint
 // ----------------------------------------------------------------------
 
-TAO_Base_StreamEndPoint::TAO_Base_StreamEndPoint (void)
+TAO_Base_StreamEndPoint::TAO_Base_StreamEndPoint ()
   : protocol_object_set_ (0)
 {
 }
 
-TAO_Base_StreamEndPoint::~TAO_Base_StreamEndPoint (void)
+TAO_Base_StreamEndPoint::~TAO_Base_StreamEndPoint ()
 {
 }
 
 int
-TAO_Base_StreamEndPoint::handle_close (void)
+TAO_Base_StreamEndPoint::handle_close ()
 {
   // This method should not be defined, but EGCS complains endlessly
   // about it.
@@ -1446,7 +1446,7 @@ TAO_Base_StreamEndPoint::handle_close (void)
 }
 
 int
-TAO_Base_StreamEndPoint::handle_open (void)
+TAO_Base_StreamEndPoint::handle_open ()
 {
   return 0;
 }
@@ -1501,14 +1501,14 @@ TAO_Base_StreamEndPoint::set_protocol_object (const char * /*flowname*/,
 }
 
 void
-TAO_Base_StreamEndPoint::protocol_object_set (void)
+TAO_Base_StreamEndPoint::protocol_object_set ()
 {
   this->protocol_object_set_ = 1;
 }
 
 
 int
-TAO_Base_StreamEndPoint::is_protocol_object_set (void)
+TAO_Base_StreamEndPoint::is_protocol_object_set ()
 {
   return this->protocol_object_set_;
 }
@@ -1557,7 +1557,7 @@ TAO_Base_StreamEndPoint::set_control_flow_handler (const char *flowname,
 
 // constructor.
 
-TAO_StreamEndPoint::TAO_StreamEndPoint (void)
+TAO_StreamEndPoint::TAO_StreamEndPoint ()
   :flow_count_ (0),
    flow_num_ (0),
    mcast_port_ (ACE_DEFAULT_MULTICAST_PORT+1)
@@ -2381,7 +2381,7 @@ TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/,
   return 0;
 }
 
-TAO_StreamEndPoint::~TAO_StreamEndPoint (void)
+TAO_StreamEndPoint::~TAO_StreamEndPoint ()
 {
   //this->handle_close ();
   TAO_AV_FlowSpecSetItor begin = this->forward_flow_spec_set.begin ();
@@ -2416,7 +2416,7 @@ TAO_StreamEndPoint::~TAO_StreamEndPoint (void)
 // TAO_StreamEndPoint_A
 // ----------------------------------------------------------------------
 
-TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void)
+TAO_StreamEndPoint_A::TAO_StreamEndPoint_A ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamEndPoint_A::TAO_StreamEndPoint_A: created\n"));
 }
@@ -2613,7 +2613,7 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep
 
 }
 
-TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A (void)
+TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A ()
 {
 }
 
@@ -2621,7 +2621,7 @@ TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A (void)
 // TAO_StreamEndPoint_B
 // ----------------------------------------------------------------------
 
-TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
+TAO_StreamEndPoint_B::TAO_StreamEndPoint_B ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,
                                        "\n(%P|%t) TAO_StreamEndPoint_B::TAO_StreamEndPoint_B: created"));
@@ -2743,7 +2743,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
   return 1;
 }
 
-TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B (void)
+TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B ()
 {
 }
 
@@ -2751,7 +2751,7 @@ TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B (void)
 // TAO_VDev
 // ----------------------------------------------------------------------
 
-TAO_VDev::TAO_VDev (void)
+TAO_VDev::TAO_VDev ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,
               "(%P|%t) TAO_VDev::TAO_VDev: created\n"));
@@ -2919,7 +2919,7 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
   return 1;
 }
 
-TAO_VDev::~TAO_VDev (void)
+TAO_VDev::~TAO_VDev ()
 {
 }
 
@@ -3341,7 +3341,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name)
 }
 
 // destructor.
-TAO_MMDevice::~TAO_MMDevice (void)
+TAO_MMDevice::~TAO_MMDevice ()
 {
   delete this->stream_ctrl_;
 }
@@ -3351,7 +3351,7 @@ TAO_MMDevice::~TAO_MMDevice (void)
 //------------------------------------------------------------------
 
 // default constructor.
-TAO_FlowConnection::TAO_FlowConnection (void)
+TAO_FlowConnection::TAO_FlowConnection ()
   :fp_name_ (CORBA::string_dup ("")),
    ip_multicast_ (0)
 {
@@ -3381,7 +3381,7 @@ TAO_FlowConnection::set_protocol (const char *protocol)
 
 // stop this flow.
 void
-TAO_FlowConnection::stop (void)
+TAO_FlowConnection::stop ()
 {
   try
     {
@@ -3419,7 +3419,7 @@ TAO_FlowConnection::stop (void)
 
 // start this flow.
 void
-TAO_FlowConnection::start (void)
+TAO_FlowConnection::start ()
 {
   try
     {
@@ -3457,7 +3457,7 @@ TAO_FlowConnection::start (void)
 
 // destroy this flow.
 void
-TAO_FlowConnection::destroy (void)
+TAO_FlowConnection::destroy ()
 {
   try
     {
@@ -3627,7 +3627,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
 
 
 CORBA::Boolean
-TAO_FlowConnection::disconnect (void)
+TAO_FlowConnection::disconnect ()
 {
   return  0;
 }
@@ -3820,7 +3820,7 @@ TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target)
 // -----------------------------------------------------------------
 
 //default constructor.
-TAO_FlowEndPoint::TAO_FlowEndPoint (void)
+TAO_FlowEndPoint::TAO_FlowEndPoint ()
   :lock_ (0)
 {
 }
@@ -3889,7 +3889,7 @@ TAO_FlowEndPoint::set_flowname (const char *flowname)
 // used by one flowconnection so that multiple connections cant use
 // the same flowendpoint.
 CORBA::Boolean
-TAO_FlowEndPoint::lock (void)
+TAO_FlowEndPoint::lock ()
 {
   // lock the current flowendpoint
 
@@ -3901,14 +3901,14 @@ TAO_FlowEndPoint::lock (void)
 
 // unlocks the flowendpoint , becomes free to be used in another flow.
 void
-TAO_FlowEndPoint::unlock (void)
+TAO_FlowEndPoint::unlock ()
 {
   this->lock_ = 0;
 }
 
 
 void
-TAO_FlowEndPoint::destroy (void)
+TAO_FlowEndPoint::destroy ()
 {
   int result = TAO_AV_Core::deactivate_servant (this);
   if (result < 0)
@@ -3920,7 +3920,7 @@ TAO_FlowEndPoint::destroy (void)
 }
 
 AVStreams::StreamEndPoint_ptr
-TAO_FlowEndPoint::related_sep (void)
+TAO_FlowEndPoint::related_sep ()
 {
 
   return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ());
@@ -3933,7 +3933,7 @@ TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep)
 }
 
 AVStreams::FlowConnection_ptr
-TAO_FlowEndPoint::related_flow_connection (void)
+TAO_FlowEndPoint::related_flow_connection ()
 {
   return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ());
 }
@@ -3946,7 +3946,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
 
 // returns the connected peer for this flow
 AVStreams::FlowEndPoint_ptr
-TAO_FlowEndPoint::get_connected_fep (void)
+TAO_FlowEndPoint::get_connected_fep ()
 {
   return AVStreams::FlowEndPoint::_duplicate (this->peer_fep_.in ());
 }
@@ -4274,7 +4274,7 @@ TAO_FlowEndPoint::set_protocol_object (const char * /*flowname*/,
 // ------------------------------------------------------------
 
 //default constructor
-TAO_FlowProducer::TAO_FlowProducer (void)
+TAO_FlowProducer::TAO_FlowProducer ()
 {
 }
 
@@ -4294,7 +4294,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/)
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowProducer::stop (void)
+TAO_FlowProducer::stop ()
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4306,7 +4306,7 @@ TAO_FlowProducer::stop (void)
 }
 
 void
-TAO_FlowProducer::start (void)
+TAO_FlowProducer::start ()
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4418,7 +4418,7 @@ TAO_FlowProducer::set_source_id (CORBA::Long source_id)
 
 
 // default constructor.
-TAO_FlowConsumer::TAO_FlowConsumer (void)
+TAO_FlowConsumer::TAO_FlowConsumer ()
 {
 }
 
@@ -4431,7 +4431,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname,
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowConsumer::stop (void)
+TAO_FlowConsumer::stop ()
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4440,7 +4440,7 @@ TAO_FlowConsumer::stop (void)
 }
 
 void
-TAO_FlowConsumer::start (void)
+TAO_FlowConsumer::start ()
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4551,7 +4551,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter)
 }
 
 char*
-TAO_Tokenizer::token (void)
+TAO_Tokenizer::token ()
 {
   if (count_ < num_tokens_)
     return CORBA::string_dup (this->token_array_[this->count_++]);
@@ -4560,7 +4560,7 @@ TAO_Tokenizer::token (void)
 }
 
 int
-TAO_Tokenizer::num_tokens (void)
+TAO_Tokenizer::num_tokens ()
 {
   return static_cast<int> (this->num_tokens_);
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 459d8979c95..f245d0d2535 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -964,8 +964,7 @@ public:
    */
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol)
-    = 0;
+                                          const char * use_flow_protocol) = 0;
 
   /// connect to the peer endpoint.
   virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
@@ -981,8 +980,7 @@ public:
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol)
-    = 0;
+                               char *& flowProtocol) = 0;
 
   /// listen request from the peer.
   virtual char * go_to_listen_i (TAO_FlowSpec_Entry::Role role,
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index ea7a4029ee1..0c5f67b7260 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -30,7 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // TAO_AV_Core
 //------------------------------------------------------------
 
-TAO_AV_Core::TAO_AV_Core (void)
+TAO_AV_Core::TAO_AV_Core ()
   :connector_registry_ (0),
    acceptor_registry_ (0)
 {
@@ -42,7 +42,7 @@ TAO_AV_Core::TAO_AV_Core (void)
            );
 }
 
-TAO_AV_Core::~TAO_AV_Core (void)
+TAO_AV_Core::~TAO_AV_Core ()
 {
   delete this->connector_registry_;
   delete this->acceptor_registry_;
@@ -76,7 +76,7 @@ TAO_AV_Core::~TAO_AV_Core (void)
 }
 
 CORBA::ORB_ptr
-TAO_AV_Core::orb (void)
+TAO_AV_Core::orb ()
 {
   return this->orb_.in ();
 }
@@ -88,7 +88,7 @@ TAO_AV_Core::orb (CORBA::ORB_ptr orb)
 }
 
 PortableServer::POA_ptr
-TAO_AV_Core::poa (void)
+TAO_AV_Core::poa ()
 {
   return this->poa_.in ();
 }
@@ -100,38 +100,38 @@ TAO_AV_Core::poa (PortableServer::POA_ptr poa)
 }
 
 TAO_AV_Connector_Registry*
-TAO_AV_Core::connector_registry (void)
+TAO_AV_Core::connector_registry ()
 {
   return this->connector_registry_;
 }
 
 TAO_AV_Acceptor_Registry*
-TAO_AV_Core::acceptor_registry (void)
+TAO_AV_Core::acceptor_registry ()
 {
   return this->acceptor_registry_;
 }
 
 TAO_AV_TransportFactorySet *
-TAO_AV_Core::transport_factories (void)
+TAO_AV_Core::transport_factories ()
 {
   return &this->transport_factories_;
 }
 
 TAO_AV_Flow_ProtocolFactorySet*
-TAO_AV_Core::flow_protocol_factories (void)
+TAO_AV_Core::flow_protocol_factories ()
 {
   return &this->flow_protocol_factories_;
 }
 
 int
-TAO_AV_Core::stop_run (void)
+TAO_AV_Core::stop_run ()
 {
   this->stop_run_ = 1;
   return 0;
 }
 
 int
-TAO_AV_Core::run (void)
+TAO_AV_Core::run ()
 {
   this->stop_run_ = 0;
   while (!this->stop_run_ && this->orb_->work_pending ())
@@ -146,7 +146,7 @@ TAO_AV_Core::reactor (ACE_Reactor *r)
 }
 
 ACE_Reactor *
-TAO_AV_Core::reactor (void)
+TAO_AV_Core::reactor ()
 {
   return this->reactor_;
 }
@@ -694,7 +694,7 @@ TAO_AV_Core::get_transport_factory(const char *transport_protocol)
 }
 
 int
-TAO_AV_Core::load_default_transport_factories (void)
+TAO_AV_Core::load_default_transport_factories ()
 {
   const char *udp_factory_str = "UDP_Factory";
   const char *tcp_factory_str = "TCP_Factory";
@@ -813,7 +813,7 @@ TAO_AV_Core::load_default_transport_factories (void)
 }
 
 int
-TAO_AV_Core::init_transport_factories (void)
+TAO_AV_Core::init_transport_factories ()
 {
   TAO_AV_TransportFactorySetItor end = this->transport_factories_.end ();
   TAO_AV_TransportFactorySetItor factory = this->transport_factories_.begin ();
@@ -861,7 +861,7 @@ TAO_AV_Core::init_transport_factories (void)
 }
 
 int
-TAO_AV_Core::load_default_flow_protocol_factories (void)
+TAO_AV_Core::load_default_flow_protocol_factories ()
 {
   const char *udp_flow = "UDP_Flow_Factory";
   const char *tcp_flow = "TCP_Flow_Factory";
@@ -1051,7 +1051,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void)
 }
 
 int
-TAO_AV_Core::init_flow_protocol_factories (void)
+TAO_AV_Core::init_flow_protocol_factories ()
 {
   TAO_AV_Flow_ProtocolFactorySetItor end = this->flow_protocol_factories_.end ();
   TAO_AV_Flow_ProtocolFactorySetItor factory = this->flow_protocol_factories_.begin ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 882a2d742a3..ed0f32ee71a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -22,12 +22,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // ----------------------------------------------------------------------
 
 // Constructor
-TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy (void)
+TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy ()
 {
 }
 
 // Destructor.
-TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void)
+TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy ()
 {
 }
 
@@ -71,7 +71,7 @@ TAO_AV_Endpoint_Process_Strategy::TAO_AV_Endpoint_Process_Strategy (ACE_Process_
 }
 
 // Destructor.
-TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy (void)
+TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy ()
 {
 }
 
@@ -80,7 +80,7 @@ TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy (void)
 // to get the object references to the various objects created in the
 // child
 int
-TAO_AV_Endpoint_Process_Strategy::activate (void)
+TAO_AV_Endpoint_Process_Strategy::activate ()
 {
   ACE_Process process;
 
@@ -160,7 +160,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
 
 // Get ourselves a Naming service reference
 int
-TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void)
+TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service ()
 {
   try
     {
@@ -188,7 +188,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void)
 
 // Get the VDev created in the child process from the namingservice
 int
-TAO_AV_Endpoint_Process_Strategy::get_vdev (void)
+TAO_AV_Endpoint_Process_Strategy::get_vdev ()
 {
   try
     {
@@ -240,7 +240,7 @@ TAO_AV_Endpoint_Process_Strategy_A::TAO_AV_Endpoint_Process_Strategy_A (ACE_Proc
 }
 
 // Destructor
-TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void)
+TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A ()
 {
 }
 
@@ -264,7 +264,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
 
 // Gets the stream endpoint object reference from the naming service
 int
-TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void)
+TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint ()
 {
   try
     {
@@ -317,7 +317,7 @@ TAO_AV_Endpoint_Process_Strategy_B::TAO_AV_Endpoint_Process_Strategy_B (ACE_Proc
 }
 
 // Destructor
-TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void)
+TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B ()
 {
 }
 
@@ -353,7 +353,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
 
 // Gets the B type stream_endpoint from the Naming service
 int
-TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void)
+TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint ()
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index bff251c8e52..ee6a19ed0eb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -18,7 +18,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // constructor.
-TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void)
+TAO_FlowSpec_Entry::TAO_FlowSpec_Entry ()
   :address_ (0),
    clean_up_address_ (0),
    control_address_ (0),
@@ -137,7 +137,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (const char *flowname,
 }
 
 // Destructor.
-TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry (void)
+TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry ()
 {
   if (this->delete_peer_addr_)
     delete this->peer_addr_;
@@ -151,7 +151,7 @@ TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry (void)
 }
 
 int
-TAO_FlowSpec_Entry::set_protocol (void)
+TAO_FlowSpec_Entry::set_protocol ()
 {
   if (!this->use_flow_protocol_)
     {
@@ -459,7 +459,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
 }
 
 char *
-TAO_FlowSpec_Entry::get_local_addr_str (void)
+TAO_FlowSpec_Entry::get_local_addr_str ()
 {
   if (this->local_addr_ == 0)
     return 0;
@@ -489,7 +489,7 @@ TAO_FlowSpec_Entry::get_local_addr_str (void)
 //------------------------------------------------------------
 
 // default constructor.
-TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry (void)
+TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry ()
 {
 }
 
@@ -525,7 +525,7 @@ TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry (const char *flowname,
 {
 }
 
-TAO_Forward_FlowSpec_Entry::~TAO_Forward_FlowSpec_Entry (void)
+TAO_Forward_FlowSpec_Entry::~TAO_Forward_FlowSpec_Entry ()
 {
 }
 
@@ -607,7 +607,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry)
 }
 
 TAO_FlowSpec_Entry::Role
-TAO_Forward_FlowSpec_Entry::role (void)
+TAO_Forward_FlowSpec_Entry::role ()
 {
   if (this->role_ != TAO_AV_INVALID_ROLE)
     return this->role_;
@@ -626,7 +626,7 @@ TAO_Forward_FlowSpec_Entry::role (void)
 }
 
 const char *
-TAO_Forward_FlowSpec_Entry::entry_to_string (void)
+TAO_Forward_FlowSpec_Entry::entry_to_string ()
 {
   if (this->flowname_.length() == 0)
     return "";
@@ -821,7 +821,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
 //------------------------------------------------------------
 
 //default constructor.
-TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry (void)
+TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry ()
 {
 }
 
@@ -857,12 +857,12 @@ TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry (const char *flowname,
 {
 }
 
-TAO_Reverse_FlowSpec_Entry::~TAO_Reverse_FlowSpec_Entry (void)
+TAO_Reverse_FlowSpec_Entry::~TAO_Reverse_FlowSpec_Entry ()
 {
 }
 
 TAO_FlowSpec_Entry::Role
-TAO_Reverse_FlowSpec_Entry::role (void)
+TAO_Reverse_FlowSpec_Entry::role ()
 {
   if (this->role_ != TAO_AV_INVALID_ROLE)
     return this->role_;
@@ -903,7 +903,7 @@ TAO_Reverse_FlowSpec_Entry::parse (const char *flowSpec_entry)
 
 
 const char *
-TAO_Reverse_FlowSpec_Entry::entry_to_string (void)
+TAO_Reverse_FlowSpec_Entry::entry_to_string ()
 {
   if (this->flowname_.length() == 0)
     return "";
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index 6aca9ffafce..8848fffcf47 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //TAO_AV_UDP_MCast_Flow_Handler
 //------------------------------------------------------------
 
-TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler (void)
+TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler ()
 {
   ACE_NEW (transport_,
            TAO_AV_UDP_MCast_Transport (this));
@@ -22,7 +22,7 @@ TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler (void)
            ACE_SOCK_Dgram_Mcast);
 }
 
-TAO_AV_UDP_MCast_Flow_Handler::~TAO_AV_UDP_MCast_Flow_Handler (void)
+TAO_AV_UDP_MCast_Flow_Handler::~TAO_AV_UDP_MCast_Flow_Handler ()
 {
   delete this->transport_;
   delete this->dgram_mcast_;
@@ -44,7 +44,7 @@ TAO_AV_UDP_MCast_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
 }
 
 ACE_HANDLE
-TAO_AV_UDP_MCast_Flow_Handler::get_handle (void) const
+TAO_AV_UDP_MCast_Flow_Handler::get_handle () const
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Flow_Handler::get_handle "));
   return this->get_mcast_socket ()->get_handle () ;
@@ -60,7 +60,7 @@ TAO_AV_UDP_MCast_Flow_Handler::set_peer_addr (ACE_INET_Addr *peer_addr)
 // TAO_AV_UDP_MCast_Transport
 //------------------------------------------------------------
 
-TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport (void)
+TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport ()
   :handler_ (0)
 {
 }
@@ -70,7 +70,7 @@ TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport (TAO_AV_UDP_MCast_Flow_Ha
 {
 }
 
-TAO_AV_UDP_MCast_Transport::~TAO_AV_UDP_MCast_Transport (void)
+TAO_AV_UDP_MCast_Transport::~TAO_AV_UDP_MCast_Transport ()
 {
 }
 
@@ -81,20 +81,20 @@ TAO_AV_UDP_MCast_Transport::open (ACE_Addr * /*address*/)
 }
 
 int
-TAO_AV_UDP_MCast_Transport::close (void)
+TAO_AV_UDP_MCast_Transport::close ()
 {
   return 0;
 }
 
 
 ACE_Addr*
-TAO_AV_UDP_MCast_Transport::get_peer_addr (void)
+TAO_AV_UDP_MCast_Transport::get_peer_addr ()
 {
   return &this->peer_addr_;
 }
 
 ACE_Addr*
-TAO_AV_UDP_MCast_Transport::get_local_addr (void)
+TAO_AV_UDP_MCast_Transport::get_local_addr ()
 {
   this->handler_->get_mcast_socket ()->get_local_addr (this->local_addr_);
   return &this->local_addr_;
@@ -182,7 +182,7 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov,
 }
 
 int
-TAO_AV_UDP_MCast_Transport::mtu (void)
+TAO_AV_UDP_MCast_Transport::mtu ()
 {
   return ACE_MAX_DGRAM_SIZE;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
index a5b375deb70..b05af920247 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -28,23 +28,23 @@ TAO_AV_Payload_Type_Policy::TAO_AV_Payload_Type_Policy (int payload_type)
 }
 
 // TAO_AV_RTP_Sdes_Policy
-TAO_AV_RTCP_Sdes_Policy::TAO_AV_RTCP_Sdes_Policy (void)
+TAO_AV_RTCP_Sdes_Policy::TAO_AV_RTCP_Sdes_Policy ()
   :TAO_AV_Policy (TAO_AV_RTCP_SDES_POLICY)
 {
 }
 
-TAO_AV_SFP_Credit_Policy::TAO_AV_SFP_Credit_Policy (void)
+TAO_AV_SFP_Credit_Policy::TAO_AV_SFP_Credit_Policy ()
   :TAO_AV_Policy (TAO_AV_SFP_CREDIT_POLICY)
 {
 }
 
 // TAO_AV_Callback
-TAO_AV_Callback::TAO_AV_Callback (void)
+TAO_AV_Callback::TAO_AV_Callback ()
    :protocol_object_ (0)
 {
 }
 
-TAO_AV_Callback::~TAO_AV_Callback (void)
+TAO_AV_Callback::~TAO_AV_Callback ()
 {
 }
 
@@ -59,14 +59,14 @@ TAO_AV_Callback::open (TAO_AV_Protocol_Object *object,
 }
 
 int
-TAO_AV_Callback::handle_start (void)
+TAO_AV_Callback::handle_start ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_start\n"));
   return -1;
 }
 
 int
-TAO_AV_Callback::handle_stop (void)
+TAO_AV_Callback::handle_stop ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_stop\n"));
   return -1;
@@ -89,7 +89,7 @@ TAO_AV_Callback::receive_control_frame (ACE_Message_Block *,
 }
 
 int
-TAO_AV_Callback::handle_destroy (void)
+TAO_AV_Callback::handle_destroy ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_end_stream\n"));
   return -1;
@@ -111,7 +111,7 @@ TAO_AV_Callback::handle_timeout (void * /*arg*/)
 }
 
 TAO_AV_PolicyList
-TAO_AV_Callback::get_policies (void)
+TAO_AV_Callback::get_policies ()
 {
   TAO_AV_PolicyList list;
   return list;
@@ -130,7 +130,7 @@ TAO_AV_Callback::get_policies (void)
 // }
 
 TAO_AV_Protocol_Object*
-TAO_AV_Callback::protocol_object (void)
+TAO_AV_Callback::protocol_object ()
 {
   return this->protocol_object_;
 }
@@ -142,7 +142,7 @@ TAO_AV_Callback::protocol_object (void)
 // }
 
 int
-TAO_AV_Callback::schedule_timer (void)
+TAO_AV_Callback::schedule_timer ()
 {
   return this->handler_->schedule_timer ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
index 841f7fda285..17866cd0922 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
@@ -9,12 +9,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_AV_Flow_Protocol_Factory
-TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory (void)
+TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory ()
  : ref_count (0)
 {
 }
 
-TAO_AV_Flow_Protocol_Factory::~TAO_AV_Flow_Protocol_Factory (void)
+TAO_AV_Flow_Protocol_Factory::~TAO_AV_Flow_Protocol_Factory ()
 {
 }
 
@@ -41,7 +41,7 @@ TAO_AV_Flow_Protocol_Factory::make_protocol_object (TAO_FlowSpec_Entry * /* entr
 }
 
 const char *
-TAO_AV_Flow_Protocol_Factory::control_flow_factory (void)
+TAO_AV_Flow_Protocol_Factory::control_flow_factory ()
 {
   return 0;
 }
@@ -49,7 +49,7 @@ TAO_AV_Flow_Protocol_Factory::control_flow_factory (void)
 //----------------------------------------------------------------------
 // TAO_AV_Protocol_Object
 //----------------------------------------------------------------------
-TAO_AV_Protocol_Object::TAO_AV_Protocol_Object (void)
+TAO_AV_Protocol_Object::TAO_AV_Protocol_Object ()
   :transport_ (0),
    callback_ (0)
 {
@@ -71,18 +71,18 @@ TAO_AV_Protocol_Object::open (TAO_AV_Callback *callback,
   return 0;
 }
 
-TAO_AV_Protocol_Object::~TAO_AV_Protocol_Object (void)
+TAO_AV_Protocol_Object::~TAO_AV_Protocol_Object ()
 {
 }
 
 int
-TAO_AV_Protocol_Object::start (void)
+TAO_AV_Protocol_Object::start ()
 {
   return this->callback_->handle_start ();
 }
 
 int
-TAO_AV_Protocol_Object::stop (void)
+TAO_AV_Protocol_Object::stop ()
 {
   return this->callback_->handle_stop ();
 }
@@ -95,13 +95,13 @@ TAO_AV_Protocol_Object::set_policies (const TAO_AV_PolicyList &policy_list)
 }
 
 TAO_AV_PolicyList
-TAO_AV_Protocol_Object::get_policies (void)
+TAO_AV_Protocol_Object::get_policies ()
 {
   return this->policy_list_;
 }
 
 TAO_AV_Transport*
-TAO_AV_Protocol_Object::transport (void)
+TAO_AV_Protocol_Object::transport ()
 {
   return this->transport_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 084d1fc8421..feb571fe886 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -332,11 +332,11 @@ TAO_AV_RTCP::rtcp_interval (int members,
 
 
 // TAO_AV_RTCP_Flow_Factory
-TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory (void)
+TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory ()
 {
 }
 
-TAO_AV_RTCP_Flow_Factory::~TAO_AV_RTCP_Flow_Factory (void)
+TAO_AV_RTCP_Flow_Factory::~TAO_AV_RTCP_Flow_Factory ()
 {
 }
 
@@ -383,7 +383,7 @@ TAO_AV_RTCP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry * /*entry*/,
 
 // TAO_AV_RTCP_Object
 int
-TAO_AV_RTCP_Object::handle_input (void)
+TAO_AV_RTCP_Object::handle_input ()
 {
   size_t bufsiz = 2*this->transport_->mtu ();
   ACE_Message_Block data (bufsiz);
@@ -440,12 +440,12 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb,
 
 }
 
-TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object (void)
+TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object ()
 {
 }
 
 int
-TAO_AV_RTCP_Object::destroy (void)
+TAO_AV_RTCP_Object::destroy ()
 {
   this->callback_->handle_destroy ();
   delete this;
@@ -460,13 +460,13 @@ TAO_AV_RTCP_Object::set_policies (const TAO_AV_PolicyList &/*policy_list*/)
 }
 
 int
-TAO_AV_RTCP_Object::start (void)
+TAO_AV_RTCP_Object::start ()
 {
   return this->callback_->handle_start ();
 }
 
 int
-TAO_AV_RTCP_Object::stop (void)
+TAO_AV_RTCP_Object::stop ()
 {
   return this->callback_->handle_stop ();
 }
@@ -496,7 +496,7 @@ TAO_AV_RTCP_Object::ts_offset (ACE_UINT32 ts_offset)
 }
 
 // TAO_AV_RTCP_Callback
-TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback (void)
+TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback ()
   :is_initial_timeout_(1),
    packet_size_(0)
 {
@@ -510,7 +510,7 @@ TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback (void)
   this->output_.cname(cname);
 }
 
-TAO_AV_RTCP_Callback::~TAO_AV_RTCP_Callback (void)
+TAO_AV_RTCP_Callback::~TAO_AV_RTCP_Callback ()
 {
 }
 
@@ -521,13 +521,13 @@ TAO_AV_RTCP_Callback::schedule (int ms)
 }
 
 int
-TAO_AV_RTCP_Callback::handle_start (void)
+TAO_AV_RTCP_Callback::handle_start ()
 {
   return 0;
 }
 
 int
-TAO_AV_RTCP_Callback::handle_stop (void)
+TAO_AV_RTCP_Callback::handle_stop ()
 {
   return this->send_report(1);
 }
@@ -773,7 +773,7 @@ TAO_AV_RTCP_Callback::get_timeout (ACE_Time_Value *&tv,
 }
 
 int
-TAO_AV_RTCP_Callback::handle_destroy (void)
+TAO_AV_RTCP_Callback::handle_destroy ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
index 63fcc7c4899..752b1a21d6d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
@@ -29,7 +29,7 @@ RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc,
   this->peer_address_ = inet_addr;
 }
 
-RTCP_Channel_In::~RTCP_Channel_In(void)
+RTCP_Channel_In::~RTCP_Channel_In()
 {
   delete this->peer_address_;
 }
@@ -237,7 +237,7 @@ RTCP_Channel_In::recv_rtp_packet(ACE_Message_Block *mb,
 
 
 RR_Block *
-RTCP_Channel_In::getRRBlock(void)
+RTCP_Channel_In::getRRBlock()
 {
   // If no data has been received since the last report, don't create a block.
   if (!this->data_since_last_report_)
@@ -310,7 +310,7 @@ RTCP_Channel_In::getRRBlock(void)
   return local_block_ptr;
 }
 
-RTCP_Channel_Out::RTCP_Channel_Out(void)
+RTCP_Channel_Out::RTCP_Channel_Out()
   :cname_ ("cname"),
    active_ (0),
    timestamp_ (0),
@@ -319,7 +319,7 @@ RTCP_Channel_Out::RTCP_Channel_Out(void)
 {
 }
 
-RTCP_Channel_Out::~RTCP_Channel_Out(void)
+RTCP_Channel_Out::~RTCP_Channel_Out()
 {
 }
 
@@ -337,25 +337,25 @@ RTCP_Channel_Out::updateStatistics (RTP_Packet *data_packet)
 }
 
 ACE_UINT32
-RTCP_Channel_Out::timestamp (void)
+RTCP_Channel_Out::timestamp ()
 {
   return this->timestamp_;
 }
 
 ACE_UINT32
-RTCP_Channel_Out::packets_sent (void)
+RTCP_Channel_Out::packets_sent ()
 {
   return this->packets_sent_;
 }
 
 ACE_UINT32
-RTCP_Channel_Out::octets_sent (void)
+RTCP_Channel_Out::octets_sent ()
 {
   return this->octets_sent_;
 }
 
 char
-RTCP_Channel_Out::active (void)
+RTCP_Channel_Out::active ()
 {
   return this->active_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 8c0be928bc6..94fa8838943 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-RTCP_Packet::RTCP_Packet(void)
+RTCP_Packet::RTCP_Packet()
 {
   this->chd_.ver_ = 2;
   this->chd_.count_ = 0;
@@ -30,7 +30,7 @@ RTCP_Packet::RTCP_Packet(char* buffer)
   this->packet_data_ = 0;
 }
 
-RTCP_Packet::~RTCP_Packet(void)
+RTCP_Packet::~RTCP_Packet()
 {
 }
 
@@ -159,7 +159,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(char* buffer, int *len)
 
 //==============================================================================
 
-RTCP_BYE_Packet::~RTCP_BYE_Packet(void)
+RTCP_BYE_Packet::~RTCP_BYE_Packet()
 {
   if (this->ssrc_list_)
     delete []this->ssrc_list_;
@@ -170,7 +170,7 @@ RTCP_BYE_Packet::~RTCP_BYE_Packet(void)
 //==============================================================================
 
 unsigned int
-RTCP_BYE_Packet::packet_size(void)
+RTCP_BYE_Packet::packet_size()
 {
   ACE_UINT16 size = static_cast<ACE_UINT16> ((1+chd_.count_) * 4);
 
@@ -196,7 +196,7 @@ RTCP_BYE_Packet::ssrc_list(ACE_UINT32 **ssrc_list, unsigned char &length)
 //==============================================================================
 
 const char *
-RTCP_BYE_Packet::reason (void)
+RTCP_BYE_Packet::reason ()
 {
   ACE_CString reason = (const char *)this->reason_;
 
@@ -206,7 +206,7 @@ RTCP_BYE_Packet::reason (void)
 //==============================================================================
 
 void
-RTCP_BYE_Packet::build_packet(void)
+RTCP_BYE_Packet::build_packet()
 {
   unsigned int index;
   unsigned int i;
@@ -248,7 +248,7 @@ RTCP_BYE_Packet::build_packet(void)
 }
 
 void
-RTCP_BYE_Packet::dump (void)
+RTCP_BYE_Packet::dump ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "\nRTCP_BYE_Packet:: from ssrc(s) "));
@@ -344,7 +344,7 @@ RTCP_RR_Packet::RTCP_RR_Packet (char* buffer,
 
 //==============================================================================
 
-RTCP_RR_Packet::~RTCP_RR_Packet(void)
+RTCP_RR_Packet::~RTCP_RR_Packet()
 {
   RR_Block *prev;
 
@@ -365,7 +365,7 @@ RTCP_RR_Packet::~RTCP_RR_Packet(void)
 //==============================================================================
 
 unsigned int
-RTCP_RR_Packet::packet_size(void)
+RTCP_RR_Packet::packet_size()
 {
     ACE_UINT16 size = static_cast<ACE_UINT16> ((2+this->chd_.count_*6) * 4);
     return size;
@@ -374,7 +374,7 @@ RTCP_RR_Packet::packet_size(void)
 //==============================================================================
 
 void
-RTCP_RR_Packet::build_packet(void)
+RTCP_RR_Packet::build_packet()
 {
   int index;
   RR_Block *local_block_ptr;
@@ -419,7 +419,7 @@ RTCP_RR_Packet::build_packet(void)
 }
 
 void
-RTCP_RR_Packet::dump (void)
+RTCP_RR_Packet::dump ()
 {
   RR_Block *b = this->rr_;
   int count = 1;
@@ -450,7 +450,7 @@ RTCP_RR_Packet::dump (void)
 }
 
 
-RTCP_SDES_Packet::RTCP_SDES_Packet(void) :
+RTCP_SDES_Packet::RTCP_SDES_Packet() :
                    RTCP_Packet ()
 {
   this->chd_.pt_ = RTCP_PT_SDES;
@@ -563,7 +563,7 @@ RTCP_SDES_Packet::RTCP_SDES_Packet(char* buffer, int *len):
 
 //==============================================================================
 
-RTCP_SDES_Packet::~RTCP_SDES_Packet(void)
+RTCP_SDES_Packet::~RTCP_SDES_Packet()
 {
   sdesChunk_t *cp; // pointer to chunk
   sdesChunk_t *cpprev;
@@ -778,7 +778,7 @@ RTCP_SDES_Packet::add_priv_item (ACE_UINT32 ssrc,
 //==============================================================================
 
 unsigned int
-RTCP_SDES_Packet::packet_size(void)
+RTCP_SDES_Packet::packet_size()
 {
   int size;
   sdesChunk_t *cp; // pointer to chunk
@@ -817,7 +817,7 @@ RTCP_SDES_Packet::packet_size(void)
 //==============================================================================
 
 void
-RTCP_SDES_Packet::build_packet(void)
+RTCP_SDES_Packet::build_packet()
 {
   sdesChunk_t *cp; // pointer to chunk
   sdesItem_t *ip; // pointer to item
@@ -900,7 +900,7 @@ RTCP_SDES_Packet::build_packet(void)
 }
 
 void
-RTCP_SDES_Packet::dump (void)
+RTCP_SDES_Packet::dump ()
 {
   sdesItem_t *ip;
 
@@ -1087,7 +1087,7 @@ RTCP_SR_Packet::RTCP_SR_Packet (char* buffer,
 
 //==============================================================================
 
-RTCP_SR_Packet::~RTCP_SR_Packet(void)
+RTCP_SR_Packet::~RTCP_SR_Packet()
 {
   RR_Block *prev;
 
@@ -1107,7 +1107,7 @@ RTCP_SR_Packet::~RTCP_SR_Packet(void)
 
 //==============================================================================
 
-unsigned int RTCP_SR_Packet::packet_size (void)
+unsigned int RTCP_SR_Packet::packet_size ()
 {
   ACE_UINT16 size  = static_cast<ACE_UINT16> ((2+chd_.count_*6) * 4); // + profile specific extensions ?
   size += 20; // the first line is the same as RR; 20 more bytes for SR
@@ -1117,7 +1117,7 @@ unsigned int RTCP_SR_Packet::packet_size (void)
 
 //==============================================================================
 
-void RTCP_SR_Packet::build_packet(void)
+void RTCP_SR_Packet::build_packet()
 {
   int index = 0;
   RR_Block *local_block_ptr;
@@ -1171,7 +1171,7 @@ void RTCP_SR_Packet::build_packet(void)
 }
 
 void
-RTCP_SR_Packet::dump (void)
+RTCP_SR_Packet::dump ()
 {
   RR_Block *b = this->rr_;
   int count = 1;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index a7378a76974..633b870830e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -175,78 +175,78 @@ RTP_Packet::RTP_Packet(unsigned char padding,
       }
 }
 
-RTP_Packet::~RTP_Packet(void)
+RTP_Packet::~RTP_Packet()
 {
 }
 
 ACE_UINT16
-RTP_Packet::packet_size(void)
+RTP_Packet::packet_size()
 {
     return this->packet_size_;
 }
 
 ACE_UINT16
-RTP_Packet::payload_size(void)
+RTP_Packet::payload_size()
 {
     return this->payload_size_;
 }
 
 unsigned int
-RTP_Packet::ver (void)
+RTP_Packet::ver ()
 {
   return ( this->packet_[0] & 0xC0 ) >> 6;
 }
 
 unsigned int
-RTP_Packet::pad (void)
+RTP_Packet::pad ()
 {
   return ( this->packet_[0] & 0x20 ) >> 5;
 }
 
 unsigned int
-RTP_Packet::ext (void)
+RTP_Packet::ext ()
 {
   return ( this->packet_[0] & 0x10 ) >> 4;
 }
 
 unsigned int
-RTP_Packet::cc  (void)
+RTP_Packet::cc  ()
 {
   return ( this->packet_[0] & 0x0F ) ;
 }
 
 unsigned int
-RTP_Packet::mrk (void)
+RTP_Packet::mrk ()
 {
   return ( this->packet_[1] & 0x80 ) >> 7;
 }
 
 unsigned int
-RTP_Packet::pt  (void)
+RTP_Packet::pt  ()
 {
   return ( this->packet_[1] & 0x7F ) ;
 }
 
 ACE_UINT16
-RTP_Packet::sn  (void)
+RTP_Packet::sn  ()
 {
   return ntohs(*(ACE_UINT16*)(&this->packet_[2])) ;
 }
 
 ACE_UINT32
-RTP_Packet::ts  (void)
+RTP_Packet::ts  ()
 {
   return ntohl(*(ACE_UINT32*)(&this->packet_[4])) ;
 }
 
 ACE_UINT32
-RTP_Packet::ssrc (void)
+RTP_Packet::ssrc ()
 {
   return ntohl(*(ACE_UINT32*)(&this->packet_[8])) ;
 }
 
 unsigned int
-RTP_Packet::ext_bytes (void)
+RTP_Packet::ext_bytes ()
 {
   return this->extension_bytes_;
 }
@@ -262,7 +262,7 @@ RTP_Packet::get_frame_info (TAO_AV_frame_info *frame_info)
 }
 
 int
-RTP_Packet::is_valid (void)
+RTP_Packet::is_valid ()
 {
   // taken from RFC 1889 - Appendix A.1
 
@@ -315,7 +315,7 @@ RTP_Packet::get_packet_data (char **packet, ACE_UINT16 &length)
 // TAO_AV_RTP_Object
 
 int
-TAO_AV_RTP_Object::handle_input (void)
+TAO_AV_RTP_Object::handle_input ()
 {
   TAO_AV_frame_info frame_info;
 
@@ -638,12 +638,12 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback,
   this->frame_.size (2 * this->transport_->mtu ());
 }
 
-TAO_AV_RTP_Object::~TAO_AV_RTP_Object (void)
+TAO_AV_RTP_Object::~TAO_AV_RTP_Object ()
 {
 }
 
 int
-TAO_AV_RTP_Object::destroy (void)
+TAO_AV_RTP_Object::destroy ()
 {
   if(this->control_object_)
      this->control_object_->destroy ();
@@ -702,25 +702,25 @@ TAO_AV_RTP_Object::control_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-TAO_AV_RTP_Object::start (void)
+TAO_AV_RTP_Object::start ()
 {
   this->control_object_->start ();
   return this->callback_->handle_start ();
 }
 
 int
-TAO_AV_RTP_Object::stop (void)
+TAO_AV_RTP_Object::stop ()
 {
   this->control_object_->stop ();
   return this->callback_->handle_stop ();
 }
 
 // TAO_AV_RTP_Flow_Factory
-TAO_AV_RTP_Flow_Factory::TAO_AV_RTP_Flow_Factory (void)
+TAO_AV_RTP_Flow_Factory::TAO_AV_RTP_Flow_Factory ()
 {
 }
 
-TAO_AV_RTP_Flow_Factory::~TAO_AV_RTP_Flow_Factory (void)
+TAO_AV_RTP_Flow_Factory::~TAO_AV_RTP_Flow_Factory ()
 {
 }
 
@@ -768,7 +768,7 @@ TAO_AV_RTP_Flow_Factory::match_protocol (const char *flow_string)
 }
 
 const char *
-TAO_AV_RTP_Flow_Factory::control_flow_factory (void)
+TAO_AV_RTP_Flow_Factory::control_flow_factory ()
 {
   return "RTCP";
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index afe9e424271..8e0291e108d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // TAO_AV_TCP_Transport
 //------------------------------------------------------------
 
-TAO_AV_TCP_Transport::TAO_AV_TCP_Transport (void)
+TAO_AV_TCP_Transport::TAO_AV_TCP_Transport ()
   :handler_ (0)
 {
 }
@@ -22,7 +22,7 @@ TAO_AV_TCP_Transport::TAO_AV_TCP_Transport (TAO_AV_TCP_Flow_Handler *handler)
 {
 }
 
-TAO_AV_TCP_Transport::~TAO_AV_TCP_Transport (void)
+TAO_AV_TCP_Transport::~TAO_AV_TCP_Transport ()
 {
 }
 
@@ -33,19 +33,19 @@ TAO_AV_TCP_Transport::open (ACE_Addr * /*address*/)
 }
 
 int
-TAO_AV_TCP_Transport::close (void)
+TAO_AV_TCP_Transport::close ()
 {
   return 0;
 }
 
 int
-TAO_AV_TCP_Transport::mtu (void)
+TAO_AV_TCP_Transport::mtu ()
 {
   return -1;
 }
 
 ACE_Addr*
-TAO_AV_TCP_Transport::get_peer_addr (void)
+TAO_AV_TCP_Transport::get_peer_addr ()
 {
   return 0;
 }
@@ -153,11 +153,11 @@ TAO_AV_TCP_Transport::recv (iovec *iov,
 // TAO_AV_TCP_Protocol_Factory
 //------------------------------------------------------------
 
-TAO_AV_TCP_Factory::TAO_AV_TCP_Factory (void)
+TAO_AV_TCP_Factory::TAO_AV_TCP_Factory ()
 {
 }
 
-TAO_AV_TCP_Factory::~TAO_AV_TCP_Factory (void)
+TAO_AV_TCP_Factory::~TAO_AV_TCP_Factory ()
 {
 }
 
@@ -177,7 +177,7 @@ TAO_AV_TCP_Factory::match_protocol (const char *protocol_string)
 }
 
 TAO_AV_Acceptor*
-TAO_AV_TCP_Factory::make_acceptor (void)
+TAO_AV_TCP_Factory::make_acceptor ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_acceptor "));
   TAO_AV_Acceptor *acceptor = 0;
@@ -188,7 +188,7 @@ TAO_AV_TCP_Factory::make_acceptor (void)
 }
 
 TAO_AV_Connector*
-TAO_AV_TCP_Factory::make_connector (void)
+TAO_AV_TCP_Factory::make_connector ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_connector "));
   TAO_AV_Connector *connector = 0;
@@ -203,7 +203,7 @@ TAO_AV_TCP_Factory::make_connector (void)
 //------------------------------------------------------------
 
 int
-TAO_AV_TCP_Object::handle_input (void)
+TAO_AV_TCP_Object::handle_input ()
 {
   int n = this->transport_->recv (this->frame_.rd_ptr (),
                                   this->frame_.size ());
@@ -249,12 +249,12 @@ TAO_AV_TCP_Object::TAO_AV_TCP_Object (TAO_AV_Callback *callback,
   this->frame_.size (BUFSIZ);
 }
 
-TAO_AV_TCP_Object::~TAO_AV_TCP_Object (void)
+TAO_AV_TCP_Object::~TAO_AV_TCP_Object ()
 {
   // No-op
 }
 int
-TAO_AV_TCP_Object::destroy (void)
+TAO_AV_TCP_Object::destroy ()
 {
   this->callback_->handle_destroy ();
   delete this;
@@ -264,11 +264,11 @@ TAO_AV_TCP_Object::destroy (void)
 //------------------------------------------------------------
 // TAO_AV_TCP_Flow_Factory
 //------------------------------------------------------------
-TAO_AV_TCP_Flow_Factory::TAO_AV_TCP_Flow_Factory (void)
+TAO_AV_TCP_Flow_Factory::TAO_AV_TCP_Flow_Factory ()
 {
 }
 
-TAO_AV_TCP_Flow_Factory::~TAO_AV_TCP_Flow_Factory (void)
+TAO_AV_TCP_Flow_Factory::~TAO_AV_TCP_Flow_Factory ()
 {
 }
 
@@ -357,11 +357,11 @@ TAO_AV_TCP_Base_Connector::connector_connect (TAO_AV_TCP_Flow_Handler *&handler,
 //------------------------------------------------------------
 // TAO_AV_TCP_Connector
 //------------------------------------------------------------
-TAO_AV_TCP_Connector::TAO_AV_TCP_Connector (void)
+TAO_AV_TCP_Connector::TAO_AV_TCP_Connector ()
 {
 }
 
-TAO_AV_TCP_Connector::~TAO_AV_TCP_Connector (void)
+TAO_AV_TCP_Connector::~TAO_AV_TCP_Connector ()
 {
 }
 
@@ -431,7 +431,7 @@ TAO_AV_TCP_Connector::connect (TAO_FlowSpec_Entry *entry,
 }
 
 int
-TAO_AV_TCP_Connector::close (void)
+TAO_AV_TCP_Connector::close ()
 {
   return 0;
 }
@@ -473,11 +473,11 @@ TAO_AV_TCP_Base_Acceptor::make_svc_handler (TAO_AV_TCP_Flow_Handler *&handler)
 // TAO_AV_TCP_Acceptor
 //------------------------------------------------------------
 
-TAO_AV_TCP_Acceptor::TAO_AV_TCP_Acceptor (void)
+TAO_AV_TCP_Acceptor::TAO_AV_TCP_Acceptor ()
 {
 }
 
-TAO_AV_TCP_Acceptor::~TAO_AV_TCP_Acceptor (void)
+TAO_AV_TCP_Acceptor::~TAO_AV_TCP_Acceptor ()
 {
 }
 
@@ -612,7 +612,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
 
 
 int
-TAO_AV_TCP_Acceptor::close (void)
+TAO_AV_TCP_Acceptor::close ()
 {
   return 0;
 }
@@ -628,13 +628,13 @@ TAO_AV_TCP_Flow_Handler::TAO_AV_TCP_Flow_Handler (TAO_AV_Callback * /*callback*/
            TAO_AV_TCP_Transport (this));
 }
 
-TAO_AV_TCP_Flow_Handler::~TAO_AV_TCP_Flow_Handler (void)
+TAO_AV_TCP_Flow_Handler::~TAO_AV_TCP_Flow_Handler ()
 {
   delete this->transport_;
 }
 
 TAO_AV_Transport *
-TAO_AV_TCP_Flow_Handler::transport (void)
+TAO_AV_TCP_Flow_Handler::transport ()
 {
   return this->transport_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 909d9eb5657..5e5a7dd19cc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -47,7 +47,7 @@ TAO_AV_Flow_Protocol_Item::TAO_AV_Flow_Protocol_Item (const ACE_CString &name)
 // TAO_AV_Connector_Registry
 //------------------------------------------------------------
 
-TAO_AV_Connector_Registry::TAO_AV_Connector_Registry (void)
+TAO_AV_Connector_Registry::TAO_AV_Connector_Registry ()
 {
 }
 
@@ -174,7 +174,7 @@ TAO_AV_Connector_Registry::close (TAO_AV_Connector *connector)
 }
 
 int
-TAO_AV_Connector_Registry::close_all (void)
+TAO_AV_Connector_Registry::close_all ()
 {
   for (TAO_AV_ConnectorSetItor i = this->connectors_.begin ();
        i != this->connectors_.end ();
@@ -192,7 +192,7 @@ TAO_AV_Connector_Registry::close_all (void)
   return 0;
 }
 
-TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry (void)
+TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry ()
 {
   this->close_all ();
 }
@@ -201,11 +201,11 @@ TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry (void)
 // TAO_AV_Acceptor_Registry
 //------------------------------------------------------------
 
-TAO_AV_Acceptor_Registry::TAO_AV_Acceptor_Registry (void)
+TAO_AV_Acceptor_Registry::TAO_AV_Acceptor_Registry ()
 {
 }
 
-TAO_AV_Acceptor_Registry::~TAO_AV_Acceptor_Registry (void)
+TAO_AV_Acceptor_Registry::~TAO_AV_Acceptor_Registry ()
 {
   this->close_all();
 }
@@ -443,7 +443,7 @@ TAO_AV_Acceptor_Registry::close (TAO_AV_Acceptor *acceptor)
 }
 
 int
-TAO_AV_Acceptor_Registry::close_all (void)
+TAO_AV_Acceptor_Registry::close_all ()
 {
   for (TAO_AV_AcceptorSetItor i = this->acceptors_.begin ();
        i != this->acceptors_.end ();
@@ -465,17 +465,17 @@ TAO_AV_Acceptor_Registry::close_all (void)
 // TAO_AV_Transport
 //----------------------------------------------------------------------
 
-TAO_AV_Transport::TAO_AV_Transport (void)
+TAO_AV_Transport::TAO_AV_Transport ()
 {
 }
 
 // Virtual destructor.
-TAO_AV_Transport::~TAO_AV_Transport (void)
+TAO_AV_Transport::~TAO_AV_Transport ()
 {
 }
 
 ACE_Addr*
-TAO_AV_Transport::get_local_addr (void)
+TAO_AV_Transport::get_local_addr ()
 {
   return 0;
 }
@@ -485,7 +485,7 @@ TAO_AV_Transport::get_local_addr (void)
 //----------------------------------------------------------------------
 
 //TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (TAO_AV_Callback *callback)
-TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (void)
+TAO_AV_Flow_Handler::TAO_AV_Flow_Handler ()
   :transport_ (0),
    callback_ (0),
    protocol_object_ (0),
@@ -493,7 +493,7 @@ TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (void)
 {
 }
 
-TAO_AV_Flow_Handler::~TAO_AV_Flow_Handler(void)
+TAO_AV_Flow_Handler::~TAO_AV_Flow_Handler()
 {
   // cancel the timer (if there is one)
   this->cancel_timer();
@@ -524,7 +524,7 @@ TAO_AV_Flow_Handler::start (TAO_FlowSpec_Entry::Role role)
 }
 
 int
-TAO_AV_Flow_Handler::schedule_timer (void)
+TAO_AV_Flow_Handler::schedule_timer ()
 {
   ACE_Event_Handler *event_handler = this->event_handler ();
   ACE_Time_Value *tv = 0;
@@ -546,7 +546,7 @@ TAO_AV_Flow_Handler::schedule_timer (void)
 
 
 int
-TAO_AV_Flow_Handler::cancel_timer (void)
+TAO_AV_Flow_Handler::cancel_timer ()
 {
   if (this->timer_id_ != -1)
   return TAO_AV_CORE::instance()->reactor ()->cancel_timer (this->timer_id_);
@@ -605,7 +605,7 @@ TAO_AV_Flow_Handler::change_qos (AVStreams::QoS)
 }
 
 TAO_AV_Transport*
-TAO_AV_Flow_Handler::transport (void)
+TAO_AV_Flow_Handler::transport ()
 {
   return this->transport_;
 }
@@ -617,7 +617,7 @@ TAO_AV_Flow_Handler::protocol_object (TAO_AV_Protocol_Object *protocol_object)
 }
 
 TAO_AV_Protocol_Object*
-TAO_AV_Flow_Handler::protocol_object (void)
+TAO_AV_Flow_Handler::protocol_object ()
 {
   return this->protocol_object_;
 }
@@ -629,29 +629,29 @@ TAO_AV_Flow_Handler::callback (TAO_AV_Callback *callback)
 }
 
 // TAO_AV_Connector
-TAO_AV_Connector::TAO_AV_Connector (void)
+TAO_AV_Connector::TAO_AV_Connector ()
 {
 }
 
-TAO_AV_Connector::~TAO_AV_Connector (void)
+TAO_AV_Connector::~TAO_AV_Connector ()
 {
 }
 
 // TAO_AV_Acceptor
-TAO_AV_Acceptor::TAO_AV_Acceptor (void)
+TAO_AV_Acceptor::TAO_AV_Acceptor ()
 {
 }
 
-TAO_AV_Acceptor::~TAO_AV_Acceptor (void)
+TAO_AV_Acceptor::~TAO_AV_Acceptor ()
 {
 }
 
-TAO_AV_Transport_Factory::TAO_AV_Transport_Factory (void)
+TAO_AV_Transport_Factory::TAO_AV_Transport_Factory ()
  : ref_count (0)
 {
 }
 
-TAO_AV_Transport_Factory::~TAO_AV_Transport_Factory (void)
+TAO_AV_Transport_Factory::~TAO_AV_Transport_Factory ()
 {
 }
 
@@ -669,13 +669,13 @@ TAO_AV_Transport_Factory::match_protocol (const char * /* protocol_string */)
 }
 
 TAO_AV_Acceptor *
-TAO_AV_Transport_Factory::make_acceptor (void)
+TAO_AV_Transport_Factory::make_acceptor ()
 {
   return 0;
 }
 
 TAO_AV_Connector *
-TAO_AV_Transport_Factory::make_connector (void)
+TAO_AV_Transport_Factory::make_connector ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 601e173fdfc..edfa055b2a1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -17,13 +17,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // TAO_AV_UDP_Flow_Handler
 //------------------------------------------------------------
 
-TAO_AV_UDP_Flow_Handler::TAO_AV_UDP_Flow_Handler (void)
+TAO_AV_UDP_Flow_Handler::TAO_AV_UDP_Flow_Handler ()
 {
   ACE_NEW (this->transport_,
            TAO_AV_UDP_Transport (this));
 }
 
-TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler (void)
+TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler ()
 {
   // remove the event handler from the reactor.
   TAO_AV_CORE::instance()->reactor ()->remove_handler (this->event_handler(),
@@ -35,7 +35,7 @@ TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler (void)
 }
 
 TAO_AV_Transport *
-TAO_AV_UDP_Flow_Handler::transport (void)
+TAO_AV_UDP_Flow_Handler::transport ()
 {
   return this->transport_;
 }
@@ -68,7 +68,7 @@ TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address)
 
 
 ACE_HANDLE
-TAO_AV_UDP_Flow_Handler::get_handle (void) const
+TAO_AV_UDP_Flow_Handler::get_handle () const
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -155,7 +155,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos)
 // TAO_AV_UDP_Transport
 //------------------------------------------------------------
 
-TAO_AV_UDP_Transport::TAO_AV_UDP_Transport (void)
+TAO_AV_UDP_Transport::TAO_AV_UDP_Transport ()
   :handler_ (0)
 {
 }
@@ -166,7 +166,7 @@ TAO_AV_UDP_Transport::TAO_AV_UDP_Transport (TAO_AV_UDP_Flow_Handler *handler)
 {
 }
 
-TAO_AV_UDP_Transport::~TAO_AV_UDP_Transport (void)
+TAO_AV_UDP_Transport::~TAO_AV_UDP_Transport ()
 {
 }
 
@@ -184,19 +184,19 @@ TAO_AV_UDP_Transport::open (ACE_Addr * /*address*/)
 }
 
 int
-TAO_AV_UDP_Transport::close (void)
+TAO_AV_UDP_Transport::close ()
 {
   return 0;
 }
 
 int
-TAO_AV_UDP_Transport::mtu (void)
+TAO_AV_UDP_Transport::mtu ()
 {
   return 65535;
 }
 
 ACE_Addr*
-TAO_AV_UDP_Transport::get_peer_addr (void)
+TAO_AV_UDP_Transport::get_peer_addr ()
 {
   return &this->peer_addr_;
 }
@@ -318,13 +318,13 @@ TAO_AV_UDP_Transport::recv (iovec *iov,
 // TAO_AV_UDP_Acceptor
 //------------------------------------------------------------
 
-TAO_AV_UDP_Acceptor::TAO_AV_UDP_Acceptor (void)
+TAO_AV_UDP_Acceptor::TAO_AV_UDP_Acceptor ()
   : address_ (0),
     control_inet_address_ (0)
 {
 }
 
-TAO_AV_UDP_Acceptor::~TAO_AV_UDP_Acceptor (void)
+TAO_AV_UDP_Acceptor::~TAO_AV_UDP_Acceptor ()
 {
   if (this->flow_component_ == TAO_AV_Core::TAO_AV_CONTROL)
     delete this->entry_->control_handler ();
@@ -556,7 +556,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr,
 }
 
 int
-TAO_AV_UDP_Acceptor::close (void)
+TAO_AV_UDP_Acceptor::close ()
 {
   return 0;
 }
@@ -564,12 +564,12 @@ TAO_AV_UDP_Acceptor::close (void)
 //------------------------------------------------------------
 // TAO_AV_UDP_Connector
 //------------------------------------------------------------
-TAO_AV_UDP_Connector::TAO_AV_UDP_Connector (void)
+TAO_AV_UDP_Connector::TAO_AV_UDP_Connector ()
   : control_inet_address_ (0)
 {
 }
 
-TAO_AV_UDP_Connector::~TAO_AV_UDP_Connector (void)
+TAO_AV_UDP_Connector::~TAO_AV_UDP_Connector ()
 {
   if (this->flow_component_ == TAO_AV_Core::TAO_AV_CONTROL)
     {
@@ -779,7 +779,7 @@ TAO_AV_UDP_Connector::activate_svc_handler (TAO_AV_Flow_Handler *handler)
 }
 
 int
-TAO_AV_UDP_Connector::close (void)
+TAO_AV_UDP_Connector::close ()
 {
   return 0;
 }
@@ -908,11 +908,11 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler,
 // TAO_AV_UDP_Protocol_Factory
 //------------------------------------------------------------
 
-TAO_AV_UDP_Factory::TAO_AV_UDP_Factory (void)
+TAO_AV_UDP_Factory::TAO_AV_UDP_Factory ()
 {
 }
 
-TAO_AV_UDP_Factory::~TAO_AV_UDP_Factory (void)
+TAO_AV_UDP_Factory::~TAO_AV_UDP_Factory ()
 {
 }
 
@@ -927,7 +927,7 @@ TAO_AV_UDP_Factory::match_protocol (const char *protocol_string)
 }
 
 TAO_AV_Acceptor*
-TAO_AV_UDP_Factory::make_acceptor (void)
+TAO_AV_UDP_Factory::make_acceptor ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_acceptor\n"));
   TAO_AV_Acceptor *acceptor = 0;
@@ -938,7 +938,7 @@ TAO_AV_UDP_Factory::make_acceptor (void)
 }
 
 TAO_AV_Connector*
-TAO_AV_UDP_Factory::make_connector (void)
+TAO_AV_UDP_Factory::make_connector ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_connector\n"));
   TAO_AV_Connector *connector = 0;
@@ -960,7 +960,7 @@ TAO_AV_UDP_Factory::init (int /* argc */,
 //------------------------------------------------------------
 
 int
-TAO_AV_UDP_Object::handle_input (void)
+TAO_AV_UDP_Object::handle_input ()
 {
   int n = this->transport_->recv (this->frame_.rd_ptr (),
                                   this->frame_.size ());
@@ -1012,13 +1012,13 @@ TAO_AV_UDP_Object::TAO_AV_UDP_Object (TAO_AV_Callback *callback,
   this->frame_.size (this->transport_->mtu ());
 }
 
-TAO_AV_UDP_Object::~TAO_AV_UDP_Object (void)
+TAO_AV_UDP_Object::~TAO_AV_UDP_Object ()
 {
   //no-op
 }
 
 int
-TAO_AV_UDP_Object::destroy (void)
+TAO_AV_UDP_Object::destroy ()
 {
   this->callback_->handle_destroy ();
   delete this;
@@ -1030,11 +1030,11 @@ TAO_AV_UDP_Object::destroy (void)
 //------------------------------------------------------------
 // TAO_AV_UDP_Flow_Factory
 //------------------------------------------------------------
-TAO_AV_UDP_Flow_Factory::TAO_AV_UDP_Flow_Factory (void)
+TAO_AV_UDP_Flow_Factory::TAO_AV_UDP_Flow_Factory ()
 {
 }
 
-TAO_AV_UDP_Flow_Factory::~TAO_AV_UDP_Flow_Factory (void)
+TAO_AV_UDP_Flow_Factory::~TAO_AV_UDP_Flow_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index 19ec09132b9..1a20983efb2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -8,14 +8,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void)
+TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory ()
 {
   if (TAO_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
                 "TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory %d\n"));
 }
 
-TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory (void)
+TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory ()
 {
   TAO_AV_TransportFactorySetItor t_end = TAO_AV_CORE::instance ()->transport_factories ()->end ();
   for (TAO_AV_TransportFactorySetItor tfiterator =
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index ad857ef4536..77b9e1542a7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -45,7 +45,7 @@ operator< (const TAO_SFP_Fragment_Node& left,
 // TAO_SFP_Base
 //------------------------------------------------------------
 
-TAO_SFP_Base::TAO_SFP_Base (void)
+TAO_SFP_Base::TAO_SFP_Base ()
 {
   TAO_OutputCDR output_cdr;
   flowProtocol::frameHeader frame_header;
@@ -845,13 +845,13 @@ TAO_SFP_Object::TAO_SFP_Object (TAO_AV_Callback *callback,
   this->state_.static_frame_.size (2* this->transport_->mtu ());
 }
 
-TAO_SFP_Object::~TAO_SFP_Object (void)
+TAO_SFP_Object::~TAO_SFP_Object ()
 {
   //no-op
 }
 
 int
-TAO_SFP_Object::destroy (void)
+TAO_SFP_Object::destroy ()
 {
   int result = -1;
   TAO_OutputCDR out_stream;
@@ -1127,7 +1127,7 @@ TAO_SFP_Consumer_Object::TAO_SFP_Consumer_Object (TAO_AV_Callback *callback,
 }
 
 int
-TAO_SFP_Consumer_Object::handle_input (void)
+TAO_SFP_Consumer_Object::handle_input ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_SFP_Consumer_Object::handle_input\n"));
   // This is the entry point for receiving data.
@@ -1177,7 +1177,7 @@ TAO_SFP_Producer_Object::TAO_SFP_Producer_Object (TAO_AV_Callback *callback,
 }
 
 int
-TAO_SFP_Producer_Object::handle_input (void)
+TAO_SFP_Producer_Object::handle_input ()
 {
   // A producer can only receive credit messages.
   int result;
@@ -1223,11 +1223,11 @@ TAO_SFP_Producer_Object::handle_input (void)
 }
 
 // TAO_AV_SFP_Factory
-TAO_AV_SFP_Factory::TAO_AV_SFP_Factory (void)
+TAO_AV_SFP_Factory::TAO_AV_SFP_Factory ()
 {
 }
 
-TAO_AV_SFP_Factory::~TAO_AV_SFP_Factory (void)
+TAO_AV_SFP_Factory::~TAO_AV_SFP_Factory ()
 {
 }
 
@@ -1293,7 +1293,7 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry,
 // TAO_SFP_Frame_State
 //------------------------------------------------------------
 
-TAO_SFP_Frame_State::TAO_SFP_Frame_State (void)
+TAO_SFP_Frame_State::TAO_SFP_Frame_State ()
   :cdr (new ACE_Data_Block (ACE_CDR::DEFAULT_BUFSIZE,
                             ACE_Message_Block::MB_DATA,
                             0,
@@ -1309,13 +1309,13 @@ TAO_SFP_Frame_State::TAO_SFP_Frame_State (void)
 }
 
 CORBA::Boolean
-TAO_SFP_Frame_State::is_complete (void)
+TAO_SFP_Frame_State::is_complete ()
 {
   return (!this->more_fragments_) &&  (this->frame_block_);
 }
 
 int
-TAO_SFP_Frame_State::reset (void)
+TAO_SFP_Frame_State::reset ()
 {
   this->frame_block_ = 0;
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 296d2d2f6bd..9f2baab57a9 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -41,7 +41,7 @@ public:
   virtual void push (const RtecEventComm::EventSet& events);
 
   /// Forwards to target_.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   TARGET *target_;
@@ -64,7 +64,7 @@ public:
   ACE_PushSupplier_Adapter (TARGET *target);
 
   /// Forwards to target_.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   TARGET *target_;
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 997efb34aca..6b36ef5c48d 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -20,7 +20,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CC_Lock::CC_Lock (void)
+CC_Lock::CC_Lock ()
   : mode_ (CosConcurrencyControl::intention_read),
     lock_held_ (0)
 {
@@ -32,12 +32,12 @@ CC_Lock::CC_Lock (CosConcurrencyControl::lock_mode mode)
 {
 }
 
-CC_Lock::~CC_Lock (void)
+CC_Lock::~CC_Lock ()
 {
 }
 
 void
-CC_Lock::lock (void)
+CC_Lock::lock ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "CC_Lock::lock\n"));
@@ -45,7 +45,7 @@ CC_Lock::lock (void)
 }
 
 CORBA::Boolean
-CC_Lock::try_lock (void)
+CC_Lock::try_lock ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "CC_Lock::try_lock. "));
@@ -79,7 +79,7 @@ CC_Lock::try_lock (void)
 }
 
 void
-CC_Lock::unlock (void)
+CC_Lock::unlock ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "CC_Lock::unlock\n"));
@@ -133,25 +133,25 @@ CC_Lock::Compatible (CosConcurrencyControl::lock_mode mode)
 }
 
 CosConcurrencyControl::lock_mode
-CC_Lock::GetMode (void)
+CC_Lock::GetMode ()
 {
   return mode_;
 }
 
 int
-CC_Lock::GetLocksHeld (void)
+CC_Lock::GetLocksHeld ()
 {
   return this->lock_held_;
 }
 
 void
-CC_Lock::DecLocksHeld (void)
+CC_Lock::DecLocksHeld ()
 {
   this->lock_held_--;
 }
 
 void
-CC_Lock::dump (void)
+CC_Lock::dump ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "mode_ %i, lock_held_: %i\n",
@@ -183,21 +183,21 @@ CORBA::Boolean CC_Lock::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES]
 
 // CC_LockModeterator
 
-CC_LockModeIterator::CC_LockModeIterator (void)
+CC_LockModeIterator::CC_LockModeIterator ()
   : current_ (CosConcurrencyControl::intention_read)
 {
 }
 
-CC_LockModeIterator::~CC_LockModeIterator (void)
+CC_LockModeIterator::~CC_LockModeIterator ()
 {
   // Do nothing
 }
-void CC_LockModeIterator::First (void)
+void CC_LockModeIterator::First ()
 {
   current_ = CosConcurrencyControl::intention_read;
 }
 
-void CC_LockModeIterator::Next (void)
+void CC_LockModeIterator::Next ()
 {
   switch (current_)
     {
@@ -221,7 +221,7 @@ void CC_LockModeIterator::Next (void)
 }
 
 CORBA::Boolean
-CC_LockModeIterator::IsDone (void)
+CC_LockModeIterator::IsDone ()
 {
   if (current_ == CosConcurrencyControl::write)
     return 1;
@@ -230,7 +230,7 @@ CC_LockModeIterator::IsDone (void)
 }
 
 CosConcurrencyControl::lock_mode
-CC_LockModeIterator::GetLockMode (void)
+CC_LockModeIterator::GetLockMode ()
 {
   return current_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 8f1715e7959..99d6a1b442e 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default constructor.
 
-CC_LockSet::CC_LockSet (void)
+CC_LockSet::CC_LockSet ()
 {
   try
     {
@@ -45,7 +45,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr )
 // Initialization.
 
 void
-CC_LockSet::Init (void)
+CC_LockSet::Init ()
 {
   // Set the mode of the statically allocated locks
   lock_[CC_IR] = 0;
@@ -61,7 +61,7 @@ CC_LockSet::Init (void)
 
 // Destructor
 
-CC_LockSet::~CC_LockSet (void)
+CC_LockSet::~CC_LockSet ()
 {
 }
 
@@ -278,7 +278,7 @@ CC_LockSet::lock_held (CC_LockModeEnum lm)
 }
 
 void
-CC_LockSet::dump (void)
+CC_LockSet::dump ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "waiting_calls_: %i, IR: %i, R: %i, U: %i, IW: %i, W: %i\n",
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 9a78bc807ab..03a2175adb9 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -15,17 +15,17 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default constructor
-CC_LockSetFactory::CC_LockSetFactory (void)
+CC_LockSetFactory::CC_LockSetFactory ()
 {
 }
 
 // Destructor.
-CC_LockSetFactory::~CC_LockSetFactory (void)
+CC_LockSetFactory::~CC_LockSetFactory ()
 {
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create (void)
+CC_LockSetFactory::create ()
 {
   CC_LockSet *ls = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 0056beb1e52..74555ec8ed7 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -18,11 +18,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Concurrency_Loader::TAO_Concurrency_Loader (void)
+TAO_Concurrency_Loader::TAO_Concurrency_Loader ()
 {
 }
 
-TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void)
+TAO_Concurrency_Loader::~TAO_Concurrency_Loader ()
 {
 }
 
@@ -48,7 +48,7 @@ TAO_Concurrency_Loader::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_Concurrency_Loader::fini (void)
+TAO_Concurrency_Loader::fini ()
 {
   // Remove the Concurrency Service.
   this->concurrency_server_.fini();
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index db4f396520d..51ef58e254e 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -56,11 +56,10 @@ public:
   TAO_Concurrency_Server concurrency_server_;
 
 private:
-
-  // Disallow copying and assignment.
-  TAO_Concurrency_Loader (const TAO_Concurrency_Loader &);
-  TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &);
-
+  TAO_Concurrency_Loader (const TAO_Concurrency_Loader &) = delete;
+  TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &) = delete;
+  TAO_Concurrency_Loader (TAO_Concurrency_Loader &&) = delete;
+  TAO_Concurrency_Loader &operator = (TAO_Concurrency_Loader &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 9ae228725bb..d0147e100f4 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -16,7 +16,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default constructor
-TAO_Concurrency_Server::TAO_Concurrency_Server (void)
+TAO_Concurrency_Server::TAO_Concurrency_Server ()
 {
 }
 
@@ -72,7 +72,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
 }
 
 int
-TAO_Concurrency_Server::fini (void)
+TAO_Concurrency_Server::fini ()
 {
   try
     {
@@ -95,12 +95,12 @@ TAO_Concurrency_Server::fini (void)
 }
 
 CC_LockSetFactory *
-TAO_Concurrency_Server::GetLockSetFactory(void)
+TAO_Concurrency_Server::GetLockSetFactory()
 {
   return &this->lock_set_factory_;
 }
 
-TAO_Concurrency_Server::~TAO_Concurrency_Server (void)
+TAO_Concurrency_Server::~TAO_Concurrency_Server ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index cfd92db0be4..749c421fe0c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -21,7 +21,7 @@ TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec)
     this->event_channel_->consumer_poa ();
 }
 
-TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void)
+TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin ()
 {
 }
 
@@ -74,7 +74,7 @@ TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier)
 }
 
 void
-TAO_CEC_ConsumerAdmin::shutdown (void)
+TAO_CEC_ConsumerAdmin::shutdown ()
 {
   this->push_admin_.shutdown ();
 
@@ -82,19 +82,19 @@ TAO_CEC_ConsumerAdmin::shutdown (void)
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_push_supplier (void)
+TAO_CEC_ConsumerAdmin::obtain_push_supplier ()
 {
   return this->push_admin_.obtain ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void)
+TAO_CEC_ConsumerAdmin::obtain_pull_supplier ()
 {
   return this->pull_admin_.obtain ();
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ConsumerAdmin::_default_POA (void)
+TAO_CEC_ConsumerAdmin::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index cc9fab516c4..a0b70c10152 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -2,22 +2,22 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void)
+TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl ()
 {
 }
 
-TAO_CEC_ConsumerControl::~TAO_CEC_ConsumerControl (void)
+TAO_CEC_ConsumerControl::~TAO_CEC_ConsumerControl ()
 {
 }
 
 int
-TAO_CEC_ConsumerControl::activate (void)
+TAO_CEC_ConsumerControl::activate ()
 {
   return 0;
 }
 
 int
-TAO_CEC_ConsumerControl::shutdown (void)
+TAO_CEC_ConsumerControl::shutdown ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index c8703df70c7..84026edf994 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -41,7 +41,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void)
+TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory ()
 {
     if (orbid_dupped_ != 0)
       {
@@ -50,7 +50,7 @@ TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void)
 }
 
 int
-TAO_CEC_Default_Factory::init_svcs (void)
+TAO_CEC_Default_Factory::init_svcs ()
 {
   return
     ACE_Service_Config::static_svcs ()->insert (
@@ -423,7 +423,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-TAO_CEC_Default_Factory::fini (void)
+TAO_CEC_Default_Factory::fini ()
 {
   return 0;
 }
@@ -1233,7 +1233,7 @@ TAO_CEC_Default_Factory::destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPu
 }
 
 ACE_Lock*
-TAO_CEC_Default_Factory::create_consumer_lock (void)
+TAO_CEC_Default_Factory::create_consumer_lock ()
 {
   if (this->consumer_lock_ == 0)
     return new ACE_Lock_Adapter<ACE_Null_Mutex>;
@@ -1251,7 +1251,7 @@ TAO_CEC_Default_Factory::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_Lock*
-TAO_CEC_Default_Factory::create_supplier_lock (void)
+TAO_CEC_Default_Factory::create_supplier_lock ()
 {
   if (this->supplier_lock_ == 0)
     return new ACE_Lock_Adapter<ACE_Null_Mutex>;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index a98e625c404..192f6edc8c2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -3,23 +3,23 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void)
+TAO_CEC_Dispatching::~TAO_CEC_Dispatching ()
 {
 }
 
 // ****************************************************************
 
-TAO_CEC_Reactive_Dispatching::TAO_CEC_Reactive_Dispatching (void)
+TAO_CEC_Reactive_Dispatching::TAO_CEC_Reactive_Dispatching ()
 {
 }
 
 void
-TAO_CEC_Reactive_Dispatching::activate (void)
+TAO_CEC_Reactive_Dispatching::activate ()
 {
 }
 
 void
-TAO_CEC_Reactive_Dispatching::shutdown (void)
+TAO_CEC_Reactive_Dispatching::shutdown ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 4ee21c30070..af861810196 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -13,7 +13,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_CEC_Dispatching_Task::svc (void)
+TAO_CEC_Dispatching_Task::svc ()
 {
   bool done = false;
 
@@ -107,27 +107,27 @@ TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy,
 
 // ****************************************************************
 
-TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void)
+TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command ()
 {
 }
 
 // ****************************************************************
 
 int
-TAO_CEC_Shutdown_Task_Command::execute (void)
+TAO_CEC_Shutdown_Task_Command::execute ()
 {
   return -1;
 }
 
 // ****************************************************************
 
-TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void)
+TAO_CEC_Push_Command::~TAO_CEC_Push_Command ()
 {
   this->proxy_->_decr_refcnt ();
 }
 
 int
-TAO_CEC_Push_Command::execute (void)
+TAO_CEC_Push_Command::execute ()
 {
   this->proxy_->push_to_consumer (this->event_);
   return 0;
@@ -136,13 +136,13 @@ TAO_CEC_Push_Command::execute (void)
 // ****************************************************************
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command (void)
+TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command ()
 {
   this->proxy_->_decr_refcnt ();
 }
 
 int
-TAO_CEC_Invoke_Command::execute (void)
+TAO_CEC_Invoke_Command::execute ()
 {
   this->proxy_->invoke_to_consumer (this->typed_event_);
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index 78ab05ce1d2..c2223a2d8ba 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -13,7 +13,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Destructor
-TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void)
+TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer ()
 {
 }
 
@@ -69,7 +69,7 @@ TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::O
 }
 
 PortableServer::POA_ptr
-TAO_CEC_DynamicImplementationServer::_default_POA (void)
+TAO_CEC_DynamicImplementationServer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 522f8e5506b..579cfadd83d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -47,7 +47,7 @@ TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr,
     this->factory_->create_supplier_control (this);
 }
 
-TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void)
+TAO_CEC_EventChannel::~TAO_CEC_EventChannel ()
 {
   this->factory_->destroy_dispatching (this->dispatching_);
   this->dispatching_ = 0;
@@ -70,7 +70,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void)
 }
 
 void
-TAO_CEC_EventChannel::activate (void)
+TAO_CEC_EventChannel::activate ()
 {
   this->dispatching_->activate ();
   this->pulling_strategy_->activate ();
@@ -79,7 +79,7 @@ TAO_CEC_EventChannel::activate (void)
 }
 
 void
-TAO_CEC_EventChannel::shutdown (void)
+TAO_CEC_EventChannel::shutdown ()
 {
   this->dispatching_->shutdown ();
   this->pulling_strategy_->shutdown ();
@@ -176,19 +176,19 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier)
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CEC_EventChannel::for_consumers (void)
+TAO_CEC_EventChannel::for_consumers ()
 {
   return this->consumer_admin_->_this ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CEC_EventChannel::for_suppliers (void)
+TAO_CEC_EventChannel::for_suppliers ()
 {
   return this->supplier_admin_->_this ();
 }
 
 void
-TAO_CEC_EventChannel::destroy (void)
+TAO_CEC_EventChannel::destroy ()
 {
   this->shutdown ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index deda68038c8..7087b92301b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -29,7 +29,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) :
+TAO_CEC_Event_Loader::TAO_CEC_Event_Loader () :
   attributes_ (0)
   , factory_ (0)
   , ec_impl_ (0)
@@ -41,7 +41,7 @@ TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) :
   // Constructor
 }
 
-TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void)
+TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader ()
 {
   // Destructor
 }
@@ -405,7 +405,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 }
 
 int
-TAO_CEC_Event_Loader::fini (void)
+TAO_CEC_Event_Loader::fini ()
 {
   //   + Since it was activated with _this() you have to do the
   //   canonical:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index 1148ce28edb..13444dc750a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -94,9 +94,10 @@ protected:
   CosNaming::Name channel_name_;
 
 private:
-  // Disallow copying and assignment.
-  TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &);
-  TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &);
+  TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &) = delete;
+  TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &) = delete;
+  TAO_CEC_Event_Loader (TAO_CEC_Event_Loader &&) = delete;
+  TAO_CEC_Event_Loader &operator= (TAO_CEC_Event_Loader &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
index 6eef61ef41a..84e3bb84c64 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CEC_Factory::~TAO_CEC_Factory (void)
+TAO_CEC_Factory::~TAO_CEC_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 6d80809278b..db1e6bf776d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -17,7 +17,7 @@ TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads,
 }
 
 void
-TAO_CEC_MT_Dispatching::activate (void)
+TAO_CEC_MT_Dispatching::activate ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -41,7 +41,7 @@ TAO_CEC_MT_Dispatching::activate (void)
 }
 
 void
-TAO_CEC_MT_Dispatching::shutdown (void)
+TAO_CEC_MT_Dispatching::shutdown ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index a12bdf9b683..67ba41ddca5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -30,7 +30,7 @@ TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* ec,
   this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 
-TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
+TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer ()
 {
   this->event_channel_->get_servant_retry_map ().unbind (this);
   this->event_channel_->destroy_consumer_lock (this->lock_);
@@ -53,7 +53,7 @@ TAO_CEC_ProxyPullConsumer::activate (
 }
 
 void
-TAO_CEC_ProxyPullConsumer::deactivate (void)
+TAO_CEC_ProxyPullConsumer::deactivate ()
 {
   try
     {
@@ -189,7 +189,7 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent (
 }
 
 void
-TAO_CEC_ProxyPullConsumer::shutdown (void)
+TAO_CEC_ProxyPullConsumer::shutdown ()
 {
   CosEventComm::PullSupplier_var supplier;
 
@@ -219,21 +219,21 @@ TAO_CEC_ProxyPullConsumer::shutdown (void)
 }
 
 void
-TAO_CEC_ProxyPullConsumer::cleanup_i (void)
+TAO_CEC_ProxyPullConsumer::cleanup_i ()
 {
   this->supplier_ =
     CosEventComm::PullSupplier::_nil ();
 }
 
 CORBA::ULong
-TAO_CEC_ProxyPullConsumer::_incr_refcnt (void)
+TAO_CEC_ProxyPullConsumer::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
   return this->refcount_++;
 }
 
 CORBA::ULong
-TAO_CEC_ProxyPullConsumer::_decr_refcnt (void)
+TAO_CEC_ProxyPullConsumer::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
@@ -358,19 +358,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ()
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPullConsumer::_default_POA (void)
+TAO_CEC_ProxyPullConsumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPullConsumer::_add_ref (void)
+TAO_CEC_ProxyPullConsumer::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPullConsumer::_remove_ref (void)
+TAO_CEC_ProxyPullConsumer::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index db840f03ee5..b023d169da2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -29,7 +29,7 @@ TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier
   this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 
-TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
+TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier ()
 {
   this->event_channel_->get_servant_retry_map ().unbind (this);
   this->event_channel_->destroy_supplier_lock (this->lock_);
@@ -52,7 +52,7 @@ TAO_CEC_ProxyPullSupplier::activate (
 }
 
 void
-TAO_CEC_ProxyPullSupplier::deactivate (void)
+TAO_CEC_ProxyPullSupplier::deactivate ()
 {
   try
     {
@@ -72,7 +72,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (void)
 }
 
 void
-TAO_CEC_ProxyPullSupplier::shutdown (void)
+TAO_CEC_ProxyPullSupplier::shutdown ()
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -148,7 +148,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event)
 }
 
 CORBA::Any *
-TAO_CEC_ProxyPullSupplier::pull (void)
+TAO_CEC_ProxyPullSupplier::pull ()
 {
   if (this->is_connected () == 0)
     throw CosEventComm::Disconnected ();
@@ -190,7 +190,7 @@ TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event)
 }
 
 void
-TAO_CEC_ProxyPullSupplier::cleanup_i (void)
+TAO_CEC_ProxyPullSupplier::cleanup_i ()
 {
   this->consumer_ =
     CosEventComm::PullConsumer::_nil ();
@@ -198,14 +198,14 @@ TAO_CEC_ProxyPullSupplier::cleanup_i (void)
 }
 
 CORBA::ULong
-TAO_CEC_ProxyPullSupplier::_incr_refcnt (void)
+TAO_CEC_ProxyPullSupplier::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
   return this->refcount_++;
 }
 
 CORBA::ULong
-TAO_CEC_ProxyPullSupplier::_decr_refcnt (void)
+TAO_CEC_ProxyPullSupplier::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
@@ -330,19 +330,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ()
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPullSupplier::_default_POA (void)
+TAO_CEC_ProxyPullSupplier::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPullSupplier::_add_ref (void)
+TAO_CEC_ProxyPullSupplier::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPullSupplier::_remove_ref (void)
+TAO_CEC_ProxyPullSupplier::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index 27bf794dd05..18428148b39 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -30,7 +30,7 @@ TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* ec,
   this->event_channel_->get_servant_retry_map ().bind (this, 0);
 }
 
-TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void)
+TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer ()
 {
   this->event_channel_->get_servant_retry_map ().unbind (this);
   this->event_channel_->destroy_consumer_lock (this->lock_);
@@ -53,7 +53,7 @@ TAO_CEC_ProxyPushConsumer::activate (
 }
 
 void
-TAO_CEC_ProxyPushConsumer::deactivate (void)
+TAO_CEC_ProxyPushConsumer::deactivate ()
 {
   try
     {
@@ -103,7 +103,7 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent (
 }
 
 void
-TAO_CEC_ProxyPushConsumer::shutdown (void)
+TAO_CEC_ProxyPushConsumer::shutdown ()
 {
   CosEventComm::PushSupplier_var supplier;
 
@@ -134,7 +134,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (void)
 }
 
 void
-TAO_CEC_ProxyPushConsumer::cleanup_i (void)
+TAO_CEC_ProxyPushConsumer::cleanup_i ()
 {
   this->supplier_ =
     CosEventComm::PushSupplier::_nil ();
@@ -142,14 +142,14 @@ TAO_CEC_ProxyPushConsumer::cleanup_i (void)
 }
 
 CORBA::ULong
-TAO_CEC_ProxyPushConsumer::_incr_refcnt (void)
+TAO_CEC_ProxyPushConsumer::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
   return this->refcount_++;
 }
 
 CORBA::ULong
-TAO_CEC_ProxyPushConsumer::_decr_refcnt (void)
+TAO_CEC_ProxyPushConsumer::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
@@ -288,19 +288,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ()
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPushConsumer::_default_POA (void)
+TAO_CEC_ProxyPushConsumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPushConsumer::_add_ref (void)
+TAO_CEC_ProxyPushConsumer::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPushConsumer::_remove_ref (void)
+TAO_CEC_ProxyPushConsumer::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
@@ -334,7 +334,7 @@ TAO_CEC_ProxyPushConsumer_Guard::
 }
 
 TAO_CEC_ProxyPushConsumer_Guard::
-    ~TAO_CEC_ProxyPushConsumer_Guard (void)
+    ~TAO_CEC_ProxyPushConsumer_Guard ()
 {
   // This access is safe because guard objects are created on the
   // stack, only one thread has access to them
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index b1a1569031a..0e5bc198acb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -71,7 +71,7 @@ TAO_CEC_ProxyPushSupplier (TAO_CEC_TypedEventChannel* ec,
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void)
+TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier ()
 {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->is_typed_ec () )
@@ -107,7 +107,7 @@ TAO_CEC_ProxyPushSupplier::activate (
 }
 
 void
-TAO_CEC_ProxyPushSupplier::deactivate (void)
+TAO_CEC_ProxyPushSupplier::deactivate ()
 {
   try
     {
@@ -127,7 +127,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (void)
 }
 
 void
-TAO_CEC_ProxyPushSupplier::shutdown (void)
+TAO_CEC_ProxyPushSupplier::shutdown ()
 {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->is_typed_ec () )
@@ -277,7 +277,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event)
 }
 
 void
-TAO_CEC_ProxyPushSupplier::cleanup_i (void)
+TAO_CEC_ProxyPushSupplier::cleanup_i ()
 {
   this->consumer_ =
     CosEventComm::PushConsumer::_nil ();
@@ -288,14 +288,14 @@ TAO_CEC_ProxyPushSupplier::cleanup_i (void)
 }
 
 CORBA::ULong
-TAO_CEC_ProxyPushSupplier::_incr_refcnt (void)
+TAO_CEC_ProxyPushSupplier::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
   return this->refcount_++;
 }
 
 CORBA::ULong
-TAO_CEC_ProxyPushSupplier::_decr_refcnt (void)
+TAO_CEC_ProxyPushSupplier::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
@@ -876,19 +876,19 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPushSupplier::_default_POA (void)
+TAO_CEC_ProxyPushSupplier::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPushSupplier::_add_ref (void)
+TAO_CEC_ProxyPushSupplier::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPushSupplier::_remove_ref (void)
+TAO_CEC_ProxyPushSupplier::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
index 4cafb289b22..6f61ade96b6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void)
+TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index d443ae002cb..ab8852c1d3c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -83,7 +83,7 @@ TAO_CEC_Reactive_ConsumerControl::
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void)
+TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl ()
 {
 }
 
@@ -232,7 +232,7 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout (
 }
 
 int
-TAO_CEC_Reactive_ConsumerControl::activate (void)
+TAO_CEC_Reactive_ConsumerControl::activate ()
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   try
@@ -283,7 +283,7 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
 }
 
 int
-TAO_CEC_Reactive_ConsumerControl::shutdown (void)
+TAO_CEC_Reactive_ConsumerControl::shutdown ()
 {
   int r = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 1d0b3ad00cb..c17ed7364b5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -83,7 +83,7 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout (
 }
 
 void
-TAO_CEC_Reactive_Pulling_Strategy::activate (void)
+TAO_CEC_Reactive_Pulling_Strategy::activate ()
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
@@ -124,7 +124,7 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
 }
 
 void
-TAO_CEC_Reactive_Pulling_Strategy::shutdown (void)
+TAO_CEC_Reactive_Pulling_Strategy::shutdown ()
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   this->reactor_->cancel_timer (timer_id_);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index f92360df4c3..14adf5a5fc5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -83,7 +83,7 @@ TAO_CEC_Reactive_SupplierControl::
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void)
+TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl ()
 {
 }
 
@@ -232,7 +232,7 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout (
 }
 
 int
-TAO_CEC_Reactive_SupplierControl::activate (void)
+TAO_CEC_Reactive_SupplierControl::activate ()
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   try
@@ -283,7 +283,7 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
 }
 
 int
-TAO_CEC_Reactive_SupplierControl::shutdown (void)
+TAO_CEC_Reactive_SupplierControl::shutdown ()
 {
   int r = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index fadba6678b8..45685c93d41 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -19,12 +19,12 @@ TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec)
     this->event_channel_->supplier_poa ();
 }
 
-TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void)
+TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin ()
 {
 }
 
 PortableServer::POA_ptr
-TAO_CEC_SupplierAdmin::_default_POA (void)
+TAO_CEC_SupplierAdmin::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -66,7 +66,7 @@ TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer)
 }
 
 void
-TAO_CEC_SupplierAdmin::shutdown (void)
+TAO_CEC_SupplierAdmin::shutdown ()
 {
   this->push_admin_.shutdown ();
 
@@ -74,13 +74,13 @@ TAO_CEC_SupplierAdmin::shutdown (void)
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_push_consumer (void)
+TAO_CEC_SupplierAdmin::obtain_push_consumer ()
 {
   return this->push_admin_.obtain ();
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_pull_consumer (void)
+TAO_CEC_SupplierAdmin::obtain_pull_consumer ()
 {
   return this->pull_admin_.obtain ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index a359fd9549a..50bb6bd63ef 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -2,22 +2,22 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void)
+TAO_CEC_SupplierControl::TAO_CEC_SupplierControl ()
 {
 }
 
-TAO_CEC_SupplierControl::~TAO_CEC_SupplierControl (void)
+TAO_CEC_SupplierControl::~TAO_CEC_SupplierControl ()
 {
 }
 
 int
-TAO_CEC_SupplierControl::activate (void)
+TAO_CEC_SupplierControl::activate ()
 {
   return 0;
 }
 
 int
-TAO_CEC_SupplierControl::shutdown (void)
+TAO_CEC_SupplierControl::shutdown ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index ca290520a07..0c57d545a0b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -18,7 +18,7 @@ TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChanne
 }
 
 // Implementation skeleton destructor
-TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void)
+TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin ()
 {
 }
 
@@ -49,7 +49,7 @@ TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier)
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::shutdown (void)
+TAO_CEC_TypedConsumerAdmin::shutdown ()
 {
   this->typed_push_admin_.shutdown ();
 }
@@ -77,19 +77,19 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void)
+TAO_CEC_TypedConsumerAdmin::obtain_push_supplier ()
 {
     throw CORBA::NO_IMPLEMENT ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void)
+TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier ()
 {
     throw CORBA::NO_IMPLEMENT ();
 }
 
 PortableServer::POA_ptr
-TAO_CEC_TypedConsumerAdmin::_default_POA (void)
+TAO_CEC_TypedConsumerAdmin::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index 76ddff0af4a..2ed8f27eb16 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -55,7 +55,7 @@ TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attr,
 }
 
 // Implementation skeleton destructor
-TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void)
+TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel ()
 {
   this->clear_ifr_cache ();
   this->interface_description_.close ();
@@ -73,7 +73,7 @@ TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void)
 }
 
 void
-TAO_CEC_TypedEventChannel::activate (void)
+TAO_CEC_TypedEventChannel::activate ()
 {
   this->dispatching_->activate ();
   this->consumer_control_->activate ();
@@ -98,7 +98,7 @@ namespace
 }
 
 void
-TAO_CEC_TypedEventChannel::shutdown (void)
+TAO_CEC_TypedEventChannel::shutdown ()
 {
   this->dispatching_->shutdown ();
   this->supplier_control_->shutdown ();
@@ -213,7 +213,7 @@ TAO_CEC_TypedEventChannel::insert_into_ifr_cache (const char *operation_,
 
 // Clear the ifr cache, freeing up all its contents.
 int
-TAO_CEC_TypedEventChannel::clear_ifr_cache (void)
+TAO_CEC_TypedEventChannel::clear_ifr_cache ()
 {
   for (Iterator i = this->interface_description_.begin ();
        i != this->interface_description_.end ();
@@ -522,19 +522,19 @@ TAO_CEC_TypedEventChannel::create_list (CORBA::Long count,
 
 // The CosTypedEventChannelAdmin::TypedEventChannel methods...
 CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
-TAO_CEC_TypedEventChannel::for_consumers (void)
+TAO_CEC_TypedEventChannel::for_consumers ()
 {
   return this->typed_consumer_admin_->_this ();
 }
 
 CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
-TAO_CEC_TypedEventChannel::for_suppliers (void)
+TAO_CEC_TypedEventChannel::for_suppliers ()
 {
   return this->typed_supplier_admin_->_this ();
 }
 
 void
-TAO_CEC_TypedEventChannel::destroy (void)
+TAO_CEC_TypedEventChannel::destroy ()
 {
   if (!destroyed_)
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index 93b02abfe2f..33e9199368d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -55,7 +55,7 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer
 }
 
 // Implementation skeleton destructor
-TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void)
+TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer ()
 {
   try{
     this->default_POA_->deactivate_object (this->oid_.in ());
@@ -86,7 +86,7 @@ TAO_CEC_TypedProxyPushConsumer::activate (
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::deactivate (void)
+TAO_CEC_TypedProxyPushConsumer::deactivate ()
 {
   try
     {
@@ -137,7 +137,7 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent (
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::shutdown (void)
+TAO_CEC_TypedProxyPushConsumer::shutdown ()
 {
   CosEventComm::PushSupplier_var supplier;
 
@@ -168,7 +168,7 @@ TAO_CEC_TypedProxyPushConsumer::shutdown (void)
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::cleanup_i (void)
+TAO_CEC_TypedProxyPushConsumer::cleanup_i ()
 {
   this->typed_supplier_ =
     CosEventComm::PushSupplier::_nil ();
@@ -176,14 +176,14 @@ TAO_CEC_TypedProxyPushConsumer::cleanup_i (void)
 }
 
 CORBA::ULong
-TAO_CEC_TypedProxyPushConsumer::_incr_refcnt (void)
+TAO_CEC_TypedProxyPushConsumer::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
   return this->refcount_++;
 }
 
 CORBA::ULong
-TAO_CEC_TypedProxyPushConsumer::_decr_refcnt (void)
+TAO_CEC_TypedProxyPushConsumer::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
@@ -313,25 +313,25 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ()
 }
 
 PortableServer::POA_ptr
-TAO_CEC_TypedProxyPushConsumer::_default_POA (void)
+TAO_CEC_TypedProxyPushConsumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::_add_ref (void)
+TAO_CEC_TypedProxyPushConsumer::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::_remove_ref (void)
+TAO_CEC_TypedProxyPushConsumer::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
 
 CORBA::Object_ptr
-TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void)
+TAO_CEC_TypedProxyPushConsumer::get_typed_consumer ()
 
 {
   CORBA::Object_var server =
@@ -382,7 +382,7 @@ TAO_CEC_TypedProxyPushConsumer_Guard::
 }
 
 TAO_CEC_TypedProxyPushConsumer_Guard::
-    ~TAO_CEC_TypedProxyPushConsumer_Guard (void)
+    ~TAO_CEC_TypedProxyPushConsumer_Guard ()
 {
   // This access is safe because guard objects are created on the
   // stack, only one thread has access to them
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index f5dc2ce81bc..2c00bc62d84 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -17,12 +17,12 @@ TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChanne
 }
 
 // Implementation skeleton destructor
-TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin (void)
+TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin ()
 {
 }
 
 PortableServer::POA_ptr
-TAO_CEC_TypedSupplierAdmin::_default_POA (void)
+TAO_CEC_TypedSupplierAdmin::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -46,7 +46,7 @@ TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consum
 }
 
 void
-TAO_CEC_TypedSupplierAdmin::shutdown (void)
+TAO_CEC_TypedSupplierAdmin::shutdown ()
 {
   this->typed_push_admin_.shutdown ();
 }
@@ -75,13 +75,13 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer (
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void)
+TAO_CEC_TypedSupplierAdmin::obtain_push_consumer ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void)
+TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
index c41ef28f1a6..b7cc48b1a54 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
@@ -49,14 +49,14 @@ public:
    * Check the documentation in 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:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index 0aa25211104..36578eb57e5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -36,7 +36,7 @@ class TAO_ESF_Copy_On_Read : public TAO_ESF_Proxy_Collection<PROXY>
 {
 public:
   /// Constructors
-  TAO_ESF_Copy_On_Read (void);
+  TAO_ESF_Copy_On_Read ();
   TAO_ESF_Copy_On_Read (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy_Collection methods
@@ -44,7 +44,7 @@ public:
   virtual void connected (PROXY *proxy);
   virtual void reconnected (PROXY *proxy);
   virtual void disconnected (PROXY *proxy);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index 20d105bb85f..dddaf15ebc8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -25,13 +25,13 @@ template<class COLLECTION, class ITERATOR>
 class TAO_ESF_Copy_On_Write_Collection
 {
 public:
-  TAO_ESF_Copy_On_Write_Collection (void);
+  TAO_ESF_Copy_On_Write_Collection ();
 
   /// Increment the reference count
-  CORBA::ULong _incr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
 
   /// Decrement the reference count
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _decr_refcnt ();
 
   /// The actual collection
   COLLECTION collection;
@@ -62,7 +62,7 @@ public:
                                     Collection *&collection);
 
   /// Destructor
-  ~TAO_ESF_Copy_On_Write_Read_Guard (void);
+  ~TAO_ESF_Copy_On_Write_Read_Guard ();
 
   Collection *collection;
 
@@ -94,7 +94,7 @@ public:
                                      Collection*& collection);
 
   /// Destructor
-  ~TAO_ESF_Copy_On_Write_Write_Guard (void);
+  ~TAO_ESF_Copy_On_Write_Write_Guard ();
 
   Collection *copy;
 
@@ -124,17 +124,17 @@ public:
   /// Constructor
   typedef TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_SYNCH_MUTEX_T> Read_Guard;
   typedef TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE> Write_Guard;
-  TAO_ESF_Copy_On_Write (void);
+  TAO_ESF_Copy_On_Write ();
 
   /// Destructor
-  ~TAO_ESF_Copy_On_Write (void);
+  ~TAO_ESF_Copy_On_Write ();
 
   // = The TAO_ESF_Proxy methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
   virtual void connected (PROXY *proxy);
   virtual void reconnected (PROXY *proxy);
   virtual void disconnected (PROXY *proxy);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 5052c34c873..b1dcefda33e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    TAO_ESF_Delayed_Changes (void)
+    TAO_ESF_Delayed_Changes ()
       :  lock_ (this),
          busy_cond_ (busy_lock_),
          busy_count_ (0),
@@ -61,7 +61,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    busy (void)
+    busy ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1);
 
@@ -75,7 +75,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    idle (void)
+    idle ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1);
 
@@ -91,7 +91,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    execute_delayed_operations (void)
+    execute_delayed_operations ()
 {
   while (!this->command_queue_.is_empty ())
     {
@@ -177,7 +177,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
-TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::shutdown (void)
+TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::shutdown ()
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 31aa6471b07..c3e9f8e40d0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -86,17 +86,17 @@ template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 class TAO_ESF_Delayed_Changes : public TAO_ESF_Proxy_Collection<PROXY>
 {
 public:
-  TAO_ESF_Delayed_Changes (void);
+  TAO_ESF_Delayed_Changes ();
   TAO_ESF_Delayed_Changes (const COLLECTION &collection);
 
-  int busy (void);
-  int idle (void);
-  int execute_delayed_operations (void);
+  int busy ();
+  int idle ();
+  int execute_delayed_operations ();
 
   void connected_i (PROXY *proxy);
   void reconnected_i (PROXY *proxy);
   void disconnected_i (PROXY *proxy);
-  void shutdown_i (void);
+  void shutdown_i ();
 
   typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
   typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command;
@@ -108,7 +108,7 @@ public:
   virtual void connected (PROXY *proxy);
   virtual void reconnected (PROXY *proxy);
   virtual void disconnected (PROXY *proxy);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
index 55fee94e3e6..0732a41bff2 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
@@ -24,7 +24,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown_i (void)
+    shutdown_i ()
 {
   this->collection_.shutdown ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index 37765884ca4..6a0a8a4c03b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class C, class ITERATOR, class ACE_LOCK>
 TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
-    TAO_ESF_Immediate_Changes (void)
+    TAO_ESF_Immediate_Changes ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index f1958c0680e..5f46da59d2a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -27,7 +27,7 @@ template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
 class TAO_ESF_Immediate_Changes : public TAO_ESF_Proxy_Collection<PROXY>
 {
 public:
-  TAO_ESF_Immediate_Changes (void);
+  TAO_ESF_Immediate_Changes ();
   TAO_ESF_Immediate_Changes (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy methods
@@ -35,7 +35,7 @@ public:
   virtual void connected (PROXY *proxy);
   virtual void reconnected (PROXY *proxy);
   virtual void disconnected (PROXY *proxy);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
index 3dc79d8bdd7..469b999f73e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
@@ -33,7 +33,7 @@ TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
-TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown (void)
+TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown ()
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 54672a13ca8..eb2b2fbc583 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -60,7 +60,7 @@ public:
   TAO_ESF_Peer_Admin (EVENT_CHANNEL *ec);
 
   /// destructor
-  virtual ~TAO_ESF_Peer_Admin (void);
+  virtual ~TAO_ESF_Peer_Admin ();
 
   /**
    * A <peer> has connected, this is invoked when the peer's client
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index 45819a38f1f..ceb4b3ab3f3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -66,7 +66,7 @@ public:
   TAO_ESF_Proxy_Admin (EVENT_CHANNEL *ec);
 
   /// Cleanup internal resources, destroy the internal collection
-  virtual ~TAO_ESF_Proxy_Admin (void);
+  virtual ~TAO_ESF_Proxy_Admin ();
 
   /// Iterate over its internal collection.
   void for_each (TAO_ESF_Worker<PROXY> *worker);
@@ -78,14 +78,14 @@ public:
   // code is supposed to run under TAO only.
   /// Create a new PROXY and activate it.
   virtual INTERFACE*
-      obtain (void);
+      obtain ();
 
   /**
    * The Event Channel that owns this Admin object is going
    * down. Invoke <shutdown> on all the proxies, cleanup the
    * collection and prepare to terminate.
    */
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /**
    * A <proxy> has connected, this is invoked when the proxy's client
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index 3250eee56ad..b486e13f02f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -125,7 +125,7 @@ class TAO_ESF_Proxy_Collection
 {
 public:
   /// destructor
-  virtual ~TAO_ESF_Proxy_Collection (void);
+  virtual ~TAO_ESF_Proxy_Collection ();
 
   /**
    * Iterate over the collection and invoke worker->work() for each
@@ -151,7 +151,7 @@ public:
   virtual void disconnected (PROXY *proxy) = 0;
 
   /// The EC is shutting down, must release all the elements.
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index fe241694268..fbd79d670a7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -38,17 +38,17 @@ public:
   typedef ACE_Unbounded_Set_Iterator<PROXY*> Iterator;
 
   /// Constructor
-  TAO_ESF_Proxy_List (void);
+  TAO_ESF_Proxy_List ();
 
   /// Return the first element in the collection, or end() if there
   /// are none
-  ACE_Unbounded_Set_Iterator<PROXY*> begin (void);
+  ACE_Unbounded_Set_Iterator<PROXY*> begin ();
 
   /// Return one past the last element in the collection
-  ACE_Unbounded_Set_Iterator<PROXY*> end (void);
+  ACE_Unbounded_Set_Iterator<PROXY*> end ();
 
   /// Return the number of elements in the collection
-  size_t size (void) const;
+  size_t size () const;
 
   /// Insert a new element to the collection
   void connected (PROXY *);
@@ -61,7 +61,7 @@ public:
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index aa2e1c1fea7..089f7caaf71 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -37,9 +37,9 @@ public:
 
   bool operator == (const TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> &rhs) const;
   bool operator != (const TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> &rhs) const;
-  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>& operator++ (void);
+  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>& operator++ ();
   TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> operator++ (int);
-  PROXY *operator *(void);
+  PROXY *operator *();
 
 private:
   Implementation impl_;
@@ -66,17 +66,17 @@ public:
   typedef TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> Iterator;
 
   /// Constructor
-  TAO_ESF_Proxy_RB_Tree (void);
+  TAO_ESF_Proxy_RB_Tree ();
 
   /// Return the first element in the collection, or end() if there
   /// are none
-  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> begin (void);
+  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> begin ();
 
   /// Return one past the last element in the collection
-  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> end (void);
+  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> end ();
 
   /// Return the number of elements in the collection
-  size_t size (void) const;
+  size_t size () const;
 
   /// Insert a new element to the collection
   void connected (PROXY *);
@@ -88,7 +88,7 @@ public:
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
index 68e677e3a7b..0b4607fe62b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
@@ -46,7 +46,7 @@ public:
                                 PROXY *proxy);
 
   /// Destructor
-  ~TAO_ESF_Proxy_RefCount_Guard (void);
+  ~TAO_ESF_Proxy_RefCount_Guard ();
 
 protected:
   /// The reference count, if it gets to zero then the object must be
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
index 49ae0dcf666..61873a0de55 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
@@ -41,7 +41,7 @@ public:
   TAO_ESF_RefCount_Guard (T &refcount);
 
   /// Destructor
-  ~TAO_ESF_RefCount_Guard (void);
+  ~TAO_ESF_RefCount_Guard ();
 
 protected:
   /// The reference count
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index a31b76e630f..efea73b2dcc 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -25,7 +25,7 @@ template<class PROXY>
 class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY>
 {
 public:
-  TAO_ESF_Shutdown_Proxy (void);
+  TAO_ESF_Shutdown_Proxy ();
 
   void work (PROXY *proxy);
 };
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
index 416d6e7dd6f..86e1ef6ccb0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY> ACE_INLINE
-TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy (void)
+TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index e0d44d16751..fe8b04411b8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -41,7 +41,7 @@ template<class Object>
 class TAO_ESF_Worker
 {
 public:
-  virtual ~TAO_ESF_Worker (void);
+  virtual ~TAO_ESF_Worker ();
 
   /// Used by the collection to inform the worker
   /// the number of proxies in the collection.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
index b52c4f60d5e..1fdf7e17b3c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
@@ -2,11 +2,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void)
+TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown ()
 {
 }
 
-TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler (void)
+TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index 23fe2376590..c44cadd0a86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -42,8 +42,8 @@ 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 (void);
-  virtual int shutdown (void) = 0;
+  virtual ~TAO_ECG_Handler_Shutdown ();
+  virtual int shutdown () = 0;
 };
 
 /**
@@ -58,7 +58,7 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Dgram_Handler
 {
 public:
 
-  virtual ~TAO_ECG_Dgram_Handler (void);
+  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 3040d61ff41..d0bfcaf73f8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -12,7 +12,6 @@
 #include /**/ "orbsvcs/Event/event_serv_export.h"
 #include "orbsvcs/RtecUDPAdminS.h"
 #include "orbsvcs/Event/EC_Lifetime_Utils.h"
-#include "ace/Auto_Ptr.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 7115d407a11..aca8953f5dc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -14,12 +14,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor (void)
+TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor ()
 {
 }
 // ****************************************************************
 
-TAO_ECG_UDP_Request_Entry::~TAO_ECG_UDP_Request_Entry (void)
+TAO_ECG_UDP_Request_Entry::~TAO_ECG_UDP_Request_Entry ()
 {
   if (this->own_received_fragments_)
     {
@@ -107,7 +107,7 @@ TAO_ECG_UDP_Request_Entry::mark_received (CORBA::ULong fragment_id)
 }
 
 int
-TAO_ECG_UDP_Request_Entry::complete (void) const
+TAO_ECG_UDP_Request_Entry::complete () const
 {
   for (CORBA::ULong i = 0;
        i < this->received_fragments_size_;
@@ -145,13 +145,13 @@ TAO_ECG_CDR_Message_Receiver::Requests::init (size_t size,
 
   for (size_t i = 0; i < size; ++i)
     {
-      this->fragmented_requests_[i] = 0;
+      this->fragmented_requests_[i] = nullptr;
     }
 
   return 0;
 }
 
-TAO_ECG_CDR_Message_Receiver::Requests::~Requests (void)
+TAO_ECG_CDR_Message_Receiver::Requests::~Requests ()
 {
   for (size_t i = 0; i < this->size_; ++i)
     {
@@ -164,7 +164,7 @@ TAO_ECG_CDR_Message_Receiver::Requests::~Requests (void)
 
   delete [] this->fragmented_requests_;
 
-  this->fragmented_requests_ = 0;
+  this->fragmented_requests_ = nullptr;
   this->size_ = 0;
   this->id_range_low_ = 0;
   this->id_range_high_ = 0;
@@ -176,7 +176,7 @@ TAO_ECG_CDR_Message_Receiver::Requests::get_request (CORBA::ULong request_id)
   if (request_id < this->id_range_low_)
     // <request_id> is below the current range.
     {
-      return 0;
+      return nullptr;
     }
 
   if (request_id > this->id_range_high_)
@@ -223,14 +223,14 @@ TAO_ECG_CDR_Message_Receiver::Requests::purge_requests (
         {
           delete this->fragmented_requests_[index];
         }
-      this->fragmented_requests_[index] = 0;
+      this->fragmented_requests_[index] = nullptr;
     }
 }
 
 // ****************************************************************
 
 TAO_ECG_UDP_Request_Entry
-TAO_ECG_CDR_Message_Receiver::Request_Completed_ (0, 0, 0, 0);
+TAO_ECG_CDR_Message_Receiver::Request_Completed_ (false, 0, 0, 0);
 
 int
 TAO_ECG_CDR_Message_Receiver::handle_input (
@@ -290,7 +290,7 @@ TAO_ECG_CDR_Message_Receiver::handle_input (
       crc = ACE::crc32 (iov, 2);
     }
   // Check whether the message is a loopback message.
-  if (this->ignore_from_.get () != 0
+  if (this->ignore_from_.get () != nullptr
       && this->ignore_from_->is_loopback (from))
     {
       return 0;
@@ -368,7 +368,7 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from,
   TAO_ECG_UDP_Request_Entry ** request =
     entry->int_id_->get_request (request_id);
 
-  if (request == 0)
+  if (request == nullptr)
     {
       ORBSVCS_DEBUG ((LM_WARNING, "Received mcast request with sequence"
                               "below currently expected range.\n"));
@@ -380,7 +380,7 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from,
                            "(Request already complete).\n"));
       return 0;
     }
-  if (*request != 0)
+  if (*request != nullptr)
     {
       ORBSVCS_ERROR_RETURN ((LM_ERROR, "Inconsistent fragments for "
                                    "mcast request.\n"),
@@ -407,7 +407,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment (
   TAO_ECG_UDP_Request_Entry ** request =
     source_entry->int_id_->get_request (header.request_id);
 
-  if (request == 0)
+  if (request == nullptr)
     {
       ORBSVCS_DEBUG ((LM_WARNING, "Received mcast request with sequence "
                               "below currently expected range.\n"));
@@ -419,7 +419,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment (
                            "(Request already complete).\n"));
       return 0;
     }
-  if (*request == 0)
+  if (*request == nullptr)
     // Entry for this request has not yet been allocated.
     {
       ACE_NEW_RETURN (*request,
@@ -479,16 +479,16 @@ TAO_ECG_CDR_Message_Receiver::Request_Map::ENTRY*
 TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from)
 {
   // Get the entry for <from> from the <request_map_>.
-  Request_Map::ENTRY * entry = 0;
+  Request_Map::ENTRY * entry = nullptr;
 
   if (this->request_map_.find (from, entry) == -1)
     {
       // Create an entry if one doesn't exist.
-      Requests *requests = 0;
+      Requests *requests = nullptr;
       ACE_NEW_RETURN (requests,
                       Requests,
-                      0);
-      auto_ptr<Requests> requests_aptr (requests);
+                      nullptr);
+      std::unique_ptr<Requests> requests_aptr (requests);
 
       if (requests->init (this->max_requests_, this->min_purge_count_) == -1
           || this->request_map_.bind (from, requests, entry) == -1)
@@ -504,7 +504,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from)
 }
 
 void
-TAO_ECG_CDR_Message_Receiver::shutdown (void)
+TAO_ECG_CDR_Message_Receiver::shutdown ()
 {
   // ACE_GUARD (ACE_Lock, guard, *this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
index 2ec41e62347..199834e90fc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ECG_CDR_Processor
 {
 public:
-  virtual ~TAO_ECG_CDR_Processor (void);
+  virtual ~TAO_ECG_CDR_Processor ();
 
   /// Extracts data from @a cdr.  Returns 0 on success, -1 on error.
   virtual int decode (TAO_InputCDR &cdr) = 0;
@@ -63,7 +63,7 @@ public:
                              CORBA::ULong request_size,
                              CORBA::ULong fragment_count);
 
-  ~TAO_ECG_UDP_Request_Entry (void);
+  ~TAO_ECG_UDP_Request_Entry ();
 
   /// Validate a fragment, it should be rejected if it is invalid..
   int validate_fragment (CORBA::Boolean byte_order,
@@ -80,7 +80,7 @@ public:
   void mark_received (CORBA::ULong fragment_id);
 
   /// Is the message complete?
-  int complete (void) const;
+  int complete () const;
 
   /// Return a buffer for the fragment at offset @a fragment_offset
   char* fragment_buffer (CORBA::ULong fragment_offset);
@@ -144,7 +144,7 @@ public:
   /// Initialization and termination methods.
   //@{
   TAO_ECG_CDR_Message_Receiver (CORBA::Boolean check_crc);
-  ~TAO_ECG_CDR_Message_Receiver (void);
+  ~TAO_ECG_CDR_Message_Receiver ();
 
   /**
    * @param ignore_from Endpoint used to remove events generated by
@@ -154,7 +154,7 @@ public:
              /* , ACE_Lock *lock = 0 */);
 
   // Shutdown the component: close down the request map, etc.
-  void shutdown (void);
+  void shutdown ();
   //@}
 
   /// Main method: read the data from @a dgram and either pass ready data
@@ -258,8 +258,8 @@ class TAO_ECG_CDR_Message_Receiver::Requests
 {
 public:
 
-  Requests (void);
-  ~Requests (void);
+  Requests ();
+  ~Requests ();
 
   /// Allocates and initializes <fragmented_requests_>.
   int init (size_t size, size_t min_purge_count);
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index a46244b6dfb..a218fb7f0d5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -17,7 +17,7 @@ void
 TAO_ECG_CDR_Message_Sender::init (
       TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
-  if (endpoint_rptr.get () == 0
+  if (endpoint_rptr.get () == nullptr
       || endpoint_rptr->dgram ().get_handle () == ACE_INVALID_HANDLE)
     {
       ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): "
@@ -32,7 +32,7 @@ void
 TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                            const ACE_INET_Addr &addr)
 {
-  if (this->endpoint_rptr_.get () == 0)
+  if (this->endpoint_rptr_.get () == nullptr)
     {
       ORBSVCS_ERROR ((LM_ERROR, "Attempt to invoke send_message() "
                             "on non-initialized sender object.\n"));
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index b36c12ff164..d9ce3dd8bbb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -94,7 +94,7 @@ public:
   void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   // Shutdown this component.  Frees up the endpoint.
-  void shutdown (void);
+  void shutdown ();
   //@}
 
   /// Setters/getters.
@@ -109,7 +109,7 @@ public:
    * header + 8 bytes must fit).
    */
   int mtu (CORBA::ULong mtu);
-  CORBA::ULong mtu (void) const;
+  CORBA::ULong mtu () const;
   //@}
 
   /// The main method - send a CDR message.
@@ -131,7 +131,7 @@ public:
 
 private:
   /// Return the datagram...
-  ACE_SOCK_Dgram& dgram (void);
+  ACE_SOCK_Dgram& dgram ();
 
   /**
    * Send one fragment, the first entry in the iovec is used to send
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index b4968b356b5..d8d2961e3fd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -15,7 +15,7 @@ TAO_ECG_Complex_Address_Server::TAO_ECG_Complex_Address_Server (
 {
 }
 
-TAO_ECG_Complex_Address_Server::~TAO_ECG_Complex_Address_Server (void)
+TAO_ECG_Complex_Address_Server::~TAO_ECG_Complex_Address_Server ()
 {
 }
 
@@ -32,7 +32,7 @@ TAO_ECG_Complex_Address_Server::init (const char *arg)
   while (*data != '\0')
     {
       // Extract lookup value (it is followed by '@').
-      const char * location = 0;
+      const char * location = nullptr;
       location = ACE_OS::strchr (data, '@');
       if (!location)
         {
@@ -44,24 +44,24 @@ TAO_ECG_Complex_Address_Server::init (const char *arg)
                             -1);
         }
       size_t len = location - data;
-      key_string.set (data, len, 1);
+      key_string.set (data, len, true);
       data += len + 1;
 
       // Extract mcast address to be mapped to just extracted lookup
       // value.
-      location = 0;
+      location = nullptr;
       location = ACE_OS::strchr (data, ' ');
       if (location)
         {
           len = location - data;
-          mcast_string.set (data, len, 1);
+          mcast_string.set (data, len, true);
           data += len + 1;
         }
       else
         {
           // This must be the last entry in the mapping.
           len = ACE_OS::strlen (data);
-          mcast_string.set (data, len, 1);
+          mcast_string.set (data, len, true);
           data += len;
         }
 
@@ -90,7 +90,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
     }
 
   // Convert strings to values.
-  char * endptr = 0;
+  char * endptr = nullptr;
   CORBA::Long header_value = ACE_OS::strtol (key, &endptr, 0);
   if (*endptr != '\0')
     {
@@ -131,7 +131,7 @@ TAO_ECG_Complex_Address_Server::get_addr (
   else
     key = header.type;
 
-  MAP::ENTRY * mapping_entry = 0;
+  MAP::ENTRY * mapping_entry = nullptr;
   if (this->mcast_mapping_.find (key, mapping_entry) == -1)
     {
       // Key was not found in the mapping.  Use default.
@@ -164,7 +164,7 @@ TAO_ECG_Complex_Address_Server::get_address (
   else
     key = header.type;
 
-  MAP::ENTRY * mapping_entry = 0;
+  MAP::ENTRY * mapping_entry = nullptr;
   ACE_INET_Addr &src_addr =
     (this->mcast_mapping_.find (key, mapping_entry) == -1) ?
     this->default_addr_ : mapping_entry->int_id_;
@@ -188,7 +188,7 @@ TAO_ECG_Complex_Address_Server::get_address (
 
 
 void
-TAO_ECG_Complex_Address_Server::dump_content (void)
+TAO_ECG_Complex_Address_Server::dump_content ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG, "Default address: %s:%d\n",
               this->default_addr_.get_host_addr (),
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index 6f90a5b6935..5bb96c44b7b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -58,7 +58,7 @@ public:
          create (int is_source_mapping = 1);
 
   /// Destructor
-  virtual ~TAO_ECG_Complex_Address_Server (void);
+  virtual ~TAO_ECG_Complex_Address_Server ();
 
   /// Initializes the mapping from the @a arg string.  See class notes
   /// for the expected format.
@@ -72,7 +72,7 @@ public:
 
   /// Prints out complete content of the address server. Useful for
   /// debugging.
-  void dump_content (void);
+  void dump_content ();
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index 47557ef714e..9c513ff2b77 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -4,22 +4,22 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void)
+TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control ()
 {
 }
 
-TAO_ECG_ConsumerEC_Control::~TAO_ECG_ConsumerEC_Control (void)
+TAO_ECG_ConsumerEC_Control::~TAO_ECG_ConsumerEC_Control ()
 {
 }
 
 int
-TAO_ECG_ConsumerEC_Control::activate (void)
+TAO_ECG_ConsumerEC_Control::activate ()
 {
   return 0;
 }
 
 int
-TAO_ECG_ConsumerEC_Control::shutdown (void)
+TAO_ECG_ConsumerEC_Control::shutdown ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
index 268c4c5c7be..70bb109851f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -44,18 +44,18 @@ class TAO_RTEvent_Serv_Export TAO_ECG_ConsumerEC_Control
 {
 public:
   /// Constructor.
-  TAO_ECG_ConsumerEC_Control (void);
+  TAO_ECG_ConsumerEC_Control ();
 
   /// Destructor.
-  virtual ~TAO_ECG_ConsumerEC_Control (void);
+  virtual ~TAO_ECG_ConsumerEC_Control ();
 
   /// Activate any internal threads or timers used to poll the state of
   /// the event channel.
-  virtual int activate (void);
+  virtual int activate ();
 
   /// Shutdown any internal threads or timers used to poll the state of
   /// the event channel.
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /**
    * When pushing an event to the event channel a CORBA::OBJECT_NOT_EXIST
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 970534d4332..8c36dc6b44c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv,
                                     const ACE_TCHAR *net_if,
                                     CORBA::ULong sz)
-  : net_if_ (net_if ? ACE_OS::strdup (net_if) : 0)
+  : net_if_ (net_if ? ACE_OS::strdup (net_if) : nullptr)
   , subscriptions_ ()
   , receiver_ (recv)
   , recvbuf_size_ (sz)
@@ -29,7 +29,7 @@ TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv,
   ACE_ASSERT (this->receiver_);
 }
 
-TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void)
+TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH ()
 {
   ACE_OS::free (this->net_if_);
 }
@@ -78,7 +78,7 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec)
 }
 
 int
-TAO_ECG_Mcast_EH::shutdown (void)
+TAO_ECG_Mcast_EH::shutdown ()
 {
   // Already shut down.
   if (!this->receiver_)
@@ -91,11 +91,11 @@ TAO_ECG_Mcast_EH::shutdown (void)
   if (this->observer_.in ())
     {
       this->observer_->shutdown ();
-      this->observer_ = 0;
+      this->observer_ = nullptr;
     }
 
   // Indicates that we are in a shutdown state.
-  this->receiver_ = 0;
+  this->receiver_ = nullptr;
 
   // Deregister from reactor, close and clean up sockets.
   size_t const subscriptions_size = this->subscriptions_.size ();
@@ -303,9 +303,9 @@ TAO_ECG_Mcast_EH::Observer::update_supplier (
 }
 
 void
-TAO_ECG_Mcast_EH::Observer::shutdown (void)
+TAO_ECG_Mcast_EH::Observer::shutdown ()
 {
-  this->eh_ = 0;
+  this->eh_ = nullptr;
   this->deactivator_.deactivate ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index dbdf3beef72..8afc5439610 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -68,7 +68,7 @@ public:
                     CORBA::ULong buf_sz = 0);
 
   /// Destructor.
-  virtual ~TAO_ECG_Mcast_EH (void);
+  virtual ~TAO_ECG_Mcast_EH ();
 
   /**
    * Register for changes in the EC subscription list.
@@ -89,7 +89,7 @@ public:
    * multicast groups, close the sockets and deregister from the
    * reactor.
    */
-  virtual int shutdown (void);
+  virtual int shutdown ();
   //@}
 
   /// Reactor callback.  Notify receiver_ that a dgram corresponding
@@ -115,7 +115,7 @@ private:
 
     /// Shut down the observer: disconnect from EC and deactivate from
     /// POA.
-    void shutdown (void);
+    void shutdown ();
 
     /// Event Channel Observer methods
     //@{
@@ -201,14 +201,14 @@ private:
   class TAO_RTEvent_Serv_Export Observer_Disconnect_Command
   {
   public:
-    Observer_Disconnect_Command (void);
+    Observer_Disconnect_Command ();
     Observer_Disconnect_Command (RtecEventChannelAdmin::Observer_Handle handle,
                                  RtecEventChannelAdmin::EventChannel_ptr ec);
 
     Observer_Disconnect_Command (const Observer_Disconnect_Command &rhs);
     Observer_Disconnect_Command & operator= (const Observer_Disconnect_Command & rhs);
 
-    void execute (void);
+    void execute ();
 
   private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index a679bd3b058..3d8c8a8eb4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -28,7 +28,7 @@ typedef TAO_EC_Shutdown_Command<PortableServer::Servant_var<TAO_ECG_UDP_Receiver
 UDP_Receiver_Shutdown;
 
 int
-TAO_ECG_Mcast_Gateway::init_svcs (void)
+TAO_ECG_Mcast_Gateway::init_svcs ()
 {
   return ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_TAO_ECG_Mcast_Gateway);
@@ -36,7 +36,7 @@ TAO_ECG_Mcast_Gateway::init_svcs (void)
 
 
 int
-TAO_ECG_Mcast_Gateway::fini (void)
+TAO_ECG_Mcast_Gateway::fini ()
 {
   return 0;
 }
@@ -149,7 +149,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[])
           if (arg_shifter.is_parameter_next ())
             {
               const ACE_TCHAR* opt = arg_shifter.get_current ();
-              unsigned long tmp = ACE_OS::strtoul (opt, 0, 0) & 0xff;
+              unsigned long tmp = ACE_OS::strtoul (opt, nullptr, 0) & 0xff;
               this->ttl_value_ = static_cast<u_char> (tmp);
               arg_shifter.consume_arg ();
             }
@@ -236,7 +236,7 @@ TAO_ECG_Mcast_Gateway::init (
 }
 
 int
-TAO_ECG_Mcast_Gateway::validate_configuration (void)
+TAO_ECG_Mcast_Gateway::validate_configuration ()
 {
   if ((this->handler_type_ == ECG_HANDLER_BASIC
        || this->handler_type_ == ECG_HANDLER_UDP)
@@ -280,16 +280,16 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
 }
 
 TAO_ECG_Refcounted_Endpoint
-TAO_ECG_Mcast_Gateway::init_endpoint (void)
+TAO_ECG_Mcast_Gateway::init_endpoint ()
 {
-  TAO_ECG_UDP_Out_Endpoint* endpoint = 0;
+  TAO_ECG_UDP_Out_Endpoint* endpoint = nullptr;
   TAO_ECG_Refcounted_Endpoint refendpoint;
 
   // Try to allocate a new endpoint from the heap
   ACE_NEW_NORETURN (endpoint,
                     TAO_ECG_UDP_Out_Endpoint);
 
-  if (endpoint != 0)
+  if (endpoint != nullptr)
   {
     refendpoint.reset (endpoint);
   }
@@ -351,22 +351,22 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
 }
 
 PortableServer::ServantBase *
-TAO_ECG_Mcast_Gateway::init_address_server (void)
+TAO_ECG_Mcast_Gateway::init_address_server ()
 {
   const char * address_server_arg =
     (this->address_server_arg_.length ())
-    ? this->address_server_arg_.c_str () : 0;
+    ? this->address_server_arg_.c_str () : nullptr;
 
   if (this->address_server_type_ == ECG_ADDRESS_SERVER_BASIC)
     {
       PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> impl =
         TAO_ECG_Simple_Address_Server::create ();
       if (!impl.in ())
-        return 0;
+        return nullptr;
 
       if (impl->init (address_server_arg) == -1)
         {
-          return 0;
+          return nullptr;
         }
       return impl._retn ();
     }
@@ -376,11 +376,11 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
       PortableServer::Servant_var<TAO_ECG_Complex_Address_Server> impl =
         TAO_ECG_Complex_Address_Server::create (1);
       if (!impl.in ())
-        return 0;
+        return nullptr;
 
       if (impl->init (address_server_arg) == -1)
         {
-          return 0;
+          return nullptr;
         }
       return impl._retn ();
     }
@@ -390,11 +390,11 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
       PortableServer::Servant_var<TAO_ECG_Complex_Address_Server> impl =
         TAO_ECG_Complex_Address_Server::create (0);
       if (!impl.in ())
-        return 0;
+        return nullptr;
 
       if (impl->init (address_server_arg) == -1)
         {
-          return 0;
+          return nullptr;
         }
       return impl._retn ();
     }
@@ -404,7 +404,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
       ORBSVCS_ERROR ((LM_ERROR,
                   "Cannot create address server: "
                   "unknown address server type specified.\n"));
-      return 0;
+      return nullptr;
     }
 }
 
@@ -416,14 +416,14 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
   TAO_ECG_Refcounted_Handler handler;
 
   const ACE_TCHAR * nic =
-    (this->nic_.length ()) ? this->nic_.c_str () : 0;
+    (this->nic_.length ()) ? this->nic_.c_str () : nullptr;
   const char * address_server_arg =
     (this->address_server_arg_.length ())
-    ? this->address_server_arg_.c_str () : 0;
+    ? this->address_server_arg_.c_str () : nullptr;
 
   if (this->handler_type_ == ECG_HANDLER_BASIC)
     {
-      TAO_ECG_Simple_Mcast_EH * h = 0;
+      TAO_ECG_Simple_Mcast_EH * h = nullptr;
       ACE_NEW_RETURN (h,
                       TAO_ECG_Simple_Mcast_EH (receiver),
                       handler);
@@ -436,7 +436,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
 
   else if (this->handler_type_ == ECG_HANDLER_COMPLEX)
     {
-      TAO_ECG_Mcast_EH * h = 0;
+      TAO_ECG_Mcast_EH * h = nullptr;
       ACE_NEW_RETURN (h,
                       TAO_ECG_Mcast_EH (receiver, nic),
                       handler);
@@ -449,7 +449,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
 
   else if (this->handler_type_ == ECG_HANDLER_UDP)
     {
-      TAO_ECG_UDP_EH * h = 0;
+      TAO_ECG_UDP_EH * h = nullptr;
       ACE_NEW_RETURN (h,
                       TAO_ECG_UDP_EH (receiver),
                       handler);
@@ -614,7 +614,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
       || this->service_type_ == ECG_MCAST_TWO_WAY)
     {
       endpoint_rptr = this->init_endpoint ();
-      if (endpoint_rptr.get () == 0)
+      if (endpoint_rptr.get () == nullptr)
         {
           throw CORBA::INTERNAL ();
         }
@@ -651,7 +651,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
         handler_rptr (this->init_handler (receiver.in (),
                                           ec,
                                           reactor));
-      if (handler_rptr.get () == 0)
+      if (handler_rptr.get () == nullptr)
         {
           throw CORBA::INTERNAL ();
         }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index 5ab71be6c18..a34a07843f8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -129,15 +129,15 @@ public:
   /// The Service_Object entry points.
   //@{
   virtual int init (int argc, ACE_TCHAR* argv[]);
-  virtual int fini (void);
+  virtual int fini ();
   //@}
 
   /// Helper function to register the Gateway into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   /// Constructor.
-  TAO_ECG_Mcast_Gateway (void);
+  TAO_ECG_Mcast_Gateway ();
 
   /// Values for some configuration parameters to init ().
   //@{
@@ -182,7 +182,7 @@ public:
    */
   struct TAO_RTEvent_Serv_Export Attributes
   {
-    Attributes (void);
+    Attributes ();
 
     Address_Server_Type address_server_type;
     Handler_Type handler_type;
@@ -227,13 +227,13 @@ private:
                     RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Verifies configuration values specified through init() make sense.
-  int validate_configuration (void);
+  int validate_configuration ();
   //@}
 
   /// Allocate and initialize appropriate objects.
   //@{
   PortableServer::ServantBase *
-        init_address_server (void);
+        init_address_server ();
 
   PortableServer::Servant_var<TAO_ECG_UDP_Sender>
         init_sender (RtecEventChannelAdmin::EventChannel_ptr ec,
@@ -245,7 +245,7 @@ private:
                        RtecUDPAdmin::AddrServer_ptr address_server,
                        TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
-  TAO_ECG_Refcounted_Endpoint init_endpoint (void);
+  TAO_ECG_Refcounted_Endpoint init_endpoint ();
 
   TAO_ECG_Refcounted_Handler
         init_handler (TAO_ECG_Dgram_Handler *recv,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index bad8ff7df7b..04b881ae603 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -28,7 +28,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::
     this->orb_->orb_core ()->reactor ();
 }
 
-TAO_ECG_Reactive_ConsumerEC_Control::~TAO_ECG_Reactive_ConsumerEC_Control (void)
+TAO_ECG_Reactive_ConsumerEC_Control::~TAO_ECG_Reactive_ConsumerEC_Control ()
 {
 }
 
@@ -104,7 +104,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::handle_timeout (
 }
 
 int
-TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
+TAO_ECG_Reactive_ConsumerEC_Control::activate ()
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   try
@@ -134,7 +134,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
         // handle_timeout uses these policies, if done in front, the channel
         // can crash when the timeout expires before initiazation is ready.
         timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
-                                                    0,
+                                                    nullptr,
                                                     this->rate_,
                                                     this->rate_);
         if (timer_id_ == -1)
@@ -151,7 +151,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
 }
 
 int
-TAO_ECG_Reactive_ConsumerEC_Control::shutdown (void)
+TAO_ECG_Reactive_ConsumerEC_Control::shutdown ()
 {
   int r = 0;
 
@@ -159,7 +159,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::shutdown (void)
   r = this->reactor_->cancel_timer (timer_id_);
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
-  this->adapter_.reactor (0);
+  this->adapter_.reactor (nullptr);
   return r;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index d3fe99a37b9..ed3b751b127 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -72,15 +72,15 @@ public:
                                        CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_ECG_Reactive_ConsumerEC_Control (void);
+  virtual ~TAO_ECG_Reactive_ConsumerEC_Control ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_EC_ConsumerControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway);
   virtual void system_exception (TAO_EC_Gateway_IIOP *gateway,
                                  CORBA::SystemException &);
@@ -88,7 +88,7 @@ public:
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_eventchannel (void);
+  void query_eventchannel ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 0ca681bb896..018b710de09 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -27,7 +27,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::
     this->orb_->orb_core ()->reactor ();
 }
 
-TAO_ECG_Reconnect_ConsumerEC_Control::~TAO_ECG_Reconnect_ConsumerEC_Control (void)
+TAO_ECG_Reconnect_ConsumerEC_Control::~TAO_ECG_Reconnect_ConsumerEC_Control ()
 {
 }
 
@@ -143,7 +143,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::handle_timeout (
 }
 
 int
-TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
+TAO_ECG_Reconnect_ConsumerEC_Control::activate ()
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   try
@@ -173,7 +173,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
         // handle_timeout uses these policies, if done in front, the channel
         // can crash when the timeout expires before initiazation is ready.
         timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
-                                                    0,
+                                                    nullptr,
                                                     this->rate_,
                                                     this->rate_);
         if (timer_id_ == -1)
@@ -190,7 +190,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
 }
 
 int
-TAO_ECG_Reconnect_ConsumerEC_Control::shutdown (void)
+TAO_ECG_Reconnect_ConsumerEC_Control::shutdown ()
 {
   int r = 0;
 
@@ -198,7 +198,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::shutdown (void)
   r = this->reactor_->cancel_timer (timer_id_);
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
-  this->adapter_.reactor (0);
+  this->adapter_.reactor (nullptr);
   return r;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
index 27c521480d4..493cd0fe01e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -77,15 +77,15 @@ public:
                                         CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_ECG_Reconnect_ConsumerEC_Control (void);
+  virtual ~TAO_ECG_Reconnect_ConsumerEC_Control ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_EC_ConsumerControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway);
   virtual void system_exception (TAO_EC_Gateway_IIOP *gateway,
                                  CORBA::SystemException &);
@@ -93,13 +93,13 @@ public:
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_eventchannel (void);
+  void query_eventchannel ();
 
   /// Look if we can reconnect again.
-  void try_reconnect (void);
+  void try_reconnect ();
 
   /// Reconnect to the consumer ec.
-  void reconnect (void);
+  void reconnect ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
index 1d1249873ce..d1c14b7969c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -6,11 +6,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server (void)
+TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server ()
 {
 }
 
-TAO_ECG_Simple_Address_Server::~TAO_ECG_Simple_Address_Server (void)
+TAO_ECG_Simple_Address_Server::~TAO_ECG_Simple_Address_Server ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index e3e27ce61f0..267cea8f0c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -32,10 +32,10 @@ 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.)
-  static PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> create (void);
+  static PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> create ();
 
   /// Destructor
-  virtual ~TAO_ECG_Simple_Address_Server (void);
+  virtual ~TAO_ECG_Simple_Address_Server ();
 
   int init (const char *arg);
 
@@ -50,7 +50,7 @@ protected:
   /// Constructor (protected).  Clients can create new
   /// TAO_ECG_Simple_Address_Server objects using the static create()
   /// method.
-  TAO_ECG_Simple_Address_Server (void);
+  TAO_ECG_Simple_Address_Server ();
 
 private:
   ACE_INET_Addr addr_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
index bce028cdd7b..2e35302a66a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -11,7 +11,7 @@ TAO_ECG_Simple_Mcast_EH::TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv)
   ACE_ASSERT (this->receiver_);
 }
 
-TAO_ECG_Simple_Mcast_EH::~TAO_ECG_Simple_Mcast_EH (void)
+TAO_ECG_Simple_Mcast_EH::~TAO_ECG_Simple_Mcast_EH ()
 {
 }
 
@@ -23,7 +23,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr,
   if (!this->receiver_)
     return -1;
 
-  if (mcast_addr == 0)
+  if (mcast_addr == nullptr)
     return -1;
 
   ACE_INET_Addr mcast_group;
@@ -59,7 +59,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr,
 }
 
 int
-TAO_ECG_Simple_Mcast_EH::shutdown (void)
+TAO_ECG_Simple_Mcast_EH::shutdown ()
 {
   // Already shut down.
   if (!this->receiver_)
@@ -82,7 +82,7 @@ TAO_ECG_Simple_Mcast_EH::shutdown (void)
                 "Unable to close mcast receiving dgram "
                 "on shutdown.\n"));
 
-  this->receiver_ = 0;
+  this->receiver_ = nullptr;
 
   return result;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
index aa37322173f..69c5ac53150 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
@@ -50,7 +50,7 @@ public:
   TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv);
 
   /// Destructor.
-  virtual ~TAO_ECG_Simple_Mcast_EH (void);
+  virtual ~TAO_ECG_Simple_Mcast_EH ();
 
   /// Join the specified multicast group and register itself with the
   /// reactor.
@@ -62,7 +62,7 @@ public:
 
   /// TAO_ECG_Handler_Shutdown method.
   /// Unsubscribe from the reactor and close the datagram.
-  virtual int shutdown (void);
+  virtual int shutdown ();
   //@}
 
   /// Main method - reactor callback.  Notify <receiver_> that
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index b0e6e278d68..49ff6f35ecf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -17,7 +17,7 @@ TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv)
   ACE_ASSERT (this->receiver_);
 }
 
-TAO_ECG_UDP_EH::~TAO_ECG_UDP_EH (void)
+TAO_ECG_UDP_EH::~TAO_ECG_UDP_EH ()
 {
 }
 
@@ -50,7 +50,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr,
 }
 
 int
-TAO_ECG_UDP_EH::shutdown (void)
+TAO_ECG_UDP_EH::shutdown ()
 {
   // Already shut down.
   if (!this->receiver_)
@@ -72,7 +72,7 @@ TAO_ECG_UDP_EH::shutdown (void)
     ORBSVCS_ERROR ((LM_ERROR,
                 "Unable to close receiving dgram on shutdown.\n"));
 
-  this->receiver_ = 0;
+  this->receiver_ = nullptr;
 
   return result;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
index c11544fae06..0d865c992c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
@@ -55,7 +55,7 @@ public:
   TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv);
 
   /// Destructor.
-  virtual ~TAO_ECG_UDP_EH (void);
+  virtual ~TAO_ECG_UDP_EH ();
 
   /// Open the datagram and register itself with this->reactor().
   /// To insure proper resource clean up, if open () is successful,
@@ -66,7 +66,7 @@ public:
 
   /// TAO_ECG_Handler_Shutdown method.
   /// Unsubscribe from the reactor and close the datagram.
-  virtual int shutdown (void);
+  virtual int shutdown ();
   //@}
 
   /// Main method - reactor callback.  Notify <receiver_> that
@@ -78,7 +78,7 @@ public:
    * type safety", allowing the user to setup options and gain access
    * to low-level features.
    */
-  ACE_SOCK_Dgram &dgram (void);
+  ACE_SOCK_Dgram &dgram ();
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 0d27483b7eb..6f238efb3c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint (void)
+TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint ()
 {
   this->dgram_.close ();
 
@@ -36,7 +36,7 @@ TAO_ECG_UDP_Out_Endpoint::is_loopback (const ACE_INET_Addr& from)
   if (from.get_port_number () != this->port_number_)
     return false;
 
-  if (this->ifs_ == 0)
+  if (this->ifs_ == nullptr)
     {
       ACE::get_ip_interfaces (this->if_count_, this->ifs_);
     }
@@ -62,7 +62,7 @@ TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs)
       this->if_count_ = rhs.if_count_;
 
       delete [] this->ifs_;
-      this->ifs_ = 0;
+      this->ifs_ = nullptr;
 
       if (this->if_count_ != 0)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
index eb710628ee5..8cf05182684 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
@@ -45,10 +45,10 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Out_Endpoint
 {
 public:
   /// Constructor
-  TAO_ECG_UDP_Out_Endpoint (void);
+  TAO_ECG_UDP_Out_Endpoint ();
 
   /// Constructor
-  ~TAO_ECG_UDP_Out_Endpoint (void);
+  ~TAO_ECG_UDP_Out_Endpoint ();
 
   /// Copy Constructor
   TAO_ECG_UDP_Out_Endpoint (const TAO_ECG_UDP_Out_Endpoint& rhs);
@@ -58,10 +58,10 @@ public:
 
   /// Obtain the datagram associated with this endpoint. Clients of
   /// this class must open, and register (if necessary) this datagram.
-  ACE_SOCK_Dgram& dgram (void);
+  ACE_SOCK_Dgram& dgram ();
 
   /// Obtain the next request id.
-  CORBA::ULong next_request_id (void);
+  CORBA::ULong next_request_id ();
 
   /// The endpoint can detect if a data-gram was sent by itself, this
   /// is useful to ignore or remove messages sent by the same process.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 6ac398553b0..a0388b52b59 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void)
+TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver ()
 {
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -127,7 +127,7 @@ TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub)
 }
 
 void
-TAO_ECG_UDP_Receiver::disconnect_push_supplier (void)
+TAO_ECG_UDP_Receiver::disconnect_push_supplier ()
 {
   // Prevent attempts to disconnect.
   this->auto_proxy_disconnect_.disallow_command ();
@@ -136,7 +136,7 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (void)
 }
 
 void
-TAO_ECG_UDP_Receiver::shutdown (void)
+TAO_ECG_UDP_Receiver::shutdown ()
 {
   if (this->handler_rptr_.get ())
     this->handler_rptr_->shutdown ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 0d659652791..68532c6b4b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -71,7 +71,7 @@ class TAO_ECG_UDP_Out_Endpoint;
 class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver_Disconnect_Command
 {
 public:
-  TAO_ECG_UDP_Receiver_Disconnect_Command (void);
+  TAO_ECG_UDP_Receiver_Disconnect_Command ();
   TAO_ECG_UDP_Receiver_Disconnect_Command (
               RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy);
 
@@ -81,7 +81,7 @@ public:
   TAO_ECG_UDP_Receiver_Disconnect_Command &
    operator= (const TAO_ECG_UDP_Receiver_Disconnect_Command & rhs);
 
-  void execute (void);
+  void execute ();
 
 private:
 
@@ -113,7 +113,7 @@ public:
   /// TAO_ECG_UDP_Receiver objects are heap-allocated.)
   static PortableServer::Servant_var<TAO_ECG_UDP_Receiver> create (CORBA::Boolean perform_crc = 0);
 
-  ~TAO_ECG_UDP_Receiver (void);
+  ~TAO_ECG_UDP_Receiver ();
 
   /**
    * @param lcl_ec Event Channel to which we will act as a supplier of events.
@@ -157,7 +157,7 @@ public:
    * result in decrementing of the reference count (due to
    * deactivation) and deletion of the object.
    */
-  void shutdown (void);
+  void shutdown ();
   //@}
 
   /// Accessor.
@@ -174,7 +174,7 @@ public:
   /// The PushSupplier idl method.
   /// Invokes shutdown (), which may result in the object being deleted, if
   /// refcounting is used to manage its lifetime.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// TAO_ECG_Dgram_Handler method.
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index e742497719a..2e5c0b9d1a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -17,7 +17,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void)
+TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender ()
 {
 }
 
@@ -131,7 +131,7 @@ TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub)
 }
 
 void
-TAO_ECG_UDP_Sender::disconnect_push_consumer (void)
+TAO_ECG_UDP_Sender::disconnect_push_consumer ()
 {
   // Prevent attempts to disconnect.
   this->auto_proxy_disconnect_.disallow_command ();
@@ -140,7 +140,7 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (void)
 }
 
 void
-TAO_ECG_UDP_Sender::shutdown (void)
+TAO_ECG_UDP_Sender::shutdown ()
 {
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 1c0dab80b05..67f29c6fc14 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -70,7 +70,7 @@ class TAO_ECG_UDP_Out_Endpoint;
 class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender_Disconnect_Command
 {
 public:
-  TAO_ECG_UDP_Sender_Disconnect_Command (void);
+  TAO_ECG_UDP_Sender_Disconnect_Command ();
   TAO_ECG_UDP_Sender_Disconnect_Command (
               RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy);
 
@@ -80,7 +80,7 @@ public:
   TAO_ECG_UDP_Sender_Disconnect_Command &
    operator= (const TAO_ECG_UDP_Sender_Disconnect_Command & rhs);
 
-  void execute (void);
+  void execute ();
 
 private:
 
@@ -110,7 +110,7 @@ public:
   /// TAO_ECG_UDP_Sender objects are heap-allocated.)
   static PortableServer::Servant_var<TAO_ECG_UDP_Sender> create (CORBA::Boolean crc = 0);
 
-  ~TAO_ECG_UDP_Sender (void);
+  ~TAO_ECG_UDP_Sender ();
 
   /**
    * @param lcl_ec Event Channel to which we will act as a consumer of events.
@@ -148,7 +148,7 @@ public:
    * Calling this method may result in decrementing of the reference
    * count (due to deactivation) and deletion of the object.
    */
-  void shutdown (void);
+  void shutdown ();
   //@}
 
   /// Accessors.
@@ -160,7 +160,7 @@ public:
    * header + 8 bytes must fit).
    */
   int mtu (CORBA::ULong mtu);
-  CORBA::ULong mtu (void) const;
+  CORBA::ULong mtu () const;
 
   /// Get the local endpoint used to send the events.
   int get_local_addr (ACE_INET_Addr& addr);
@@ -170,7 +170,7 @@ public:
   //@{
   /// Invokes shutdown (), which may result in the object being deleted, if
   /// refcounting is used to manage its lifetime.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   virtual void push (const RtecEventComm::EventSet &events);
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 9aeb0fd5bee..0e9b80f7c7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -16,7 +16,7 @@ TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[],
     }
 }
 
-TAO_EC_And_Filter::~TAO_EC_And_Filter (void)
+TAO_EC_And_Filter::~TAO_EC_And_Filter ()
 {
   TAO_EC_Filter** end = this->children_ + this->n_;
   for (TAO_EC_Filter** i = this->children_;
@@ -24,27 +24,27 @@ TAO_EC_And_Filter::~TAO_EC_And_Filter (void)
        ++i)
     {
       delete *i;
-      *i = 0;
+      *i = nullptr;
     }
   delete[] this->children_;
-  this->children_ = 0;
+  this->children_ = nullptr;
   this->n_ = 0;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_And_Filter::begin (void) const
+TAO_EC_And_Filter::begin () const
 {
   return this->children_;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_And_Filter::end (void) const
+TAO_EC_And_Filter::end () const
 {
   return this->children_ + this->n_;
 }
 
 int
-TAO_EC_And_Filter::size (void) const
+TAO_EC_And_Filter::size () const
 {
   return static_cast<CORBA::ULong> (this->n_);
 }
@@ -62,7 +62,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
     }
 
   // All children accepted the event, push up...
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     {
       this->parent ()->push (event, qos_info);
     }
@@ -83,7 +83,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
     }
 
   // All children accepted the event, push up...
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     {
       this->parent ()->push (event, qos_info);
     }
@@ -104,7 +104,7 @@ TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&,
 }
 
 void
-TAO_EC_And_Filter::clear (void)
+TAO_EC_And_Filter::clear ()
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
@@ -116,7 +116,7 @@ TAO_EC_And_Filter::clear (void)
 }
 
 CORBA::ULong
-TAO_EC_And_Filter::max_event_size (void) const
+TAO_EC_And_Filter::max_event_size () const
 {
   CORBA::ULong n = 0;
   ChildrenIterator end = this->end ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index a773fc8f2df..8bab675629d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -43,13 +43,13 @@ public:
                              size_t n);
 
   /// Destructor
-  virtual ~TAO_EC_And_Filter (void);
+  virtual ~TAO_EC_And_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -58,8 +58,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 8be15fbd97d..5409f0b4406 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -20,11 +20,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void)
+TAO_EC_Basic_Factory::TAO_EC_Basic_Factory ()
 {
 }
 
-TAO_EC_Basic_Factory::~TAO_EC_Basic_Factory (void)
+TAO_EC_Basic_Factory::~TAO_EC_Basic_Factory ()
 {
 }
 
@@ -116,7 +116,7 @@ TAO_EC_Timeout_Generator*
 TAO_EC_Basic_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *)
 {
   int argc = 0;
-  ACE_TCHAR **argv = 0;
+  ACE_TCHAR **argv = nullptr;
   CORBA::ORB_var orb =
     CORBA::ORB_init (argc, argv);
   ACE_Reactor *reactor = orb->orb_core ()->reactor ();
@@ -133,7 +133,7 @@ TAO_EC_ObserverStrategy*
 TAO_EC_Basic_Factory::create_observer_strategy (TAO_EC_Event_Channel_Base *ec)
 {
   ACE_Lock* lock;
-  ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0);
+  ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, nullptr);
   return new TAO_EC_Basic_ObserverStrategy (ec, lock);
 }
 
@@ -194,7 +194,7 @@ TAO_EC_Basic_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSu
 }
 
 ACE_Lock*
-TAO_EC_Basic_Factory::create_consumer_lock (void)
+TAO_EC_Basic_Factory::create_consumer_lock ()
 {
   return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> ();
 }
@@ -206,7 +206,7 @@ TAO_EC_Basic_Factory::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_Lock*
-TAO_EC_Basic_Factory::create_supplier_lock (void)
+TAO_EC_Basic_Factory::create_supplier_lock ()
 {
   return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> ();
 }
@@ -221,7 +221,7 @@ TAO_EC_ConsumerControl*
 TAO_EC_Basic_Factory::create_consumer_control (TAO_EC_Event_Channel_Base* ec)
 {
   int argc = 0;
-  ACE_TCHAR **argv = 0;
+  ACE_TCHAR **argv = nullptr;
   CORBA::ORB_var orb =
     CORBA::ORB_init (argc, argv);
   // Hard-coded rate to 10 times a second
@@ -241,7 +241,7 @@ TAO_EC_SupplierControl*
 TAO_EC_Basic_Factory::create_supplier_control (TAO_EC_Event_Channel_Base* ec)
 {
   int argc = 0;
-  ACE_TCHAR **argv = 0;
+  ACE_TCHAR **argv = nullptr;
   CORBA::ORB_var orb =
     CORBA::ORB_init (argc, argv);
   // Hard-coded rate to 10 times a second
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index e4b47f620df..79753dbcf98 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -40,10 +40,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Basic_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
-  TAO_EC_Basic_Factory (void);
+  TAO_EC_Basic_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_Basic_Factory (void);
+  virtual ~TAO_EC_Basic_Factory ();
 
   // = The EC_Factory methods
   virtual TAO_EC_Dispatching*
@@ -95,9 +95,9 @@ public:
   virtual void
       destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_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_EC_ConsumerControl*
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index a108503b0e5..71b45942b78 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -15,7 +15,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void)
+TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder ()
 {
 }
 
@@ -36,7 +36,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
 {
   CORBA::ULong l = qos.dependencies.length ();
   if (pos == l)
-    return 0;
+    return nullptr;
 
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
   if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR)
@@ -45,7 +45,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
       CORBA::ULong n = this->count_children (qos, pos);
 
       TAO_EC_Filter** children;
-      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
+      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr);
       CORBA::ULong i = 0;
       for (; i != n; ++i)
         {
@@ -59,7 +59,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
       CORBA::ULong n = this->count_children (qos, pos);
 
       TAO_EC_Filter** children;
-      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
+      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr);
       CORBA::ULong i = 0;
       for (; i != n; ++i)
         {
@@ -73,7 +73,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
       CORBA::ULong n = this->count_children (qos, pos);
 
       TAO_EC_Filter** children;
-      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
+      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr);
       CORBA::ULong i = 0;
       for (; i != n; ++i)
         {
@@ -94,7 +94,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
       pos++; // COnsumer the designator
 
       if (pos == qos.dependencies.length ())
-        return 0;
+        return nullptr;
       CORBA::ULong source_mask = qos.dependencies[pos].event.header.source;
       CORBA::ULong type_mask = qos.dependencies[pos].event.header.type;
       pos++;
@@ -110,13 +110,13 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
       pos++; // Consume the designator
 
       if (pos == qos.dependencies.length ())
-        return 0;
+        return nullptr;
       CORBA::ULong source_mask = qos.dependencies[pos].event.header.source;
       CORBA::ULong type_mask = qos.dependencies[pos].event.header.type;
       pos++;
 
       if (pos == qos.dependencies.length ())
-        return 0;
+        return nullptr;
       CORBA::ULong source_value = qos.dependencies[pos].event.header.source;
       CORBA::ULong type_value = qos.dependencies[pos].event.header.type;
       pos++;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 6c444ed0a34..37adc1f8432 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -45,7 +45,7 @@ public:
   TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel_Base* ec);
 
   /// destructor...
-  virtual ~TAO_EC_Basic_Filter_Builder (void);
+  virtual ~TAO_EC_Basic_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index 0db4efa2b44..1ddeaefc8d4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -12,25 +12,25 @@ TAO_EC_Bitmask_Filter::TAO_EC_Bitmask_Filter (CORBA::ULong source_mask,
   this->adopt_child (this->child_);
 }
 
-TAO_EC_Bitmask_Filter::~TAO_EC_Bitmask_Filter (void)
+TAO_EC_Bitmask_Filter::~TAO_EC_Bitmask_Filter ()
 {
   delete this->child_;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Bitmask_Filter::begin (void) const
+TAO_EC_Bitmask_Filter::begin () const
 {
   return const_cast<TAO_EC_Filter**> (&this->child_);
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Bitmask_Filter::end (void) const
+TAO_EC_Bitmask_Filter::end () const
 {
   return const_cast<TAO_EC_Filter**> (&this->child_) + 1;
 }
 
 int
-TAO_EC_Bitmask_Filter::size (void) const
+TAO_EC_Bitmask_Filter::size () const
 {
   return 1;
 }
@@ -67,7 +67,7 @@ void
 TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event,
                              TAO_EC_QOS_Info &qos_info)
 {
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     this->parent ()->push (event, qos_info);
 }
 
@@ -75,18 +75,18 @@ void
 TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event,
                                     TAO_EC_QOS_Info &qos_info)
 {
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
-TAO_EC_Bitmask_Filter::clear (void)
+TAO_EC_Bitmask_Filter::clear ()
 {
   this->child_->clear ();
 }
 
 CORBA::ULong
-TAO_EC_Bitmask_Filter::max_event_size (void) const
+TAO_EC_Bitmask_Filter::max_event_size () const
 {
   return this->child_->max_event_size ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index ad3bfc4eac4..8d20fef16be 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -60,13 +60,13 @@ public:
                          TAO_EC_Filter* child);
 
   /// Destructor
-  virtual ~TAO_EC_Bitmask_Filter (void);
+  virtual ~TAO_EC_Bitmask_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -75,8 +75,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index 251a43c8732..3a42c815221 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -24,7 +24,7 @@ TAO_EC_Conjunction_Filter::
   this->clear ();
 }
 
-TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter (void)
+TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter ()
 {
   TAO_EC_Filter** end = this->children_ + this->n_;
   for (TAO_EC_Filter** i = this->children_;
@@ -32,18 +32,18 @@ TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter (void)
        ++i)
     {
       delete *i;
-      *i = 0;
+      *i = nullptr;
     }
   delete[] this->children_;
-  this->children_ = 0;
+  this->children_ = nullptr;
   this->n_ = 0;
 
   delete[] this->bitvec_;
-  this->bitvec_ = 0;
+  this->bitvec_ = nullptr;
 }
 
 int
-TAO_EC_Conjunction_Filter::all_received (void) const
+TAO_EC_Conjunction_Filter::all_received () const
 {
   Word* i = this->bitvec_;
   for (;
@@ -57,19 +57,19 @@ TAO_EC_Conjunction_Filter::all_received (void) const
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Conjunction_Filter::begin (void) const
+TAO_EC_Conjunction_Filter::begin () const
 {
   return this->children_;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Conjunction_Filter::end (void) const
+TAO_EC_Conjunction_Filter::end () const
 {
   return this->children_ + this->n_;
 }
 
 int
-TAO_EC_Conjunction_Filter::size (void) const
+TAO_EC_Conjunction_Filter::size () const
 {
   return static_cast<int> (this->n_);
 }
@@ -123,7 +123,7 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
     {
       this->event_[l + i] = event[i];
     }
-  if (this->all_received () && this->parent () != 0)
+  if (this->all_received () && this->parent () != nullptr)
     this->parent ()->push_nocopy (this->event_, qos_info);
 }
 
@@ -135,7 +135,7 @@ TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
 }
 
 void
-TAO_EC_Conjunction_Filter::clear (void)
+TAO_EC_Conjunction_Filter::clear ()
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
@@ -159,7 +159,7 @@ TAO_EC_Conjunction_Filter::clear (void)
 }
 
 CORBA::ULong
-TAO_EC_Conjunction_Filter::max_event_size (void) const
+TAO_EC_Conjunction_Filter::max_event_size () const
 {
   CORBA::ULong n = 0;
   ChildrenIterator end = this->end ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index c914ef7e81f..eb7247e4f05 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -45,13 +45,13 @@ public:
                              size_t n);
 
   /// Destructor
-  virtual ~TAO_EC_Conjunction_Filter (void);
+  virtual ~TAO_EC_Conjunction_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -60,8 +60,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
@@ -70,7 +70,7 @@ public:
 
 private:
   /// Determine if all the children have received their events.
-  int all_received (void) const;
+  int all_received () const;
 
   TAO_EC_Conjunction_Filter (const TAO_EC_Conjunction_Filter&);
   TAO_EC_Conjunction_Filter& operator= (const TAO_EC_Conjunction_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index da902aa0dc0..a7d2d0e4a55 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -15,18 +15,18 @@ TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec)
     this->event_channel_->consumer_poa ();
 }
 
-TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void)
+TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin ()
 {
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EC_ConsumerAdmin::obtain_push_supplier (void)
+TAO_EC_ConsumerAdmin::obtain_push_supplier ()
 {
   return this->obtain ();
 }
 
 PortableServer::POA_ptr
-TAO_EC_ConsumerAdmin::_default_POA (void)
+TAO_EC_ConsumerAdmin::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 9cce398a872..86fb2957843 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -57,14 +57,14 @@ public:
   TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base* event_channel);
 
   /// Destructor...
-  virtual ~TAO_EC_ConsumerAdmin (void);
+  virtual ~TAO_EC_ConsumerAdmin ();
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void);
+      obtain_push_supplier ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index 9b2e00add98..a972374918a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -2,22 +2,22 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void)
+TAO_EC_ConsumerControl::TAO_EC_ConsumerControl ()
 {
 }
 
-TAO_EC_ConsumerControl::~TAO_EC_ConsumerControl (void)
+TAO_EC_ConsumerControl::~TAO_EC_ConsumerControl ()
 {
 }
 
 int
-TAO_EC_ConsumerControl::activate (void)
+TAO_EC_ConsumerControl::activate ()
 {
   return 0;
 }
 
 int
-TAO_EC_ConsumerControl::shutdown (void)
+TAO_EC_ConsumerControl::shutdown ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 952d5b832af..651250bfb2f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -48,15 +48,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_ConsumerControl
 {
 public:
   /// Constructor.
-  TAO_EC_ConsumerControl (void);
+  TAO_EC_ConsumerControl ();
 
   /// Destructor.
-  virtual ~TAO_EC_ConsumerControl (void);
+  virtual ~TAO_EC_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/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index baf9a4b7055..175617bb25d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -40,12 +40,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void)
+TAO_EC_Default_Factory::~TAO_EC_Default_Factory ()
 {
 }
 
 int
-TAO_EC_Default_Factory::init_svcs (void)
+TAO_EC_Default_Factory::init_svcs ()
 {
   TAO_EC_Simple_Queue_Full_Action::init_svcs();
   return ACE_Service_Config::static_svcs ()->
@@ -106,16 +106,16 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               // need to parse the flags...ugh
               ACE_TCHAR* opt = ACE_OS::strdup (s);
 
-              ACE_TCHAR* aux = 0;
+              ACE_TCHAR* aux = nullptr;
               ACE_TCHAR* flags = ACE_OS::strtok_r (opt, ACE_TEXT (":"), &aux);
 
               TAO_EC_Thread_Flags tf(ACE_TEXT_ALWAYS_CHAR (flags)); // parse and set up
               this->dispatching_threads_flags_ = tf.flags ();
 
-              ACE_TCHAR* arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux);
+              ACE_TCHAR* arg = ACE_OS::strtok_r (nullptr, ACE_TEXT(":"), &aux);
               if (arg)
                 {
-                  long prio = ACE_OS::strtol (arg, 0, 0);
+                  long prio = ACE_OS::strtol (arg, nullptr, 0);
 
                   this->dispatching_threads_priority_ = prio;
                 }
@@ -244,8 +244,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
 
               ACE_TCHAR* aux;
               for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_TEXT(":"), &aux);
-                   arg != 0;
-                   arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux))
+                   arg != nullptr;
+                   arg = ACE_OS::strtok_r (nullptr, ACE_TEXT(":"), &aux))
                 {
                   if (ACE_OS::strcasecmp (arg, ACE_TEXT("mt")) == 0)
                     synch_type = 0;
@@ -289,8 +289,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
 
               ACE_TCHAR* aux;
               for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_TEXT(":"), &aux);
-                   arg != 0;
-                   arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux))
+                   arg != nullptr;
+                   arg = ACE_OS::strtok_r (nullptr, ACE_TEXT(":"), &aux))
                 {
                   if (ACE_OS::strcasecmp (arg, ACE_TEXT("mt")) == 0)
                     synch_type = 0;
@@ -435,7 +435,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
           if (arg_shifter.is_parameter_next ())
             {
               const ACE_TCHAR* opt = arg_shifter.get_current ();
-              unsigned long timeout = ACE_OS::strtoul(opt, 0, 10);
+              unsigned long timeout = ACE_OS::strtoul(opt, nullptr, 10);
               this->consumer_control_timeout_.usec(timeout);
               arg_shifter.consume_arg ();
             }
@@ -448,7 +448,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
           if (arg_shifter.is_parameter_next ())
             {
               const ACE_TCHAR* opt = arg_shifter.get_current ();
-              unsigned long timeout = ACE_OS::strtoul(opt, 0, 10);
+              unsigned long timeout = ACE_OS::strtoul(opt, nullptr, 10);
               this->supplier_control_timeout_.usec(timeout);
               arg_shifter.consume_arg ();
             }
@@ -498,7 +498,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-TAO_EC_Default_Factory::fini (void)
+TAO_EC_Default_Factory::fini ()
 {
   return 0;
 }
@@ -509,9 +509,9 @@ TAO_EC_Queue_Full_Service_Object*
 TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted,
                                              const ACE_TCHAR* fallback)
 {
-  TAO_EC_Queue_Full_Service_Object* so = 0;
+  TAO_EC_Queue_Full_Service_Object* so = nullptr;
   so = ACE_Dynamic_Service<TAO_EC_Queue_Full_Service_Object>::instance (wanted);
-  if (so != 0)
+  if (so != nullptr)
     return so;
 
   ORBSVCS_ERROR ((LM_ERROR,
@@ -522,7 +522,7 @@ TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted,
               fallback));
 
   so = ACE_Dynamic_Service<TAO_EC_Queue_Full_Service_Object>::instance (fallback);
-  if (so != 0)
+  if (so != nullptr)
     return so;
 
   ORBSVCS_ERROR ((LM_ERROR,
@@ -531,7 +531,7 @@ TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted,
                       "aborting.\n",
                       fallback));
   ACE_OS::abort ();
-  return 0; // superfluous return to de-warn; we should never reach here
+  return nullptr; // superfluous return to de-warn; we should never reach here
 }
 
 TAO_EC_Dispatching*
@@ -550,7 +550,7 @@ TAO_EC_Default_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
                                         this->dispatching_threads_force_active_,
                                         so);
     }
-  return 0;
+  return nullptr;
 }
 
 void
@@ -568,7 +568,7 @@ TAO_EC_Default_Factory::create_filter_builder (TAO_EC_Event_Channel_Base *ec)
     return new TAO_EC_Basic_Filter_Builder (ec);
   else if (this->filtering_ == 2)
     return new TAO_EC_Prefix_Filter_Builder (ec);
-  return 0;
+  return nullptr;
 }
 
 void
@@ -584,7 +584,7 @@ TAO_EC_Default_Factory::create_supplier_filter_builder (TAO_EC_Event_Channel_Bas
     return new TAO_EC_Trivial_Supplier_Filter_Builder (ec);
   else if (this->supplier_filtering_ == 1)
     return new TAO_EC_Per_Supplier_Filter_Builder (ec);
-  return 0;
+  return nullptr;
 }
 
 void
@@ -647,7 +647,7 @@ TAO_EC_Default_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *)
   if (this->timeout_ == 0)
     {
       int argc = 0;
-      ACE_TCHAR **argv = 0;
+      ACE_TCHAR **argv = nullptr;
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, this->orbid_.c_str ());
 
@@ -659,7 +659,7 @@ TAO_EC_Default_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *)
     {
     }
 #endif
-  return 0;
+  return nullptr;
 }
 
 void
@@ -676,18 +676,18 @@ TAO_EC_Default_Factory::create_observer_strategy (TAO_EC_Event_Channel_Base *ec)
   else if (this->observer_ == 1)
     {
       // @@ The lock should also be under control of the user...
-      ACE_Lock* lock = 0;
-      ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0);
+      ACE_Lock* lock = nullptr;
+      ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, nullptr);
       return new TAO_EC_Basic_ObserverStrategy (ec, lock);
     }
   else if (this->observer_ == 2)
     {
       // @@ The lock should also be under control of the user...
-      ACE_Lock* lock = 0;
-      ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0);
+      ACE_Lock* lock = nullptr;
+      ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, nullptr);
       return new TAO_EC_Reactive_ObserverStrategy (ec, lock);
     }
-  return 0;
+  return nullptr;
 }
 
 void
@@ -703,7 +703,7 @@ TAO_EC_Default_Factory::create_scheduling_strategy (TAO_EC_Event_Channel_Base*)
     return new TAO_EC_Null_Scheduling;
   else if (this->scheduling_ == 1)
     return new TAO_EC_Group_Scheduling;
-  return 0;
+  return nullptr;
 }
 
 void
@@ -811,7 +811,7 @@ TAO_EC_Default_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Chan
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
 
-  return 0;
+  return nullptr;
 }
 
 void
@@ -904,7 +904,7 @@ TAO_EC_Default_Factory::create_proxy_push_supplier_collection (TAO_EC_Event_Chan
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
 
-  return 0;
+  return nullptr;
 }
 
 void
@@ -914,7 +914,7 @@ TAO_EC_Default_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPush
 }
 
 ACE_Lock*
-TAO_EC_Default_Factory::create_consumer_lock (void)
+TAO_EC_Default_Factory::create_consumer_lock ()
 {
   if (this->consumer_lock_ == 0)
     return new ACE_Lock_Adapter<ACE_Null_Mutex>;
@@ -922,7 +922,7 @@ TAO_EC_Default_Factory::create_consumer_lock (void)
     return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> ();
   else if (this->consumer_lock_ == 2)
     return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> ();
-  return 0;
+  return nullptr;
 }
 
 void
@@ -932,7 +932,7 @@ TAO_EC_Default_Factory::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_Lock*
-TAO_EC_Default_Factory::create_supplier_lock (void)
+TAO_EC_Default_Factory::create_supplier_lock ()
 {
   if (this->supplier_lock_ == 0)
     return new ACE_Lock_Adapter<ACE_Null_Mutex>;
@@ -940,7 +940,7 @@ TAO_EC_Default_Factory::create_supplier_lock (void)
     return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> ();
   else if (this->supplier_lock_ == 2)
     return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> ();
-  return 0;
+  return nullptr;
 }
 
 void
@@ -957,14 +957,14 @@ TAO_EC_Default_Factory::create_consumer_control (TAO_EC_Event_Channel_Base* ec)
   else if (this->consumer_control_ == 1)
     {
       int argc = 0;
-      ACE_TCHAR **argv = 0;
+      ACE_TCHAR **argv = nullptr;
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, this->orbid_.c_str ());
 
       ACE_Time_Value rate (0, this->consumer_control_period_);
       return new TAO_EC_Reactive_ConsumerControl (rate, consumer_control_timeout_, ec, orb.in ());
     }
-  return 0;
+  return nullptr;
 }
 
 void
@@ -981,14 +981,14 @@ TAO_EC_Default_Factory::create_supplier_control (TAO_EC_Event_Channel_Base* ec)
   else if (this->supplier_control_ == 1)
     {
       int argc = 0;
-      ACE_TCHAR **argv = 0;
+      ACE_TCHAR **argv = nullptr;
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, this->orbid_.c_str ());
 
       ACE_Time_Value rate (0, this->supplier_control_period_);
       return new TAO_EC_Reactive_SupplierControl (rate, supplier_control_timeout_, ec, orb.in ());
     }
-  return 0;
+  return nullptr;
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 681360dc2ed..55ad13f6b55 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -46,18 +46,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
-  TAO_EC_Default_Factory (void);
+  TAO_EC_Default_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_Default_Factory (void);
+  virtual ~TAO_EC_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[]);
-  virtual int fini (void);
+  virtual int fini ();
 
   // = The EC_Factory methods
   virtual TAO_EC_Dispatching*
@@ -109,9 +109,9 @@ public:
   virtual void
       destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_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_EC_ConsumerControl*
@@ -124,16 +124,16 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*);
 
   /// Accessors to consumer collection flags
-  int consumer_collection (void) const;
+  int consumer_collection () const;
 
   /// Accessors to supplier collection flags
-  int supplier_collection (void) const;
+  int supplier_collection () const;
 
   /// Accessors to supplier filtering flags
-  int supplier_filtering (void) const;
+  int supplier_filtering () const;
 
   /// Accessor to ORBid
-  const ACE_CString& orb_id (void) const;
+  const ACE_CString& orb_id () const;
 
 protected:
   /// Helper for agrument parsing.  Prints out an error message about
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index a4f22d857e1..c90457fb277 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -14,7 +14,7 @@ TAO_EC_Default_ProxyPushConsumer::
 {
 }
 
-TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer (void)
+TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer ()
 {
 }
 
@@ -60,7 +60,7 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
 
     this->supplier_ =
       RtecEventComm::PushSupplier::_duplicate (push_supplier);
-    this->connected_ = 1;
+    this->connected_ = true;
     this->qos_ = qos;
 
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
@@ -104,7 +104,7 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer ()
 
     connected = this->is_connected_i ();
     supplier = this->supplier_._retn ();
-    this->connected_ = 0;
+    this->connected_ = false;
 
     if (connected)
       this->cleanup_i ();
@@ -133,19 +133,19 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer ()
 }
 
 PortableServer::POA_ptr
-TAO_EC_Default_ProxyPushConsumer::_default_POA (void)
+TAO_EC_Default_ProxyPushConsumer::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_EC_Default_ProxyPushConsumer::_add_ref (void)
+TAO_EC_Default_ProxyPushConsumer::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_EC_Default_ProxyPushConsumer::_remove_ref (void)
+TAO_EC_Default_ProxyPushConsumer::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
@@ -158,7 +158,7 @@ TAO_EC_Default_ProxyPushConsumer::activate (
 }
 
 PortableServer::ObjectId
-TAO_EC_Default_ProxyPushConsumer::object_id (void)
+TAO_EC_Default_ProxyPushConsumer::object_id ()
 {
   PortableServer::ObjectId_var result =
     this->default_POA_->servant_to_id (this);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 1c86883333b..4230f1a6370 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -42,7 +42,7 @@ public:
   TAO_EC_Default_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);
 
   /// Destructor...
-  virtual ~TAO_EC_Default_ProxyPushConsumer (void);
+  virtual ~TAO_EC_Default_ProxyPushConsumer ();
 
  virtual void activate (
      RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy);
@@ -52,17 +52,17 @@ public:
                 RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos);
   virtual void push (const RtecEventComm::EventSet& 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 ();
 
 private:
 
   virtual PortableServer::ObjectId
-         object_id (void);
+         object_id ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index da8a8b21e9e..ed1538aea45 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -15,7 +15,7 @@ TAO_EC_Default_ProxyPushSupplier::TAO_EC_Default_ProxyPushSupplier (
 {
 }
 
-TAO_EC_Default_ProxyPushSupplier::~TAO_EC_Default_ProxyPushSupplier (void)
+TAO_EC_Default_ProxyPushSupplier::~TAO_EC_Default_ProxyPushSupplier ()
 {
 }
 
@@ -146,31 +146,31 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier ()
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::suspend_connection (void)
+TAO_EC_Default_ProxyPushSupplier::suspend_connection ()
 {
   this->suspend_connection_locked ();
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::resume_connection (void)
+TAO_EC_Default_ProxyPushSupplier::resume_connection ()
 {
   this->resume_connection_locked ();
 }
 
 PortableServer::POA_ptr
-TAO_EC_Default_ProxyPushSupplier::_default_POA (void)
+TAO_EC_Default_ProxyPushSupplier::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::_add_ref (void)
+TAO_EC_Default_ProxyPushSupplier::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::_remove_ref (void)
+TAO_EC_Default_ProxyPushSupplier::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
@@ -183,7 +183,7 @@ TAO_EC_Default_ProxyPushSupplier::activate (
 }
 
 PortableServer::ObjectId
-TAO_EC_Default_ProxyPushSupplier::object_id (void)
+TAO_EC_Default_ProxyPushSupplier::object_id ()
 {
   PortableServer::ObjectId_var result =
     this->default_POA_->servant_to_id (this);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index 3ee6df2154e..df5589db1f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -39,7 +39,7 @@ public:
   TAO_EC_Default_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
 
   /// Destructor...
-  virtual ~TAO_EC_Default_ProxyPushSupplier (void);
+  virtual ~TAO_EC_Default_ProxyPushSupplier ();
 
   void activate (
      RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy);
@@ -48,19 +48,19 @@ 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 ();
 
   // = 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 ();
 
 private:
 
   virtual PortableServer::ObjectId
-            object_id (void);
+            object_id ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index ea7da34ac34..1cf257b54d6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -17,7 +17,7 @@ TAO_EC_Disjunction_Filter::
     }
 }
 
-TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter (void)
+TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter ()
 {
   TAO_EC_Filter** end = this->children_ + this->n_;
   for (TAO_EC_Filter** i = this->children_;
@@ -25,27 +25,27 @@ TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter (void)
        ++i)
     {
       delete *i;
-      *i = 0;
+      *i = nullptr;
     }
   delete[] this->children_;
-  this->children_ = 0;
+  this->children_ = nullptr;
   this->n_ = 0;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Disjunction_Filter::begin (void) const
+TAO_EC_Disjunction_Filter::begin () const
 {
   return this->children_;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Disjunction_Filter::end (void) const
+TAO_EC_Disjunction_Filter::end () const
 {
   return this->children_ + this->n_;
 }
 
 int
-TAO_EC_Disjunction_Filter::size (void) const
+TAO_EC_Disjunction_Filter::size () const
 {
   return static_cast<int> (this->n_);
 }
@@ -86,7 +86,7 @@ void
 TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info)
 {
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     this->parent ()->push (event, qos_info);
 }
 
@@ -94,12 +94,12 @@ void
 TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info)
 {
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
-TAO_EC_Disjunction_Filter::clear (void)
+TAO_EC_Disjunction_Filter::clear ()
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
@@ -111,7 +111,7 @@ TAO_EC_Disjunction_Filter::clear (void)
 }
 
 CORBA::ULong
-TAO_EC_Disjunction_Filter::max_event_size (void) const
+TAO_EC_Disjunction_Filter::max_event_size () const
 {
   CORBA::ULong n = 0;
   ChildrenIterator end = this->end ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index b93ba31e605..efc1c8a4fab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -43,14 +43,14 @@ public:
                              size_t n);
 
   /// Destructor
-  virtual ~TAO_EC_Disjunction_Filter (void);
+  virtual ~TAO_EC_Disjunction_Filter ();
 
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -59,8 +59,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index 61e9dd657be..2361f7bf3eb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Dispatching::~TAO_EC_Dispatching (void)
+TAO_EC_Dispatching::~TAO_EC_Dispatching ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index b2a1830d646..60d330fc633 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -45,18 +45,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Dispatching
 {
 public:
   /// Destructor...
-  virtual ~TAO_EC_Dispatching (void);
+  virtual ~TAO_EC_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.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 35d689302dd..dbcd5a28853 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -13,7 +13,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void)
+TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action ()
   : queue_full_action_return_value_ (WAIT_TO_EMPTY)
 {
 }
@@ -21,7 +21,7 @@ TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void)
 /// Helper function to register the default action into the service
 /// configurator.
 int
-TAO_EC_Simple_Queue_Full_Action::init_svcs (void)
+TAO_EC_Simple_Queue_Full_Action::init_svcs ()
 {
   return ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_TAO_EC_Simple_Queue_Full_Action);
@@ -50,13 +50,13 @@ TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[])
       ;
     // probably ought to print an error message here
 #endif
-  } while (0);
+  } while (false);
 
   return 0;
 }
 
 int
-TAO_EC_Simple_Queue_Full_Action::fini (void)
+TAO_EC_Simple_Queue_Full_Action::fini ()
 {
   return 0;
 }
@@ -83,7 +83,7 @@ ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Simple_Queue_Full_Action)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 bool
-TAO_EC_Queue::is_full_i (void)
+TAO_EC_Queue::is_full_i ()
 {
   return static_cast<size_t> (this->cur_count_) > this->high_water_mark_;
 }
@@ -91,7 +91,7 @@ TAO_EC_Queue::is_full_i (void)
 // ****************************************************************
 
 int
-TAO_EC_Dispatching_Task::svc (void)
+TAO_EC_Dispatching_Task::svc ()
 {
   bool done = false;
 
@@ -99,7 +99,7 @@ TAO_EC_Dispatching_Task::svc (void)
     {
       try
         {
-          ACE_Message_Block *mb = 0;
+          ACE_Message_Block *mb = nullptr;
 
           if (this->getq (mb) == -1)
             {
@@ -117,7 +117,7 @@ TAO_EC_Dispatching_Task::svc (void)
           TAO_EC_Dispatch_Command *command =
             dynamic_cast<TAO_EC_Dispatch_Command*> (mb);
 
-          if (command == 0)
+          if (command == nullptr)
             {
               ACE_Message_Block::release (mb);
               continue;
@@ -148,7 +148,7 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
 {
   if (this->msg_queue()->is_full ())
     {
-      if (0 != this->queue_full_service_object_)
+      if (nullptr != this->queue_full_service_object_)
         {
           int action =
             this->queue_full_service_object_->queue_full_action (this, proxy,
@@ -161,12 +161,12 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
         // else go ahead and queue it
     }
 
-  if (this->allocator_ == 0)
+  if (this->allocator_ == nullptr)
     this->allocator_ = ACE_Allocator::instance ();
 
   void* buf = this->allocator_->malloc (sizeof (TAO_EC_Push_Command));
 
-  if (buf == 0)
+  if (buf == nullptr)
     throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   ACE_Message_Block *mb =
@@ -180,27 +180,27 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
 
 // ****************************************************************
 
-TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void)
+TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command ()
 {
 }
 
 // ****************************************************************
 
 int
-TAO_EC_Shutdown_Task_Command::execute (void)
+TAO_EC_Shutdown_Task_Command::execute ()
 {
   return -1;
 }
 
 // ****************************************************************
 
-TAO_EC_Push_Command::~TAO_EC_Push_Command (void)
+TAO_EC_Push_Command::~TAO_EC_Push_Command ()
 {
   this->proxy_->_decr_refcnt ();
 }
 
 int
-TAO_EC_Push_Command::execute (void)
+TAO_EC_Push_Command::execute ()
 {
   this->proxy_->push_to_consumer (this->consumer_.in (),
                                   this->event_);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index edf7d0add56..fac5d0fd162 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -59,11 +59,11 @@ public:
 
   /// Helper function to register the default action 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[]);
-  virtual int fini (void);
+  virtual int fini ();
 
   virtual int queue_full_action (TAO_EC_Dispatching_Task *task,
                                  TAO_EC_ProxyPushSupplier *proxy,
@@ -84,7 +84,7 @@ public:
 protected:
   // = Override the default definition in the Message_Queue, to count
   // the number of messages (and not their size).
-  virtual bool is_full_i (void);
+  virtual bool is_full_i ();
 };
 
 /**
@@ -106,7 +106,7 @@ public:
 #endif
 
   /// Process the events in the queue.
-  virtual int svc (void);
+  virtual int svc ();
 
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
@@ -138,10 +138,10 @@ public:
                            ACE_Allocator *mb_allocator = 0);
 
   /// Destructor
-  virtual ~TAO_EC_Dispatch_Command (void);
+  virtual ~TAO_EC_Dispatch_Command ();
 
   /// Command callback
-  virtual int execute (void) = 0;
+  virtual int execute () = 0;
 };
 
 // ****************************************************************
@@ -153,7 +153,7 @@ public:
   TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 // ****************************************************************
@@ -169,10 +169,10 @@ public:
                        ACE_Allocator *mb_allocator);
 
   /// Destructor
-  virtual ~TAO_EC_Push_Command (void);
+  virtual ~TAO_EC_Push_Command ();
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index 799f234f402..7eeeaf02ce8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -10,15 +10,15 @@ TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr,
                       int own_factory)
   : TAO_EC_Event_Channel_Base (attr, factory, own_factory)
 {
-  if (this->factory () == 0)
+  if (this->factory () == nullptr)
     {
       this->factory (
              ACE_Dynamic_Service<TAO_EC_Factory>::instance ("EC_Factory"),
              0);
 
-      if (this->factory () == 0)
+      if (this->factory () == nullptr)
         {
-          TAO_EC_Factory *f = 0;
+          TAO_EC_Factory *f = nullptr;
           ACE_NEW (f,
                    TAO_EC_Default_Factory);
           this->factory (f, 1);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index d1ccf21bc5f..553ebe51701 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -22,63 +22,63 @@ TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr,
     consumer_poa_ (PortableServer::POA::_duplicate (attr.consumer_poa)),
     factory_ (factory),
     own_factory_ (own_factory),
-    dispatching_ (0),
-    filter_builder_ (0),
-    supplier_filter_builder_ (0),
-    consumer_admin_ (0),
-    supplier_admin_ (0),
-    timeout_generator_ (0),
-    observer_strategy_ (0),
-    scheduling_strategy_(0),
+    dispatching_ (nullptr),
+    filter_builder_ (nullptr),
+    supplier_filter_builder_ (nullptr),
+    consumer_admin_ (nullptr),
+    supplier_admin_ (nullptr),
+    timeout_generator_ (nullptr),
+    observer_strategy_ (nullptr),
+    scheduling_strategy_(nullptr),
     consumer_reconnect_ (attr.consumer_reconnect),
     supplier_reconnect_ (attr.supplier_reconnect),
     disconnect_callbacks_ (attr.disconnect_callbacks),
-    consumer_control_ (0),
-    supplier_control_ (0),
+    consumer_control_ (nullptr),
+    supplier_control_ (nullptr),
     status_ (EC_S_IDLE)
 {
   this->scheduler_ =
     CORBA::Object::_duplicate (attr.scheduler);
 }
 
-TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void)
+TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base ()
 {
   // Destroy Strategies in the reverse order of creation, they
   // reference to each other during destruction and thus need to be
   // cleaned up properly.
   this->factory_->destroy_supplier_control (this->supplier_control_);
-  this->supplier_control_ = 0;
+  this->supplier_control_ = nullptr;
   this->factory_->destroy_consumer_control (this->consumer_control_);
-  this->consumer_control_ = 0;
+  this->consumer_control_ = nullptr;
 
   this->factory_->destroy_scheduling_strategy (this->scheduling_strategy_);
-  this->scheduling_strategy_ = 0;
+  this->scheduling_strategy_ = nullptr;
 
   this->factory_->destroy_observer_strategy (this->observer_strategy_);
-  this->observer_strategy_ = 0;
+  this->observer_strategy_ = nullptr;
 
   this->factory_->destroy_timeout_generator (this->timeout_generator_);
-  this->timeout_generator_ = 0;
+  this->timeout_generator_ = nullptr;
 
   this->factory_->destroy_supplier_admin (this->supplier_admin_);
-  this->supplier_admin_ = 0;
+  this->supplier_admin_ = nullptr;
   this->factory_->destroy_consumer_admin (this->consumer_admin_);
-  this->consumer_admin_ = 0;
+  this->consumer_admin_ = nullptr;
 
   this->factory_->destroy_supplier_filter_builder (this->supplier_filter_builder_);
-  this->supplier_filter_builder_ = 0;
+  this->supplier_filter_builder_ = nullptr;
 
   this->factory_->destroy_filter_builder (this->filter_builder_);
-  this->filter_builder_ = 0;
+  this->filter_builder_ = nullptr;
 
   this->factory_->destroy_dispatching (this->dispatching_);
-  this->dispatching_ = 0;
+  this->dispatching_ = nullptr;
 
-  this->factory (0, this->own_factory_);
+  this->factory (nullptr, this->own_factory_);
 }
 
 void
-TAO_EC_Event_Channel_Base::create_strategies (void)
+TAO_EC_Event_Channel_Base::create_strategies ()
 {
   this->dispatching_ =
     this->factory_->create_dispatching (this);
@@ -105,7 +105,7 @@ TAO_EC_Event_Channel_Base::create_strategies (void)
 }
 
 void
-TAO_EC_Event_Channel_Base::activate (void)
+TAO_EC_Event_Channel_Base::activate ()
 {
   {
     // First check if the EC is idle, if it is not then we need to
@@ -129,7 +129,7 @@ TAO_EC_Event_Channel_Base::activate (void)
 }
 
 void
-TAO_EC_Event_Channel_Base::shutdown (void)
+TAO_EC_Event_Channel_Base::shutdown ()
 {
   {
     // First check if the EC is already active, if it is not then we
@@ -161,7 +161,7 @@ TAO_EC_Event_Channel_Base::shutdown (void)
 }
 
 void
-TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void)
+TAO_EC_Event_Channel_Base::deactivate_supplier_admin ()
 {
   try
     {
@@ -178,7 +178,7 @@ TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void)
 }
 
 void
-TAO_EC_Event_Channel_Base::deactivate_consumer_admin (void)
+TAO_EC_Event_Channel_Base::deactivate_consumer_admin ()
 {
   try
     {
@@ -243,19 +243,19 @@ TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_EC_Event_Channel_Base::for_consumers (void)
+TAO_EC_Event_Channel_Base::for_consumers ()
 {
   return this->consumer_admin_->_this ();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_EC_Event_Channel_Base::for_suppliers (void)
+TAO_EC_Event_Channel_Base::for_suppliers ()
 {
   return this->supplier_admin_->_this ();
 }
 
 void
-TAO_EC_Event_Channel_Base::destroy (void)
+TAO_EC_Event_Channel_Base::destroy ()
 {
   this->shutdown ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 2ca67d3e4a3..aeaf455232d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -110,15 +110,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Base
 {
 public:
   /// destructor
-  virtual ~TAO_EC_Event_Channel_Base (void);
+  virtual ~TAO_EC_Event_Channel_Base ();
 
   /// 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 ();
 
   virtual void for_each_consumer (
                     TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker);
@@ -127,31 +127,31 @@ public:
                     TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker);
 
   /// Access the dispatching module....
-  TAO_EC_Dispatching* dispatching (void) const;
+  TAO_EC_Dispatching* dispatching () const;
 
   /// Access the filter builder....
-  TAO_EC_Filter_Builder* filter_builder (void) const;
+  TAO_EC_Filter_Builder* filter_builder () const;
 
   /// Access the filter builder....
-  TAO_EC_Supplier_Filter_Builder* supplier_filter_builder (void) const;
+  TAO_EC_Supplier_Filter_Builder* supplier_filter_builder () const;
 
   /// Access the consumer admin implementation, useful for controlling
   /// the activation...
-  TAO_EC_ConsumerAdmin* consumer_admin (void) const;
+  TAO_EC_ConsumerAdmin* consumer_admin () const;
 
   /// Access the supplier admin implementation, useful for controlling
   /// the activation...
-  TAO_EC_SupplierAdmin* supplier_admin (void) const;
+  TAO_EC_SupplierAdmin* supplier_admin () const;
 
   /// Access the timer module...
-  TAO_EC_Timeout_Generator* timeout_generator (void) const;
+  TAO_EC_Timeout_Generator* timeout_generator () const;
 
   /// Access the scheduling strategy
-  TAO_EC_Scheduling_Strategy* scheduling_strategy (void) const;
+  TAO_EC_Scheduling_Strategy* scheduling_strategy () const;
 
   /// Access the client control strategies.
-  TAO_EC_ConsumerControl *consumer_control (void) const;
-  TAO_EC_SupplierControl *supplier_control (void) const;
+  TAO_EC_ConsumerControl *consumer_control () const;
+  TAO_EC_SupplierControl *supplier_control () const;
 
   // = The factory methods, they delegate on the EC_Factory.
   /// Create and destroy a ProxyPushSupplier
@@ -175,14 +175,14 @@ public:
   void destroy_proxy_collection (TAO_EC_ProxyPushConsumer_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
@@ -201,31 +201,31 @@ public:
   // at construction time.
 
   /// Can the consumers reconnect to the EC?
-  int consumer_reconnect (void) const;
+  int consumer_reconnect () const;
 
   /// Can the suppliers reconnect to the EC?
-  int supplier_reconnect (void) const;
+  int supplier_reconnect () const;
 
   /// Should we send callback disconnect messages when a proxy is
   /// disconnected by the client
-  int disconnect_callbacks (void) const;
+  int disconnect_callbacks () const;
 
   /// Obtain the scheduler, the user must release
-  CORBA::Object_ptr scheduler (void);
+  CORBA::Object_ptr scheduler ();
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   /// The default implementation is:
   ///    this->consumer_admin ()->_this ();
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void);
+      for_consumers ();
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this ();
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void);
+      for_suppliers ();
 
   /// Commit suicide.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr);
@@ -233,7 +233,7 @@ public:
       remove_observer (RtecEventChannelAdmin::Observer_Handle);
 
   /// Return 1 if the event channel is already destroyed.
-  int destroyed (void);
+  int destroyed ();
 
 protected:
   /**
@@ -249,7 +249,7 @@ protected:
   /**
    * Get the factory.
    */
-  TAO_EC_Factory * factory (void) const;
+  TAO_EC_Factory * factory () const;
 
   /**
    * Set the factory, if @a own_factory is not 0 it assumes ownership of the
@@ -261,13 +261,13 @@ protected:
   /**
    * Create all strategies
    */
-  void create_strategies (void);
+  void create_strategies ();
 
   /// Helpers.  Deactivate admins from their POAs, ignoring any CORBA
   /// exceptions.
   //@{
-  void deactivate_supplier_admin (void);
-  void deactivate_consumer_admin (void);
+  void deactivate_supplier_admin ();
+  void deactivate_consumer_admin ();
   //@}
 
   /// The POAs used to activate "supplier-side" and "consumer-side"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
index fba3bc42726..46f80d7a4b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
@@ -15,7 +15,7 @@ TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa,
 }
 
 ACE_INLINE TAO_EC_Factory*
-TAO_EC_Event_Channel_Base::factory (void) const
+TAO_EC_Event_Channel_Base::factory () const
 {
   return this->factory_;
 }
@@ -32,55 +32,55 @@ TAO_EC_Event_Channel_Base::factory (TAO_EC_Factory* factory,
 }
 
 ACE_INLINE TAO_EC_Dispatching*
-TAO_EC_Event_Channel_Base::dispatching (void) const
+TAO_EC_Event_Channel_Base::dispatching () const
 {
   return this->dispatching_;
 }
 
 ACE_INLINE TAO_EC_Filter_Builder*
-TAO_EC_Event_Channel_Base::filter_builder (void) const
+TAO_EC_Event_Channel_Base::filter_builder () const
 {
   return this->filter_builder_;
 }
 
 ACE_INLINE TAO_EC_Supplier_Filter_Builder*
-TAO_EC_Event_Channel_Base::supplier_filter_builder (void) const
+TAO_EC_Event_Channel_Base::supplier_filter_builder () const
 {
   return this->supplier_filter_builder_;
 }
 
 ACE_INLINE TAO_EC_ConsumerAdmin*
-TAO_EC_Event_Channel_Base::consumer_admin (void) const
+TAO_EC_Event_Channel_Base::consumer_admin () const
 {
   return this->consumer_admin_;
 }
 
 ACE_INLINE TAO_EC_SupplierAdmin*
-TAO_EC_Event_Channel_Base::supplier_admin (void) const
+TAO_EC_Event_Channel_Base::supplier_admin () const
 {
   return this->supplier_admin_;
 }
 
 ACE_INLINE TAO_EC_Timeout_Generator*
-TAO_EC_Event_Channel_Base::timeout_generator (void) const
+TAO_EC_Event_Channel_Base::timeout_generator () const
 {
   return this->timeout_generator_;
 }
 
 ACE_INLINE TAO_EC_Scheduling_Strategy*
-TAO_EC_Event_Channel_Base::scheduling_strategy (void) const
+TAO_EC_Event_Channel_Base::scheduling_strategy () const
 {
   return this->scheduling_strategy_;
 }
 
 ACE_INLINE TAO_EC_ConsumerControl*
-TAO_EC_Event_Channel_Base::consumer_control (void) const
+TAO_EC_Event_Channel_Base::consumer_control () const
 {
   return this->consumer_control_;
 }
 
 ACE_INLINE TAO_EC_SupplierControl*
-TAO_EC_Event_Channel_Base::supplier_control (void) const
+TAO_EC_Event_Channel_Base::supplier_control () const
 {
   return this->supplier_control_;
 }
@@ -134,19 +134,19 @@ TAO_EC_Event_Channel_Base::destroy_proxy_collection (TAO_EC_ProxyPushSupplier_Co
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_EC_Event_Channel_Base::supplier_poa (void)
+TAO_EC_Event_Channel_Base::supplier_poa ()
 {
   return PortableServer::POA::_duplicate (this->supplier_poa_.in ());
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_EC_Event_Channel_Base::consumer_poa (void)
+TAO_EC_Event_Channel_Base::consumer_poa ()
 {
   return PortableServer::POA::_duplicate (this->consumer_poa_.in ());
 }
 
 ACE_INLINE ACE_Lock*
-TAO_EC_Event_Channel_Base::create_consumer_lock (void)
+TAO_EC_Event_Channel_Base::create_consumer_lock ()
 {
   return this->factory_->create_consumer_lock ();
 }
@@ -158,7 +158,7 @@ TAO_EC_Event_Channel_Base::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_INLINE ACE_Lock*
-TAO_EC_Event_Channel_Base::create_supplier_lock (void)
+TAO_EC_Event_Channel_Base::create_supplier_lock ()
 {
   return this->factory_->create_supplier_lock ();
 }
@@ -170,31 +170,31 @@ TAO_EC_Event_Channel_Base::destroy_supplier_lock (ACE_Lock* x)
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::consumer_reconnect (void) const
+TAO_EC_Event_Channel_Base::consumer_reconnect () const
 {
   return this->consumer_reconnect_;
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::supplier_reconnect (void) const
+TAO_EC_Event_Channel_Base::supplier_reconnect () const
 {
   return this->supplier_reconnect_;
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::disconnect_callbacks (void) const
+TAO_EC_Event_Channel_Base::disconnect_callbacks () const
 {
   return this->disconnect_callbacks_;
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_EC_Event_Channel_Base::scheduler (void)
+TAO_EC_Event_Channel_Base::scheduler ()
 {
   return CORBA::Object::_duplicate (this->scheduler_.in ());
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::destroyed (void)
+TAO_EC_Event_Channel_Base::destroyed ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return (this->status_ == EC_S_DESTROYED);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index d4e94f46eb7..260d8784d6f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -5,12 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTEvent_Serv_Export unsigned short TAO_EC_debug_level;
 
-TAO_EC_Factory::TAO_EC_Factory (void)
+TAO_EC_Factory::TAO_EC_Factory ()
 {
   TAO_EC_debug_level = 0;
 }
 
-TAO_EC_Factory::~TAO_EC_Factory (void)
+TAO_EC_Factory::~TAO_EC_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index fcc583bfde4..8b7a66455da 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -67,8 +67,8 @@ class TAO_RTEvent_Serv_Export TAO_EC_Factory : public ACE_Service_Object
 {
 public:
   /// destructor...
-  TAO_EC_Factory (void);
-  virtual ~TAO_EC_Factory (void);
+  TAO_EC_Factory ();
+  virtual ~TAO_EC_Factory ();
 
   /// Create and destroy the dispatching module.
   virtual TAO_EC_Dispatching*
@@ -144,9 +144,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/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index f5534a16d02..5a845583713 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Filter::~TAO_EC_Filter (void)
+TAO_EC_Filter::~TAO_EC_Filter ()
 {
 }
 
@@ -20,19 +20,19 @@ TAO_EC_Filter::adopt_child (TAO_EC_Filter* child)
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Filter::begin (void) const
+TAO_EC_Filter::begin () const
 {
-  return 0;
+  return nullptr;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Filter::end (void) const
+TAO_EC_Filter::end () const
 {
-  return 0;
+  return nullptr;
 }
 
 int
-TAO_EC_Filter::size (void) const
+TAO_EC_Filter::size () const
 {
   return 0;
 }
@@ -70,7 +70,7 @@ void
 TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event,
                           TAO_EC_QOS_Info& qos_info)
 {
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     this->parent ()->push (event, qos_info);
 }
 
@@ -78,18 +78,18 @@ void
 TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info)
 {
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
-TAO_EC_Null_Filter::clear (void)
+TAO_EC_Null_Filter::clear ()
 {
   // do nothing
 }
 
 CORBA::ULong
-TAO_EC_Null_Filter::max_event_size (void) const
+TAO_EC_Null_Filter::max_event_size () const
 {
   // @@ Is there a better way to express this?
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index f64a49e72c0..88a7533d7a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -50,13 +50,13 @@ class TAO_RTEvent_Serv_Export TAO_EC_Filter
 {
 public:
   /// constructor...
-  TAO_EC_Filter (void);
+  TAO_EC_Filter ();
 
   /// destructor...
-  virtual ~TAO_EC_Filter (void);
+  virtual ~TAO_EC_Filter ();
 
   /// Obtain the parent of this filter.
-  TAO_EC_Filter* parent (void) const;
+  TAO_EC_Filter* parent () const;
 
   /// Become the parent of @a child.
   void adopt_child (TAO_EC_Filter* child);
@@ -76,9 +76,9 @@ public:
    * interface as if they all had children, but for simple filters the
    * iterators return an empty range.
    */
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
 
   /**
    * Filter this event, returns 1 if the event is accepted, 0
@@ -110,10 +110,10 @@ public:
 
   /// Clear any saved state, must reset and assume no events have been
   /// received.
-  virtual void clear (void) = 0;
+  virtual void clear () = 0;
 
   /// Returns the maximum size of the events pushed by this filter.
-  virtual CORBA::ULong max_event_size (void) const = 0;
+  virtual CORBA::ULong max_event_size () const = 0;
 
   /**
    * Returns 0 if an event with that header could never be accepted.
@@ -171,7 +171,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor.
-  TAO_EC_Null_Filter (void);
+  TAO_EC_Null_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
@@ -183,8 +183,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index 3c1c2c12db8..3a1ddc40b1f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -7,13 +7,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void)
+TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder ()
 {
 }
 
 // ****************************************************************
 
-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_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index e3ccc9f3e73..931b66be256 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -42,7 +42,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Filter_Builder
 {
 public:
   /// destructor...
-  virtual ~TAO_EC_Filter_Builder (void);
+  virtual ~TAO_EC_Filter_Builder ();
 
   /// Create the filter, the caller must assume ownership of the filter
   /// returned.
@@ -65,10 +65,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Filter_Builder : public TAO_EC_Filter_
 {
 public:
   /// constructor.
-  TAO_EC_Null_Filter_Builder (void);
+  TAO_EC_Null_Filter_Builder ();
 
   /// destructor...
-  virtual ~TAO_EC_Null_Filter_Builder (void);
+  virtual ~TAO_EC_Null_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 6f9d31798ae..145e4c8f594 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -2,12 +2,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Gateway::TAO_EC_Gateway (void)
+TAO_EC_Gateway::TAO_EC_Gateway ()
   :  handle_ (0)
 {
 }
 
-TAO_EC_Gateway::~TAO_EC_Gateway (void)
+TAO_EC_Gateway::~TAO_EC_Gateway ()
 {
 }
 
@@ -18,7 +18,7 @@ TAO_EC_Gateway::observer_handle (RtecEventChannelAdmin::Observer_Handle h)
 }
 
 RtecEventChannelAdmin::Observer_Handle
-TAO_EC_Gateway::observer_handle (void) const
+TAO_EC_Gateway::observer_handle () const
 {
   return this->handle_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 453db162cb6..6705b4026ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -44,18 +44,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Gateway
 {
 public:
   /// Default constructor.
-  TAO_EC_Gateway (void);
+  TAO_EC_Gateway ();
 
   /// Destructor
-  virtual ~TAO_EC_Gateway (void);
+  virtual ~TAO_EC_Gateway ();
 
   /// The gateway must disconnect from all the relevant event channels,
   /// or any other communication media (such as multicast groups).
-  virtual void close (void) = 0;
+  virtual void close () = 0;
 
   /// Obtain and modify the observer handle.
   void observer_handle (RtecEventChannelAdmin::Observer_Handle h);
-  RtecEventChannelAdmin::Observer_Handle observer_handle (void) const;
+  RtecEventChannelAdmin::Observer_Handle observer_handle () const;
 
 private:
   RtecEventChannelAdmin::Observer_Handle handle_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index d8287744bc6..18e8643be65 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void)
+TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP ()
   :  busy_count_ (0),
      update_posted_ (0),
      cleanup_posted_ (0),
@@ -22,36 +22,36 @@ TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void)
      consumer_is_active_ (false),
      supplier_ (this),
      supplier_is_active_ (false),
-     ec_control_ (0),
-     factory_ (0),
+     ec_control_ (nullptr),
+     factory_ (nullptr),
      use_ttl_ (1),
      use_consumer_proxy_map_ (1)
 {
-  if (this->factory_ == 0)
+  if (this->factory_ == nullptr)
     {
       this->factory_ =
              ACE_Dynamic_Service<TAO_EC_Gateway_IIOP_Factory>::instance ("EC_Gateway_IIOP_Factory");
 
-      if (this->factory_ == 0)
+      if (this->factory_ == nullptr)
         {
-          TAO_EC_Gateway_IIOP_Factory *f = 0;
+          TAO_EC_Gateway_IIOP_Factory *f = nullptr;
           ACE_NEW (f,
                    TAO_EC_Gateway_IIOP_Factory);
           this->factory_ = f;
         }
     }
 
-  if (this->factory_ != 0)
+  if (this->factory_ != nullptr)
     {
       this->use_ttl_ = this->factory_->use_ttl();
       this->use_consumer_proxy_map_ = this->factory_->use_consumer_proxy_map();
     }
 }
 
-TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void)
+TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP ()
 {
    delete ec_control_;
-   ec_control_ = 0;
+   ec_control_ = nullptr;
 }
 
 int
@@ -74,7 +74,7 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec
       this->consumer_ec_ =
         RtecEventChannelAdmin::EventChannel::_duplicate (consumer_ec);
 
-      if (ec_control_ == 0)
+      if (ec_control_ == nullptr)
         {
           ec_control_ = factory_->create_consumerec_control(this);
           ec_control_->activate();
@@ -90,7 +90,7 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec
 }
 
 void
-TAO_EC_Gateway_IIOP::close (void)
+TAO_EC_Gateway_IIOP::close ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -98,7 +98,7 @@ TAO_EC_Gateway_IIOP::close (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void)
+TAO_EC_Gateway_IIOP::cleanup_consumer_proxies ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -113,7 +113,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::close_i (void)
+TAO_EC_Gateway_IIOP::close_i ()
 {
   // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
   this->disconnect_consumer_proxies_i ();
@@ -122,7 +122,7 @@ TAO_EC_Gateway_IIOP::close_i (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void)
+TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i ()
 {
   if (this->consumer_proxy_map_.current_size () > 0)
     {
@@ -157,7 +157,7 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (void)
+TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -169,7 +169,7 @@ TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::reconnect_consumer_ec(void)
+TAO_EC_Gateway_IIOP::reconnect_consumer_ec()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -203,7 +203,7 @@ TAO_EC_Gateway_IIOP::update_consumer (
 }
 
 void
-TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (void)
+TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i ()
 {
   if (this->consumer_proxy_map_.current_size () > 0)
     {
@@ -262,7 +262,7 @@ TAO_EC_Gateway_IIOP::open_i (
     {
       sub.dependencies[i].rt_info = this->supplier_info_;
 
-      RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = 0;
+      RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = nullptr;
       const RtecEventComm::EventHeader &h =
         sub.dependencies[i].event.header;
 
@@ -420,7 +420,7 @@ TAO_EC_Gateway_IIOP::update_supplier (
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_push_consumer (void)
+TAO_EC_Gateway_IIOP::disconnect_push_consumer ()
 {
   // ORBSVCS_DEBUG ((LM_DEBUG,
   //             "ECG (%t): Supplier-consumer received "
@@ -428,7 +428,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_push_supplier (void)
+TAO_EC_Gateway_IIOP::disconnect_push_supplier ()
 {
   // ORBSVCS_DEBUG ((LM_DEBUG,
   //            "ECG (%t): Supplier received "
@@ -466,7 +466,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events)
             continue;
         }
 
-      RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = 0;
+      RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = nullptr;
       RtecEventComm::EventSourceID sid = events[i].header.source;
       if (sid == ACE_ES_EVENT_SOURCE_ANY || this->use_consumer_proxy_map_ == 0
           || this->consumer_proxy_map_.find (sid, proxy) == -1)
@@ -531,7 +531,7 @@ TAO_EC_Gateway_IIOP::push_to_consumer (
 }
 
 int
-TAO_EC_Gateway_IIOP::shutdown (void)
+TAO_EC_Gateway_IIOP::shutdown ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
@@ -566,7 +566,7 @@ TAO_EC_Gateway_IIOP::shutdown (void)
 }
 
 int
-TAO_EC_Gateway_IIOP::cleanup_consumer_ec (void)
+TAO_EC_Gateway_IIOP::cleanup_consumer_ec ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
@@ -576,7 +576,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_ec (void)
 }
 
 int
-TAO_EC_Gateway_IIOP::cleanup_supplier_ec (void)
+TAO_EC_Gateway_IIOP::cleanup_supplier_ec ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
@@ -586,21 +586,21 @@ TAO_EC_Gateway_IIOP::cleanup_supplier_ec (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::cleanup_consumer_ec_i (void)
+TAO_EC_Gateway_IIOP::cleanup_consumer_ec_i ()
 {
   this->consumer_ec_ =
     RtecEventChannelAdmin::EventChannel::_nil ();
 }
 
 void
-TAO_EC_Gateway_IIOP::cleanup_supplier_ec_i (void)
+TAO_EC_Gateway_IIOP::cleanup_supplier_ec_i ()
 {
   this->supplier_ec_ =
     RtecEventChannelAdmin::EventChannel::_nil ();
 }
 
 CORBA::Boolean
-TAO_EC_Gateway_IIOP::is_consumer_ec_connected_i (void) const
+TAO_EC_Gateway_IIOP::is_consumer_ec_connected_i () const
 {
   return !CORBA::is_nil (this->consumer_ec_.in ());
 }
@@ -615,11 +615,11 @@ TAO_EC_Gateway_IIOP::consumer_ec_non_existent (
         TAO_SYNCH_MUTEX, ace_mon, this->lock_,
         CORBA::INTERNAL ());
 
-    disconnected = 0;
+    disconnected = false;
     if (this->is_consumer_ec_connected_i () == 0)
       {
-        disconnected = 1;
-        return 0;
+        disconnected = true;
+        return false;
       }
 
     consumer_ec = CORBA::Object::_duplicate (this->consumer_ec_.in ());
@@ -633,7 +633,7 @@ TAO_EC_Gateway_IIOP::consumer_ec_non_existent (
 }
 
 void
-TAO_EC_Gateway_IIOP::suspend_supplier_ec (void)
+TAO_EC_Gateway_IIOP::suspend_supplier_ec ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 0)
     {
@@ -644,7 +644,7 @@ TAO_EC_Gateway_IIOP::suspend_supplier_ec (void)
 }
 
 void
-TAO_EC_Gateway_IIOP::resume_supplier_ec (void)
+TAO_EC_Gateway_IIOP::resume_supplier_ec ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 1)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index b6fb48fe2c5..8ea47da59ff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -63,8 +63,8 @@ class TAO_EC_Gateway_IIOP_Factory;
 class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP : public TAO_EC_Gateway
 {
 public:
-  TAO_EC_Gateway_IIOP (void);
-  virtual ~TAO_EC_Gateway_IIOP (void);
+  TAO_EC_Gateway_IIOP ();
+  virtual ~TAO_EC_Gateway_IIOP ();
 
   /**
    * To do its job this class requires to know the local and remote ECs it will
@@ -75,25 +75,25 @@ public:
             RtecEventChannelAdmin::EventChannel_ptr consumer_ec);
 
   /// The channel is disconnecting.
-  void disconnect_push_supplier (void);
+  void disconnect_push_supplier ();
 
   /// The channel is disconnecting.
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   /// This is the consumer side behavior, it pushes the events to the
   /// local event channel.
   void push (const RtecEventComm::EventSet &events);
 
   /// Disconnect and shutdown the gateway
-  int shutdown (void);
+  int shutdown ();
 
   // The following methods are documented in the base class.
-  virtual void close (void);
+  virtual void close ();
   virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub);
   virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub);
 
   // Let the gateway reconnect itself to the consumer ec given exisiting QoS
-  void reconnect_consumer_ec(void);
+  void reconnect_consumer_ec();
 
   /// Check whether the consumer event channel is non existent or not
   CORBA::Boolean consumer_ec_non_existent (CORBA::Boolean_out disconnected);
@@ -104,33 +104,33 @@ public:
    * the consumer proxy administration in case we know that the consumers
    * are all unreachable.
    */
-  void cleanup_consumer_proxies (void);
+  void cleanup_consumer_proxies ();
 
   /// Cleanup the connection to the consumer ec. Doesn't call anything on the
   /// ec again, just set the object to nil
-  int cleanup_consumer_ec (void);
+  int cleanup_consumer_ec ();
 
   /// Cleanup the connection to the supplier ec. Doesn't call anything on the
   /// ec again, just set the object to nil
-  int cleanup_supplier_ec (void);
+  int cleanup_supplier_ec ();
 
   /// Suspend the connection to the supplier ec
-  void suspend_supplier_ec (void);
+  void suspend_supplier_ec ();
 
   /// Resume the connection to the supplier ec
-  void resume_supplier_ec (void);
+  void resume_supplier_ec ();
 
 private:
-  void close_i (void);
+  void close_i ();
 
   /// Disconnect the supplier proxy
-  void disconnect_supplier_proxy_i (void);
+  void disconnect_supplier_proxy_i ();
 
   /// Disconnect all consumer proxies
-  void disconnect_consumer_proxies_i (void);
+  void disconnect_consumer_proxies_i ();
 
   /// Remove all consumer proxies without calling disconnect on them
-  void cleanup_consumer_proxies_i (void);
+  void cleanup_consumer_proxies_i ();
 
   void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
@@ -138,15 +138,15 @@ private:
   void open_i (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
   /// Helper method to see if consumer ec is connected
-  CORBA::Boolean is_consumer_ec_connected_i (void) const;
+  CORBA::Boolean is_consumer_ec_connected_i () const;
 
   /// Push the @a event to the @a consumer.
   void push_to_consumer (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
                          const RtecEventComm::EventSet& event);
 
-  void cleanup_consumer_ec_i (void);
+  void cleanup_consumer_ec_i ();
 
-  void cleanup_supplier_ec_i (void);
+  void cleanup_supplier_ec_i ();
 
 protected:
   /// Do the real work in init()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index df33e3292f6..f5a486ffc2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -20,13 +20,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_EC_Gateway_IIOP_Factory::init_svcs (void)
+TAO_EC_Gateway_IIOP_Factory::init_svcs ()
 {
   return ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_TAO_EC_Gateway_IIOP_Factory);
 }
 
-TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory (void)
+TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory ()
   :  orbid_ (TAO_ECG_DEFAULT_IIOP_ORB_ID),
      consumer_ec_control_ (TAO_ECG_DEFAULT_IIOP_CONSUMEREC_CONTROL),
      consumer_ec_control_period_ (TAO_ECG_DEFAULT_IIOP_CONSUMEREC_CONTROL_PERIOD),
@@ -36,12 +36,12 @@ TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory (void)
 {
 }
 
-TAO_EC_Gateway_IIOP_Factory::~TAO_EC_Gateway_IIOP_Factory (void)
+TAO_EC_Gateway_IIOP_Factory::~TAO_EC_Gateway_IIOP_Factory ()
 {
 }
 
 int
-TAO_EC_Gateway_IIOP_Factory::fini (void)
+TAO_EC_Gateway_IIOP_Factory::fini ()
 {
   return 0;
 }
@@ -95,7 +95,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[])
           if (arg_shifter.is_parameter_next ())
             {
               const ACE_TCHAR* opt = arg_shifter.get_current ();
-              unsigned long timeout = ACE_OS::strtoul(opt, 0, 10);
+              unsigned long timeout = ACE_OS::strtoul(opt, nullptr, 10);
               this->consumer_ec_control_timeout_.usec(timeout);
               arg_shifter.consume_arg ();
             }
@@ -171,7 +171,7 @@ TAO_EC_Gateway_IIOP_Factory::create_consumerec_control (TAO_EC_Gateway_IIOP* gat
   else if (this->consumer_ec_control_ == 1)
     {
       int argc = 0;
-      ACE_TCHAR **argv = 0;
+      ACE_TCHAR **argv = nullptr;
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, this->orbid_.c_str ());
       ACE_Time_Value rate (0, this->consumer_ec_control_period_);
@@ -180,13 +180,13 @@ TAO_EC_Gateway_IIOP_Factory::create_consumerec_control (TAO_EC_Gateway_IIOP* gat
   else if (this->consumer_ec_control_ == 2)
     {
       int argc = 0;
-      ACE_TCHAR **argv = 0;
+      ACE_TCHAR **argv = nullptr;
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, this->orbid_.c_str ());
       ACE_Time_Value rate (0, this->consumer_ec_control_period_);
       return new TAO_ECG_Reconnect_ConsumerEC_Control (rate, consumer_ec_control_timeout_, gateway, orb.in ());
     }
-  return 0;
+  return nullptr;
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
index 50fc874fab1..dffea90381d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -40,18 +40,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP_Factory
   : public ACE_Service_Object
 {
 public:
-  TAO_EC_Gateway_IIOP_Factory (void);
-  virtual ~TAO_EC_Gateway_IIOP_Factory (void);
+  TAO_EC_Gateway_IIOP_Factory ();
+  virtual ~TAO_EC_Gateway_IIOP_Factory ();
 
   /// The Service_Object entry points.
   //@{
   virtual int init (int argc, ACE_TCHAR* argv[]);
-  virtual int fini (void);
+  virtual int fini ();
   //@}
 
   /// Helper function to register the Gateway into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   /// Create the consumer event channel control.
   TAO_ECG_ConsumerEC_Control *
@@ -61,10 +61,10 @@ public:
   void destroy_consumerec_control (TAO_ECG_ConsumerEC_Control* x);
 
   /// Accessors to use_ttl flag
-  int use_ttl (void) const;
+  int use_ttl () const;
 
   /// Accessors to use_consumer_proxy_map flag
-  int use_consumer_proxy_map (void) const;
+  int use_consumer_proxy_map () const;
 
 private:
   /// Helper for agrument parsing.  Prints out an error message about
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 428104e1233..ca0b9b11dc1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -3,12 +3,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void)
+TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched ()
   :  TAO_EC_Gateway_IIOP ()
 {
 }
 
-TAO_EC_Gateway_Sched::~TAO_EC_Gateway_Sched (void)
+TAO_EC_Gateway_Sched::~TAO_EC_Gateway_Sched ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
index 6017143de4e..e60007ddae6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
@@ -29,7 +29,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Group_Scheduling : public TAO_EC_Scheduling
 {
 public:
   /// Constructor.
-  TAO_EC_Group_Scheduling (void);
+  TAO_EC_Group_Scheduling ();
 
   // Read EC_Scheduling_Strategy.h for more details
   virtual void add_proxy_supplier_dependencies (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
index 8fbfc0adcf3..49a7fabbf41 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
@@ -1,5 +1,5 @@
 ACE_INLINE
-TAO_EC_Group_Scheduling::TAO_EC_Group_Scheduling (void)
+TAO_EC_Group_Scheduling::TAO_EC_Group_Scheduling ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index 59be08f552e..df321abb0ab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope)
   :allocator_ (0),
-   dispatcher_ (0),
+   dispatcher_ (nullptr),
    lanes_setup_ (0),
    disp_sched_policy_ (sched_policy),
    disp_sched_scope_ (sched_scope)
@@ -36,7 +36,7 @@ TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *e
 }
 
 void
-TAO_EC_Kokyu_Dispatching::activate (void)
+TAO_EC_Kokyu_Dispatching::activate ()
 {
   if (!lanes_setup_)
     setup_lanes ();
@@ -47,7 +47,7 @@ TAO_EC_Kokyu_Dispatching::activate (void)
 }
 
 void
-TAO_EC_Kokyu_Dispatching::setup_lanes (void)
+TAO_EC_Kokyu_Dispatching::setup_lanes ()
 {
   // Query the scheduler togetConfig_Infos
   RtecScheduler::Config_Info_Set_var configs;
@@ -89,14 +89,14 @@ TAO_EC_Kokyu_Dispatching::setup_lanes (void)
   // Create Kokyu::Dispatcher using factory
   Kokyu::Dispatcher_Auto_Ptr
     tmp(Kokyu::Dispatcher_Factory::create_dispatcher(attrs));
-  this->dispatcher_ = tmp;
+  this->dispatcher_ = std::move(tmp);
   this->lanes_setup_ = 1;
 
   //ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu dispatcher setup\n"));
 }
 
 void
-TAO_EC_Kokyu_Dispatching::shutdown (void)
+TAO_EC_Kokyu_Dispatching::shutdown ()
 {
   this->dispatcher_->shutdown();
 }
@@ -154,19 +154,19 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
 
 // ****************************************************************
 
-TAO_EC_Kokyu_Shutdown_Command::~TAO_EC_Kokyu_Shutdown_Command(void)
+TAO_EC_Kokyu_Shutdown_Command::~TAO_EC_Kokyu_Shutdown_Command()
 {
 }
 
 int
-TAO_EC_Kokyu_Shutdown_Command::execute(void)
+TAO_EC_Kokyu_Shutdown_Command::execute()
 {
   return -1;
 }
 
 // ****************************************************************
 
-TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command(void)
+TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command()
 {
   this->proxy_->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index 34adfa62c22..815c50fe3ff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -17,12 +17,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void)
+TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory ()
 {
 }
 
 int
-TAO_EC_Kokyu_Factory::init_svcs (void)
+TAO_EC_Kokyu_Factory::init_svcs ()
 {
   return ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_TAO_EC_Kokyu_Factory);
@@ -203,7 +203,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-TAO_EC_Kokyu_Factory::fini (void)
+TAO_EC_Kokyu_Factory::fini ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index 033b9aa4a4f..37aa366a1a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -27,25 +27,25 @@ this->rt_info_computed_ = 1;
 #endif
 }
 
-TAO_EC_Kokyu_Filter::~TAO_EC_Kokyu_Filter (void)
+TAO_EC_Kokyu_Filter::~TAO_EC_Kokyu_Filter ()
 {
   delete this->body_;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Kokyu_Filter::begin (void) const
+TAO_EC_Kokyu_Filter::begin () const
 {
   return this->body_->begin ();
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Kokyu_Filter::end (void) const
+TAO_EC_Kokyu_Filter::end () const
 {
   return this->body_->end ();
 }
 
 int
-TAO_EC_Kokyu_Filter::size (void) const
+TAO_EC_Kokyu_Filter::size () const
 {
   return this->body_->size ();
 }
@@ -117,13 +117,13 @@ TAO_EC_Kokyu_Filter::push_nocopy (RtecEventComm::EventSet &event,
 }
 
 void
-TAO_EC_Kokyu_Filter::clear (void)
+TAO_EC_Kokyu_Filter::clear ()
 {
   this->body_->clear ();
 }
 
 CORBA::ULong
-TAO_EC_Kokyu_Filter::max_event_size (void) const
+TAO_EC_Kokyu_Filter::max_event_size () const
 {
   return this->body_->max_event_size ();
 }
@@ -225,7 +225,7 @@ TAO_EC_Kokyu_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info)
 }
 
 void
-TAO_EC_Kokyu_Filter::init_rt_info (void)
+TAO_EC_Kokyu_Filter::init_rt_info ()
 {
   if (this->rt_info_computed_)
     return;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 79c76c9860c..e8d8a5997b1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -31,7 +31,7 @@ const char* designator (long dsgn)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void)
+TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index 0e86459dc4c..9263064b6af 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void)
+TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index 6fbfb3f0eaf..f95099e6ab0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -41,7 +41,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Object_Deactivator
 public:
   /// Default constructor.  Deactivation info can be supplied later
   /// through set_values ().
-  TAO_EC_Object_Deactivator (void);
+  TAO_EC_Object_Deactivator ();
 
   /// Constructor.  Set @a id which will be deactivated from @ poa in
   /// the deactivator's destructor, unless deactivate () or
@@ -52,7 +52,7 @@ public:
   /// Destructor.  Deactivates id_ from poa_ if those values have
   /// been set, and neither deactivate() nor disallow_deactivation()
   /// have been invoked.
-  ~TAO_EC_Object_Deactivator (void);
+  ~TAO_EC_Object_Deactivator ();
 
   /// Set <id> which will be deactivated from <poa> in
   /// the deactivator's destructor, unless deactivate () or
@@ -65,20 +65,20 @@ public:
 
   /// Explicitly enable deactivation to happen in destructor or when
   /// deactivate() is called.
-  void allow_deactivation (void);
+  void allow_deactivation ();
 
   /// Explicitly disable deactivation from happening in destructor or
   /// when deactivate() is called.
-  void disallow_deactivation (void);
+  void disallow_deactivation ();
 
   /// Perform deactivation now if <poa_> and <id_> values have been set, and
   /// deactivation hasn't happened yet nor has it been explicitly
   /// disallowed.  CORBA exceptions occurring during deactivation are
   /// not propagated.   Deactivation will NOT happen in the destructor.
-  void deactivate (void);
+  void deactivate ();
 
   /// Accessor for the POA used in deactivation.
-  PortableServer::POA_var poa (void) const;
+  PortableServer::POA_var poa () const;
 
 private:
 
@@ -126,8 +126,8 @@ public:
 
 protected:
 
-  TAO_EC_Deactivated_Object (void);
-  ~TAO_EC_Deactivated_Object (void);
+  TAO_EC_Deactivated_Object ();
+  ~TAO_EC_Deactivated_Object ();
 
   /// Utility for deactivating ourselves from POA.
   TAO_EC_Object_Deactivator deactivator_;
@@ -147,10 +147,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_ORB_Holder
 {
 public:
   /// Constructor. No-op.
-  TAO_EC_ORB_Holder (void);
+  TAO_EC_ORB_Holder ();
 
   /// Destructor.  If holding an ORB, destroy it.
-  ~TAO_EC_ORB_Holder (void);
+  ~TAO_EC_ORB_Holder ();
 
   /// Set the ORB to be destroyed in destructor to <orb_var>.  If
   /// TAO_EC_ORB_Holder already held an orb prior to invocation of
@@ -183,10 +183,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Holder
 {
 public:
   /// Constructor. No-op.
-  TAO_EC_Event_Channel_Holder (void);
+  TAO_EC_Event_Channel_Holder ();
 
   /// Destructor.  If holding an Event Channel, destroy it.
-  ~TAO_EC_Event_Channel_Holder (void);
+  ~TAO_EC_Event_Channel_Holder ();
 
   /// Set the Event Channel to be destroyed in destructor to @a ec_var.  If
   /// TAO_EC_Event_Channel_Holder already held an Event Channel prior
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index 341e42b298b..6b2ff5f2ae4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -53,22 +53,21 @@ template <class T>
 class TAO_EC_Auto_Command
 {
 public:
-  TAO_EC_Auto_Command (void);
+  TAO_EC_Auto_Command ();
   TAO_EC_Auto_Command (const T & command);
-  ~TAO_EC_Auto_Command (void);
+  ~TAO_EC_Auto_Command ();
   void set_command (const T & command);
   void set_command (TAO_EC_Auto_Command<T> & auto_command);
-  void execute (void);
-  void allow_command (void);
-  void disallow_command (void);
+  void execute ();
+  void allow_command ();
+  void disallow_command ();
 
 private:
-
   TAO_EC_Auto_Command (const TAO_EC_Auto_Command &);
   TAO_EC_Auto_Command & operator=  (const TAO_EC_Auto_Command &);
 
   T command_;
-  int allow_command_;
+  bool allow_command_;
 };
 
 
@@ -78,9 +77,9 @@ template <class T>
 class TAO_EC_Shutdown_Command
 {
 public:
-  TAO_EC_Shutdown_Command (void);
+  TAO_EC_Shutdown_Command ();
   TAO_EC_Shutdown_Command (T target);
-  void execute (void);
+  void execute ();
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
index 746174798a0..4b85ab2aaae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
@@ -5,7 +5,7 @@ template <class T>
 ACE_INLINE
 TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (void)
   : command_ ()
-  , allow_command_ (0)
+  , allow_command_ (false)
 {
 }
 
@@ -13,7 +13,7 @@ template <class T>
 ACE_INLINE
 TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (const T & command)
   : command_ (command)
-  , allow_command_ (1)
+  , allow_command_ (true)
 {
 }
 
@@ -29,7 +29,7 @@ ACE_INLINE void
 TAO_EC_Auto_Command<T>::set_command (const T & command)
 {
   this->command_ = command;
-  this->allow_command_ = 1;
+  this->allow_command_ = true;
 }
 
 template <class T>
@@ -50,7 +50,7 @@ TAO_EC_Auto_Command<T>::execute (void)
 {
   if (this->allow_command_)
     {
-      this->allow_command_ = 0;
+      this->allow_command_ = false;
 
       try
         {
@@ -67,14 +67,14 @@ template <class T>
 ACE_INLINE void
 TAO_EC_Auto_Command<T>::allow_command (void)
 {
-  this->allow_command_ = 1;
+  this->allow_command_ = true;
 }
 
 template <class T>
 ACE_INLINE void
 TAO_EC_Auto_Command<T>::disallow_command (void)
 {
-  this->allow_command_ = 0;
+  this->allow_command_ = false;
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index e75e12bb54e..0aabbbc08bc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -15,14 +15,14 @@ TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
      thread_creation_flags_ (thread_creation_flags),
      thread_priority_ (thread_priority),
      force_activate_ (force_activate),
-     task_(0, service_object),
+     task_(nullptr, service_object),
      active_ (0)
 {
   this->task_.open (&this->thread_manager_);
 }
 
 void
-TAO_EC_MT_Dispatching::activate (void)
+TAO_EC_MT_Dispatching::activate ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -49,7 +49,7 @@ TAO_EC_MT_Dispatching::activate (void)
 }
 
 void
-TAO_EC_MT_Dispatching::shutdown (void)
+TAO_EC_MT_Dispatching::shutdown ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index 2492c94b2ad..8852968ebe1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -46,8 +46,8 @@ public:
                          TAO_EC_Queue_Full_Service_Object* queue_full_service_object_name);
 
   // = 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_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index dc550ba2fda..249dbb9e7ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -16,24 +16,24 @@ TAO_EC_Masked_Type_Filter::
 {
 }
 
-TAO_EC_Masked_Type_Filter::~TAO_EC_Masked_Type_Filter (void)
+TAO_EC_Masked_Type_Filter::~TAO_EC_Masked_Type_Filter ()
 {
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Masked_Type_Filter::begin (void) const
+TAO_EC_Masked_Type_Filter::begin () const
 {
-  return 0;
+  return nullptr;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Masked_Type_Filter::end (void) const
+TAO_EC_Masked_Type_Filter::end () const
 {
-  return 0;
+  return nullptr;
 }
 
 int
-TAO_EC_Masked_Type_Filter::size (void) const
+TAO_EC_Masked_Type_Filter::size () const
 {
   return 0;
 }
@@ -49,7 +49,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) != this->source_value_)
     return 0;
 
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     {
       this->parent ()->push (event, qos_info);
     }
@@ -67,7 +67,7 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) != this->source_value_)
     return 0;
 
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     {
       this->parent ()->push_nocopy (event, qos_info);
     }
@@ -87,12 +87,12 @@ TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &,
 }
 
 void
-TAO_EC_Masked_Type_Filter::clear (void)
+TAO_EC_Masked_Type_Filter::clear ()
 {
 }
 
 CORBA::ULong
-TAO_EC_Masked_Type_Filter::max_event_size (void) const
+TAO_EC_Masked_Type_Filter::max_event_size () const
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 3fa8dd6f094..c405c7589fb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -45,13 +45,13 @@ public:
                              CORBA::ULong type_value);
 
   /// Destructor
-  virtual ~TAO_EC_Masked_Type_Filter (void);
+  virtual ~TAO_EC_Masked_Type_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -60,8 +60,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 41ce09ab69b..a64fc8b06f1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -10,25 +10,25 @@ TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child)
   this->adopt_child (this->child_);
 }
 
-TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter (void)
+TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter ()
 {
   delete this->child_;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Negation_Filter::begin (void) const
+TAO_EC_Negation_Filter::begin () const
 {
   return const_cast<TAO_EC_Filter**> (&this->child_);
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Negation_Filter::end (void) const
+TAO_EC_Negation_Filter::end () const
 {
   return const_cast<TAO_EC_Filter**> (&this->child_) + 1;
 }
 
 int
-TAO_EC_Negation_Filter::size (void) const
+TAO_EC_Negation_Filter::size () const
 {
   return 1;
 }
@@ -39,7 +39,7 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
 {
   int n =
     this->child_->filter (event, qos_info);
-  if (this->parent () != 0 && n == 0)
+  if (this->parent () != nullptr && n == 0)
     {
       this->parent ()->push (event, qos_info);
       return 1;
@@ -53,7 +53,7 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 {
   int n =
     this->child_->filter_nocopy (event, qos_info);
-  if (this->parent () != 0 && n == 0)
+  if (this->parent () != nullptr && n == 0)
     {
       this->parent ()->push_nocopy (event, qos_info);
       return 1;
@@ -74,13 +74,13 @@ TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&,
 }
 
 void
-TAO_EC_Negation_Filter::clear (void)
+TAO_EC_Negation_Filter::clear ()
 {
   this->child_->clear ();
 }
 
 CORBA::ULong
-TAO_EC_Negation_Filter::max_event_size (void) const
+TAO_EC_Negation_Filter::max_event_size () const
 {
   return this->child_->max_event_size ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index 6097f931038..69128a25af5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -42,14 +42,14 @@ public:
   TAO_EC_Negation_Filter (TAO_EC_Filter* child);
 
   /// Destructor
-  virtual ~TAO_EC_Negation_Filter (void);
+  virtual ~TAO_EC_Negation_Filter ();
 
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -58,8 +58,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 71411aa2818..8bc8ff7eab4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -21,11 +21,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
+TAO_EC_Null_Factory::TAO_EC_Null_Factory ()
 {
 }
 
-TAO_EC_Null_Factory::~TAO_EC_Null_Factory (void)
+TAO_EC_Null_Factory::~TAO_EC_Null_Factory ()
 {
 }
 
@@ -117,7 +117,7 @@ TAO_EC_Timeout_Generator*
 TAO_EC_Null_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *)
 {
   int argc = 0;
-  ACE_TCHAR **argv = 0;
+  ACE_TCHAR **argv = nullptr;
   CORBA::ORB_var orb =
     CORBA::ORB_init (argc, argv);
   ACE_Reactor *reactor = orb->orb_core ()->reactor ();
@@ -189,7 +189,7 @@ TAO_EC_Null_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSup
 }
 
 ACE_Lock*
-TAO_EC_Null_Factory::create_consumer_lock (void)
+TAO_EC_Null_Factory::create_consumer_lock ()
 {
   return new ACE_Lock_Adapter<ACE_Null_Mutex> ();
 }
@@ -201,7 +201,7 @@ TAO_EC_Null_Factory::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_Lock*
-TAO_EC_Null_Factory::create_supplier_lock (void)
+TAO_EC_Null_Factory::create_supplier_lock ()
 {
   return new ACE_Lock_Adapter<ACE_Null_Mutex> ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index e6cdf972db1..5334fda7bca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -38,10 +38,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
-  TAO_EC_Null_Factory (void);
+  TAO_EC_Null_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_Null_Factory (void);
+  virtual ~TAO_EC_Null_Factory ();
 
   // = The EC_Factory methods
   virtual TAO_EC_Dispatching*
@@ -93,9 +93,9 @@ public:
   virtual void
       destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_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_EC_ConsumerControl*
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index 05438b6adf4..141c3bd9b3b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -25,7 +25,7 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
       const RtecEventComm::Event& e = event[j];
       RtecEventComm::Event* buffer =
         const_cast<RtecEventComm::Event*> (&e);
-      RtecEventComm::EventSet single_event (1, 1, buffer, 0);
+      RtecEventComm::EventSet single_event (1, 1, buffer, false);
 
       TAO_EC_QOS_Info event_info;
       filter->push_scheduled_event (single_event, event_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index 14892c28f7c..fc9da282605 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -32,7 +32,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Scheduling
 {
 public:
   /// Constructor.
-  TAO_EC_Null_Scheduling (void);
+  TAO_EC_Null_Scheduling ();
 
   // Read EC_Scheduling_Strategy.h for more details
   virtual void add_proxy_supplier_dependencies (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
index f1c2a48bd5c..63386ce9ca8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
@@ -1,5 +1,5 @@
 ACE_INLINE
-TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling (void)
+TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 973ecaf9ba7..8b11a9dd746 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -11,11 +11,9 @@
 #include "orbsvcs/Event/EC_ObserverStrategy.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
+TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy ()
 {
 }
 
@@ -57,10 +55,10 @@ TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*)
 
 // ****************************************************************
 
-TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void)
+TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy ()
 {
   delete this->lock_;
-  this->lock_ = 0;
+  this->lock_ = nullptr;
 }
 
 RtecEventChannelAdmin::Observer_Handle
@@ -111,7 +109,7 @@ TAO_EC_Basic_ObserverStrategy::create_observer_list (
                  RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
   int size = static_cast<int> (this->observers_.current_size ());
-  RtecEventChannelAdmin::Observer_var *tmp = 0;
+  RtecEventChannelAdmin::Observer_var *tmp = nullptr;
   ACE_NEW_RETURN (tmp,
                   RtecEventChannelAdmin::Observer_var[size],
                   0);
@@ -156,7 +154,7 @@ TAO_EC_Basic_ObserverStrategy::supplier_qos_update (
   RtecEventChannelAdmin::SupplierQOS s_qos;
   this->fill_qos (s_qos);
 
-  RtecEventChannelAdmin::Observer_var *tmp = 0;
+  RtecEventChannelAdmin::Observer_var *tmp = nullptr;
   int size = this->create_observer_list (tmp);
   ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp);
 
@@ -198,7 +196,7 @@ TAO_EC_Basic_ObserverStrategy::consumer_qos_update (
   RtecEventChannelAdmin::ConsumerQOS c_qos;
   this->fill_qos (c_qos);
 
-  RtecEventChannelAdmin::Observer_var *tmp = 0;
+  RtecEventChannelAdmin::Observer_var *tmp = nullptr;
   int size = this->create_observer_list (tmp);
   ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp);
 
@@ -262,7 +260,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 
 // ****************************************************************
 
-TAO_EC_Reactive_ObserverStrategy::~TAO_EC_Reactive_ObserverStrategy (void)
+TAO_EC_Reactive_ObserverStrategy::~TAO_EC_Reactive_ObserverStrategy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 6b4dcdf09a8..21b01e17fe0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -58,15 +58,13 @@ class TAO_RTEvent_Serv_Export TAO_EC_ObserverStrategy
 {
 public:
   /// Destructor
-  virtual ~TAO_EC_ObserverStrategy (void);
+  virtual ~TAO_EC_ObserverStrategy ();
 
   /// The basic methods to support the EC strategies.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr)
-    = 0;
+      append_observer (RtecEventChannelAdmin::Observer_ptr) = 0;
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle)
-     = 0;
+                        RtecEventChannelAdmin::Observer_Handle) = 0;
 
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
   /// connected or disconnected from it.
@@ -93,7 +91,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_ObserverStrategy : public TAO_EC_Obser
 {
 public:
   /// Constructor
-  TAO_EC_Null_ObserverStrategy (void);
+  TAO_EC_Null_ObserverStrategy ();
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
@@ -132,7 +130,7 @@ public:
                                  ACE_Lock* lock);
 
   /// Destructor
-  virtual ~TAO_EC_Basic_ObserverStrategy (void);
+  virtual ~TAO_EC_Basic_ObserverStrategy ();
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
@@ -158,7 +156,7 @@ public:
    */
   struct Observer_Entry
   {
-    Observer_Entry (void);
+    Observer_Entry ();
     Observer_Entry (RtecEventChannelAdmin::Observer_Handle h,
                     RtecEventChannelAdmin::Observer_ptr o);
 
@@ -243,7 +241,7 @@ public:
                                     ACE_Lock* lock);
 
   /// Destructor
-  virtual ~TAO_EC_Reactive_ObserverStrategy (void);
+  virtual ~TAO_EC_Reactive_ObserverStrategy ();
 
 protected:
   /// Helpers.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index bc9d38bc388..74b29ea94cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -20,16 +20,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_EC_Per_Supplier_Filter::
     TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel_Base* ec)
   :  event_channel_ (ec),
-     consumer_ (0),
+     consumer_ (nullptr),
      refcnt_ (1)
 {
   this->event_channel_->create_proxy_collection (this->collection_);
 }
 
-TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter (void)
+TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter ()
 {
   this->event_channel_->destroy_proxy_collection (this->collection_);
-  this->collection_ = 0;
+  this->collection_ = nullptr;
 }
 
 void
@@ -37,7 +37,7 @@ TAO_EC_Per_Supplier_Filter::bind (TAO_EC_ProxyPushConsumer* consumer)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  if (this->consumer_ == 0)
+  if (this->consumer_ == nullptr)
     {
       this->consumer_ = consumer;
     }
@@ -48,10 +48,10 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  if (this->consumer_ == 0 || this->consumer_ != consumer)
+  if (this->consumer_ == nullptr || this->consumer_ != consumer)
     return;
 
-  this->consumer_ = 0;
+  this->consumer_ = nullptr;
 
   try
     {
@@ -68,7 +68,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  if (this->consumer_ != 0)
+  if (this->consumer_ != nullptr)
     {
       const RtecEventChannelAdmin::SupplierQOS& pub =
         this->consumer_->publications_i ();
@@ -104,7 +104,7 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  if (this->consumer_ != 0)
+  if (this->consumer_ != nullptr)
     {
       const RtecEventChannelAdmin::SupplierQOS& pub =
         this->consumer_->publications_i ();
@@ -135,7 +135,7 @@ TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 }
 
 void
-TAO_EC_Per_Supplier_Filter::shutdown (void)
+TAO_EC_Per_Supplier_Filter::shutdown ()
 {
   this->collection_->shutdown ();
 }
@@ -160,7 +160,7 @@ TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event
 }
 
 CORBA::ULong
-TAO_EC_Per_Supplier_Filter::_incr_refcnt (void)
+TAO_EC_Per_Supplier_Filter::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
 
@@ -169,7 +169,7 @@ TAO_EC_Per_Supplier_Filter::_incr_refcnt (void)
 }
 
 CORBA::ULong
-TAO_EC_Per_Supplier_Filter::_decr_refcnt (void)
+TAO_EC_Per_Supplier_Filter::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index c2a5c559043..079c334476b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -46,7 +46,7 @@ public:
   TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel_Base* ec);
 
   /// Destructor
-  virtual ~TAO_EC_Per_Supplier_Filter (void);
+  virtual ~TAO_EC_Per_Supplier_Filter ();
 
   // = The TAO_EC_Supplier_Filter methods.
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
@@ -54,13 +54,13 @@ public:
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_ProxyPushConsumer *consumer);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
                                      const TAO_EC_QOS_Info &event_info);
-  virtual CORBA::ULong _decr_refcnt (void);
-  virtual CORBA::ULong _incr_refcnt (void);
+  virtual CORBA::ULong _decr_refcnt ();
+  virtual CORBA::ULong _incr_refcnt ();
 
 private:
   /// The event channel, used to locate the set of consumers.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 855a58e620a..9aa1306d3b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -17,7 +17,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void)
+TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder ()
 {
 }
 
@@ -38,7 +38,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build (
 {
   CORBA::ULong l = qos.dependencies.length ();
   if (pos == l)
-    return 0;
+    return nullptr;
 
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
   if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR)
@@ -47,7 +47,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build (
       CORBA::ULong n = e.header.source;
 
       TAO_EC_Filter** children;
-      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
+      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr);
       CORBA::ULong i = 0;
       for (; i != n; ++i)
         {
@@ -61,7 +61,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build (
       CORBA::ULong n = e.header.source;
 
       TAO_EC_Filter** children;
-      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
+      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr);
       CORBA::ULong i = 0;
       for (; i != n; ++i)
         {
@@ -76,7 +76,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build (
       CORBA::ULong n = e.header.source;
 
       TAO_EC_Filter** children;
-      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
+      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr);
       CORBA::ULong i = 0;
       for (; i != n; ++i)
         {
@@ -98,7 +98,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build (
       pos++; // COnsumer the designator
 
       if (pos == qos.dependencies.length ())
-        return 0;
+        return nullptr;
       CORBA::ULong source_mask = qos.dependencies[pos].event.header.source;
       CORBA::ULong type_mask = qos.dependencies[pos].event.header.type;
       pos++;
@@ -114,13 +114,13 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build (
       pos++; // Consume the designator
 
       if (pos == qos.dependencies.length ())
-        return 0;
+        return nullptr;
       CORBA::ULong source_mask = qos.dependencies[pos].event.header.source;
       CORBA::ULong type_mask = qos.dependencies[pos].event.header.type;
       pos++;
 
       if (pos == qos.dependencies.length ())
-        return 0;
+        return nullptr;
       CORBA::ULong source_value = qos.dependencies[pos].event.header.source;
       CORBA::ULong type_value = qos.dependencies[pos].event.header.type;
       pos++;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index 2f83bed94b7..453af2aace7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -42,7 +42,7 @@ public:
   TAO_EC_Prefix_Filter_Builder (TAO_EC_Event_Channel_Base* ec);
 
   /// destructor...
-  virtual ~TAO_EC_Prefix_Filter_Builder (void);
+  virtual ~TAO_EC_Prefix_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 5f5eb1383f6..1908203fd0b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -22,7 +22,7 @@ TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_B
 }
 
 void
-TAO_EC_Priority_Dispatching::activate (void)
+TAO_EC_Priority_Dispatching::activate ()
 {
   if (this->tasks_ != 0)
     return;
@@ -83,7 +83,7 @@ TAO_EC_Priority_Dispatching::activate (void)
 }
 
 void
-TAO_EC_Priority_Dispatching::shutdown (void)
+TAO_EC_Priority_Dispatching::shutdown ()
 {
   if (this->tasks_ == 0)
     return;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 750d6dd82dd..7f8bae66487 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -13,7 +13,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void)
+TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 9ca4c7a410a..59698a88284 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -18,7 +18,7 @@ TAO_EC_ProxyPushConsumer::
   : event_channel_ (ec),
     ec_refcount_ (1),
     connected_ (false),
-    filter_ (0)
+    filter_ (nullptr)
 {
   this->lock_ =
     this->event_channel_->create_consumer_lock ();
@@ -29,7 +29,7 @@ TAO_EC_ProxyPushConsumer::
   this->qos_.is_gateway = false;
 }
 
-TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void)
+TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer ()
 {
   this->event_channel_->destroy_consumer_lock (this->lock_);
   this->cleanup_i ();
@@ -46,7 +46,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
 
-    disconnected = 0;
+    disconnected = false;
     if (!this->is_connected_i ())
       {
         disconnected = true;
@@ -121,12 +121,12 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*)
 }
 
 void
-TAO_EC_ProxyPushConsumer::shutdown_hook (void)
+TAO_EC_ProxyPushConsumer::shutdown_hook ()
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::shutdown (void)
+TAO_EC_ProxyPushConsumer::shutdown ()
 {
   RtecEventComm::PushSupplier_var supplier;
 
@@ -140,7 +140,7 @@ TAO_EC_ProxyPushConsumer::shutdown (void)
 
     this->shutdown_hook ();
 
-    if (this->filter_ != 0)
+    if (this->filter_ != nullptr)
       {
         this->filter_->shutdown ();
 
@@ -165,22 +165,22 @@ TAO_EC_ProxyPushConsumer::shutdown (void)
 }
 
 void
-TAO_EC_ProxyPushConsumer::cleanup_i (void)
+TAO_EC_ProxyPushConsumer::cleanup_i ()
 {
   this->supplier_ =
     RtecEventComm::PushSupplier::_nil ();
   this->connected_ = false;
 
-  if (this->filter_ != 0)
+  if (this->filter_ != nullptr)
     {
       this->filter_->unbind (this);
       this->filter_->_decr_refcnt ();
-      this->filter_ = 0;
+      this->filter_ = nullptr;
     }
 }
 
 void
-TAO_EC_ProxyPushConsumer::deactivate (void)
+TAO_EC_ProxyPushConsumer::deactivate ()
 {
   try
     {
@@ -198,21 +198,21 @@ TAO_EC_ProxyPushConsumer::deactivate (void)
 }
 
 CORBA::ULong
-TAO_EC_ProxyPushConsumer::_incr_refcnt (void)
+TAO_EC_ProxyPushConsumer::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
   return this->ec_refcount_++;
 }
 
 void
-TAO_EC_ProxyPushConsumer::refcount_zero_hook (void)
+TAO_EC_ProxyPushConsumer::refcount_zero_hook ()
 {
   // Use the event channel
   this->event_channel_->destroy_proxy (this);
 }
 
 CORBA::ULong
-TAO_EC_ProxyPushConsumer::_decr_refcnt (void)
+TAO_EC_ProxyPushConsumer::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
@@ -257,7 +257,7 @@ TAO_EC_ProxyPushConsumer_Guard::
 }
 
 TAO_EC_ProxyPushConsumer_Guard::
-    ~TAO_EC_ProxyPushConsumer_Guard (void)
+    ~TAO_EC_ProxyPushConsumer_Guard ()
 {
   // This access is safe because guard objects are created on the
   // stack, only one thread has access to them
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index c6ec73de326..01fb9781875 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -62,28 +62,27 @@ public:
   TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);
 
   /// destructor...
-  virtual ~TAO_EC_ProxyPushConsumer (void);
+  virtual ~TAO_EC_ProxyPushConsumer ();
 
   /// Activate in the POA
   virtual void activate (
-          RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
-    = 0;
+          RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) = 0;
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Disconnect this from
   virtual void disconnect_push_consumer () = 0;
 
   /// Return false if no supplier is connected...
-  CORBA::Boolean is_connected (void) const;
+  CORBA::Boolean is_connected () const;
 
   /// Return the consumer object reference. It returns nil() if it has
   /// not connected yet.
-  RtecEventComm::PushSupplier_ptr supplier (void) const;
+  RtecEventComm::PushSupplier_ptr supplier () const;
 
   /// The QoS (subscription) used to connect to the EC.
-  const RtecEventChannelAdmin::SupplierQOS& publications (void) const;
+  const RtecEventChannelAdmin::SupplierQOS& publications () const;
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -105,15 +104,15 @@ public:
   virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// The QoS (subscription) used to connect to the EC, assumes the
   /// locks are held, use with care!
-  const RtecEventChannelAdmin::SupplierQOS& publications_i (void) const;
+  const RtecEventChannelAdmin::SupplierQOS& publications_i () const;
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
 
 protected:
@@ -126,13 +125,13 @@ protected:
   // The guard needs access to the following protected methods.
 
   /// The private version (without locking) of is_connected().
-  CORBA::Boolean is_connected_i (void) const;
+  CORBA::Boolean is_connected_i () const;
 
   /// Return the current filter, assumes the locks are held.
-  TAO_EC_Supplier_Filter *filter_i (void) const;
+  TAO_EC_Supplier_Filter *filter_i () const;
 
   /// Release the filter and the supplier
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// The supplier admin, used for activation and memory management.
   TAO_EC_Event_Channel_Base* event_channel_;
@@ -161,10 +160,10 @@ protected:
 
 private:
   /// Template method hooks.
-  virtual void shutdown_hook (void);
-  virtual void refcount_zero_hook (void);
+  virtual void shutdown_hook ();
+  virtual void refcount_zero_hook ();
 
-  virtual PortableServer::ObjectId object_id (void) = 0;
+  virtual PortableServer::ObjectId object_id () = 0;
 };
 
 // ****************************************************************
@@ -189,10 +188,10 @@ public:
                                   TAO_EC_ProxyPushConsumer *proxy);
 
   /// Destructor
-  ~TAO_EC_ProxyPushConsumer_Guard (void);
+  ~TAO_EC_ProxyPushConsumer_Guard ();
 
   /// Returns true if the reference count successfully acquired
-  bool locked (void) const;
+  bool locked () const;
 
   TAO_EC_Supplier_Filter *filter;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 23d9a366eb9..68c2c3cb5d8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -23,7 +23,7 @@ TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* e
   : event_channel_ (ec),
     refcount_ (1),
     suspended_ (false),
-    child_ (0),
+    child_ (nullptr),
     consumer_validate_connection_(validate_connection)
 {
   this->lock_ =
@@ -35,7 +35,7 @@ TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* e
   this->qos_.is_gateway = false;
 }
 
-TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
+TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier ()
 {
   this->event_channel_->destroy_supplier_lock (this->lock_);
   this->cleanup_i ();
@@ -80,7 +80,7 @@ TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*)
 }
 
 void
-TAO_EC_ProxyPushSupplier::shutdown (void)
+TAO_EC_ProxyPushSupplier::shutdown ()
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -116,7 +116,7 @@ TAO_EC_ProxyPushSupplier::shutdown (void)
 }
 
 void
-TAO_EC_ProxyPushSupplier::cleanup_i (void)
+TAO_EC_ProxyPushSupplier::cleanup_i ()
 {
   this->consumer_ =
     RtecEventComm::PushConsumer::_nil ();
@@ -124,11 +124,11 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
   // @@ Why don't we have a destroy() method in the
   // filter_builder?
   delete this->child_;
-  this->child_ = 0;
+  this->child_ = nullptr;
 }
 
 void
-TAO_EC_ProxyPushSupplier::deactivate (void) throw ()
+TAO_EC_ProxyPushSupplier::deactivate () throw ()
 {
   try
     {
@@ -145,21 +145,21 @@ TAO_EC_ProxyPushSupplier::deactivate (void) throw ()
 }
 
 CORBA::ULong
-TAO_EC_ProxyPushSupplier::_incr_refcnt (void)
+TAO_EC_ProxyPushSupplier::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
   return this->refcount_++;
 }
 
 void
-TAO_EC_ProxyPushSupplier::refcount_zero_hook (void)
+TAO_EC_ProxyPushSupplier::refcount_zero_hook ()
 {
   // Use the event channel
   this->event_channel_->destroy_proxy (this);
 }
 
 CORBA::ULong
-TAO_EC_ProxyPushSupplier::_decr_refcnt (void)
+TAO_EC_ProxyPushSupplier::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
@@ -259,7 +259,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
                                                 qos_info);
   }
 
-  if (this->child_ != 0)
+  if (this->child_ != nullptr)
     this->child_->clear ();
 }
 
@@ -308,7 +308,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
                                                        qos_info);
   }
 
-  if (this->child_ != 0)
+  if (this->child_ != nullptr)
     this->child_->clear ();
 }
 
@@ -430,7 +430,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent (
 }
 
 void
-TAO_EC_ProxyPushSupplier::clear (void)
+TAO_EC_ProxyPushSupplier::clear ()
 {
   ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
@@ -438,7 +438,7 @@ TAO_EC_ProxyPushSupplier::clear (void)
 }
 
 CORBA::ULong
-TAO_EC_ProxyPushSupplier::max_event_size (void) const
+TAO_EC_ProxyPushSupplier::max_event_size () const
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 68b378bcb3e..65e699545b2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -62,32 +62,32 @@ public:
   TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
 
   /// Destructor...
-  virtual ~TAO_EC_ProxyPushSupplier (void);
+  virtual ~TAO_EC_ProxyPushSupplier ();
 
   /// Activate in the POA
   virtual void activate (
     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) = 0;
 
   /// Deactivate from the POA
-  virtual void deactivate (void) throw ();
+  virtual void deactivate () throw ();
 
   /// Disconnect this from
   virtual void disconnect_push_supplier () = 0;
 
   /// Return false if no consumer is connected...
-  CORBA::Boolean is_connected (void) const;
+  CORBA::Boolean is_connected () const;
 
   /// Return true if it is suspended.
-  CORBA::Boolean is_suspended (void) const;
+  CORBA::Boolean is_suspended () const;
 
   /**
    * Return the consumer object reference. It returns nil() if it has
    * not connected yet.
    */
-  RtecEventComm::PushConsumer_ptr consumer (void) const;
+  RtecEventComm::PushConsumer_ptr consumer () const;
 
   /// The QoS (subscription) used to connect to the EC.
-  const RtecEventChannelAdmin::ConsumerQOS& subscriptions (void) const;
+  const RtecEventChannelAdmin::ConsumerQOS& subscriptions () const;
 
   /// Concrete implementations can use this methods to keep track of
   /// the suppliers that publish its events.
@@ -102,7 +102,7 @@ public:
   virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Pushes to the consumer, verifies that it is connected and that it
   /// is not suspended.
@@ -124,8 +124,8 @@ public:
   CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
 
   /// 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 TAO_EC_Filter methods, only push() is implemented...
   virtual int filter (const RtecEventComm::EventSet &event,
@@ -136,8 +136,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
@@ -148,16 +148,16 @@ protected:
   void consumer (RtecEventComm::PushConsumer_ptr consumer);
   void consumer_i (RtecEventComm::PushConsumer_ptr consumer);
 
-  void suspend_connection_i (void);
-  void resume_connection_i (void);
-  void suspend_connection_locked (void);
-  void resume_connection_locked (void);
+  void suspend_connection_i ();
+  void resume_connection_i ();
+  void suspend_connection_locked ();
+  void resume_connection_locked ();
 
   /// The private version (without locking) of is_connected().
-  CORBA::Boolean is_connected_i (void) const;
+  CORBA::Boolean is_connected_i () const;
 
   /// Release the child and the consumer
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// The Event Channel that owns this object.
   TAO_EC_Event_Channel_Base* event_channel_;
@@ -188,9 +188,9 @@ protected:
 private:
 
   /// Template method hooks.
-  virtual void refcount_zero_hook (void);
+  virtual void refcount_zero_hook ();
   virtual void pre_dispatch_hook (RtecEventComm::EventSet&);
-  virtual PortableServer::ObjectId object_id (void) = 0;
+  virtual PortableServer::ObjectId object_id () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 701f280f40e..97e7fef5c6d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -40,7 +40,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_QOS_Info
 {
 public:
   /// Constructor
-  TAO_EC_QOS_Info (void);
+  TAO_EC_QOS_Info ();
 
   /// Copy constructor, it does the obvious thing, but if it is not
   /// here the HP/aCC compiler breaks.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index cb057292fc2..07ecf59d97c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -19,13 +19,13 @@ TAO_EC_RTCORBA_Dispatching::
     this->tasks_[i].thr_mgr (&this->thread_manager_);
 }
 
-TAO_EC_RTCORBA_Dispatching::~TAO_EC_RTCORBA_Dispatching (void)
+TAO_EC_RTCORBA_Dispatching::~TAO_EC_RTCORBA_Dispatching ()
 {
   delete[] this->tasks_;
 }
 
 void
-TAO_EC_RTCORBA_Dispatching::activate (void)
+TAO_EC_RTCORBA_Dispatching::activate ()
 {
   for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i)
     {
@@ -48,7 +48,7 @@ TAO_EC_RTCORBA_Dispatching::activate (void)
 }
 
 void
-TAO_EC_RTCORBA_Dispatching::shutdown (void)
+TAO_EC_RTCORBA_Dispatching::shutdown ()
 {
   for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 01d6063199d..8c0d8d3723a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -15,7 +15,7 @@ TAO_EC_RTCORBA_Factory::
 {
 }
 
-TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory (void)
+TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory ()
 {
 }
 
@@ -27,7 +27,7 @@ TAO_EC_RTCORBA_Factory::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-TAO_EC_RTCORBA_Factory::fini (void)
+TAO_EC_RTCORBA_Factory::fini ()
 {
   return this->body_->fini ();
 }
@@ -212,7 +212,7 @@ TAO_EC_RTCORBA_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPush
 }
 
 ACE_Lock*
-TAO_EC_RTCORBA_Factory::create_consumer_lock (void)
+TAO_EC_RTCORBA_Factory::create_consumer_lock ()
 {
   return this->body_->create_consumer_lock ();
 }
@@ -224,7 +224,7 @@ TAO_EC_RTCORBA_Factory::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_Lock*
-TAO_EC_RTCORBA_Factory::create_supplier_lock (void)
+TAO_EC_RTCORBA_Factory::create_supplier_lock ()
 {
   return this->body_->create_supplier_lock ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index e23bf2bc0fa..585b4a0e10e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -35,7 +35,7 @@ TAO_EC_Reactive_ConsumerControl::
     this->orb_->orb_core ()->reactor ();
 }
 
-TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void)
+TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl ()
 {
 }
 
@@ -88,7 +88,7 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout (
 }
 
 int
-TAO_EC_Reactive_ConsumerControl::activate (void)
+TAO_EC_Reactive_ConsumerControl::activate ()
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   try
@@ -117,7 +117,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
         // handle_timeout uses these policies, if done in front, the channel
         // can crash when the timeout expires before initiazation is ready.
         timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
-                                                    0,
+                                                    nullptr,
                                                     this->rate_,
                                                     this->rate_);
         if (timer_id_ == -1)
@@ -134,14 +134,14 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
 }
 
 int
-TAO_EC_Reactive_ConsumerControl::shutdown (void)
+TAO_EC_Reactive_ConsumerControl::shutdown ()
 {
   int r = 0;
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   r = this->reactor_->cancel_timer (timer_id_);
 #endif /* TAO_HAS_CORBA_MESSAGING */
-  this->adapter_.reactor (0);
+  this->adapter_.reactor (nullptr);
   return r;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 5218d068061..3d4f9b0645a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -77,15 +77,15 @@ public:
                                    CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_EC_Reactive_ConsumerControl (void);
+  virtual ~TAO_EC_Reactive_ConsumerControl ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_EC_ConsumerControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy);
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &);
@@ -93,7 +93,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/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index f9011dc1df8..1a2dee5f5d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -5,18 +5,18 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void)
+TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching ()
   : TAO_EC_Dispatching ()
 {
 }
 
 void
-TAO_EC_Reactive_Dispatching::activate (void)
+TAO_EC_Reactive_Dispatching::activate ()
 {
 }
 
 void
-TAO_EC_Reactive_Dispatching::shutdown (void)
+TAO_EC_Reactive_Dispatching::shutdown ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
index 2ede72e6740..ce9c76ad799 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -39,11 +39,11 @@ class TAO_RTEvent_Serv_Export TAO_EC_Reactive_Dispatching : public TAO_EC_Dispat
 public:
   /// The scheduler is used to find the range of priorities and similar
   /// info.
-  TAO_EC_Reactive_Dispatching (void);
+  TAO_EC_Reactive_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_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 070edd73045..b76dc2aa4e7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -35,7 +35,7 @@ TAO_EC_Reactive_SupplierControl::
     this->orb_->orb_core ()->reactor ();
 }
 
-TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void)
+TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl ()
 {
 }
 
@@ -80,7 +80,7 @@ TAO_EC_Reactive_SupplierControl::handle_timeout (
 }
 
 int
-TAO_EC_Reactive_SupplierControl::activate (void)
+TAO_EC_Reactive_SupplierControl::activate ()
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   try
@@ -110,7 +110,7 @@ TAO_EC_Reactive_SupplierControl::activate (void)
         // handle_timeout uses these policies, if done in front, the channel
         // can crash when the timeout expires before initiazation is ready.
         timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
-                                                    0,
+                                                    nullptr,
                                                     this->rate_,
                                                     this->rate_);
         if (timer_id_ == -1)
@@ -127,14 +127,14 @@ TAO_EC_Reactive_SupplierControl::activate (void)
 }
 
 int
-TAO_EC_Reactive_SupplierControl::shutdown (void)
+TAO_EC_Reactive_SupplierControl::shutdown ()
 {
   int r = 0;
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   r = this->reactor_->cancel_timer (timer_id_);
 #endif /* TAO_HAS_CORBA_MESSAGING */
-  this->adapter_.reactor (0);
+  this->adapter_.reactor (nullptr);
   return r;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index 949cd581af7..64ae0a9f4e7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -87,15 +87,15 @@ public:
                                    CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_EC_Reactive_SupplierControl (void);
+  virtual ~TAO_EC_Reactive_SupplierControl ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_EC_SupplierControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy);
   virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy,
                                  CORBA::SystemException &);
@@ -103,7 +103,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/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
index 19acc6826e1..ae33ca08734 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -9,20 +9,20 @@ TAO_EC_Reactive_Timeout_Generator::
 {
 }
 
-TAO_EC_Reactive_Timeout_Generator::~TAO_EC_Reactive_Timeout_Generator (void)
+TAO_EC_Reactive_Timeout_Generator::~TAO_EC_Reactive_Timeout_Generator ()
 {
 }
 
 void
-TAO_EC_Reactive_Timeout_Generator::activate (void)
+TAO_EC_Reactive_Timeout_Generator::activate ()
 {
 }
 
 void
-TAO_EC_Reactive_Timeout_Generator::shutdown (void)
+TAO_EC_Reactive_Timeout_Generator::shutdown ()
 {
   this->reactor_->cancel_timer (&this->event_handler_);
-  this->event_handler_.reactor (0);
+  this->event_handler_.reactor (nullptr);
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
index 4e7a0a6b7d4..1076a3e41d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -42,11 +42,11 @@ public:
   TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor = 0);
 
   /// destructor
-  virtual ~TAO_EC_Reactive_Timeout_Generator (void);
+  virtual ~TAO_EC_Reactive_Timeout_Generator ();
 
   // = The TAO_EC_Timeout_Generator methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual int schedule_timer (TAO_EC_Timeout_Filter* filter,
                               const ACE_Time_Value& delta,
                               const ACE_Time_Value& interval);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 56c9af969ee..edc5a380c27 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -18,7 +18,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory (void)
+TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory ()
 {
 }
 
@@ -162,7 +162,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-TAO_EC_Sched_Factory::fini (void)
+TAO_EC_Sched_Factory::fini ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index d85da896b8f..99a0693f1f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -27,25 +27,25 @@ TAO_EC_Sched_Filter::
   this->adopt_child (this->body_);
 }
 
-TAO_EC_Sched_Filter::~TAO_EC_Sched_Filter (void)
+TAO_EC_Sched_Filter::~TAO_EC_Sched_Filter ()
 {
   delete this->body_;
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Sched_Filter::begin (void) const
+TAO_EC_Sched_Filter::begin () const
 {
   return this->body_->begin ();
 }
 
 TAO_EC_Filter::ChildrenIterator
-TAO_EC_Sched_Filter::end (void) const
+TAO_EC_Sched_Filter::end () const
 {
   return this->body_->end ();
 }
 
 int
-TAO_EC_Sched_Filter::size (void) const
+TAO_EC_Sched_Filter::size () const
 {
   return this->body_->size ();
 }
@@ -117,13 +117,13 @@ TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event,
 }
 
 void
-TAO_EC_Sched_Filter::clear (void)
+TAO_EC_Sched_Filter::clear ()
 {
   this->body_->clear ();
 }
 
 CORBA::ULong
-TAO_EC_Sched_Filter::max_event_size (void) const
+TAO_EC_Sched_Filter::max_event_size () const
 {
   return this->body_->max_event_size ();
 }
@@ -172,7 +172,7 @@ TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info)
 }
 
 void
-TAO_EC_Sched_Filter::init_rt_info (void)
+TAO_EC_Sched_Filter::init_rt_info ()
 {
   if (this->rt_info_computed_)
     return;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 6db96184ed2..3df2fa9f386 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -17,7 +17,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void)
+TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index 88ca6abf682..ea13e8047b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void)
+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 ecb4532fc30..6216f869b2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -47,7 +47,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Scheduling_Strategy
 {
 public:
   /// Destructor
-  virtual ~TAO_EC_Scheduling_Strategy (void);
+  virtual ~TAO_EC_Scheduling_Strategy ();
 
   /// Add all the dependencies between @a supplier and @a consumer
   virtual void add_proxy_supplier_dependencies (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 7ed8c79aad1..e31589276a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -17,18 +17,18 @@ TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec)
     this->event_channel_->supplier_poa ();
 }
 
-TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void)
+TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin ()
 {
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_EC_SupplierAdmin::obtain_push_consumer (void)
+TAO_EC_SupplierAdmin::obtain_push_consumer ()
 {
   return this->obtain ();
 }
 
 PortableServer::POA_ptr
-TAO_EC_SupplierAdmin::_default_POA (void)
+TAO_EC_SupplierAdmin::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index a6aae47eb68..d388cb29734 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -48,14 +48,14 @@ public:
   TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base* event_channel);
 
   /// destructor...
-  virtual ~TAO_EC_SupplierAdmin (void);
+  virtual ~TAO_EC_SupplierAdmin ();
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void);
+      obtain_push_consumer ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index a24ce675bb2..5519b5b9022 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -4,22 +4,22 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_SupplierControl::TAO_EC_SupplierControl (void)
+TAO_EC_SupplierControl::TAO_EC_SupplierControl ()
 {
 }
 
-TAO_EC_SupplierControl::~TAO_EC_SupplierControl (void)
+TAO_EC_SupplierControl::~TAO_EC_SupplierControl ()
 {
 }
 
 int
-TAO_EC_SupplierControl::activate (void)
+TAO_EC_SupplierControl::activate ()
 {
   return 0;
 }
 
 int
-TAO_EC_SupplierControl::shutdown (void)
+TAO_EC_SupplierControl::shutdown ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 68a36a5ea74..99d3805f1df 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -47,15 +47,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_SupplierControl
 {
 public:
   /// Constructor.
-  TAO_EC_SupplierControl (void);
+  TAO_EC_SupplierControl ();
 
   /// Destructor.
-  virtual ~TAO_EC_SupplierControl (void);
+  virtual ~TAO_EC_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/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index 3534ca66a7c..46ea1b4e70e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void)
+TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 50872b9d5aa..e5f8204bbc0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -67,7 +67,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Supplier_Filter
 {
 public:
   /// Destructor
-  virtual ~TAO_EC_Supplier_Filter (void);
+  virtual ~TAO_EC_Supplier_Filter ();
 
   /**
    * Whenever a ProxyPushConsumer is initialized it calls this method
@@ -96,7 +96,7 @@ public:
   virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier) = 0;
 
   /// The event channel is shutting down.
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 
   /// The ProxyPushConsumer delegates on this class to actually send
   /// the event.
@@ -110,8 +110,8 @@ public:
 
   /// Increment and decrement the reference count, locking must be
   /// provided by the user.
-  virtual CORBA::ULong _incr_refcnt (void) = 0;
-  virtual CORBA::ULong _decr_refcnt (void) = 0;
+  virtual CORBA::ULong _incr_refcnt () = 0;
+  virtual CORBA::ULong _decr_refcnt () = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index 02b830ff850..446058b3f45 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void)
+TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index b23635b80af..0a363d62a02 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -41,7 +41,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Supplier_Filter_Builder
 {
 public:
   /// Destructor...
-  virtual ~TAO_EC_Supplier_Filter_Builder (void);
+  virtual ~TAO_EC_Supplier_Filter_Builder ();
 
   /**
    * Create the filter. The consumer is bound to the returned
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index d932bb3c9ac..bd3ad9b9094 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -22,7 +22,7 @@ TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (int ,
   , consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
   , queue_full_service_object_(so)
 {
-  ACE_ASSERT (this->queue_full_service_object_ != 0);
+  ACE_ASSERT (this->queue_full_service_object_ != nullptr);
 }
 
 TAO_EC_TPC_Dispatching::~TAO_EC_TPC_Dispatching ()
@@ -68,13 +68,13 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer)
   int bindresult =
     this->consumer_task_map_.bind (RtecEventComm::PushConsumer::_duplicate(pc.in()),
                                    dtask);
-  const char* explanation = 0;
+  const char* explanation = nullptr;
   if (bindresult == -1)
     explanation = "general failure";
   else if (bindresult == 1)
     explanation = "entry already exists";
 
-  if (explanation != 0)
+  if (explanation != nullptr)
     {
       ORBSVCS_DEBUG ((LM_WARNING,
                   "EC (%P|%t): TPC_Dispatching::add_consumer failed to bind consumer (%@)"
@@ -94,7 +94,7 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
-  TAO_EC_Dispatching_Task* dtask = 0;
+  TAO_EC_Dispatching_Task* dtask = nullptr;
 
   if (this->consumer_task_map_.find (consumer, dtask) == -1)
     {
@@ -119,12 +119,12 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume
 }
 
 void
-TAO_EC_TPC_Dispatching::activate (void)
+TAO_EC_TPC_Dispatching::activate ()
 {
 }
 
 void
-TAO_EC_TPC_Dispatching::shutdown (void)
+TAO_EC_TPC_Dispatching::shutdown ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -133,7 +133,7 @@ TAO_EC_TPC_Dispatching::shutdown (void)
   MAPTYPE::ITERATOR iter = this->consumer_task_map_.begin ();
   while (! iter.done())
     {
-      MAPTYPE::ENTRY* entry = 0;
+      MAPTYPE::ENTRY* entry = nullptr;
       if (! iter.next(entry))
         continue;
 
@@ -148,7 +148,7 @@ TAO_EC_TPC_Dispatching::shutdown (void)
   iter = this->consumer_task_map_.begin ();
   while (! iter.done())
     {
-      MAPTYPE::ENTRY* entry = 0;
+      MAPTYPE::ENTRY* entry = nullptr;
       if (! iter.next(entry))
         continue;
 
@@ -179,7 +179,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer));
 
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-  TAO_EC_Dispatching_Task* dtask = 0;
+  TAO_EC_Dispatching_Task* dtask = nullptr;
 
   if (this->consumer_task_map_.find (consumer, dtask) == -1)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index d5af34899bf..6715b883f17 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -44,8 +44,8 @@ public:
   ~TAO_EC_TPC_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_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index d4904b5a195..52af0795fc3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -17,17 +17,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 unsigned long TAO_EC_TPC_debug_level;
 
-TAO_EC_TPC_Factory::TAO_EC_TPC_Factory (void)
+TAO_EC_TPC_Factory::TAO_EC_TPC_Factory ()
 {
   TAO_EC_TPC_debug_level = 0;
 }
 
-TAO_EC_TPC_Factory::~TAO_EC_TPC_Factory (void)
+TAO_EC_TPC_Factory::~TAO_EC_TPC_Factory ()
 {
 }
 
 int
-TAO_EC_TPC_Factory::init_svcs (void)
+TAO_EC_TPC_Factory::init_svcs ()
 {
   TAO_EC_Simple_Queue_Full_Action::init_svcs();
   return ACE_Service_Config::static_svcs ()->
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
index 2e5fbed19b0..e7e189cf5cd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
@@ -30,14 +30,14 @@ class TAO_RTEvent_Serv_Export TAO_EC_TPC_Factory : public TAO_EC_Default_Factory
 {
 public:
   /// Constructor
-  TAO_EC_TPC_Factory (void);
+  TAO_EC_TPC_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_TPC_Factory (void);
+  virtual ~TAO_EC_TPC_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[]);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index 0b60d49d1cf..d781c1702e2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -13,7 +13,7 @@ TAO_EC_TPC_ProxyPushConsumer::TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel
 }
 
 TAO_EC_TPC_Dispatching*
-TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching (void)
+TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching ()
 {
   TAO_EC_Dispatching* dispatcher = this->event_channel_->dispatching ();
   TAO_EC_TPC_Dispatching* tpcdispatcher =
@@ -21,7 +21,7 @@ TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching (void)
   return tpcdispatcher;
 }
 
-TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
+TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer ()
 {
   // @@@ Do I need to call the logic to remove the consumer from the
   // dispatch map in here?  I'm not sure...  But, if I do, then I need
@@ -32,7 +32,7 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
 }
 
 void
-TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer (void)
+TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer ()
 {
   RtecEventComm::PushConsumer_var emulated_exceptions_suck = this->_this ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
index 8b617a74f95..a6077c76874 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
@@ -29,9 +29,9 @@ class TAO_RTEvent_Serv_Export TAO_EC_TPC_ProxyPushConsumer :
 {
 public:
   TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec);
-  virtual ~TAO_EC_TPC_ProxyPushConsumer (void);
+  virtual ~TAO_EC_TPC_ProxyPushConsumer ();
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   typedef TAO_EC_Default_ProxyPushConsumer BASECLASS;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index a45da4bd065..6438de63fbf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -12,12 +12,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 extern unsigned long TAO_EC_TPC_debug_level;
 
-TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void)
+TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier ()
 {
 }
 
 void
-TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void)
+TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier ()
 {
   if (TAO_EC_TPC_debug_level > 0)
     ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): consumer=%@\n",
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
index 5fd466c2f11..c2183f1b1b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
@@ -28,7 +28,7 @@ public:
   TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
 
   /// Dtor
-  virtual ~TAO_EC_TPC_ProxyPushSupplier (void);
+  virtual ~TAO_EC_TPC_ProxyPushSupplier ();
 
   /*! These are overridden from the base class in order to maintain the
        map in the dispatcher class. */
@@ -38,7 +38,7 @@ public:
                 RtecEventComm::PushConsumer_ptr push_consumer,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   typedef TAO_EC_Default_ProxyPushSupplier BASECLASS;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
index 77617b17086..a08142d98ab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
@@ -53,18 +53,18 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms)
   flags_ = scope_ = sched_ = 0; // zero out everything
 
   // short-circuit on the trivial case
-  if (syms == 0 || *syms == '\0')
+  if (syms == nullptr || *syms == '\0')
     return;
 
   static size_t num_flags = sizeof(supported_flags_)/sizeof(Supported_Flag);
   char* s = ACE_OS::strdup (syms); // need a mutable string
-  if (s == 0)
+  if (s == nullptr)
     return;
 
   const char* SEPARATORS = " |"; // this should probably be at class level
-  char* ptr = 0;
+  char* ptr = nullptr;
   char* tok = ACE_OS::strtok_r (s, SEPARATORS, &ptr);
-  while (tok != 0)
+  while (tok != nullptr)
     {
       // This would allow for easy accomodation of flags that
       // aren't currently supported, but is it a good idea?
@@ -76,7 +76,7 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms)
           // If somebody specifies the scheduler this way, then they
           // lose range checking on the priority.  Bummer, but those
           // are the breaks.
-          this->flags_ |= ACE_OS::strtol (tok, 0, 0);
+          this->flags_ |= ACE_OS::strtol (tok, nullptr, 0);
         }
       else
         {
@@ -114,7 +114,7 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms)
                           tok));
             }
         }
-      tok = ACE_OS::strtok_r (0, SEPARATORS, &ptr);
+      tok = ACE_OS::strtok_r (nullptr, SEPARATORS, &ptr);
     }
 
   ACE_OS::free (s); // clean up after ourselves
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index dde8279502e..cd4e008260d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -55,7 +55,7 @@ TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter (
   //              this->id_));
 }
 
-TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void)
+TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter ()
 {
   this->event_channel_->timeout_generator ()->cancel_timer (this->qos_info_,
                                                             this->id_);
@@ -67,7 +67,7 @@ TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event,
 {
   qos_info.timer_id_ = this->id_;
 
-  if (this->supplier_ != 0)
+  if (this->supplier_ != nullptr)
     this->supplier_->filter (event,
                              qos_info);
 }
@@ -77,7 +77,7 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
                                TAO_EC_QOS_Info &qos_info)
 {
   if (qos_info.timer_id_ == this->id_
-      && this->parent () != 0)
+      && this->parent () != nullptr)
     {
       this->parent ()->push (event, qos_info);
       return 1;
@@ -90,7 +90,7 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
                                       TAO_EC_QOS_Info &qos_info)
 {
   if (qos_info.timer_id_ == this->id_
-      && this->parent () != 0)
+      && this->parent () != nullptr)
     {
       this->parent ()->push_nocopy (event, qos_info);
       return 1;
@@ -111,7 +111,7 @@ TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&,
 }
 
 void
-TAO_EC_Timeout_Filter::clear (void)
+TAO_EC_Timeout_Filter::clear ()
 {
   if (this->type_ == ACE_ES_EVENT_DEADLINE_TIMEOUT)
     {
@@ -133,7 +133,7 @@ TAO_EC_Timeout_Filter::clear (void)
 }
 
 CORBA::ULong
-TAO_EC_Timeout_Filter::max_event_size (void) const
+TAO_EC_Timeout_Filter::max_event_size () const
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index 333266db7d4..917b2ef4b83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -48,13 +48,13 @@ public:
                          RtecEventComm::Time period);
 
   /// Destructor.
-  virtual ~TAO_EC_Timeout_Filter (void);
+  virtual ~TAO_EC_Timeout_Filter ();
 
   /// Return the QOS_Info for this Timeout filter.
-  const TAO_EC_QOS_Info& qos_info (void) const;
+  const TAO_EC_QOS_Info& qos_info () const;
 
   /// The type of timeout event that we generate.
-  RtecEventComm::EventType type (void) const;
+  RtecEventComm::EventType type () const;
 
   /// Callback from the Timeout_Generator
   void push_to_proxy (const RtecEventComm::EventSet& event,
@@ -70,8 +70,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 60278f39599..fd2f50c1dc3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void)
+TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator ()
 {
 }
 
@@ -26,7 +26,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
   TAO_EC_Timeout_Filter *filter =
     static_cast<TAO_EC_Timeout_Filter*> (const_cast<void*> (vp));
 
-  if (filter == 0)
+  if (filter == nullptr)
     return 0;
 
   try
@@ -35,7 +35,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
       e.header.type = filter->type ();
       e.header.source = 0;
 
-      RtecEventComm::EventSet single_event (1, 1, &e, 0);
+      RtecEventComm::EventSet single_event (1, 1, &e, false);
 
       TAO_EC_QOS_Info qos_info = filter->qos_info ();
       filter->push_to_proxy (single_event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
index 32f0a576ed5..3ef4d586c2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
@@ -46,14 +46,14 @@ class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Generator
 {
 public:
   /// destructor
-  virtual ~TAO_EC_Timeout_Generator (void);
+  virtual ~TAO_EC_Timeout_Generator ();
 
   /// Activate any internal threads.
-  virtual void activate (void) = 0;
+  virtual void activate () = 0;
 
   /// Deactivate any internal threads, clients can destroy the object
   /// after calling this method.
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 
   /// Add a timer at the given priority, returns the timer ID.
   virtual int schedule_timer (TAO_EC_Timeout_Filter* filter,
@@ -80,7 +80,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Adapter : public ACE_Event_Handler
 {
 public:
   /// Default construction.
-  TAO_EC_Timeout_Adapter (void);
+  TAO_EC_Timeout_Adapter ();
 
 private:
   /// Casts @a act to EC_Filter and dispatches an event to it.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 7dea70568b6..1ec13c1e230 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -44,7 +44,7 @@ TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*)
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::shutdown (void)
+TAO_EC_Trivial_Supplier_Filter::shutdown ()
 {
 }
 
@@ -68,13 +68,13 @@ TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &e
 }
 
 CORBA::ULong
-TAO_EC_Trivial_Supplier_Filter::_incr_refcnt (void)
+TAO_EC_Trivial_Supplier_Filter::_incr_refcnt ()
 {
   return 1;
 }
 
 CORBA::ULong
-TAO_EC_Trivial_Supplier_Filter::_decr_refcnt (void)
+TAO_EC_Trivial_Supplier_Filter::_decr_refcnt ()
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 0282d01b7c7..64994b1f55f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -54,13 +54,13 @@ public:
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_ProxyPushConsumer *consumer);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
                                      const TAO_EC_QOS_Info &event_info);
-  virtual CORBA::ULong _decr_refcnt (void);
-  virtual CORBA::ULong _incr_refcnt (void);
+  virtual CORBA::ULong _decr_refcnt ();
+  virtual CORBA::ULong _incr_refcnt ();
 
 private:
   /// The event channel, used to locate the set of consumers.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 77bcb2af011..56ec593b2ea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -43,7 +43,7 @@ void
 TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event,
                           TAO_EC_QOS_Info& qos_info)
 {
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     this->parent ()->push (event, qos_info);
 }
 
@@ -51,17 +51,17 @@ void
 TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info)
 {
-  if (this->parent () != 0)
+  if (this->parent () != nullptr)
     this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
-TAO_EC_Type_Filter::clear (void)
+TAO_EC_Type_Filter::clear ()
 {
 }
 
 CORBA::ULong
-TAO_EC_Type_Filter::max_event_size (void) const
+TAO_EC_Type_Filter::max_event_size () const
 {
   return 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index 180d39815ef..4e50f2cc5ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -48,8 +48,8 @@ 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 CORBA::ULong max_event_size (void) const;
+  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,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 5068fd0edfc..553fdfb6c63 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -8,7 +8,7 @@ TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port)
 {
 }
 
-TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void)
+TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index ffe71480a01..51ab32225a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -40,7 +40,7 @@ public:
   TAO_EC_Simple_AddrServer (CORBA::UShort port);
 
   /// Destructor
-  virtual ~TAO_EC_Simple_AddrServer (void);
+  virtual ~TAO_EC_Simple_AddrServer ();
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index aaee3390c4a..3768edc213e 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -25,7 +25,7 @@ ACE_ConsumerQOS_Factory::
   qos_.dependencies.length (0);
 }
 
-ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory (void)
+ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory ()
 {
 }
 
@@ -72,7 +72,7 @@ ACE_ConsumerQOS_Factory::start_logical_and_group (int nchildren)
 }
 
 int
-ACE_ConsumerQOS_Factory::start_negation (void)
+ACE_ConsumerQOS_Factory::start_negation ()
 {
   int l = qos_.dependencies.length ();
   qos_.dependencies.length (l + 1);
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
index ce31c1afdaf..1b6671c5093 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
@@ -98,7 +98,7 @@ public:
                            CORBA::ULong qos_max_len = 0);
 
   /// Death and destruction.
-  ~ACE_ConsumerQOS_Factory (void);
+  ~ACE_ConsumerQOS_Factory ();
 
   /**
    * The Event Channel waits until all the children have accepted at
@@ -117,7 +117,7 @@ public:
 
   /// The consumer wants all the events *except* the group that
   /// follows.
-  int start_negation (void);
+  int start_negation ();
 
   /// Insert a bitmask filter, this acts as a quick rejection mechanism
   /// for the subsequent filters.
@@ -136,7 +136,7 @@ public:
                               CORBA::ULong type_value);
 
   /// Insert a node that accepts any event, useful for bitmask filters.
-  int insert_null_terminator (void);
+  int insert_null_terminator ();
 
   // = Insert operations add to the current conjunction or disjunction
   // group.  These return 0 on success, -1 on failure.  Before insert
@@ -179,10 +179,10 @@ public:
 
   /// Allows conversions to ConsumerQOS, which is expected by the
   /// PushSupplierProxy::connect_push_consumer interface.
-  const RtecEventChannelAdmin::ConsumerQOS &get_ConsumerQOS (void);
+  const RtecEventChannelAdmin::ConsumerQOS &get_ConsumerQOS ();
 
   /// Calls this->get_ConsumerQOS.
-  operator const RtecEventChannelAdmin::ConsumerQOS &(void);
+  operator const RtecEventChannelAdmin::ConsumerQOS &();
 
   static void debug (const RtecEventChannelAdmin::ConsumerQOS& qos);
 
@@ -224,10 +224,10 @@ public:
 
   /// Allows conversions to SupplierQOS, which is expected by the
   /// PushSupplierProxy::connect_push_supplier interface.
-  const RtecEventChannelAdmin::SupplierQOS &get_SupplierQOS (void);
+  const RtecEventChannelAdmin::SupplierQOS &get_SupplierQOS ();
 
   /// Calls this->get_SupplierQOS().
-  operator const RtecEventChannelAdmin::SupplierQOS &(void);
+  operator const RtecEventChannelAdmin::SupplierQOS &();
 
   static void debug (const RtecEventChannelAdmin::SupplierQOS& qos);
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index c0e3ab94736..f3203343855 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -15,13 +15,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TimeBase::TimeT
-TAO_FT_Request_Duration_Policy::request_duration_policy_value (void)
+TAO_FT_Request_Duration_Policy::request_duration_policy_value ()
 {
   return this->request_duration_;
 }
 
 CORBA::PolicyType
-TAO_FT_Request_Duration_Policy::policy_type (void)
+TAO_FT_Request_Duration_Policy::policy_type ()
 {
   return FT::REQUEST_DURATION_POLICY;
 }
@@ -43,7 +43,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val)
 }
 
 TAO_FT_Request_Duration_Policy *
-TAO_FT_Request_Duration_Policy::clone (void) const
+TAO_FT_Request_Duration_Policy::clone () const
 {
   TAO_FT_Request_Duration_Policy *copy = 0;
   ACE_NEW_RETURN (copy,
@@ -53,7 +53,7 @@ TAO_FT_Request_Duration_Policy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::copy (void)
+TAO_FT_Request_Duration_Policy::copy ()
 {
   TAO_FT_Request_Duration_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
@@ -64,7 +64,7 @@ TAO_FT_Request_Duration_Policy::copy (void)
 }
 
 void
-TAO_FT_Request_Duration_Policy::destroy (void)
+TAO_FT_Request_Duration_Policy::destroy ()
 {
 }
 
@@ -89,7 +89,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
 /*****************************************************************/
 
 FT::HeartbeatPolicyValue
-TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
+TAO_FT_Heart_Beat_Policy::heartbeat_policy_value ()
 {
   FT::HeartbeatPolicyValue val;
   val.heartbeat = this->heartbeat_;
@@ -120,14 +120,14 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Policy::policy_type (void)
+TAO_FT_Heart_Beat_Policy::policy_type ()
 {
   return FT::HEARTBEAT_POLICY;
 }
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::copy (void)
+TAO_FT_Heart_Beat_Policy::copy ()
 {
   TAO_FT_Heart_Beat_Policy * tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
@@ -138,7 +138,7 @@ TAO_FT_Heart_Beat_Policy::copy (void)
 }
 
 TAO_FT_Heart_Beat_Policy *
-TAO_FT_Heart_Beat_Policy::clone (void) const
+TAO_FT_Heart_Beat_Policy::clone () const
 {
   TAO_FT_Heart_Beat_Policy *copy = 0;
   ACE_NEW_RETURN (copy,
@@ -148,7 +148,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
 }
 
 void
-TAO_FT_Heart_Beat_Policy::destroy (void)
+TAO_FT_Heart_Beat_Policy::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index dda812b88b0..51faf3010a7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor (void)
+  FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor ()
     : name_ ("TAO_FT_ClientRequest_Interceptor")
       , uuid_ (0)
       , lock_ (0)
@@ -36,20 +36,20 @@ namespace TAO
 
   }
 
-  FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor (void)
+  FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor ()
   {
     delete this->uuid_;
     delete this->lock_;
   }
 
   char *
-  FT_ClientRequest_Interceptor::name (void)
+  FT_ClientRequest_Interceptor::name ()
   {
     return CORBA::string_dup (this->name_);
   }
 
   void
-  FT_ClientRequest_Interceptor::destroy (void)
+  FT_ClientRequest_Interceptor::destroy ()
   {
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 11844309254..51ec9ccd7ea 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -10,11 +10,11 @@ static bool initialized = false;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate (void)
+TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate ()
 {
 }
 
-TAO_FT_ClientService_Activate::~TAO_FT_ClientService_Activate (void)
+TAO_FT_ClientService_Activate::~TAO_FT_ClientService_Activate ()
 {
 }
 
@@ -35,7 +35,7 @@ TAO_FT_ClientService_Activate::activate_services (TAO_ORB_Core *orb_core)
 
 
 int
-TAO_FT_ClientService_Activate::Initializer (void)
+TAO_FT_ClientService_Activate::Initializer ()
 {
   if (initialized == false)
     {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index 10f9aa9c141..dc4a86e8883 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -4,12 +4,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void)
+TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory ()
   : ft_endpoint_selector_ (0)
 {
 }
 
-TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void)
+TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory ()
 {
   delete this->ft_endpoint_selector_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 638686d0048..9bd5d50ffe9 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -12,12 +12,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void)
+TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector ()
   : TAO_Default_Endpoint_Selector ()
 {
 }
 
-TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void)
+TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 75e3b09891d..195f5c2bdce 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -38,14 +38,14 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
 }
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
+TAO_FT_Heart_Beat_Enabled_Policy::policy_type ()
 {
   return FT::HEARTBEAT_ENABLED_POLICY;
 }
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::copy (void)
+TAO_FT_Heart_Beat_Enabled_Policy::copy ()
 {
   TAO_FT_Heart_Beat_Enabled_Policy * tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
@@ -56,7 +56,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::copy (void)
 }
 
 TAO_FT_Heart_Beat_Enabled_Policy *
-TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
+TAO_FT_Heart_Beat_Enabled_Policy::clone () const
 {
   TAO_FT_Heart_Beat_Enabled_Policy *copy = 0;
   ACE_NEW_RETURN (copy,
@@ -66,7 +66,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
 }
 
 void
-TAO_FT_Heart_Beat_Enabled_Policy::destroy (void)
+TAO_FT_Heart_Beat_Enabled_Policy::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 85e8eabfff0..4b62b30cb21 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor (void)
+  FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor ()
     : object_group_ref_version_ (0)
     , is_primary_ (false)
     , iogr_ (0)
@@ -20,18 +20,18 @@ namespace TAO
   {
   }
 
-  FT_ServerRequest_Interceptor::~FT_ServerRequest_Interceptor (void)
+  FT_ServerRequest_Interceptor::~FT_ServerRequest_Interceptor ()
   {
   }
 
   char *
-  FT_ServerRequest_Interceptor::name (void)
+  FT_ServerRequest_Interceptor::name ()
   {
     return CORBA::string_dup ("TAO_FT_ServerRequest_Interceptor");
   }
 
   void
-  FT_ServerRequest_Interceptor::destroy (void)
+  FT_ServerRequest_Interceptor::destroy ()
   {
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
index e48abf59844..06b3cd218b0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
@@ -9,16 +9,16 @@ static bool initialized = false;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate (void)
+TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate ()
 {
 }
 
-TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate (void)
+TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate ()
 {
 }
 
 int
-TAO_FT_ServerService_Activate::Initializer (void)
+TAO_FT_ServerService_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 e4ab0334684..2e87871cfb0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -19,7 +19,7 @@ TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *)
 {
 }
 
-TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks (void)
+TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks ()
 {
 }
 
@@ -325,7 +325,7 @@ TAO_FT_Service_Callbacks::restart_policy_check (
 }
 
 TimeBase::TimeT
-TAO_FT_Service_Callbacks::now (void)
+TAO_FT_Service_Callbacks::now ()
 {
   // Grab the localtime on the machine where this is running
   ACE_Time_Value time_val = ACE_OS::gettimeofday ();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index 2437068b3eb..0049477f82a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -18,18 +18,18 @@ FTRT_ClientORB_Interceptor (CORBA::Long transaction_depth)
 {
 }
 
-FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor (void)
+FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor ()
 {
 }
 
 char *
-FTRT_ClientORB_Interceptor::name (void)
+FTRT_ClientORB_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-FTRT_ClientORB_Interceptor::destroy (void)
+FTRT_ClientORB_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index 0e9e8568433..19d68d23691 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -10,11 +10,11 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRT {
-  FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void)
+  FTRT_ClientORB_Loader::FTRT_ClientORB_Loader ()
   {
   }
 
-  FTRT_ClientORB_Loader::~FTRT_ClientORB_Loader (void)
+  FTRT_ClientORB_Loader::~FTRT_ClientORB_Loader ()
   {
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index 80a00b4b270..9d2b52cebc4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -24,17 +24,17 @@ AMI_Primary_Replication_Strategy::~AMI_Primary_Replication_Strategy()
     this->wait();
 }
 
-int  AMI_Primary_Replication_Strategy::acquire_read (void)
+int  AMI_Primary_Replication_Strategy::acquire_read ()
 {
   return mutex_ ? mutex_->acquire_read() : 0;
 }
 
-int  AMI_Primary_Replication_Strategy::acquire_write (void)
+int  AMI_Primary_Replication_Strategy::acquire_write ()
 {
   return mutex_ ? mutex_->acquire_write() : 0;
 }
 
-int  AMI_Primary_Replication_Strategy::release (void)
+int  AMI_Primary_Replication_Strategy::release ()
 {
   return  mutex_ ? mutex_->release() : 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index 8a8416ab398..7ebb7de55a9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -38,23 +38,23 @@ AMI_Replication_Strategy::make_primary_strategy()
 {
   AMI_Primary_Replication_Strategy* result;
   ACE_NEW_RETURN(result, AMI_Primary_Replication_Strategy(mt_), 0);
-  auto_ptr<AMI_Primary_Replication_Strategy> holder(result);
+  std::unique_ptr<AMI_Primary_Replication_Strategy> holder(result);
   if (result->activate() == 0)
     return holder.release();
   return 0;
 }
 
-int  AMI_Replication_Strategy::acquire_read (void)
+int  AMI_Replication_Strategy::acquire_read ()
 {
   return 0;
 }
 
-int  AMI_Replication_Strategy::acquire_write (void)
+int  AMI_Replication_Strategy::acquire_write ()
 {
   return 0;
 }
 
-int  AMI_Replication_Strategy::release (void)
+int  AMI_Replication_Strategy::release ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 4c9a470ec4c..7c8551d649b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -21,7 +21,7 @@ Basic_Replication_Strategy::~Basic_Replication_Strategy()
 }
 
 void
-Basic_Replication_Strategy::check_validity(void)
+Basic_Replication_Strategy::check_validity()
 {
     FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number();
 
@@ -118,17 +118,17 @@ Basic_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
   } while (!finished);
 }
 
-int  Basic_Replication_Strategy::acquire_read (void)
+int  Basic_Replication_Strategy::acquire_read ()
 {
   return mutex_ ? mutex_->acquire_read() : 0;
 }
 
-int  Basic_Replication_Strategy::acquire_write (void)
+int  Basic_Replication_Strategy::acquire_write ()
 {
   return mutex_ ? mutex_->acquire_write() : 0;
 }
 
-int  Basic_Replication_Strategy::release (void)
+int  Basic_Replication_Strategy::release ()
 {
   return mutex_ ? mutex_->release() : 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index 2fe7edd1eaa..d41ed665aed 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -17,12 +17,12 @@ TAO_FTEC_ConsumerAdmin::TAO_FTEC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec)
 {
 }
 
-TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void)
+TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin ()
 {
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void)
+TAO_FTEC_ConsumerAdmin::obtain_push_supplier ()
 {
   ORBSVCS_DEBUG((LM_DEBUG,"obtain_push_supplier\n" ));
   return obtain_proxy();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index 3ed1b7628f0..a0d88dd93f7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -148,13 +148,13 @@ void TAO_FTEC_Event_Channel::oneway_set_update (
 
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_FTEC_Event_Channel::for_consumers (void)
+TAO_FTEC_Event_Channel::for_consumers ()
 {
     return ec_impl_->for_consumers();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_FTEC_Event_Channel::for_suppliers (void)
+TAO_FTEC_Event_Channel::for_suppliers ()
 {
     return ec_impl_->for_suppliers();
 }
@@ -168,7 +168,7 @@ TAO_FTEC_Event_Channel::set_state (const FTRT::State & s)
 }
 
 void
-TAO_FTEC_Event_Channel::destroy (void)
+TAO_FTEC_Event_Channel::destroy ()
 {
   if (Fault_Detector::instance())
     Fault_Detector::instance()->stop();
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 66f7793c896..1a346c32385 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -226,7 +226,7 @@ TAO_FTEC_Event_Channel_Impl::activate_object (
 /// The default implementation is:
 ///    this->consumer_admin ()->_this ();
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_FTEC_Event_Channel_Impl::for_consumers (void)
+TAO_FTEC_Event_Channel_Impl::for_consumers ()
 {
   CORBA::Object_var obj = consumer_admin()->reference();
   obj = IOGR_Maker::instance()->forge_iogr(obj.in());
@@ -237,7 +237,7 @@ TAO_FTEC_Event_Channel_Impl::for_consumers (void)
 /// The default implementation is:
 ///    this->supplier_admin ()->_this ();
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_FTEC_Event_Channel_Impl::for_suppliers (void)
+TAO_FTEC_Event_Channel_Impl::for_suppliers ()
 {
   CORBA::Object_var obj = supplier_admin()->reference();
   obj = IOGR_Maker::instance()->forge_iogr(obj.in());
@@ -419,14 +419,14 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s)
 }
 
 
-TAO_FTEC_ConsumerAdmin* TAO_FTEC_Event_Channel_Impl::consumer_admin (void) const
+TAO_FTEC_ConsumerAdmin* TAO_FTEC_Event_Channel_Impl::consumer_admin () const
 {
   return static_cast<TAO_FTEC_ConsumerAdmin*> (TAO_EC_Event_Channel_Base::consumer_admin());
 }
 
 /// Access the supplier admin implementation, useful for controlling
 /// the activation...
-TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin (void) const
+TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin () const
 {
   return static_cast<TAO_FTEC_SupplierAdmin*> (TAO_EC_Event_Channel_Base::supplier_admin());
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
index 6056a120fe9..90d4d1f2071 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void)
+TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index f1c24c01f4d..9e559b2fa09 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -116,7 +116,7 @@ void TAO_FTEC_Group_Manager::add_member (
   TAO_FTRTEC::Log(1, ACE_TEXT("add_member location = <%s>\n"),
     (const char*)info.the_location[0].id);
 
-  auto_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl);
+  std::unique_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl);
 
   new_impl->my_position = impl_->my_position;
   size_t pos = impl_->info_list.length();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 6701e3ad7cd..62577d767b0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -68,7 +68,7 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
   }
 }
 
-void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void)
+void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer ()
 {
   if (Request_Context_Repository().is_executed_request())
     return;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 34b5848c15b..c962ed0542a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -70,7 +70,7 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
+void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier ()
 {
   if (Request_Context_Repository().is_executed_request())
     return;
@@ -88,7 +88,7 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
+void TAO_FTEC_ProxyPushSupplier::suspend_connection ()
 {
   if (Request_Context_Repository().is_executed_request())
     return;
@@ -113,7 +113,7 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
   }
 }
 
-void TAO_FTEC_ProxyPushSupplier::resume_connection (void)
+void TAO_FTEC_ProxyPushSupplier::resume_connection ()
 {
   if (Request_Context_Repository().is_executed_request())
     return;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index 0240e85014c..f8a274de7fb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -21,7 +21,7 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin()
 
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_FTEC_SupplierAdmin::obtain_push_consumer (void)
+TAO_FTEC_SupplierAdmin::obtain_push_consumer ()
 {
   return obtain_proxy();
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index e8f4ae86d5f..5ee21412e22 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -26,14 +26,14 @@ FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid)
 
 
 const FtRtecEventComm::ObjectId&
-FT_ProxyAdmin_Base::object_id(void) const
+FT_ProxyAdmin_Base::object_id() const
 {
   return object_id_;
 }
 
 
 CORBA::Object_var
-FT_ProxyAdmin_Base::reference(void) const
+FT_ProxyAdmin_Base::reference() const
 {
   return poa_->servant_to_reference(servant_);
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
index 8f04f5d83be..909cc006159 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
@@ -11,7 +11,7 @@ Fault_Detector::ReactorTask::ReactorTask()
 }
 
 int
-Fault_Detector::ReactorTask::svc (void)
+Fault_Detector::ReactorTask::svc ()
 {
   this->reactor_.owner(ACE_OS::thr_self());
   this->reactor_.run_reactor_event_loop();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 7485754612d..8cddd9bcb50 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -18,11 +18,11 @@ namespace FTRTEC {
     ACE_SOCK_Connector, ConnectionDetectHandler<ACE_SOCK_STREAM> >
     TCP_Fault_Detector;
 
-  Fault_Detector_Loader::Fault_Detector_Loader (void)
+  Fault_Detector_Loader::Fault_Detector_Loader ()
   {
   }
 
-  Fault_Detector_Loader::~Fault_Detector_Loader (void)
+  Fault_Detector_Loader::~Fault_Detector_Loader ()
   {
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index 788a65217af..7a7ea02de09 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -67,12 +67,12 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor()
 {
 }
 
-char * ForwardCtrlServerInterceptor::name (void)
+char * ForwardCtrlServerInterceptor::name ()
 {
   return CORBA::string_dup("ForwardCtrlServerInterceptor");
 }
 
-void ForwardCtrlServerInterceptor::destroy (void)
+void ForwardCtrlServerInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index 8796c03aca0..aa5763720eb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -180,13 +180,13 @@ FtEventServiceInterceptor::instance()
 }
 
 char *
-FtEventServiceInterceptor::name (void)
+FtEventServiceInterceptor::name ()
 {
   return CORBA::string_dup ("FtEventServiceInterceptor");
 }
 
 void
-FtEventServiceInterceptor::destroy (void)
+FtEventServiceInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
index 97c83c66083..715f06ede3b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -21,7 +21,7 @@ ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *)
 {
 }
 
-void ObjectGroupManagerHandler::create_group (void)
+void ObjectGroupManagerHandler::create_group ()
 {
 }
 
@@ -32,7 +32,7 @@ ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *)
 }
 
 void
-ObjectGroupManagerHandler::add_member (void)
+ObjectGroupManagerHandler::add_member ()
 {
   if (--num_backups_ ==0)
     evt_.signal();
@@ -45,7 +45,7 @@ ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *)
 }
 
 void
-ObjectGroupManagerHandler::set_state (void)
+ObjectGroupManagerHandler::set_state ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 39678d4f533..8835c3a1bce 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -38,7 +38,7 @@ public:
   virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder);
 private:
   ACE_Auto_Event& evt_;
-  ACE_Atomic_Op< TAO_SYNCH_MUTEX, int > num_backups_;
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> num_backups_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index 9f43f278154..52656b42fba 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace FTRTEC
 {
   namespace {
-    auto_ptr<Replication_Strategy> replication_strategy;
+    std::unique_ptr<Replication_Strategy> replication_strategy;
     int threads = 1;
     Replication_Service* service;
   }
@@ -108,7 +108,7 @@ namespace FTRTEC
     }
   }
 
-  void Replication_Service::check_validity(void)
+  void Replication_Service::check_validity()
   {
     replication_strategy->check_validity();
   }
@@ -152,21 +152,21 @@ namespace FTRTEC
     replication_strategy->add_member(info, object_group_ref_version);
   }
 
-  int  Replication_Service::acquire_read (void)
+  int  Replication_Service::acquire_read ()
   {
     int r =  replication_strategy->acquire_read();
     TAO_FTRTEC::Log(3, ACE_TEXT("Read Lock acquired %d\n"), r);
     return r;
   }
 
-  int  Replication_Service::acquire_write (void)
+  int  Replication_Service::acquire_write ()
   {
     int r= replication_strategy->acquire_write();
     TAO_FTRTEC::Log(3, ACE_TEXT("Write Lock acqured %d\n"), r);
     return r;
   }
 
-  int  Replication_Service::release (void)
+  int  Replication_Service::release ()
   {
     int r= replication_strategy->release();
     TAO_FTRTEC::Log(3, ACE_TEXT("Lock Released %d\n"), r);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
index f6c0611358a..c6879652d91 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -14,7 +14,7 @@ Replication_Strategy::~Replication_Strategy()
 
 
 void
-Replication_Strategy::check_validity(void)
+Replication_Strategy::check_validity()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index 29abc223232..f146aa999f0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -80,7 +80,7 @@ get_object_id(CORBA::Any_var a)
 
 
 FtRtecEventChannelAdmin::ObjectId_var
-Request_Context_Repository::get_object_id(void)
+Request_Context_Repository::get_object_id()
 {
   /*
   PortableInterceptor::Current_var pic =
@@ -117,7 +117,7 @@ Request_Context_Repository::set_cached_result(
 }
 
 CORBA::Any_ptr
-Request_Context_Repository::get_cached_result(void)
+Request_Context_Repository::get_cached_result()
 {
   PortableInterceptor::Current_var pic =
     resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
@@ -167,7 +167,7 @@ Request_Context_Repository::set_sequence_number(
 
 
 FTRT::SequenceNumber
-Request_Context_Repository::get_sequence_number(void)
+Request_Context_Repository::get_sequence_number()
 {
   PortableInterceptor::Current_var pic =
     resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 908c7de402c..9866af127a9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -12,18 +12,18 @@ TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor ()
 {
 }
 
-TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void)
+TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor ()
 {
 }
 
 char *
-TAO_Set_Update_Interceptor::name (void)
+TAO_Set_Update_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-TAO_Set_Update_Interceptor::destroy (void)
+TAO_Set_Update_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 80a774bfcd4..c2d71044d19 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -21,7 +21,7 @@ public:
   ~FTEC_Gateway_ConsumerAdmin();
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void);
+      obtain_push_supplier ();
   FTEC_Gateway_Impl* impl_;
 };
 
@@ -33,7 +33,7 @@ public:
   ~FTEC_Gateway_SupplierAdmin();
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void);
+      obtain_push_consumer ();
   FTEC_Gateway_Impl* impl_;
 };
 
@@ -47,9 +47,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 ();
   FTEC_Gateway_Impl* impl_;
 };
 
@@ -65,7 +65,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 ();
 
   FTEC_Gateway_Impl* impl_;
 };
@@ -75,7 +75,7 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler
 public:
   PushConsumerHandler();
   ~PushConsumerHandler();
-  virtual void push (void);
+  virtual void push ();
 
   virtual void push_excep (::Messaging::ExceptionHolder * excep_holder);
 };
@@ -91,7 +91,7 @@ public:
   }
 private:
   Interceptor_Destoryer();
-  inline void do_it(void) {
+  inline void do_it() {
     destroy_interceptors();
   };
 };
@@ -210,19 +210,19 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa)
 
 //= The RtecEventChannelAdmin::EventChannel methods
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-FTEC_Gateway::for_consumers (void)
+FTEC_Gateway::for_consumers ()
 {
   return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in());
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-FTEC_Gateway::for_suppliers (void)
+FTEC_Gateway::for_suppliers ()
 {
   ORBSVCS_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n"));
   return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in());
 }
 
-void FTEC_Gateway::destroy (void)
+void FTEC_Gateway::destroy ()
 {
   impl_->ftec->destroy();
 }
@@ -262,7 +262,7 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin()
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void)
+FTEC_Gateway_ConsumerAdmin::obtain_push_supplier ()
 {
 
   FtRtecEventComm::ObjectId** remote_proxy_oid_ptr;
@@ -292,7 +292,7 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin()
 
 // = The RtecEventChannelAdmin::SupplierAdmin methods...
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void)
+FTEC_Gateway_SupplierAdmin::obtain_push_consumer ()
 {
   FtRtecEventComm::ObjectId** remote_proxy_oid_ptr;
   ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY());
@@ -347,7 +347,7 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer (
   *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos);
 }
 
-void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void)
+void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier ()
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   impl_->ftec->disconnect_push_supplier(**oid_ptr);
@@ -355,13 +355,13 @@ void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void)
   delete oid_ptr;
 }
 
-void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void)
+void FTEC_Gateway_ProxyPushSupplier::suspend_connection ()
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   impl_->ftec->suspend_push_supplier(**oid_ptr);
 }
 
-void FTEC_Gateway_ProxyPushSupplier::resume_connection (void)
+void FTEC_Gateway_ProxyPushSupplier::resume_connection ()
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   impl_->ftec->resume_push_supplier(**oid_ptr);
@@ -405,7 +405,7 @@ void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier (
   *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos);
 }
 
-void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void)
+void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer ()
 {
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
   impl_->ftec->disconnect_push_consumer(**oid_ptr);
@@ -421,7 +421,7 @@ PushConsumerHandler::~PushConsumerHandler()
 {
 }
 
-void PushConsumerHandler::push (void)
+void PushConsumerHandler::push ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index bf379827c0a..278cae08786 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -40,7 +40,7 @@ TAO::HTIOP::Acceptor::Acceptor (ACE::HTBP::Environment *ht_env,
 {
 }
 
-TAO::HTIOP::Acceptor::~Acceptor (void)
+TAO::HTIOP::Acceptor::~Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -246,7 +246,7 @@ TAO::HTIOP::Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO::HTIOP::Acceptor::close (void)
+TAO::HTIOP::Acceptor::close ()
 {
   return this->base_acceptor_.close ();
 }
@@ -743,7 +743,7 @@ TAO::HTIOP::Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
 }
 
 CORBA::ULong
-TAO::HTIOP::Acceptor::endpoint_count (void)
+TAO::HTIOP::Acceptor::endpoint_count ()
 {
   return this->endpoint_count_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
index ff8a07a0be6..b5e35eedf77 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
@@ -44,7 +44,7 @@ TAO::HTIOP::Completion_Handler::Completion_Handler (TAO_ORB_Core *orb_core,
 }
 
 
-TAO::HTIOP::Completion_Handler::~Completion_Handler (void)
+TAO::HTIOP::Completion_Handler::~Completion_Handler ()
 {
   delete this->creation_strategy_;
   delete this->concurrency_strategy_;
@@ -66,7 +66,7 @@ TAO::HTIOP::Completion_Handler::open (void*)
 }
 
 int
-TAO::HTIOP::Completion_Handler::resume_handler (void)
+TAO::HTIOP::Completion_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index 1917da10b24..de51d760b7e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -47,7 +47,7 @@ TAO::HTIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core)
   this->transport (specific_transport);
 }
 
-TAO::HTIOP::Connection_Handler::~Connection_Handler (void)
+TAO::HTIOP::Connection_Handler::~Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -141,13 +141,13 @@ TAO::HTIOP::Connection_Handler::open (void*)
 }
 
 int
-TAO::HTIOP::Connection_Handler::resume_handler (void)
+TAO::HTIOP::Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO::HTIOP::Connection_Handler::close_connection (void)
+TAO::HTIOP::Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -208,14 +208,14 @@ TAO::HTIOP::Connection_Handler::close (u_long)
 }
 
 int
-TAO::HTIOP::Connection_Handler::release_os_resources (void)
+TAO::HTIOP::Connection_Handler::release_os_resources ()
 {
   int result = this->peer().close ();
   return result;
 }
 
 int
-TAO::HTIOP::Connection_Handler::add_transport_to_cache (void)
+TAO::HTIOP::Connection_Handler::add_transport_to_cache ()
 {
   ACE::HTBP::Addr addr;
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index e513b06caea..abe63a47620 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -29,7 +29,7 @@ TAO::HTIOP::Connector::Connector (ACE::HTBP::Environment *ht_env)
 {
 }
 
-TAO::HTIOP::Connector::~Connector (void)
+TAO::HTIOP::Connector::~Connector ()
 {
 }
 
@@ -59,7 +59,7 @@ TAO::HTIOP::Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO::HTIOP::Connector::close (void)
+TAO::HTIOP::Connector::close ()
 {
   delete this->concurrency_strategy_;
   delete this->connect_creation_strategy_;
@@ -341,7 +341,7 @@ TAO::HTIOP::Connector::create_profile (TAO_InputCDR& cdr)
  * @brief Create a profile with a given endpoint.
  */
 TAO_Profile *
-TAO::HTIOP::Connector::make_profile (void)
+TAO::HTIOP::Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -385,7 +385,7 @@ TAO::HTIOP::Connector::check_prefix (const char *endpoint)
 }
 
 char
-TAO::HTIOP::Connector::object_key_delimiter (void) const
+TAO::HTIOP::Connector::object_key_delimiter () const
 {
   return TAO::HTIOP::Profile::object_key_delimiter_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
index f54168e2603..88b96524ac9 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
@@ -44,7 +44,7 @@ TAO::HTIOP::Endpoint::Endpoint (const char *host,
     this->htid_ = htid;
 }
 
-TAO::HTIOP::Endpoint::Endpoint (void)
+TAO::HTIOP::Endpoint::Endpoint ()
   : TAO_Endpoint (OCI_TAG_HTIOP_PROFILE),
     host_ (),
     port_ (0),
@@ -72,7 +72,7 @@ TAO::HTIOP::Endpoint::Endpoint (const char *host,
     this->htid_ = htid;
 }
 
-TAO::HTIOP::Endpoint::~Endpoint (void)
+TAO::HTIOP::Endpoint::~Endpoint ()
 {
 }
 
@@ -150,7 +150,7 @@ TAO::HTIOP::Endpoint::htid (const char *h)
 }
 
 void
-TAO::HTIOP::Endpoint::reset_hint (void)
+TAO::HTIOP::Endpoint::reset_hint ()
 {
   // Commented out for the time being....
   /*  if (this->hint_)
@@ -158,13 +158,13 @@ TAO::HTIOP::Endpoint::reset_hint (void)
 }
 
 TAO_Endpoint *
-TAO::HTIOP::Endpoint::next (void)
+TAO::HTIOP::Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO::HTIOP::Endpoint::duplicate (void)
+TAO::HTIOP::Endpoint::duplicate ()
 {
   // @@ Bala, we probably need to make sure that the duplicate has the
   // same priority as the original.  Although it does not matter in
@@ -204,7 +204,7 @@ TAO::HTIOP::Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO::HTIOP::Endpoint::hash (void)
+TAO::HTIOP::Endpoint::hash ()
 {
   if (this->htid_.in() && ACE_OS::strlen (this->htid_.in()))
     return ACE::hash_pjw(this->htid_.in());
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
index 443def1b352..b929bcc2a9b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
@@ -12,14 +12,14 @@ static const char the_prefix[] = "htiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::HTIOP::Protocol_Factory::Protocol_Factory (void)
+TAO::HTIOP::Protocol_Factory::Protocol_Factory ()
   :  TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE),
      ht_env_ (0),
      inside_ (-1)
 {
 }
 
-TAO::HTIOP::Protocol_Factory::~Protocol_Factory (void)
+TAO::HTIOP::Protocol_Factory::~Protocol_Factory ()
 {
   delete this->ht_env_;
 }
@@ -32,13 +32,13 @@ TAO::HTIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix)
 }
 
 const char *
-TAO::HTIOP::Protocol_Factory::prefix (void) const
+TAO::HTIOP::Protocol_Factory::prefix () const
 {
   return ::the_prefix;
 }
 
 char
-TAO::HTIOP::Protocol_Factory::options_delimiter (void) const
+TAO::HTIOP::Protocol_Factory::options_delimiter () const
 {
   return '/';
 }
@@ -111,7 +111,7 @@ TAO::HTIOP::Protocol_Factory::init (int argc,
 }
 
 TAO_Acceptor *
-TAO::HTIOP::Protocol_Factory::make_acceptor (void)
+TAO::HTIOP::Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -123,7 +123,7 @@ TAO::HTIOP::Protocol_Factory::make_acceptor (void)
 }
 
 TAO_Connector *
-TAO::HTIOP::Protocol_Factory::make_connector (void)
+TAO::HTIOP::Protocol_Factory::make_connector ()
 {
   TAO_Connector *connector = 0;
   ACE_NEW_RETURN (connector,
@@ -133,7 +133,7 @@ TAO::HTIOP::Protocol_Factory::make_connector (void)
 }
 
 int
-TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint (void) const
+TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint () const
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index ab4e94d9819..5d17a0de8d2 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 const char TAO::HTIOP::Profile::object_key_delimiter_ = '/';
 
 char
-TAO::HTIOP::Profile::object_key_delimiter (void) const
+TAO::HTIOP::Profile::object_key_delimiter () const
 {
   return TAO::HTIOP::Profile::object_key_delimiter_;
 }
@@ -63,7 +63,7 @@ TAO::HTIOP::Profile::Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO::HTIOP::Profile::~Profile (void)
+TAO::HTIOP::Profile::~Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -258,13 +258,13 @@ TAO::HTIOP::Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO::HTIOP::Profile::endpoint (void)
+TAO::HTIOP::Profile::endpoint ()
 {
   return &this->endpoint_;
 }
 
 CORBA::ULong
-TAO::HTIOP::Profile::endpoint_count (void) const
+TAO::HTIOP::Profile::endpoint_count () const
 {
   return this->count_;
 }
@@ -279,7 +279,7 @@ TAO::HTIOP::Profile::add_endpoint (TAO::HTIOP::Endpoint *endp)
 }
 
 char *
-TAO::HTIOP::Profile::to_string (void) const
+TAO::HTIOP::Profile::to_string () const
 {
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
@@ -319,7 +319,7 @@ TAO::HTIOP::Profile::to_string (void) const
 
 
 const char *
-TAO::HTIOP::Profile::prefix (void)
+TAO::HTIOP::Profile::prefix ()
 {
   return ::the_prefix;
 }
@@ -413,7 +413,7 @@ TAO::HTIOP::Profile::encode_endpoints ()
 }
 
 int
-TAO::HTIOP::Profile::decode_endpoints (void)
+TAO::HTIOP::Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index 1f0ec2faa71..296db0bad23 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -30,18 +30,18 @@ TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h,
 {
 }
 
-TAO::HTIOP::Transport::~Transport (void)
+TAO::HTIOP::Transport::~Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO::HTIOP::Transport::event_handler_i (void)
+TAO::HTIOP::Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO::HTIOP::Transport::connection_handler_i (void)
+TAO::HTIOP::Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -106,7 +106,7 @@ TAO::HTIOP::Transport::recv (char *buf,
 }
 
 int
-TAO::HTIOP::Transport::register_handler (void)
+TAO::HTIOP::Transport::register_handler ()
 {
   if (TAO_debug_level > 4)
     {
@@ -355,7 +355,7 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list,
 
 
 TAO_Connection_Handler *
-TAO::HTIOP::Transport::invalidate_event_handler_i (void)
+TAO::HTIOP::Transport::invalidate_event_handler_i ()
 {
   TAO_Connection_Handler * eh = this->connection_handler_;
   this->connection_handler_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index c08eb8ef809..0ed392a3d0b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -12,12 +12,12 @@ TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void)
+TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_AbstractInterfaceDef_i::def_kind (void)
+TAO_AbstractInterfaceDef_i::def_kind ()
 {
   return CORBA::dk_AbstractInterface;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 9a581fe1c5a..283253def36 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -14,18 +14,18 @@ TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_AliasDef_i::~TAO_AliasDef_i (void)
+TAO_AliasDef_i::~TAO_AliasDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_AliasDef_i::def_kind (void)
+TAO_AliasDef_i::def_kind ()
 {
   return CORBA::dk_Alias;
 }
 
 CORBA::TypeCode_ptr
-TAO_AliasDef_i::type (void)
+TAO_AliasDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -35,7 +35,7 @@ TAO_AliasDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_AliasDef_i::type_i (void)
+TAO_AliasDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -68,7 +68,7 @@ TAO_AliasDef_i::type_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_AliasDef_i::original_type_def (void)
+TAO_AliasDef_i::original_type_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -78,7 +78,7 @@ TAO_AliasDef_i::original_type_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_AliasDef_i::original_type_def_i (void)
+TAO_AliasDef_i::original_type_def_i ()
 {
   ACE_TString original_type;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index 7c685d9fc06..c31a73f0ba7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -12,18 +12,18 @@ TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ArrayDef_i::~TAO_ArrayDef_i (void)
+TAO_ArrayDef_i::~TAO_ArrayDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ArrayDef_i::def_kind (void)
+TAO_ArrayDef_i::def_kind ()
 {
   return CORBA::dk_Array;
 }
 
 void
-TAO_ArrayDef_i::destroy (void)
+TAO_ArrayDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -33,7 +33,7 @@ TAO_ArrayDef_i::destroy (void)
 }
 
 void
-TAO_ArrayDef_i::destroy_i (void)
+TAO_ArrayDef_i::destroy_i ()
 {
   // Only if it is (w)string, fixed, array or sequence.
   this->destroy_element_type ();
@@ -49,7 +49,7 @@ TAO_ArrayDef_i::destroy_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::type (void)
+TAO_ArrayDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -59,7 +59,7 @@ TAO_ArrayDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::type_i (void)
+TAO_ArrayDef_i::type_i ()
 {
   // Store the current array's section key.
   ACE_Configuration_Section_Key
@@ -83,7 +83,7 @@ TAO_ArrayDef_i::type_i (void)
 }
 
 CORBA::ULong
-TAO_ArrayDef_i::length (void)
+TAO_ArrayDef_i::length ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -93,7 +93,7 @@ TAO_ArrayDef_i::length (void)
 }
 
 CORBA::ULong
-TAO_ArrayDef_i::length_i (void)
+TAO_ArrayDef_i::length_i ()
 {
   u_int length = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -122,7 +122,7 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length)
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::element_type (void)
+TAO_ArrayDef_i::element_type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -132,7 +132,7 @@ TAO_ArrayDef_i::element_type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::element_type_i (void)
+TAO_ArrayDef_i::element_type_i ()
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -146,7 +146,7 @@ TAO_ArrayDef_i::element_type_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_ArrayDef_i::element_type_def (void)
+TAO_ArrayDef_i::element_type_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -156,7 +156,7 @@ TAO_ArrayDef_i::element_type_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_ArrayDef_i::element_type_def_i (void)
+TAO_ArrayDef_i::element_type_def_i ()
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 6f56fed7bc1..dbddc089e7d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -14,18 +14,18 @@ TAO_AttributeDef_i::TAO_AttributeDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_AttributeDef_i::~TAO_AttributeDef_i (void)
+TAO_AttributeDef_i::~TAO_AttributeDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_AttributeDef_i::def_kind (void)
+TAO_AttributeDef_i::def_kind ()
 {
   return CORBA::dk_Attribute;
 }
 
 CORBA::Contained::Description *
-TAO_AttributeDef_i::describe (void)
+TAO_AttributeDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -35,7 +35,7 @@ TAO_AttributeDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_AttributeDef_i::describe_i (void)
+TAO_AttributeDef_i::describe_i ()
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -58,7 +58,7 @@ TAO_AttributeDef_i::describe_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type (void)
+TAO_AttributeDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -68,7 +68,7 @@ TAO_AttributeDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type_i (void)
+TAO_AttributeDef_i::type_i ()
 {
   ACE_TString type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -83,7 +83,7 @@ TAO_AttributeDef_i::type_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_AttributeDef_i::type_def (void)
+TAO_AttributeDef_i::type_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -93,7 +93,7 @@ TAO_AttributeDef_i::type_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_AttributeDef_i::type_def_i (void)
+TAO_AttributeDef_i::type_def_i ()
 {
   ACE_TString type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -131,7 +131,7 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def)
 }
 
 CORBA::AttributeMode
-TAO_AttributeDef_i::mode (void)
+TAO_AttributeDef_i::mode ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL);
 
@@ -141,7 +141,7 @@ TAO_AttributeDef_i::mode (void)
 }
 
 CORBA::AttributeMode
-TAO_AttributeDef_i::mode_i (void)
+TAO_AttributeDef_i::mode_i ()
 {
   u_int mode = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -192,7 +192,7 @@ TAO_AttributeDef_i::make_description (
 }
 
 CORBA::ExceptionDefSeq *
-TAO_AttributeDef_i::get_exceptions (void)
+TAO_AttributeDef_i::get_exceptions ()
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
   int index = 0;
@@ -263,7 +263,7 @@ TAO_AttributeDef_i::get_exceptions (void)
 }
 
 CORBA::ExceptionDefSeq *
-TAO_AttributeDef_i::put_exceptions (void)
+TAO_AttributeDef_i::put_exceptions ()
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
   int index = 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index fb5870084af..196bacc8492 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -17,7 +17,7 @@ TAO_ComponentContainer_i::TAO_ComponentContainer_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ComponentContainer_i::~TAO_ComponentContainer_i (void)
+TAO_ComponentContainer_i::~TAO_ComponentContainer_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index 783a6093cab..6f41666db3f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -69,18 +69,18 @@ TAO_ComponentDef_i::TAO_ComponentDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ComponentDef_i::~TAO_ComponentDef_i (void)
+TAO_ComponentDef_i::~TAO_ComponentDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ComponentDef_i::def_kind (void)
+TAO_ComponentDef_i::def_kind ()
 {
   return CORBA::dk_Component;
 }
 
 void
-TAO_ComponentDef_i::destroy (void)
+TAO_ComponentDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -90,7 +90,7 @@ TAO_ComponentDef_i::destroy (void)
 }
 
 void
-TAO_ComponentDef_i::destroy_i (void)
+TAO_ComponentDef_i::destroy_i ()
 {
   // Destroy our special subsections first, then call destroy_i
   // on our base class.
@@ -129,7 +129,7 @@ TAO_ComponentDef_i::destroy_i (void)
 }
 
 CORBA::Contained::Description *
-TAO_ComponentDef_i::describe (void)
+TAO_ComponentDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -139,7 +139,7 @@ TAO_ComponentDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_ComponentDef_i::describe_i (void)
+TAO_ComponentDef_i::describe_i ()
 {
   CORBA::ComponentIR::ComponentDescription cd;
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::ComponentDescription,
@@ -278,7 +278,7 @@ TAO_ComponentDef_i::describe_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ComponentDef_i::type (void)
+TAO_ComponentDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -288,7 +288,7 @@ TAO_ComponentDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ComponentDef_i::type_i (void)
+TAO_ComponentDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -307,7 +307,7 @@ TAO_ComponentDef_i::type_i (void)
 }
 
 CORBA::InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces (void)
+TAO_ComponentDef_i::supported_interfaces ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -317,7 +317,7 @@ TAO_ComponentDef_i::supported_interfaces (void)
 }
 
 CORBA::InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces_i (void)
+TAO_ComponentDef_i::supported_interfaces_i ()
 {
   CORBA::InterfaceDefSeq *seq = 0;
   ACE_NEW_RETURN (seq,
@@ -421,7 +421,7 @@ TAO_ComponentDef_i::supported_interfaces_i (
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-TAO_ComponentDef_i::base_component (void)
+TAO_ComponentDef_i::base_component ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
@@ -431,7 +431,7 @@ TAO_ComponentDef_i::base_component (void)
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-TAO_ComponentDef_i::base_component_i (void)
+TAO_ComponentDef_i::base_component_i ()
 {
   ACE_TString base_path;
   int status =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
index 63c10e9dc3e..2e7937885b0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
@@ -9,7 +9,7 @@ TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i (void)
+TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index 7e6bd0996b3..c980d2b422e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -27,7 +27,7 @@ TAO_ComponentRepository_i::TAO_ComponentRepository_i (
 {
 }
 
-TAO_ComponentRepository_i::~TAO_ComponentRepository_i (void)
+TAO_ComponentRepository_i::~TAO_ComponentRepository_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index f91f727f4ba..168af593a08 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -16,18 +16,18 @@ TAO_ConstantDef_i::TAO_ConstantDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ConstantDef_i::~TAO_ConstantDef_i (void)
+TAO_ConstantDef_i::~TAO_ConstantDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ConstantDef_i::def_kind (void)
+TAO_ConstantDef_i::def_kind ()
 {
   return CORBA::dk_Constant;
 }
 
 CORBA::Contained::Description *
-TAO_ConstantDef_i::describe (void)
+TAO_ConstantDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -37,7 +37,7 @@ TAO_ConstantDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_ConstantDef_i::describe_i (void)
+TAO_ConstantDef_i::describe_i ()
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -73,7 +73,7 @@ TAO_ConstantDef_i::describe_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ConstantDef_i::type (void)
+TAO_ConstantDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -83,7 +83,7 @@ TAO_ConstantDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ConstantDef_i::type_i (void)
+TAO_ConstantDef_i::type_i ()
 {
   ACE_TString type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -97,7 +97,7 @@ TAO_ConstantDef_i::type_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_ConstantDef_i::type_def (void)
+TAO_ConstantDef_i::type_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -107,7 +107,7 @@ TAO_ConstantDef_i::type_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_ConstantDef_i::type_def_i (void)
+TAO_ConstantDef_i::type_def_i ()
 {
   ACE_TString type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -142,7 +142,7 @@ TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def)
 }
 
 CORBA::Any *
-TAO_ConstantDef_i::value (void)
+TAO_ConstantDef_i::value ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -152,7 +152,7 @@ TAO_ConstantDef_i::value (void)
 }
 
 CORBA::Any *
-TAO_ConstantDef_i::value_i (void)
+TAO_ConstantDef_i::value_i ()
 {
   CORBA::TypeCode_var tc = this->type_i ();
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
index d991b8009bc..e2ea5176907 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -13,12 +13,12 @@ TAO_ConsumesDef_i::TAO_ConsumesDef_i (
 {
 }
 
-TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void)
+TAO_ConsumesDef_i::~TAO_ConsumesDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ConsumesDef_i::def_kind (void)
+TAO_ConsumesDef_i::def_kind ()
 {
   return CORBA::dk_Consumes;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index 975ade416ab..dc711338a09 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -15,12 +15,12 @@ TAO_Contained_i::TAO_Contained_i (
 {
 }
 
-TAO_Contained_i::~TAO_Contained_i (void)
+TAO_Contained_i::~TAO_Contained_i ()
 {
 }
 
 void
-TAO_Contained_i::destroy (void)
+TAO_Contained_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -30,7 +30,7 @@ TAO_Contained_i::destroy (void)
 }
 
 void
-TAO_Contained_i::destroy_i (void)
+TAO_Contained_i::destroy_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -85,7 +85,7 @@ TAO_Contained_i::destroy_i (void)
 }
 
 char *
-TAO_Contained_i::id (void)
+TAO_Contained_i::id ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -95,7 +95,7 @@ TAO_Contained_i::id (void)
 }
 
 char *
-TAO_Contained_i::id_i (void)
+TAO_Contained_i::id_i ()
 {
   ACE_TString retval;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -157,7 +157,7 @@ TAO_Contained_i::id_i (const char *id)
 }
 
 char *
-TAO_Contained_i::name (void)
+TAO_Contained_i::name ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -167,7 +167,7 @@ TAO_Contained_i::name (void)
 }
 
 char *
-TAO_Contained_i::name_i (void)
+TAO_Contained_i::name_i ()
 {
   ACE_TString retval;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -178,7 +178,7 @@ TAO_Contained_i::name_i (void)
 }
 
 char *
-TAO_Contained_i::version (void)
+TAO_Contained_i::version ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -188,7 +188,7 @@ TAO_Contained_i::version (void)
 }
 
 char *
-TAO_Contained_i::version_i (void)
+TAO_Contained_i::version_i ()
 {
   ACE_TString retval;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -260,7 +260,7 @@ TAO_Contained_i::version_i (const char *version)
 }
 
 CORBA::Container_ptr
-TAO_Contained_i::defined_in (void)
+TAO_Contained_i::defined_in ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::Container::_nil ());
 
@@ -270,7 +270,7 @@ TAO_Contained_i::defined_in (void)
 }
 
 CORBA::Container_ptr
-TAO_Contained_i::defined_in_i (void)
+TAO_Contained_i::defined_in_i ()
 {
   ACE_TString container_id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -298,7 +298,7 @@ TAO_Contained_i::defined_in_i (void)
 }
 
 char *
-TAO_Contained_i::absolute_name (void)
+TAO_Contained_i::absolute_name ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -308,7 +308,7 @@ TAO_Contained_i::absolute_name (void)
 }
 
 char *
-TAO_Contained_i::absolute_name_i (void)
+TAO_Contained_i::absolute_name_i ()
 {
   ACE_TString absolute_name;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -319,7 +319,7 @@ TAO_Contained_i::absolute_name_i (void)
 }
 
 CORBA::Repository_ptr
-TAO_Contained_i::containing_repository (void)
+TAO_Contained_i::containing_repository ()
 {
   return this->repo_->repo_objref ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 9dad1c8b29b..94b7fb91931 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -21,12 +21,12 @@ TAO_Container_i::TAO_Container_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_Container_i::~TAO_Container_i (void)
+TAO_Container_i::~TAO_Container_i ()
 {
 }
 
 void
-TAO_Container_i::destroy (void)
+TAO_Container_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -36,14 +36,14 @@ TAO_Container_i::destroy (void)
 }
 
 void
-TAO_Container_i::destroy_i (void)
+TAO_Container_i::destroy_i ()
 {
   this->destroy_references_i();
   this->destroy_definitions_i();
 }
 
 void
-TAO_Container_i::destroy_references_i (void)
+TAO_Container_i::destroy_references_i ()
 {
   int index = 0;
   int status;
@@ -119,7 +119,7 @@ TAO_Container_i::destroy_references_i (void)
 }
 
 void
-TAO_Container_i::destroy_definitions_i (void)
+TAO_Container_i::destroy_definitions_i ()
 {
   int index = 0;
   int status;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
index 424f8674e3c..86170850374 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -10,12 +10,12 @@ TAO_EmitsDef_i::TAO_EmitsDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_EmitsDef_i::~TAO_EmitsDef_i (void)
+TAO_EmitsDef_i::~TAO_EmitsDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_EmitsDef_i::def_kind (void)
+TAO_EmitsDef_i::def_kind ()
 {
   return CORBA::dk_Emits;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 9c6c11fa9ae..1bff5c0cbd0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -14,18 +14,18 @@ TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_EnumDef_i::~TAO_EnumDef_i (void)
+TAO_EnumDef_i::~TAO_EnumDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_EnumDef_i::def_kind (void)
+TAO_EnumDef_i::def_kind ()
 {
   return CORBA::dk_Enum;
 }
 
 CORBA::TypeCode_ptr
-TAO_EnumDef_i::type (void)
+TAO_EnumDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -35,7 +35,7 @@ TAO_EnumDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_EnumDef_i::type_i (void)
+TAO_EnumDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -55,7 +55,7 @@ TAO_EnumDef_i::type_i (void)
 }
 
 CORBA::EnumMemberSeq *
-TAO_EnumDef_i::members (void)
+TAO_EnumDef_i::members ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -65,7 +65,7 @@ TAO_EnumDef_i::members (void)
 }
 
 CORBA::EnumMemberSeq *
-TAO_EnumDef_i::members_i (void)
+TAO_EnumDef_i::members_i ()
 {
   u_int count = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index 94a36220fe5..cd612feea46 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -13,18 +13,18 @@ TAO_EventDef_i::TAO_EventDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_EventDef_i::~TAO_EventDef_i (void)
+TAO_EventDef_i::~TAO_EventDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_EventDef_i::def_kind (void)
+TAO_EventDef_i::def_kind ()
 {
   return CORBA::dk_Event;
 }
 
 void
-TAO_EventDef_i::destroy (void)
+TAO_EventDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -34,14 +34,14 @@ TAO_EventDef_i::destroy (void)
 }
 
 void
-TAO_EventDef_i::destroy_i (void)
+TAO_EventDef_i::destroy_i ()
 {
   // An event type is a restriction of a value type, not an extension.
   this->TAO_ExtValueDef_i::destroy_i ();
 }
 
 CORBA::Contained::Description *
-TAO_EventDef_i::describe (void)
+TAO_EventDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -51,7 +51,7 @@ TAO_EventDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_EventDef_i::describe_i (void)
+TAO_EventDef_i::describe_i ()
 {
   return this->TAO_ValueDef_i::describe_i ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index bf67c03d0c8..5e5186a678d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -14,7 +14,7 @@ TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_EventPortDef_i::~TAO_EventPortDef_i (void)
+TAO_EventPortDef_i::~TAO_EventPortDef_i ()
 {
 }
 
@@ -121,7 +121,7 @@ TAO_EventPortDef_i::is_a_i (
 }
 
 CORBA::Contained::Description *
-TAO_EventPortDef_i::describe (void)
+TAO_EventPortDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -131,7 +131,7 @@ TAO_EventPortDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_EventPortDef_i::describe_i (void)
+TAO_EventPortDef_i::describe_i ()
 {
   CORBA::ComponentIR::EventPortDescription epd;
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::EventPortDescription,
@@ -158,7 +158,7 @@ TAO_EventPortDef_i::describe_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EventPortDef_i::def_kind (void)
+TAO_EventPortDef_i::def_kind ()
 {
   return CORBA::dk_none;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 54a720bc9df..83aca20e401 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -14,18 +14,18 @@ TAO_ExceptionDef_i::TAO_ExceptionDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void)
+TAO_ExceptionDef_i::~TAO_ExceptionDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ExceptionDef_i::def_kind (void)
+TAO_ExceptionDef_i::def_kind ()
 {
   return CORBA::dk_Exception;
 }
 
 void
-TAO_ExceptionDef_i::destroy (void)
+TAO_ExceptionDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -35,7 +35,7 @@ TAO_ExceptionDef_i::destroy (void)
 }
 
 void
-TAO_ExceptionDef_i::destroy_i (void)
+TAO_ExceptionDef_i::destroy_i ()
 {
   // Destroy our members.
   TAO_Container_i::destroy_i ();
@@ -45,7 +45,7 @@ TAO_ExceptionDef_i::destroy_i (void)
 }
 
 CORBA::Contained::Description *
-TAO_ExceptionDef_i::describe (void)
+TAO_ExceptionDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -55,7 +55,7 @@ TAO_ExceptionDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_ExceptionDef_i::describe_i (void)
+TAO_ExceptionDef_i::describe_i ()
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -90,7 +90,7 @@ TAO_ExceptionDef_i::describe_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ExceptionDef_i::type (void)
+TAO_ExceptionDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -100,7 +100,7 @@ TAO_ExceptionDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ExceptionDef_i::type_i (void)
+TAO_ExceptionDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -123,7 +123,7 @@ TAO_ExceptionDef_i::type_i (void)
 }
 
 CORBA::StructMemberSeq *
-TAO_ExceptionDef_i::members (void)
+TAO_ExceptionDef_i::members ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -133,7 +133,7 @@ TAO_ExceptionDef_i::members (void)
 }
 
 CORBA::StructMemberSeq *
-TAO_ExceptionDef_i::members_i (void)
+TAO_ExceptionDef_i::members_i ()
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
   ACE_Unbounded_Queue<ACE_TString> path_queue;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
index 649c86a069e..72da496bbcb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -15,14 +15,14 @@ TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i (
 {
 }
 
-TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i (void)
+TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i ()
 {
 }
 
 // Just call the base class version, this is here only to
 // disambiguate multiple inheritance.
 void
-TAO_ExtAbstractInterfaceDef_i::destroy (void)
+TAO_ExtAbstractInterfaceDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 4c532eab20f..e18697e9ad6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -14,7 +14,7 @@ TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i (void)
+TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
index 55c6413a73a..0e3166e25d4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
@@ -13,7 +13,7 @@ TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i (void)
+TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
index 0d7c2d6fbdd..c9c27dbe34c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -14,14 +14,14 @@ TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i (void)
+TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i ()
 {
 }
 
 // Just call the base class version, this is here only to
 // disambiguate multiple inheritance.
 void
-TAO_ExtLocalInterfaceDef_i::destroy (void)
+TAO_ExtLocalInterfaceDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index e2386bbf087..842fe5d72c9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -17,7 +17,7 @@ TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ExtValueDef_i::~TAO_ExtValueDef_i (void)
+TAO_ExtValueDef_i::~TAO_ExtValueDef_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
index 4ad931fe56a..d96e0eb2a06 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -10,12 +10,12 @@ TAO_FactoryDef_i::TAO_FactoryDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_FactoryDef_i::~TAO_FactoryDef_i (void)
+TAO_FactoryDef_i::~TAO_FactoryDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_FactoryDef_i::def_kind (void)
+TAO_FactoryDef_i::def_kind ()
 {
   return CORBA::dk_Factory;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
index 8a7abfb8312..408c047eb9e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -10,12 +10,12 @@ TAO_FinderDef_i::TAO_FinderDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_FinderDef_i::~TAO_FinderDef_i (void)
+TAO_FinderDef_i::~TAO_FinderDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_FinderDef_i::def_kind (void)
+TAO_FinderDef_i::def_kind ()
 {
   return CORBA::dk_Finder;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index 50a59fe7ca6..866f767ca5f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -9,18 +9,18 @@ TAO_FixedDef_i::TAO_FixedDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_FixedDef_i::~TAO_FixedDef_i (void)
+TAO_FixedDef_i::~TAO_FixedDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_FixedDef_i::def_kind (void)
+TAO_FixedDef_i::def_kind ()
 {
   return CORBA::dk_Fixed;
 }
 
 void
-TAO_FixedDef_i::destroy (void)
+TAO_FixedDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -30,13 +30,13 @@ TAO_FixedDef_i::destroy (void)
 }
 
 void
-TAO_FixedDef_i::destroy_i (void)
+TAO_FixedDef_i::destroy_i ()
 {
   // TODO
 }
 
 CORBA::TypeCode_ptr
-TAO_FixedDef_i::type (void)
+TAO_FixedDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -46,14 +46,14 @@ TAO_FixedDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_FixedDef_i::type_i (void)
+TAO_FixedDef_i::type_i ()
 {
   // TODO
   return CORBA::TypeCode::_nil ();
 }
 
 CORBA::UShort
-TAO_FixedDef_i::digits (void)
+TAO_FixedDef_i::digits ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -63,7 +63,7 @@ TAO_FixedDef_i::digits (void)
 }
 
 CORBA::UShort
-TAO_FixedDef_i::digits_i (void)
+TAO_FixedDef_i::digits_i ()
 {
   // TODO
   return 0;
@@ -87,7 +87,7 @@ TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */
 }
 
 CORBA::Short
-TAO_FixedDef_i::scale (void)
+TAO_FixedDef_i::scale ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -97,7 +97,7 @@ TAO_FixedDef_i::scale (void)
 }
 
 CORBA::Short
-TAO_FixedDef_i::scale_i (void)
+TAO_FixedDef_i::scale_i ()
 {
   // TODO
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index 97d7bc8c76f..c83e120a01b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -23,18 +23,18 @@ TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_HomeDef_i::~TAO_HomeDef_i (void)
+TAO_HomeDef_i::~TAO_HomeDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_HomeDef_i::def_kind (void)
+TAO_HomeDef_i::def_kind ()
 {
   return CORBA::dk_Home;
 }
 
 void
-TAO_HomeDef_i::destroy (void)
+TAO_HomeDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -44,7 +44,7 @@ TAO_HomeDef_i::destroy (void)
 }
 
 void
-TAO_HomeDef_i::destroy_i (void)
+TAO_HomeDef_i::destroy_i ()
 {
   // Destroy our special subsections first, then call destroy_i
   // on our base class.
@@ -65,7 +65,7 @@ TAO_HomeDef_i::destroy_i (void)
 }
 
 CORBA::Contained::Description *
-TAO_HomeDef_i::describe (void)
+TAO_HomeDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -75,7 +75,7 @@ TAO_HomeDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_HomeDef_i::describe_i (void)
+TAO_HomeDef_i::describe_i ()
 {
   CORBA::ComponentIR::HomeDescription home_desc;
 
@@ -150,7 +150,7 @@ TAO_HomeDef_i::describe_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_HomeDef_i::type (void)
+TAO_HomeDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -160,7 +160,7 @@ TAO_HomeDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_HomeDef_i::type_i (void)
+TAO_HomeDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -177,7 +177,7 @@ TAO_HomeDef_i::type_i (void)
 }
 
 CORBA::ComponentIR::HomeDef_ptr
-TAO_HomeDef_i::base_home (void)
+TAO_HomeDef_i::base_home ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
 
@@ -187,7 +187,7 @@ TAO_HomeDef_i::base_home (void)
 }
 
 CORBA::ComponentIR::HomeDef_ptr
-TAO_HomeDef_i::base_home_i (void)
+TAO_HomeDef_i::base_home_i ()
 {
   ACE_TString path;
   int status =
@@ -336,7 +336,7 @@ TAO_HomeDef_i::supported_interfaces_i (
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-TAO_HomeDef_i::managed_component (void)
+TAO_HomeDef_i::managed_component ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
@@ -346,7 +346,7 @@ TAO_HomeDef_i::managed_component (void)
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-TAO_HomeDef_i::managed_component_i (void)
+TAO_HomeDef_i::managed_component_i ()
 {
   ACE_TString path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -383,7 +383,7 @@ TAO_HomeDef_i::managed_component_i (
 }
 
 CORBA::ValueDef_ptr
-TAO_HomeDef_i::primary_key (void)
+TAO_HomeDef_i::primary_key ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ());
 
@@ -393,7 +393,7 @@ TAO_HomeDef_i::primary_key (void)
 }
 
 CORBA::ValueDef_ptr
-TAO_HomeDef_i::primary_key_i (void)
+TAO_HomeDef_i::primary_key_i ()
 {
   ACE_TString path;
   int status =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
index 78c10859022..522df7a364b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
@@ -7,7 +7,7 @@ TAO_IDLType_i::TAO_IDLType_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_IDLType_i::~TAO_IDLType_i (void)
+TAO_IDLType_i::~TAO_IDLType_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index fa7b25f8c37..7b661d821bf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -14,12 +14,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void)
+TAO_IFR_Service_Loader::TAO_IFR_Service_Loader ()
 {
   // Constructor
 }
 
-TAO_IFR_Service_Loader::~TAO_IFR_Service_Loader (void)
+TAO_IFR_Service_Loader::~TAO_IFR_Service_Loader ()
 {
   // Destructor
 }
@@ -50,7 +50,7 @@ TAO_IFR_Service_Loader::init (int argc,
 }
 
 int
-TAO_IFR_Service_Loader::fini (void)
+TAO_IFR_Service_Loader::fini ()
 {
   // Remove the IFR_Service Service.
   return this->ifr_server_.fini ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index cafbd7cdb62..9497487226b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -22,13 +22,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0;
 
-TAO_IFR_Server::TAO_IFR_Server (void)
+TAO_IFR_Server::TAO_IFR_Server ()
   : ior_multicast_ (0),
     config_ (0)
 {
 }
 
-TAO_IFR_Server::~TAO_IFR_Server (void)
+TAO_IFR_Server::~TAO_IFR_Server ()
 {
   // Get reactor instance from TAO.
   ACE_Reactor *reactor = this->orb_->orb_core ()->reactor ();
@@ -148,7 +148,7 @@ TAO_IFR_Server::init_with_poa (int argc,
 }
 
 int
-TAO_IFR_Server::fini (void)
+TAO_IFR_Server::fini ()
 {
   try
     {
@@ -164,7 +164,7 @@ TAO_IFR_Server::fini (void)
 }
 
 int
-TAO_IFR_Server::create_poa (void)
+TAO_IFR_Server::create_poa ()
 {
   PortableServer::POAManager_var poa_manager =
     this->root_poa_->the_POAManager ();
@@ -211,7 +211,7 @@ TAO_IFR_Server::create_poa (void)
 }
 
 int
-TAO_IFR_Server::open_config (void)
+TAO_IFR_Server::open_config ()
 {
   if (OPTIONS::instance ()->using_registry ())
     {
@@ -266,7 +266,7 @@ TAO_IFR_Server::open_config (void)
 }
 
 int
-TAO_IFR_Server::create_repository (void)
+TAO_IFR_Server::create_repository ()
 {
   TAO_ComponentRepository_i *impl = 0;
   ACE_NEW_THROW_EX (
@@ -279,11 +279,10 @@ TAO_IFR_Server::create_repository (void)
       CORBA::NO_MEMORY ()
     );
 
-  auto_ptr<TAO_ComponentRepository_i> safety (impl);
+  std::unique_ptr<TAO_ComponentRepository_i> safety (impl);
   TAO_IFR_Service_Utils::repo_ = impl;
 
-  POA_CORBA::ComponentIR::Repository_tie<TAO_ComponentRepository_i> *impl_tie
-    = 0;
+  POA_CORBA::ComponentIR::Repository_tie<TAO_ComponentRepository_i> *impl_tie = 0;
 
   ACE_NEW_THROW_EX (
       impl_tie,
@@ -372,7 +371,7 @@ TAO_IFR_Server::create_repository (void)
 
 // Install ior multicast handler.
 int
-TAO_IFR_Server::init_multicast_server (void)
+TAO_IFR_Server::init_multicast_server ()
 {
 #if defined (ACE_HAS_IP_MULTICAST)
   // Get reactor instance from TAO.
@@ -464,11 +463,11 @@ TAO_IFR_Server::init_multicast_server (void)
   return 0;
 }
 
-TAO_IFR_Service_Utils::TAO_IFR_Service_Utils (void)
+TAO_IFR_Service_Utils::TAO_IFR_Service_Utils ()
 {
 }
 
-TAO_IFR_Service_Utils::~TAO_IFR_Service_Utils (void)
+TAO_IFR_Service_Utils::~TAO_IFR_Service_Utils ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index 4b4bf77db08..a93bfc97e9a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -17,7 +17,7 @@ TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_IRObject_i::~TAO_IRObject_i (void)
+TAO_IRObject_i::~TAO_IRObject_i ()
 {
 }
 
@@ -36,7 +36,7 @@ TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key)
 }
 
 void
-TAO_IRObject_i::update_key (void)
+TAO_IRObject_i::update_key ()
 {
   TAO::Portable_Server::POA_Current_Impl *pc_impl =
     static_cast <TAO::Portable_Server::POA_Current_Impl *>
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index 50f496b0dba..6ca2337f6b4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -18,7 +18,7 @@ TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i (
 {
 }
 
-TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i (void)
+TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 1baecb43533..d2f73c4d659 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -17,18 +17,18 @@ TAO_InterfaceDef_i::TAO_InterfaceDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void)
+TAO_InterfaceDef_i::~TAO_InterfaceDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_InterfaceDef_i::def_kind (void)
+TAO_InterfaceDef_i::def_kind ()
 {
   return CORBA::dk_Interface;
 }
 
 void
-TAO_InterfaceDef_i::destroy (void)
+TAO_InterfaceDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -38,7 +38,7 @@ TAO_InterfaceDef_i::destroy (void)
 }
 
 void
-TAO_InterfaceDef_i::destroy_i (void)
+TAO_InterfaceDef_i::destroy_i ()
 {
   // Destroy our members.
   this->TAO_Container_i::destroy_i ();
@@ -64,7 +64,7 @@ TAO_InterfaceDef_i::destroy_i (void)
 }
 
 CORBA::Contained::Description *
-TAO_InterfaceDef_i::describe (void)
+TAO_InterfaceDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -74,7 +74,7 @@ TAO_InterfaceDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_InterfaceDef_i::describe_i (void)
+TAO_InterfaceDef_i::describe_i ()
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
@@ -137,7 +137,7 @@ TAO_InterfaceDef_i::describe_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_InterfaceDef_i::type (void)
+TAO_InterfaceDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -147,7 +147,7 @@ TAO_InterfaceDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_InterfaceDef_i::type_i (void)
+TAO_InterfaceDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -166,7 +166,7 @@ TAO_InterfaceDef_i::type_i (void)
 }
 
 CORBA::InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces (void)
+TAO_InterfaceDef_i::base_interfaces ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -176,7 +176,7 @@ TAO_InterfaceDef_i::base_interfaces (void)
 }
 
 CORBA::InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces_i (void)
+TAO_InterfaceDef_i::base_interfaces_i ()
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -355,7 +355,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id)
 }
 
 CORBA::InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface (void)
+TAO_InterfaceDef_i::describe_interface ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -365,7 +365,7 @@ TAO_InterfaceDef_i::describe_interface (void)
 }
 
 CORBA::InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface_i (void)
+TAO_InterfaceDef_i::describe_interface_i ()
 {
   CORBA::InterfaceDef::FullInterfaceDescription *fifd = 0;
   ACE_NEW_RETURN (fifd,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index d078ec7ca7f..3ddbc46afed 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -12,12 +12,12 @@ TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void)
+TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_LocalInterfaceDef_i::def_kind (void)
+TAO_LocalInterfaceDef_i::def_kind ()
 {
   return CORBA::dk_LocalInterface;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index 9f5b20010d0..ba036951827 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -14,18 +14,18 @@ TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ModuleDef_i::~TAO_ModuleDef_i (void)
+TAO_ModuleDef_i::~TAO_ModuleDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ModuleDef_i::def_kind (void)
+TAO_ModuleDef_i::def_kind ()
 {
   return CORBA::dk_Module;
 }
 
 void
-TAO_ModuleDef_i::destroy (void)
+TAO_ModuleDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -35,7 +35,7 @@ TAO_ModuleDef_i::destroy (void)
 }
 
 void
-TAO_ModuleDef_i::destroy_i (void)
+TAO_ModuleDef_i::destroy_i ()
 {
   // Destroy our members.
   TAO_Container_i::destroy_i ();
@@ -45,7 +45,7 @@ TAO_ModuleDef_i::destroy_i (void)
 }
 
 CORBA::Contained::Description *
-TAO_ModuleDef_i::describe (void)
+TAO_ModuleDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -55,7 +55,7 @@ TAO_ModuleDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_ModuleDef_i::describe_i (void)
+TAO_ModuleDef_i::describe_i ()
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index d3bdb5e3192..4894451318a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -13,18 +13,18 @@ TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_NativeDef_i::~TAO_NativeDef_i (void)
+TAO_NativeDef_i::~TAO_NativeDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_NativeDef_i::def_kind (void)
+TAO_NativeDef_i::def_kind ()
 {
   return CORBA::dk_Native;
 }
 
 CORBA::TypeCode_ptr
-TAO_NativeDef_i::type (void)
+TAO_NativeDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -34,7 +34,7 @@ TAO_NativeDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_NativeDef_i::type_i (void)
+TAO_NativeDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index 73c79b50ff2..e4981989d82 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -19,12 +19,12 @@ TAO_OperationDef_i::TAO_OperationDef_i (
 {
 }
 
-TAO_OperationDef_i::~TAO_OperationDef_i (void)
+TAO_OperationDef_i::~TAO_OperationDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_OperationDef_i::def_kind (void)
+TAO_OperationDef_i::def_kind ()
 {
   return CORBA::dk_Operation;
 }
@@ -60,7 +60,7 @@ TAO_OperationDef_i::describe_i ( )
 }
 
 CORBA::TypeCode_ptr
-TAO_OperationDef_i::result (void)
+TAO_OperationDef_i::result ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -70,7 +70,7 @@ TAO_OperationDef_i::result (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_OperationDef_i::result_i (void)
+TAO_OperationDef_i::result_i ()
 {
   ACE_TString result_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -86,7 +86,7 @@ TAO_OperationDef_i::result_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_OperationDef_i::result_def (void)
+TAO_OperationDef_i::result_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -96,7 +96,7 @@ TAO_OperationDef_i::result_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_OperationDef_i::result_def_i (void)
+TAO_OperationDef_i::result_def_i ()
 {
   ACE_TString result_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -132,7 +132,7 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def)
 }
 
 CORBA::ParDescriptionSeq *
-TAO_OperationDef_i::params (void)
+TAO_OperationDef_i::params ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -142,7 +142,7 @@ TAO_OperationDef_i::params (void)
 }
 
 CORBA::ParDescriptionSeq *
-TAO_OperationDef_i::params_i (void)
+TAO_OperationDef_i::params_i ()
 {
   CORBA::ULong i = 0;
   ACE_Configuration_Section_Key params_key;
@@ -307,7 +307,7 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params)
 }
 
 CORBA::OperationMode
-TAO_OperationDef_i::mode (void)
+TAO_OperationDef_i::mode ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL);
 
@@ -317,7 +317,7 @@ TAO_OperationDef_i::mode (void)
 }
 
 CORBA::OperationMode
-TAO_OperationDef_i::mode_i (void)
+TAO_OperationDef_i::mode_i ()
 {
   u_int mode;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -346,7 +346,7 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode)
 }
 
 CORBA::ContextIdSeq *
-TAO_OperationDef_i::contexts (void)
+TAO_OperationDef_i::contexts ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -356,7 +356,7 @@ TAO_OperationDef_i::contexts (void)
 }
 
 CORBA::ContextIdSeq *
-TAO_OperationDef_i::contexts_i (void)
+TAO_OperationDef_i::contexts_i ()
 {
   ACE_Configuration_Section_Key contexts_key;
   int status =
@@ -665,7 +665,7 @@ TAO_OperationDef_i::make_description (
 }
 
 CORBA::TypeCode_ptr
-TAO_OperationDef_i::type_i (void)
+TAO_OperationDef_i::type_i ()
 {
   return this->result_i ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
index dd6ba317df2..2c545920ee0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
@@ -90,37 +90,37 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 const char *
-Options::ior_output_file (void) const
+Options::ior_output_file () const
 {
   return this->ior_output_file_;
 }
 
 int
-Options::persistent (void) const
+Options::persistent () const
 {
   return this->persistent_;
 }
 
 const char *
-Options::persistent_file (void) const
+Options::persistent_file () const
 {
   return this->persistent_file_;
 }
 
 int
-Options::using_registry (void) const
+Options::using_registry () const
 {
   return this->using_registry_;
 }
 
 int
-Options::enable_locking (void) const
+Options::enable_locking () const
 {
   return this->enable_locking_;
 }
 
 int
-Options::support_multicast_discovery (void) const
+Options::support_multicast_discovery () const
 {
   return this->support_multicast_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index 44af15021ad..b0435b983fc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -9,30 +9,30 @@ TAO_PrimitiveDef_i::TAO_PrimitiveDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
+TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_PrimitiveDef_i::def_kind (void)
+TAO_PrimitiveDef_i::def_kind ()
 {
   return CORBA::dk_Primitive;
 }
 
 void
-TAO_PrimitiveDef_i::destroy (void)
+TAO_PrimitiveDef_i::destroy ()
 {
   this->destroy_i ();
 }
 
 void
-TAO_PrimitiveDef_i::destroy_i (void)
+TAO_PrimitiveDef_i::destroy_i ()
 {
   throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 CORBA::TypeCode_ptr
-TAO_PrimitiveDef_i::type (void)
+TAO_PrimitiveDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -42,7 +42,7 @@ TAO_PrimitiveDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_PrimitiveDef_i::type_i (void)
+TAO_PrimitiveDef_i::type_i ()
 {
   u_int pkind = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -101,7 +101,7 @@ TAO_PrimitiveDef_i::type_i (void)
 }
 
 CORBA::PrimitiveKind
-TAO_PrimitiveDef_i::kind (void)
+TAO_PrimitiveDef_i::kind ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
 
@@ -111,7 +111,7 @@ TAO_PrimitiveDef_i::kind (void)
 }
 
 CORBA::PrimitiveKind
-TAO_PrimitiveDef_i::kind_i (void)
+TAO_PrimitiveDef_i::kind_i ()
 {
   u_int pkind = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index 796f36acfb2..55edddb4cc4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -12,18 +12,18 @@ TAO_ProvidesDef_i::TAO_ProvidesDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void)
+TAO_ProvidesDef_i::~TAO_ProvidesDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ProvidesDef_i::def_kind (void)
+TAO_ProvidesDef_i::def_kind ()
 {
   return CORBA::dk_Provides;
 }
 
 CORBA::Contained::Description *
-TAO_ProvidesDef_i::describe (void)
+TAO_ProvidesDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -33,7 +33,7 @@ TAO_ProvidesDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_ProvidesDef_i::describe_i (void)
+TAO_ProvidesDef_i::describe_i ()
 {
   CORBA::ComponentIR::ProvidesDescription pd;
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::ProvidesDescription,
@@ -60,7 +60,7 @@ TAO_ProvidesDef_i::describe_i (void)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_ProvidesDef_i::interface_type (void)
+TAO_ProvidesDef_i::interface_type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
 
@@ -70,7 +70,7 @@ TAO_ProvidesDef_i::interface_type (void)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_ProvidesDef_i::interface_type_i (void)
+TAO_ProvidesDef_i::interface_type_i ()
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index 40f64d82e02..c9531a80fb3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -9,12 +9,12 @@ TAO_PublishesDef_i::TAO_PublishesDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_PublishesDef_i::~TAO_PublishesDef_i (void)
+TAO_PublishesDef_i::~TAO_PublishesDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_PublishesDef_i::def_kind (void)
+TAO_PublishesDef_i::def_kind ()
 {
   return CORBA::dk_Publishes;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 3711e269ef8..54778f26be8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -28,19 +28,19 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb,
 {
 }
 
-TAO_Repository_i::~TAO_Repository_i (void)
+TAO_Repository_i::~TAO_Repository_i ()
 {
   delete this->lock_;
 }
 
 CORBA::DefinitionKind
-TAO_Repository_i::def_kind (void)
+TAO_Repository_i::def_kind ()
 {
   return CORBA::dk_Repository;
 }
 
 void
-TAO_Repository_i::destroy (void)
+TAO_Repository_i::destroy ()
 {
   throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
@@ -549,7 +549,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
 }
 
 int
-TAO_Repository_i::create_sections (void)
+TAO_Repository_i::create_sections ()
 {
   this->config_->open_section (config_->root_section (),
                                "root",
@@ -680,7 +680,7 @@ TAO_Repository_i::create_sections (void)
 }
 
 int
-TAO_Repository_i::create_servants_and_poas (void)
+TAO_Repository_i::create_servants_and_poas ()
 {
   CORBA::PolicyList policies (5);
   policies.length (5);
@@ -913,25 +913,25 @@ TAO_Repository_i::select_poa (CORBA::DefinitionKind def_kind) const
 }
 
 PortableServer::Current_ptr
-TAO_Repository_i::poa_current (void) const
+TAO_Repository_i::poa_current () const
 {
   return this->poa_current_.in ();
 }
 
 ACE_Configuration *
-TAO_Repository_i::config (void) const
+TAO_Repository_i::config () const
 {
   return this->config_;
 }
 
 CORBA::TypeCodeFactory_ptr
-TAO_Repository_i::tc_factory (void) const
+TAO_Repository_i::tc_factory () const
 {
   return this->tc_factory_.in ();
 }
 
 CORBA::Repository_ptr
-TAO_Repository_i::repo_objref (void) const
+TAO_Repository_i::repo_objref () const
 {
   return CORBA::Repository::_duplicate (this->repo_objref_.in ());
 }
@@ -943,61 +943,61 @@ TAO_Repository_i::repo_objref (CORBA::Repository_ptr objref)
 }
 
 ACE_Configuration_Section_Key
-TAO_Repository_i::root_key (void) const
+TAO_Repository_i::root_key () const
 {
   return this->root_key_;
 }
 
 ACE_Configuration_Section_Key
-TAO_Repository_i::repo_ids_key (void) const
+TAO_Repository_i::repo_ids_key () const
 {
   return this->repo_ids_key_;
 }
 
 ACE_Configuration_Section_Key
-TAO_Repository_i::pkinds_key (void) const
+TAO_Repository_i::pkinds_key () const
 {
   return this->pkinds_key_;
 }
 
 ACE_Configuration_Section_Key
-TAO_Repository_i::strings_key (void) const
+TAO_Repository_i::strings_key () const
 {
   return this->strings_key_;
 }
 
 ACE_Configuration_Section_Key
-TAO_Repository_i::wstrings_key (void) const
+TAO_Repository_i::wstrings_key () const
 {
   return this->wstrings_key_;
 }
 
 ACE_Configuration_Section_Key
-TAO_Repository_i::fixeds_key (void) const
+TAO_Repository_i::fixeds_key () const
 {
   return this->fixeds_key_;
 }
 
 ACE_Configuration_Section_Key
-TAO_Repository_i::arrays_key (void) const
+TAO_Repository_i::arrays_key () const
 {
   return this->arrays_key_;
 }
 
 ACE_Configuration_Section_Key
-TAO_Repository_i::sequences_key (void) const
+TAO_Repository_i::sequences_key () const
 {
   return this->sequences_key_;
 }
 
 const char *
-TAO_Repository_i::extension (void) const
+TAO_Repository_i::extension () const
 {
   return this->extension_.in ();
 }
 
 ACE_Lock &
-TAO_Repository_i::lock (void) const
+TAO_Repository_i::lock () const
 {
   return *this->lock_;
 }
@@ -1035,14 +1035,14 @@ TAO_Repository_i::pkind_to_string (CORBA::PrimitiveKind pkind) const
 }
 
 u_int
-TAO_Repository_i::num_pkinds (void) const
+TAO_Repository_i::num_pkinds () const
 {
   return sizeof (TAO_Repository_i::TAO_IFR_primitive_kinds) / sizeof (char*);
 }
 
 // For debugging use only.
 void
-TAO_Repository_i::shutdown (void)
+TAO_Repository_i::shutdown ()
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index 3badf1b343e..d537a2c5d90 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -13,18 +13,18 @@ TAO_SequenceDef_i::TAO_SequenceDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_SequenceDef_i::~TAO_SequenceDef_i (void)
+TAO_SequenceDef_i::~TAO_SequenceDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_SequenceDef_i::def_kind (void)
+TAO_SequenceDef_i::def_kind ()
 {
   return CORBA::dk_Sequence;
 }
 
 void
-TAO_SequenceDef_i::destroy (void)
+TAO_SequenceDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -34,7 +34,7 @@ TAO_SequenceDef_i::destroy (void)
 }
 
 void
-TAO_SequenceDef_i::destroy_i (void)
+TAO_SequenceDef_i::destroy_i ()
 {
   // Only if it is (w)string, fixed, array or sequence.
   this->destroy_element_type ();
@@ -50,7 +50,7 @@ TAO_SequenceDef_i::destroy_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type (void)
+TAO_SequenceDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -60,7 +60,7 @@ TAO_SequenceDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type_i (void)
+TAO_SequenceDef_i::type_i ()
 {
   CORBA::TypeCode_var element_typecode =
     this->element_type_i ();
@@ -74,7 +74,7 @@ TAO_SequenceDef_i::type_i (void)
 }
 
 CORBA::ULong
-TAO_SequenceDef_i::bound (void)
+TAO_SequenceDef_i::bound ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -84,7 +84,7 @@ TAO_SequenceDef_i::bound (void)
 }
 
 CORBA::ULong
-TAO_SequenceDef_i::bound_i (void)
+TAO_SequenceDef_i::bound_i ()
 {
   u_int bound = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -111,7 +111,7 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound)
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type (void)
+TAO_SequenceDef_i::element_type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -121,7 +121,7 @@ TAO_SequenceDef_i::element_type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type_i (void)
+TAO_SequenceDef_i::element_type_i ()
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -136,7 +136,7 @@ TAO_SequenceDef_i::element_type_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_SequenceDef_i::element_type_def (void)
+TAO_SequenceDef_i::element_type_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -146,7 +146,7 @@ TAO_SequenceDef_i::element_type_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_SequenceDef_i::element_type_def_i (void)
+TAO_SequenceDef_i::element_type_def_i ()
 {
   ACE_TString element_path;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index d065fb17b9f..b316c778ed6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -11,18 +11,18 @@ TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_StringDef_i::~TAO_StringDef_i (void)
+TAO_StringDef_i::~TAO_StringDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_StringDef_i::def_kind (void)
+TAO_StringDef_i::def_kind ()
 {
   return CORBA::dk_String;
 }
 
 void
-TAO_StringDef_i::destroy (void)
+TAO_StringDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -32,7 +32,7 @@ TAO_StringDef_i::destroy (void)
 }
 
 void
-TAO_StringDef_i::destroy_i (void)
+TAO_StringDef_i::destroy_i ()
 {
   ACE_TString name;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -45,7 +45,7 @@ TAO_StringDef_i::destroy_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_StringDef_i::type (void)
+TAO_StringDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -55,7 +55,7 @@ TAO_StringDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_StringDef_i::type_i (void)
+TAO_StringDef_i::type_i ()
 {
   CORBA::ULong bound = this->bound_i ();
 
@@ -65,7 +65,7 @@ TAO_StringDef_i::type_i (void)
 }
 
 CORBA::ULong
-TAO_StringDef_i::bound (void)
+TAO_StringDef_i::bound ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -75,7 +75,7 @@ TAO_StringDef_i::bound (void)
 }
 
 CORBA::ULong
-TAO_StringDef_i::bound_i (void)
+TAO_StringDef_i::bound_i ()
 {
   u_int retval = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index a5586fd2f8b..b085d10321a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -17,18 +17,18 @@ TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_StructDef_i::~TAO_StructDef_i (void)
+TAO_StructDef_i::~TAO_StructDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_StructDef_i::def_kind (void)
+TAO_StructDef_i::def_kind ()
 {
   return CORBA::dk_Struct;
 }
 
 void
-TAO_StructDef_i::destroy (void)
+TAO_StructDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -38,7 +38,7 @@ TAO_StructDef_i::destroy (void)
 }
 
 void
-TAO_StructDef_i::destroy_i (void)
+TAO_StructDef_i::destroy_i ()
 {
   // Destroy our members.
   TAO_Container_i::destroy_i ();
@@ -48,7 +48,7 @@ TAO_StructDef_i::destroy_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_StructDef_i::type (void)
+TAO_StructDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -58,7 +58,7 @@ TAO_StructDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_StructDef_i::type_i (void)
+TAO_StructDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -97,7 +97,7 @@ TAO_StructDef_i::type_i (void)
 }
 
 CORBA::StructMemberSeq *
-TAO_StructDef_i::members (void)
+TAO_StructDef_i::members ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -107,7 +107,7 @@ TAO_StructDef_i::members (void)
 }
 
 CORBA::StructMemberSeq *
-TAO_StructDef_i::members_i (void)
+TAO_StructDef_i::members_i ()
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
   ACE_Unbounded_Queue<ACE_TString> path_queue;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index 486c5fd408b..27aff95a6a3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -12,12 +12,12 @@ TAO_TypedefDef_i::TAO_TypedefDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_TypedefDef_i::~TAO_TypedefDef_i (void)
+TAO_TypedefDef_i::~TAO_TypedefDef_i ()
 {
 }
 
 CORBA::Contained::Description *
-TAO_TypedefDef_i::describe (void)
+TAO_TypedefDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -27,7 +27,7 @@ TAO_TypedefDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_TypedefDef_i::describe_i (void)
+TAO_TypedefDef_i::describe_i ()
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index e77bcc3742a..99eac21a96a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -20,18 +20,18 @@ TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_UnionDef_i::~TAO_UnionDef_i (void)
+TAO_UnionDef_i::~TAO_UnionDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_UnionDef_i::def_kind (void)
+TAO_UnionDef_i::def_kind ()
 {
   return CORBA::dk_Union;
 }
 
 void
-TAO_UnionDef_i::destroy (void)
+TAO_UnionDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -41,7 +41,7 @@ TAO_UnionDef_i::destroy (void)
 }
 
 void
-TAO_UnionDef_i::destroy_i (void)
+TAO_UnionDef_i::destroy_i ()
 {
   // Destroy our members.
   TAO_Container_i::destroy_i ();
@@ -51,7 +51,7 @@ TAO_UnionDef_i::destroy_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::type (void)
+TAO_UnionDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -61,7 +61,7 @@ TAO_UnionDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::type_i (void)
+TAO_UnionDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -103,7 +103,7 @@ TAO_UnionDef_i::type_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::discriminator_type (void)
+TAO_UnionDef_i::discriminator_type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -113,7 +113,7 @@ TAO_UnionDef_i::discriminator_type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::discriminator_type_i (void)
+TAO_UnionDef_i::discriminator_type_i ()
 {
   ACE_TString disc_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -132,7 +132,7 @@ TAO_UnionDef_i::discriminator_type_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_UnionDef_i::discriminator_type_def (void)
+TAO_UnionDef_i::discriminator_type_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -142,7 +142,7 @@ TAO_UnionDef_i::discriminator_type_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_UnionDef_i::discriminator_type_def_i (void)
+TAO_UnionDef_i::discriminator_type_def_i ()
 {
   ACE_TString disc_path;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -182,7 +182,7 @@ TAO_UnionDef_i::discriminator_type_def_i (
 }
 
 CORBA::UnionMemberSeq *
-TAO_UnionDef_i::members (void)
+TAO_UnionDef_i::members ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -192,7 +192,7 @@ TAO_UnionDef_i::members (void)
 }
 
 CORBA::UnionMemberSeq *
-TAO_UnionDef_i::members_i (void)
+TAO_UnionDef_i::members_i ()
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index 7c8b1435634..a872766822f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -13,18 +13,18 @@ TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_UsesDef_i::~TAO_UsesDef_i (void)
+TAO_UsesDef_i::~TAO_UsesDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_UsesDef_i::def_kind (void)
+TAO_UsesDef_i::def_kind ()
 {
   return CORBA::dk_Uses;
 }
 
 CORBA::Contained::Description *
-TAO_UsesDef_i::describe (void)
+TAO_UsesDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -34,7 +34,7 @@ TAO_UsesDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_UsesDef_i::describe_i (void)
+TAO_UsesDef_i::describe_i ()
 {
   CORBA::ComponentIR::UsesDescription ud;
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::UsesDescription,
@@ -62,7 +62,7 @@ TAO_UsesDef_i::describe_i (void)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_UsesDef_i::interface_type (void)
+TAO_UsesDef_i::interface_type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
 
@@ -72,7 +72,7 @@ TAO_UsesDef_i::interface_type (void)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_UsesDef_i::interface_type_i (void)
+TAO_UsesDef_i::interface_type_i ()
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -135,7 +135,7 @@ TAO_UsesDef_i::interface_type_i (
 }
 
 CORBA::Boolean
-TAO_UsesDef_i::is_multiple (void)
+TAO_UsesDef_i::is_multiple ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -145,7 +145,7 @@ TAO_UsesDef_i::is_multiple (void)
 }
 
 CORBA::Boolean
-TAO_UsesDef_i::is_multiple_i (void)
+TAO_UsesDef_i::is_multiple_i ()
 {
   CORBA::ULong val = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index 178c524cd76..496a915607b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -17,18 +17,18 @@ TAO_ValueBoxDef_i::TAO_ValueBoxDef_i (
 {
 }
 
-TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void)
+TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ValueBoxDef_i::def_kind (void)
+TAO_ValueBoxDef_i::def_kind ()
 {
   return CORBA::dk_ValueBox;
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueBoxDef_i::type (void)
+TAO_ValueBoxDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -38,7 +38,7 @@ TAO_ValueBoxDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueBoxDef_i::type_i (void)
+TAO_ValueBoxDef_i::type_i ()
 {
   ACE_TString id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -67,7 +67,7 @@ TAO_ValueBoxDef_i::type_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_ValueBoxDef_i::original_type_def (void)
+TAO_ValueBoxDef_i::original_type_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -77,7 +77,7 @@ TAO_ValueBoxDef_i::original_type_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_ValueBoxDef_i::original_type_def_i (void)
+TAO_ValueBoxDef_i::original_type_def_i ()
 {
   ACE_TString boxed_type_path;
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index b79502df952..304a998ca67 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -17,18 +17,18 @@ TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ValueDef_i::~TAO_ValueDef_i (void)
+TAO_ValueDef_i::~TAO_ValueDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ValueDef_i::def_kind (void)
+TAO_ValueDef_i::def_kind ()
 {
   return CORBA::dk_Value;
 }
 
 void
-TAO_ValueDef_i::destroy (void)
+TAO_ValueDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -38,7 +38,7 @@ TAO_ValueDef_i::destroy (void)
 }
 
 void
-TAO_ValueDef_i::destroy_i (void)
+TAO_ValueDef_i::destroy_i ()
 {
   this->TAO_Container_i::destroy_i ();
 
@@ -60,7 +60,7 @@ TAO_ValueDef_i::destroy_i (void)
 }
 
 CORBA::Contained::Description *
-TAO_ValueDef_i::describe (void)
+TAO_ValueDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -70,7 +70,7 @@ TAO_ValueDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_ValueDef_i::describe_i (void)
+TAO_ValueDef_i::describe_i ()
 {
   CORBA::ValueDescription *vd = 0;
   ACE_NEW_RETURN (vd,
@@ -91,7 +91,7 @@ TAO_ValueDef_i::describe_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueDef_i::type (void)
+TAO_ValueDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -101,7 +101,7 @@ TAO_ValueDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueDef_i::type_i (void)
+TAO_ValueDef_i::type_i ()
 {
   /// Since valuetype type codes may encapsultate the type code of a
   /// base class, this call could be recursive, with the
@@ -113,7 +113,7 @@ TAO_ValueDef_i::type_i (void)
 }
 
 CORBA::InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces (void)
+TAO_ValueDef_i::supported_interfaces ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -123,7 +123,7 @@ TAO_ValueDef_i::supported_interfaces (void)
 }
 
 CORBA::InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces_i (void)
+TAO_ValueDef_i::supported_interfaces_i ()
 {
   CORBA::InterfaceDefSeq *seq = 0;
   ACE_NEW_RETURN (seq,
@@ -257,7 +257,7 @@ TAO_ValueDef_i::supported_interfaces_i (
 }
 
 CORBA::InitializerSeq *
-TAO_ValueDef_i::initializers (void)
+TAO_ValueDef_i::initializers ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -267,7 +267,7 @@ TAO_ValueDef_i::initializers (void)
 }
 
 CORBA::InitializerSeq *
-TAO_ValueDef_i::initializers_i (void)
+TAO_ValueDef_i::initializers_i ()
 {
   CORBA::InitializerSeq *iseq = 0;
   ACE_NEW_RETURN (iseq,
@@ -383,7 +383,7 @@ TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers)
 }
 
 CORBA::ValueDef_ptr
-TAO_ValueDef_i::base_value (void)
+TAO_ValueDef_i::base_value ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ());
 
@@ -393,7 +393,7 @@ TAO_ValueDef_i::base_value (void)
 }
 
 CORBA::ValueDef_ptr
-TAO_ValueDef_i::base_value_i (void)
+TAO_ValueDef_i::base_value_i ()
 {
   ACE_TString base_path;
   int status =
@@ -458,7 +458,7 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value)
 }
 
 CORBA::ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values (void)
+TAO_ValueDef_i::abstract_base_values ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -468,7 +468,7 @@ TAO_ValueDef_i::abstract_base_values (void)
 }
 
 CORBA::ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values_i (void)
+TAO_ValueDef_i::abstract_base_values_i ()
 {
   CORBA::ValueDefSeq *vd_seq = 0;
   ACE_NEW_RETURN (vd_seq,
@@ -585,7 +585,7 @@ TAO_ValueDef_i::abstract_base_values_i (
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_abstract (void)
+TAO_ValueDef_i::is_abstract ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -595,7 +595,7 @@ TAO_ValueDef_i::is_abstract (void)
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_abstract_i (void)
+TAO_ValueDef_i::is_abstract_i ()
 {
   CORBA::ULong is_it = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -624,7 +624,7 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract)
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_custom (void)
+TAO_ValueDef_i::is_custom ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -634,7 +634,7 @@ TAO_ValueDef_i::is_custom (void)
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_custom_i (void)
+TAO_ValueDef_i::is_custom_i ()
 {
   CORBA::ULong is_it = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -663,7 +663,7 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom)
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_truncatable (void)
+TAO_ValueDef_i::is_truncatable ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -673,7 +673,7 @@ TAO_ValueDef_i::is_truncatable (void)
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_truncatable_i (void)
+TAO_ValueDef_i::is_truncatable_i ()
 {
   CORBA::ULong is_it = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
@@ -800,7 +800,7 @@ TAO_ValueDef_i::is_a_i (const char *id)
 }
 
 CORBA::ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value (void)
+TAO_ValueDef_i::describe_value ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -810,7 +810,7 @@ TAO_ValueDef_i::describe_value (void)
 }
 
 CORBA::ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value_i (void)
+TAO_ValueDef_i::describe_value_i ()
 {
   CORBA::ValueDef::FullValueDescription *fv_desc = 0;
   ACE_NEW_RETURN (fv_desc,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index d446026e696..332b6004b6c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -14,18 +14,18 @@ TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void)
+TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_ValueMemberDef_i::def_kind (void)
+TAO_ValueMemberDef_i::def_kind ()
 {
   return CORBA::dk_ValueMember;
 }
 
 CORBA::Contained::Description *
-TAO_ValueMemberDef_i::describe (void)
+TAO_ValueMemberDef_i::describe ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -35,7 +35,7 @@ TAO_ValueMemberDef_i::describe (void)
 }
 
 CORBA::Contained::Description *
-TAO_ValueMemberDef_i::describe_i (void)
+TAO_ValueMemberDef_i::describe_i ()
 {
   CORBA::ValueMember vm;
   TAO_IFR_Desc_Utils<CORBA::ValueMember,
@@ -74,7 +74,7 @@ TAO_ValueMemberDef_i::describe_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueMemberDef_i::type (void)
+TAO_ValueMemberDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -84,7 +84,7 @@ TAO_ValueMemberDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueMemberDef_i::type_i (void)
+TAO_ValueMemberDef_i::type_i ()
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -97,7 +97,7 @@ TAO_ValueMemberDef_i::type_i (void)
 }
 
 CORBA::IDLType_ptr
-TAO_ValueMemberDef_i::type_def (void)
+TAO_ValueMemberDef_i::type_def ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
@@ -107,7 +107,7 @@ TAO_ValueMemberDef_i::type_def (void)
 }
 
 CORBA::IDLType_ptr
-TAO_ValueMemberDef_i::type_def_i (void)
+TAO_ValueMemberDef_i::type_def_i ()
 {
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -140,7 +140,7 @@ TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def)
 }
 
 CORBA::Visibility
-TAO_ValueMemberDef_i::access (void)
+TAO_ValueMemberDef_i::access ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -150,7 +150,7 @@ TAO_ValueMemberDef_i::access (void)
 }
 
 CORBA::Visibility
-TAO_ValueMemberDef_i::access_i (void)
+TAO_ValueMemberDef_i::access_i ()
 {
   CORBA::ULong val = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 5c1227b73f8..20c871b11fa 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -11,18 +11,18 @@ TAO_WstringDef_i::TAO_WstringDef_i (TAO_Repository_i *repo)
 {
 }
 
-TAO_WstringDef_i::~TAO_WstringDef_i (void)
+TAO_WstringDef_i::~TAO_WstringDef_i ()
 {
 }
 
 CORBA::DefinitionKind
-TAO_WstringDef_i::def_kind (void)
+TAO_WstringDef_i::def_kind ()
 {
   return CORBA::dk_Wstring;
 }
 
 void
-TAO_WstringDef_i::destroy (void)
+TAO_WstringDef_i::destroy ()
 {
   TAO_IFR_WRITE_GUARD;
 
@@ -32,7 +32,7 @@ TAO_WstringDef_i::destroy (void)
 }
 
 void
-TAO_WstringDef_i::destroy_i (void)
+TAO_WstringDef_i::destroy_i ()
 {
   ACE_TString name;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -45,7 +45,7 @@ TAO_WstringDef_i::destroy_i (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_WstringDef_i::type (void)
+TAO_WstringDef_i::type ()
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
@@ -55,14 +55,14 @@ TAO_WstringDef_i::type (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_WstringDef_i::type_i (void)
+TAO_WstringDef_i::type_i ()
 {
   CORBA::ULong bound = this->bound_i ();
 
   return this->repo_->tc_factory ()->create_wstring_tc (bound);
 }
 CORBA::ULong
-TAO_WstringDef_i::bound (void)
+TAO_WstringDef_i::bound ()
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
@@ -73,7 +73,7 @@ TAO_WstringDef_i::bound (void)
 
 
 CORBA::ULong
-TAO_WstringDef_i::bound_i (void)
+TAO_WstringDef_i::bound_i ()
 {
   u_int retval = 0;
   this->repo_->config ()->get_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 8d99f155162..67d80c65ad3 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -8,12 +8,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_HANDLE
-TAO_IOR_Multicast::get_handle (void) const
+TAO_IOR_Multicast::get_handle () const
 {
   return this->mcast_dgram_.get_handle ();
 }
 
-TAO_IOR_Multicast::TAO_IOR_Multicast (void)
+TAO_IOR_Multicast::TAO_IOR_Multicast ()
   : service_id_ ((TAO_Service_ID) 0)
 {
 }
@@ -32,7 +32,7 @@ TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior,
                 ACE_TEXT ("TAO_IOR_Multicast")));
 }
 
-TAO_IOR_Multicast::~TAO_IOR_Multicast (void)
+TAO_IOR_Multicast::~TAO_IOR_Multicast ()
 {
   if (ior_.length() > 0 && this->mcast_dgram_.leave (this->mcast_addr_) == -1)
     {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index cae9a5df6bf..184f5c13129 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -51,12 +51,12 @@ TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor (
     }
 }
 
-TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void)
+TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor ()
 {
 }
 
 CosLoadBalancing::Location *
-TAO_LB_CPU_Load_Average_Monitor::the_location (void)
+TAO_LB_CPU_Load_Average_Monitor::the_location ()
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -71,7 +71,7 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (void)
 }
 
 CosLoadBalancing::LoadList *
-TAO_LB_CPU_Load_Average_Monitor::loads (void)
+TAO_LB_CPU_Load_Average_Monitor::loads ()
 {
   CORBA::Float load = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 18568bc60e9..140d1fd5f2d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-double calc_cpu_loading (void)
+double calc_cpu_loading ()
 {
   static char buf[1024];
   static unsigned long prev_idle = 0;
@@ -100,12 +100,12 @@ TAO_LB_CPU_Utilization_Monitor::TAO_LB_CPU_Utilization_Monitor (const char * loc
     }
 }
 
-TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void)
+TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor ()
 {
 }
 
 CosLoadBalancing::Location *
-TAO_LB_CPU_Utilization_Monitor::the_location (void)
+TAO_LB_CPU_Utilization_Monitor::the_location ()
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -120,7 +120,7 @@ TAO_LB_CPU_Utilization_Monitor::the_location (void)
 }
 
 CosLoadBalancing::LoadList *
-TAO_LB_CPU_Utilization_Monitor::loads (void)
+TAO_LB_CPU_Utilization_Monitor::loads ()
 {
   CORBA::Float load = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index e8b7ed58bdd..434337ec336 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -13,13 +13,13 @@ TAO_LB_ClientComponent::init (int /* argc */, ACE_TCHAR * /* argv */[])
 }
 
 int
-TAO_LB_ClientComponent::fini (void)
+TAO_LB_ClientComponent::fini ()
 {
   return 0;
 }
 
 int
-TAO_LB_ClientComponent::register_orb_initializer (void)
+TAO_LB_ClientComponent::register_orb_initializer ()
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 359b4d493df..e21f4aa30cc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -40,7 +40,6 @@ class TAO_LoadBalancing_Export TAO_LB_ClientComponent
   : public ACE_Service_Object
 {
 public:
-
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -48,10 +47,8 @@ public:
   virtual int fini (void);
 
 protected:
-
   /// Register the LB_ClientComponent's ORBInitializer.
   int register_orb_initializer (void);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
index 0d26d87475c..9ce2a887ac8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -46,7 +46,6 @@ class TAO_LB_ClientORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name PortableInterceptor::ORBInitializer Methods
    *
@@ -58,7 +57,6 @@ public:
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index f0db0d42c80..60aff63da0d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -10,7 +10,7 @@ TAO_LB_ClientRequestInterceptor::name ()
 }
 
 void
-TAO_LB_ClientRequestInterceptor::destroy (void)
+TAO_LB_ClientRequestInterceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 0094a7f89cb..7346bc1e73e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -84,7 +84,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
 }
 
 int
-TAO_LB_Component::fini (void)
+TAO_LB_Component::fini ()
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index cd1014d001f..daf9dfa2485 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -26,13 +26,13 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor (
 }
 
 char *
-TAO_LB_IORInterceptor::name (void)
+TAO_LB_IORInterceptor::name ()
 {
   return CORBA::string_dup ("TAO_LB_IORInterceptor");
 }
 
 void
-TAO_LB_IORInterceptor::destroy (void)
+TAO_LB_IORInterceptor::destroy ()
 {
   // Force the LoadManager reference to be released since the ORB's
   // lifetime is tied to object reference lifetimes.
@@ -101,7 +101,7 @@ TAO_LB_IORInterceptor::adapter_state_changed (
 }
 
 void
-TAO_LB_IORInterceptor::register_load_alert (void)
+TAO_LB_IORInterceptor::register_load_alert ()
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index fe81e8323e5..a82d675db16 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -51,7 +51,6 @@ class TAO_LB_IORInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_LB_IORInterceptor (const CORBA::StringSeq & object_groups,
                          const CORBA::StringSeq & repository_ids,
@@ -92,12 +91,10 @@ public:
   //@}
 
 private:
-
   /// Create and register the LoadAlert object with the LoadManager.
   void register_load_alert (void);
 
 private:
-
   /// List of stringified object group references.
   const CORBA::StringSeq object_groups_;
 
@@ -122,7 +119,6 @@ private:
 
   /// Synchronize access to the class state.
   TAO_SYNCH_MUTEX lock_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 7768d687e3f..91e605558eb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -41,20 +41,20 @@ TAO_LB_LeastLoaded::TAO_LB_LeastLoaded (PortableServer::POA_ptr poa)
   TAO_LB_Random::init ();
 }
 
-TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void)
+TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded ()
 {
   delete this->load_map_;
   delete this->lock_;
 }
 
 char *
-TAO_LB_LeastLoaded::name (void)
+TAO_LB_LeastLoaded::name ()
 {
   return CORBA::string_dup ("LeastLoaded");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LeastLoaded::get_properties (void)
+TAO_LB_LeastLoaded::get_properties ()
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -293,7 +293,7 @@ TAO_LB_LeastLoaded::analyze_loads (
 }
 
 PortableServer::POA_ptr
-TAO_LB_LeastLoaded::_default_POA (void)
+TAO_LB_LeastLoaded::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index cfac64f7c8f..9dd963d8549 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -75,7 +75,6 @@ class TAO_LB_LeastLoaded
   : public virtual POA_CosLoadBalancing::Strategy
 {
 public:
-
   /// Constructor.
   TAO_LB_LeastLoaded (PortableServer::POA_ptr poa);
 
@@ -107,14 +106,12 @@ public:
   //@}
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Initialize the LeastLoaded instance with the given properties.
   void init (const PortableGroup::Properties & props);
 
 protected:
-
   /// Destructor.
   ~TAO_LB_LeastLoaded (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index dab05290bac..a1fccfa31cd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -6,18 +6,18 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LB_LoadAlert::TAO_LB_LoadAlert (void)
+TAO_LB_LoadAlert::TAO_LB_LoadAlert ()
   : alerted_ (0),
     lock_ ()
 {
 }
 
-TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void)
+TAO_LB_LoadAlert::~TAO_LB_LoadAlert ()
 {
 }
 
 void
-TAO_LB_LoadAlert::enable_alert (void)
+TAO_LB_LoadAlert::enable_alert ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
@@ -25,7 +25,7 @@ TAO_LB_LoadAlert::enable_alert (void)
 }
 
 void
-TAO_LB_LoadAlert::disable_alert (void)
+TAO_LB_LoadAlert::disable_alert ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index a0c270e0946..035fdf21aeb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -28,7 +28,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadAlert
   : public virtual POA_CosLoadBalancing::LoadAlert
 {
 public:
-
   /// Constructor.
   TAO_LB_LoadAlert (void);
 
@@ -62,14 +61,12 @@ public:
   virtual ~TAO_LB_LoadAlert (void);
 
 private:
-
   /// Has this LoadAlert servant been alerted of a high load condition
   /// by the LoadManager?
   CORBA::Boolean alerted_;
 
   /// Lock used to synchronized access to the LoadAlert state.
   mutable TAO_SYNCH_MUTEX lock_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
index fbba4fb425c..d19c4b29ddf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void)
+TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo ()
   : load_alert (),
     alerted (0)
 {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
index 0aa3cb0004e..4dec5ef7044 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -42,7 +42,6 @@ struct TAO_LB_LoadAlertInfo
   /// True if the LoadAlert object has been alerted about a given load
   /// condition.  False otherwise.
   CORBA::Boolean alerted;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index 0492f39e912..7a55a8bf123 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -4,12 +4,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
+TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler ()
 {
 }
 
 void
-TAO_LB_LoadAlert_Handler::enable_alert (void)
+TAO_LB_LoadAlert_Handler::enable_alert ()
 {
 }
 
@@ -24,7 +24,7 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep (
 }
 
 void
-TAO_LB_LoadAlert_Handler::disable_alert (void)
+TAO_LB_LoadAlert_Handler::disable_alert ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index 07ca4cfd154..a35561a416b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -40,23 +40,18 @@ class TAO_LB_LoadAlert_Handler
   : public virtual POA_CosLoadBalancing::AMI_LoadAlertHandler
 {
 public:
-
   virtual void enable_alert (void);
 
-  virtual void enable_alert_excep (
-      ::Messaging::ExceptionHolder *);
+  virtual void enable_alert_excep (::Messaging::ExceptionHolder *);
 
   virtual void disable_alert (void);
 
-  virtual void disable_alert_excep (
-      ::Messaging::ExceptionHolder *);
+  virtual void disable_alert_excep (::Messaging::ExceptionHolder *);
 
 protected:
-
   /// Protected destructor to enforce propery memory management
   /// through reference counting.
   ~TAO_LB_LoadAlert_Handler (void);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index 506b720ddb1..65b656bdee4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -39,20 +39,20 @@ TAO_LB_LoadAverage::TAO_LB_LoadAverage (PortableServer::POA_ptr poa)
   TAO_LB_Random::init ();
 }
 
-TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void)
+TAO_LB_LoadAverage::~TAO_LB_LoadAverage ()
 {
   delete this->load_map_;
   delete this->lock_;
 }
 
 char *
-TAO_LB_LoadAverage::name (void)
+TAO_LB_LoadAverage::name ()
 {
   return CORBA::string_dup ("LoadAverage");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LoadAverage::get_properties (void)
+TAO_LB_LoadAverage::get_properties ()
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -320,7 +320,7 @@ TAO_LB_LoadAverage::analyze_loads (
 }
 
 PortableServer::POA_ptr
-TAO_LB_LoadAverage::_default_POA (void)
+TAO_LB_LoadAverage::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 93b1d34637b..b5fb4e0a12f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -66,7 +66,7 @@ TAO_LB_LoadManager::TAO_LB_LoadManager (int ping_timeout,
   //       by whatever code instantiates this LoadManager.
 }
 
-TAO_LB_LoadManager::~TAO_LB_LoadManager (void)
+TAO_LB_LoadManager::~TAO_LB_LoadManager ()
 {
   this->shutdown_ = true;
   this->validate_condition_.signal ();
@@ -1162,7 +1162,7 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info)
 
 
 int
-TAO_LB_LoadManager::svc (void)
+TAO_LB_LoadManager::svc ()
 {
   while (! this->shutdown_)
   {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 506deccc859..3f09e937742 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -40,20 +40,20 @@ TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa)
   TAO_LB_Random::init ();
 }
 
-TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void)
+TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum ()
 {
   delete this->load_map_;
   delete this->lock_;
 }
 
 char *
-TAO_LB_LoadMinimum::name (void)
+TAO_LB_LoadMinimum::name ()
 {
   return CORBA::string_dup ("LoadMinimum");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LoadMinimum::get_properties (void)
+TAO_LB_LoadMinimum::get_properties ()
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -357,7 +357,7 @@ TAO_LB_LoadMinimum::analyze_loads (
 }
 
 PortableServer::POA_ptr
-TAO_LB_LoadMinimum::_default_POA (void)
+TAO_LB_LoadMinimum::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index 16f8052feaa..a95028fa71e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -76,7 +76,6 @@ class TAO_LB_LoadMinimum
   : public virtual POA_CosLoadBalancing::Strategy
 {
 public:
-
   /// Constructor.
   TAO_LB_LoadMinimum (PortableServer::POA_ptr poa);
 
@@ -108,14 +107,12 @@ public:
   //@}
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Initialize the LoadMinimum instance with the given properties.
   void init (const PortableGroup::Properties & props);
 
 protected:
-
   /// Destructor.
   ~TAO_LB_LoadMinimum (void);
 
@@ -142,7 +139,6 @@ protected:
                                CORBA::Float & value);
 
 private:
-
   /// This servant's default POA.
   PortableServer::POA_var poa_;
 
@@ -173,7 +169,6 @@ private:
   CORBA::Float per_balance_load_;
 
   //@}
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 90fda5e5db8..31b974fd655 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -47,14 +47,14 @@ TAO_LB_ObjectReferenceFactory::TAO_LB_ObjectReferenceFactory (
 }
 
 ::CORBA::ValueBase *
-TAO_LB_ObjectReferenceFactory::_copy_value (void)
+TAO_LB_ObjectReferenceFactory::_copy_value ()
 {
   ::CORBA::ValueBase *ret_val= 0;
   // Not implimented
   return ret_val;
 }
 
-TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void)
+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.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index a84d6345130..6e44f3ce5d6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void)
+TAO_LB_Pull_Handler::TAO_LB_Pull_Handler ()
   : monitor_map_ (0),
     load_manager_ (0)
 {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index 96dcc7c5f31..12dc31cc68b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -23,13 +23,13 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa)
 }
 
 char *
-TAO_LB_Random::name (void)
+TAO_LB_Random::name ()
 {
   return CORBA::string_dup ("Random");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_Random::get_properties (void)
+TAO_LB_Random::get_properties ()
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -85,7 +85,7 @@ TAO_LB_Random::analyze_loads (
 }
 
 PortableServer::POA_ptr
-TAO_LB_Random::_default_POA (void)
+TAO_LB_Random::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -133,7 +133,7 @@ TAO_LB_Random::_tao_next_member (
 }
 
 void
-TAO_LB_Random::init (void)
+TAO_LB_Random::init ()
 {
 #ifdef ACE_HAS_PTHREADS
   (void) ::pthread_once (&::tao_lb_once_control,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index cfddac5559a..23ab22f39c7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -15,18 +15,18 @@ TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa)
 {
 }
 
-TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void)
+TAO_LB_RoundRobin::~TAO_LB_RoundRobin ()
 {
 }
 
 char *
-TAO_LB_RoundRobin::name (void)
+TAO_LB_RoundRobin::name ()
 {
   return CORBA::string_dup ("RoundRobin");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_RoundRobin::get_properties (void)
+TAO_LB_RoundRobin::get_properties ()
 {
   // There are no RoundRobin properties.  Return an empty property
   // list.
@@ -182,7 +182,7 @@ TAO_LB_RoundRobin::analyze_loads (
 }
 
 PortableServer::POA_ptr
-TAO_LB_RoundRobin::_default_POA (void)
+TAO_LB_RoundRobin::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index bccb7ac7c05..b3a8dfa4f56 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -12,18 +12,18 @@ TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor (
 {
 }
 
-TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void)
+TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor ()
 {
 }
 
 char *
-TAO_LB_ServerRequestInterceptor::name (void)
+TAO_LB_ServerRequestInterceptor::name ()
 {
   return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor");
 }
 
 void
-TAO_LB_ServerRequestInterceptor::destroy (void)
+TAO_LB_ServerRequestInterceptor::destroy ()
 {
 }
 
@@ -125,7 +125,6 @@ TAO_LB_ServerRequestInterceptor::send_exception (
     {
       // A CORBA::TRANSIENT is thrown when the LoadManager informs the
       // LoadAlert object that its member is overloaded, for example.
-
       ORBSVCS_DEBUG ((LM_INFO,
                   ACE_TEXT ("TAO_LB_ServerRequestInterceptor -- ")
                   ACE_TEXT ("Exception thrown.\n")));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index cb95039e570..a3ad143d70b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -49,7 +49,6 @@ class TAO_LoadBalancing_Export TAO_LB_ServerRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_LB_ServerRequestInterceptor (TAO_LB_LoadAlert & load_alert);
 
@@ -82,7 +81,6 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce correct memory management via
@@ -91,9 +89,7 @@ protected:
   ~TAO_LB_ServerRequestInterceptor (void);
 
 private:
-
   TAO_LB_LoadAlert & load_alert_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/README b/TAO/orbsvcs/orbsvcs/LoadBalancing/README
index 84bf1466c3e..175e8e074fd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/README
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/README
@@ -1,5 +1,3 @@
-
-
 This directory contains the implementations of the TAO Load Balancing
 service, which is called as Cygnus.
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 27860277a4f..a7295c933e3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -3,11 +3,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void)
+TAO_BasicLogFactory_i::TAO_BasicLogFactory_i ()
 {
 }
 
-TAO_BasicLogFactory_i::~TAO_BasicLogFactory_i (void)
+TAO_BasicLogFactory_i::~TAO_BasicLogFactory_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index d55c9656420..b0b30c1bf4b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -15,7 +15,7 @@ TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb,
   // No-Op.
 }
 
-TAO_BasicLog_i::~TAO_BasicLog_i (void)
+TAO_BasicLog_i::~TAO_BasicLog_i ()
 {
   // No-Op.
 }
@@ -54,7 +54,7 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id)
 }
 
 void
-TAO_BasicLog_i::destroy (void)
+TAO_BasicLog_i::destroy ()
 {
   // Remove ourselves from the list of logs.
   this->logmgr_i_.remove (this->logid_);
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index abc0f9e0718..52752db1dff 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -9,7 +9,7 @@ TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log)
 {
 }
 
-TAO_Event_LogConsumer::~TAO_Event_LogConsumer (void)
+TAO_Event_LogConsumer::~TAO_Event_LogConsumer ()
 {
 }
 
@@ -79,7 +79,7 @@ TAO_Event_LogConsumer::push (const CORBA::Any& data)
 }
 
 void
-TAO_Event_LogConsumer::disconnect_push_consumer (void)
+TAO_Event_LogConsumer::disconnect_push_consumer ()
 {
   this->supplier_proxy_->disconnect_push_supplier ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index bad86505f10..d2e0a1955cc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) :
+TAO_EventLogFactory_i::TAO_EventLogFactory_i () :
   impl (0),
   notifier_ (0)
 {
@@ -33,7 +33,7 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) :
     }
 }
 
-TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void)
+TAO_EventLogFactory_i::~TAO_EventLogFactory_i ()
 {
   // No-Op.
 }
@@ -45,7 +45,7 @@ TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */)
 
   CosEventChannelAdmin::EventChannel_var ec_return;
 
-  auto_ptr <TAO_CEC_EventChannel> ec (impl);
+  std::unique_ptr <TAO_CEC_EventChannel> ec (impl);
 
   PortableServer::ObjectId_var oid =
     this->poa_->activate_object (ec.get ());
@@ -186,13 +186,13 @@ TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EventLogFactory_i::obtain_push_supplier (void)
+TAO_EventLogFactory_i::obtain_push_supplier ()
 {
   return consumer_admin_->obtain_push_supplier ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_EventLogFactory_i::obtain_pull_supplier (void)
+TAO_EventLogFactory_i::obtain_pull_supplier ()
 
 {
   return consumer_admin_->obtain_pull_supplier ();
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 16e8d79994b..624b26e8946 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -11,13 +11,13 @@ TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventC
   obtain_proxy_consumer ();
 }
 
-TAO_EventLogNotification::~TAO_EventLogNotification (void)
+TAO_EventLogNotification::~TAO_EventLogNotification ()
 {
   // No-Op.
 }
 
 void
-TAO_EventLogNotification::disconnect_push_supplier (void)
+TAO_EventLogNotification::disconnect_push_supplier ()
 {
   this->consumer_->disconnect_push_consumer ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 90bb1ee624d..6ede219f2e6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -69,7 +69,7 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id)
 
 
 void
-TAO_EventLog_i::destroy (void)
+TAO_EventLog_i::destroy ()
 {
   // Send event to indicate the log has been deleted.
   notifier_->object_deletion (logid_);
@@ -85,7 +85,7 @@ TAO_EventLog_i::destroy (void)
 }
 
 void
-TAO_EventLog_i::activate (void)
+TAO_EventLog_i::activate ()
 {
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
   this->event_channel_->for_consumers ();
@@ -97,13 +97,13 @@ TAO_EventLog_i::activate (void)
 
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_EventLog_i::for_consumers (void)
+TAO_EventLog_i::for_consumers ()
 {
   return this->event_channel_->for_consumers ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_EventLog_i::for_suppliers (void)
+TAO_EventLog_i::for_suppliers ()
 {
   return this->event_channel_->for_suppliers ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index 6ad7296b210..25e6b7d1017 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -25,7 +25,7 @@ TAO_Hash_Iterator_i::TAO_Hash_Iterator_i (
 }
 
 
-TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i (void)
+TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index 961c2839023..93c5607b08d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -72,44 +72,44 @@ TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (
     log_poa->create_POA(buf, poa_manager.in(), policies);
 }
 
-TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore (void)
+TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore ()
 {
   this->iterator_poa_->destroy (1, 0);
 }
 
 int
-TAO_Hash_LogRecordStore::open (void)
+TAO_Hash_LogRecordStore::open ()
 {
   return rec_map_.open ();
 }
 
 int
-TAO_Hash_LogRecordStore::close (void)
+TAO_Hash_LogRecordStore::close ()
 {
   // Close the hash
   return rec_map_.close ();
 }
 
 CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_current_size (void)
+TAO_Hash_LogRecordStore::get_current_size ()
 {
   return this->current_size_;
 }
 
 CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_n_records (void)
+TAO_Hash_LogRecordStore::get_n_records ()
 {
   return this->num_records_;
 }
 
 CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_gauge (void)
+TAO_Hash_LogRecordStore::get_gauge ()
 {
   return this->gauge_;
 }
 
 void
-TAO_Hash_LogRecordStore::reset_gauge (void)
+TAO_Hash_LogRecordStore::reset_gauge ()
 {
   this->gauge_ = 0;
 }
@@ -209,7 +209,7 @@ TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter)
 }
 
 int
-TAO_Hash_LogRecordStore::purge_old_records (void)
+TAO_Hash_LogRecordStore::purge_old_records ()
 {
   CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U;
 
@@ -315,7 +315,7 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id)
 
 
 int
-TAO_Hash_LogRecordStore::flush (void)
+TAO_Hash_LogRecordStore::flush ()
 {
   return 0;
 }
@@ -543,7 +543,7 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i
 }
 
 CORBA::ULong
-TAO_Hash_LogRecordStore::remove_old_records (void)
+TAO_Hash_LogRecordStore::remove_old_records ()
 {
   if (this->max_record_life_ == 0) {
     return 0;
@@ -597,7 +597,7 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar)
 
 
 DsLogAdmin::AdministrativeState
-TAO_Hash_LogRecordStore::get_administrative_state (void) const
+TAO_Hash_LogRecordStore::get_administrative_state () const
 {
   return this->admin_state_;
 }
@@ -610,7 +610,7 @@ TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeSta
 
 
 DsLogAdmin::CapacityAlarmThresholdList*
-TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (void) const
+TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds () const
 {
   DsLogAdmin::CapacityAlarmThresholdList* ret_val;
   ACE_NEW_THROW_EX (ret_val,
@@ -629,7 +629,7 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci
 
 
 DsLogAdmin::ForwardingState
-TAO_Hash_LogRecordStore::get_forwarding_state (void) const
+TAO_Hash_LogRecordStore::get_forwarding_state () const
 {
   return this->forward_state_;
 }
@@ -641,7 +641,7 @@ TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state
 }
 
 DsLogAdmin::TimeInterval
-TAO_Hash_LogRecordStore::get_interval (void) const
+TAO_Hash_LogRecordStore::get_interval () const
 {
   return this->interval_;
 }
@@ -654,7 +654,7 @@ TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval)
 
 
 DsLogAdmin::LogFullActionType
-TAO_Hash_LogRecordStore::get_log_full_action (void) const
+TAO_Hash_LogRecordStore::get_log_full_action () const
 {
   return this->log_full_action_;
 }
@@ -666,7 +666,7 @@ TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType acti
 }
 
 DsLogAdmin::QoSList *
-TAO_Hash_LogRecordStore::get_log_qos (void) const
+TAO_Hash_LogRecordStore::get_log_qos () const
 {
   DsLogAdmin::QoSList* ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
@@ -683,7 +683,7 @@ TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos)
 }
 
 CORBA::ULong
-TAO_Hash_LogRecordStore::get_max_record_life (void) const
+TAO_Hash_LogRecordStore::get_max_record_life () const
 {
   return this->max_record_life_;
 }
@@ -695,7 +695,7 @@ TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life)
 }
 
 CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_max_size (void) const
+TAO_Hash_LogRecordStore::get_max_size () const
 {
   return this->max_size_;
 }
@@ -707,7 +707,7 @@ TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size)
 }
 
 DsLogAdmin::WeekMask*
-TAO_Hash_LogRecordStore::get_week_mask (void)
+TAO_Hash_LogRecordStore::get_week_mask ()
 {
   DsLogAdmin::WeekMask* ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index 1cbfed1dc8c..60e527cd359 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -18,7 +18,7 @@ TAO_Hash_LogStore::~TAO_Hash_LogStore()
 
 
 DsLogAdmin::LogList*
-TAO_Hash_LogStore::list_logs (void)
+TAO_Hash_LogStore::list_logs ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -54,7 +54,7 @@ TAO_Hash_LogStore::list_logs (void)
 }
 
 DsLogAdmin::LogIdList*
-TAO_Hash_LogStore::list_logs_by_id (void)
+TAO_Hash_LogStore::list_logs_by_id ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -168,7 +168,7 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action,
                                              ),
                     CORBA::NO_MEMORY ());
 
-  auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
+  std::unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
 
   if (this->hash_map_.bind (id, recordstore.get ()) != 0)
     {
@@ -205,7 +205,7 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
                                              ),
                     CORBA::NO_MEMORY ());
 
-  auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
+  std::unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
 
   if (this->hash_map_.bind (id, recordstore.get ()) != 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 751c18bdf8c..ae82ec30f30 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -19,7 +19,7 @@ TAO_Iterator_i::TAO_Iterator_i (PortableServer::POA_ptr poa,
 }
 
 
-TAO_Iterator_i::~TAO_Iterator_i (void)
+TAO_Iterator_i::~TAO_Iterator_i ()
 {
   // cancel timer
   if (this->timer_id_ != -1)
@@ -30,7 +30,7 @@ TAO_Iterator_i::~TAO_Iterator_i (void)
 
 
 void
-TAO_Iterator_i::destroy (void)
+TAO_Iterator_i::destroy ()
 {
   PortableServer::ObjectId_var oid =
     this->poa_->servant_to_id (this);
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index f9db2b037ca..7c5977d684d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -146,14 +146,14 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id)
 }
 
 DsLogAdmin::LogList*
-TAO_LogMgr_i::list_logs (void)
+TAO_LogMgr_i::list_logs ()
 {
   return this->logstore_->list_logs ();
 }
 
 
 DsLogAdmin::LogIdList*
-TAO_LogMgr_i::list_logs_by_id (void)
+TAO_LogMgr_i::list_logs_by_id ()
 {
   return this->logstore_->list_logs_by_id ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 0e49232f712..44054f36974 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -6,11 +6,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LogNotification::TAO_LogNotification (void)
+TAO_LogNotification::TAO_LogNotification ()
 {
 }
 
-TAO_LogNotification::~TAO_LogNotification (void)
+TAO_LogNotification::~TAO_LogNotification ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index dd2b50b8f31..cefd5f77fa7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -2,11 +2,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LogRecordStore::TAO_LogRecordStore (void)
+TAO_LogRecordStore::TAO_LogRecordStore ()
 {
 }
 
-TAO_LogRecordStore::~TAO_LogRecordStore (void)
+TAO_LogRecordStore::~TAO_LogRecordStore ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index c6799199f43..2aec6a518ba 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -24,7 +24,7 @@ TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
     }
 }
 
-TAO_Log_Constraint_Interpreter::~TAO_Log_Constraint_Interpreter (void)
+TAO_Log_Constraint_Interpreter::~TAO_Log_Constraint_Interpreter ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
index 76e3cb801d5..926277a0f3f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
@@ -46,7 +46,7 @@ class TAO_Log_Serv_Export TAO_Log_Persistence_Strategy
 public:
   /// @brief Log Store Factory
   virtual TAO_LogStore*
-    create_log_store (TAO_LogMgr_i* logmgr_i)     = 0;
+    create_log_store (TAO_LogMgr_i* logmgr_i) = 0;
 
 private:
 };
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index d3c65eac212..ce5d326a07d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -40,7 +40,7 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb,
 }
 
 void
-TAO_Log_i::init (void)
+TAO_Log_i::init ()
 {
   this->log_ =
     logmgr_i_.create_log_reference (this->logid_);
@@ -89,24 +89,24 @@ TAO_Log_i::init (void)
   this->op_state_ = DsLogAdmin::enabled;
 }
 
-TAO_Log_i::~TAO_Log_i (void)
+TAO_Log_i::~TAO_Log_i ()
 {
 }
 
 DsLogAdmin::LogMgr_ptr
-TAO_Log_i::my_factory (void)
+TAO_Log_i::my_factory ()
 {
   return DsLogAdmin::LogMgr::_duplicate (this->factory_.in ());
 }
 
 DsLogAdmin::LogId
-TAO_Log_i::id (void)
+TAO_Log_i::id ()
 {
   return logid_;
 }
 
 DsLogAdmin::QoSList*
-TAO_Log_i::get_log_qos (void)
+TAO_Log_i::get_log_qos ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -172,7 +172,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos)
 }
 
 CORBA::ULong
-TAO_Log_i::get_max_record_life (void)
+TAO_Log_i::get_max_record_life ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -222,7 +222,7 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life)
 }
 
 CORBA::ULongLong
-TAO_Log_i::get_max_size (void)
+TAO_Log_i::get_max_size ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -293,7 +293,7 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size)
 }
 
 CORBA::ULongLong
-TAO_Log_i::get_current_size (void)
+TAO_Log_i::get_current_size ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -304,7 +304,7 @@ TAO_Log_i::get_current_size (void)
 }
 
 CORBA::ULongLong
-TAO_Log_i::get_n_records (void)
+TAO_Log_i::get_n_records ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -315,7 +315,7 @@ TAO_Log_i::get_n_records (void)
 }
 
 DsLogAdmin::LogFullActionType
-TAO_Log_i::get_log_full_action (void)
+TAO_Log_i::get_log_full_action ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -379,7 +379,7 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action)
 }
 
 DsLogAdmin::AdministrativeState
-TAO_Log_i::get_administrative_state (void)
+TAO_Log_i::get_administrative_state ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -422,7 +422,7 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state)
 }
 
 DsLogAdmin::ForwardingState
-TAO_Log_i::get_forwarding_state (void)
+TAO_Log_i::get_forwarding_state ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -466,7 +466,7 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state)
 }
 
 DsLogAdmin::OperationalState
-TAO_Log_i::get_operational_state (void)
+TAO_Log_i::get_operational_state ()
 {
   // No locks are necessary, since op_state_ is set in ::init() and
   // never changed.
@@ -474,7 +474,7 @@ TAO_Log_i::get_operational_state (void)
 }
 
 DsLogAdmin::TimeInterval
-TAO_Log_i::get_interval (void)
+TAO_Log_i::get_interval ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -536,7 +536,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval)
 }
 
 DsLogAdmin::AvailabilityStatus
-TAO_Log_i::get_availability_status (void)
+TAO_Log_i::get_availability_status ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -547,7 +547,7 @@ TAO_Log_i::get_availability_status (void)
 }
 
 DsLogAdmin::AvailabilityStatus
-TAO_Log_i::get_availability_status_i (void)
+TAO_Log_i::get_availability_status_i ()
 {
   // The log is considered "on duty" if all the following are true:
   //   * operational state is enabled
@@ -575,7 +575,7 @@ TAO_Log_i::get_availability_status_i (void)
 }
 
 DsLogAdmin::CapacityAlarmThresholdList*
-TAO_Log_i::get_capacity_alarm_thresholds (void)
+TAO_Log_i::get_capacity_alarm_thresholds ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -645,7 +645,7 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
 }
 
 DsLogAdmin::WeekMask*
-TAO_Log_i::get_week_mask (void)
+TAO_Log_i::get_week_mask ()
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
@@ -942,14 +942,14 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id)
 }
 
 void
-TAO_Log_i::flush (void)
+TAO_Log_i::flush ()
 {
   /// XXX locks?
   this->recordstore_->flush ();
 }
 
 CORBA::Boolean
-TAO_Log_i::scheduled (void)
+TAO_Log_i::scheduled ()
 {
   DsLogAdmin::TimeInterval interval =
     this->recordstore_->get_interval ();
@@ -1043,7 +1043,7 @@ TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log)
 }
 
 void
-TAO_Log_i::remove_old_records (void)
+TAO_Log_i::remove_old_records ()
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                             guard,
@@ -1074,7 +1074,7 @@ TAO_Log_i::remove_old_records (void)
 }
 
 void
-TAO_Log_i::check_capacity_alarm_threshold (void)
+TAO_Log_i::check_capacity_alarm_threshold ()
 {
   const CORBA::ULongLong max_size =
     this->recordstore_->get_max_size ();
@@ -1135,7 +1135,7 @@ TAO_Log_i::check_capacity_alarm_threshold (void)
 }
 
 void
-TAO_Log_i::reset_capacity_alarm_threshold (void)
+TAO_Log_i::reset_capacity_alarm_threshold ()
 {
   const CORBA::ULongLong max_size =
     this->recordstore_->get_max_size ();
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index b9d834eafad..9d46942ca69 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -9,7 +9,7 @@ TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log)
 {
 }
 
-TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void)
+TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer ()
 {
 }
 
@@ -38,7 +38,7 @@ TAO_Notify_LogConsumer::connect (
 }
 
 void
-TAO_Notify_LogConsumer::disconnect (void)
+TAO_Notify_LogConsumer::disconnect ()
 {
   this->proxy_supplier_->
     disconnect_push_supplier();
@@ -111,7 +111,7 @@ TAO_Notify_LogConsumer::push
 
 void
 TAO_Notify_LogConsumer::disconnect_push_consumer
-   (void)
+   ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index ab114d23ada..2b444c1a68b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void)
+TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i ()
 {
 }
 
@@ -172,25 +172,25 @@ TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_NotifyLogFactory_i::MyID (void)
+TAO_NotifyLogFactory_i::MyID ()
 {
   return consumer_admin_->MyID ();
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_NotifyLogFactory_i::MyChannel (void)
+TAO_NotifyLogFactory_i::MyChannel ()
 {
   throw CORBA::NO_IMPLEMENT();
 }
 
 CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_NotifyLogFactory_i::MyOperator (void)
+TAO_NotifyLogFactory_i::MyOperator ()
 {
   return consumer_admin_->MyOperator ();
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_NotifyLogFactory_i::priority_filter (void)
+TAO_NotifyLogFactory_i::priority_filter ()
 {
   return consumer_admin_->priority_filter ();
 }
@@ -202,7 +202,7 @@ TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filt
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_NotifyLogFactory_i::lifetime_filter (void)
+TAO_NotifyLogFactory_i::lifetime_filter ()
 {
   return consumer_admin_->lifetime_filter ();
 }
@@ -214,13 +214,13 @@ TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filt
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NotifyLogFactory_i::pull_suppliers (void)
+TAO_NotifyLogFactory_i::pull_suppliers ()
 {
   return consumer_admin_->pull_suppliers ();
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NotifyLogFactory_i::push_suppliers (void)
+TAO_NotifyLogFactory_i::push_suppliers ()
 {
   return consumer_admin_->push_suppliers ();
 }
@@ -266,7 +266,7 @@ TAO_NotifyLogFactory_i::obtain_pull_supplier (
 }
 
 void
-TAO_NotifyLogFactory_i::destroy (void)
+TAO_NotifyLogFactory_i::destroy ()
 {
   // No-Op.
 }
@@ -280,7 +280,7 @@ TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq
 }
 
 CosNotification::QoSProperties*
-TAO_NotifyLogFactory_i::get_qos (void)
+TAO_NotifyLogFactory_i::get_qos ()
 {
   return consumer_admin_->get_qos ();
 }
@@ -317,13 +317,13 @@ TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id)
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_NotifyLogFactory_i::get_all_filters (void)
+TAO_NotifyLogFactory_i::get_all_filters ()
 {
   return consumer_admin_->get_all_filters ();
 }
 
 void
-TAO_NotifyLogFactory_i::remove_all_filters (void)
+TAO_NotifyLogFactory_i::remove_all_filters ()
 {
   consumer_admin_->remove_all_filters ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index 3ebc0c046a5..725c4952af7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -35,7 +35,7 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification (
   proxy_consumer_->connect_any_push_supplier (objref.in ());
 }
 
-TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void)
+TAO_NotifyLogNotification::~TAO_NotifyLogNotification ()
 {
   // No-Op.
 }
@@ -55,7 +55,7 @@ TAO_NotifyLogNotification::subscription_change
 }
 
 void
-TAO_NotifyLogNotification::disconnect_push_supplier (void)
+TAO_NotifyLogNotification::disconnect_push_supplier ()
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index db2aaaf9226..3cf48ab0234 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -75,7 +75,7 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id)
 
 
 void
-TAO_NotifyLog_i::destroy (void)
+TAO_NotifyLog_i::destroy ()
 {
   notifier_->object_deletion (logid_);
 
@@ -90,7 +90,7 @@ TAO_NotifyLog_i::destroy (void)
 }
 
 void
-TAO_NotifyLog_i::activate (void)
+TAO_NotifyLog_i::activate ()
 {
 
   CosNotifyChannelAdmin::AdminID adminid = 0;
@@ -122,7 +122,7 @@ TAO_NotifyLog_i::activate (void)
 
 //IDL to C++
 CosNotifyFilter::Filter_ptr
-TAO_NotifyLog_i::get_filter (void)
+TAO_NotifyLog_i::get_filter ()
 {
   //TODO: need to add impl
   throw CORBA::NO_IMPLEMENT ();
@@ -137,26 +137,26 @@ TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */)
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_NotifyLog_i::MyFactory (void)
+TAO_NotifyLog_i::MyFactory ()
 {
   //TODO: need to add impl
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NotifyLog_i::default_consumer_admin (void)
+TAO_NotifyLog_i::default_consumer_admin ()
 {
   return this->event_channel_->default_consumer_admin ();
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NotifyLog_i::default_supplier_admin (void)
+TAO_NotifyLog_i::default_supplier_admin ()
 {
   return this->event_channel_->default_supplier_admin ();
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_NotifyLog_i::default_filter_factory (void)
+TAO_NotifyLog_i::default_filter_factory ()
 {
   return this->event_channel_->default_filter_factory ();
 }
@@ -188,19 +188,19 @@ TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_NotifyLog_i::get_all_consumeradmins (void)
+TAO_NotifyLog_i::get_all_consumeradmins ()
 {
   return this->event_channel_->get_all_consumeradmins ();
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_NotifyLog_i::get_all_supplieradmins (void)
+TAO_NotifyLog_i::get_all_supplieradmins ()
 {
   return this->event_channel_->get_all_supplieradmins ();
 }
 
 CosNotification::AdminProperties*
-TAO_NotifyLog_i::get_admin (void)
+TAO_NotifyLog_i::get_admin ()
 {
   return this->event_channel_->get_admin ();
 }
@@ -212,7 +212,7 @@ TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin)
 }
 
 CosNotification::QoSProperties*
-TAO_NotifyLog_i::get_qos (void)
+TAO_NotifyLog_i::get_qos ()
 {
   //need to add merging of QoS from Log_i and EventChannel_i
   throw CORBA::NO_IMPLEMENT ();
@@ -236,7 +236,7 @@ TAO_NotifyLog_i::validate_qos (
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_NotifyLog_i::for_consumers (void)
+TAO_NotifyLog_i::for_consumers ()
 {
   return this->event_channel_->for_consumers();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index 1e26e39f1fa..a20179e0a89 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -20,7 +20,7 @@ TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log)
 {
 }
 
-TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer (void)
+TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer ()
 {
 }
 
@@ -52,7 +52,7 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events)
 }
 
 void
-TAO_Rtec_LogConsumer::disconnect_push_consumer (void)
+TAO_Rtec_LogConsumer::disconnect_push_consumer ()
 {
   this->supplier_proxy_->disconnect_push_supplier ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index ffe4ebc38af..3b689030332 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -19,7 +19,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i (void) :
+TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i () :
   impl (0),
   notifier_ (0)
 {
@@ -46,7 +46,7 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
                     TAO_EC_Event_Channel (attr),
                     CORBA::NO_MEMORY ());
 
-  auto_ptr <TAO_EC_Event_Channel> ec (impl);
+  std::unique_ptr <TAO_EC_Event_Channel> ec (impl);
 
   impl->activate ();
 
@@ -69,7 +69,7 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
 }
 
 RTEventLogAdmin::EventLogFactory_ptr
-TAO_RTEventLogFactory_i::activate (void)
+TAO_RTEventLogFactory_i::activate ()
 {
   RTEventLogAdmin::EventLogFactory_var v_return;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index 27929151778..bbcc5c060af 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -29,19 +29,19 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification (
   obtainProxyConsumer ();
 }
 
-TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void)
+TAO_RTEventLogNotification::~TAO_RTEventLogNotification ()
 {
   // No-Op.
 }
 
 void
-TAO_RTEventLogNotification::disconnect_push_supplier (void)
+TAO_RTEventLogNotification::disconnect_push_supplier ()
 {
   // No-Op.
 }
 
 void
-TAO_RTEventLogNotification::obtainProxyConsumer (void)
+TAO_RTEventLogNotification::obtainProxyConsumer ()
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     event_channel_->for_suppliers();
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 08f783e807c..c63d99d4e41 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -74,7 +74,7 @@ TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id)
 }
 
 void
-TAO_RTEventLog_i::destroy (void)
+TAO_RTEventLog_i::destroy ()
 {
   notifier_->object_deletion (logid_);
 
@@ -88,7 +88,7 @@ TAO_RTEventLog_i::destroy (void)
 }
 
 void
-TAO_RTEventLog_i::activate (void)
+TAO_RTEventLog_i::activate ()
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     this->event_channel_->for_consumers ();
@@ -98,13 +98,13 @@ TAO_RTEventLog_i::activate (void)
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_RTEventLog_i::for_consumers (void)
+TAO_RTEventLog_i::for_consumers ()
 {
   return this->event_channel_->for_consumers();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_RTEventLog_i::for_suppliers (void)
+TAO_RTEventLog_i::for_suppliers ()
 {
   return this->event_channel_->for_suppliers();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
index dfabfd4984b..32020a57daa 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IntId::TAO_IntId (void)
+TAO_IntId::TAO_IntId ()
   : type_ (CosNaming::nobject)
 {
   ref_ = CORBA::Object::_nil ();
@@ -29,7 +29,7 @@ TAO_IntId::TAO_IntId (const TAO_IntId &rhs)
   ref_ = CORBA::Object::_duplicate (rhs.ref_);
 }
 
-TAO_IntId::~TAO_IntId (void)
+TAO_IntId::~TAO_IntId ()
 {
   CORBA::release (ref_);
 }
@@ -47,7 +47,7 @@ TAO_IntId::operator= (const TAO_IntId &rhs)
   ref_ = CORBA::Object::_duplicate (rhs.ref_);
 }
 
-TAO_ExtId::TAO_ExtId (void)
+TAO_ExtId::TAO_ExtId ()
   : kind_ (),
     id_ ()
 {
@@ -66,18 +66,18 @@ TAO_ExtId::TAO_ExtId (const TAO_ExtId &rhs)
   kind_ = rhs.kind_;
 }
 
-TAO_ExtId::~TAO_ExtId (void)
+TAO_ExtId::~TAO_ExtId ()
 {
 }
 
 const char *
-TAO_ExtId::id (void)
+TAO_ExtId::id ()
 {
   return id_.fast_rep ();
 }
 
 const char *
-TAO_ExtId::kind (void)
+TAO_ExtId::kind ()
 {
   return kind_.fast_rep ();
 }
@@ -106,7 +106,7 @@ TAO_ExtId::operator!= (const TAO_ExtId &rhs) const
 }
 
 u_long
-TAO_ExtId::hash (void) const
+TAO_ExtId::hash () const
 {
   ACE_CString temp (id_);
   temp += kind_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
index 4178727920b..4a3c0bafc58 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
@@ -60,7 +60,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Naming_Manager::TAO_FT_Naming_Manager (void)
+TAO_FT_Naming_Manager::TAO_FT_Naming_Manager ()
   : factory_registry_ ("NamingManager::FactoryRegistry"),
     group_factory_ (),
     use_global_ (false),
@@ -79,7 +79,7 @@ TAO_FT_Naming_Manager::TAO_FT_Naming_Manager (void)
     ::FT_Naming::TAO_FT_OBJECT_GROUP_NAME;
 }
 
-TAO_FT_Naming_Manager::~TAO_FT_Naming_Manager (void)
+TAO_FT_Naming_Manager::~TAO_FT_Naming_Manager ()
 {
   this->object_group_property_name_.length (0);
   this->built_in_balancing_strategy_name_.length (0);
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 ae540b2cd65..ae18aa384f8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
@@ -87,12 +87,12 @@ TAO_FT_Naming_Replication_Manager::TAO_FT_Naming_Replication_Manager (TAO_FT_Nam
 {
 }
 
-TAO_FT_Naming_Replication_Manager::~TAO_FT_Naming_Replication_Manager(void)
+TAO_FT_Naming_Replication_Manager::~TAO_FT_Naming_Replication_Manager()
 {
 }
 
 void
-TAO_FT_Naming_Replication_Manager::init_orb (void)
+TAO_FT_Naming_Replication_Manager::init_orb ()
 {
   int argc = 8;
   ACE_TCHAR *argv[11];
@@ -132,19 +132,19 @@ TAO_FT_Naming_Replication_Manager::init_orb (void)
 }
 
 char *
-TAO_FT_Naming_Replication_Manager::ior (void)
+TAO_FT_Naming_Replication_Manager::ior ()
 {
   return this->orb_->object_to_string (this->me_.in ());
 }
 
 bool
-TAO_FT_Naming_Replication_Manager::peer_available (void)
+TAO_FT_Naming_Replication_Manager::peer_available ()
 {
   return !CORBA::is_nil (this->peer_.in ());
 }
 
 void
-TAO_FT_Naming_Replication_Manager::stop (void)
+TAO_FT_Naming_Replication_Manager::stop ()
 {
   if (this->reactor_ == 0)
     {
@@ -155,7 +155,7 @@ TAO_FT_Naming_Replication_Manager::stop (void)
 }
 
 int
-TAO_FT_Naming_Replication_Manager::svc (void)
+TAO_FT_Naming_Replication_Manager::svc ()
 {
   if (this->reactor_ == 0)
     {
@@ -371,7 +371,7 @@ TAO_FT_Naming_Replication_Manager::send_registration (bool use_combo_refs)
 }
 
 bool
-TAO_FT_Naming_Replication_Manager::peer_init_i (void)
+TAO_FT_Naming_Replication_Manager::peer_init_i ()
 {
   CORBA::Object_var obj = this->orb_->string_to_object (replica_ior_.c_str());
   bool non_exist = true;
@@ -421,7 +421,7 @@ TAO_FT_Naming_Replication_Manager::peer_init_i (void)
 }
 
 bool
-TAO_FT_Naming_Replication_Manager::update_peer_registration (void)
+TAO_FT_Naming_Replication_Manager::update_peer_registration ()
 {
   FT_Naming::ReplicaInfo info;
   info.combined = this->send_combos_;
@@ -450,7 +450,7 @@ TAO_FT_Naming_Replication_Manager::update_peer_registration (void)
 
 
 bool
-TAO_FT_Naming_Replication_Manager::init_peer (void)
+TAO_FT_Naming_Replication_Manager::init_peer ()
 {
   ACE_TString replica_ior_file = this->server_.replica_ior_filename (true);
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index 7d05f927ad1..28445381a2f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -74,7 +74,7 @@ TAO_FTNS_Notifier::handle_exception (ACE_HANDLE )
 }
 
 /// Default Constructor.
-TAO_FT_Naming_Server::TAO_FT_Naming_Server (void)
+TAO_FT_Naming_Server::TAO_FT_Naming_Server ()
   : TAO_Naming_Server (IOR_ARRAY_SIZE),
     naming_manager_ (),
     replicator_ (0),
@@ -94,7 +94,7 @@ TAO_FT_Naming_Server::TAO_FT_Naming_Server (void)
 }
 
 void
-TAO_FT_Naming_Server::update_info_i (void)
+TAO_FT_Naming_Server::update_info_i ()
 {
   while (true)
     {
@@ -140,7 +140,7 @@ TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos)
 }
 
 void
-TAO_FT_Naming_Server::update_iors_i (void)
+TAO_FT_Naming_Server::update_iors_i ()
 {
   while (true)
     {
@@ -344,7 +344,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int, ACE_TCHAR *[], CORBA::O
 }
 
 int
-TAO_FT_Naming_Server::init_replicator (void)
+TAO_FT_Naming_Server::init_replicator ()
 {
   if (this->server_role_ == STANDALONE )
     return 0;
@@ -393,7 +393,7 @@ TAO_FT_Naming_Server::replica_ior_filename (bool peer_ior_file) const
 }
 
 void
-TAO_FT_Naming_Server::init_replication_pairing (void)
+TAO_FT_Naming_Server::init_replication_pairing ()
 {
   if (this->server_role_ == STANDALONE)
     {
@@ -620,7 +620,7 @@ TAO_FT_Naming_Server::parse_args (int argc,
 }
 
 int
-TAO_FT_Naming_Server::fini (void)
+TAO_FT_Naming_Server::fini ()
 {
   if (this->replicator_ != 0)
     {
@@ -697,7 +697,7 @@ TAO_FT_Naming_Server::storable_naming_context_factory (size_t context_size)
 }
 
 TAO_Persistent_Naming_Context_Factory *
-TAO_FT_Naming_Server::persistent_naming_context_factory (void)
+TAO_FT_Naming_Server::persistent_naming_context_factory ()
 {
 #if defined (ACE_HAS_NEW_NOTHROW)
   return new (ACE_nothrow) TAO_FT_Persistent_Naming_Context_Factory;
@@ -708,14 +708,14 @@ TAO_FT_Naming_Server::persistent_naming_context_factory (void)
 
 /// Return the IOR for the registered replication manager
 char*
-TAO_FT_Naming_Server::replicator_ior (void)
+TAO_FT_Naming_Server::replicator_ior ()
 {
   return CORBA::string_dup (this->iors_[REPLICATOR].ior_.c_str());
 }
 
 /// Return the IOR for the registered object group manager
 char*
-TAO_FT_Naming_Server::naming_manager_ior (void)
+TAO_FT_Naming_Server::naming_manager_ior ()
 {
   return CORBA::string_dup (this->iors_[GROUP].ior_.c_str());
 }
@@ -812,14 +812,14 @@ TAO_FT_Naming_Server::update_naming_context (
 }
 
 /// Destructor.
-TAO_FT_Naming_Server::~TAO_FT_Naming_Server (void)
+TAO_FT_Naming_Server::~TAO_FT_Naming_Server ()
 {
   // Clear out the static naming manager from the persistent naming context
   TAO_FT_Persistent_Naming_Context::set_naming_manager_impl (0);
 }
 
 CosNaming::NamingContext_ptr
-TAO_FT_Naming_Server::my_root_context (void) const
+TAO_FT_Naming_Server::my_root_context () const
 {
   if (CORBA::is_nil (this->iors_[ROOT].ref_.in()))
     {
@@ -834,7 +834,7 @@ TAO_FT_Naming_Server::my_root_context (void) const
 }
 
 FT_Naming::NamingManager_ptr
-TAO_FT_Naming_Server::my_naming_manager (void) const
+TAO_FT_Naming_Server::my_naming_manager () const
 {
   if (CORBA::is_nil (this->iors_[GROUP].ref_))
     {
@@ -850,7 +850,7 @@ TAO_FT_Naming_Server::my_naming_manager (void) const
 }
 
 CosNaming::NamingContext_ptr
-TAO_FT_Naming_Server::ft_root_context (void) const
+TAO_FT_Naming_Server::ft_root_context () const
 {
   if (CORBA::is_nil (this->iors_[FT_ROOT].ref_))
     {
@@ -865,7 +865,7 @@ TAO_FT_Naming_Server::ft_root_context (void) const
 }
 
 FT_Naming::NamingManager_ptr
-TAO_FT_Naming_Server::ft_naming_manager (void) const
+TAO_FT_Naming_Server::ft_naming_manager () const
 {
   if (CORBA::is_nil (this->iors_[FT_GROUP].ref_))
     {
@@ -881,13 +881,13 @@ TAO_FT_Naming_Server::ft_naming_manager (void) const
 }
 
 const ACE_CString &
-TAO_FT_Naming_Server::ft_endpoint (void)
+TAO_FT_Naming_Server::ft_endpoint ()
 {
   return this->ft_endpoint_;
 }
 
 const ACE_Time_Value &
-TAO_FT_Naming_Server::ft_update_delay (void)
+TAO_FT_Naming_Server::ft_update_delay ()
 {
   return this->ft_update_delay_;
 }
@@ -955,7 +955,7 @@ TAO_FT_Naming_Server::combine_iors (FT_Naming::EntityKind kind, CORBA::Object_pt
 }
 
 int
-TAO_FT_Naming_Server::recover_iors (void)
+TAO_FT_Naming_Server::recover_iors ()
 {
   if (this->registered_)
     {
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 6f05c3decc5..97a7f9cf109 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,7 +52,7 @@ 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::~FT_PG_Object_Group_Storable ()
 {
 }
 
@@ -79,7 +79,7 @@ TAO::FT_PG_Object_Group_Storable::propagate_update_notification
 }
 
 void
-TAO::FT_PG_Object_Group_Storable::state_written (void)
+TAO::FT_PG_Object_Group_Storable::state_written ()
 {
   FT_Naming::ChangeType change_type;
   if (!this->file_created_)
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 6e1601e8070..5ef67c277eb 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
@@ -31,7 +31,7 @@ TAO_FT_Persistent_Naming_Context::TAO_FT_Persistent_Naming_Context (
 }
 
 
-TAO_FT_Persistent_Naming_Context::~TAO_FT_Persistent_Naming_Context (void)
+TAO_FT_Persistent_Naming_Context::~TAO_FT_Persistent_Naming_Context ()
 {
   // Perform appropriate cleanup based on the destruction level specified.
 }
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 e2c7b9f0a93..5d0fda3837f 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
@@ -4,7 +4,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
   /// Constructor.
-TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Factory (void)
+TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Factory ()
 : TAO_Persistent_Naming_Context_Factory ()
 {
 
@@ -12,7 +12,7 @@ TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Facto
 
   /// 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 (void)
+TAO_FT_Persistent_Naming_Context_Factory::~TAO_FT_Persistent_Naming_Context_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
index 4ebab318def..7c2cf1a2134 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
@@ -9,11 +9,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Random::TAO_FT_Random (void)
+TAO_FT_Random::TAO_FT_Random ()
 {
 }
 
-TAO_FT_Random::~TAO_FT_Random (void)
+TAO_FT_Random::~TAO_FT_Random ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
index ecfae28389a..d4246736ab0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
@@ -9,13 +9,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FT_Round_Robin::TAO_FT_Round_Robin (void)
+TAO_FT_Round_Robin::TAO_FT_Round_Robin ()
   : lock_ (),
     location_index_map_ (TAO_PG_MAX_OBJECT_GROUPS)
 {
 }
 
-TAO_FT_Round_Robin::~TAO_FT_Round_Robin (void)
+TAO_FT_Round_Robin::~TAO_FT_Round_Robin ()
 {
 }
 
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 823990864b3..aaba0319349 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
@@ -35,7 +35,7 @@ TAO_FT_Storable_Naming_Context::TAO_FT_Storable_Naming_Context (CORBA::ORB_ptr o
 }
 
 
-TAO_FT_Storable_Naming_Context::~TAO_FT_Storable_Naming_Context (void)
+TAO_FT_Storable_Naming_Context::~TAO_FT_Storable_Naming_Context ()
 {
   // Perform appropriate cleanup based on the destruction level specified.
 }
@@ -124,14 +124,14 @@ TAO_FT_Storable_Naming_Context::stale (bool is_stale)
 
 
 bool
-TAO_FT_Storable_Naming_Context::stale (void)
+TAO_FT_Storable_Naming_Context::stale ()
 {
   return stale_;
 }
 
 
 void
-TAO_FT_Storable_Naming_Context::context_written (void)
+TAO_FT_Storable_Naming_Context::context_written ()
 {
   FT_Naming::ChangeType change_type;
 
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 65a0e759562..648ec3a7654 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
@@ -24,7 +24,7 @@ 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 (void)
+TAO_FT_Storable_Naming_Context_Factory::~TAO_FT_Storable_Naming_Context_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
index 450be60c4c5..4af5d580395 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
@@ -389,7 +389,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path)
  * Displays all object groups that currently exist in the naming service.
  */
 int
-NS_group_svc::group_list (void)
+NS_group_svc::group_list ()
 {
 
   // KCS: The group list is independent of locations. I created a new operation in the
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 3a7f45ccf79..16ebeaa7b85 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -13,7 +13,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Bindings_Map::~TAO_Bindings_Map (void)
+TAO_Bindings_Map::~TAO_Bindings_Map ()
 {
 }
 
@@ -33,19 +33,19 @@ TAO_Hash_Naming_Context::interface (TAO_Naming_Context *i)
   this->interface_ = i;
 }
 
-TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context (void)
+TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context ()
 {
   delete context_;
 }
 
 TAO_SYNCH_RW_MUTEX&
-TAO_Hash_Naming_Context::lock (void)
+TAO_Hash_Naming_Context::lock ()
 {
   return this->lock_;
 }
 
 PortableServer::POA_ptr
-TAO_Hash_Naming_Context::_default_POA (void)
+TAO_Hash_Naming_Context::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -546,7 +546,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n)
 }
 
 void
-TAO_Hash_Naming_Context::destroy (void)
+TAO_Hash_Naming_Context::destroy ()
 {
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -579,20 +579,20 @@ TAO_Hash_Naming_Context::destroy (void)
 }
 
 int
-TAO_Hash_Naming_Context::root (void)
+TAO_Hash_Naming_Context::root ()
 {
   return (ACE_OS::strcmp (this->poa_id_.fast_rep (),
                           TAO_ROOT_NAMING_CONTEXT) == 0);
 }
 
 int
-TAO_Hash_Naming_Context::destroyed (void)
+TAO_Hash_Naming_Context::destroyed ()
 {
   return this->destroyed_;
 }
 
 TAO_Naming_Context *
-TAO_Hash_Naming_Context::interface (void)
+TAO_Hash_Naming_Context::interface ()
 {
   return this->interface_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index 92255b51454..c16509e5e0b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -5,13 +5,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Client::operator -> (void) const
+TAO_Naming_Client::operator -> () const
 {
   return this->naming_context_.ptr ();
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Client::get_context (void) const
+TAO_Naming_Client::get_context () const
 {
   // Must duplicate this pointer so it can be stored in a _var.
   return CosNaming::NamingContext::_duplicate (this->naming_context_.in ());
@@ -41,12 +41,12 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout)
   return 0;
 }
 
-TAO_Naming_Client::TAO_Naming_Client (void)
+TAO_Naming_Client::TAO_Naming_Client ()
 {
   // Do nothing
 }
 
-TAO_Naming_Client::~TAO_Naming_Client (void)
+TAO_Naming_Client::~TAO_Naming_Client ()
 {
   // Do nothing
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 4bb6e7c4a8d..11858f0ece8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -18,7 +18,7 @@ TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl)
 {
 }
 
-TAO_Naming_Context::~TAO_Naming_Context (void)
+TAO_Naming_Context::~TAO_Naming_Context ()
 {
   delete impl_;
 }
@@ -68,7 +68,7 @@ TAO_Naming_Context::unbind (const CosNaming::Name &n)
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Context::new_context (void)
+TAO_Naming_Context::new_context ()
 {
   return impl_->new_context ();
 }
@@ -80,7 +80,7 @@ TAO_Naming_Context::bind_new_context (const CosNaming::Name &n)
 }
 
 void
-TAO_Naming_Context::destroy (void)
+TAO_Naming_Context::destroy ()
 {
   impl_->destroy ();
 }
@@ -463,7 +463,7 @@ TAO_Naming_Context::stale (bool value)
   this->impl_->stale (value);
 }
 
-TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void)
+TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl ()
 {
 }
 
@@ -475,7 +475,7 @@ TAO_Naming_Context_Impl::stale (bool value)
 }
 
 bool
-TAO_Naming_Context_Impl::stale (void)
+TAO_Naming_Context_Impl::stale ()
 {
   // Default implementation is to reply false
   return false;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index b1b7a9da824..31cf92cecab 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -31,7 +31,7 @@ TAO_Naming_Loader::TAO_Naming_Loader (TAO_Naming_Server *server)
     ACE_NEW (naming_server_, TAO_Naming_Server);
 }
 
-TAO_Naming_Loader::~TAO_Naming_Loader (void)
+TAO_Naming_Loader::~TAO_Naming_Loader ()
 {
   // Destroy the naming server that was created
   delete naming_server_;
@@ -65,7 +65,7 @@ TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_Naming_Loader::fini (void)
+TAO_Naming_Loader::fini ()
 {
   // Remove the Naming Service.
   if (this->naming_server_ == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index a0931cb7edc..448c6100d03 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -483,11 +483,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
           TAO::Storable_Factory* pf = 0;
           ACE_CString directory (ACE_TEXT_ALWAYS_CHAR (persistence_location));
           ACE_NEW_RETURN (pf, TAO::Storable_FlatFileFactory (directory), -1);
-#if defined (ACE_HAS_CPP11)
           std::unique_ptr<TAO::Storable_Factory> persFactory(pf);
-#else
-          auto_ptr<TAO::Storable_Factory> persFactory(pf);
-#endif /* ACE_HAS_CPP11 */
 
           // Use an auto_ptr to ensure that we clean up the factory in the case
           // of a failure in creating and registering the Activator.
@@ -495,11 +491,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
             this->storable_naming_context_factory (context_size);
           // Make sure we got a factory
           if (cf == 0) return -1;
-#if defined (ACE_HAS_CPP11)
           std::unique_ptr<TAO_Storable_Naming_Context_Factory> contextFactory (cf);
-#else
-          auto_ptr<TAO_Storable_Naming_Context_Factory> contextFactory (cf);
-#endif /* ACE_HAS_CPP11 */
 
           // This instance will either get deleted after recreate all or,
           // in the case of a servant activator's use, on destruction of the
@@ -770,7 +762,7 @@ TAO_Naming_Server::storable_naming_context_factory (size_t context_size)
 }
 
 TAO_Persistent_Naming_Context_Factory *
-TAO_Naming_Server::persistent_naming_context_factory (void)
+TAO_Naming_Server::persistent_naming_context_factory ()
 {
 #if defined (ACE_HAS_NEW_NOTHROW)
   return new (ACE_nothrow) TAO_Persistent_Naming_Context_Factory;
@@ -780,7 +772,7 @@ TAO_Naming_Server::persistent_naming_context_factory (void)
 }
 
 int
-TAO_Naming_Server::fini (void)
+TAO_Naming_Server::fini ()
 {
   // First get rid of the multi cast handler
   if (this->ior_multicast_)
@@ -852,13 +844,13 @@ TAO_Naming_Server::fini (void)
 }
 
 char*
-TAO_Naming_Server::naming_service_ior (void)
+TAO_Naming_Server::naming_service_ior ()
 {
   return CORBA::string_dup (this->iors_[ROOT].ior_.c_str());
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Server::operator-> (void) const
+TAO_Naming_Server::operator-> () const
 {
   if (CORBA::is_nil (this->iors_[ROOT].ref_))
     {
@@ -872,7 +864,7 @@ TAO_Naming_Server::operator-> (void) const
 }
 
 
-TAO_Naming_Server::~TAO_Naming_Server (void)
+TAO_Naming_Server::~TAO_Naming_Server ()
 {
   delete [] this->iors_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
index 01d5a109d0b..fdca3733dba 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -86,7 +86,7 @@ public:
   int done (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   // = STL styled iteration, compare, and reference functions.
 
@@ -174,7 +174,7 @@ public:
   size_t size (void) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Reset the <ACE_Unbounded_List> to be empty.
   void reset (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index ad4a4f071ab..896f31bc96f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -92,7 +92,7 @@ TAO_Persistent_Context_Index::TAO_Persistent_Context_Index
 {
 }
 
-TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void)
+TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index ()
 {
   delete allocator_;
   delete context_impl_factory_;
@@ -100,19 +100,19 @@ TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void)
 }
 
 ACE_Allocator*
-TAO_Persistent_Context_Index::allocator (void)
+TAO_Persistent_Context_Index::allocator ()
 {
   return allocator_;
 }
 
 CosNaming::NamingContext_ptr
-TAO_Persistent_Context_Index::root_context (void)
+TAO_Persistent_Context_Index::root_context ()
 {
   return CosNaming::NamingContext::_duplicate (root_context_.in ());
 }
 
 CORBA::ORB_ptr
-TAO_Persistent_Context_Index::orb (void)
+TAO_Persistent_Context_Index::orb ()
 {
   return orb_.in ();
 }
@@ -160,7 +160,7 @@ TAO_Persistent_Context_Index::init (size_t context_size)
 }
 
 int
-TAO_Persistent_Context_Index::recreate_all (void)
+TAO_Persistent_Context_Index::recreate_all ()
 {
   CONTEXT_INDEX::ITERATOR *index_iter = 0;
 
@@ -239,7 +239,7 @@ TAO_Persistent_Context_Index::create_naming_context_impl (
 }
 
 int
-TAO_Persistent_Context_Index::create_index (void)
+TAO_Persistent_Context_Index::create_index ()
 {
   // Make sure that the file name is of the legal length.
   if (ACE_OS::strlen (index_file_) >= MAXNAMELEN + MAXPATHLEN)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
index ae98a0f2d29..1946a0e3035 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Persistent_IntId::TAO_Persistent_IntId (void)
+TAO_Persistent_IntId::TAO_Persistent_IntId ()
   : ref_ (0),
     type_ (CosNaming::nobject)
 {
@@ -30,7 +30,7 @@ TAO_Persistent_IntId::TAO_Persistent_IntId (const TAO_Persistent_IntId &rhs)
   type_ = rhs.type_;
 }
 
-TAO_Persistent_IntId::~TAO_Persistent_IntId (void)
+TAO_Persistent_IntId::~TAO_Persistent_IntId ()
 {
 }
 
@@ -45,7 +45,7 @@ TAO_Persistent_IntId::operator= (const TAO_Persistent_IntId &rhs)
   ref_ = rhs.ref_;
 }
 
-TAO_Persistent_ExtId::TAO_Persistent_ExtId (void)
+TAO_Persistent_ExtId::TAO_Persistent_ExtId ()
   : id_ (0),
     kind_ (0)
 {
@@ -65,7 +65,7 @@ TAO_Persistent_ExtId::TAO_Persistent_ExtId (const TAO_Persistent_ExtId &rhs)
   kind_ = rhs.kind_;
 }
 
-TAO_Persistent_ExtId::~TAO_Persistent_ExtId (void)
+TAO_Persistent_ExtId::~TAO_Persistent_ExtId ()
 {
 }
 
@@ -95,7 +95,7 @@ TAO_Persistent_ExtId::operator!= (const TAO_Persistent_ExtId &rhs) const
 }
 
 u_long
-TAO_Persistent_ExtId::hash (void) const
+TAO_Persistent_ExtId::hash () const
 {
   ACE_CString temp (id_);
   temp += kind_;
@@ -104,18 +104,18 @@ TAO_Persistent_ExtId::hash (void) const
 }
 
 const char *
-TAO_Persistent_ExtId::id (void)
+TAO_Persistent_ExtId::id ()
 {
   return id_;
 }
 
 const char *
-TAO_Persistent_ExtId::kind (void)
+TAO_Persistent_ExtId::kind ()
 {
   return kind_;
 }
 
-TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (void)
+TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId ()
   : counter_ (0),
     hash_map_ (0)
 {
@@ -135,7 +135,7 @@ TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (const TAO_Persistent_Ind
   hash_map_ = rhs.hash_map_;
 }
 
-TAO_Persistent_Index_IntId::~TAO_Persistent_Index_IntId (void)
+TAO_Persistent_Index_IntId::~TAO_Persistent_Index_IntId ()
 {
 }
 
@@ -150,7 +150,7 @@ TAO_Persistent_Index_IntId::operator= (const TAO_Persistent_Index_IntId &rhs)
   hash_map_ = rhs.hash_map_;
 }
 
-TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (void)
+TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId ()
   : poa_id_ (0)
 {
 }
@@ -165,7 +165,7 @@ TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (const TAO_Persistent_Ind
   poa_id_ = rhs.poa_id_;
 }
 
-TAO_Persistent_Index_ExtId::~TAO_Persistent_Index_ExtId (void)
+TAO_Persistent_Index_ExtId::~TAO_Persistent_Index_ExtId ()
 {
 }
 
@@ -192,7 +192,7 @@ TAO_Persistent_Index_ExtId::operator!= (const TAO_Persistent_Index_ExtId &rhs) c
 }
 
 u_long
-TAO_Persistent_Index_ExtId::hash (void) const
+TAO_Persistent_Index_ExtId::hash () const
 {
   ACE_CString temp (poa_id_);
   return temp.hash ();
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 8fdbbec5cd4..3dc96efb69f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -70,31 +70,31 @@ TAO_Persistent_Bindings_Map::TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb)
 {
 }
 
-TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map (void)
+TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map ()
 {
 }
 
 void
-TAO_Persistent_Bindings_Map::destroy (void)
+TAO_Persistent_Bindings_Map::destroy ()
 {
   this->map_->ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>::~ACE_Hash_Map_With_Allocator ();
   this->allocator_->free (map_);
 }
 
 TAO_Persistent_Bindings_Map::HASH_MAP *
-TAO_Persistent_Bindings_Map::map (void)
+TAO_Persistent_Bindings_Map::map ()
 {
   return this->map_;
 }
 
 size_t
-TAO_Persistent_Bindings_Map::total_size (void)
+TAO_Persistent_Bindings_Map::total_size ()
 {
   return this->map_->total_size ();
 }
 
 size_t
-TAO_Persistent_Bindings_Map::current_size (void)
+TAO_Persistent_Bindings_Map::current_size ()
 {
   return map_->current_size ();
 }
@@ -260,7 +260,7 @@ TAO_Persistent_Naming_Context::init (size_t hash_table_size)
   return persistent_context_->open (hash_table_size, index_->allocator ());
 }
 
-TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context (void)
+TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context ()
 {
   // Perform appropriate cleanup based on the destruction level specified.
 
@@ -349,7 +349,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
 }
 
 CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::new_context (void)
+TAO_Persistent_Naming_Context::new_context ()
 {
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
index 994acadbd16..8d98362f74f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
@@ -4,14 +4,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Constructor.
-TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory (void)
+TAO_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_Persistent_Naming_Context_Factory::~TAO_Persistent_Naming_Context_Factory (void)
+TAO_Persistent_Naming_Context_Factory::~TAO_Persistent_Naming_Context_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 10f8347bf49..9b113af9710 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -19,7 +19,7 @@ ACE_UINT32 TAO_Storable_Naming_Context::gcounter_;
 ACE_Auto_Ptr<TAO::Storable_Base> TAO_Storable_Naming_Context::gfl_;
 int TAO_Storable_Naming_Context::redundant_;
 
-TAO_Storable_IntId::TAO_Storable_IntId (void)
+TAO_Storable_IntId::TAO_Storable_IntId ()
   : ref_ (CORBA::string_dup ("")),
     type_ (CosNaming::nobject)
 {
@@ -38,7 +38,7 @@ TAO_Storable_IntId::TAO_Storable_IntId (const TAO_Storable_IntId &rhs)
   type_ = rhs.type_;
 }
 
-TAO_Storable_IntId::~TAO_Storable_IntId (void)
+TAO_Storable_IntId::~TAO_Storable_IntId ()
 {
 }
 
@@ -53,7 +53,7 @@ TAO_Storable_IntId::operator= (const TAO_Storable_IntId &rhs)
   ref_ = rhs.ref_;
 }
 
-TAO_Storable_ExtId::TAO_Storable_ExtId (void)
+TAO_Storable_ExtId::TAO_Storable_ExtId ()
   : id_ (CORBA::string_dup ("")),
     kind_ (CORBA::string_dup (""))
 {
@@ -71,7 +71,7 @@ TAO_Storable_ExtId::TAO_Storable_ExtId (const TAO_Storable_ExtId &rhs)
   kind_ = rhs.kind_;
 }
 
-TAO_Storable_ExtId::~TAO_Storable_ExtId (void)
+TAO_Storable_ExtId::~TAO_Storable_ExtId ()
 {
 }
 
@@ -101,7 +101,7 @@ TAO_Storable_ExtId::operator!= (const TAO_Storable_ExtId &rhs) const
 }
 
 u_long
-TAO_Storable_ExtId::hash (void) const
+TAO_Storable_ExtId::hash () const
 {
   // @CJC I wager this could be optimized a bit better, but I'm not
   // sure how much it's called.  At the very least, we could allocate
@@ -114,13 +114,13 @@ TAO_Storable_ExtId::hash (void) const
 }
 
 const char *
-TAO_Storable_ExtId::id (void)
+TAO_Storable_ExtId::id ()
 {
   return id_.in();
 }
 
 const char *
-TAO_Storable_ExtId::kind (void)
+TAO_Storable_ExtId::kind ()
 {
   return kind_.in();
 }
@@ -184,27 +184,27 @@ TAO_Storable_Bindings_Map::TAO_Storable_Bindings_Map (size_t hash_table_size,
   ACE_TRACE("TAO_Storable_Bindings_Map");
 }
 
-TAO_Storable_Bindings_Map::~TAO_Storable_Bindings_Map (void)
+TAO_Storable_Bindings_Map::~TAO_Storable_Bindings_Map ()
 {
   ACE_TRACE("~TAO_Storable_Bindings_Map");
 }
 
 TAO_Storable_Bindings_Map::HASH_MAP &
-TAO_Storable_Bindings_Map::map (void)
+TAO_Storable_Bindings_Map::map ()
 {
   ACE_TRACE("map");
   return map_;
 }
 
 size_t
-TAO_Storable_Bindings_Map::current_size (void)
+TAO_Storable_Bindings_Map::current_size ()
 {
   ACE_TRACE("current_size");
   return map_.current_size ();
 }
 
 size_t
-TAO_Storable_Bindings_Map::total_size (void)
+TAO_Storable_Bindings_Map::total_size ()
 {
   ACE_TRACE("total_size");
   return map_.total_size ();
@@ -305,7 +305,7 @@ File_Open_Lock_and_Check::~File_Open_Lock_and_Check ()
 
 bool
 TAO_Storable_Naming_Context::
-File_Open_Lock_and_Check::object_obsolete (void)
+File_Open_Lock_and_Check::object_obsolete ()
 {
 
   // Query the underlying context if it is obsolete with respect
@@ -315,7 +315,7 @@ File_Open_Lock_and_Check::object_obsolete (void)
 
 void
 TAO_Storable_Naming_Context::
-File_Open_Lock_and_Check::mark_object_current (void)
+File_Open_Lock_and_Check::mark_object_current ()
 {
   // Reset the stale flag
   context_->stale (false);
@@ -402,7 +402,7 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context (
   ACE_TRACE("TAO_Storable_Naming_Context");
 }
 
-TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void)
+TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context ()
 {
   ACE_TRACE("~TAO_Storable_Naming_Context");
 
@@ -430,7 +430,7 @@ TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void)
 }
 
 void
-TAO_Storable_Naming_Context::context_written (void)
+TAO_Storable_Naming_Context::context_written ()
 {
   // No-op. Overridden by derived class.
 }
@@ -445,7 +445,7 @@ TAO_Storable_Naming_Context::is_obsolete (time_t stored_time)
 }
 
 void
-TAO_Storable_Naming_Context::verify_not_destroyed (void)
+TAO_Storable_Naming_Context::verify_not_destroyed ()
 {
   File_Open_Lock_and_Check flck (this, SFG::ACCESSOR, false);
   if (this->destroyed_)
@@ -539,7 +539,7 @@ TAO_Storable_Naming_Context::make_new_context (
 }
 
 CosNaming::NamingContext_ptr
-TAO_Storable_Naming_Context::new_context (void)
+TAO_Storable_Naming_Context::new_context ()
 {
   ACE_TRACE ("new_context");
 
@@ -836,7 +836,7 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
 }
 
 void
-TAO_Storable_Naming_Context::destroy (void)
+TAO_Storable_Naming_Context::destroy ()
 {
   ACE_TRACE("TAO_Storable_Naming_Context::destroy");
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
index e86e2dc1ac3..573f1dc6676 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
@@ -14,7 +14,7 @@ TAO_Storable_Naming_Context_Factory::TAO_Storable_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_Storable_Naming_Context_Factory::~TAO_Storable_Naming_Context_Factory (void)
+TAO_Storable_Naming_Context_Factory::~TAO_Storable_Naming_Context_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 0e56e61a49b..0836bd43139 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -65,24 +65,24 @@ TAO_Transient_Bindings_Map::TAO_Transient_Bindings_Map (size_t hash_table_size)
 {
 }
 
-TAO_Transient_Bindings_Map::~TAO_Transient_Bindings_Map (void)
+TAO_Transient_Bindings_Map::~TAO_Transient_Bindings_Map ()
 {
 }
 
 TAO_Transient_Bindings_Map::HASH_MAP &
-TAO_Transient_Bindings_Map::map (void)
+TAO_Transient_Bindings_Map::map ()
 {
   return map_;
 }
 
 size_t
-TAO_Transient_Bindings_Map::current_size (void)
+TAO_Transient_Bindings_Map::current_size ()
 {
   return map_.current_size ();
 }
 
 size_t
-TAO_Transient_Bindings_Map::total_size (void)
+TAO_Transient_Bindings_Map::total_size ()
 {
   return map_.total_size ();
 }
@@ -130,7 +130,7 @@ TAO_Transient_Naming_Context::TAO_Transient_Naming_Context (PortableServer::POA_
   context_ = transient_context_;
 }
 
-TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void)
+TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context ()
 {
 }
 
@@ -181,7 +181,7 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
 }
 
 CosNaming::NamingContext_ptr
-TAO_Transient_Naming_Context::new_context (void)
+TAO_Transient_Naming_Context::new_context ()
 {
   // Generate a POA id for the new context.
   char poa_id[BUFSIZ];
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 3dc8a3af5fe..0ad5f026dc3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -99,7 +99,7 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types)
 }
 
 int
-TAO_Notify_Admin::shutdown (void)
+TAO_Notify_Admin::shutdown ()
 {
   if (TAO_Notify_Object::shutdown () == 1)
     return 1;
@@ -209,7 +209,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type,
 }
 
 void
-TAO_Notify_Admin::reconnect (void)
+TAO_Notify_Admin::reconnect ()
 {
   TAO_Notify::Reconnect_Worker<TAO_Notify_Proxy> wrk;
   this->proxy_container().collection()->for_each(&wrk);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index 542749dcc13..9580d6f82e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void)
+TAO_Notify_AdminProperties::TAO_Notify_AdminProperties ()
   : max_global_queue_length_ (CosNotification::MaxQueueLength, 0)
   , max_consumers_ (CosNotification::MaxConsumers, 0)
   , max_suppliers_ (CosNotification::MaxSuppliers, 0)
@@ -72,7 +72,7 @@ TAO_Notify_AdminProperties::init ()
 }
 
 CORBA::Boolean
-TAO_Notify_AdminProperties::queue_full (void)
+TAO_Notify_AdminProperties::queue_full ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, 1);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 28871268029..598d4616b86 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -23,7 +23,7 @@ TAO_Notify_AnyEvent_No_Copy::~TAO_Notify_AnyEvent_No_Copy ()
 }
 
 const TAO_Notify_EventType&
-TAO_Notify_AnyEvent_No_Copy::type (void) const
+TAO_Notify_AnyEvent_No_Copy::type () const
 {
   return this->event_type_;
 }
@@ -108,7 +108,7 @@ TAO_Notify_AnyEvent_No_Copy::unmarshal (TAO_InputCDR & cdr)
 }
 
 TAO_Notify_Event *
-TAO_Notify_AnyEvent_No_Copy::copy (void) const
+TAO_Notify_AnyEvent_No_Copy::copy () const
 {
   TAO_Notify_Event * new_event;
   ACE_NEW_THROW_EX (new_event,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index 7f7780af34e..31fb4f2be48 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer (void)
+TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer ()
 {
 }
 
@@ -18,7 +18,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::~TAO_Notify_CosEC_ProxyPushConsumer ()
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer::release (void)
+TAO_Notify_CosEC_ProxyPushConsumer::release ()
 {
   delete this;
   //@@ inform factory
@@ -59,14 +59,14 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (void)
+TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer ()
 {
   TAO_Notify_CosEC_ProxyPushConsumer::Ptr guard( this );
   this->destroy ();
 }
 
 const char *
-TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name (void) const
+TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name () const
 {
   return "ec_proxy_push_consumer";
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index d911c4b2b2d..31456ab5d13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier (void)
+TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier ()
 {
 }
 
@@ -14,7 +14,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::~TAO_Notify_CosEC_ProxyPushSupplier ()
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier::release (void)
+TAO_Notify_CosEC_ProxyPushSupplier::release ()
 {
 
   delete this;
@@ -36,14 +36,14 @@ TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushCon
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (void)
+TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier ()
 {
   TAO_Notify_CosEC_ProxyPushSupplier::Ptr guard( this );
   this->destroy ();
 }
 
 const char *
-TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name (void) const
+TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name () const
 {
   return "ec_proxy_push_supplier";
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index e0ff8ad2b3f..613c87a9f18 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer (void)
+TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer ()
 {
 }
 
@@ -17,14 +17,14 @@ TAO_Notify_ProxyPushConsumer::~TAO_Notify_ProxyPushConsumer ()
 }
 
 void
-TAO_Notify_ProxyPushConsumer::release (void)
+TAO_Notify_ProxyPushConsumer::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_ProxyPushConsumer::MyType (void)
+TAO_Notify_ProxyPushConsumer::MyType ()
 {
   return CosNotifyChannelAdmin::PUSH_ANY;
 }
@@ -61,7 +61,7 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl
   this->self_change ();
 }
 
-void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void)
+void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer ()
 {
   TAO_Notify_ProxyPushConsumer::Ptr guard( this );
   this->destroy ();
@@ -69,7 +69,7 @@ void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void)
 }
 
 const char *
-TAO_Notify_ProxyPushConsumer::get_proxy_type_name (void) const
+TAO_Notify_ProxyPushConsumer::get_proxy_type_name () const
 {
   return "proxy_push_consumer";
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index f30948eae05..a20b22359f3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void)
+TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier ()
 {
 }
 
@@ -15,7 +15,7 @@ TAO_Notify_ProxyPushSupplier::~TAO_Notify_ProxyPushSupplier ()
 }
 
 void
-TAO_Notify_ProxyPushSupplier::release (void)
+TAO_Notify_ProxyPushSupplier::release ()
 {
   delete this;
   //@@ inform factory
@@ -37,7 +37,7 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu
 }
 
 void
-TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void)
+TAO_Notify_ProxyPushSupplier::disconnect_push_supplier ()
 {
   TAO_Notify_ProxyPushSupplier::Ptr guard( this );
   this->destroy ();
@@ -45,13 +45,13 @@ TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_ProxyPushSupplier::MyType (void)
+TAO_Notify_ProxyPushSupplier::MyType ()
 {
   return CosNotifyChannelAdmin::PUSH_ANY;
 }
 
 const char *
-TAO_Notify_ProxyPushSupplier::get_proxy_type_name (void) const
+TAO_Notify_ProxyPushSupplier::get_proxy_type_name () const
 {
   return "proxy_push_supplier";
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index d130e72d1e3..2f144d30e1e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -88,7 +88,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer)
 }
 
 void
-TAO_Notify_PushConsumer::release (void)
+TAO_Notify_PushConsumer::release ()
 {
   delete this;
   //@@ inform factory
@@ -129,7 +129,7 @@ TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event)
 }
 
 ACE_CString
-TAO_Notify_PushConsumer::get_ior (void) const
+TAO_Notify_PushConsumer::get_ior () const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
@@ -156,7 +156,7 @@ TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consu
 }
 
 CORBA::Object_ptr
-TAO_Notify_PushConsumer::get_consumer (void)
+TAO_Notify_PushConsumer::get_consumer ()
 {
   return CosEventComm::PushConsumer::_duplicate (this->push_consumer_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index 69db801841f..b2edf829cb4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -30,14 +30,14 @@ TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier)
 }
 
 void
-TAO_Notify_PushSupplier::release (void)
+TAO_Notify_PushSupplier::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 ACE_CString
-TAO_Notify_PushSupplier::get_ior (void) const
+TAO_Notify_PushSupplier::get_ior () const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
@@ -54,7 +54,7 @@ TAO_Notify_PushSupplier::get_ior (void) const
 }
 
 CORBA::Object_ptr
-TAO_Notify_PushSupplier::get_supplier (void)
+TAO_Notify_PushSupplier::get_supplier ()
 {
   return CosEventComm::PushSupplier::_duplicate (this->push_supplier_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index 130e2fe785c..8721836d7e6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -50,7 +50,7 @@ TAO_Notify_Buffering_Strategy::update_qos_properties
 }
 
 void
-TAO_Notify_Buffering_Strategy::shutdown (void)
+TAO_Notify_Buffering_Strategy::shutdown ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_);
 
@@ -67,7 +67,7 @@ TAO_Notify_Buffering_Strategy::shutdown (void)
 }
 
 ACE_Time_Value
-TAO_Notify_Buffering_Strategy::oldest_event (void)
+TAO_Notify_Buffering_Strategy::oldest_event ()
 {
   ACE_Time_Value tv (ACE_Time_Value::max_time);
   ACE_Message_Block* mb = 0;
@@ -91,13 +91,13 @@ TAO_Notify_Buffering_Strategy::oldest_event (void)
 }
 
 
-TAO_Notify_Buffering_Strategy::Tracker::Tracker (void)
+TAO_Notify_Buffering_Strategy::Tracker::Tracker ()
   : child_ (0)
 {
 }
 
 
-TAO_Notify_Buffering_Strategy::Tracker::~Tracker (void)
+TAO_Notify_Buffering_Strategy::Tracker::~Tracker ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index d789e146bbb..4ba1ea9207d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -151,7 +151,7 @@ typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_CosEC_ProxyPushSupplier
                              , TAO_Notify_ConsumerAdmin>
 TAO_Notify_CosEC_ProxyPushSupplier_Builder;
 
-TAO_Notify_Builder::TAO_Notify_Builder (void)
+TAO_Notify_Builder::TAO_Notify_Builder ()
 {
   // Init the static members.
   TAO_Notify_AnyEvent::event_type_ = TAO_Notify_EventType::special ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index c3bf761f86a..ae7f7f43f71 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -58,19 +58,19 @@ TAO_Notify_Consumer::~TAO_Notify_Consumer ()
 }
 
 CORBA::ULong
-TAO_Notify_Consumer::_incr_refcnt (void)
+TAO_Notify_Consumer::_incr_refcnt ()
 {
   return this->add_reference();
 }
 
 CORBA::ULong
-TAO_Notify_Consumer::_decr_refcnt (void)
+TAO_Notify_Consumer::_decr_refcnt ()
 {
   return this->remove_reference();
 }
 
 TAO_Notify_Proxy*
-TAO_Notify_Consumer::proxy (void)
+TAO_Notify_Consumer::proxy ()
 {
   return this->proxy_supplier ();
 }
@@ -82,7 +82,7 @@ TAO_Notify_Consumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties
 }
 
 void
-TAO_Notify_Consumer::resume (void)
+TAO_Notify_Consumer::resume ()
 {
   this->is_suspended_ = 0;
 
@@ -468,7 +468,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
 }
 
 void
-TAO_Notify_Consumer::dispatch_pending (void)
+TAO_Notify_Consumer::dispatch_pending ()
 {
   if (DEBUG_LEVEL  > 5)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -642,7 +642,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error)
 }
 
 void
-TAO_Notify_Consumer::cancel_timer (void)
+TAO_Notify_Consumer::cancel_timer ()
 {
   if (this->timer_.isSet() && this->timer_id_ != -1)
     {
@@ -677,7 +677,7 @@ TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*)
 }
 
 void
-TAO_Notify_Consumer::shutdown (void)
+TAO_Notify_Consumer::shutdown ()
 {
   this->suspend();
   if (this->timer_.isSet ())
@@ -701,13 +701,13 @@ TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& ad
 }
 
 TAO_SYNCH_MUTEX*
-TAO_Notify_Consumer::proxy_lock (void)
+TAO_Notify_Consumer::proxy_lock ()
 {
   return &this->proxy_->lock_;
 }
 
 TAO_Notify_ProxySupplier*
-TAO_Notify_Consumer::proxy_supplier (void)
+TAO_Notify_Consumer::proxy_supplier ()
 {
   return this->proxy_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 98d5c3611e3..3df0b425864 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -205,9 +205,8 @@ protected:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, ACE_Time_Value> last_ping_;
 
 private:
-
   /// Events pending to be delivered.
-  ACE_Auto_Ptr< Request_Queue > pending_events_;
+  ACE_Auto_Ptr<Request_Queue> pending_events_;
 
   CORBA::Object_var rtt_obj_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 28e42513918..56b93b5206f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -31,7 +31,7 @@ TAO_Notify_ProxySupplier_Find_Worker;
 
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker;
 
-TAO_Notify_ConsumerAdmin::TAO_Notify_ConsumerAdmin (void)
+TAO_Notify_ConsumerAdmin::TAO_Notify_ConsumerAdmin ()
   : TAO_Notify_Admin ()
 {
 }
@@ -60,26 +60,26 @@ TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec)
 }
 
 void
-TAO_Notify_ConsumerAdmin::_add_ref (void)
+TAO_Notify_ConsumerAdmin::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_ConsumerAdmin::_remove_ref (void)
+TAO_Notify_ConsumerAdmin::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_Notify_ConsumerAdmin::release (void)
+TAO_Notify_ConsumerAdmin::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_Notify_ConsumerAdmin::destroy (void)
+TAO_Notify_ConsumerAdmin::destroy ()
 {
   this->shutdown ();
   this->ec_->remove (this);
@@ -179,7 +179,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_Notify_ConsumerAdmin::obtain_push_supplier (void)
+TAO_Notify_ConsumerAdmin::obtain_push_supplier ()
 {
   CosEventChannelAdmin::ProxyPushSupplier_var proxy =
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this);
@@ -188,25 +188,25 @@ TAO_Notify_ConsumerAdmin::obtain_push_supplier (void)
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_Notify_ConsumerAdmin::MyID (void)
+TAO_Notify_ConsumerAdmin::MyID ()
 {
   return this->id ();
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ConsumerAdmin::MyChannel (void)
+TAO_Notify_ConsumerAdmin::MyChannel ()
 {
   return this->ec_->_this ();
 }
 
 ::CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_ConsumerAdmin::MyOperator (void)
+TAO_Notify_ConsumerAdmin::MyOperator ()
 {
   return this->filter_operator_;
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin::push_suppliers (void)
+TAO_Notify_ConsumerAdmin::push_suppliers ()
 {
   TAO_Notify_Proxy_Seq_Worker seq_worker;
 
@@ -228,7 +228,7 @@ void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & q
 
 
 CosNotification::QoSProperties*
-TAO_Notify_ConsumerAdmin::get_qos (void)
+TAO_Notify_ConsumerAdmin::get_qos ()
 {
   return this->TAO_Notify_Object::get_qos ();
 }
@@ -275,13 +275,13 @@ TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter)
 }
 
 ::CosNotifyFilter::FilterIDSeq*
-TAO_Notify_ConsumerAdmin::get_all_filters (void)
+TAO_Notify_ConsumerAdmin::get_all_filters ()
 {
   return this->filter_admin_.get_all_filters ();
 }
 
 void
-TAO_Notify_ConsumerAdmin::remove_all_filters (void)
+TAO_Notify_ConsumerAdmin::remove_all_filters ()
 {
   this->filter_admin_.remove_all_filters ();
 }
@@ -289,7 +289,7 @@ TAO_Notify_ConsumerAdmin::remove_all_filters (void)
 /************ UNIMPLMENTED METHODS *************************/
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin::priority_filter (void)
+TAO_Notify_ConsumerAdmin::priority_filter ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -302,7 +302,7 @@ TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin::lifetime_filter (void)
+TAO_Notify_ConsumerAdmin::lifetime_filter ()
 
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -315,7 +315,7 @@ TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*
 }
 
 ::CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin::pull_suppliers (void)
+TAO_Notify_ConsumerAdmin::pull_suppliers ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -336,7 +336,7 @@ TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void)
+TAO_Notify_ConsumerAdmin::obtain_pull_supplier ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
index 1b1abd51aa4..9b1f56e9c96 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer (void)
+TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer ()
 {
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_CosNotify_Service);
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory_OLD);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 6f79de052cf..f5e9f05863e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -13,11 +13,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CosNotify_Service::TAO_CosNotify_Service (void)
+TAO_CosNotify_Service::TAO_CosNotify_Service ()
 {
 }
 
-TAO_CosNotify_Service::~TAO_CosNotify_Service (void)
+TAO_CosNotify_Service::~TAO_CosNotify_Service ()
 {
 }
 
@@ -292,7 +292,7 @@ TAO_CosNotify_Service::set_threads (CosNotification::QoSProperties &qos, int thr
 }
 
 int
-TAO_CosNotify_Service::fini (void)
+TAO_CosNotify_Service::fini ()
 {
   if (TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb())
     {
@@ -449,7 +449,7 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o
 }
 
 TAO_Notify_Factory*
-TAO_CosNotify_Service::create_factory (void)
+TAO_CosNotify_Service::create_factory ()
 {
   TAO_Notify_Factory* factory = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
   if (factory == 0)
@@ -462,7 +462,7 @@ TAO_CosNotify_Service::create_factory (void)
 }
 
 TAO_Notify_Builder*
-TAO_CosNotify_Service::create_builder (void)
+TAO_CosNotify_Service::create_builder ()
 {
   TAO_Notify_Builder* builder = 0;
   ACE_NEW_THROW_EX (builder,
@@ -486,14 +486,14 @@ TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/)
 }
 
 TAO_Notify_Factory&
-TAO_CosNotify_Service::factory (void)
+TAO_CosNotify_Service::factory ()
 {
   ACE_ASSERT( this->factory_.get() != 0 );
   return *this->factory_;
 }
 
 TAO_Notify_Builder&
-TAO_CosNotify_Service::builder (void)
+TAO_CosNotify_Service::builder ()
 {
   ACE_ASSERT( this->builder_.get() != 0 );
   return *this->builder_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index a17a30f6aae..e594cef4ae0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -37,7 +37,7 @@ public:
   }
 };
 
-TAO_Notify_Default_Factory::TAO_Notify_Default_Factory (void)
+TAO_Notify_Default_Factory::TAO_Notify_Default_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index b9a8c147a14..63a375d9120 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Constraint_Expr::TAO_Notify_Constraint_Expr (void)
+TAO_Notify_Constraint_Expr::TAO_Notify_Constraint_Expr ()
 {
 }
 
@@ -86,7 +86,7 @@ TAO_Notify_Constraint_Expr::load_child (
 
 
 void
-TAO_Notify_Constraint_Expr::release (void)
+TAO_Notify_Constraint_Expr::release ()
 {
   delete this;
   //@@ inform factory
@@ -124,7 +124,7 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter ()
 }
 
 char*
-TAO_Notify_ETCL_Filter::constraint_grammar (void)
+TAO_Notify_ETCL_Filter::constraint_grammar ()
 {
   return CORBA::string_dup (this->grammar_.c_str ());
 }
@@ -147,7 +147,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i (CosNotifyFilter::ConstraintID cnstr_id
   ACE_NEW_THROW_EX (notify_constr_expr,
     TAO_Notify_Constraint_Expr (),
     CORBA::NO_MEMORY ());
-  auto_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr);
+  std::unique_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr);
 
   if (TAO_debug_level > 1)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -172,7 +172,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i
   ACE_NEW_THROW_EX (notify_constr_expr,
     TAO_Notify_Constraint_Expr (),
     CORBA::NO_MEMORY ());
-  auto_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr);
+  std::unique_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr);
 
   CosNotifyFilter::ConstraintExp const & expr =
     constraint.constraint_expression;
@@ -364,7 +364,7 @@ TAO_Notify_ETCL_Filter::get_constraints (
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
-TAO_Notify_ETCL_Filter::get_all_constraints (void)
+TAO_Notify_ETCL_Filter::get_all_constraints ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -404,7 +404,7 @@ TAO_Notify_ETCL_Filter::get_all_constraints (void)
 }
 
 void
-TAO_Notify_ETCL_Filter::remove_all_constraints (void)
+TAO_Notify_ETCL_Filter::remove_all_constraints ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -413,7 +413,7 @@ TAO_Notify_ETCL_Filter::remove_all_constraints (void)
 }
 
 void
-TAO_Notify_ETCL_Filter::remove_all_constraints_i (void)
+TAO_Notify_ETCL_Filter::remove_all_constraints_i ()
 {
   CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_);
   CONSTRAINT_EXPR_LIST::ENTRY *entry;
@@ -431,7 +431,7 @@ TAO_Notify_ETCL_Filter::remove_all_constraints_i (void)
 }
 
 void
-TAO_Notify_ETCL_Filter::destroy (void)
+TAO_Notify_ETCL_Filter::destroy ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -507,7 +507,7 @@ TAO_Notify_ETCL_Filter::detach_callback (
 }
 
 CosNotifyFilter::CallbackIDSeq *
-TAO_Notify_ETCL_Filter::get_callbacks (void)
+TAO_Notify_ETCL_Filter::get_callbacks ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -548,7 +548,7 @@ TAO_Notify_ETCL_Filter::save_persistent (TAO_Notify::Topology_Saver& saver)
 
 
 void
-TAO_Notify_ETCL_Filter::release (void)
+TAO_Notify_ETCL_Filter::release ()
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 83223cc25c0..a5daa3611b9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void) :
+TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory () :
   filter_poa_ (PortableServer::POA::_nil ())
 {
 }
@@ -59,7 +59,7 @@ TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_ptr filter_poa)
 }
 
 void
-TAO_Notify_ETCL_FilterFactory::destroy (void)
+TAO_Notify_ETCL_FilterFactory::destroy ()
 {
   if (CORBA::is_nil(this->filter_poa_.in ()))
     return;
@@ -241,7 +241,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type,
 
 
 void
-TAO_Notify_ETCL_FilterFactory::release (void)
+TAO_Notify_ETCL_FilterFactory::release ()
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index 0b75982cd13..d3f7ff5c047 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -14,7 +14,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Event::TAO_Notify_Event (void)
+TAO_Notify_Event::TAO_Notify_Event ()
 : priority_ (CosNotification::Priority, CosNotification::DefaultPriority)
 , timeout_ (CosNotification::Timeout)
 , reliable_ (CosNotification::EventReliability, true)
@@ -32,7 +32,7 @@ TAO_Notify_Event::~TAO_Notify_Event ()
   //  ORBSVCS_DEBUG ((LM_DEBUG,"event:%x  destroyed\n", this ));
 }
 void
-TAO_Notify_Event::release (void)
+TAO_Notify_Event::release ()
 {
   delete this;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index c0e30c6fe10..35445ee3fcf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -40,7 +40,7 @@ TAO_Notify_SupplierAdmin_Find_Worker;
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_ConsumerAdmin> TAO_Notify_ConsumerAdmin_Seq_Worker;
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_SupplierAdmin> TAO_Notify_SupplierAdmin_Seq_Worker;
 
-TAO_Notify_EventChannel::TAO_Notify_EventChannel (void)
+TAO_Notify_EventChannel::TAO_Notify_EventChannel ()
   : ecf_ (0)
   , ca_container_ (0)
   , sa_container_ (0)
@@ -179,19 +179,19 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent)
 
 
 void
-TAO_Notify_EventChannel::_add_ref (void)
+TAO_Notify_EventChannel::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_EventChannel::_remove_ref (void)
+TAO_Notify_EventChannel::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_Notify_EventChannel::release (void)
+TAO_Notify_EventChannel::release ()
 {
   delete this;
   //@@ inform factory
@@ -204,7 +204,7 @@ TAO_Notify_EventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID,
 }
 
 int
-TAO_Notify_EventChannel::shutdown (void)
+TAO_Notify_EventChannel::shutdown ()
 {
   int sd_ret = TAO_Notify_Object::shutdown ();
 
@@ -221,7 +221,7 @@ TAO_Notify_EventChannel::shutdown (void)
 }
 
 void
-TAO_Notify_EventChannel::destroy (void)
+TAO_Notify_EventChannel::destroy ()
 {
   TAO_Notify_EventChannel::Ptr guard( this );
 
@@ -260,19 +260,19 @@ TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos)
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_EventChannel::get_qos (void)
+TAO_Notify_EventChannel::get_qos ()
 {
   return this->TAO_Notify_Object::get_qos ();
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannel::MyFactory (void)
+TAO_Notify_EventChannel::MyFactory ()
 {
   return this->ecf_->_this ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::default_consumer_admin (void)
+TAO_Notify_EventChannel::default_consumer_admin ()
 {
   if (CORBA::is_nil (default_consumer_admin_.in ()))
     {
@@ -299,7 +299,7 @@ TAO_Notify_EventChannel::default_consumer_admin (void)
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::default_supplier_admin (void)
+TAO_Notify_EventChannel::default_supplier_admin ()
 {
   if (CORBA::is_nil (default_supplier_admin_.in ()))
     {
@@ -324,7 +324,7 @@ TAO_Notify_EventChannel::default_supplier_admin (void)
 }
 
 ::CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_EventChannel::default_filter_factory (void)
+TAO_Notify_EventChannel::default_filter_factory ()
 {
   return CosNotifyFilter::FilterFactory::_duplicate (this->default_filter_factory_.in ());
 }
@@ -384,7 +384,7 @@ TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel::get_all_consumeradmins (void)
+TAO_Notify_EventChannel::get_all_consumeradmins ()
 {
   TAO_Notify_ConsumerAdmin_Seq_Worker seq_worker;
 
@@ -392,7 +392,7 @@ TAO_Notify_EventChannel::get_all_consumeradmins (void)
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel::get_all_supplieradmins (void)
+TAO_Notify_EventChannel::get_all_supplieradmins ()
 {
   TAO_Notify_SupplierAdmin_Seq_Worker seq_worker;
 
@@ -406,7 +406,7 @@ TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & adm
 }
 
 CosNotification::AdminProperties*
-TAO_Notify_EventChannel::get_admin (void)
+TAO_Notify_EventChannel::get_admin ()
 {
   CosNotification::AdminProperties_var properties;
 
@@ -420,13 +420,13 @@ TAO_Notify_EventChannel::get_admin (void)
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::for_consumers (void)
+TAO_Notify_EventChannel::for_consumers ()
 {
   return this->default_consumer_admin();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::for_suppliers (void)
+TAO_Notify_EventChannel::for_suppliers ()
 {
   return this->default_supplier_admin ();
 }
@@ -592,7 +592,7 @@ TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_
 
 
 void
-TAO_Notify_EventChannel::reconnect (void)
+TAO_Notify_EventChannel::reconnect ()
 {
   TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin> ca_wrk;
   this->ca_container().collection()->for_each(&ca_wrk);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index a51e3da7ba7..ad4ff082cd8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -45,7 +45,7 @@ TAO_Notify_EventChannel_Find_Worker;
 
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Seq_Worker;
 
-TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory (void)
+TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory ()
   : topology_save_seq_ (0)
   , topology_factory_(0)
   , reconnect_registry_(*this)
@@ -58,7 +58,7 @@ TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory ()
 }
 
 void
-TAO_Notify_EventChannelFactory::destroy (void)
+TAO_Notify_EventChannelFactory::destroy ()
 {
   if (this->shutdown () == 1)
     return;
@@ -128,19 +128,19 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa)
 }
 
 void
-TAO_Notify_EventChannelFactory::_add_ref (void)
+TAO_Notify_EventChannelFactory::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_EventChannelFactory::_remove_ref (void)
+TAO_Notify_EventChannelFactory::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_Notify_EventChannelFactory::release (void)
+TAO_Notify_EventChannelFactory::release ()
 {
   delete this;
   //@@ inform factory
@@ -154,7 +154,7 @@ TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel)
 }
 
 int
-TAO_Notify_EventChannelFactory::shutdown (void)
+TAO_Notify_EventChannelFactory::shutdown ()
 {
   this->stop_validator();
 
@@ -194,7 +194,7 @@ TAO_Notify_EventChannelFactory::create_named_channel (
 }
 
 CosNotifyChannelAdmin::ChannelIDSeq*
-TAO_Notify_EventChannelFactory::get_all_channels (void)
+TAO_Notify_EventChannelFactory::get_all_channels ()
 {
   TAO_Notify_EventChannel_Seq_Worker seq_worker;
 
@@ -222,13 +222,13 @@ TAO_Notify_EventChannelFactory::set_topology_factory(TAO_Notify::Topology_Factor
 }
 
 void
-TAO_Notify_EventChannelFactory::load_topology (void)
+TAO_Notify_EventChannelFactory::load_topology ()
 {
   this->loading_topology_ = true;
   if (this->topology_factory_ != 0)
   {
     // create_loader will open and load the persistence file for validation
-    auto_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader());
+    std::unique_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader());
     if (tl.get () != 0)
     {
       tl->load (this);
@@ -292,7 +292,7 @@ TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& sav
 }
 
 void
-TAO_Notify_EventChannelFactory::load_event_persistence (void)
+TAO_Notify_EventChannelFactory::load_event_persistence ()
 {
   TAO_Notify::Event_Persistence_Strategy * strategy =
     ACE_Dynamic_Service <TAO_Notify::Event_Persistence_Strategy>::instance ("Event_Persistence");
@@ -334,7 +334,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void)
 }
 
 bool
-TAO_Notify_EventChannelFactory::change_to_parent (void)
+TAO_Notify_EventChannelFactory::change_to_parent ()
 {
   bool saving = false;
   if (! this->loading_topology_)
@@ -351,7 +351,7 @@ TAO_Notify_EventChannelFactory::change_to_parent (void)
       ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->topology_save_lock_, CORBA::INTERNAL ());
       if (seq == this->topology_save_seq_)
       {
-        auto_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver());
+        std::unique_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver());
         if (saver.get() != 0)
         {
           this->save_persistent(*saver);
@@ -396,7 +396,7 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
 }
 
 void
-TAO_Notify_EventChannelFactory::reconnect (void)
+TAO_Notify_EventChannelFactory::reconnect ()
 {
   // Reconnect all children first
   TAO_Notify::Reconnect_Worker<TAO_Notify_EventChannel> wrk;
@@ -434,13 +434,13 @@ TAO_Notify_EventChannelFactory::unregister_callback (
 }
 
 CORBA::Boolean
-TAO_Notify_EventChannelFactory::is_alive (void)
+TAO_Notify_EventChannelFactory::is_alive ()
 {
   return CORBA::Boolean (1);
 }
 
 void
-TAO_Notify_EventChannelFactory::save_topology (void)
+TAO_Notify_EventChannelFactory::save_topology ()
 {
   this->self_change ();
 }
@@ -497,7 +497,7 @@ TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory::activate_self (void)
+TAO_Notify_EventChannelFactory::activate_self ()
 {
   CORBA::Object_var obj = this->activate (this);
   this->channel_factory_
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index 7ee8a94b6b3..cb8d189001d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -13,12 +13,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_EventType
-TAO_Notify_EventType::special (void)
+TAO_Notify_EventType::special ()
 {
   return TAO_Notify_EventType ("*", "%ALL");
 }
 
-TAO_Notify_EventType::TAO_Notify_EventType (void)
+TAO_Notify_EventType::TAO_Notify_EventType ()
 {
 }
 
@@ -55,7 +55,7 @@ TAO_Notify_EventType::~TAO_Notify_EventType ()
 }
 
 void
-TAO_Notify_EventType::recompute_hash (void)
+TAO_Notify_EventType::recompute_hash ()
 {
   // @@ Pradeep: this code is bound to crash someday if the strings
   // are too long....  See if the hash_pjw () function can be modified
@@ -112,14 +112,14 @@ TAO_Notify_EventType::operator!=(const TAO_Notify_EventType& event_type) const
 }
 
 CORBA::Boolean
-TAO_Notify_EventType::is_special (void) const
+TAO_Notify_EventType::is_special () const
 {
   return (this->domain_is_wildcard (this->event_type_.domain_name) &&
           this->type_is_wildcard (this->event_type_.type_name));
 }
 
 void
-TAO_Notify_EventType::dump (void) const
+TAO_Notify_EventType::dump () const
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
               "(%s,%s)",
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index b5a0f316f9f..ca5bed88301 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -67,7 +67,7 @@ public:
   const CosNotification::EventType& native (void) const;
 
   /// Helper to print contents.
-  void dump (void) const;
+  void dump () const;
 
   /// Initialize from an NVPList, return false on failure
   bool init(const TAO_Notify::NVPList& attrs);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index 906e103d2cd..cd98e86503a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void)
+TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq ()
 {
 }
 
@@ -243,7 +243,7 @@ TAO_Notify_EventTypeSeq::intersection (const TAO_Notify_EventTypeSeq& rhs, const
 }
 
 void
-TAO_Notify_EventTypeSeq::dump (void) const
+TAO_Notify_EventTypeSeq::dump () const
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (*this);
 
@@ -303,7 +303,7 @@ TAO_Notify_EventTypeSeq::load_child (const ACE_CString &type, CORBA::Long id,
 }
 
 void
-TAO_Notify_EventTypeSeq::release (void)
+TAO_Notify_EventTypeSeq::release ()
 {
   delete this;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index b011441347d..5ecbd009ffc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -64,7 +64,7 @@ public:
   void populate_no_special (CosNotification::EventTypeSeq& event_type) const;
 
   /// Print the contents.
-  void dump (void) const;
+  void dump () const;
 
   // TAO_Notify::Topology_Object
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index 3f279e612ea..0ad3ff2ca33 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -55,7 +55,7 @@ protected:
 
 /********************************************************************************/
 
-TAO_Notify_Event_Manager::TAO_Notify_Event_Manager (void)
+TAO_Notify_Event_Manager::TAO_Notify_Event_Manager ()
 {
 }
 
@@ -74,7 +74,7 @@ void TAO_Notify_Event_Manager::release()
 }
 
 void
-TAO_Notify_Event_Manager::init (void)
+TAO_Notify_Event_Manager::init ()
 {
   ACE_ASSERT (this->consumer_map_.get() == 0);
 
@@ -96,7 +96,7 @@ TAO_Notify_Event_Manager::init (void)
 }
 
 void
-TAO_Notify_Event_Manager::shutdown (void)
+TAO_Notify_Event_Manager::shutdown ()
 {
 }
 
@@ -231,27 +231,27 @@ TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer,
 }
 
 TAO_Notify_Consumer_Map&
-TAO_Notify_Event_Manager::consumer_map (void)
+TAO_Notify_Event_Manager::consumer_map ()
 {
   ACE_ASSERT( this->consumer_map_.get() != 0 );
   return *this->consumer_map_;
 }
 
 TAO_Notify_Supplier_Map&
-TAO_Notify_Event_Manager::supplier_map (void)
+TAO_Notify_Event_Manager::supplier_map ()
 {
   ACE_ASSERT( this->supplier_map_.get() != 0 );
   return *this->supplier_map_;
 }
 
 const TAO_Notify_EventTypeSeq&
-TAO_Notify_Event_Manager::offered_types (void) const
+TAO_Notify_Event_Manager::offered_types () const
 {
   return this->supplier_map_->event_types ();
 }
 
 const TAO_Notify_EventTypeSeq&
-TAO_Notify_Event_Manager::subscription_types (void) const
+TAO_Notify_Event_Manager::subscription_types () const
 {
   return this->consumer_map_->event_types ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index db98b1d895f..c9281a4bffd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -110,12 +110,10 @@ protected:
   void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq);
 
 private:
-  // Disallow copying and assignment; we don't need them
-  // and if we let the compiler generate them it needs the
-  // full declaration of the template arguments for ACE_Auto_Ptr<>
-  // below.
-  TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&);
-  TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&);
+  TAO_Notify_Event_Manager (const TAO_Notify_Event_Manager&) = delete;
+  TAO_Notify_Event_Manager& operator= (const TAO_Notify_Event_Manager&) = delete;
+  TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&&) = delete;
+  TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&&) = delete;
 
   /// Consumer Map
   ACE_Auto_Ptr< TAO_Notify_Consumer_Map > consumer_map_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
index 0bfdbf409ec..3876f8b7463 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory (void)
+TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 441b3d556d0..64d570166d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -15,13 +15,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Implementation skeleton constructor
-TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin (void)
+TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin ()
 {
 }
 
 
 // Implementation skeleton destructor
-TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin (void)
+TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin ()
 {
 }
 
@@ -71,7 +71,7 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id)
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_Notify_FilterAdmin::get_all_filters (void)
+TAO_Notify_FilterAdmin::get_all_filters ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -104,7 +104,7 @@ TAO_Notify_FilterAdmin::get_all_filters (void)
 }
 
 void
-TAO_Notify_FilterAdmin::remove_all_filters (void)
+TAO_Notify_FilterAdmin::remove_all_filters ()
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -174,7 +174,7 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
 }
 
 void
-TAO_Notify_FilterAdmin::release (void)
+TAO_Notify_FilterAdmin::release ()
 {
   delete this;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
index eca1d32f6f3..b6c6ca41364 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void)
+TAO_Notify_ID_Factory::TAO_Notify_ID_Factory ()
   : seed_ (0)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index e43bf8d3057..fdcd1075447 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -5,12 +5,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void)
+TAO_Notify_Method_Request::~TAO_Notify_Method_Request ()
 {
 }
 
 TAO_Notify_Method_Request_Queueable *
-TAO_Notify_Method_Request_Queueable::copy (void)
+TAO_Notify_Method_Request_Queueable::copy ()
 {
   return this;
 }
@@ -57,7 +57,7 @@ TAO_Notify_Method_Request_Queueable::init (const TAO_Notify_Event* event)
 }
 
 const ACE_Time_Value&
-TAO_Notify_Method_Request_Queueable::creation_time (void) const
+TAO_Notify_Method_Request_Queueable::creation_time () const
 {
   return this->time_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 3a420766747..f584e725bef 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -57,7 +57,7 @@ TAO_Notify_Method_Request_Dispatch::~TAO_Notify_Method_Request_Dispatch ()
 {
 }
 
-int TAO_Notify_Method_Request_Dispatch::execute_i (void)
+int TAO_Notify_Method_Request_Dispatch::execute_i ()
 {
   if (this->proxy_supplier_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
@@ -210,7 +210,7 @@ TAO_Notify_Method_Request_Dispatch_Queueable::~TAO_Notify_Method_Request_Dispatc
 }
 
 int
-TAO_Notify_Method_Request_Dispatch_Queueable::execute (void)
+TAO_Notify_Method_Request_Dispatch_Queueable::execute ()
 {
   return this->execute_i ();
 }
@@ -231,13 +231,13 @@ TAO_Notify_Method_Request_Dispatch_No_Copy:: ~TAO_Notify_Method_Request_Dispatch
 }
 
 int
-TAO_Notify_Method_Request_Dispatch_No_Copy::execute (void)
+TAO_Notify_Method_Request_Dispatch_No_Copy::execute ()
 {
   return this->execute_i ();
 }
 
 TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Dispatch_No_Copy::copy (void)
+TAO_Notify_Method_Request_Dispatch_No_Copy::copy ()
 {
   TAO_Notify_Method_Request_Queueable* request = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 519b1ff0a47..590bbba4ffe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -83,7 +83,7 @@ TAO_Notify_Method_Request_Event_Queueable::~TAO_Notify_Method_Request_Event_Queu
 }
 
 int
-TAO_Notify_Method_Request_Event_Queueable::execute (void)
+TAO_Notify_Method_Request_Event_Queueable::execute ()
 {
   ACE_ASSERT (false);
   return -1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index 2a3cf610e46..264f4ede97c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -54,7 +54,7 @@ TAO_Notify_Method_Request_Lookup::work (
   }
 }
 
-int TAO_Notify_Method_Request_Lookup::execute_i (void)
+int TAO_Notify_Method_Request_Lookup::execute_i ()
 {
   if (this->proxy_consumer_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
@@ -187,7 +187,7 @@ TAO_Notify_Method_Request_Lookup_Queueable::~TAO_Notify_Method_Request_Lookup_Qu
 }
 
 int
-TAO_Notify_Method_Request_Lookup_Queueable::execute (void)
+TAO_Notify_Method_Request_Lookup_Queueable::execute ()
 {
   return this->execute_i ();
 }
@@ -206,13 +206,13 @@ TAO_Notify_Method_Request_Lookup_No_Copy::~TAO_Notify_Method_Request_Lookup_No_C
 }
 
 int
-TAO_Notify_Method_Request_Lookup_No_Copy::execute (void)
+TAO_Notify_Method_Request_Lookup_No_Copy::execute ()
 {
   return this->execute_i ();
 }
 
 TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Lookup_No_Copy::copy (void)
+TAO_Notify_Method_Request_Lookup_No_Copy::copy ()
 {
   TAO_Notify_Method_Request_Queueable* request;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index 5a25e497aae..847a70616aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -13,13 +13,13 @@ TAO_Notify_Method_Request_Shutdown::~TAO_Notify_Method_Request_Shutdown ()
 }
 
 TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Shutdown::copy (void)
+TAO_Notify_Method_Request_Shutdown::copy ()
 {
   return new TAO_Notify_Method_Request_Shutdown (this->task_);
 }
 
 int
-TAO_Notify_Method_Request_Shutdown::execute (void)
+TAO_Notify_Method_Request_Shutdown::execute ()
 {
   // Shut down the scheduler by deactivating the activation queue's
   // underlying message queue - should pop all worker threads off their
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 14f93d48e73..3b4eee8bb9f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -15,7 +15,7 @@ TAO_Notify_Method_Request_Updates::~TAO_Notify_Method_Request_Updates ()
 }
 
 int
-TAO_Notify_Method_Request_Updates::execute (void)
+TAO_Notify_Method_Request_Updates::execute ()
 {
   return this->execute_i ();
 }
@@ -33,7 +33,7 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No
 }
 
 TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Updates_No_Copy::copy (void)
+TAO_Notify_Method_Request_Updates_No_Copy::copy ()
 {
   TAO_Notify_Method_Request_Queueable* request = 0;
 
@@ -45,7 +45,7 @@ TAO_Notify_Method_Request_Updates_No_Copy::copy (void)
 }
 
 int
-TAO_Notify_Method_Request_Updates_No_Copy::execute (void)
+TAO_Notify_Method_Request_Updates_No_Copy::execute ()
 {
   return this->execute_i ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
index 73e63738be3..7ff8ac5455d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_NS_Control::~TAO_NS_Control (void)
+TAO_NS_Control::~TAO_NS_Control ()
 {
 }
 
@@ -12,7 +12,7 @@ TAO_NS_Control::TAO_NS_Control (const char* name)
 }
 
 const ACE_CString&
-TAO_NS_Control::name (void) const
+TAO_NS_Control::name () const
 {
   return this->name_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
index 2dce7e4ea36..6b767080a8d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
@@ -3,12 +3,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Control_Registry*
-TAO_Control_Registry::instance (void)
+TAO_Control_Registry::instance ()
 {
   return TAO_Singleton<TAO_Control_Registry, TAO_SYNCH_MUTEX>::instance ();
 }
 
-TAO_Control_Registry::~TAO_Control_Registry (void)
+TAO_Control_Registry::~TAO_Control_Registry ()
 {
   ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->mutex_);
 
@@ -67,7 +67,7 @@ TAO_Control_Registry::remove (const ACE_CString& name)
 }
 
 const TAO_Control_Registry::NameList&
-TAO_Control_Registry::names (void)
+TAO_Control_Registry::names ()
 {
   if (this->name_cache_.length () == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
index cdee710b3d7..0c9a43b1f82 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
@@ -16,7 +16,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_MonitorManager::TAO_MonitorManager (void)
+TAO_MonitorManager::TAO_MonitorManager ()
   : run_ (false)
   , initialized_ (false)
 {
@@ -93,7 +93,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-TAO_MonitorManager::fini (void)
+TAO_MonitorManager::fini ()
 {
   if (!CORBA::is_nil (this->task_.orb_.in ()))
     {
@@ -110,7 +110,7 @@ TAO_MonitorManager::fini (void)
 }
 
 int
-TAO_MonitorManager::run (void)
+TAO_MonitorManager::run ()
 {
   bool activate = false;
 
@@ -152,13 +152,13 @@ TAO_MonitorManager::run (void)
 }
 
 int
-TAO_MonitorManager::resume (void)
+TAO_MonitorManager::resume ()
 {
   return this->run ();
 }
 
 void
-TAO_MonitorManager::shutdown (void)
+TAO_MonitorManager::shutdown ()
 {
   TAO_MonitorManager* monitor =
     ACE_Dynamic_Service<TAO_MonitorManager>::instance (
@@ -170,7 +170,7 @@ TAO_MonitorManager::shutdown (void)
     }
 }
 
-TAO_MonitorManager::ORBTask::ORBTask (void)
+TAO_MonitorManager::ORBTask::ORBTask ()
  : use_name_svc_ (true)
    , startup_barrier_ (2) // synch the parent with the single child thread
    , mc_orb_name_ (ACE_TEXT("TAO_MonitorAndControl"))
@@ -178,7 +178,7 @@ TAO_MonitorManager::ORBTask::ORBTask (void)
 }
 
 int
-TAO_MonitorManager::ORBTask::svc (void)
+TAO_MonitorManager::ORBTask::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
index 03cbde82aab..e5ca866f620 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
@@ -21,7 +21,7 @@ NotificationServiceMonitor_i::NotificationServiceMonitor_i (CORBA::ORB_ptr orb)
 }
 
 Monitor::NameList*
-NotificationServiceMonitor_i::get_statistic_names (void)
+NotificationServiceMonitor_i::get_statistic_names ()
 {
   Monitor_Control_Types::NameList name_list =
     Monitor_Point_Registry::instance ()->names ();
@@ -208,7 +208,7 @@ NotificationServiceMonitor_i::send_control_command (const char* name,
 }
 
 void
-NotificationServiceMonitor_i::shutdown (void)
+NotificationServiceMonitor_i::shutdown ()
 {
   if (!CORBA::is_nil (this->orb_.in ()))
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h
index 67021c98ab8..f27157372ac 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h
@@ -36,11 +36,9 @@ class TAO_Notify_MC_Ext_Export TAO_MC_Default_Factory:
                                  public TAO_Notify_Default_Factory
 {
 public:
-#if !defined (__GNUC__) || (__GNUC__ >= 3)
   /// Instruct the compiler that we want the create
   /// methods from the base class as well
   using TAO_Notify_Default_Factory::create;
-#endif /* !__GNUC__ || __GNUC__ >= 3 */
 
   /// Create the channel factory.
   virtual void create (TAO_Notify_EventChannelFactory*& factory,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
index 72063c91920..8994a77cfc0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
@@ -13,12 +13,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_MC_Notify_Service::~TAO_MC_Notify_Service (void)
+TAO_MC_Notify_Service::~TAO_MC_Notify_Service ()
 {
 }
 
 TAO_Notify_Factory*
-TAO_MC_Notify_Service::create_factory (void)
+TAO_MC_Notify_Service::create_factory ()
 {
   TAO_MC_Default_Factory* factory = 0;
   ACE_NEW_THROW_EX (factory,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
index 6847580b12d..5d9275a1412 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
@@ -51,7 +51,7 @@ private:
   CosNotifyChannelAdmin::AdminID id_;
 };
 
-TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin (void)
+TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin ()
   : stat_name_ (),
     control_name_ (),
     queue_size_ (0),
@@ -59,7 +59,7 @@ TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin (void)
 {
 }
 
-TAO_MonitorConsumerAdmin::~TAO_MonitorConsumerAdmin (void)
+TAO_MonitorConsumerAdmin::~TAO_MonitorConsumerAdmin ()
 {
   this->remove ();
   // The registry also manages this refcount. The pointer itself
@@ -205,7 +205,7 @@ TAO_MonitorConsumerAdmin::count_queue_overflow (
 }
 
 TAO_MonitorEventChannel *
-TAO_MonitorConsumerAdmin::get_ec (void) const
+TAO_MonitorConsumerAdmin::get_ec () const
 {
   TAO_MonitorEventChannel* ec = dynamic_cast<TAO_MonitorEventChannel*> (this->ec_.get ());
   if (ec == 0)
@@ -214,21 +214,21 @@ TAO_MonitorConsumerAdmin::get_ec (void) const
 }
 
 const ACE_CString &
-TAO_MonitorConsumerAdmin::stat_name (void)const
+TAO_MonitorConsumerAdmin::stat_name ()const
 {
   return stat_name_;
 }
 
 
 void
-TAO_MonitorConsumerAdmin::destroy (void)
+TAO_MonitorConsumerAdmin::destroy ()
 {
   this->remove ();
   this->TAO_Notify_ConsumerAdmin::destroy ();
 }
 
 void
-TAO_MonitorConsumerAdmin::remove (void)
+TAO_MonitorConsumerAdmin::remove ()
 {
   // First, make sure we can get down to the real ec type
   TAO_MonitorEventChannel* ec =
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
index 5b9b6f9470b..92e23ce07d6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
@@ -39,7 +39,7 @@ public:
   {
   }
 
-  virtual void update (void) {
+  virtual void update () {
     if (this->type () == Monitor_Control_Types::MC_LIST)
       {
         Monitor_Control_Types::NameList list;
@@ -75,7 +75,7 @@ public:
   {
   }
 
-  virtual void update (void) {
+  virtual void update () {
     Monitor_Control_Types::NameList list;
     this->interf_->get_timedout_consumers (&list);
     this->receive (list);
@@ -97,7 +97,7 @@ public:
   {
   }
 
-  virtual void update (void)
+  virtual void update ()
   {
     if (this->type () == Monitor_Control_Types::MC_LIST)
       {
@@ -146,7 +146,7 @@ public:
   {
   }
 
-  virtual void update (void)
+  virtual void update ()
   {
     this->receive (this->interf_->calculate_queue_size (this->count_));
   }
@@ -168,7 +168,7 @@ public:
   {
   }
 
-  virtual void update (void)
+  virtual void update ()
   {
     this->receive (this->interf_->get_oldest_event ());
   }
@@ -187,7 +187,7 @@ public:
   {
   }
 
-  virtual void update (void)
+  virtual void update ()
   {
     Monitor_Control_Types::NameList list;
     this->interf_->determine_slowest_consumer (&list);
@@ -296,7 +296,7 @@ TAO_MonitorEventChannel::TAO_MonitorEventChannel (const char* name)
   this->add_stats ();
 }
 
-TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void)
+TAO_MonitorEventChannel::~TAO_MonitorEventChannel ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_);
 
@@ -318,7 +318,7 @@ TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void)
 }
 
 const ACE_CString&
-TAO_MonitorEventChannel::name (void) const
+TAO_MonitorEventChannel::name () const
 {
   return this->name_;
 }
@@ -1288,7 +1288,7 @@ TAO_MonitorEventChannel::determine_slowest_consumer (
 }
 
 double
-TAO_MonitorEventChannel::get_oldest_event (void)
+TAO_MonitorEventChannel::get_oldest_event ()
 {
   CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids =
     this->get_all_consumeradmins ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
index d3de46ab273..753ace26855 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
@@ -30,7 +30,7 @@ public:
   {
   }
 
-  virtual void update (void)
+  virtual void update ()
   {
     if (this->type () == Monitor_Control_Types::MC_LIST)
       {
@@ -151,7 +151,7 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory (
     }
 }
 
-TAO_MonitorEventChannelFactory::~TAO_MonitorEventChannelFactory (void)
+TAO_MonitorEventChannelFactory::~TAO_MonitorEventChannelFactory ()
 {
   Monitor_Point_Registry* instance = Monitor_Point_Registry::instance ();
   size_t size = this->stat_names_.size ();
@@ -418,7 +418,7 @@ TAO_MonitorEventChannelFactory::Unbinder::Unbinder (
 {
 }
 
-TAO_MonitorEventChannelFactory::Unbinder::~Unbinder (void)
+TAO_MonitorEventChannelFactory::Unbinder::~Unbinder ()
 {
   if (!this->released_)
     {
@@ -427,7 +427,7 @@ TAO_MonitorEventChannelFactory::Unbinder::~Unbinder (void)
 }
 
 void
-TAO_MonitorEventChannelFactory::Unbinder::release (void)
+TAO_MonitorEventChannelFactory::Unbinder::release ()
 {
   this->released_ = true;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
index b1e55e19a79..ffa6e2bb0e1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
@@ -41,11 +41,11 @@ private:
   CosNotifyChannelAdmin::AdminID id_;
 };
 
-TAO_MonitorSupplierAdmin::TAO_MonitorSupplierAdmin (void)
+TAO_MonitorSupplierAdmin::TAO_MonitorSupplierAdmin ()
 {
 }
 
-TAO_MonitorSupplierAdmin::~TAO_MonitorSupplierAdmin (void)
+TAO_MonitorSupplierAdmin::~TAO_MonitorSupplierAdmin ()
 {
   // First, make sure we can get down to the real ec type
   TAO_MonitorEventChannel* ec =
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index e0f0a0a8b38..c255704f3df 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -6,11 +6,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter (void)
+TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter ()
 {
 }
 
-TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void)
+TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index eb1e3c4e429..f26b3719927 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -17,7 +17,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
+TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor ()
   : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY),
     implicit_ids_(implicit_ids_size_),
     filterable_data_(filterable_data_size_),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
index f0af71d982c..f9ca1b251e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Notify_Default_CO_Factory::init_svc (void)
+TAO_Notify_Default_CO_Factory::init_svc ()
 {
   // NOP.
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index 21421e091e7..cf3fdb6e5d8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Notify_Default_Collection_Factory::init_svc (void)
+TAO_Notify_Default_Collection_Factory::init_svc ()
 {
   // NOP.
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
index 44687d95c71..f8020100558 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Notify_Default_EMO_Factory::init_svc (void)
+TAO_Notify_Default_EMO_Factory::init_svc ()
 {
   // NOP.
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
index 6648d5e5ffd..c80e8358626 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Notify_Default_POA_Factory::init_svc (void)
+TAO_Notify_Default_POA_Factory::init_svc ()
 {
   // NOP.
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index adb740a2803..3fe20a72ab3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -15,7 +15,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Object::TAO_Notify_Object (void)
+TAO_Notify_Object::TAO_Notify_Object ()
 : poa_ (0)
 , proxy_poa_ (0)
 , own_proxy_poa_ (false)
@@ -82,7 +82,7 @@ TAO_Notify_Object::activate (
 
 
 void
-TAO_Notify_Object::deactivate (void)
+TAO_Notify_Object::deactivate ()
 {
   try
   {
@@ -100,7 +100,7 @@ TAO_Notify_Object::deactivate (void)
 }
 
 int
-TAO_Notify_Object::shutdown (void)
+TAO_Notify_Object::shutdown ()
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
@@ -119,13 +119,13 @@ TAO_Notify_Object::shutdown (void)
 }
 
 CORBA::Object_ptr
-TAO_Notify_Object::ref (void)
+TAO_Notify_Object::ref ()
 {
   return this->poa_->id_to_reference (this->id_);
 }
 
 void
-TAO_Notify_Object::shutdown_worker_task (void)
+TAO_Notify_Object::shutdown_worker_task ()
 {
   // Only do this if we are the owner.
   TAO_Notify_Worker_Task::Ptr task( this->worker_task_ );
@@ -140,7 +140,7 @@ TAO_Notify_Object::shutdown_worker_task (void)
 }
 
 void
-TAO_Notify_Object::destroy_proxy_poa (void)
+TAO_Notify_Object::destroy_proxy_poa ()
 {
   if (this->proxy_poa_ != 0)
   {
@@ -166,7 +166,7 @@ TAO_Notify_Object::destroy_proxy_poa (void)
 }
 
 void
-TAO_Notify_Object::destroy_object_poa (void)
+TAO_Notify_Object::destroy_object_poa ()
 {
   if (this->object_poa_ != 0)
   {
@@ -192,7 +192,7 @@ TAO_Notify_Object::destroy_object_poa (void)
 }
 
 /// Shutdown the current poa.
-void TAO_Notify_Object::destroy_poa (void)
+void TAO_Notify_Object::destroy_poa ()
 {
   this->poa_ = 0;
 }
@@ -280,7 +280,7 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos)
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_Object::get_qos (void)
+TAO_Notify_Object::get_qos ()
 {
   CosNotification::QoSProperties_var properties;
 
@@ -311,7 +311,7 @@ TAO_Notify_Object::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties
 }
 
 TAO_Notify_Timer*
-TAO_Notify_Object::timer (void)
+TAO_Notify_Object::timer ()
 {
   ACE_ASSERT (worker_task_.get() != 0);
   return this->worker_task_->timer ();
@@ -355,7 +355,7 @@ TAO_Notify_Object::load_attrs(const TAO_Notify::NVPList& attrs)
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Object::get_worker_task (void)
+TAO_Notify_Object::get_worker_task ()
 {
   return this->worker_task_.get ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index b81da9bd7dc..ddf7d362ecc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -13,16 +13,16 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void)
+TAO_Notify_POA_Helper::TAO_Notify_POA_Helper ()
 {
 }
 
-TAO_Notify_POA_Helper::~TAO_Notify_POA_Helper (void)
+TAO_Notify_POA_Helper::~TAO_Notify_POA_Helper ()
 {
 }
 
 ACE_CString
-TAO_Notify_POA_Helper::get_unique_id (void)
+TAO_Notify_POA_Helper::get_unique_id ()
 {
   /// Factory for generating unique ids for the POAs.
   static TAO_Notify_ID_Factory poa_id_factory;
@@ -234,7 +234,7 @@ TAO_Notify_POA_Helper::servant_to_reference (
 
 
 void
-TAO_Notify_POA_Helper::destroy (void)
+TAO_Notify_POA_Helper::destroy ()
 {
   poa_->destroy (true, false);
  // The <wait_for_completion> flag = 0
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index d76ad81625d..894e03dc65a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Peer::TAO_Notify_Peer (void)
+TAO_Notify_Peer::TAO_Notify_Peer ()
 {
 }
 
@@ -19,13 +19,13 @@ TAO_Notify_Peer::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties*/
 }
 
 void
-TAO_Notify_Peer::shutdown (void)
+TAO_Notify_Peer::shutdown ()
 {
   // NOP.
 }
 
 void
-TAO_Notify_Peer::handle_dispatch_exception (void)
+TAO_Notify_Peer::handle_dispatch_exception ()
 {
   // Sever all association when a remote client misbehaves. Other strategies like reties are possible but not implemented.
   this->proxy ()->destroy ();
@@ -100,13 +100,13 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const
 }
 
 CORBA::ULong
-TAO_Notify_Peer::_incr_refcnt (void)
+TAO_Notify_Peer::_incr_refcnt ()
 {
   return this->proxy ()->_incr_refcnt ();
 }
 
 CORBA::ULong
-TAO_Notify_Peer::_decr_refcnt (void)
+TAO_Notify_Peer::_decr_refcnt ()
 {
   return this->proxy ()->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index 73262ca1adc..fd1938022b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Properties::TAO_Notify_Properties (void)
+TAO_Notify_Properties::TAO_Notify_Properties ()
   : factory_ (0)
   , builder_ (0)
   , orb_(0)
@@ -39,14 +39,14 @@ TAO_Notify_Properties::~TAO_Notify_Properties ()
 }
 
 TAO_Notify_Properties *
-TAO_Notify_Properties::instance (void)
+TAO_Notify_Properties::instance ()
 {
   return ACE_Unmanaged_Singleton<TAO_Notify_Properties,
                                  TAO_SYNCH_MUTEX>::instance ();
 }
 
 void
-TAO_Notify_Properties::close (void)
+TAO_Notify_Properties::close ()
 {
   ACE_Unmanaged_Singleton<TAO_Notify_Properties,
                           TAO_SYNCH_MUTEX>::close ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
index 27d5d57ae16..77d76160bad 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void)
+TAO_Notify_PropertySeq::TAO_Notify_PropertySeq ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index a82555e7620..ca6b2956649 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -14,7 +14,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Proxy::TAO_Notify_Proxy (void)
+TAO_Notify_Proxy::TAO_Notify_Proxy ()
   : updates_off_ (0)
 {
 }
@@ -41,7 +41,7 @@ TAO_Notify_Proxy::activate (PortableServer::Servant servant,
 }
 
 void
-TAO_Notify_Proxy::deactivate (void)
+TAO_Notify_Proxy::deactivate ()
 {
   ACE_ASSERT (this->proxy_poa() != 0 );
   this->proxy_poa()->deactivate (this->id());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index 483546e7e7e..533dcced502 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -26,7 +26,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void)
+TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer ()
   : supplier_admin_ (0)
 {
 }
@@ -36,7 +36,7 @@ TAO_Notify_ProxyConsumer::~TAO_Notify_ProxyConsumer ()
 }
 
 TAO_Notify_Peer*
-TAO_Notify_ProxyConsumer::peer (void)
+TAO_Notify_ProxyConsumer::peer ()
 {
   return this->supplier ();
 }
@@ -145,7 +145,7 @@ TAO_Notify_ProxyConsumer::supports_reliable_events () const
 }
 
 void
-TAO_Notify_ProxyConsumer::disconnect (void)
+TAO_Notify_ProxyConsumer::disconnect ()
 {
   TAO_Notify_EventTypeSeq added;
 
@@ -158,7 +158,7 @@ TAO_Notify_ProxyConsumer::disconnect (void)
 }
 
 int
-TAO_Notify_ProxyConsumer::shutdown (void)
+TAO_Notify_ProxyConsumer::shutdown ()
 {
   if (this->TAO_Notify_Object::shutdown () == 1)
     return 1;
@@ -174,7 +174,7 @@ TAO_Notify_ProxyConsumer::shutdown (void)
 }
 
 void
-TAO_Notify_ProxyConsumer::destroy (void)
+TAO_Notify_ProxyConsumer::destroy ()
 {
   this->shutdown ();
   this->supplier_admin_->cleanup_proxy (this, false, false);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 46b2740b2e3..f655b71fada 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -15,7 +15,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void)
+TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier ()
   : consumer_admin_ (0)
 {
 }
@@ -47,7 +47,7 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin)
 }
 
 TAO_Notify_Peer*
-TAO_Notify_ProxySupplier:: peer (void)
+TAO_Notify_ProxySupplier:: peer ()
 {
   return this->consumer ();
 }
@@ -99,7 +99,7 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer)
 }
 
 void
-TAO_Notify_ProxySupplier::disconnect (void)
+TAO_Notify_ProxySupplier::disconnect ()
 {
   TAO_Notify_EventTypeSeq added;
 
@@ -112,7 +112,7 @@ TAO_Notify_ProxySupplier::disconnect (void)
 }
 
 int
-TAO_Notify_ProxySupplier::shutdown (void)
+TAO_Notify_ProxySupplier::shutdown ()
 {
   if (this->TAO_Notify_Object::shutdown () == 1)
     return 1;
@@ -128,7 +128,7 @@ TAO_Notify_ProxySupplier::shutdown (void)
 }
 
 void
-TAO_Notify_ProxySupplier::destroy (void)
+TAO_Notify_ProxySupplier::destroy ()
 {
   this->destroy (false);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 4a5e67a70c4..959ce7bd878 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_QoSProperties::TAO_Notify_QoSProperties (void)
+TAO_Notify_QoSProperties::TAO_Notify_QoSProperties ()
   : event_reliability_(CosNotification::EventReliability)
   , connection_reliability_(CosNotification::ConnectionReliability)
   , priority_ (CosNotification::Priority)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index 4437626e758..b9efd07001e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void)
+TAO_Notify_RT_Builder::TAO_Notify_RT_Builder ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index 70a45839531..bb30c4bd9e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_RT_Factory::TAO_Notify_RT_Factory (void)
+TAO_Notify_RT_Factory::TAO_Notify_RT_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index d8e61bda16b..8e47d1fb080 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -38,11 +38,9 @@ public:
   /// Destructor
   virtual ~TAO_Notify_RT_Factory ();
 
-#if !defined (__GNUC__) || (__GNUC__ >= 3)
   /// Instruct the compiler that we want the create
   /// methods from the base class as well
   using TAO_Notify_Default_Factory::create;
-#endif /* !__GNUC__ || __GNUC__ >= 3 */
 
   /// Create StructuredProxyPushSupplier
   virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index 575205e48a4..17d3befb962 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RT_Notify_Service::TAO_RT_Notify_Service (void)
+TAO_RT_Notify_Service::TAO_RT_Notify_Service ()
 {
 }
 
@@ -53,7 +53,7 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb)
 }
 
 TAO_Notify_Factory*
-TAO_RT_Notify_Service::create_factory (void)
+TAO_RT_Notify_Service::create_factory ()
 {
   TAO_Notify_Factory* factory =
     ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
@@ -68,7 +68,7 @@ TAO_RT_Notify_Service::create_factory (void)
 }
 
 TAO_Notify_Builder*
-TAO_RT_Notify_Service::create_builder (void)
+TAO_RT_Notify_Service::create_builder ()
 {
   TAO_Notify_Builder* builder = 0;
   ACE_NEW_THROW_EX (builder,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
index 8967dd68fa3..3f718315949 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void)
+TAO_Notify_RT_Properties::TAO_Notify_RT_Properties ()
 {
 }
 
@@ -16,7 +16,7 @@ TAO_Notify_RT_Properties::~TAO_Notify_RT_Properties ()
 }
 
 TAO_Notify_RT_Properties *
-TAO_Notify_RT_Properties::instance (void)
+TAO_Notify_RT_Properties::instance ()
 {
   // Hide the template instantiation to prevent multiple instances
   // from being created.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index c23841d19cd..29217f504e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task (void)
+TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task ()
   :timer_ (0)
 {
 }
@@ -18,7 +18,7 @@ TAO_Notify_Reactive_Task::~TAO_Notify_Reactive_Task ()
 }
 
 void
-TAO_Notify_Reactive_Task::init (void)
+TAO_Notify_Reactive_Task::init ()
 {
   ACE_ASSERT (this->timer_.get() == 0);
 
@@ -30,13 +30,13 @@ TAO_Notify_Reactive_Task::init (void)
 }
 
 void
-TAO_Notify_Reactive_Task::release (void)
+TAO_Notify_Reactive_Task::release ()
 {
   delete this; //TODO: Release via factory.
 }
 
 void
-TAO_Notify_Reactive_Task::shutdown (void)
+TAO_Notify_Reactive_Task::shutdown ()
 {
 }
 
@@ -47,7 +47,7 @@ TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request)
 }
 
 TAO_Notify_Timer*
-TAO_Notify_Reactive_Task::timer (void)
+TAO_Notify_Reactive_Task::timer ()
 {
   return this->timer_.get();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index f1ffc62b480..6a8f3972cb4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -87,7 +87,7 @@ namespace TAO_Notify
   }
 
   CORBA::Boolean
-  Reconnection_Registry::is_alive (void)
+  Reconnection_Registry::is_alive ()
   {
     return CORBA::Boolean(1);
   }
@@ -231,7 +231,7 @@ namespace TAO_Notify
   }
 
   void
-  Reconnection_Registry::release (void)
+  Reconnection_Registry::release ()
   {
     delete this;
     //@@ inform factory
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index e95438ef6b4..a57cd230a60 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -3,7 +3,7 @@
 #include "orbsvcs/Log_Macros.h"
 #include "ace/Guard_T.h"
 
-#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+#if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
 
 #include <map>
 #include <string>
@@ -62,13 +62,13 @@ TAO_Notify_Refcountable::diagnostic_dump( const char* title )
 #endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */
 
 
-TAO_Notify_Refcountable::TAO_Notify_Refcountable (void)
+TAO_Notify_Refcountable::TAO_Notify_Refcountable ()
 {
 }
 
 TAO_Notify_Refcountable::~TAO_Notify_Refcountable ()
 {
-#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+#if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
   TAO_Notify_Tracker::Entry e = TAO_Notify_Tracker::get_instance().find( this );
   if ( e.obj != 0 )
   {
@@ -90,14 +90,14 @@ TAO_Notify_Refcountable::~TAO_Notify_Refcountable ()
 
 
 CORBA::ULong
-TAO_Notify_Refcountable::_incr_refcnt (void)
+TAO_Notify_Refcountable::_incr_refcnt ()
 {
   CORBA::Long refcount = ++this->refcount_;
   if (TAO_debug_level > 1 )
   {
     ORBSVCS_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, refcount ));
   }
-#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+#if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
   // Stack-instantiated-non-servants should never have _incr_refcnt called.
   // We do not care about stack-instances. Stack-instantiated servants break
   // the tracker.
@@ -110,7 +110,7 @@ TAO_Notify_Refcountable::_incr_refcnt (void)
 }
 
 CORBA::ULong
-TAO_Notify_Refcountable::_decr_refcnt (void)
+TAO_Notify_Refcountable::_decr_refcnt ()
 {
   CORBA::Long refcount = --this->refcount_;
 
@@ -131,7 +131,7 @@ TAO_Notify_Refcountable::_decr_refcnt (void)
   return refcount;
 }
 
-#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+#if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
 
 std::auto_ptr< TAO_Notify_Tracker > TAO_Notify_Tracker::s_instance;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index b45d3623d15..f3c96c621d8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -58,7 +58,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_Serv_Export TAO_Notify_Refcountable
 {
 public:
-  typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Refcountable > Ptr;
+  typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_Refcountable> Ptr;
 
   /// Constructor
   TAO_Notify_Refcountable (void);
@@ -67,12 +67,12 @@ public:
   /// public for stack allocated instances
   virtual ~TAO_Notify_Refcountable ();
 
-  /// This method sigantures deliberately match the RefCounting methods required for ESF Proxy
+  /// 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);
 
-#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+#if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
   static void diagnostic_dump( const char* title = 0 );
 #endif
 
@@ -84,7 +84,7 @@ private:
   /// boundary conditions such as too many _decr_refcnt() calls.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::Long> refcount_;
 
-#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+#if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0)
   friend class TAO_Notify_Tracker;
   int ref_id_;
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index 86134043cd8..b6e665a3f91 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -902,7 +902,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
 }
 
 void
-Routing_Slip::reconnect (void)
+Routing_Slip::reconnect ()
 {
   Routing_Slip_Guard guard (this->internals_);
   enter_state_saved (guard);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index 820ba315d17..7d76533d46b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -277,7 +277,7 @@ Routing_Slip_Persistence_Manager::Block_Header::Block_Header(Header_Type type)
   , data_size(0)
 {
 }
-Routing_Slip_Persistence_Manager::Block_Header::~Block_Header (void)
+Routing_Slip_Persistence_Manager::Block_Header::~Block_Header ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index b5e9fc336b3..74076bc8ecf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void)
+TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer ()
 :pacing_interval_ (CosNotification::PacingInterval)
 {
 }
@@ -18,14 +18,14 @@ TAO_Notify_SequenceProxyPushConsumer::~TAO_Notify_SequenceProxyPushConsumer ()
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer::release (void)
+TAO_Notify_SequenceProxyPushConsumer::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_SequenceProxyPushConsumer::MyType (void)
+TAO_Notify_SequenceProxyPushConsumer::MyType ()
 {
   return CosNotifyChannelAdmin::PUSH_SEQUENCE;
 }
@@ -67,7 +67,7 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void)
+TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer ()
 {
   TAO_Notify_SequenceProxyPushConsumer::Ptr guard( this );
   this->destroy ();
@@ -75,7 +75,7 @@ TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void)
 }
 
 const char *
-TAO_Notify_SequenceProxyPushConsumer::get_proxy_type_name (void) const
+TAO_Notify_SequenceProxyPushConsumer::get_proxy_type_name () const
 {
   return "sequence_proxy_push_consumer";
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index faf990d3aca..14db624738b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void)
+TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier ()
 {
 }
 
@@ -15,7 +15,7 @@ TAO_Notify_SequenceProxyPushSupplier::~TAO_Notify_SequenceProxyPushSupplier ()
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier::release (void)
+TAO_Notify_SequenceProxyPushSupplier::release ()
 {
   delete this;
   //@@ inform factory
@@ -37,7 +37,7 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void)
+TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier ()
 
 {
   TAO_Notify_SequenceProxyPushSupplier::Ptr guard( this );
@@ -46,13 +46,13 @@ TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_SequenceProxyPushSupplier::MyType (void)
+TAO_Notify_SequenceProxyPushSupplier::MyType ()
 {
   return CosNotifyChannelAdmin::PUSH_SEQUENCE;
 }
 
 const char *
-TAO_Notify_SequenceProxyPushSupplier::get_proxy_type_name (void) const
+TAO_Notify_SequenceProxyPushSupplier::get_proxy_type_name () const
 {
   return "sequence_proxy_push_supplier";
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 00a8f1805d0..212e85435c1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -86,7 +86,7 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p
 }
 
 void
-TAO_Notify_SequencePushConsumer::release (void)
+TAO_Notify_SequencePushConsumer::release ()
 {
   delete this;
   //@@ inform factory
@@ -309,7 +309,7 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_
 }
 
 ACE_CString
-TAO_Notify_SequencePushConsumer::get_ior (void) const
+TAO_Notify_SequencePushConsumer::get_ior () const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance ()->orb ();
@@ -335,7 +335,7 @@ TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* o
 }
 
 CORBA::Object_ptr
-TAO_Notify_SequencePushConsumer::get_consumer (void)
+TAO_Notify_SequencePushConsumer::get_consumer ()
 {
   return CosNotifyComm::SequencePushConsumer::_duplicate (this->push_consumer_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index 227d634859e..ef090ec4db5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -22,14 +22,14 @@ TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr p
 }
 
 void
-TAO_Notify_SequencePushSupplier::release (void)
+TAO_Notify_SequencePushSupplier::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 ACE_CString
-TAO_Notify_SequencePushSupplier::get_ior (void) const
+TAO_Notify_SequencePushSupplier::get_ior () const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
@@ -46,7 +46,7 @@ TAO_Notify_SequencePushSupplier::get_ior (void) const
 }
 
 CORBA::Object_ptr
-TAO_Notify_SequencePushSupplier::get_supplier (void)
+TAO_Notify_SequencePushSupplier::get_supplier ()
 {
   return CosNotifyComm::SequencePushSupplier::_duplicate (this->push_supplier_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
index 42288ac9f09..04276d9b291 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
@@ -3,12 +3,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Service::~TAO_Notify_Service (void)
+TAO_Notify_Service::~TAO_Notify_Service ()
 {
 }
 
 TAO_Notify_Service*
-TAO_Notify_Service::load_default (void)
+TAO_Notify_Service::load_default ()
 {
   static const char* services[] = { TAO_MC_NOTIFICATION_SERVICE_NAME,
                                     TAO_NOTIFICATION_SERVICE_NAME,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index ea0aa2940e0..31230f40288 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void)
+TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index c321d27da66..e882ee26710 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -22,7 +22,7 @@ TAO_Notify_StructuredEvent_No_Copy::TAO_Notify_StructuredEvent_No_Copy (const Co
 }
 
 const TAO_Notify_EventType&
-TAO_Notify_StructuredEvent_No_Copy::type (void) const
+TAO_Notify_StructuredEvent_No_Copy::type () const
 {
   return this->type_;
 }
@@ -53,7 +53,7 @@ TAO_Notify_StructuredEvent_No_Copy::unmarshal (TAO_InputCDR & cdr)
 }
 
 TAO_Notify_Event *
-TAO_Notify_StructuredEvent_No_Copy::copy (void) const
+TAO_Notify_StructuredEvent_No_Copy::copy () const
 {
   TAO_Notify_Event * new_event;
   ACE_NEW_THROW_EX (new_event,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index dbfe3ba3127..8836af68ee3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void)
+TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer ()
 {
 }
 
@@ -19,14 +19,14 @@ TAO_Notify_StructuredProxyPushConsumer::~TAO_Notify_StructuredProxyPushConsumer
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer::release (void)
+TAO_Notify_StructuredProxyPushConsumer::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_StructuredProxyPushConsumer::MyType (void)
+TAO_Notify_StructuredProxyPushConsumer::MyType ()
 {
   return CosNotifyChannelAdmin::PUSH_STRUCTURED;
 }
@@ -63,7 +63,7 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (void)
+TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer ()
 {
   TAO_Notify_StructuredProxyPushConsumer::Ptr guard( this );
   this->destroy ();
@@ -71,7 +71,7 @@ TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (voi
 }
 
 const char *
-TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name (void) const
+TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name () const
 {
   return "structured_proxy_push_consumer";
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 4cf50ad0d2f..367c25f3ae5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void)
+TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier ()
 {
 }
 
@@ -18,14 +18,14 @@ TAO_Notify_StructuredProxyPushSupplier::~TAO_Notify_StructuredProxyPushSupplier
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier::release (void)
+TAO_Notify_StructuredProxyPushSupplier::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_StructuredProxyPushSupplier::MyType (void)
+TAO_Notify_StructuredProxyPushSupplier::MyType ()
 {
   return CosNotifyChannelAdmin::PUSH_STRUCTURED;
 }
@@ -46,7 +46,7 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (void)
+TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier ()
 
 {
   TAO_Notify_StructuredProxyPushSupplier::Ptr guard( this );
@@ -55,7 +55,7 @@ TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (voi
 }
 
 const char *
-TAO_Notify_StructuredProxyPushSupplier::get_proxy_type_name (void) const
+TAO_Notify_StructuredProxyPushSupplier::get_proxy_type_name () const
 {
   return "structured_proxy_push_supplier";
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 69d2a6334a3..cfd6d7b1246 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -73,7 +73,7 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p
 }
 
 void
-TAO_Notify_StructuredPushConsumer::release (void)
+TAO_Notify_StructuredPushConsumer::release ()
 {
   delete this;
   //@@ inform factory
@@ -161,7 +161,7 @@ TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer*
 }
 
 ACE_CString
-TAO_Notify_StructuredPushConsumer::get_ior (void) const
+TAO_Notify_StructuredPushConsumer::get_ior () const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
@@ -178,7 +178,7 @@ TAO_Notify_StructuredPushConsumer::get_ior (void) const
 }
 
 CORBA::Object_ptr
-TAO_Notify_StructuredPushConsumer::get_consumer (void)
+TAO_Notify_StructuredPushConsumer::get_consumer ()
 {
   return CosNotifyComm::StructuredPushConsumer::_duplicate (this->push_consumer_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 92ab7846873..4eba099e25b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -22,14 +22,14 @@ TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_p
 }
 
 void
-TAO_Notify_StructuredPushSupplier::release (void)
+TAO_Notify_StructuredPushSupplier::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 ACE_CString
-TAO_Notify_StructuredPushSupplier::get_ior (void) const
+TAO_Notify_StructuredPushSupplier::get_ior () const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
@@ -46,7 +46,7 @@ TAO_Notify_StructuredPushSupplier::get_ior (void) const
 }
 
 CORBA::Object_ptr
-TAO_Notify_StructuredPushSupplier::get_supplier (void)
+TAO_Notify_StructuredPushSupplier::get_supplier ()
 {
   return CosNotifyComm::StructuredPushSupplier::_duplicate (this->push_supplier_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index 98d4536a3ea..dca10de0f28 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -28,7 +28,7 @@ TAO_Notify_Supplier::~TAO_Notify_Supplier ()
 }
 
 TAO_Notify_Proxy*
-TAO_Notify_Supplier::proxy (void)
+TAO_Notify_Supplier::proxy ()
 {
   return this->proxy_consumer ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 30406d7453a..cb20f513368 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -27,7 +27,7 @@ TAO_Notify_ProxyConsumer_Find_Worker;
 
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker;
 
-TAO_Notify_SupplierAdmin::TAO_Notify_SupplierAdmin (void)
+TAO_Notify_SupplierAdmin::TAO_Notify_SupplierAdmin ()
   : TAO_Notify_Admin ()
 {
 }
@@ -54,26 +54,26 @@ TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec)
 }
 
 void
-TAO_Notify_SupplierAdmin::_add_ref (void)
+TAO_Notify_SupplierAdmin::_add_ref ()
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_SupplierAdmin::_remove_ref (void)
+TAO_Notify_SupplierAdmin::_remove_ref ()
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_Notify_SupplierAdmin::release (void)
+TAO_Notify_SupplierAdmin::release ()
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_Notify_SupplierAdmin::destroy (void)
+TAO_Notify_SupplierAdmin::destroy ()
 {
   this->shutdown ();
   this->ec_->remove (this);
@@ -140,7 +140,7 @@ TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos)
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_SupplierAdmin::get_qos (void)
+TAO_Notify_SupplierAdmin::get_qos ()
 {
   return this->TAO_Notify_Object::get_qos ();
 }
@@ -177,7 +177,7 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC
 
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_Notify_SupplierAdmin::obtain_push_consumer (void)
+TAO_Notify_SupplierAdmin::obtain_push_consumer ()
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy =
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this);
@@ -186,25 +186,25 @@ TAO_Notify_SupplierAdmin::obtain_push_consumer (void)
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_Notify_SupplierAdmin::MyID (void)
+TAO_Notify_SupplierAdmin::MyID ()
 {
   return this->id ();
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_SupplierAdmin::MyChannel (void)
+TAO_Notify_SupplierAdmin::MyChannel ()
 {
   return this->ec_->_this ();
 }
 
 ::CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_SupplierAdmin::MyOperator (void)
+TAO_Notify_SupplierAdmin::MyOperator ()
 {
   return this->filter_operator_;
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin::push_consumers (void)
+TAO_Notify_SupplierAdmin::push_consumers ()
 {
   TAO_Notify_Proxy_Seq_Worker seq_worker;
 
@@ -261,13 +261,13 @@ TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter)
 }
 
 ::CosNotifyFilter::FilterIDSeq*
-TAO_Notify_SupplierAdmin::get_all_filters (void)
+TAO_Notify_SupplierAdmin::get_all_filters ()
 {
   return this->filter_admin_.get_all_filters ();
 }
 
 void
-TAO_Notify_SupplierAdmin::remove_all_filters (void)
+TAO_Notify_SupplierAdmin::remove_all_filters ()
 {
   this->filter_admin_.remove_all_filters ();
 }
@@ -291,13 +291,13 @@ TAO_Notify_SupplierAdmin::find_proxy_consumer (
 /************** UNIMPLEMENTED METHODS ***************/
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_Notify_SupplierAdmin::obtain_pull_consumer (void)
+TAO_Notify_SupplierAdmin::obtain_pull_consumer ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin::pull_consumers (void)
+TAO_Notify_SupplierAdmin::pull_consumers ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index eebc10e0b92..7af192a0761 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void)
+TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task ()
 : shutdown_ (false)
 {
 }
@@ -27,13 +27,13 @@ TAO_Notify_ThreadPool_Task::init (int argc, ACE_TCHAR **argv)
 }
 
 TAO_Notify_Timer*
-TAO_Notify_ThreadPool_Task::timer (void)
+TAO_Notify_ThreadPool_Task::timer ()
 {
   return this->timer_.get();
 }
 
 TAO_Notify_Buffering_Strategy*
-TAO_Notify_ThreadPool_Task::buffering_strategy (void)
+TAO_Notify_ThreadPool_Task::buffering_strategy ()
 {
   return this->buffering_strategy_.get ();
 }
@@ -116,7 +116,7 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request)
 }
 
 int
-TAO_Notify_ThreadPool_Task::svc (void)
+TAO_Notify_ThreadPool_Task::svc ()
 {
   TAO_Notify_Method_Request_Queueable* method_request = 0;
 
@@ -163,7 +163,7 @@ TAO_Notify_ThreadPool_Task::svc (void)
 }
 
 void
-TAO_Notify_ThreadPool_Task::shutdown (void)
+TAO_Notify_ThreadPool_Task::shutdown ()
 {
   if (this->shutdown_)
     {
@@ -176,7 +176,7 @@ TAO_Notify_ThreadPool_Task::shutdown (void)
 }
 
 void
-TAO_Notify_ThreadPool_Task::release (void)
+TAO_Notify_ThreadPool_Task::release ()
 {
   delete this;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
index ed37ea1caca..a31eefeea3b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void)
+TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue ()
 {
 }
 
@@ -11,7 +11,7 @@ TAO_Notify_Timer_Queue::~TAO_Notify_Timer_Queue ()
 }
 
 void
-TAO_Notify_Timer_Queue::release (void)
+TAO_Notify_Timer_Queue::release ()
 {
   delete this;
   //@@ inform factory
@@ -36,7 +36,7 @@ TAO_Notify_Timer_Queue::cancel_timer (long timer_id)
 }
 
 ACE_Timer_Queue&
-TAO_Notify_Timer_Queue::impl (void)
+TAO_Notify_Timer_Queue::impl ()
 {
   return this->timer_queue_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
index ef42a417287..ad7e3990a49 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor (void)
+TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor ()
   :reactor_ (0)
 {
   // Get the ORB
@@ -20,7 +20,7 @@ TAO_Notify_Timer_Reactor::~TAO_Notify_Timer_Reactor ()
 }
 
 void
-TAO_Notify_Timer_Reactor::release (void)
+TAO_Notify_Timer_Reactor::release ()
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
index d061c815db5..66433ff114b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
@@ -11,7 +11,7 @@ TAO_Notify::Topology_Loader::~Topology_Loader ()
 }
 
 void
-TAO_Notify::Topology_Loader::close (void)
+TAO_Notify::Topology_Loader::close ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index ec88590b269..a330f413c38 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -15,12 +15,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-  Topology_Savable::~Topology_Savable (void)
+  Topology_Savable::~Topology_Savable ()
   {
   }
 
   void
-  Topology_Savable::reconnect (void)
+  Topology_Savable::reconnect ()
   {
   }
 
@@ -76,14 +76,14 @@ namespace TAO_Notify
   }
 
   bool
-  Topology_Object::self_change (void)
+  Topology_Object::self_change ()
   {
     this->self_changed_ = true;
     return send_change ();
   }
 
   bool
-  Topology_Object::send_change (void)
+  Topology_Object::send_change ()
   {
     bool saving = false;
     if (is_persistent ())
@@ -107,7 +107,7 @@ namespace TAO_Notify
   }
 
   bool
-  Topology_Object::send_deletion_change (void)
+  Topology_Object::send_deletion_change ()
   {
     bool saving = false;
     if (is_persistent ())
@@ -120,7 +120,7 @@ namespace TAO_Notify
   }
 
   bool
-    Topology_Object::change_to_parent (void)
+    Topology_Object::change_to_parent ()
     {
       bool result = false;
       Topology_Parent * parent = this->topology_parent();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
index f8ba3dd7751..fc251d262a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
@@ -7,7 +7,7 @@ TAO_Notify::Topology_Saver::~Topology_Saver ()
 }
 
 void
-TAO_Notify::Topology_Saver::close (void)
+TAO_Notify::Topology_Saver::close ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
index 861ebfd7ef5..9a448d90ba1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
@@ -27,13 +27,13 @@ TAO_Notify_validate_client_Task::
 }
 
 
-TAO_Notify_validate_client_Task::~TAO_Notify_validate_client_Task (void)
+TAO_Notify_validate_client_Task::~TAO_Notify_validate_client_Task ()
 {
 }
 
 
 int
-TAO_Notify_validate_client_Task::svc (void)
+TAO_Notify_validate_client_Task::svc ()
 {
   ACE_Time_Value due = ACE_OS::gettimeofday () + this->delay_;
   while (! this->shutdown_)
@@ -74,7 +74,7 @@ TAO_Notify_validate_client_Task::svc (void)
 
 
 void
-TAO_Notify_validate_client_Task::shutdown (void)
+TAO_Notify_validate_client_Task::shutdown ()
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *(this->condition_.mutex()));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
index c9fdfc61130..2042dc05389 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void)
+TAO_Notify_Worker_Task::TAO_Notify_Worker_Task ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 5285d07672b..a0c4b0c7f22 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -77,7 +77,7 @@ namespace TAO_Notify
     if (result)
     {
       this->live_ = false;
-      auto_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
+      std::unique_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
       // xml input source will take ownership
 
       if (fstm->open (this->file_name_.c_str ()) == 0)
@@ -127,7 +127,7 @@ namespace TAO_Notify
     ACE_ASSERT (root != 0);
     this->live_ = true;
 
-    auto_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
+    std::unique_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream);
     // xml input source will take ownership
 
     if (fstm->open (this->file_name_.c_str ()) == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index 4f7207d4118..881c2be3515 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -41,7 +41,7 @@ namespace TAO_Notify
   }
 
   void
-  XML_Saver::close (void)
+  XML_Saver::close ()
   {
     if (this->close_out_ && this->output_ != 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
index 456032c58ab..56258982147 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
@@ -70,7 +70,7 @@ namespace
 namespace TAO_PG
 {
 
-  Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy (void)
+  Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy ()
   {
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 22845604ce4..a409ee0873c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -82,7 +82,7 @@ TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name,
 {
 }
 
-TAO_GOA::~TAO_GOA (void)
+TAO_GOA::~TAO_GOA ()
 {
 }
 
@@ -211,7 +211,7 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 char *
-TAO_GOA::the_name (void)
+TAO_GOA::the_name ()
 {
   char * name =
     this->TAO_Regular_POA::the_name ();
@@ -219,7 +219,7 @@ TAO_GOA::the_name (void)
 }
 
 PortableServer::POA_ptr
-TAO_GOA::the_parent (void)
+TAO_GOA::the_parent ()
 {
   PortableServer::POA_ptr parent =
     this->TAO_Regular_POA::the_parent ();
@@ -227,7 +227,7 @@ TAO_GOA::the_parent (void)
 }
 
 PortableServer::POAList *
-TAO_GOA::the_children (void)
+TAO_GOA::the_children ()
 {
   PortableServer::POAList *children =
     this->TAO_Regular_POA::the_children ();
@@ -235,7 +235,7 @@ TAO_GOA::the_children (void)
 }
 
 PortableServer::POAManager_ptr
-TAO_GOA::the_POAManager (void)
+TAO_GOA::the_POAManager ()
 {
   PortableServer::POAManager_ptr poa_manager =
     this->TAO_Regular_POA::the_POAManager ();
@@ -246,7 +246,7 @@ TAO_GOA::the_POAManager (void)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::AdapterActivator_ptr
-TAO_GOA::the_activator (void)
+TAO_GOA::the_activator ()
 {
   PortableServer::AdapterActivator_ptr activator =
     this->TAO_Regular_POA::the_activator ();
@@ -260,7 +260,7 @@ TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
 }
 
 PortableServer::ServantManager_ptr
-TAO_GOA::get_servant_manager (void)
+TAO_GOA::get_servant_manager ()
 {
   PortableServer::ServantManager_ptr servant_manager =
     this->TAO_Regular_POA::get_servant_manager ();
@@ -274,7 +274,7 @@ TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
 }
 
 PortableServer::Servant
-TAO_GOA::get_servant (void)
+TAO_GOA::get_servant ()
 {
   PortableServer::Servant servant =
     this->TAO_Regular_POA::get_servant ();
@@ -378,7 +378,7 @@ TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid)
 }
 
 CORBA::OctetSeq *
-TAO_GOA::id (void)
+TAO_GOA::id ()
 {
   return this->TAO_Regular_POA::id ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
index 444629713cc..3522317ef20 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   /*static*/ int
-  MIOP_Loader::Initializer (void)
+  MIOP_Loader::Initializer ()
   {
     ACE_Service_Config::process_directive (
       ace_svc_desc_TAO_PortableGroup_Loader);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index d5d09e51d8e..92743a6b5b8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void)
+TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator ()
   : membership_ (1),
     factories_ (1)
 {
@@ -14,7 +14,7 @@ TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void)
   this->factories_[0].id = CORBA::string_dup ("org.omg.PortableGroup.Factories");
 }
 
-TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator (void)
+TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 87f2526b88c..8be0a079531 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -56,7 +56,7 @@ TAO::PG_FactoryRegistry::PG_FactoryRegistry (const char * name)
 {
 }
 
-TAO::PG_FactoryRegistry::~PG_FactoryRegistry (void)
+TAO::PG_FactoryRegistry::~PG_FactoryRegistry ()
 {
 }
 
@@ -111,7 +111,7 @@ const char * TAO::PG_FactoryRegistry::identity () const
   return this->identity_.c_str();
 }
 
-void TAO::PG_FactoryRegistry::_remove_ref (void)
+void TAO::PG_FactoryRegistry::_remove_ref ()
 {
   this->quit_state_ = GONE;
 }
@@ -135,7 +135,7 @@ int TAO::PG_FactoryRegistry::idle (int & result)
 }
 
 
-int TAO::PG_FactoryRegistry::fini (void)
+int TAO::PG_FactoryRegistry::fini ()
 {
   if (this->ior_output_file_ != 0)
   {
@@ -284,7 +284,7 @@ void TAO::PG_FactoryRegistry::register_factory (
   METHOD_ENTRY(TAO::PG_FactoryRegistry::register_factory);
 
   RoleInfo * role_info = 0;
-  auto_ptr<RoleInfo> safe_entry;
+  std::unique_ptr<RoleInfo> safe_entry;
   if (this->registry_.find(role, role_info) != 0)
     {
       ORBSVCS_DEBUG(( LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index d4f2fdc2541..78225419532 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -24,7 +24,7 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory (
   this->object_group_manager_.generic_factory (this);
 }
 
-TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void)
+TAO_PG_GenericFactory::~TAO_PG_GenericFactory ()
 {
 
   TAO_PG_Factory_Map::iterator end = this->factory_map_.end ();
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 4d5b68919d8..7d9d138d90e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -59,7 +59,7 @@ TAO::PG_Group_Factory::PG_Group_Factory ()
 {
 }
 
-TAO::PG_Group_Factory::~PG_Group_Factory (void)
+TAO::PG_Group_Factory::~PG_Group_Factory ()
 {
   for (Group_Map_Iterator it = this->group_map_.begin ();
     it != this->group_map_.end ();
@@ -325,7 +325,7 @@ TAO::PG_Group_Factory::groups_at_location (
 }
 
 PortableGroup::ObjectGroups *
-TAO::PG_Group_Factory::all_groups (void)
+TAO::PG_Group_Factory::all_groups ()
 {
   Group_Map & group_map = this->get_group_map ();
   CORBA::ULong const upper_limit = static_cast<CORBA::ULong> (group_map.current_size ());
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index 9ec99126a3c..66d40b0fe15 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -19,7 +19,7 @@ TAO_PG_Group_Guard::TAO_PG_Group_Guard (
 {
 }
 
-TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void)
+TAO_PG_Group_Guard::~TAO_PG_Group_Guard ()
 {
   if (!this->released_)
     {
@@ -41,7 +41,7 @@ TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void)
 }
 
 void
-TAO_PG_Group_Guard::release (void)
+TAO_PG_Group_Guard::release ()
 {
   this->released_ = true;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index b1705e94a87..72065e982b1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -12,7 +12,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void)
+TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager ()
   : poa_ (),
     object_group_map_ (TAO_PG_MAX_OBJECT_GROUPS),
     location_map_ (TAO_PG_MAX_LOCATIONS),
@@ -21,7 +21,7 @@ TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void)
 {
 }
 
-TAO_PG_ObjectGroupManager::~TAO_PG_ObjectGroupManager (void)
+TAO_PG_ObjectGroupManager::~TAO_PG_ObjectGroupManager ()
 {
   for (TAO_PG_Location_Map::iterator i = this->location_map_.begin ();
        i != this->location_map_.end ();
@@ -171,7 +171,7 @@ TAO_PG_ObjectGroupManager::add_member_i (
                             ENOMEM),
                           CORBA::COMPLETED_NO));
 
-      auto_ptr<TAO_PG_ObjectGroup_Array> safe_groups (groups);
+      std::unique_ptr<TAO_PG_ObjectGroup_Array> safe_groups (groups);
 
       // This should not fail!
       if (this->location_map_.bind (the_location, groups) != 0)
@@ -490,7 +490,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
-  auto_ptr<TAO_PG_ObjectGroup_Map_Entry> safe_group_entry (group_entry);
+  std::unique_ptr<TAO_PG_ObjectGroup_Map_Entry> safe_group_entry (group_entry);
 
   // Set the RepositoryId associated with the created ObjectGroup_Map
   // entry.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
index 4586255f5d4..3e660dde88e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void)
+TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 3b2a7dfc988..802d3f6f1f9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -41,7 +41,7 @@ TAO::PG_Object_Group::MemberInfo::MemberInfo (
 {
 }
 
-TAO::PG_Object_Group::MemberInfo::~MemberInfo (void)
+TAO::PG_Object_Group::MemberInfo::~MemberInfo ()
 {
   if( ! CORBA::is_nil (this->factory_.in()))
     {
@@ -103,7 +103,7 @@ TAO::PG_Object_Group::PG_Object_Group (
 {
 }
 
-TAO::PG_Object_Group::~PG_Object_Group (void)
+TAO::PG_Object_Group::~PG_Object_Group ()
 {
   if (TAO_debug_level > 3)
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -134,7 +134,7 @@ dump_ior (const char * base,
 #endif  // may want this again someday
 
 PortableGroup::ObjectGroup_ptr
-TAO::PG_Object_Group::reference (void) const
+TAO::PG_Object_Group::reference () const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -155,7 +155,7 @@ TAO::PG_Object_Group::get_group_specific_factories (
 }
 
 const PortableGroup::Location &
-TAO::PG_Object_Group::get_primary_location (void)
+TAO::PG_Object_Group::get_primary_location ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -450,7 +450,7 @@ TAO::PG_Object_Group::remove_member (
 
 
 PortableGroup::ObjectGroupId
-TAO::PG_Object_Group::get_object_group_id (void) const
+TAO::PG_Object_Group::get_object_group_id () const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -480,7 +480,7 @@ TAO::PG_Object_Group::get_properties (
 
 
 PortableGroup::TypeId
-TAO::PG_Object_Group::get_type_id (void) const
+TAO::PG_Object_Group::get_type_id () const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -494,7 +494,7 @@ TAO::PG_Object_Group::get_type_id (void) const
 // Internal method
 
 int
-TAO::PG_Object_Group::increment_version (void)
+TAO::PG_Object_Group::increment_version ()
 {
   // assume internals is locked
   int result = 0;
@@ -520,7 +520,7 @@ TAO::PG_Object_Group::increment_version (void)
 //////////////////
 // Internal method
 void
-TAO::PG_Object_Group::distribute_iogr (void)
+TAO::PG_Object_Group::distribute_iogr ()
 {
   // Check if the object group is configured to distribute
   if (!this->distribute_)
@@ -584,7 +584,7 @@ TAO::PG_Object_Group::distribute_iogr (void)
 }
 
 PortableGroup::Locations *
-TAO::PG_Object_Group::locations_of_members (void)
+TAO::PG_Object_Group::locations_of_members ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -640,7 +640,7 @@ TAO::PG_Object_Group::get_member_reference (
 
 
 PortableGroup::MembershipStyleValue
-TAO::PG_Object_Group::get_membership_style (void) const
+TAO::PG_Object_Group::get_membership_style () const
 {
   PortableGroup::MembershipStyleValue membership_style = 0;
   if (!TAO::find (properties_,
@@ -654,7 +654,7 @@ TAO::PG_Object_Group::get_membership_style (void) const
 
 
 PortableGroup::MinimumNumberMembersValue
-TAO::PG_Object_Group::get_minimum_number_members (void) const
+TAO::PG_Object_Group::get_minimum_number_members () const
 {
   PortableGroup::MinimumNumberMembersValue minimum_number_members = 0;
   if (!TAO::find (properties_,
@@ -667,7 +667,7 @@ TAO::PG_Object_Group::get_minimum_number_members (void) const
 }
 
 PortableGroup::InitialNumberMembersValue
-TAO::PG_Object_Group::get_initial_number_members (void) const
+TAO::PG_Object_Group::get_initial_number_members () const
 {
   PortableGroup::InitialNumberMembersValue initial_number_members = 0;
   if (!TAO::find (properties_,
@@ -859,7 +859,7 @@ TAO::PG_Object_Group::create_members (size_t count)
 }
 
 void
-TAO::PG_Object_Group::initial_populate (void)
+TAO::PG_Object_Group::initial_populate ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
@@ -876,7 +876,7 @@ TAO::PG_Object_Group::initial_populate (void)
 }
 
 void
-TAO::PG_Object_Group::minimum_populate (void)
+TAO::PG_Object_Group::minimum_populate ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
@@ -913,13 +913,13 @@ TAO::PG_Object_Group::set_name (const char* group_name)
 }
 
 const char*
-TAO::PG_Object_Group::get_name (void)
+TAO::PG_Object_Group::get_name ()
 {
   return group_name_;
 }
 
 void
-TAO::PG_Object_Group::clear_members_map (void)
+TAO::PG_Object_Group::clear_members_map ()
 {
   for (MemberMap_Iterator it = this->members_.begin();
       it != this->members_.end();
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
index e27cc9adfbb..a1822362dce 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
@@ -307,7 +307,7 @@ TAO::PG_Object_Group_Storable::PG_Object_Group_Storable (
     }
 }
 
-TAO::PG_Object_Group_Storable::~PG_Object_Group_Storable (void)
+TAO::PG_Object_Group_Storable::~PG_Object_Group_Storable ()
 {
   if (destroyed_)
     {
@@ -330,7 +330,7 @@ TAO::PG_Object_Group_Storable::set_destroyed (bool destroyed)
 }
 
 const PortableGroup::Location &
-TAO::PG_Object_Group_Storable::get_primary_location (void)
+TAO::PG_Object_Group_Storable::get_primary_location ()
 {
   Object_Group_File_Guard fg (*this, SFG::ACCESSOR);
   return TAO::PG_Object_Group::get_primary_location ();
@@ -369,7 +369,7 @@ TAO::PG_Object_Group_Storable::remove_member (
 
 
 PortableGroup::Locations *
-TAO::PG_Object_Group_Storable::locations_of_members (void)
+TAO::PG_Object_Group_Storable::locations_of_members ()
 {
   Object_Group_File_Guard fg (*this, SFG::ACCESSOR);
   return PG_Object_Group::locations_of_members ();
@@ -397,14 +397,14 @@ TAO::PG_Object_Group_Storable::set_name (const char* group_name)
 }
 
 const char*
-TAO::PG_Object_Group_Storable::get_name (void)
+TAO::PG_Object_Group_Storable::get_name ()
 {
   Object_Group_File_Guard fg (*this, SFG::ACCESSOR);
   return PG_Object_Group::get_name ();
 }
 
 void
-TAO::PG_Object_Group_Storable::initial_populate (void)
+TAO::PG_Object_Group_Storable::initial_populate ()
 {
   Object_Group_File_Guard fg (*this, SFG::MUTATOR);
   PG_Object_Group::initial_populate ();
@@ -412,7 +412,7 @@ TAO::PG_Object_Group_Storable::initial_populate (void)
 }
 
 void
-TAO::PG_Object_Group_Storable::minimum_populate (void)
+TAO::PG_Object_Group_Storable::minimum_populate ()
 {
   Object_Group_File_Guard fg (*this, SFG::MUTATOR);
   PG_Object_Group::minimum_populate ();
@@ -650,7 +650,7 @@ TAO::PG_Object_Group_Storable::stale ()
 }
 
 void
-TAO::PG_Object_Group_Storable::state_written (void)
+TAO::PG_Object_Group_Storable::state_written ()
 {
   // No-op. Overridden by derived class.
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index 6f8c5d2070b..9c8cb300bca 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -55,7 +55,7 @@ namespace TAO_PG
       /// Meaningless method to keep ACE_Vector happy
       bool operator != (const NamedValue &rhs) const;
     };
-    typedef ACE_Vector< NamedValue, 10 > NamedValueVec;
+    typedef ACE_Vector<NamedValue, 10> NamedValueVec;
 
   public:
     /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 4e73825d981..80a0e8106a7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void)
+TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index e3555148867..8b73a3b75d4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -12,11 +12,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void)
+TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry ()
 {
 }
 
-TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry (void)
+TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry ()
 {
   // Free the memory for the endpoints.
   Entry *entry;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 4fd1aabc5d6..94e4938aae6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
+TAO_PortableGroup_Loader::TAO_PortableGroup_Loader ()
 {
 }
 
@@ -47,7 +47,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
 }
 
 int
-TAO_PortableGroup_Loader::Initializer (void)
+TAO_PortableGroup_Loader::Initializer ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_PortableGroup_Loader);
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_MIOP_Resource_Factory);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index ed7036f2259..4e2c4c5dfe6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void)
+PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 225346a2fa5..8d40234ec16 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -11,7 +11,7 @@ TAO_Portable_Group_Map::TAO_Portable_Group_Map ()
 }
 
 /// Destructor.
-TAO_Portable_Group_Map::~TAO_Portable_Group_Map (void)
+TAO_Portable_Group_Map::~TAO_Portable_Group_Map ()
 {
   for (Iterator i = this->map_.begin ();
        i != this->map_.end ();
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 451189b1a2c..914c86dad84 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -28,7 +28,7 @@ TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor (
 {
 }
 
-TAO_UIPMC_Acceptor::~TAO_UIPMC_Acceptor (void)
+TAO_UIPMC_Acceptor::~TAO_UIPMC_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -70,7 +70,7 @@ TAO_UIPMC_Acceptor::is_collocated (const TAO_Endpoint *)
 }
 
 int
-TAO_UIPMC_Acceptor::close (void)
+TAO_UIPMC_Acceptor::close ()
 {
   return 0;
 }
@@ -363,7 +363,7 @@ TAO_UIPMC_Acceptor::dotted_decimal_address (
 }
 
 CORBA::ULong
-TAO_UIPMC_Acceptor::endpoint_count (void)
+TAO_UIPMC_Acceptor::endpoint_count ()
 {
   return this->endpoint_count_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 8a4113bcbdd..600caa4254e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -46,7 +46,7 @@ TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (TAO_ORB_Core *orb_co
   this->transport (specific_transport);
 }
 
-TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler (void)
+TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -62,7 +62,7 @@ TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler (void)
 }
 
 const ACE_INET_Addr &
-TAO_UIPMC_Connection_Handler::addr (void) const
+TAO_UIPMC_Connection_Handler::addr () const
 {
   return this->addr_;
 }
@@ -74,7 +74,7 @@ TAO_UIPMC_Connection_Handler::addr (const ACE_INET_Addr &addr)
 }
 
 const ACE_INET_Addr &
-TAO_UIPMC_Connection_Handler::local_addr (void) const
+TAO_UIPMC_Connection_Handler::local_addr () const
 {
   return this->local_addr_;
 }
@@ -86,7 +86,7 @@ TAO_UIPMC_Connection_Handler::local_addr (const ACE_INET_Addr &addr)
 }
 
 u_long
-TAO_UIPMC_Connection_Handler::send_hi_water_mark (void) const
+TAO_UIPMC_Connection_Handler::send_hi_water_mark () const
 {
   return this->send_hi_water_mark_;
 }
@@ -321,13 +321,13 @@ TAO_UIPMC_Connection_Handler::open (void*)
 }
 
 int
-TAO_UIPMC_Connection_Handler::resume_handler (void)
+TAO_UIPMC_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_UIPMC_Connection_Handler::close_connection (void)
+TAO_UIPMC_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -395,13 +395,13 @@ TAO_UIPMC_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_UIPMC_Connection_Handler::release_os_resources (void)
+TAO_UIPMC_Connection_Handler::release_os_resources ()
 {
   return this->peer ().close ();
 }
 
 int
-TAO_UIPMC_Connection_Handler::add_transport_to_cache (void)
+TAO_UIPMC_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 0f810879769..7dfe87e1e95 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -16,12 +16,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIPMC_Connector::TAO_UIPMC_Connector (void)
+TAO_UIPMC_Connector::TAO_UIPMC_Connector ()
   : TAO_Connector (IOP::TAG_UIPMC)
 {
 }
 
-TAO_UIPMC_Connector::~TAO_UIPMC_Connector (void)
+TAO_UIPMC_Connector::~TAO_UIPMC_Connector ()
 {
 }
 
@@ -38,7 +38,7 @@ TAO_UIPMC_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_UIPMC_Connector::close (void)
+TAO_UIPMC_Connector::close ()
 {
   return 0;
 }
@@ -293,7 +293,7 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_UIPMC_Connector::make_profile (void)
+TAO_UIPMC_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -336,7 +336,7 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint)
 }
 
 char
-TAO_UIPMC_Connector::object_key_delimiter (void) const
+TAO_UIPMC_Connector::object_key_delimiter () const
 {
   return TAO_UIPMC_Profile::object_key_delimiter_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index a2eeaa473e3..24d0573bb7d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -16,7 +16,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (void)
+TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint ()
   : TAO_Endpoint (IOP::TAG_UIPMC),
     host_ (),
     port_ (0),
@@ -55,7 +55,7 @@ TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (const CORBA::Octet class_d_address[4],
   this->update_object_addr ();
 }
 
-TAO_UIPMC_Endpoint::~TAO_UIPMC_Endpoint (void)
+TAO_UIPMC_Endpoint::~TAO_UIPMC_Endpoint ()
 {
   delete this->next_;
 }
@@ -72,7 +72,7 @@ TAO_UIPMC_Endpoint::object_addr (const ACE_INET_Addr &addr)
 }
 
 const char *
-TAO_UIPMC_Endpoint::host (void) const
+TAO_UIPMC_Endpoint::host () const
 {
   return this->host_.in ();
 }
@@ -112,13 +112,13 @@ TAO_UIPMC_Endpoint::addr_to_string (char *buffer, size_t length)
 }
 
 TAO_Endpoint *
-TAO_UIPMC_Endpoint::next (void)
+TAO_UIPMC_Endpoint::next ()
 {
   return this->next_;
 }
 
 TAO_Endpoint *
-TAO_UIPMC_Endpoint::duplicate (void)
+TAO_UIPMC_Endpoint::duplicate ()
 {
   TAO_UIPMC_Endpoint *endpoint = 0;
 
@@ -144,7 +144,7 @@ TAO_UIPMC_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_UIPMC_Endpoint::hash (void)
+TAO_UIPMC_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
@@ -239,14 +239,14 @@ TAO_UIPMC_Endpoint::preferred_interfaces (TAO_ORB_Core *oc)
 }
 
 bool
-TAO_UIPMC_Endpoint::is_preferred_network (void) const
+TAO_UIPMC_Endpoint::is_preferred_network () const
 {
   return (this->preferred_path_.host.in () != 0 &&
           this->preferred_path_.host.in ()[0] != 0);
 }
 
 const char *
-TAO_UIPMC_Endpoint::preferred_network (void) const
+TAO_UIPMC_Endpoint::preferred_network () const
 {
   return this->preferred_path_.host.in ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index 465b82b3e27..a520483be08 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -12,7 +12,7 @@ static const char the_prefix[] = "uipmc";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void)
+TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory ()
   :  TAO_Protocol_Factory (IOP::TAG_UIPMC),
      // major_ (TAO_DEF_GIOP_MAJOR),
      // minor_ (TAO_DEF_GIOP_MINOR),
@@ -21,7 +21,7 @@ TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void)
 {
 }
 
-TAO_UIPMC_Protocol_Factory::~TAO_UIPMC_Protocol_Factory (void)
+TAO_UIPMC_Protocol_Factory::~TAO_UIPMC_Protocol_Factory ()
 {
 }
 
@@ -33,19 +33,19 @@ TAO_UIPMC_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 }
 
 const char *
-TAO_UIPMC_Protocol_Factory::prefix (void) const
+TAO_UIPMC_Protocol_Factory::prefix () const
 {
   return ::the_prefix;
 }
 
 char
-TAO_UIPMC_Protocol_Factory::options_delimiter (void) const
+TAO_UIPMC_Protocol_Factory::options_delimiter () const
 {
   return '/';
 }
 
 TAO_Acceptor *
-TAO_UIPMC_Protocol_Factory::make_acceptor (void)
+TAO_UIPMC_Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
   ACE_NEW_RETURN (acceptor,
@@ -127,7 +127,7 @@ TAO_UIPMC_Protocol_Factory::init (int argc,
 }
 
 TAO_Connector *
-TAO_UIPMC_Protocol_Factory::make_connector (void)
+TAO_UIPMC_Protocol_Factory::make_connector ()
 {
   // This is done only once when the library is loaded and
   // only on the client side.
@@ -141,7 +141,7 @@ TAO_UIPMC_Protocol_Factory::make_connector (void)
 }
 
 int
-TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint (void) const
+TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint () const
 {
   // A multicast endpoint can't be picked automatically in the
   // pluggable protocol framework.  It must be determined from
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
index ada29cd487f..23535a98d17 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
@@ -56,7 +56,7 @@ TAO_UIPMC_Mcast_Connection_Handler::TAO_UIPMC_Mcast_Connection_Handler (
   this->transport (specific_transport);
 }
 
-TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler (void)
+TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -72,7 +72,7 @@ TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler (void)
 }
 
 const ACE_INET_Addr &
-TAO_UIPMC_Mcast_Connection_Handler::addr (void) const
+TAO_UIPMC_Mcast_Connection_Handler::addr () const
 {
   return this->addr_;
 }
@@ -84,7 +84,7 @@ TAO_UIPMC_Mcast_Connection_Handler::addr (const ACE_INET_Addr &addr)
 }
 
 const ACE_INET_Addr &
-TAO_UIPMC_Mcast_Connection_Handler::local_addr (void) const
+TAO_UIPMC_Mcast_Connection_Handler::local_addr () const
 {
   return this->local_addr_;
 }
@@ -239,13 +239,13 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *)
 }
 
 int
-TAO_UIPMC_Mcast_Connection_Handler::resume_handler (void)
+TAO_UIPMC_Mcast_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_UIPMC_Mcast_Connection_Handler::close_connection (void)
+TAO_UIPMC_Mcast_Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -314,13 +314,13 @@ TAO_UIPMC_Mcast_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_UIPMC_Mcast_Connection_Handler::release_os_resources (void)
+TAO_UIPMC_Mcast_Connection_Handler::release_os_resources ()
 {
   return this->peer ().close ();
 }
 
 int
-TAO_UIPMC_Mcast_Connection_Handler::add_transport_to_cache (void)
+TAO_UIPMC_Mcast_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
index 71de66ca660..942408b46c3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
@@ -29,7 +29,7 @@ TAO_UIPMC_Mcast_Transport::TAO_UIPMC_Mcast_Transport (
            TAO_UIPMC_Wait_Never (this));
 }
 
-TAO_UIPMC_Mcast_Transport::~TAO_UIPMC_Mcast_Transport (void)
+TAO_UIPMC_Mcast_Transport::~TAO_UIPMC_Mcast_Transport ()
 {
   // Cleanup all packets.
   this->cleanup_packets (false);
@@ -88,13 +88,13 @@ TAO_UIPMC_Mcast_Transport::cleanup_packets (bool expired_only)
 }
 
 ACE_Event_Handler *
-TAO_UIPMC_Mcast_Transport::event_handler_i (void)
+TAO_UIPMC_Mcast_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_UIPMC_Mcast_Transport::connection_handler_i (void)
+TAO_UIPMC_Mcast_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -605,7 +605,7 @@ TAO_UIPMC_Mcast_Transport::handle_input (
 }
 
 int
-TAO_UIPMC_Mcast_Transport::register_handler (void)
+TAO_UIPMC_Mcast_Transport::register_handler ()
 {
   // We never register the handler with the reactor
   // as we never need to be informed about any incoming data,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 5090520c7c5..3724b0ab006 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -23,7 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 const char TAO_UIPMC_Profile::object_key_delimiter_ = '/';
 
 char
-TAO_UIPMC_Profile::object_key_delimiter (void) const
+TAO_UIPMC_Profile::object_key_delimiter () const
 {
   return TAO_UIPMC_Profile::object_key_delimiter_;
 }
@@ -85,7 +85,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4],
   this->addressing_mode_ = default_addressing_mode_;
 }
 
-TAO_UIPMC_Profile::~TAO_UIPMC_Profile (void)
+TAO_UIPMC_Profile::~TAO_UIPMC_Profile ()
 {
 }
 
@@ -157,7 +157,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr)
 }
 
 int
-TAO_UIPMC_Profile::decode_endpoints (void)
+TAO_UIPMC_Profile::decode_endpoints ()
 {
   ACE_NOTSUP_RETURN (-1);
 }
@@ -528,25 +528,25 @@ TAO_UIPMC_Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO_UIPMC_Profile::endpoint (void)
+TAO_UIPMC_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
 
 int
-TAO_UIPMC_Profile::encode_endpoints (void)
+TAO_UIPMC_Profile::encode_endpoints ()
 {
   return 1;
 }
 
 CORBA::ULong
-TAO_UIPMC_Profile::endpoint_count (void) const
+TAO_UIPMC_Profile::endpoint_count () const
 {
   return 1;
 }
 
 char *
-TAO_UIPMC_Profile::to_string (void) const
+TAO_UIPMC_Profile::to_string () const
 {
   // corbaloc:miop:1.0@1.0-group_id-1-1/host:port
 
@@ -617,13 +617,13 @@ TAO_UIPMC_Profile::to_string (void) const
 }
 
 const char *
-TAO_UIPMC_Profile::prefix (void)
+TAO_UIPMC_Profile::prefix ()
 {
   return ::the_prefix;
 }
 
 IOP::TaggedProfile &
-TAO_UIPMC_Profile::create_tagged_profile (void)
+TAO_UIPMC_Profile::create_tagged_profile ()
 {
   // Check whether we have already created the TaggedProfile
   if (this->tagged_profile_.profile_data.length () == 0)
@@ -695,7 +695,7 @@ TAO_UIPMC_Profile::set_group_info (
 }
 
 void
-TAO_UIPMC_Profile::update_cached_group_component (void)
+TAO_UIPMC_Profile::update_cached_group_component ()
 {
   PortableGroup::TagGroupTaggedComponent group;
 
@@ -770,7 +770,7 @@ TAO_UIPMC_Profile::request_target_specifier (
 }
 
 int
-TAO_UIPMC_Profile::supports_multicast (void) const
+TAO_UIPMC_Profile::supports_multicast () const
 {
   // Yes!  We support multicast!
   return 1;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index e156ec4c373..d7a8006d3df 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -35,18 +35,18 @@ TAO_UIPMC_Transport::TAO_UIPMC_Transport (
   this->uuid_hash_ = uuid.to_string ()->hash ();
 }
 
-TAO_UIPMC_Transport::~TAO_UIPMC_Transport (void)
+TAO_UIPMC_Transport::~TAO_UIPMC_Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO_UIPMC_Transport::event_handler_i (void)
+TAO_UIPMC_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_UIPMC_Transport::connection_handler_i (void)
+TAO_UIPMC_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -421,7 +421,7 @@ TAO_UIPMC_Transport::recv (
 }
 
 int
-TAO_UIPMC_Transport::register_handler (void)
+TAO_UIPMC_Transport::register_handler ()
 {
   // We never register the handler with the reactor
   // as we never need to be informed about any incoming data,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
index c72f45795f1..c0d9b19aa45 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
@@ -16,20 +16,20 @@ namespace TAO_PG
   {
   }
 
-  UIPMC_Recv_Packet_Cleanup_Guard::~UIPMC_Recv_Packet_Cleanup_Guard (void)
+  UIPMC_Recv_Packet_Cleanup_Guard::~UIPMC_Recv_Packet_Cleanup_Guard ()
   {
     // Cleanup only expired packets.
     this->transport_->cleanup_packets (true);
   }
 
-  UIPMC_Recv_Packet::UIPMC_Recv_Packet (void)
+  UIPMC_Recv_Packet::UIPMC_Recv_Packet ()
     : last_fragment_id_ (0)
     , data_length_ (0)
     , started_ (ACE_OS::gettimeofday ())
   {
   }
 
-  UIPMC_Recv_Packet::~UIPMC_Recv_Packet (void)
+  UIPMC_Recv_Packet::~UIPMC_Recv_Packet ()
   {
     for (Fragments_Map::iterator iter = this->fragments_.begin ();
          iter != this->fragments_.end ();
@@ -100,13 +100,13 @@ namespace TAO_PG
   }
 
   ACE_Time_Value const &
-  UIPMC_Recv_Packet::started (void) const
+  UIPMC_Recv_Packet::started () const
   {
     return this->started_;
   }
 
   CORBA::ULong
-  UIPMC_Recv_Packet::data_length (void) const
+  UIPMC_Recv_Packet::data_length () const
   {
     return this->data_length_;
   }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index a539bfecc1d..1c6f19f8f98 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -10,24 +10,24 @@ TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport)
 {
 }
 
-TAO_UIPMC_Wait_Never::~TAO_UIPMC_Wait_Never (void)
+TAO_UIPMC_Wait_Never::~TAO_UIPMC_Wait_Never ()
 {
 }
 
 int
-TAO_UIPMC_Wait_Never::register_handler (void)
+TAO_UIPMC_Wait_Never::register_handler ()
 {
   return -1;
 }
 
 bool
-TAO_UIPMC_Wait_Never::non_blocking (void) const
+TAO_UIPMC_Wait_Never::non_blocking () const
 {
   return true;
 }
 
 bool
-TAO_UIPMC_Wait_Never::can_process_upcalls (void) const
+TAO_UIPMC_Wait_Never::can_process_upcalls () const
 {
   return true;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
index c9ae98313b7..7cf473067bf 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
@@ -9,7 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory (void)
+TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory ()
   : fragments_cleanup_strategy_type_ (TAO_MIOP_CLEANUP_TIME_BOUND)
   , fragments_cleanup_bound_   (-1)
   , fragments_cleanup_strategy_ (0)
@@ -24,7 +24,7 @@ TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory (void)
 {
 }
 
-TAO_MIOP_Resource_Factory::~TAO_MIOP_Resource_Factory (void)
+TAO_MIOP_Resource_Factory::~TAO_MIOP_Resource_Factory ()
 {
   delete this->fragments_cleanup_strategy_;
 }
@@ -284,7 +284,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
 }
 
 TAO_PG::Fragments_Cleanup_Strategy *
-TAO_MIOP_Resource_Factory::fragments_cleanup_strategy (void) const
+TAO_MIOP_Resource_Factory::fragments_cleanup_strategy () const
 {
   if (this->fragments_cleanup_strategy_ == 0)
     {
@@ -330,19 +330,19 @@ TAO_MIOP_Resource_Factory::fragments_cleanup_strategy (void) const
 }
 
 u_long
-TAO_MIOP_Resource_Factory::max_fragment_size (void) const
+TAO_MIOP_Resource_Factory::max_fragment_size () const
 {
   return this->max_fragment_size_;
 }
 
 u_long
-TAO_MIOP_Resource_Factory::max_fragments (void) const
+TAO_MIOP_Resource_Factory::max_fragments () const
 {
   return this->max_fragments_;
 }
 
 u_long
-TAO_MIOP_Resource_Factory::max_fragment_rate (void) const
+TAO_MIOP_Resource_Factory::max_fragment_rate () const
 {
   // If "max_fragment_rate_" is not specified (i.e. zero)
   // use the same value as "max_fragment_size_".
@@ -352,31 +352,31 @@ TAO_MIOP_Resource_Factory::max_fragment_rate (void) const
 }
 
 u_long
-TAO_MIOP_Resource_Factory::send_hi_water_mark (void) const
+TAO_MIOP_Resource_Factory::send_hi_water_mark () const
 {
   return this->send_hi_water_mark_;
 }
 
 u_long
-TAO_MIOP_Resource_Factory::send_buffer_size (void) const
+TAO_MIOP_Resource_Factory::send_buffer_size () const
 {
   return send_buffer_size_;
 }
 
 u_long
-TAO_MIOP_Resource_Factory::receive_buffer_size (void) const
+TAO_MIOP_Resource_Factory::receive_buffer_size () const
 {
   return receive_buffer_size_;
 }
 
 bool
-TAO_MIOP_Resource_Factory::enable_throttling (void) const
+TAO_MIOP_Resource_Factory::enable_throttling () const
 {
   return enable_throttling_;
 }
 
 bool
-TAO_MIOP_Resource_Factory::enable_eager_dequeue (void) const
+TAO_MIOP_Resource_Factory::enable_eager_dequeue () const
 {
   return enable_eager_dequeue_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 2cba0dcae08..6a639dd6394 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // = Methods to deal with ACE_Hash_Map_Manager.
 
-CosProperty_Hash_Key::CosProperty_Hash_Key (void)
+CosProperty_Hash_Key::CosProperty_Hash_Key ()
 {
 }
 
@@ -47,20 +47,20 @@ CosProperty_Hash_Key::operator == (const CosProperty_Hash_Key &hash_key) const
 }
 
 u_long
-CosProperty_Hash_Key::hash (void) const
+CosProperty_Hash_Key::hash () const
 {
   u_long ret = ACE::hash_pjw (this->pname_);
 
   return ret;
 }
 
-CosProperty_Hash_Key::~CosProperty_Hash_Key (void)
+CosProperty_Hash_Key::~CosProperty_Hash_Key ()
 {
 }
 
 //======================================================================
 
-CosProperty_Hash_Value::CosProperty_Hash_Value (void)
+CosProperty_Hash_Value::CosProperty_Hash_Value ()
 {
 }
 
@@ -77,19 +77,19 @@ CosProperty_Hash_Value::CosProperty_Hash_Value (const CosProperty_Hash_Value &sr
 {
 }
 
-CosProperty_Hash_Value::~CosProperty_Hash_Value (void)
+CosProperty_Hash_Value::~CosProperty_Hash_Value ()
 {
 }
 
 //======================================================================
 
 // Constructor.
-TAO_PropertySetFactory::TAO_PropertySetFactory (void)
+TAO_PropertySetFactory::TAO_PropertySetFactory ()
 {
 }
 
 // Destructor.
-TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
+TAO_PropertySetFactory::~TAO_PropertySetFactory ()
 {
 }
 
@@ -99,7 +99,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
 // things.
 
 CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_propertyset (void)
+TAO_PropertySetFactory::create_propertyset ()
 {
   // New a TAO_PropertySet.
   TAO_PropertySet *new_set;
@@ -201,7 +201,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
 }
 
 // Destructor.
-TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void)
+TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory ()
 {
   // Release all the new'ed products.
   for (CORBA::ULong pi = 0;
@@ -213,7 +213,7 @@ TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void)
 //======================================================================
 
 // Constrctor.
-TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
+TAO_PropertySetDefFactory::TAO_PropertySetDefFactory ()
 {
 }
 
@@ -223,7 +223,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
 // delete all these New'ed things.
 
 CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_propertysetdef (void)
+TAO_PropertySetDefFactory::create_propertysetdef ()
 {
   // New a TAO_PropertySetDef.
   TAO_PropertySetDef *new_set;
@@ -330,7 +330,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
 // Makes default sized hash_table_. All the sequences are set the max
 // length as 0.
 
-TAO_PropertySet::TAO_PropertySet (void)
+TAO_PropertySet::TAO_PropertySet ()
 {
 }
 
@@ -397,7 +397,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_p
 
 // Destructor. All sequences will be deleted.
 
-TAO_PropertySet::~TAO_PropertySet (void)
+TAO_PropertySet::~TAO_PropertySet ()
 {
 }
 
@@ -625,7 +625,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
 
 
 CORBA::ULong
-TAO_PropertySet::get_number_of_properties (void)
+TAO_PropertySet::get_number_of_properties ()
 {
   return static_cast<CORBA::ULong> (this->hash_table_.current_size ());
 }
@@ -990,7 +990,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
 
 
 CORBA::Boolean
-TAO_PropertySet::delete_all_properties (void)
+TAO_PropertySet::delete_all_properties ()
 {
   // Get all the property names in a names' sequence.
   CosPropertyService::PropertyNames *names_ptr = 0;
@@ -1043,7 +1043,7 @@ TAO_PropertySet::operator= (const TAO_PropertySet &)
 
 // Makes default sized hash_table_.
 
-TAO_PropertySetDef::TAO_PropertySetDef (void)
+TAO_PropertySetDef::TAO_PropertySetDef ()
 {
 }
 
@@ -1082,7 +1082,7 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs i
 
 // Destructor.
 
-TAO_PropertySetDef::~TAO_PropertySetDef (void)
+TAO_PropertySetDef::~TAO_PropertySetDef ()
 {
 }
 
@@ -1521,7 +1521,7 @@ TAO_PropertyNamesIterator::TAO_PropertyNamesIterator (TAO_PropertySet &property_
 
 // Destructor.
 
-TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
+TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator ()
 {
 }
 
@@ -1529,7 +1529,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
 // one exists.
 
 void
-TAO_PropertyNamesIterator::reset (void)
+TAO_PropertyNamesIterator::reset ()
 {
   this->iterator_ = this->iterator_.map ().begin ();
 }
@@ -1589,7 +1589,7 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_PropertyNamesIterator::destroy (void)
+TAO_PropertyNamesIterator::destroy ()
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
@@ -1609,12 +1609,12 @@ TAO_PropertiesIterator::TAO_PropertiesIterator (TAO_PropertySet &property_set)
 {
 }
 
-TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
+TAO_PropertiesIterator::~TAO_PropertiesIterator ()
 {
 }
 
 void
-TAO_PropertiesIterator::reset (void)
+TAO_PropertiesIterator::reset ()
 {
   this->iterator_ = this->iterator_.map ().begin ();
 }
@@ -1681,7 +1681,7 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_PropertiesIterator::destroy (void)
+TAO_PropertiesIterator::destroy ()
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index f90a7ee5404..5538284fe7f 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -422,7 +422,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
 // to the number returned, inclusive.
 
 RtecScheduler::Preemption_Priority_t
-ACE_Runtime_Scheduler::last_scheduled_priority (void)
+ACE_Runtime_Scheduler::last_scheduled_priority ()
 {
   // throw an exception if a valid schedule has not been loaded
   if (config_count_ <= 0)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
index a22952b17a2..4ab2c1e9f72 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void)
+TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor ()
   : TAO_IIOP_Acceptor (),
     base_acceptor_ (),
     creation_strategy_ (0),
@@ -13,7 +13,7 @@ TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void)
 {
 }
 
-TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor (void)
+TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -25,7 +25,7 @@ TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor (void)
 }
 
 int
-TAO::IIOP_SSL_Acceptor::close (void)
+TAO::IIOP_SSL_Acceptor::close ()
 {
   return this->base_acceptor_.close ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index 4622a9ac7a8..0b01d3824f8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -74,7 +74,7 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
   this->transport (specific_transport);
 }
 
-TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler (void)
+TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index 3029c05c3e5..d2023356c48 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -15,14 +15,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (void)
+TAO::IIOP_SSL_Connector::IIOP_SSL_Connector ()
   : TAO_IIOP_Connector (),
     connect_strategy_ (),
     base_connector_ (0)
 {
 }
 
-TAO::IIOP_SSL_Connector::~IIOP_SSL_Connector (void)
+TAO::IIOP_SSL_Connector::~IIOP_SSL_Connector ()
 {
 }
 
@@ -58,7 +58,7 @@ TAO::IIOP_SSL_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO::IIOP_SSL_Connector::close (void)
+TAO::IIOP_SSL_Connector::close ()
 {
   delete this->base_connector_.creation_strategy ();
   delete this->base_connector_.concurrency_strategy ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index 353c0b82c9d..2e2c03fbe04 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -18,7 +18,7 @@ TAO::IIOP_SSL_Transport::IIOP_SSL_Transport (
     TAO::SSLIOP::Util::current (orb_core);
 }
 
-TAO::IIOP_SSL_Transport::~IIOP_SSL_Transport (void)
+TAO::IIOP_SSL_Transport::~IIOP_SSL_Transport ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 704b3cde555..c89130859f2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -82,7 +82,7 @@ TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop,
                   CSIIOP::NoProtection);
 }
 
-TAO::SSLIOP::Acceptor::~Acceptor (void)
+TAO::SSLIOP::Acceptor::~Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -351,7 +351,7 @@ TAO::SSLIOP::Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO::SSLIOP::Acceptor::close (void)
+TAO::SSLIOP::Acceptor::close ()
 {
   int r = this->ssl_acceptor_.close ();
   if (this->IIOP_SSL_Acceptor::close () != 0)
@@ -577,7 +577,7 @@ int
 TAO::SSLIOP::Acceptor::parse_options_i (int &argc, ACE_CString ** argv)
 {
   //first, do the base class parser, then parse the leftovers.
-  int result = this->IIOP_SSL_Acceptor::parse_options_i(argc,argv);
+  int const result = this->IIOP_SSL_Acceptor::parse_options_i(argc,argv);
   if (result == -1)
     return result;
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index e8842aa4a16..1486707d257 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -12,24 +12,24 @@ TAO::SSLIOP::ClientCredentials::ClientCredentials (
 {
 }
 
-TAO::SSLIOP::ClientCredentials::~ClientCredentials (void)
+TAO::SSLIOP::ClientCredentials::~ClientCredentials ()
 {
 }
 
 SecurityLevel3::CredentialsType
-TAO::SSLIOP::ClientCredentials::creds_type (void)
+TAO::SSLIOP::ClientCredentials::creds_type ()
 {
   return SecurityLevel3::CT_ClientCredentials;
 }
 
 char *
-TAO::SSLIOP::ClientCredentials::context_id (void)
+TAO::SSLIOP::ClientCredentials::context_id ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::Principal *
-TAO::SSLIOP::ClientCredentials::client_principal (void)
+TAO::SSLIOP::ClientCredentials::client_principal ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -47,7 +47,7 @@ TAO::SSLIOP::ClientCredentials::client_restricted_resources ()
 }
 
 SecurityLevel3::Principal *
-TAO::SSLIOP::ClientCredentials::target_principal (void)
+TAO::SSLIOP::ClientCredentials::target_principal ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -65,7 +65,7 @@ TAO::SSLIOP::ClientCredentials::target_restricted_resources ()
 }
 
 SecurityLevel3::OwnCredentials_ptr
-TAO::SSLIOP::ClientCredentials::parent_credentials (void)
+TAO::SSLIOP::ClientCredentials::parent_credentials ()
 {
   SecurityLevel3::OwnCredentials_ptr creds =
     SecurityLevel3::OwnCredentials::_nil ();
@@ -92,19 +92,19 @@ TAO::SSLIOP::ClientCredentials::client_authentication ()
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::target_authentication (void)
+TAO::SSLIOP::ClientCredentials::target_authentication ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::confidentiality (void)
+TAO::SSLIOP::ClientCredentials::confidentiality ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::integrity (void)
+TAO::SSLIOP::ClientCredentials::integrity ()
 {
   // TAO's SSLIOP pluggable transport always provides integrity.  Note
   // that if we
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index f37b77c9682..2244fb35e51 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -51,7 +51,7 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core)
   this->transport (specific_transport);
 }
 
-TAO::SSLIOP::Connection_Handler::~Connection_Handler (void)
+TAO::SSLIOP::Connection_Handler::~Connection_Handler ()
 {
   delete this->transport ();
   int const result =
@@ -245,13 +245,13 @@ TAO::SSLIOP::Connection_Handler::open (void *)
 }
 
 int
-TAO::SSLIOP::Connection_Handler::resume_handler (void)
+TAO::SSLIOP::Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO::SSLIOP::Connection_Handler::close_connection (void)
+TAO::SSLIOP::Connection_Handler::close_connection ()
 {
   return this->close_connection_eh (this);
 }
@@ -313,7 +313,7 @@ TAO::SSLIOP::Connection_Handler::close (u_long flags)
 }
 
 int
-TAO::SSLIOP::Connection_Handler::release_os_resources (void)
+TAO::SSLIOP::Connection_Handler::release_os_resources ()
 {
   return this->peer().close ();
 }
@@ -326,7 +326,7 @@ TAO::SSLIOP::Connection_Handler::pos_io_hook (int & return_value)
 }
 
 int
-TAO::SSLIOP::Connection_Handler::add_transport_to_cache (void)
+TAO::SSLIOP::Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
@@ -459,7 +459,7 @@ TAO::SSLIOP::Connection_Handler::handle_write_ready (const ACE_Time_Value *t)
 }
 
 bool
-TAO::SSLIOP::Connection_Handler::check_host (void)
+TAO::SSLIOP::Connection_Handler::check_host ()
 {
   ACE_SSL_Context *ssl_ctx = ACE_SSL_Context::instance ();
   ACE_INET_Addr remote_addr;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 6aebd8005d2..458198a14c7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -70,7 +70,7 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO::SSLIOP::Connector::close (void)
+TAO::SSLIOP::Connector::close ()
 {
   (void) this->TAO::IIOP_SSL_Connector::close ();
 
@@ -214,7 +214,7 @@ TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO::SSLIOP::Connector::make_profile (void)
+TAO::SSLIOP::Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -236,7 +236,7 @@ TAO::SSLIOP::Connector::make_profile (void)
 
 
 TAO_Profile *
-TAO::SSLIOP::Connector::make_secure_profile (void)
+TAO::SSLIOP::Connector::make_secure_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index ea8462ccf68..20e4069f82a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -70,30 +70,30 @@ TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp)
     }
 }
 
-TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void)
+TAO::SSLIOP_Credentials::~SSLIOP_Credentials ()
 {
 }
 
 char *
-TAO::SSLIOP_Credentials::creds_id (void)
+TAO::SSLIOP_Credentials::creds_id ()
 {
   return CORBA::string_dup (this->id_.in ());
 }
 
 SecurityLevel3::CredentialsUsage
-TAO::SSLIOP_Credentials::creds_usage (void)
+TAO::SSLIOP_Credentials::creds_usage ()
 {
   return SecurityLevel3::CU_Indefinite;
 }
 
 TimeBase::UtcT
-TAO::SSLIOP_Credentials::expiry_time (void)
+TAO::SSLIOP_Credentials::expiry_time ()
 {
   return this->expiry_time_;
 }
 
 SecurityLevel3::CredentialsState
-TAO::SSLIOP_Credentials::creds_state (void)
+TAO::SSLIOP_Credentials::creds_state ()
 {
   const ::X509 *x = this->x509_.in ();
 
@@ -181,7 +181,7 @@ TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs)
 }
 
 CORBA::ULong
-TAO::SSLIOP_Credentials::hash (void) const
+TAO::SSLIOP_Credentials::hash () const
 {
   ::X509 * x509 = this->x509_.in ();
 
@@ -219,7 +219,7 @@ tao_TAO_SSLIOP_Credentials_release (TAO::SSLIOP::Credentials_ptr p)
 }
 
 TAO::SSLIOP::Credentials_ptr
-tao_TAO_SSLIOP_Credentials_nil (void)
+tao_TAO_SSLIOP_Credentials_nil ()
 {
   return TAO::SSLIOP_Credentials::_nil ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 0528fe63f03..e9821f0c25a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -76,12 +76,12 @@ TAO::SSLIOP::CredentialsAcquirer::CredentialsAcquirer (
 {
 }
 
-TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer (void)
+TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer ()
 {
 }
 
 char *
-TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void)
+TAO::SSLIOP::CredentialsAcquirer::acquisition_method ()
 {
   this->check_validity ();
 
@@ -89,7 +89,7 @@ TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void)
 }
 
 SecurityLevel3::AcquisitionStatus
-TAO::SSLIOP::CredentialsAcquirer::current_status (void)
+TAO::SSLIOP::CredentialsAcquirer::current_status ()
 {
   this->check_validity ();
 
@@ -97,7 +97,7 @@ TAO::SSLIOP::CredentialsAcquirer::current_status (void)
 }
 
 CORBA::ULong
-TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void)
+TAO::SSLIOP::CredentialsAcquirer::nth_iteration ()
 {
   this->check_validity ();
 
@@ -170,7 +170,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
 }
 
 void
-TAO::SSLIOP::CredentialsAcquirer::destroy (void)
+TAO::SSLIOP::CredentialsAcquirer::destroy ()
 {
   this->check_validity ();
 
@@ -188,7 +188,7 @@ TAO::SSLIOP::CredentialsAcquirer::destroy (void)
 }
 
 void
-TAO::SSLIOP::CredentialsAcquirer::check_validity (void)
+TAO::SSLIOP::CredentialsAcquirer::check_validity ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index c0141239c3f..32e419fd1ce 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -13,7 +13,7 @@ TAO::SSLIOP::Current::Current (TAO_ORB_Core *orb_core)
 {
 }
 
-TAO::SSLIOP::Current::~Current (void)
+TAO::SSLIOP::Current::~Current ()
 {
 }
 
@@ -78,7 +78,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain ()
 }
 
 CORBA::Boolean
-TAO::SSLIOP::Current::no_context (void)
+TAO::SSLIOP::Current::no_context ()
 {
   return (this->implementation () == 0 ? true : false);
 }
@@ -127,7 +127,7 @@ TAO::SSLIOP::Current::_duplicate (TAO::SSLIOP::Current_ptr obj)
 }
 
 const char *
-TAO::SSLIOP::Current::_interface_repository_id (void) const
+TAO::SSLIOP::Current::_interface_repository_id () const
 {
   return "IDL:TAO/SSLIOP/Current:1.0";
 }
@@ -147,7 +147,7 @@ tao_TAO_SSLIOP_Current_release (TAO::SSLIOP::Current_ptr p)
 }
 
 TAO::SSLIOP::Current_ptr
-tao_TAO_SSLIOP_Current_nil (void)
+tao_TAO_SSLIOP_Current_nil ()
 {
   return TAO::SSLIOP::Current::_nil ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index 00a811a558b..672bc44fcd5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -13,7 +13,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::SSLIOP::Current_Impl::~Current_Impl (void)
+TAO::SSLIOP::Current_Impl::~Current_Impl ()
 {
 }
 
@@ -43,7 +43,7 @@ TAO::SSLIOP::Current_Impl::client_credentials ()
 }
 
 CORBA::Boolean
-TAO::SSLIOP::Current_Impl::request_is_local (void)
+TAO::SSLIOP::Current_Impl::request_is_local ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -115,7 +115,7 @@ TAO::SSLIOP::Current_Impl::get_peer_certificate_chain (
 }
 
 CORBA::ULong
-TAO::SSLIOP::Current_Impl::tag (void) const
+TAO::SSLIOP::Current_Impl::tag () const
 {
   return ::SSLIOP::TAG_SSL_SEC_TRANS;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index 077725fc096..ac09e5b1cab 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -97,7 +97,7 @@ TAO_SSLIOP_Endpoint::operator= (const TAO_SSLIOP_Endpoint &other)
   return *this;
 }
 
-TAO_SSLIOP_Endpoint::~TAO_SSLIOP_Endpoint (void)
+TAO_SSLIOP_Endpoint::~TAO_SSLIOP_Endpoint ()
 {
   if (this->destroy_iiop_endpoint_)
     delete this->iiop_endpoint_;
@@ -125,7 +125,7 @@ TAO_SSLIOP_Endpoint::addr_to_string (char *buffer, size_t length)
 
 
 TAO_Endpoint *
-TAO_SSLIOP_Endpoint::next (void)
+TAO_SSLIOP_Endpoint::next ()
 {
   return this->next_;
 }
@@ -170,7 +170,7 @@ TAO_SSLIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 TAO_Endpoint *
-TAO_SSLIOP_Endpoint::duplicate (void)
+TAO_SSLIOP_Endpoint::duplicate ()
 {
   TAO_SSLIOP_Endpoint *endpoint = 0;
 
@@ -190,7 +190,7 @@ TAO_SSLIOP_Endpoint::duplicate (void)
 }
 
 CORBA::ULong
-TAO_SSLIOP_Endpoint::hash (void)
+TAO_SSLIOP_Endpoint::hash ()
 {
   // there is actually the potential for a race of the inverse case,
   // since setting the security attributes will reset the hash_val_,
@@ -230,7 +230,7 @@ TAO_SSLIOP_Endpoint::hash (void)
 
 
 const ACE_INET_Addr &
-TAO_SSLIOP_Endpoint::object_addr (void) const
+TAO_SSLIOP_Endpoint::object_addr () const
 {
   // The object_addr_ is initialized here, rather than at IOR decode
   // time for several reasons:
@@ -345,7 +345,7 @@ TAO_SSLIOP_Synthetic_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint
 }
 
 TAO_Endpoint *
-TAO_SSLIOP_Synthetic_Endpoint::duplicate (void)
+TAO_SSLIOP_Synthetic_Endpoint::duplicate ()
 {
   TAO_SSLIOP_Synthetic_Endpoint *endpoint = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 907e7246983..9f42eb0efb2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -230,7 +230,7 @@ TAO::SSLIOP::Protocol_Factory::pem_passwd_cb (char *buf, int size, int , void *t
   return len;
 }
 
-TAO::SSLIOP::Protocol_Factory::Protocol_Factory (void)
+TAO::SSLIOP::Protocol_Factory::Protocol_Factory ()
   :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
      qop_ (::Security::SecQOPIntegrityAndConfidentiality),
      timeout_ (TAO::SSLIOP::ACCEPT_TIMEOUT),
@@ -238,7 +238,7 @@ TAO::SSLIOP::Protocol_Factory::Protocol_Factory (void)
 {
 }
 
-TAO::SSLIOP::Protocol_Factory::~Protocol_Factory (void)
+TAO::SSLIOP::Protocol_Factory::~Protocol_Factory ()
 {
 }
 
@@ -251,7 +251,7 @@ TAO::SSLIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix)
 }
 
 const char *
-TAO::SSLIOP::Protocol_Factory::prefix (void) const
+TAO::SSLIOP::Protocol_Factory::prefix () const
 {
    // Note: This method doesn't seem to be used anywhere. Moreover,
    // keeping it may make things more confusing - a Factory can
@@ -261,13 +261,13 @@ TAO::SSLIOP::Protocol_Factory::prefix (void) const
 }
 
 char
-TAO::SSLIOP::Protocol_Factory::options_delimiter (void) const
+TAO::SSLIOP::Protocol_Factory::options_delimiter () const
 {
   return '/';
 }
 
 TAO_Acceptor *
-TAO::SSLIOP::Protocol_Factory::make_acceptor (void)
+TAO::SSLIOP::Protocol_Factory::make_acceptor ()
 {
   TAO_Acceptor *acceptor = 0;
 
@@ -797,7 +797,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-TAO::SSLIOP::Protocol_Factory::register_orb_initializer (void)
+TAO::SSLIOP::Protocol_Factory::register_orb_initializer ()
 {
   try
     {
@@ -853,7 +853,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (void)
 
 
 TAO_Connector *
-TAO::SSLIOP::Protocol_Factory::make_connector (void)
+TAO::SSLIOP::Protocol_Factory::make_connector ()
 {
   TAO::SSLIOP::Connector *connector = 0;
 
@@ -864,7 +864,7 @@ TAO::SSLIOP::Protocol_Factory::make_connector (void)
 }
 
 int
-TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint (void) const
+TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint () const
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 4e0324ffd9a..12496c1adf8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -47,7 +47,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor (
   this->sec2manager_ = SecurityLevel2::SecurityManager::_narrow (obj.in ());
 }
 
-TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor (void)
+TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 58d9e0e5078..a4fefe04827 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -169,7 +169,7 @@ TAO::SSLIOP::ORBInitializer::post_init (
                     TAO::SSLIOP::CredentialsAcquirerFactory,
                     CORBA::NO_MEMORY ());
 
-  auto_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory;
+  std::unique_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory;
 
   tao_curator->register_acquirer_factory ("SL3TLS", factory);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index 8604d6ba2cb..be7540ea0a6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -7,7 +7,7 @@ TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp)
 {
 }
 
-TAO::SSLIOP::OwnCredentials::~OwnCredentials (void)
+TAO::SSLIOP::OwnCredentials::~OwnCredentials ()
 {
 }
 
@@ -28,26 +28,26 @@ TAO::SSLIOP::OwnCredentials::_narrow (CORBA::Object_ptr obj)
 }
 
 TAO::SSLIOP::OwnCredentials_ptr
-TAO::SSLIOP::OwnCredentials::_nil (void)
+TAO::SSLIOP::OwnCredentials::_nil ()
 {
   return (OwnCredentials *) 0;
 
 }
 
 SecurityLevel3::CredentialsType
-TAO::SSLIOP::OwnCredentials::creds_type (void)
+TAO::SSLIOP::OwnCredentials::creds_type ()
 {
   return SecurityLevel3::CT_OwnCredentials;
 }
 
 SecurityLevel3::CredsInitiator_ptr
-TAO::SSLIOP::OwnCredentials::creds_initiator (void)
+TAO::SSLIOP::OwnCredentials::creds_initiator ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::CredsAcceptor_ptr
-TAO::SSLIOP::OwnCredentials::creds_acceptor (void)
+TAO::SSLIOP::OwnCredentials::creds_acceptor ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index dcca6d01808..91ebb0db443 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -56,7 +56,7 @@ TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core, int ssl_only)
   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
 }
 
-TAO_SSLIOP_Profile::~TAO_SSLIOP_Profile (void)
+TAO_SSLIOP_Profile::~TAO_SSLIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
@@ -190,7 +190,7 @@ TAO_SSLIOP_Profile::do_is_equivalent (const TAO_Profile * other_profile)
 }
 
 TAO_Endpoint*
-TAO_SSLIOP_Profile::endpoint (void)
+TAO_SSLIOP_Profile::endpoint ()
 {
   return &this->ssl_endpoint_;
 }
@@ -209,7 +209,7 @@ TAO_SSLIOP_Profile::add_endpoint (TAO_SSLIOP_Endpoint * endp)
 }
 
 int
-TAO_SSLIOP_Profile::encode_endpoints (void)
+TAO_SSLIOP_Profile::encode_endpoints ()
 {
   // If we have more than one endpoint, we encode info about others
   // into a tagged component for wire transfer.
@@ -266,7 +266,7 @@ TAO_SSLIOP_Profile::encode_endpoints (void)
 }
 
 int
-TAO_SSLIOP_Profile::decode_tagged_endpoints (void)
+TAO_SSLIOP_Profile::decode_tagged_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO::TAG_SSL_ENDPOINTS;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index fff54f524b9..c203fdc7d5e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -10,19 +10,19 @@ TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert,
 
 
 SecurityLevel3::CredentialsType
-TAO::SSLIOP::TargetCredentials::creds_type (void)
+TAO::SSLIOP::TargetCredentials::creds_type ()
 {
   return SecurityLevel3::CT_TargetCredentials;
 }
 
 char *
-TAO::SSLIOP::TargetCredentials::context_id (void)
+TAO::SSLIOP::TargetCredentials::context_id ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::Principal *
-TAO::SSLIOP::TargetCredentials::client_principal (void)
+TAO::SSLIOP::TargetCredentials::client_principal ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -40,7 +40,7 @@ TAO::SSLIOP::TargetCredentials::client_restricted_resources ()
 }
 
 SecurityLevel3::Principal *
-TAO::SSLIOP::TargetCredentials::target_principal (void)
+TAO::SSLIOP::TargetCredentials::target_principal ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -58,49 +58,49 @@ TAO::SSLIOP::TargetCredentials::target_restricted_resources ()
 }
 
 SecurityLevel3::OwnCredentials_ptr
-TAO::SSLIOP::TargetCredentials::parent_credentials (void)
+TAO::SSLIOP::TargetCredentials::parent_credentials ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::client_authentication (void)
+TAO::SSLIOP::TargetCredentials::client_authentication ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_authentication (void)
+TAO::SSLIOP::TargetCredentials::target_authentication ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::confidentiality (void)
+TAO::SSLIOP::TargetCredentials::confidentiality ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::integrity (void)
+TAO::SSLIOP::TargetCredentials::integrity ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_embodied (void)
+TAO::SSLIOP::TargetCredentials::target_embodied ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_endorsed (void)
+TAO::SSLIOP::TargetCredentials::target_endorsed ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-TAO::SSLIOP::TargetCredentials::release (void)
+TAO::SSLIOP::TargetCredentials::release ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 3a123c382f7..e9df6979bb0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -27,18 +27,18 @@ TAO::SSLIOP::Transport::Transport (
 {
 }
 
-TAO::SSLIOP::Transport::~Transport (void)
+TAO::SSLIOP::Transport::~Transport ()
 {
 }
 
 ACE_Event_Handler *
-TAO::SSLIOP::Transport::event_handler_i (void)
+TAO::SSLIOP::Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO::SSLIOP::Transport::connection_handler_i (void)
+TAO::SSLIOP::Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index da9d83b8e5d..f80cd66be75 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Config_Scheduler::ACE_Config_Scheduler (void)
+ACE_Config_Scheduler::ACE_Config_Scheduler ()
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
   : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t> (TAO_MIN_CRITICAL_PRIORITY))
   , impl (new ACE_Strategy_Scheduler (scheduler_strategy_))
@@ -22,7 +22,7 @@ ACE_Config_Scheduler::ACE_Config_Scheduler (void)
   // impl->output_level (10);
 }
 
-ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
+ACE_Config_Scheduler::~ACE_Config_Scheduler ()
 {
   delete impl;
 }
@@ -438,7 +438,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 
 
 RtecScheduler::Preemption_Priority_t
-ACE_Config_Scheduler::last_scheduled_priority (void)
+ACE_Config_Scheduler::last_scheduled_priority ()
 {
 
   RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue ();
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 3cdc82216da..f1844bed135 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -1237,7 +1237,7 @@ ACE_DynScheduler::propagate_dispatches (
 
 
 ACE_DynScheduler::status_t
-ACE_DynScheduler::calculate_utilization_params (void)
+ACE_DynScheduler::calculate_utilization_params ()
 {
   critical_set_frame_size_ = 0;
   utilization_ = 0.0;
@@ -1307,7 +1307,7 @@ ACE_DynScheduler::update_priority_level_params ()
 }
 
 ACE_DynScheduler::status_t
-ACE_DynScheduler::setup_task_entries (void)
+ACE_DynScheduler::setup_task_entries ()
 {
   // store number of tasks, based on registrations
   tasks (static_cast<u_int> (rt_info_entries_.size ()));
@@ -1384,7 +1384,7 @@ ACE_DynScheduler::setup_task_entries (void)
 }
 
 ACE_DynScheduler::status_t
-ACE_DynScheduler::relate_task_entries (void)
+ACE_DynScheduler::relate_task_entries ()
 {
   status_t status = SUCCEEDED;
 
@@ -1584,7 +1584,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals,
 }
 
 ACE_DynScheduler::status_t
-ACE_DynScheduler::check_dependency_cycles (void)
+ACE_DynScheduler::check_dependency_cycles ()
 {
   status_t return_status = SUCCEEDED;
 
@@ -1748,7 +1748,7 @@ ACE_DynScheduler::schedule_dispatches (ACE_Unbounded_Set<RtecScheduler::Scheduli
   // calls internal dispatch scheduling method.
 
 ACE_DynScheduler::status_t
-ACE_DynScheduler::store_assigned_info (void)
+ACE_DynScheduler::store_assigned_info ()
 {
   for  (u_int i = 0; i < dispatch_entry_count_; ++i)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index 4bf6aede47c..b50d9381218 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -705,7 +705,7 @@ effective_exec_multiplier (CORBA::Long l)
 
 ///////////////////////////
 
-TAO_Reconfig_Sched_Entry_Visitor::~TAO_Reconfig_Sched_Entry_Visitor (void)
+TAO_Reconfig_Sched_Entry_Visitor::~TAO_Reconfig_Sched_Entry_Visitor ()
 {
 }
 
@@ -910,7 +910,7 @@ enabled_state (RtecScheduler::RT_Info_Enabled_Type_t et)
 
 ////////////////////////////////////////////
 
-TAO_RT_Info_Tuple_Visitor::~TAO_RT_Info_Tuple_Visitor (void)
+TAO_RT_Info_Tuple_Visitor::~TAO_RT_Info_Tuple_Visitor ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 8f851f9b415..9cfb8e0b5da 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -21,7 +21,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-Task_Entry::Task_Entry (void)
+Task_Entry::Task_Entry ()
   : rt_info_ (0),
     effective_period_(0),
     dfs_status_ (NOT_VISITED),
@@ -35,7 +35,7 @@ Task_Entry::Task_Entry (void)
 {
 }
 
-Task_Entry::~Task_Entry (void)
+Task_Entry::~Task_Entry ()
 {
   // Zero out the task entry ACT in the corresponding rt_info
   rt_info_->volatile_token = 0;
@@ -758,7 +758,7 @@ Dispatch_Proxy_Iterator::first (u_int sub_frame)
 // and -1 if an error occurred.
 
 int
-Dispatch_Proxy_Iterator::last (void)
+Dispatch_Proxy_Iterator::last ()
 {
   // use the last call
   current_call_ = number_of_calls_ - 1;
@@ -775,7 +775,7 @@ Dispatch_Proxy_Iterator::last (void)
 // and -1 if an error occurred.
 
 int
-Dispatch_Proxy_Iterator::advance (void)
+Dispatch_Proxy_Iterator::advance ()
 {
   int result = 1;
 
@@ -814,7 +814,7 @@ Dispatch_Proxy_Iterator::advance (void)
 // and -1 if an error occurred.
 
 int
-Dispatch_Proxy_Iterator::retreat (void)
+Dispatch_Proxy_Iterator::retreat ()
 {
   int result = 1;
 
@@ -851,7 +851,7 @@ Dispatch_Proxy_Iterator::retreat (void)
 // returns the adjusted arrival time of the virtual entry
 
 RtecScheduler::Time
-Dispatch_Proxy_Iterator::arrival (void) const
+Dispatch_Proxy_Iterator::arrival () const
 {
   Dispatch_Entry_Link *link;
   if (iter_.done ()
@@ -868,7 +868,7 @@ Dispatch_Proxy_Iterator::arrival (void) const
 // returns the adjusted deadline time of the virtual entry
 
 RtecScheduler::Time
-Dispatch_Proxy_Iterator::deadline (void) const
+Dispatch_Proxy_Iterator::deadline () const
 {
   Dispatch_Entry_Link *link;
   if (iter_.done ()
@@ -885,7 +885,7 @@ Dispatch_Proxy_Iterator::deadline (void) const
 // returns the scheduler priority of the virtual entry
 
 Dispatch_Proxy_Iterator::Preemption_Priority
-Dispatch_Proxy_Iterator::priority (void) const
+Dispatch_Proxy_Iterator::priority () const
 {
   Dispatch_Entry_Link *link;
 
@@ -900,7 +900,7 @@ Dispatch_Proxy_Iterator::priority (void) const
 // returns the OS priority of the virtual entry
 
 Dispatch_Proxy_Iterator::OS_Priority
-Dispatch_Proxy_Iterator::OS_priority (void) const
+Dispatch_Proxy_Iterator::OS_priority () const
 {
   Dispatch_Entry_Link *link;
   if (iter_.done ()
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index d301b963454..c1bb16f71c5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -613,7 +613,7 @@ ACE_Scheduler_Strategy::ACE_Scheduler_Strategy (
 {
 }
 
-ACE_Scheduler_Strategy::~ACE_Scheduler_Strategy (void)
+ACE_Scheduler_Strategy::~ACE_Scheduler_Strategy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 1190037fc93..8d1618b975b 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -105,7 +105,7 @@ struct ACE_Scheduler_Factory_Data
   // applications; must be set by either the application or Event
   // Channel.
 
-  ACE_Scheduler_Factory_Data (void)
+  ACE_Scheduler_Factory_Data ()
     : scheduler_ (TAO_SF_config_count,
                   TAO_SF_config_info,
                   TAO_SF_entry_count,
@@ -140,7 +140,7 @@ int ACE_Scheduler_Factory::use_runtime (int cc,
 }
 
 static RtecScheduler::Scheduler_ptr
-static_server (void)
+static_server ()
 {
   RtecScheduler::Scheduler_ptr server_ = 0;
 
@@ -221,7 +221,7 @@ ACE_Scheduler_Factory::server (RtecScheduler::Scheduler_ptr sptr)
 }
 
 RtecScheduler::Scheduler_ptr
-ACE_Scheduler_Factory::server (void)
+ACE_Scheduler_Factory::server ()
 {
   if (server_ == 0 && TAO_SF_entry_count != -1)
     server_ = static_server ();
@@ -730,7 +730,7 @@ ACE_Scheduler_Factory::log_scheduling_tuples(
 #endif /* HPUX && !g++ */
 
 RtecScheduler::Preemption_Priority_t
-ACE_Scheduler_Factory::preemption_priority (void)
+ACE_Scheduler_Factory::preemption_priority ()
 {
   // Return whatever we've got.  The application or Event Channel is
   // responsible for making sure that it was set.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 99e681eb61a..09273977362 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -10,7 +10,7 @@ TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy (
 {
 }
 
-TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void)
+TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy ()
 {
 }
 
@@ -21,7 +21,7 @@ TAO::Security::EstablishTrustPolicy::policy_type ()
 }
 
 CORBA::Policy_ptr
-TAO::Security::EstablishTrustPolicy::copy (void)
+TAO::Security::EstablishTrustPolicy::copy ()
 {
   TAO::Security::EstablishTrustPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -36,12 +36,12 @@ TAO::Security::EstablishTrustPolicy::copy (void)
 }
 
 void
-TAO::Security::EstablishTrustPolicy::destroy (void)
+TAO::Security::EstablishTrustPolicy::destroy ()
 {
 }
 
 ::Security::EstablishTrust
-TAO::Security::EstablishTrustPolicy::trust (void)
+TAO::Security::EstablishTrustPolicy::trust ()
 {
   return this->trust_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 9d41415ebd2..6fac5016428 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -9,18 +9,18 @@ TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop)
 {
 }
 
-TAO::Security::QOPPolicy::~QOPPolicy (void)
+TAO::Security::QOPPolicy::~QOPPolicy ()
 {
 }
 
 CORBA::PolicyType
-TAO::Security::QOPPolicy::policy_type (void)
+TAO::Security::QOPPolicy::policy_type ()
 {
   return ::Security::SecQOPPolicy;
 }
 
 CORBA::Policy_ptr
-TAO::Security::QOPPolicy::copy (void)
+TAO::Security::QOPPolicy::copy ()
 {
   TAO::Security::QOPPolicy * policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -35,12 +35,12 @@ TAO::Security::QOPPolicy::copy (void)
 }
 
 void
-TAO::Security::QOPPolicy::destroy (void)
+TAO::Security::QOPPolicy::destroy ()
 {
 }
 
 Security::QOP
-TAO::Security::QOPPolicy::qop (void)
+TAO::Security::QOPPolicy::qop ()
 {
   return this->qop_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index 0dfb18dcc59..6590858dfe5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -27,7 +27,7 @@ TAO::Security::SecurityManager::SecurityManager (/* unknown */)
   this->access_decision_ = ad;
 }
 
-TAO::Security::SecurityManager::~SecurityManager (void)
+TAO::Security::SecurityManager::~SecurityManager ()
 {
 }
 
@@ -315,7 +315,7 @@ TAO::Security::AccessDecision::remove_object
 }
 
 CORBA::Boolean
-TAO::Security::AccessDecision::default_decision (void)
+TAO::Security::AccessDecision::default_decision ()
 {
   return this->default_allowance_decision_;
 }
@@ -327,7 +327,7 @@ TAO::Security::AccessDecision::default_decision (CORBA::Boolean d)
 }
 
 CORBA::Boolean
-TAO::Security::AccessDecision::default_collocated_decision (void)
+TAO::Security::AccessDecision::default_collocated_decision ()
 {
   return this->default_collocated_decision_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index 525dcf71228..9f1af843b94 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -18,7 +18,7 @@ TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy (
 {
 }
 
-TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void)
+TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy ()
 {
 }
 
@@ -29,7 +29,7 @@ TAO::SL3::ContextEstablishmentPolicy::creds_directive ()
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ContextEstablishmentPolicy::creds_list (void)
+TAO::SL3::ContextEstablishmentPolicy::creds_list ()
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
 
@@ -71,7 +71,7 @@ TAO::SL3::ContextEstablishmentPolicy::policy_type ()
 }
 
 CORBA::Policy_ptr
-TAO::SL3::ContextEstablishmentPolicy::copy (void)
+TAO::SL3::ContextEstablishmentPolicy::copy ()
 {
   CORBA::Policy_ptr p = CORBA::Policy_ptr ();
   ACE_NEW_THROW_EX (p,
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
index 3cd971c403d..37104fb3940 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory (void)
+TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 82d65bfe788..a1f9556ebb6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -11,14 +11,14 @@ namespace TAO
   }
 }
 
-TAO::SL3::CredentialsCurator::CredentialsCurator (void)
+TAO::SL3::CredentialsCurator::CredentialsCurator ()
   : lock_ (),
     acquirer_factories_ (),
     credentials_table_ (TAO::SL3::CREDENTIALS_TABLE_SIZE)
 {
 }
 
-TAO::SL3::CredentialsCurator::~CredentialsCurator (void)
+TAO::SL3::CredentialsCurator::~CredentialsCurator ()
 {
   const Factory_Iterator fend = this->acquirer_factories_.end ();
   for (Factory_Iterator i = this->acquirer_factories_.begin ();
@@ -62,13 +62,13 @@ TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj)
 }
 
 TAO::SL3::CredentialsCurator_ptr
-TAO::SL3::CredentialsCurator::_nil (void)
+TAO::SL3::CredentialsCurator::_nil ()
 {
   return (CredentialsCurator *) 0;
 }
 
 SecurityLevel3::AcquisitionMethodList *
-TAO::SL3::CredentialsCurator::supported_methods (void)
+TAO::SL3::CredentialsCurator::supported_methods ()
 {
   SecurityLevel3::AcquisitionMethodList * list;
   ACE_NEW_THROW_EX (list,
@@ -115,7 +115,7 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::CredentialsCurator::default_creds_list (void)
+TAO::SL3::CredentialsCurator::default_creds_list ()
 {
   SecurityLevel3::OwnCredentialsList * list;
   ACE_NEW_THROW_EX (list,
@@ -146,7 +146,7 @@ TAO::SL3::CredentialsCurator::default_creds_list (void)
 }
 
 SecurityLevel3::CredentialsIdList *
-TAO::SL3::CredentialsCurator::default_creds_ids (void)
+TAO::SL3::CredentialsCurator::default_creds_ids ()
 {
   SecurityLevel3::CredentialsIdList * list;
   ACE_NEW_THROW_EX (list,
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index f8f99982eff..ddda19ce6e9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -8,12 +8,12 @@ TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy (
 {
 }
 
-TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void)
+TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy ()
 {
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ObjectCredentialsPolicy::creds_list (void)
+TAO::SL3::ObjectCredentialsPolicy::creds_list ()
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
 
@@ -31,7 +31,7 @@ TAO::SL3::ObjectCredentialsPolicy::policy_type ()
 }
 
 CORBA::Policy_ptr
-TAO::SL3::ObjectCredentialsPolicy::copy (void)
+TAO::SL3::ObjectCredentialsPolicy::copy ()
 {
   CORBA::Policy_ptr p = CORBA::Policy_ptr ();
   ACE_NEW_THROW_EX (p,
@@ -42,7 +42,7 @@ TAO::SL3::ObjectCredentialsPolicy::copy (void)
 }
 
 void
-TAO::SL3::ObjectCredentialsPolicy::destroy (void)
+TAO::SL3::ObjectCredentialsPolicy::destroy ()
 {
   this->creds_list_.length (0);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index 582564c8aee..95bc274c937 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -14,12 +14,12 @@ TAO::SL3::SecurityCurrent::SecurityCurrent (size_t tss_slot,
 }
 
 
-TAO::SL3::SecurityCurrent::~SecurityCurrent (void)
+TAO::SL3::SecurityCurrent::~SecurityCurrent ()
 {
 }
 
 SecurityLevel3::ClientCredentials_ptr
-TAO::SL3::SecurityCurrent::client_credentials (void)
+TAO::SL3::SecurityCurrent::client_credentials ()
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
 
@@ -33,7 +33,7 @@ TAO::SL3::SecurityCurrent::client_credentials (void)
 }
 
 CORBA::Boolean
-TAO::SL3::SecurityCurrent::request_is_local (void)
+TAO::SL3::SecurityCurrent::request_is_local ()
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
index 2dfaeb1645f..e9518af55ba 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void)
+TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 4242a6fc6a8..cb8a06bff3f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -45,7 +45,6 @@ namespace TAO
     class TAO_Security_Export SecurityCurrent_Impl
     {
     public:
-
       /// Destructor.
       virtual ~SecurityCurrent_Impl (void);
 
@@ -58,17 +57,14 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
-        = 0;
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials () = 0;
 
       /// Is the current request local?
-      virtual CORBA::Boolean request_is_local ()
-        = 0;
+      virtual CORBA::Boolean request_is_local () = 0;
       //@}
 
       /// Return the unique tag that identifies the concrete subclass.
       virtual CORBA::ULong tag (void) const = 0;
-
     };
 
   }  // End Security namespace.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index a0cc037bf31..9e1e1850e0a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -10,7 +10,7 @@ TAO::SL3::SecurityManager::SecurityManager (
 {
 }
 
-TAO::SL3::SecurityManager::~SecurityManager (void)
+TAO::SL3::SecurityManager::~SecurityManager ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 8ea7bb61737..2cde77f2465 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -16,7 +16,7 @@ TAO_Security_Current::TAO_Security_Current (size_t tss_slot,
 {
 }
 
-TAO_Security_Current::~TAO_Security_Current (void)
+TAO_Security_Current::~TAO_Security_Current ()
 {
 }
 
@@ -50,7 +50,7 @@ TAO_Security_Current::received_credentials ()
 }
 
 int
-TAO_Security_Current::init (void)
+TAO_Security_Current::init ()
 {
   int result = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
index 0a6350f675f..75c6442c097 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Security::Current_Impl::~Current_Impl (void)
+TAO::Security::Current_Impl::~Current_Impl ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index aa1825c25ca..3931509fc0a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -59,8 +59,7 @@ namespace TAO
       /// the given attribute type list associated with the current
       /// request.
       virtual ::Security::AttributeList * get_attributes (
-          const ::Security::AttributeTypeList & attributes)
-        = 0;
+          const ::Security::AttributeTypeList & attributes) = 0;
       //@}
 
       /**
@@ -72,8 +71,7 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
-        = 0;
+      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials () = 0;
       //@}
 
       /// Return the unique tag that identifies the concrete subclass.
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 6336278865f..aeb74e75716 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -11,14 +11,14 @@ TAO_TIO::TAO_TIO (TimeBase::TimeT lower,
 }
 
 // Destructor.
-TAO_TIO::~TAO_TIO (void)
+TAO_TIO::~TAO_TIO ()
 {
 }
 
 // This is the get method for the attribute time interval.
 
 TimeBase::IntervalT
-TAO_TIO::time_interval (void)
+TAO_TIO::time_interval ()
 {
   return attr_time_interval;
 }
@@ -234,7 +234,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 }
 
 CosTime::UTO_ptr
-TAO_TIO::time (void)
+TAO_TIO::time ()
 {
   TAO_UTO *uto = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index a87bc724459..ee81b1d322f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -32,7 +32,7 @@ TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value,
 
 // Destructor.
 
-TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
+TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk ()
 {
 }
 
@@ -40,7 +40,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
 // in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::universal_time (void)
+TAO_Time_Service_Clerk::universal_time ()
 {
   TAO_UTO *uto = 0;
 
@@ -59,7 +59,7 @@ TAO_Time_Service_Clerk::universal_time (void)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::secure_universal_time (void)
+TAO_Time_Service_Clerk::secure_universal_time ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
@@ -120,7 +120,7 @@ TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
 }
 
 CORBA::ULongLong
-TAO_Time_Service_Clerk::get_time (void)
+TAO_Time_Service_Clerk::get_time ()
 {
   // Globally sync. time is the latest global time plus the time
   // elapsed since last updation was done.
@@ -137,7 +137,7 @@ TAO_Time_Service_Clerk::get_time (void)
 // Returns the time displacement factor in minutes.
 // This is displacement from the GMT.
 CORBA::Short
-TAO_Time_Service_Clerk::time_displacement_factor (void)
+TAO_Time_Service_Clerk::time_displacement_factor ()
 {
   return time_displacement_factor_;
 }
@@ -151,7 +151,7 @@ TAO_Time_Service_Clerk::time_displacement_factor (CORBA::Short tdf)
 
 // GET method for inaccuracy.
 TimeBase::InaccuracyT
-TAO_Time_Service_Clerk::inaccuracy (void)
+TAO_Time_Service_Clerk::inaccuracy ()
 {
   return this->inaccuracy_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index d9fdf300e57..1433cac6262 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -11,12 +11,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
-TAO_Time_Service_Server::TAO_Time_Service_Server (void)
+TAO_Time_Service_Server::TAO_Time_Service_Server ()
 {
 }
 
 // Destructor.
-TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
+TAO_Time_Service_Server::~TAO_Time_Service_Server ()
 {
 }
 
@@ -24,7 +24,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
 // inaccuracy in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::universal_time (void)
+TAO_Time_Service_Server::universal_time ()
 {
   TAO_UTO *uto = 0;
 
@@ -51,7 +51,7 @@ TAO_Time_Service_Server::universal_time (void)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::secure_universal_time (void)
+TAO_Time_Service_Server::secure_universal_time ()
 {
   throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 11461266cf6..73007d9845b 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -24,14 +24,14 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time,
 
 // Destructor.
 
-TAO_UTO::~TAO_UTO (void)
+TAO_UTO::~TAO_UTO ()
 {
 }
 
 // Get Method for the readonly attribute time.
 
 TimeBase::TimeT
-TAO_UTO::time (void)
+TAO_UTO::time ()
 {
   return attr_utc_time_.time;
 }
@@ -39,7 +39,7 @@ TAO_UTO::time (void)
 // Get method for the readonly attribute inaccuracy.
 
 TimeBase::InaccuracyT
-TAO_UTO::inaccuracy (void)
+TAO_UTO::inaccuracy ()
 {
   // Construct the Inaccuracy from the
   // inacchi and inacclo.
@@ -53,7 +53,7 @@ TAO_UTO::inaccuracy (void)
 // Get method for the readonly attribute tdf.
 
 TimeBase::TdfT
-TAO_UTO::tdf (void)
+TAO_UTO::tdf ()
 {
   return attr_utc_time_.tdf;
 }
@@ -61,7 +61,7 @@ TAO_UTO::tdf (void)
 // Get method for the readonly attribute utc_time.
 
 TimeBase::UtcT
-TAO_UTO::utc_time (void)
+TAO_UTO::utc_time ()
 {
   return attr_utc_time_;
 }
@@ -70,7 +70,7 @@ TAO_UTO::utc_time (void)
 // the Base Time, UTC and Distributed Time Sync. Algos. [3].
 
 CosTime::UTO_ptr
-TAO_UTO::absolute_time (void)
+TAO_UTO::absolute_time ()
 {
   return CosTime::UTO::_nil ();
 }
@@ -176,7 +176,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto)
 // time value in the UTO.
 
 CosTime::TIO_ptr
-TAO_UTO::interval (void)
+TAO_UTO::interval ()
 {
   TAO_TIO *tio = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 3264a707ddd..2dfdaaf37df 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -10,7 +10,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-Timer_Helper::Timer_Helper (void)
+Timer_Helper::Timer_Helper ()
   : clerk_ (0)
 {
 }
@@ -21,7 +21,7 @@ Timer_Helper::Timer_Helper (TAO_Time_Service_Clerk *clerk)
 
 }
 
-Timer_Helper::~Timer_Helper (void)
+Timer_Helper::~Timer_Helper ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 5205633818b..b48aa8e55f7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -51,7 +51,7 @@ TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
     }
 }
 
-TAO_Constraint_Interpreter::~TAO_Constraint_Interpreter (void)
+TAO_Constraint_Interpreter::~TAO_Constraint_Interpreter ()
 {
 }
 
@@ -225,7 +225,7 @@ remove_offer (CosTrading::Offer*& offer)
 
 
 size_t
-TAO_Preference_Interpreter::num_offers (void)
+TAO_Preference_Interpreter::num_offers ()
 {
   return this->offers_.size ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 521827604cc..6905df54a60 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -134,9 +134,10 @@ public:
   typedef ACE_Unbounded_Queue<Preference_Info> Ordered_Offers;
 
 private:
-  /// Disallow copying.
-  TAO_Preference_Interpreter (const TAO_Preference_Interpreter&);
-  TAO_Preference_Interpreter& operator= (const TAO_Preference_Interpreter&);
+  TAO_Preference_Interpreter (const TAO_Preference_Interpreter&) = delete;
+  TAO_Preference_Interpreter& operator= (const TAO_Preference_Interpreter&) = delete;
+  TAO_Preference_Interpreter (TAO_Preference_Interpreter&&) = delete;
+  TAO_Preference_Interpreter& operator= (TAO_Preference_Interpreter&&) = delete;
 
   /// The ordered list of offers.
   Ordered_Offers offers_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 8ea8c4946c2..3d20afdd2bd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -37,7 +37,7 @@ TAO_Binary_Constraint (TAO_Expression_Type op_type,
 {
 }
 
-TAO_Binary_Constraint::~TAO_Binary_Constraint (void)
+TAO_Binary_Constraint::~TAO_Binary_Constraint ()
 {
   delete left_;
   delete right_;
@@ -194,13 +194,13 @@ visit_in (TAO_Constraint_Visitor* visitor,
 
 
 TAO_Constraint*
-TAO_Binary_Constraint::left_operand (void) const
+TAO_Binary_Constraint::left_operand () const
 {
   return this->left_;
 }
 
 TAO_Constraint*
-TAO_Binary_Constraint::right_operand (void) const
+TAO_Binary_Constraint::right_operand () const
 {
   return this->right_;
 }
@@ -213,7 +213,7 @@ TAO_Unary_Constraint (TAO_Expression_Type op_type,
 {
 }
 
-TAO_Unary_Constraint::~TAO_Unary_Constraint (void)
+TAO_Unary_Constraint::~TAO_Unary_Constraint ()
 {
   delete operand_;
 }
@@ -254,7 +254,7 @@ TAO_Unary_Constraint::accept (TAO_Constraint_Visitor* visitor)
 }
 
 TAO_Constraint*
-TAO_Unary_Constraint::operand (void)
+TAO_Unary_Constraint::operand ()
 {
   return this->operand_;
 }
@@ -265,7 +265,7 @@ TAO_Property_Constraint (const char* name)
 {
 }
 
-TAO_Property_Constraint::~TAO_Property_Constraint (void)
+TAO_Property_Constraint::~TAO_Property_Constraint ()
 {
   CORBA::string_free (this->name_);
 }
@@ -277,18 +277,18 @@ TAO_Property_Constraint::accept (TAO_Constraint_Visitor* visitor)
 }
 
 TAO_Expression_Type
-TAO_Property_Constraint::expr_type (void) const
+TAO_Property_Constraint::expr_type () const
 {
   return TAO_IDENT;
 }
 
 const char*
-TAO_Property_Constraint::name (void) const
+TAO_Property_Constraint::name () const
 {
   return name_;
 }
 
-TAO_Literal_Constraint::TAO_Literal_Constraint (void)
+TAO_Literal_Constraint::TAO_Literal_Constraint ()
   : type_ (TAO_UNKNOWN)
 {
 }
@@ -415,7 +415,7 @@ TAO_Literal_Constraint::TAO_Literal_Constraint (const char* str)
   this->op_.str_ = CORBA::string_dup (str);
 }
 
-TAO_Literal_Constraint::~TAO_Literal_Constraint (void)
+TAO_Literal_Constraint::~TAO_Literal_Constraint ()
 {
   if (this->type_ == TAO_STRING)
     CORBA::string_free (this->op_.str_);
@@ -433,12 +433,12 @@ TAO_Literal_Constraint::operator= (const TAO_Literal_Constraint& co)
   this->copy (co);
 }
 
-TAO_Literal_Constraint::operator CORBA::Boolean (void) const
+TAO_Literal_Constraint::operator CORBA::Boolean () const
 {
   return (this->type_ == TAO_BOOLEAN) ? this->op_.bool_ : 0;
 }
 
-TAO_Literal_Constraint::operator CORBA::ULongLong (void) const
+TAO_Literal_Constraint::operator CORBA::ULongLong () const
 {
   CORBA::ULongLong return_value = 0;
 
@@ -458,7 +458,7 @@ TAO_Literal_Constraint::operator CORBA::ULongLong (void) const
   return return_value;
 }
 
-TAO_Literal_Constraint::operator CORBA::LongLong (void) const
+TAO_Literal_Constraint::operator CORBA::LongLong () const
 {
   CORBA::LongLong return_value = 0;
 
@@ -481,7 +481,7 @@ TAO_Literal_Constraint::operator CORBA::LongLong (void) const
   return return_value;
 }
 
-TAO_Literal_Constraint::operator CORBA::Double (void) const
+TAO_Literal_Constraint::operator CORBA::Double () const
 {
   CORBA::Double return_value = 0.0;
 
@@ -495,12 +495,12 @@ TAO_Literal_Constraint::operator CORBA::Double (void) const
   return return_value;
 }
 
-TAO_Literal_Constraint::operator const char* (void) const
+TAO_Literal_Constraint::operator const char* () const
 {
   return (this->type_ == TAO_STRING) ? this->op_.str_ : 0;
 }
 
-TAO_Literal_Constraint::operator const CORBA::Any* (void) const
+TAO_Literal_Constraint::operator const CORBA::Any* () const
 {
   return (this->type_ == TAO_SEQUENCE) ? this->op_.any_ : 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 8772fbd39d4..a066079520c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -9,12 +9,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void)
+TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue ()
 {
 }
 
 TAO_Literal_Constraint&
-TAO_Constraint_Evaluator::Operand_Queue::get_left_operand (void)
+TAO_Constraint_Evaluator::Operand_Queue::get_left_operand ()
 {
   TAO_Literal_Constraint* left_operand = 0;
   this->get (left_operand, 1);
@@ -22,7 +22,7 @@ TAO_Constraint_Evaluator::Operand_Queue::get_left_operand (void)
 }
 
 TAO_Literal_Constraint&
-TAO_Constraint_Evaluator::Operand_Queue::get_right_operand (void)
+TAO_Constraint_Evaluator::Operand_Queue::get_right_operand ()
 {
   TAO_Literal_Constraint* right_operand = 0;
   this->get (right_operand);
@@ -30,7 +30,7 @@ TAO_Constraint_Evaluator::Operand_Queue::get_right_operand (void)
 }
 
 TAO_Literal_Constraint&
-TAO_Constraint_Evaluator::Operand_Queue::get_operand (void)
+TAO_Constraint_Evaluator::Operand_Queue::get_operand ()
 {
   TAO_Literal_Constraint* operand = 0;
   this->get (operand);
@@ -38,13 +38,13 @@ TAO_Constraint_Evaluator::Operand_Queue::get_operand (void)
 }
 
 void
-TAO_Constraint_Evaluator::Operand_Queue::dequeue_operand (void)
+TAO_Constraint_Evaluator::Operand_Queue::dequeue_operand ()
 {
   TAO_Literal_Constraint operand;
   this->dequeue_head (operand);
 }
 
-TAO_Constraint_Evaluator::TAO_Constraint_Evaluator (void)
+TAO_Constraint_Evaluator::TAO_Constraint_Evaluator ()
 {
   // No-Op.
 }
@@ -759,12 +759,12 @@ operator () (TAO_DynSequence_i& dyn_any,
 }
 
 TAO_Constraint_Validator::
-TAO_Constraint_Validator (void)
+TAO_Constraint_Validator ()
 {
   // No-Op.
 }
 
-TAO_Constraint_Validator::~TAO_Constraint_Validator (void)
+TAO_Constraint_Validator::~TAO_Constraint_Validator ()
 {
   for (TAO_Typecode_Table::iterator type_iter (this->type_map_);
        ! type_iter.done ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index 0351c364934..c4546897636 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -344,12 +344,12 @@ private:
   CORBA::Boolean sequence_does_contain (CORBA::Any* sequence,
                                         TAO_Literal_Constraint& element);
 
-  /// Disallow copying.
-  TAO_Constraint_Evaluator (const TAO_Constraint_Evaluator&);
-  TAO_Constraint_Evaluator& operator= (const TAO_Constraint_Evaluator&);
+  TAO_Constraint_Evaluator (const TAO_Constraint_Evaluator&) = delete;
+  TAO_Constraint_Evaluator& operator= (const TAO_Constraint_Evaluator&) = delete;
+  TAO_Constraint_Evaluator (TAO_Constraint_Evaluator&&) = delete;
+  TAO_Constraint_Evaluator& operator= (TAO_Constraint_Evaluator&&) = delete;
 
 protected:
-
   /// The map of property names to their values for a property.
   TAO_Lookup_Table props_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index fc4038822dd..9d0429b6b46 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -373,11 +373,11 @@ 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 )
 
@@ -435,9 +435,9 @@ 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  );
 
 
@@ -651,18 +651,18 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base);
 
 
 
-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 ( );
 
 
 
@@ -670,7 +670,7 @@ void yyset_debug ( int debug_flag  );
 
 
 
-YY_EXTRA_TYPE yyget_extra ( void );
+YY_EXTRA_TYPE yyget_extra ( );
 
 
 
@@ -678,7 +678,7 @@ void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
 
 
-FILE *yyget_in ( void );
+FILE *yyget_in ( );
 
 
 
@@ -686,7 +686,7 @@ void yyset_in  ( FILE * _in_str  );
 
 
 
-FILE *yyget_out ( void );
+FILE *yyget_out ( );
 
 
 
@@ -694,15 +694,15 @@ 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 ( );
 
 
 
@@ -856,7 +856,7 @@ static int input ( void );
 
 
 
-extern int yylex (void);
+extern int yylex ();
 
 #define YY_DECL int yylex (void)
 #endif /* !YY_DECL */
@@ -1298,7 +1298,7 @@ case YY_STATE_EOF(INITIAL):
  *  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);
@@ -1437,7 +1437,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;
@@ -1667,7 +1667,7 @@ static int yy_get_next_buffer (void)
 }
 
 
-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;
@@ -1821,7 +1821,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;
@@ -1841,7 +1841,7 @@ 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;
 
@@ -2027,7 +2027,7 @@ static void yynoreturn yy_fatal_error (const char* msg )
 /** Get the current line number.
  *
  */
-int yyget_lineno  (void)
+int yyget_lineno  ()
 {
 
 
@@ -2041,7 +2041,7 @@ int yyget_lineno  (void)
 /** Get the input stream.
  *
  */
-FILE *yyget_in  (void)
+FILE *yyget_in  ()
 {
         return yyin;
 }
@@ -2051,7 +2051,7 @@ FILE *yyget_in  (void)
 /** Get the output stream.
  *
  */
-FILE *yyget_out  (void)
+FILE *yyget_out  ()
 {
         return yyout;
 }
@@ -2061,7 +2061,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  *
  */
-int yyget_leng  (void)
+int yyget_leng  ()
 {
         return yyleng;
 }
@@ -2071,7 +2071,7 @@ int yyget_leng  (void)
  *
  */
 
-char *yyget_text  (void)
+char *yyget_text  ()
 {
         return yytext;
 }
@@ -2116,7 +2116,7 @@ void yyset_out (FILE *  _out_str )
 
 
 
-int yyget_debug  (void)
+int yyget_debug  ()
 {
         return yy_flex_debug;
 }
@@ -2130,7 +2130,7 @@ void yyset_debug (int  _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.
@@ -2167,7 +2167,7 @@ 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. */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
index fb982f6a424..2c4cb219d93 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
@@ -5,12 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__;
 
-TAO_Interpreter::TAO_Interpreter (void)
+TAO_Interpreter::TAO_Interpreter ()
   : root_ (0)
 {
 }
 
-TAO_Interpreter::~TAO_Interpreter (void)
+TAO_Interpreter::~TAO_Interpreter ()
 {
   delete root_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 9e1246a55a1..576b8544083 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -8,12 +8,12 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class LOCK_TYPE>
-TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database (void)
+TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database ()
 {
 }
 
 template <class LOCK_TYPE>
-TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database (void)
+TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database ()
 {
   ACE_WRITE_GUARD (LOCK_TYPE, ace_mon, this->db_lock_);
 
@@ -220,7 +220,7 @@ lookup_offer (const char* type, CORBA::ULong id)
 }
 
 template <class LOCK_TYPE> TAO_Offer_Id_Iterator*
-TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void)
+TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids ()
 {
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
 
@@ -328,7 +328,7 @@ TAO_Service_Offer_Iterator (const char* type,
 }
 
 template <class LOCK_TYPE>
-TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator (void)
+TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator ()
 {
   this->stm_.db_lock_.release ();
 
@@ -340,7 +340,7 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator (void)
 }
 
 template <class LOCK_TYPE> CosTrading::OfferId
-TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id (void)
+TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id ()
 {
   return (this->offer_iter_ != 0)
     ? TAO_Offer_Database<LOCK_TYPE>::generate_offer_id (this->type_, (**this->offer_iter_).ext_id_)
@@ -348,20 +348,20 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id (void)
 }
 
 template <class LOCK_TYPE> int
-TAO_Service_Offer_Iterator<LOCK_TYPE>::has_more_offers (void)
+TAO_Service_Offer_Iterator<LOCK_TYPE>::has_more_offers ()
 {
   return (this->offer_iter_ != 0) ? ! this->offer_iter_->done () : 0;
 }
 
 
 template <class LOCK_TYPE> CosTrading::Offer*
-TAO_Service_Offer_Iterator<LOCK_TYPE>::get_offer (void)
+TAO_Service_Offer_Iterator<LOCK_TYPE>::get_offer ()
 {
   return (this->offer_iter_ != 0) ? (**this->offer_iter_).int_id_ : 0;
 }
 
 template <class LOCK_TYPE> void
-TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer (void)
+TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer ()
 {
   if (this->offer_iter_ != 0)
     this->offer_iter_->advance ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 465445a518b..e79269ae7b3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -7,12 +7,12 @@ TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter)
 {
 }
 
-TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
+TAO_Offer_Iterator::~TAO_Offer_Iterator ()
 {
 }
 
 void
-TAO_Offer_Iterator::destroy (void)
+TAO_Offer_Iterator::destroy ()
 {
   // Remove self from POA
 
@@ -31,7 +31,7 @@ TAO_Query_Only_Offer_Iterator(const TAO_Property_Filter& pfilter)
 {
 }
 
-TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator(void)
+TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator()
 {
 }
 
@@ -44,7 +44,7 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id,
 }
 
 CORBA::ULong
-TAO_Query_Only_Offer_Iterator::max_left (void)
+TAO_Query_Only_Offer_Iterator::max_left ()
 {
   return static_cast<CORBA::ULong> (this->offers_.size ());
 }
@@ -71,11 +71,11 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
   return offers_in_sequence != 0;
 }
 
-TAO_Offer_Iterator_Collection::TAO_Offer_Iterator_Collection (void)
+TAO_Offer_Iterator_Collection::TAO_Offer_Iterator_Collection ()
 {
 }
 
-TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void)
+TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection ()
 {
   while (! this->iters_.is_empty ())
     {
@@ -157,7 +157,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
 }
 
 void
-TAO_Offer_Iterator_Collection::destroy (void)
+TAO_Offer_Iterator_Collection::destroy ()
 {
   // Destroy all iterators in the collection.
   for (Offer_Iters::ITERATOR iters_iter (this->iters_);
@@ -182,16 +182,16 @@ TAO_Offer_Iterator_Collection::destroy (void)
 }
 
 CORBA::ULong
-TAO_Offer_Iterator_Collection::max_left (void)
+TAO_Offer_Iterator_Collection::max_left ()
 {
   throw CosTrading::UnknownMaxLeft();
 }
 
-TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator (void)
+TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator ()
 {
 }
 
-TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
+TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator ()
 {
   int return_value = 0;
 
@@ -207,13 +207,13 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
 }
 
 CORBA::ULong
-TAO_Offer_Id_Iterator::max_left (void)
+TAO_Offer_Id_Iterator::max_left ()
 {
   return static_cast<CORBA::ULong> (this->ids_.size ());
 }
 
 void
-TAO_Offer_Id_Iterator::destroy (void)
+TAO_Offer_Id_Iterator::destroy ()
 {
   // Remove self from POA
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 4ed2f171cb5..9ae6c26fd71 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -62,8 +62,7 @@ public:
   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 (void) = 0;
 
   // BEGIN SPEC
   // The max_left operation returns the number of service offers
@@ -88,10 +87,8 @@ public:
    * END SPEC
    */
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers)
-    = 0;
+                                 CosTrading::OfferSeq_out offers) = 0;
  protected:
-
   TAO_Offer_Iterator& operator=(const TAO_Offer_Iterator&);
 
   /// The filter through which each returned offer must pass. Used to
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 6e6c27cfb33..c64338e52ed 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -16,7 +16,7 @@ TAO_Service_Type_Repository::TAO_Service_Type_Repository (ACE_Lock* lock)
              ACE_Lock_Adapter<ACE_Null_Mutex>);
 }
 
-TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
+TAO_Service_Type_Repository::~TAO_Service_Type_Repository ()
 {
   {
     // Make sure not to throw exceptions in destructors...
@@ -35,7 +35,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
 }
 
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-TAO_Service_Type_Repository::incarnation (void)
+TAO_Service_Type_Repository::incarnation ()
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 3d36b2862af..5ca9f7b1236 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Trader_Base::TAO_Trader_Base (void)
+TAO_Trader_Base::TAO_Trader_Base ()
   : trading_components_ (*this),
     import_attributes_ (*this),
     support_attributes_ (*this),
@@ -19,54 +19,54 @@ TAO_Trader_Base::TAO_Trader_Base (void)
 {
 }
 
-TAO_Trader_Base::~TAO_Trader_Base (void)
+TAO_Trader_Base::~TAO_Trader_Base ()
 {
 }
 
 TAO_Import_Attributes_i &
-TAO_Trader_Base::import_attributes (void)
+TAO_Trader_Base::import_attributes ()
 {
   return this->import_attributes_;
 }
 
 const TAO_Import_Attributes_i &
-TAO_Trader_Base::import_attributes (void) const
+TAO_Trader_Base::import_attributes () const
 {
   return this->import_attributes_;
 }
 
 TAO_Support_Attributes_i &
-TAO_Trader_Base::support_attributes (void)
+TAO_Trader_Base::support_attributes ()
 {
   return this->support_attributes_;
 }
 
 const TAO_Support_Attributes_i &
-TAO_Trader_Base::support_attributes (void) const
+TAO_Trader_Base::support_attributes () const
 {
   return this->support_attributes_;
 }
 
 TAO_Link_Attributes_i &
-TAO_Trader_Base::link_attributes (void)
+TAO_Trader_Base::link_attributes ()
 {
   return this->link_attributes_;
 }
 
 const TAO_Link_Attributes_i &
-TAO_Trader_Base::link_attributes (void) const
+TAO_Trader_Base::link_attributes () const
 {
   return this->link_attributes_;
 }
 
 TAO_Trading_Components_i &
-TAO_Trader_Base::trading_components (void)
+TAO_Trader_Base::trading_components ()
 {
   return this->trading_components_;
 }
 
 const TAO_Trading_Components_i &
-TAO_Trader_Base::trading_components (void) const
+TAO_Trader_Base::trading_components () const
 {
   return this->trading_components_;
 }
@@ -157,7 +157,7 @@ TAO_Trader_Base::is_valid_identifier_name (const char* ident)
   return return_value;
 }
 
-TAO_Lockable::~TAO_Lockable (void)
+TAO_Lockable::~TAO_Lockable ()
 {
 }
 
@@ -172,12 +172,12 @@ TAO_Support_Attributes_i (TAO_Lockable &locker)
 {
 }
 
-TAO_Support_Attributes_i::~TAO_Support_Attributes_i (void)
+TAO_Support_Attributes_i::~TAO_Support_Attributes_i ()
 {
 }
 
 CORBA::Boolean
-TAO_Support_Attributes_i::supports_modifiable_properties (void) const
+TAO_Support_Attributes_i::supports_modifiable_properties () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          0);
@@ -193,7 +193,7 @@ supports_modifiable_properties (CORBA::Boolean new_value)
 }
 
 CORBA::Boolean
-TAO_Support_Attributes_i::supports_dynamic_properties (void) const
+TAO_Support_Attributes_i::supports_dynamic_properties () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          0);
@@ -210,7 +210,7 @@ supports_dynamic_properties (CORBA::Boolean new_value)
 }
 
 CORBA::Boolean
-TAO_Support_Attributes_i::supports_proxy_offers (void) const
+TAO_Support_Attributes_i::supports_proxy_offers () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          0);
@@ -227,7 +227,7 @@ supports_proxy_offers (CORBA::Boolean new_value)
 }
 
 CosTrading::TypeRepository_ptr
-TAO_Support_Attributes_i::type_repos (void) const
+TAO_Support_Attributes_i::type_repos () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          CosTrading::TypeRepository::_nil ());
@@ -248,7 +248,7 @@ type_repos (CosTrading::TypeRepository_ptr new_value)
 }
 
 CosTradingRepos::ServiceTypeRepository_ptr
-TAO_Support_Attributes_i::service_type_repos (void) const
+TAO_Support_Attributes_i::service_type_repos () const
 {
   return this->service_type_repos_.ptr ();
 }
@@ -272,12 +272,12 @@ TAO_Import_Attributes_i (TAO_Lockable &locker)
 }
 
 
-TAO_Import_Attributes_i::~TAO_Import_Attributes_i (void)
+TAO_Import_Attributes_i::~TAO_Import_Attributes_i ()
 {
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::def_search_card (void) const
+TAO_Import_Attributes_i::def_search_card () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->def_search_card_;
@@ -295,7 +295,7 @@ TAO_Import_Attributes_i::def_search_card (CORBA::ULong new_value)
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::max_search_card (void) const
+TAO_Import_Attributes_i::max_search_card () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->max_search_card_;
@@ -313,7 +313,7 @@ TAO_Import_Attributes_i::max_search_card (CORBA::ULong new_value)
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::def_match_card (void) const
+TAO_Import_Attributes_i::def_match_card () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->def_match_card_;
@@ -331,7 +331,7 @@ TAO_Import_Attributes_i::def_match_card (CORBA::ULong new_value)
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::max_match_card (void) const
+TAO_Import_Attributes_i::max_match_card () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->max_match_card_;
@@ -348,7 +348,7 @@ TAO_Import_Attributes_i::max_match_card (CORBA::ULong new_value)
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::def_return_card (void) const
+TAO_Import_Attributes_i::def_return_card () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->def_return_card_;
@@ -366,7 +366,7 @@ TAO_Import_Attributes_i::def_return_card (CORBA::ULong new_value)
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::max_return_card (void) const
+TAO_Import_Attributes_i::max_return_card () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->max_return_card_;
@@ -383,7 +383,7 @@ TAO_Import_Attributes_i::max_return_card (CORBA::ULong new_value)
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::max_list (void) const
+TAO_Import_Attributes_i::max_list () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0);
   return this->max_list_;
@@ -397,7 +397,7 @@ TAO_Import_Attributes_i::max_list (CORBA::ULong new_value)
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::def_hop_count (void) const
+TAO_Import_Attributes_i::def_hop_count () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0);
   return this->def_hop_count_;
@@ -415,7 +415,7 @@ TAO_Import_Attributes_i::def_hop_count (CORBA::ULong new_value)
 }
 
 CORBA::ULong
-TAO_Import_Attributes_i::max_hop_count (void) const
+TAO_Import_Attributes_i::max_hop_count () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0);
   return this->max_hop_count_;
@@ -432,7 +432,7 @@ TAO_Import_Attributes_i::max_hop_count (CORBA::ULong new_value)
 }
 
 CosTrading::FollowOption
-TAO_Import_Attributes_i::def_follow_policy (void) const
+TAO_Import_Attributes_i::def_follow_policy () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only);
   return this->def_follow_policy_;
@@ -450,7 +450,7 @@ TAO_Import_Attributes_i::def_follow_policy (CosTrading::FollowOption new_value)
 }
 
 CosTrading::FollowOption
-TAO_Import_Attributes_i::max_follow_policy (void) const
+TAO_Import_Attributes_i::max_follow_policy () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only);
   return this->max_follow_policy_;
@@ -477,12 +477,12 @@ TAO_Trading_Components_i::TAO_Trading_Components_i (TAO_Lockable &locker)
 {
 }
 
-TAO_Trading_Components_i::~TAO_Trading_Components_i (void)
+TAO_Trading_Components_i::~TAO_Trading_Components_i ()
 {
 }
 
 CosTrading::Lookup_ptr
-TAO_Trading_Components_i::lookup_if (void) const
+TAO_Trading_Components_i::lookup_if () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          CosTrading::Lookup::_nil ());
@@ -497,7 +497,7 @@ TAO_Trading_Components_i::lookup_if (CosTrading::Lookup_ptr new_value)
 }
 
 CosTrading::Register_ptr
-TAO_Trading_Components_i::register_if (void) const
+TAO_Trading_Components_i::register_if () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          CosTrading::Register::_nil ());
@@ -512,7 +512,7 @@ TAO_Trading_Components_i::register_if (CosTrading::Register_ptr new_value)
 }
 
 CosTrading::Link_ptr
-TAO_Trading_Components_i::link_if (void) const
+TAO_Trading_Components_i::link_if () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          CosTrading::Link::_nil ());
@@ -527,7 +527,7 @@ TAO_Trading_Components_i::link_if (CosTrading::Link_ptr new_value)
 }
 
 CosTrading::Proxy_ptr
-TAO_Trading_Components_i::proxy_if (void) const
+TAO_Trading_Components_i::proxy_if () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          CosTrading::Proxy::_nil ());
@@ -542,7 +542,7 @@ TAO_Trading_Components_i::proxy_if (CosTrading::Proxy_ptr new_value)
 }
 
 CosTrading::Admin_ptr
-TAO_Trading_Components_i::admin_if (void) const
+TAO_Trading_Components_i::admin_if () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          CosTrading::Admin::_nil ());
@@ -563,12 +563,12 @@ TAO_Link_Attributes_i::TAO_Link_Attributes_i (TAO_Lockable &locker)
 {
 }
 
-TAO_Link_Attributes_i::~TAO_Link_Attributes_i (void)
+TAO_Link_Attributes_i::~TAO_Link_Attributes_i ()
 {
 }
 
 CosTrading::FollowOption
-TAO_Link_Attributes_i::max_link_follow_policy (void) const
+TAO_Link_Attributes_i::max_link_follow_policy () const
 {
   ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
                          CosTrading::local_only);
@@ -661,7 +661,7 @@ TAO_Trader_Factory::TAO_Trader_Factory (int& argc, ACE_TCHAR** argv)
 }
 
 TAO_Trader_Factory::TAO_TRADER *
-TAO_Trader_Factory::manufacture_trader (void)
+TAO_Trader_Factory::manufacture_trader ()
 {
   typedef TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex> TRADER;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 7a676905862..67941639ea2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -22,7 +22,7 @@ TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Lookup (void)
+TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Lookup ()
 {
   ACE_GUARD (TRADER_LOCK_TYPE, trader_mon, this->lock_);
   for (Request_Ids::ITERATOR riter (this->request_ids_);
@@ -790,7 +790,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::TAO_Register (TAO_Trader<TRADER_LO
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Register (void)
+TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Register ()
 {
 }
 
@@ -1162,13 +1162,13 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void)
+TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin ()
 {
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq *
-TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (void)
+TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem ()
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0);
 
@@ -1454,7 +1454,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::TAO_Link (TAO_Trader<TRADER_LOCK_TYPE,
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Link (void)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Link ()
 {
 }
 
@@ -1564,7 +1564,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name)
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::LinkNameSeq*
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (void)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links ()
 {
   // Allocate space for the link names.
   size_t size = this->links_.current_size ();
@@ -1632,7 +1632,7 @@ TAO_Proxy (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Proxy (void)
+TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Proxy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 0221981bceb..f252f630e24 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -117,13 +117,13 @@ TAO_Policy_Creator::request_id (const CosTrading::Admin::OctetSeq& request_id)
   policy.value <<= request_id;
 }
 
-TAO_Policy_Creator::operator const CosTrading::PolicySeq& (void) const
+TAO_Policy_Creator::operator const CosTrading::PolicySeq& () const
 {
   return this->policies_;
 }
 
 const CosTrading::PolicySeq&
-TAO_Policy_Creator::policy_seq (void) const
+TAO_Policy_Creator::policy_seq () const
 {
   return this->policies_;
 }
@@ -214,7 +214,7 @@ TAO_Property_Evaluator(CosTrading::Offer& offer,
       this->dp_cache_[i] = 0;
 }
 
-TAO_Property_Evaluator::~TAO_Property_Evaluator (void)
+TAO_Property_Evaluator::~TAO_Property_Evaluator ()
 {
   // Clean up the results of any dynamic properties.
   for (CORBA::ULong i = 0; i < this->props_.length (); i++)
@@ -424,7 +424,7 @@ TAO_Property_Evaluator_By_Name::get_property (const char* property_name)
   return property;
 }
 
-TAO_Dynamic_Property::~TAO_Dynamic_Property (void)
+TAO_Dynamic_Property::~TAO_Dynamic_Property ()
 {
 }
 
@@ -462,7 +462,7 @@ construct_dynamic_prop (const char* name,
 }
 
 void
-TAO_Dynamic_Property::destroy (void)
+TAO_Dynamic_Property::destroy ()
 {
   if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
     {
@@ -553,7 +553,7 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
     }
 }
 
-TAO_Policies::~TAO_Policies (void)
+TAO_Policies::~TAO_Policies ()
 {
 }
 
@@ -610,19 +610,19 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol) const
 }
 
 CORBA::ULong
-TAO_Policies::search_card (void) const
+TAO_Policies::search_card () const
 {
   return this->ulong_prop (SEARCH_CARD);
 }
 
 CORBA::ULong
-TAO_Policies::match_card (void) const
+TAO_Policies::match_card () const
 {
   return this->ulong_prop (MATCH_CARD);
 }
 
 CORBA::ULong
-TAO_Policies::return_card (void) const
+TAO_Policies::return_card () const
 {
   return this->ulong_prop (RETURN_CARD);
 }
@@ -679,32 +679,32 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol) const
 
 
 CORBA::Boolean
-TAO_Policies::use_modifiable_properties (void) const
+TAO_Policies::use_modifiable_properties () const
 {
   return this->boolean_prop (USE_MODIFIABLE_PROPERTIES);
 }
 
 CORBA::Boolean
-TAO_Policies::use_dynamic_properties (void) const
+TAO_Policies::use_dynamic_properties () const
 {
   return this->boolean_prop (USE_DYNAMIC_PROPERTIES);
 }
 
 CORBA::Boolean
-TAO_Policies::use_proxy_offers (void) const
+TAO_Policies::use_proxy_offers () const
 {
   return this->boolean_prop (USE_PROXY_OFFERS);
 }
 
 CORBA::Boolean
-TAO_Policies::exact_type_match (void) const
+TAO_Policies::exact_type_match () const
 {
   return this->boolean_prop (EXACT_TYPE_MATCH);
 }
 
 
 const CosTrading::TraderName*
-TAO_Policies::starting_trader (void) const
+TAO_Policies::starting_trader () const
 {
   const CosTrading::TraderName* trader_name = 0;
 
@@ -731,7 +731,7 @@ TAO_Policies::starting_trader (void) const
 }
 
 CosTrading::FollowOption
-TAO_Policies::link_follow_rule (void) const
+TAO_Policies::link_follow_rule () const
 {
   CosTrading::FollowOption return_value =
     this->trader_.import_attributes ().def_follow_policy ();
@@ -783,13 +783,13 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) con
 }
 
 CORBA::ULong
-TAO_Policies::hop_count (void) const
+TAO_Policies::hop_count () const
 {
   return this->ulong_prop (HOP_COUNT);
 }
 
 const CosTrading::Admin::OctetSeq*
-TAO_Policies::request_id (void) const
+TAO_Policies::request_id () const
 {
   const CosTrading::Admin::OctetSeq* request_id = 0;
 
@@ -1023,7 +1023,7 @@ TAO_Offer_Modifier (const char* type_name,
     }
 }
 
-TAO_Offer_Modifier::~TAO_Offer_Modifier (void)
+TAO_Offer_Modifier::~TAO_Offer_Modifier ()
 {
   for (TAO_Typecode_Table::iterator type_iter (this->prop_types_);
        ! type_iter.done ();
@@ -1296,13 +1296,13 @@ TAO_Offer_Filter::ok_to_consider (CosTrading::Offer* offer)
 }
 
 CORBA::Boolean
-TAO_Offer_Filter::ok_to_consider_more (void)
+TAO_Offer_Filter::ok_to_consider_more ()
 {
   return this->search_card_ > 0 && this->match_card_ > 0;
 }
 
 void
-TAO_Offer_Filter::matched_offer (void)
+TAO_Offer_Filter::matched_offer ()
 {
   this->match_card_--;
   this->return_card_--;
@@ -1323,19 +1323,19 @@ TAO_Offer_Filter::matched_offer (void)
 }
 
 CORBA::ULong
-TAO_Offer_Filter::search_card_remaining (void) const
+TAO_Offer_Filter::search_card_remaining () const
 {
   return this->search_card_;
 }
 
 CORBA::ULong
-TAO_Offer_Filter::match_card_remaining (void) const
+TAO_Offer_Filter::match_card_remaining () const
 {
   return this->match_card_;
 }
 
 CosTrading::PolicyNameSeq*
-TAO_Offer_Filter::limits_applied (void)
+TAO_Offer_Filter::limits_applied ()
 {
   int i = 0;
   CORBA::ULong size = static_cast<CORBA::ULong> (this->limits_.size ());
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 6e53cce11c5..cf24bbcd1d3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -179,7 +179,6 @@ class TAO_Trading_Serv_Export TAO_Dynamic_Property
   : public virtual POA_CosTradingDynamic::DynamicPropEval
 {
 public:
-
   TAO_Dynamic_Property (void) {}
   virtual ~TAO_Dynamic_Property (void);
 
@@ -188,8 +187,7 @@ public:
   /// Dynamic property evaluation call-back method.
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
-                             const CORBA::Any& extra_info)
-    = 0;
+                             const CORBA::Any& extra_info) = 0;
 
   /// Method to construct a dynamic property structure suitable for
   /// exporting in a CosTrading::PropertyStruct to the Trading Service.
@@ -199,7 +197,6 @@ public:
                           const CORBA::Any& extra_info);
 
 private:
-
   CosTradingDynamic::DynamicPropEval_var prop_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index c321b73ab89..6c2fb4ef839 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -30,7 +30,7 @@
 
 
 
-TAO_Trading_Loader::TAO_Trading_Loader (void)
+TAO_Trading_Loader::TAO_Trading_Loader ()
   : federate_ (0),
     ior_output_file_ (0),
     bootstrapper_ (0)
@@ -74,7 +74,7 @@ TAO_Trading_Loader::TAO_Trading_Loader (void)
     }
 }
 
-TAO_Trading_Loader::~TAO_Trading_Loader (void)
+TAO_Trading_Loader::~TAO_Trading_Loader ()
 {
   // Destructor
 }
@@ -112,7 +112,7 @@ TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_Trading_Loader::fini (void)
+TAO_Trading_Loader::fini ()
 {
   try
     {
@@ -178,7 +178,7 @@ TAO_Trading_Loader::fini (void)
 }
 
 int
-TAO_Trading_Loader::run (void)
+TAO_Trading_Loader::run ()
 {
   int return_value =
     this->orb_manager_.run ();
@@ -198,9 +198,9 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
   this->orb_manager_.activate_poa_manager ();
 
   // Create a Trader Object and set its Service Type Repository.
-  auto_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
+  std::unique_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
 
-  this->trader_ = auto_trader;
+  this->trader_ = std::move(auto_trader);
 
   TAO_Support_Attributes_i &sup_attr =
     this->trader_->support_attributes ();
@@ -266,7 +266,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
 }
 
 int
-TAO_Trading_Loader::bootstrap_to_federation (void)
+TAO_Trading_Loader::bootstrap_to_federation ()
 {
   // If all traders follow this strategy, it creates a complete graph
   // of all known traders on a multicast network.
@@ -364,7 +364,7 @@ TAO_Trading_Loader::bootstrap_to_federation (void)
 }
 
 int
-TAO_Trading_Loader::init_multicast_server (void)
+TAO_Trading_Loader::init_multicast_server ()
 {
 #if defined (ACE_HAS_IP_MULTICAST)
   // Get reactor instance from TAO.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index 0eae04554d0..6006017b4be 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -27,7 +27,7 @@
 
 #include "tao/Object_Loader.h"
 #include "tao/Utils/ORB_Manager.h"
-#include "ace/Auto_Ptr.h"
+#include <utility>
 
 class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader
 {
@@ -56,7 +56,6 @@ public:
                                    ACE_TCHAR *argv[]);
 
 protected:
-
   /// Enable the Trading Service to answer multicast requests for its
   /// IOR.
   int init_multicast_server (void);
@@ -71,7 +70,7 @@ protected:
   TAO_ORB_Manager orb_manager_;
 
   /// Pointer to the linked trader.
-  auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader_;
+  std::unique_ptr<TAO_Trader_Factory::TAO_TRADER> trader_;
 
   /// Service Type Repository used by the trading service.
   TAO_Service_Type_Repository type_repos_;
@@ -96,9 +95,10 @@ protected:
   CORBA::Boolean bootstrapper_;
 
 private:
-  // Disallow copying and assignment.
-  TAO_Trading_Loader (const TAO_Trading_Loader &);
-  TAO_Trading_Loader &operator= (const TAO_Trading_Loader &);
+  TAO_Trading_Loader (const TAO_Trading_Loader &) = delete;
+  TAO_Trading_Loader &operator= (const TAO_Trading_Loader &) = delete;
+  TAO_Trading_Loader (TAO_Trading_Loader &&) = delete;
+  TAO_Trading_Loader &operator= (TAO_Trading_Loader &&) = delete;
 };
 
 ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index c52581f9fcd..d13ec9d6a4c 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -46,7 +46,6 @@ class ServerRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   ServerRequestInterceptor (void);
 
@@ -81,7 +80,6 @@ public:
   CORBA::Long request_count (void);
 
 protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce correct memory management via
@@ -90,10 +88,8 @@ protected:
   ~ServerRequestInterceptor (void);
 
 private:
-
   /// The number of requests that have arrived on the server.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> request_count_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl
index ae8ac9b2f88..8cfae24888d 100755
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 #
 
 use English;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl
index 193c196319f..16726a37d2a 100755
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 #
 
 foreach $t (@ARGV) {
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/README b/TAO/orbsvcs/tests/Bug_2248_Regression/README
index 83b9b9e3d0d..5460419e89b 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/README
@@ -1,7 +1,7 @@
 
 
 This test is regression for bug 2248
-http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2248
+http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2248
 
 To run:
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/README b/TAO/orbsvcs/tests/Bug_2285_Regression/README
index 91dfe60cbd5..e2f8f197abd 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/README
@@ -1,6 +1,6 @@
 
 
-See http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2285 for more.
+See http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2285 for more.
 
 These two test scenarios test that the following FT spec conditions are met:
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/README b/TAO/orbsvcs/tests/Bug_2287_Regression/README
index e3ce00ed60a..7ba1ebb7956 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/README
@@ -2,7 +2,7 @@
 
 This test provides regression coverage for bugzilla #2287.
 
-See http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2287 for more.
+See http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2287 for more.
 
 The server installs a server request interceptor and persistent servant and writes out an IOGR for itself.
 The client installs client side FT support and invokes the method "throw_location_forward" on the IOGR.
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/README b/TAO/orbsvcs/tests/Bug_2925_Regression/README
index 259005e721b..1d643442272 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/README
@@ -1,6 +1,6 @@
 
 
-Read http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2925 for
+Read http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2925 for
 more details.
 
 This test uses dscp over both IPv4 and IPv6 and basically there is
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/README b/TAO/orbsvcs/tests/Bug_3215_Regression/README
index 218a1cd32a1..28bd9c7f3d7 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/README
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/README
@@ -44,7 +44,7 @@ The below is the original documentation for the bug #2287 test between []'s for
 
 [This test provides regression coverage for bugzilla #2287.
 
-See http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2287 for more.
+See http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2287 for more.
 
 The server installs a server request interceptor and persistent servant and writes out an IOGR for itself.
 The client installs client side FT support and invokes the method "throw_location_forward" on the IOGR.
diff --git a/TAO/orbsvcs/tests/FT_App/README b/TAO/orbsvcs/tests/FT_App/README
index 55c018fc848..ae8f11fdf2c 100644
--- a/TAO/orbsvcs/tests/FT_App/README
+++ b/TAO/orbsvcs/tests/FT_App/README
@@ -26,7 +26,7 @@ Commands consist of a single character followed by an optional number
 (with no space between).  For example: =10 sets the value of the counter
 to 10.  +5 increments the counter by 5 (thereby setting the value to 15).
 
-The '?' commmand lists the possible commands and their options.
+The '?' command lists the possible commands and their options.
 
 Additional programs:
  ft_notifier is a stub implementation of a fault notifier for testing fault detectors.
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
index ffa68678b76..68dc7ab118a 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
@@ -6,7 +6,7 @@
 #include "HelloS.h"
 #include "ace/Atomic_Op_T.h"
 
-extern ACE_Atomic_Op< TAO_SYNCH_MUTEX, u_long > Number_of_Problems;
+extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, u_long> Number_of_Problems;
 
 class UIPMC_Object_Impl : public virtual POA_Test::UIPMC_Object
 {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 420cf902d0e..ebff1041c48 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -32,8 +32,7 @@ public:
 
   // = SequencePushConsumer methods
   virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications
-      );
+        const CosNotification::EventBatch & notifications);
 
 protected:
   Sequence* test_client_;
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index b1d8451a31e..02c8642afea 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -170,7 +170,7 @@ Client::test_get_all_property_names (void)
   CORBA::ULong how_many = num_of_properties / 2;
 
   // The extra ptr's and out's required to avoind SunnCC's warning
-  // when foo.out () is passed to a funtion.
+  // when foo.out () is passed to a function.
   CosPropertyService::PropertyNames_var names_var;
   CosPropertyService::PropertyNames     *names_ptr = 0;
   CosPropertyService::PropertyNames_out names_out (names_ptr);
@@ -502,7 +502,7 @@ Client::test_get_all_properties (void)
           CosPropertyService::Property* property_ptr = 0;
           CosPropertyService::Property_out property_out (property_ptr);
 
-          // Call the funtion.
+          // Call the function.
           CORBA::Boolean next_one_result = iterator->next_one (property_out);
 
           // Get the value to the _var variable.
diff --git a/TAO/orbsvcs/tests/Simple_Naming/README b/TAO/orbsvcs/tests/Simple_Naming/README
index be49d98e286..fe856d9e10b 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/README
+++ b/TAO/orbsvcs/tests/Simple_Naming/README
@@ -156,7 +156,7 @@ root->resolve (level1/level2/foo) to make sure correct reference is returned.
 
 Expected Output:
 
-All funtions work properly
+All functions work properly
 ********************************************
 
 Exceptions Test.
diff --git a/TAO/performance-tests/README b/TAO/performance-tests/README
index 89b86cc1806..2873606c899 100644
--- a/TAO/performance-tests/README
+++ b/TAO/performance-tests/README
@@ -1,38 +1,34 @@
-
-
 This directory contains a number of tests that illustrate the
-performance of TAO and other ORBs.  The individual directories contain
+performance of TAO and other ORBs. The individual directories contain
 READMEs on how to run the following performance tests:
 
-        . Cubit
-
-          This directory contains performance tests for TAO that
-          measure the latency, jitter, CPU utilization, and
-          priority inversion of these ORBs.
-
-        . Latency
+. Cubit
 
-          A set of performance tests that measure throughput, latency
-          and jitter.
+  This directory contains performance tests for TAO that
+  measure the latency, jitter, CPU utilization, and
+  priority inversion of these ORBs.
 
-        . POA
+. Latency
 
-          Various tests of the TAO's POA performance.
+  A set of performance tests that measure throughput, latency
+  and jitter.
 
-        . Pluggable
+. POA
 
-          The tests in this directory time the latency contributed by
-          various parts of the ORB, but mostly the emphasis is on the
-          contribution due to the pluggable protocols code.
+  Various tests of the TAO's POA performance.
 
-        . RTCorba
+. Pluggable
 
-          Tests for various (TAO-specific) real-time features. Tests
-          for RT CORBA spec real-time features can be found in
-          $TAO_ROOT/tests/RTCORBA.
+  The tests in this directory time the latency contributed by
+  various parts of the ORB, but mostly the emphasis is on the
+  contribution due to the pluggable protocols code.
 
-        . Throughput
+. RTCorba
 
-          Throughput tests (bytes per second) for TAO.
+  Tests for various (TAO-specific) real-time features. Tests
+  for RT CORBA spec real-time features can be found in
+  $TAO_ROOT/tests/RTCORBA.
 
+. Throughput
 
+  Throughput tests (bytes per second) for TAO.
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index a1605345254..fc917331b46 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void)
+TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase ()
 {
 }
 
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 2fb670808a4..9b53e14563b 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -70,25 +70,25 @@ class TAO_Export TAO_Abstract_ServantBase
 {
 public:
   /// Destructor
-  virtual ~TAO_Abstract_ServantBase (void);
+  virtual ~TAO_Abstract_ServantBase ();
 
   /// Local implementation of the CORBA::Object::_is_a method.
   virtual CORBA::Boolean _is_a (const char* logical_type_id) = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   /// Default @c _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (void) = 0;
+  virtual CORBA::Boolean _non_existent () = 0;
 
 #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Query the Interface Repository.
-  virtual CORBA::InterfaceDef_ptr _get_interface (void) = 0;
+  virtual CORBA::InterfaceDef_ptr _get_interface () = 0;
 
   /// Default @c _get_component: always returns nil.
-  virtual CORBA::Object_ptr _get_component (void) = 0;
+  virtual CORBA::Object_ptr _get_component () = 0;
 #endif
 
   /// Default @c _repository_id
-  virtual char * _repository_id (void) = 0;
+  virtual char * _repository_id () = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   //@{
@@ -96,21 +96,21 @@ public:
    * @name Reference Counting Operations
    */
   /// Increase reference count by one.
-  virtual void _add_ref (void) = 0;
+  virtual void _add_ref () = 0;
 
   /**
    * Decreases reference count by one; if the resulting reference
    * count equals zero, _remove_ref invokes delete on its this pointer
    * in order to destroy the servant.
    */
-  virtual void _remove_ref (void) = 0;
+  virtual void _remove_ref () = 0;
 
   /// Returns the current reference count value.
-  virtual CORBA::ULong _refcount_value (void) const = 0;
+  virtual CORBA::ULong _refcount_value () const = 0;
   //@}
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (void) = 0;
+  virtual TAO_Stub *_create_stub () = 0;
 
   /// Find an operation in the operation table and return a
   /// TAO_Skeleton which can be used to make upcalls
@@ -137,7 +137,7 @@ public:
 
 protected:
   /// Default constructor, only derived classes can be created.
-  TAO_Abstract_ServantBase (void);
+  TAO_Abstract_ServantBase ();
 
   /// Copy constructor, protected so no instances can be created.
   TAO_Abstract_ServantBase (const TAO_Abstract_ServantBase &);
@@ -157,7 +157,7 @@ protected:
     TAO::Portable_Server::Servant_Upcall *servant_upcall) = 0;
 
   /// Get this interface's repository id (TAO specific).
-  virtual const char *_interface_repository_id (void) const = 0;
+  virtual const char *_interface_repository_id () const = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp
index 26a7f1d33d9..6c1fe0bad53 100644
--- a/TAO/tao/Acceptor_Filter.cpp
+++ b/TAO/tao/Acceptor_Filter.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void)
+TAO_Acceptor_Filter::~TAO_Acceptor_Filter ()
 {
 }
 
diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
index d5c4415de3c..1f1f1d095ac 100644
--- a/TAO/tao/Acceptor_Filter.h
+++ b/TAO/tao/Acceptor_Filter.h
@@ -44,7 +44,7 @@ class TAO_Acceptor;
 class TAO_Export TAO_Acceptor_Filter
 {
 public:
-  virtual ~TAO_Acceptor_Filter (void);
+  virtual ~TAO_Acceptor_Filter ();
 
   /**
    * Populate @a mprofile with profiles. Profiles are created for
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 9adc59e4f45..f502fe89c0d 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -24,13 +24,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Acceptor_Registry::TAO_Acceptor_Registry (void)
-  : acceptors_ (0),
+TAO_Acceptor_Registry::TAO_Acceptor_Registry ()
+  : acceptors_ (nullptr),
     size_ (0)
 {
 }
 
-TAO_Acceptor_Registry::~TAO_Acceptor_Registry (void)
+TAO_Acceptor_Registry::~TAO_Acceptor_Registry ()
 {
   this->close_all ();
 
@@ -38,7 +38,7 @@ TAO_Acceptor_Registry::~TAO_Acceptor_Registry (void)
 }
 
 size_t
-TAO_Acceptor_Registry::endpoint_count (void)
+TAO_Acceptor_Registry::endpoint_count ()
 {
   size_t count = 0;
   const TAO_AcceptorSetIterator end = this->end ();
@@ -77,7 +77,7 @@ TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile)
               //       operation if the below is_collocated() call
               //       also executes a loop.
               for (TAO_Endpoint *endp = pf->endpoint ();
-                   endp != 0;
+                   endp != nullptr;
                    endp = endp->next ())
                 {
                   if ((*i)->is_collocated (endp))
@@ -106,7 +106,7 @@ TAO_Acceptor_Registry::get_acceptor (CORBA::ULong tag)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 int
@@ -121,7 +121,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
 
       // All TAO pluggable protocols are expected to have the ability
       // to create a default endpoint.
-      && this->open_default (orb_core, reactor, 0) == -1)
+      && this->open_default (orb_core, reactor, nullptr) == -1)
     {
       throw ::CORBA::INTERNAL (
         CORBA::SystemException::_tao_minor_code (
@@ -135,7 +135,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
   size_t acceptor_count = 0;
   TAO_EndpointSetIterator endpts (endpoint_set);
 
-  for (ACE_CString *ep = 0;
+  for (ACE_CString *ep = nullptr;
        endpts.next (ep) != 0;
        endpts.advance ())
     {
@@ -199,7 +199,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
         ep->c_str () + ACE_OS::strlen (ep->c_str ());
 
       for (const char *e = ACE_OS::strchr (ep->c_str (), ',');
-           e != 0 && e != ep_end;
+           e != nullptr && e != ep_end;
            e = ACE_OS::strchr (e, ','))
         {
           ++acceptor_count;
@@ -209,7 +209,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
 
   // The array containing the TAO_Acceptors will never contain more
   // than the number of endpoints stored in TAO_ORB_Parameters.
-  if (this->acceptors_ == 0)
+  if (this->acceptors_ == nullptr)
     {
       ACE_NEW_THROW_EX (this->acceptors_,
                         TAO_Acceptor *[acceptor_count],
@@ -222,7 +222,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
 
   TAO_EndpointSetIterator endpoints (endpoint_set);
 
-  for (ACE_CString *endpoint = 0;
+  for (ACE_CString *endpoint = nullptr;
        endpoints.next (endpoint) != 0;
        endpoints.advance ())
     {
@@ -482,7 +482,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
   // endpoints were specified by the user, meaning that the number of
   // acceptors will never be more than the number of loaded protocols
   // in the ORB core.
-  if (this->acceptors_ == 0)
+  if (this->acceptors_ == nullptr)
     {
       ACE_NEW_RETURN (this->acceptors_,
                       TAO_Acceptor *[pfs->size ()],
@@ -552,7 +552,7 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
   // Make an acceptor
   TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor ();
 
-  if (acceptor == 0)
+  if (acceptor == nullptr)
     {
       if (TAO_debug_level > 0)
         {
@@ -611,13 +611,13 @@ TAO_Acceptor_Registry::open_default_i (TAO_ORB_Core *orb_core,
 }
 
 int
-TAO_Acceptor_Registry::close_all (void)
+TAO_Acceptor_Registry::close_all ()
 {
   const TAO_AcceptorSetIterator end = this->end ();
 
   for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i)
     {
-      if (*i != 0)
+      if (*i != nullptr)
         {
           (*i)->close ();
           delete *i;
@@ -679,14 +679,14 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
   ACE_CString options_tmp;
   this->extract_endpoint_options (addrs, options_tmp, (*factory)->factory ());
 
-  const char *options = 0;
+  const char *options = nullptr;
 
   if (options_tmp.length () > 0)
     {
       options = options_tmp.c_str ();
     }
 
-  char *last_addr = 0;
+  char *last_addr = nullptr;
   ACE_Auto_Basic_Array_Ptr<char> addr_str (addrs.rep ());
 
   const char *astr = ACE_OS::strtok_r (addr_str.get (), ",", &last_addr);
@@ -699,11 +699,11 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
       // possible for astr to be 0.  This indicates that
       // the user is requesting the default endpoint for
       // the specified protocol.
-      ACE_CString address (astr == 0 ? "" : astr);
+      ACE_CString address (astr == nullptr ? "" : astr);
 
       TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor ();
 
-      if (acceptor != 0)
+      if (acceptor != nullptr)
         {
           // Extract the desired endpoint/protocol version if one
           // exists.
@@ -878,7 +878,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
             CORBA::COMPLETED_NO);
         }
     }
-  while (astr != 0 && (astr = ACE_OS::strtok_r (0, ",", &last_addr)) != 0);
+  while (astr != nullptr && (astr = ACE_OS::strtok_r (nullptr, ",", &last_addr)) != nullptr);
 
   return 0;
 }
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 771982dd41e..dc0124ae18a 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -60,10 +60,10 @@ class TAO_Export TAO_Acceptor_Registry
 {
 public:
   ///  Default constructor.
-  TAO_Acceptor_Registry (void);
+  TAO_Acceptor_Registry ();
 
   ///  Default destructor.
-  ~TAO_Acceptor_Registry (void);
+  ~TAO_Acceptor_Registry ();
 
   /// Initialize all registered acceptors.  Return -1 on error.
   int open (TAO_ORB_Core *orb_core,
@@ -72,10 +72,10 @@ public:
             bool ignore_address);
 
   /// Close all open acceptors.
-  int close_all (void);
+  int close_all ();
 
   /// Returns the total number of endpoints in all of its acceptors.
-  size_t endpoint_count (void);
+  size_t endpoint_count ();
 
   /// Check if there is at least one profile in @a mprofile that
   /// corresponds to a collocated object.
@@ -85,8 +85,8 @@ public:
   TAO_Acceptor *get_acceptor (CORBA::ULong tag);
 
   // = Iterator.
-  TAO_AcceptorSetIterator begin (void);
-  TAO_AcceptorSetIterator end (void);
+  TAO_AcceptorSetIterator begin ();
+  TAO_AcceptorSetIterator end ();
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry &))
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index b77750e0b27..bc5ff33898d 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Adapter::~TAO_Adapter (void)
+TAO_Adapter::~TAO_Adapter ()
 {
 }
 
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index 41f12d50af0..e9f0556a7d5 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -45,10 +45,10 @@ class TAO_ServerRequest;
 class TAO_Export TAO_Adapter
 {
 public:
-  virtual ~TAO_Adapter (void);
+  virtual ~TAO_Adapter ();
 
   /// Initialize the Adapter
-  virtual void open (void) = 0;
+  virtual void open () = 0;
 
   /// The ORB is shutting down, destroy any resources attached to this
   /// adapter.
@@ -63,7 +63,7 @@ public:
    * Adapters at higher priority are used first, the first adapter
    * that matches a key is used to dispatch a request.
    */
-  virtual int priority (void) const = 0;
+  virtual int priority () const = 0;
 
   /// Return the status....
   virtual int dispatch (TAO::ObjectKey &key,
@@ -94,14 +94,14 @@ public:
 
   /// Return the name, i.e. the object id used to resolve it in the
   /// ORB.
-  virtual const char *name (void) const = 0;
+  virtual const char *name () const = 0;
 
   /**
    * Return the root of the Object Adapter.
    * Each adapter defines its own IDL interface accessed through the
    * method above.
    */
-  virtual CORBA::Object_ptr root (void) = 0;
+  virtual CORBA::Object_ptr root () = 0;
 
   /// Create a collocated object using the given profile and stub.
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp
index 20a5f497a1a..3485f9913da 100644
--- a/TAO/tao/Adapter_Factory.cpp
+++ b/TAO/tao/Adapter_Factory.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Adapter_Factory::~TAO_Adapter_Factory (void)
+TAO_Adapter_Factory::~TAO_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/Adapter_Factory.h b/TAO/tao/Adapter_Factory.h
index 876864a2240..20105ad3964 100644
--- a/TAO/tao/Adapter_Factory.h
+++ b/TAO/tao/Adapter_Factory.h
@@ -33,7 +33,7 @@ class TAO_Export TAO_Adapter_Factory : public ACE_Service_Object
 {
 public:
   /// Destructor
-  virtual ~TAO_Adapter_Factory (void);
+  virtual ~TAO_Adapter_Factory ();
 
   /// Create a new adapter
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0;
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index e6c04ff658d..df2ab410265 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -15,13 +15,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *)
   : adapters_capacity_ (16), // @@ Make it configurable
     adapters_count_ (0),
-    adapters_ (0)
+    adapters_ (nullptr)
 {
   ACE_NEW (this->adapters_,
            TAO_Adapter*[this->adapters_capacity_]);
 }
 
-TAO_Adapter_Registry::~TAO_Adapter_Registry (void)
+TAO_Adapter_Registry::~TAO_Adapter_Registry ()
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     delete this->adapters_[i];
@@ -67,7 +67,7 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter)
   if (this->adapters_capacity_ == this->adapters_count_)
     {
       this->adapters_capacity_ *= 2;
-      TAO_Adapter **tmp = 0;
+      TAO_Adapter **tmp = nullptr;
       ACE_NEW_THROW_EX (tmp,
                         TAO_Adapter*[this->adapters_capacity_],
                         CORBA::NO_MEMORY ());
@@ -126,7 +126,7 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
     {
       CORBA::Object_ptr x =
         this->adapters_[i]->create_collocated_object (stub, mprofile);
-      if (x != 0)
+      if (x != nullptr)
         {
           if (!stub->collocated_servant ())
             {
@@ -145,7 +145,7 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
           return x;
         }
     }
-  return 0;
+  return nullptr;
 }
 
 CORBA::Long
@@ -174,7 +174,7 @@ TAO_Adapter_Registry::find_adapter (const char *name) const
     if (ACE_OS::strcmp ((*i)->name (), name) == 0)
       return *i;
 
-  return 0;
+  return nullptr;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h
index 421fc0b234a..037f59e23d2 100644
--- a/TAO/tao/Adapter_Registry.h
+++ b/TAO/tao/Adapter_Registry.h
@@ -51,7 +51,7 @@ public:
   explicit TAO_Adapter_Registry (TAO_ORB_Core *);
 
   /// Close the
-  ~TAO_Adapter_Registry (void);
+  ~TAO_Adapter_Registry ();
 
   /**
    * Close each of of the Adapters and then cleanup the Registry.
diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h
index c4b68cd521f..6209d77710e 100644
--- a/TAO/tao/Allocator.h
+++ b/TAO/tao/Allocator.h
@@ -35,7 +35,7 @@ namespace TAO
   {
   public:
 
-    virtual ~TAO_Allocator (void) {}
+    virtual ~TAO_Allocator () {}
 
     virtual handler_type *allocate () = 0;
     virtual void release (handler_type *ptr) = 0;
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
index d617283dbb0..4b525902eb6 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -66,8 +66,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -82,10 +82,10 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::TypeCode_ptr content_type_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::TypeCode_ptr content_type_i () const;
 
     private:
       /// Base attributes for this @c TypeCode containing the
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
index 6a89a9dcb7b..48e0a7a074e 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -57,14 +57,14 @@ TAO::TypeCode::Alias<char const *,
 void
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                     TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
+                     TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -100,7 +100,7 @@ TAO::TypeCode::Alias<char const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const
+                     TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -132,7 +132,7 @@ TAO::TypeCode::Alias<char const *,
 char const *
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::id_i (void) const
+                     TAO::Null_RefCount_Policy>::id_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -142,7 +142,7 @@ TAO::TypeCode::Alias<char const *,
 char const *
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::name_i (void) const
+                     TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -152,7 +152,7 @@ TAO::TypeCode::Alias<char const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::content_type_i (void) const
+                     TAO::Null_RefCount_Policy>::content_type_i () const
 {
   return
      CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
index 05a8f675fac..96c9bac0238 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
@@ -69,8 +69,8 @@ namespace TAO
        */
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -85,10 +85,10 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::TypeCode_ptr content_type_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::TypeCode_ptr content_type_i () const;
 
     private:
       /// Base attributes for this @c TypeCode containing the
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index b74124189a3..45e7c8c7c51 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -23,7 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 using namespace TAO;
 
-CORBA::Any::Any (void)
+CORBA::Any::Any ()
   : impl_ (0)
 {
 }
@@ -37,7 +37,7 @@ CORBA::Any::Any (const CORBA::Any &rhs)
     }
 }
 
-CORBA::Any::~Any (void)
+CORBA::Any::~Any ()
 {
   if (this->impl_ != 0)
     {
@@ -80,7 +80,7 @@ CORBA::Any::replace (TAO::Any_Impl *new_impl)
 }
 
 CORBA::TypeCode_ptr
-CORBA::Any::type (void) const
+CORBA::Any::type () const
 {
   if (this->impl_ != 0)
     {
@@ -91,7 +91,7 @@ CORBA::Any::type (void) const
 }
 
 CORBA::TypeCode_ptr
-CORBA::Any::_tao_get_typecode (void) const
+CORBA::Any::_tao_get_typecode () const
 {
   if (this->impl_ != 0)
     {
@@ -116,7 +116,7 @@ CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc)
 }
 
 int
-CORBA::Any::_tao_byte_order (void) const
+CORBA::Any::_tao_byte_order () const
 {
   if (this->impl_ != 0)
     {
diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h
index 2f644c9ad78..9f879820950 100644
--- a/TAO/tao/AnyTypeCode/Any.h
+++ b/TAO/tao/AnyTypeCode/Any.h
@@ -66,13 +66,13 @@ namespace CORBA
     typedef Any_var _var_type;
     typedef Any_out _out_type;
 
-    Any (void);
+    Any ();
     Any (const Any &);
 
-    ~Any (void);
+    ~Any ();
 
     Any &operator= (const Any &);
-    TAO::Any_Impl *impl (void) const;
+    TAO::Any_Impl *impl () const;
 
     /// Used in our destruction if we ourselves are stored in an Any.
     static void _tao_any_destructor (void *);
@@ -146,19 +146,19 @@ namespace CORBA
     void replace (TAO::Any_Impl *);
 
     /// Return TypeCode of the element stored in the Any.
-    TypeCode_ptr type (void) const;
+    TypeCode_ptr type () const;
 
     /// For use along with <<= of a value of aliased type when the alias must
     /// be preserved.
     void type (TypeCode_ptr);
 
     /// TAO extension, does not return a duplicate.
-    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
+    CORBA::TypeCode_ptr _tao_get_typecode () const;
 
     /// TAO extension.
     void _tao_set_typecode (const CORBA::TypeCode_ptr);
 
-    int _tao_byte_order (void) const;
+    int _tao_byte_order () const;
 
   private:
     CORBA::Boolean checked_to_object (CORBA::Object_ptr &) const;
@@ -184,10 +184,10 @@ namespace CORBA
   class TAO_AnyTypeCode_Export Any_var
   {
   public:
-    Any_var (void);
+    Any_var ();
     Any_var (Any *a);
     Any_var (const Any_var &);
-    ~Any_var (void);
+    ~Any_var ();
 
     Any_var &operator= (Any *);
 
@@ -200,7 +200,7 @@ namespace CORBA
     Any_var &operator= (const Any_var &);
 
     /// Arrow operator (smart pointer).
-    Any *operator-> (void);
+    Any *operator-> ();
 
     /// Cast.
     operator const Any *() const;
@@ -209,19 +209,19 @@ namespace CORBA
     operator Any *&();
 
     /// For in Any parameter.
-    const Any &in (void) const;
+    const Any &in () const;
 
     /// For inout Any parameter.
-    Any &inout (void);
+    Any &inout ();
 
     /// For out Any parameter.
-    Any *&out (void);
+    Any *&out ();
 
     /// For Any return type.
-    Any *_retn (void);
+    Any *_retn ();
 
     /// TAO specific extension
-    Any *ptr (void) const;
+    Any *ptr () const;
   private:
     /// Holds the Any.
     Any *ptr_;
@@ -252,9 +252,9 @@ namespace CORBA
     operator Any *&();
 
     /// Return underlying instance.
-    Any *& ptr (void);
+    Any *& ptr ();
 
-    Any *operator-> (void);
+    Any *operator-> ();
 
   private:
     /// Assignment from _var disallowed.
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
index cb8beef4ed0..7c9a1911696 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
@@ -287,7 +287,7 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, const CORBA::WS
 }
 
 int
-TAO_AnyTypeCode_Adapter_Impl::Initializer (void)
+TAO_AnyTypeCode_Adapter_Impl::Initializer ()
 {
   // The TAO::Unknown_IDL_Type::lock_i () is a PRIVATE thread unsafe singleton
   // which we need to initialise before Unknown_IDL_Types are used in a
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
index ab8c7d6d3f6..566233eb0cf 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
@@ -32,7 +32,7 @@ class TAO_AnyTypeCode_Export TAO_AnyTypeCode_Adapter_Impl
 {
 public:
     // Used to force the initialization of the code.
-    static int Initializer (void);
+    static int Initializer ();
 
 #define ANYTYPECODE__EXCEPTION_LIST \
     TAO_SYSTEM_EXCEPTION (UNKNOWN) \
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index 678233f3951..9222c88dbce 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -93,11 +93,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
                                       T_forany::tao_alloc ()),
                       false);
 
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (replacement);
-#else
-      auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (replacement);
-#endif /* ACE_HAS_CPP11 */
 
       // We know this will work since the unencoded case is covered above.
       TAO::Unknown_IDL_Type * const unk =
@@ -161,8 +157,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
 
 template<typename T_slice, typename T_forany>
 void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
-                                                       )
+TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr)
 {
   if (! this->demarshal_value (cdr))
     {
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
index b2879bf3438..660d3080136 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -51,8 +51,7 @@ namespace TAO
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              );
+    virtual void _tao_decode (TAO_InputCDR &);
 
     virtual const void *value (void) const;
     virtual void free_value (void);
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index ace666a3009..8273695fffd 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -66,7 +66,7 @@ namespace TAO
     }
   }
 
-  Any_Basic_Impl::~Any_Basic_Impl (void)
+  Any_Basic_Impl::~Any_Basic_Impl ()
   {
   }
 
@@ -116,11 +116,7 @@ namespace TAO
         TAO::Any_Basic_Impl *replacement =
           TAO::Any_Basic_Impl::create_empty (any_tc);
 
-#if defined (ACE_HAS_CPP11)
         std::unique_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement);
-#else
-        auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement);
-#endif /* ACE_HAS_CPP11 */
 
         // We know this will work since the unencoded case is covered above.
         TAO::Unknown_IDL_Type * const unk =
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
index ab18778fc0f..c2796c62777 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
@@ -40,7 +40,7 @@ namespace TAO
     Any_Basic_Impl (CORBA::TypeCode_ptr,
                     void *value);
 
-    virtual ~Any_Basic_Impl (void);
+    virtual ~Any_Basic_Impl ();
 
     static void insert (CORBA::Any &,
                         CORBA::TypeCode_ptr,
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
index a45b3b2481b..7e82b968f9f 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
@@ -78,11 +78,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
       TAO::Any_Basic_Impl_T<T> * const replacement =
         TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
 
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
-#else
-      auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
-#endif /* ACE_HAS_CPP11 */
 
       // We know this will work since the unencoded case is covered above.
       TAO::Unknown_IDL_Type * const unk =
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
index dd1395d764d..fdd7343bbaf 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
@@ -37,7 +37,7 @@ namespace TAO
   public:
     Any_Basic_Impl_T (CORBA::TypeCode_ptr,
                       const T & val);
-    virtual ~Any_Basic_Impl_T (void);
+    virtual ~Any_Basic_Impl_T ();
 
     static void insert (CORBA::Any &,
                         CORBA::TypeCode_ptr,
@@ -50,7 +50,7 @@ namespace TAO
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
     virtual void _tao_decode (TAO_InputCDR &);
 
-    virtual const void *value (void) const;
+    virtual const void *value () const;
     static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr);
 
   private:
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
index 42cc10a0066..41bb34ba6aa 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
@@ -158,11 +158,7 @@ TAO::Any_Dual_Impl_T<T>::replace (TAO_InputCDR &cdr,
   ACE_NEW_RETURN (empty_value,
                   T,
                   false);
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<T> empty_value_safety (empty_value);
-#else
-  auto_ptr<T> empty_value_safety (empty_value);
-#endif /* ACE_HAS_CPP11 */
   TAO::Any_Dual_Impl_T<T> *replacement = 0;
   ACE_NEW_RETURN (replacement,
                   TAO::Any_Dual_Impl_T<T> (destructor,
@@ -170,11 +166,7 @@ TAO::Any_Dual_Impl_T<T>::replace (TAO_InputCDR &cdr,
                                            empty_value),
                   false);
 
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
-#else
-  auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
-#endif /* ACE_HAS_CPP11 */
 
   CORBA::Boolean const good_decode = replacement->demarshal_value (cdr);
 
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
index 4d35f4add89..dd627266355 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
@@ -45,7 +45,7 @@ namespace TAO
                      CORBA::TypeCode_ptr,
                      const T &);
     Any_Dual_Impl_T (CORBA::TypeCode_ptr);
-    virtual ~Any_Dual_Impl_T (void);
+    virtual ~Any_Dual_Impl_T ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor,
@@ -64,8 +64,8 @@ namespace TAO
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
     virtual void _tao_decode (TAO_InputCDR &);
 
-    virtual const void *value (void) const;
-    virtual void free_value (void);
+    virtual const void *value () const;
+    virtual void free_value ();
 
   protected:
     void value (const T &);
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp
index 3633d68739f..b1867d468e3 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp
@@ -22,7 +22,7 @@ TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
 {
 }
 
-TAO::Any_Impl::~Any_Impl (void)
+TAO::Any_Impl::~Any_Impl ()
 {
 }
 
@@ -56,20 +56,20 @@ TAO::Any_Impl::marshal (TAO_OutputCDR &cdr)
 }
 
 void
-TAO::Any_Impl::free_value (void)
+TAO::Any_Impl::free_value ()
 {
   // We always have to do this.
   ::CORBA::release (this->type_);
 }
 
 CORBA::TypeCode_ptr
-TAO::Any_Impl::type (void) const
+TAO::Any_Impl::type () const
 {
   return CORBA::TypeCode::_duplicate (this->type_);
 }
 
 CORBA::TypeCode_ptr
-TAO::Any_Impl::_tao_get_typecode (void) const
+TAO::Any_Impl::_tao_get_typecode () const
 {
   return this->type_;
 }
@@ -82,7 +82,7 @@ TAO::Any_Impl::type (CORBA::TypeCode_ptr tc)
 }
 
 int
-TAO::Any_Impl::_tao_byte_order (void) const
+TAO::Any_Impl::_tao_byte_order () const
 {
   return TAO_ENCAP_BYTE_ORDER;
 }
@@ -102,13 +102,13 @@ TAO::Any_Impl::_tao_any_wstring_destructor (void *x)
 }
 
 void
-TAO::Any_Impl::_add_ref (void)
+TAO::Any_Impl::_add_ref ()
 {
   ++this->refcount_;
 }
 
 void
-TAO::Any_Impl::_remove_ref (void)
+TAO::Any_Impl::_remove_ref ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -145,7 +145,7 @@ TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const
 }
 
 bool
-TAO::Any_Impl::encoded (void) const
+TAO::Any_Impl::encoded () const
 {
   return this->encoded_;
 }
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h
index 2446ec37368..622ade7405c 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl.h
@@ -22,15 +22,7 @@
 
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/Basic_Types.h"
-
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Synch_Traits.h"
-# include "ace/Null_Mutex.h"
-# include "ace/Thread_Mutex.h"
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -69,16 +61,16 @@ namespace TAO
     CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &) = 0;
 
-    virtual void free_value (void);
+    virtual void free_value ();
 
-    CORBA::TypeCode_ptr type (void) const;
-    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
+    CORBA::TypeCode_ptr type () const;
+    CORBA::TypeCode_ptr _tao_get_typecode () const;
     void type (CORBA::TypeCode_ptr);
 
-    virtual int _tao_byte_order (void) const;
+    virtual int _tao_byte_order () const;
 
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
+    virtual void _add_ref ();
+    virtual void _remove_ref ();
 
     /// Used to release these CORBA basic types.
     static void _tao_any_string_destructor (void *);
@@ -90,13 +82,13 @@ namespace TAO
     virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
     virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
 
-    bool encoded (void) const;
+    bool encoded () const;
 
   protected:
     Any_Impl (_tao_destructor,
               CORBA::TypeCode_ptr,
               bool encoded = false);
-    virtual ~Any_Impl (void);
+    virtual ~Any_Impl ();
 
     TAO::Any_Impl::_tao_destructor value_destructor_;
     CORBA::TypeCode_ptr type_;
@@ -104,11 +96,7 @@ namespace TAO
 
   private:
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
   };
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
index f389796bff3..c0ba6c2d82b 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
@@ -91,11 +91,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
                                           0),
                       false);
 
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
-#else
-      auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
-#endif /* ACE_HAS_CPP11 */
 
       // We know this will work since the unencoded case is covered above.
       TAO::Unknown_IDL_Type * const unk =
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h
index 3be4db172f9..c69f916df91 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h
@@ -43,7 +43,7 @@ namespace TAO
     Any_Impl_T (_tao_destructor destructor,
                 CORBA::TypeCode_ptr,
                 T * const);
-    virtual ~Any_Impl_T (void);
+    virtual ~Any_Impl_T ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor destructor,
@@ -61,8 +61,8 @@ namespace TAO
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
     virtual void _tao_decode (TAO_InputCDR & );
-    virtual const void *value (void) const;
-    virtual void free_value (void);
+    virtual const void *value () const;
+    virtual void free_value ();
 
   private:
     T * value_;
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
index a5cdeb3239d..b728b74f42c 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
@@ -129,11 +129,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
                                                 bound),
                       false);
 
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (replacement);
-#else
-      auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (replacement);
-#endif /* ACE_HAS_CPP11 */
 
       // We know this will work since the unencoded case is covered above.
       TAO::Unknown_IDL_Type * const unk =
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
index c153ea9ce8c..c57d09c7a04 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
@@ -37,7 +37,7 @@ namespace TAO
                         CORBA::TypeCode_ptr,
                         T * const,
                         CORBA::ULong bound);
-    virtual ~Any_Special_Impl_T (void);
+    virtual ~Any_Special_Impl_T ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor destructor,
@@ -52,11 +52,10 @@ namespace TAO
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              );
+    virtual void _tao_decode (TAO_InputCDR &);
 
-    virtual const void *value (void) const;
-    virtual void free_value (void);
+    virtual const void *value () const;
+    virtual void free_value ();
 
   private:
     T * value_;
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
index 2e06f71b942..1e905894b64 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
@@ -40,7 +40,7 @@ TAO::Any_SystemException::Any_SystemException (CORBA::TypeCode_ptr tc)
 {
 }
 
-TAO::Any_SystemException::~Any_SystemException (void)
+TAO::Any_SystemException::~Any_SystemException ()
 {
 }
 
@@ -116,11 +116,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
                                                 empty_value),
                       false);
 
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO::Any_SystemException > replacement_safety (replacement);
-#else
-      auto_ptr<TAO::Any_SystemException > replacement_safety (replacement);
-#endif /* ACE_HAS_CPP11 */
 
       // We know this will work since the unencoded case is covered above.
       TAO::Unknown_IDL_Type * const unk =
@@ -152,7 +148,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
 }
 
 void
-TAO::Any_SystemException::free_value (void)
+TAO::Any_SystemException::free_value ()
 {
   if (this->value_destructor_ != 0)
     {
@@ -165,7 +161,7 @@ TAO::Any_SystemException::free_value (void)
 }
 
 const void *
-TAO::Any_SystemException::value (void) const
+TAO::Any_SystemException::value () const
 {
   return this->value_;
 }
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h
index 2cb231476f4..622e5e501d4 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.h
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.h
@@ -50,7 +50,7 @@ namespace TAO
 
     Any_SystemException (CORBA::TypeCode_ptr);
 
-    virtual ~Any_SystemException (void);
+    virtual ~Any_SystemException ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor,
@@ -71,8 +71,8 @@ namespace TAO
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
 
-    virtual const void *value (void) const;
-    virtual void free_value (void);
+    virtual const void *value () const;
+    virtual void free_value ();
 
   protected:
     CORBA::SystemException *value_;
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index 72e818c8ca7..bacd24e67d5 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Unknown_IDL_Type::LOCK const
-TAO::Unknown_IDL_Type::lock_i (void)
+TAO::Unknown_IDL_Type::lock_i ()
 {
   static LOCK base_lock_ (new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>());
   return base_lock_;
@@ -49,7 +49,7 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type (CORBA::TypeCode_ptr tc)
 {
 }
 
-TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void)
+TAO::Unknown_IDL_Type::~Unknown_IDL_Type ()
 {
 }
 
@@ -81,25 +81,25 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR & cdr)
 }
 
 const void *
-TAO::Unknown_IDL_Type::value (void) const
+TAO::Unknown_IDL_Type::value () const
 {
   return this->cdr_.start ();
 }
 
 void
-TAO::Unknown_IDL_Type::free_value (void)
+TAO::Unknown_IDL_Type::free_value ()
 {
   ::CORBA::release (this->type_);
 }
 
 TAO_InputCDR &
-TAO::Unknown_IDL_Type::_tao_get_cdr (void)
+TAO::Unknown_IDL_Type::_tao_get_cdr ()
 {
   return this->cdr_;
 }
 
 int
-TAO::Unknown_IDL_Type::_tao_byte_order (void) const
+TAO::Unknown_IDL_Type::_tao_byte_order () const
 {
   return this->cdr_.byte_order ();
 }
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
index b313a294ef0..a26f7f02240 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
@@ -43,14 +43,14 @@ namespace TAO
 
     Unknown_IDL_Type (CORBA::TypeCode_ptr);
 
-    virtual ~Unknown_IDL_Type (void);
+    virtual ~Unknown_IDL_Type ();
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    virtual const void *value (void) const;
-    virtual void free_value (void);
+    virtual const void *value () const;
+    virtual void free_value ();
 
-    virtual TAO_InputCDR &_tao_get_cdr (void);
-    virtual int _tao_byte_order (void) const;
+    virtual TAO_InputCDR &_tao_get_cdr ();
+    virtual int _tao_byte_order () const;
 
     virtual void _tao_decode (TAO_InputCDR &);
 
@@ -79,7 +79,7 @@ namespace TAO
     typedef ACE_Refcounted_Auto_Ptr<ACE_Lock,
                                     ACE_Lock_Adapter<TAO_SYNCH_MUTEX> >
       LOCK;
-    static LOCK const lock_i (void);
+    static LOCK const lock_i ();
     LOCK const lock_;
     mutable TAO_InputCDR cdr_;
   };
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
index 1cf8645c5a2..6792fb8b35f 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -16,7 +16,7 @@ TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const
 }
 
 void
-TAO::TypeCode::Empty_Param::tao_duplicate (void)
+TAO::TypeCode::Empty_Param::tao_duplicate ()
 {
   // No-op since empty parameter TypeCodes are never created
   // dynamically, meaning there is no need to implement reference
@@ -24,7 +24,7 @@ TAO::TypeCode::Empty_Param::tao_duplicate (void)
 }
 
 void
-TAO::TypeCode::Empty_Param::tao_release (void)
+TAO::TypeCode::Empty_Param::tao_release ()
 {
   // No-op since empty parameter TypeCodes are never created
   // dynamically, meaning there is no need to implement reference
@@ -58,7 +58,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc) const
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Empty_Param::get_compact_typecode_i (void) const
+TAO::TypeCode::Empty_Param::get_compact_typecode_i () const
 {
   // Already compact since parameter list is empty.
 
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
index d0ef4e370c2..ba194eff926 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
@@ -60,8 +60,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -76,7 +76,7 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
     };
 
   }  // End namespace TypeCode
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index 2297a263a00..37e64256a52 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -157,8 +157,7 @@ TAO::TypeCode::Enum<StringType,
     adapter->create_enum_tc (this->base_attributes_.id (),
                              ""  /* empty name */,
                              tc_enumerators,
-                             this->nenumerators_
-                            );
+                             this->nenumerators_);
 }
 
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index dbd05818165..245bb43c630 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -63,8 +63,8 @@ namespace TAO
        */
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -78,10 +78,10 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       //@}
 
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 5ef55878740..81af701debf 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -58,14 +58,14 @@ TAO::TypeCode::Enum<char const *,
 void
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                    TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_release (void)
+                    TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -124,7 +124,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
 
@@ -154,15 +154,14 @@ TAO::TypeCode::Enum<char const *,
     adapter->create_enum_tc (this->base_attributes_.id (),
                              ""  /* empty name */,
                              tc_enumerators,
-                             this->nenumerators_
-                            );
+                             this->nenumerators_);
 }
 
 char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::id_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -173,7 +172,7 @@ char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::name_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -184,7 +183,7 @@ CORBA::ULong
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::member_count_i (
-  void) const
+  ) const
 {
   return this->nenumerators_;
 }
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
index 8fd342a90ef..4e35dc18586 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
@@ -69,8 +69,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -84,10 +84,10 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       //@}
 
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index 56a6b685fa0..e84730b2469 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -57,8 +57,8 @@ namespace TAO
        */
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -73,9 +73,9 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual CORBA::UShort fixed_digits_i (void) const;
-      virtual CORBA::UShort fixed_scale_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual CORBA::UShort fixed_digits_i () const;
+      virtual CORBA::UShort fixed_scale_i () const;
 
     private:
       /// The number of significant digits.
diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
index ec34f735087..93a88f1bbc7 100644
--- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
@@ -24,7 +24,7 @@ TAO::TypeCode::Indirected_Type::tao_marshal (TAO_OutputCDR & cdr,
 }
 
 void
-TAO::TypeCode::Indirected_Type::tao_duplicate (void)
+TAO::TypeCode::Indirected_Type::tao_duplicate ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
 
@@ -39,7 +39,7 @@ TAO::TypeCode::Indirected_Type::tao_duplicate (void)
 }
 
 void
-TAO::TypeCode::Indirected_Type::tao_release (void)
+TAO::TypeCode::Indirected_Type::tao_release ()
 {
   unsigned long newcount;
   CORBA::TypeCode_ptr curmaster;
@@ -103,25 +103,25 @@ TAO::TypeCode::Indirected_Type::equivalent_i (
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Indirected_Type::get_compact_typecode_i (void) const
+TAO::TypeCode::Indirected_Type::get_compact_typecode_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->get_compact_typecode () : 0;
 }
 
 char const *
-TAO::TypeCode::Indirected_Type::id_i (void) const
+TAO::TypeCode::Indirected_Type::id_i () const
 {
   return this->id_.in ();
 }
 
 char const *
-TAO::TypeCode::Indirected_Type::name_i (void) const
+TAO::TypeCode::Indirected_Type::name_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->name () : 0;
 }
 
 CORBA::ULong
-TAO::TypeCode::Indirected_Type::member_count_i (void) const
+TAO::TypeCode::Indirected_Type::member_count_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->member_count () : 0;
 }
@@ -147,13 +147,13 @@ TAO::TypeCode::Indirected_Type::member_visibility_i (CORBA::ULong index) const
 }
 
 CORBA::ValueModifier
-TAO::TypeCode::Indirected_Type::type_modifier_i (void) const
+TAO::TypeCode::Indirected_Type::type_modifier_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->type_modifier () : 0;
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Indirected_Type::concrete_base_type_i (void) const
+TAO::TypeCode::Indirected_Type::concrete_base_type_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->concrete_base_type () : 0;
 }
@@ -165,13 +165,13 @@ TAO::TypeCode::Indirected_Type::member_label_i (CORBA::ULong index) const
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Indirected_Type::discriminator_type_i (void) const
+TAO::TypeCode::Indirected_Type::discriminator_type_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->discriminator_type () : 0;
 }
 
 CORBA::Long
-TAO::TypeCode::Indirected_Type::default_index_i (void) const
+TAO::TypeCode::Indirected_Type::default_index_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->default_index () : 0;
 }
diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
index b72f0d14f2e..4d810a4150a 100644
--- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
@@ -64,8 +64,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
       virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
       /// Setter for recursive reference.
@@ -83,10 +83,10 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       //@}
@@ -101,8 +101,8 @@ namespace TAO
        */
       //@{
       virtual CORBA::Any * member_label_i (CORBA::ULong index) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (void) const;
-      virtual CORBA::Long default_index_i (void) const;
+      virtual CORBA::TypeCode_ptr discriminator_type_i () const;
+      virtual CORBA::Long default_index_i () const;
       //@}
 
       /**
@@ -115,8 +115,8 @@ namespace TAO
        */
       //@{
       virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const;
-      virtual CORBA::ValueModifier type_modifier_i (void) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const;
+      virtual CORBA::ValueModifier type_modifier_i () const;
+      virtual CORBA::TypeCode_ptr concrete_base_type_i () const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp
index 965d22e645c..b7274bcd458 100644
--- a/TAO/tao/AnyTypeCode/Marshal.cpp
+++ b/TAO/tao/AnyTypeCode/Marshal.cpp
@@ -21,7 +21,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Marshal_Object::~TAO_Marshal_Object (void)
+TAO_Marshal_Object::~TAO_Marshal_Object ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h
index 09a5705b113..6c6bee37e03 100644
--- a/TAO/tao/AnyTypeCode/Marshal.h
+++ b/TAO/tao/AnyTypeCode/Marshal.h
@@ -75,10 +75,10 @@ class TAO_AnyTypeCode_Export TAO_Marshal_Object
 {
 public:
   /// constructor
-  TAO_Marshal_Object (void);
+  TAO_Marshal_Object ();
 
   /// destructor
-  virtual ~TAO_Marshal_Object (void);
+  virtual ~TAO_Marshal_Object ();
 
   /// skip entry point, it allocates the right kind of Marshal_Object
   /// and invokes skip on it.
@@ -111,7 +111,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Primitive: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Primitive (void);
+  TAO_Marshal_Primitive ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -133,7 +133,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Any: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Any (void);
+  TAO_Marshal_Any ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -155,7 +155,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_TypeCode (void);
+  TAO_Marshal_TypeCode ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -177,7 +177,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Principal: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Principal (void);
+  TAO_Marshal_Principal ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -199,7 +199,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_ObjRef (void);
+  TAO_Marshal_ObjRef ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -221,7 +221,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Struct : public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Struct (void);
+  TAO_Marshal_Struct ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -243,7 +243,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Union: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Union (void);
+  TAO_Marshal_Union ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -265,7 +265,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_String: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_String (void);
+  TAO_Marshal_String ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -287,7 +287,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Sequence: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Sequence (void);
+  TAO_Marshal_Sequence ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -309,7 +309,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Array: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Array (void);
+  TAO_Marshal_Array ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -331,7 +331,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Alias: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Alias (void);
+  TAO_Marshal_Alias ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -353,7 +353,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Except: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Except (void);
+  TAO_Marshal_Except ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -375,7 +375,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_WString : public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_WString (void);
+  TAO_Marshal_WString ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
@@ -397,7 +397,7 @@ public:
 class TAO_AnyTypeCode_Export TAO_Marshal_Value: public TAO_Marshal_Object
 {
 public:
-  TAO_Marshal_Value (void);
+  TAO_Marshal_Value ();
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl
index 281a0225f2f..54d26c68102 100644
--- a/TAO/tao/AnyTypeCode/Marshal.inl
+++ b/TAO/tao/AnyTypeCode/Marshal.inl
@@ -3,77 +3,77 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_Marshal_Object::TAO_Marshal_Object (void)
+TAO_Marshal_Object::TAO_Marshal_Object ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Primitive::TAO_Marshal_Primitive (void)
+TAO_Marshal_Primitive::TAO_Marshal_Primitive ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Any::TAO_Marshal_Any (void)
+TAO_Marshal_Any::TAO_Marshal_Any ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Principal::TAO_Marshal_Principal (void)
+TAO_Marshal_Principal::TAO_Marshal_Principal ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void)
+TAO_Marshal_TypeCode::TAO_Marshal_TypeCode ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void)
+TAO_Marshal_ObjRef::TAO_Marshal_ObjRef ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Struct::TAO_Marshal_Struct (void)
+TAO_Marshal_Struct::TAO_Marshal_Struct ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Union::TAO_Marshal_Union (void)
+TAO_Marshal_Union::TAO_Marshal_Union ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_String::TAO_Marshal_String (void)
+TAO_Marshal_String::TAO_Marshal_String ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Sequence::TAO_Marshal_Sequence (void)
+TAO_Marshal_Sequence::TAO_Marshal_Sequence ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Array::TAO_Marshal_Array (void)
+TAO_Marshal_Array::TAO_Marshal_Array ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Alias::TAO_Marshal_Alias (void)
+TAO_Marshal_Alias::TAO_Marshal_Alias ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Except::TAO_Marshal_Except (void)
+TAO_Marshal_Except::TAO_Marshal_Except ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_WString::TAO_Marshal_WString (void)
+TAO_Marshal_WString::TAO_Marshal_WString ()
 {
 }
 
 ACE_INLINE
-TAO_Marshal_Value::TAO_Marshal_Value (void)
+TAO_Marshal_Value::TAO_Marshal_Value ()
   : nested_processing_ (false)
 {
 }
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index 927ae22006c..7c0571e618f 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -23,13 +23,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Reference counting for DII Request object
 CORBA::ULong
-CORBA::NamedValue::_incr_refcount (void)
+CORBA::NamedValue::_incr_refcount ()
 {
   return ++this->refcount_;
 }
 
 CORBA::ULong
-CORBA::NamedValue::_decr_refcount (void)
+CORBA::NamedValue::_decr_refcount ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -39,7 +39,7 @@ CORBA::NamedValue::_decr_refcount (void)
   return new_count;
 }
 
-CORBA::NamedValue::~NamedValue (void)
+CORBA::NamedValue::~NamedValue ()
 {
   if (this->name_)
     {
@@ -52,13 +52,13 @@ CORBA::NamedValue::~NamedValue (void)
 // ****************************************************************
 
 CORBA::ULong
-CORBA::NVList::_incr_refcount (void)
+CORBA::NVList::_incr_refcount ()
 {
   return ++this->refcount_;
 }
 
 CORBA::ULong
-CORBA::NVList::_decr_refcount (void)
+CORBA::NVList::_decr_refcount ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -68,7 +68,7 @@ CORBA::NVList::_decr_refcount (void)
   return new_count;
 }
 
-CORBA::NVList::~NVList (void)
+CORBA::NVList::~NVList ()
 {
   // initialize an iterator and delete each NamedValue
   ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> iter (this->values_);
@@ -402,7 +402,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag)
 }
 
 ptrdiff_t
-CORBA::NVList::_tao_target_alignment (void)
+CORBA::NVList::_tao_target_alignment ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
@@ -426,17 +426,13 @@ CORBA::NVList::_tao_target_alignment (void)
 }
 
 void
-CORBA::NVList::evaluate (void)
+CORBA::NVList::evaluate ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (this->incoming_ != 0)
     {
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO_InputCDR> incoming (this->incoming_);
-#else
-      auto_ptr<TAO_InputCDR> incoming (this->incoming_);
-#endif /* ACE_HAS_CPP11 */
       this->incoming_ = 0;
 
       this->_tao_decode (*(incoming.get ()), this->incoming_flag_);
@@ -444,7 +440,7 @@ CORBA::NVList::evaluate (void)
 }
 
 CORBA::Boolean
-CORBA::NVList::_lazy_has_arguments (void) const
+CORBA::NVList::_lazy_has_arguments () const
 {
   if (this->incoming_ != 0)
     {
diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h
index 001a1d7691d..989df82cd99 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -26,11 +26,7 @@
 
 #include "ace/Unbounded_Queue.h"
 #include "ace/Thread_Mutex.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -84,21 +80,21 @@ namespace CORBA
 
   public:
     /// optional name
-    const char * name (void) const;
+    const char * name () const;
 
     /// return the value
-    Any_ptr value (void) const;
+    Any_ptr value () const;
 
     /// return the parameter mode flag
-    Flags flags (void) const;
+    Flags flags () const;
 
     // The pseudo object static methods..
     static NamedValue * _duplicate (NamedValue *);
-    static NamedValue * _nil (void);
+    static NamedValue * _nil ();
 
     // = Reference counting.
-    ULong _incr_refcount (void);
-    ULong _decr_refcount (void);
+    ULong _incr_refcount ();
+    ULong _decr_refcount ();
 
     // Useful for template programming.
     typedef NamedValue_ptr _ptr_type;
@@ -111,20 +107,16 @@ namespace CORBA
      * Protected destructor to enforce proper memory management
      * through the reference counting mechanism.
      */
-    ~NamedValue (void);
+    ~NamedValue ();
 
   private:
     /// private constructor. Cannot be directly instantiated other than
     /// by its friends.
-    NamedValue (void);
+    NamedValue ();
 
   private:
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
     /// holds the value
     Any any_;
@@ -165,7 +157,7 @@ namespace CORBA
   public:
 
     /// return the current number of elements in the list
-    ULong count (void) const;
+    ULong count () const;
 
     /// add an element and just initialize the flags
     NamedValue_ptr add (Flags);
@@ -193,11 +185,11 @@ namespace CORBA
 
     // The pseudo object static methods..
     static NVList * _duplicate (NVList *);
-    static NVList * _nil (void);
+    static NVList * _nil ();
 
     // = Reference counting.
-    ULong _incr_refcount (void);
-    ULong _decr_refcount (void);
+    ULong _incr_refcount ();
+    ULong _decr_refcount ();
 
     // = TAO Extensions:
 
@@ -223,14 +215,14 @@ namespace CORBA
      * re-alignment.
      * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors.
      */
-    ptrdiff_t _tao_target_alignment (void);
+    ptrdiff_t _tao_target_alignment ();
 
     /**
      * If this list is used by a DII request, this will tell us if
      * our CDR stream contains any marshaled arguments (needed for
      * GIOP 1.2).
      */
-    Boolean _lazy_has_arguments (void) const;
+    Boolean _lazy_has_arguments () const;
 
     // Useful for template programming.
     typedef NVList_ptr _ptr_type;
@@ -243,12 +235,12 @@ namespace CORBA
      * Protected destructor to enforce proper memory management
      * through the reference counting mechanism.
      */
-    ~NVList (void);
+    ~NVList ();
 
   private:
     /// Constructor - cannot be instantiated directly other than
     /// through the CORBA::ORB::create_list method
-    NVList (void);
+    NVList ();
 
     /// Helper to increase the list size. This is used by all the add_
     /// methods of the NVList class
@@ -256,7 +248,7 @@ namespace CORBA
 
     /// Lazy evaluation routine to fill up the Anys in the NVList from
     /// the CDR stream.
-    void evaluate (void);
+    void evaluate ();
 
   private:
     /// Internal list of parameters stored as NamedValues
@@ -266,11 +258,7 @@ namespace CORBA
     ULong max_;
 
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
     /// Protects the incoming pointer.
     TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
index d170907e390..a9d1940a8df 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -55,7 +55,7 @@ TAO_NVList_Adapter_Impl::create_named_value (CORBA::NamedValue_ptr &nv)
 }
 
 int
-TAO_NVList_Adapter_Impl::Initializer (void)
+TAO_NVList_Adapter_Impl::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl);
 }
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
index aca4292e926..5ad1d79264e 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
@@ -36,7 +36,7 @@ public:
   virtual void create_named_value (CORBA::NamedValue_ptr &nv);
 
   /// Used to force the initialization of the NVList adapter
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int TAO_Requires_NVList_Adapter_Impl_Initializer =
diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
index 09b696a606c..6dd3b5e1fa0 100644
--- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
@@ -66,10 +66,10 @@ namespace TAO
   public:
 
     /// No-op reference increment.
-    void add_ref (void)  { }
+    void add_ref ()  { }
 
     /// No-op reference decrement.
-    void remove_ref (void) { }
+    void remove_ref () { }
 
   };
 
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
index 59e1abf4e3c..5a43981c0f2 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -69,8 +69,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -86,9 +86,9 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
 
     protected:
       /// Base attributes (@c id and @c name).
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index 2502e71169d..9022c9ce878 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -38,13 +38,13 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal (
 
 void
 TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                      TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
 TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
+                      TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -70,7 +70,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i (
 
 CORBA::TypeCode_ptr
 TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const
+                      TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -116,7 +116,7 @@ TAO::TypeCode::Objref<char const *,
 
 char const *
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -125,7 +125,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
 
 char const *
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
index 0887c074809..8166b24edbe 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
@@ -73,8 +73,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -90,9 +90,9 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
 
     protected:
       /// Base attributes (@c id and @c name).
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index 403529e8650..d8482d33599 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -143,7 +143,7 @@ namespace TAO
       {
       public:
         Reset (CORBA::ULong & flag) : flag_ (flag) { }
-        ~Reset (void) { this->flag_ = 0; }
+        ~Reset () { this->flag_ = 0; }
       private:
         CORBA::ULong & flag_;
       };
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
index 9b621ac9bd3..154a4d41742 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -60,8 +60,8 @@ namespace TAO
        */
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -76,9 +76,9 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual CORBA::ULong length_i (void) const;
-      virtual CORBA::TypeCode_ptr content_type_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual CORBA::ULong length_i () const;
+      virtual CORBA::TypeCode_ptr content_type_i () const;
 
     private:
       /// Element type of the sequence.
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index 99f8e26c3bf..5ef1aec82db 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -48,13 +48,13 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 
 void
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                        TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_release (void)
+                        TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -105,7 +105,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   // Already compact since tk_sequence and tk_array TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -126,7 +126,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::ULong
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::length_i (
-  void) const
+  ) const
 {
   return this->length_;
 }
@@ -134,7 +134,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::content_type_i (
-  void) const
+  ) const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
index 2750c37ab74..11c76119774 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
@@ -65,8 +65,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -81,9 +81,9 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual CORBA::ULong length_i (void) const;
-      virtual CORBA::TypeCode_ptr content_type_i (        void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual CORBA::ULong length_i () const;
+      virtual CORBA::TypeCode_ptr content_type_i (        ) const;
 
     private:
       /// Element type of the sequence.
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h
index 507ad7ba137..8ca53f95e6e 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -59,8 +59,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -75,8 +75,8 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual CORBA::ULong length_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual CORBA::ULong length_i () const;
 
     private:
       /// Length of the @c string.  A length of zero indicates an
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index 90b9344e529..83f28c3add9 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -24,12 +24,12 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal (
 }
 
 void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate (void)
+TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void)
+TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -57,7 +57,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
 
 CORBA::TypeCode_ptr
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   // Already compact since tk_string and tk_wstring TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -71,7 +71,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
 
 CORBA::ULong
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
-  void) const
+  ) const
 {
   return this->length_;
 }
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
index 8fb262cb65d..388644be81b 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
@@ -62,8 +62,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -78,8 +78,8 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual CORBA::ULong length_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual CORBA::ULong length_i () const;
 
     private:
       /// Length of the @c string.  A length of zero indicates an
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index 3234062e624..4e5fb375edf 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -72,8 +72,8 @@ namespace TAO
        */
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
       /// Accessor for fields_
@@ -91,10 +91,10 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       //@}
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index 06aadae7364..fb6853c958e 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -83,7 +83,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                      TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
@@ -92,7 +92,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
+                      TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -121,8 +121,7 @@ TAO::TypeCode::Struct<char const *,
 
       char const * const lhs_name =
         Traits<char const *>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                    );
+      char const * const rhs_name = tc->member_name (i);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -182,7 +181,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   ACE_Array_Base<Struct_Field<CORBA::String_var,
                               CORBA::TypeCode_var> >
@@ -230,7 +229,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::id_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -242,7 +241,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::name_i (void) const
+                      TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -254,7 +253,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_count_i (void) const
+                      TAO::Null_RefCount_Policy>::member_count_i () const
 {
   return this->nfields_;
 }
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
index aa800a6b537..06bbd178928 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
@@ -78,8 +78,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -94,10 +94,10 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       //@}
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
index 3f25a04ed14..97662a84f02 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::True_RefCount_Policy::~True_RefCount_Policy (void)
+TAO::True_RefCount_Policy::~True_RefCount_Policy ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
index e1198f14cbe..257032630fc 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
@@ -25,11 +25,7 @@
 #include "tao/orbconf.h"
 
 #include "ace/Thread_Mutex.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -75,7 +71,7 @@ namespace TAO
   public:
 
     /// Increase the reference count on this object.
-    void add_ref (void);
+    void add_ref ();
 
     /// Decrease the reference count on this object.
     /**
@@ -83,7 +79,7 @@ namespace TAO
      * reference count drops to zero, call @c operator @c delete()
      * on this object.
      */
-    void remove_ref (void);
+    void remove_ref ();
 
   protected:
     /// Constructor.
@@ -91,7 +87,7 @@ namespace TAO
      * @note This constructor is protected since it not meant to be
      *       instantiated/used as a standalone object.
      */
-    True_RefCount_Policy (void);
+    True_RefCount_Policy ();
 
     /// Destructor.
     /**
@@ -100,15 +96,11 @@ namespace TAO
      *       zero, i.e. when @c remove_ref() calls @c operator
      *       @c delete @c this.
      */
-    virtual ~True_RefCount_Policy (void);
+    virtual ~True_RefCount_Policy ();
 
   private:
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
   };
 
 }  // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp
index b8277a895cc..53108bd3b91 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode.cpp
@@ -13,7 +13,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::TypeCode::~TypeCode (void)
+CORBA::TypeCode::~TypeCode ()
 {
 }
 
@@ -113,19 +113,19 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc) const
 }
 
 char const *
-CORBA::TypeCode::id_i (void) const
+CORBA::TypeCode::id_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 char const *
-CORBA::TypeCode::name_i (void) const
+CORBA::TypeCode::name_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::ULong
-CORBA::TypeCode::member_count_i (void) const
+CORBA::TypeCode::member_count_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
@@ -149,37 +149,37 @@ CORBA::TypeCode::member_label_i (CORBA::ULong /* index */) const
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type_i (void) const
+CORBA::TypeCode::discriminator_type_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::Long
-CORBA::TypeCode::default_index_i (void) const
+CORBA::TypeCode::default_index_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::ULong
-CORBA::TypeCode::length_i (void) const
+CORBA::TypeCode::length_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type_i (void) const
+CORBA::TypeCode::content_type_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::UShort
-CORBA::TypeCode::fixed_digits_i (void) const
+CORBA::TypeCode::fixed_digits_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::UShort
-CORBA::TypeCode::fixed_scale_i (void) const
+CORBA::TypeCode::fixed_scale_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
@@ -191,20 +191,20 @@ CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */) const
 }
 
 CORBA::ValueModifier
-CORBA::TypeCode::type_modifier_i (void) const
+CORBA::TypeCode::type_modifier_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type_i (void) const
+CORBA::TypeCode::concrete_base_type_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 // ---------------------------------------------------------------
 
-CORBA::TypeCode::Bounds::Bounds (void)
+CORBA::TypeCode::Bounds::Bounds ()
   : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0",
                           "Bounds")
 {
@@ -217,7 +217,7 @@ CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex)
 }
 
 CORBA::Exception *
-CORBA::TypeCode::Bounds::_alloc (void)
+CORBA::TypeCode::Bounds::_alloc ()
 {
   CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0);
@@ -225,7 +225,7 @@ CORBA::TypeCode::Bounds::_alloc (void)
 }
 
 CORBA::Exception *
-CORBA::TypeCode::Bounds::_tao_duplicate (void) const
+CORBA::TypeCode::Bounds::_tao_duplicate () const
 {
   CORBA::Exception *result;
   ACE_NEW_RETURN (result,
@@ -235,7 +235,7 @@ CORBA::TypeCode::Bounds::_tao_duplicate (void) const
 }
 
 void
-CORBA::TypeCode::Bounds::_raise (void) const
+CORBA::TypeCode::Bounds::_raise () const
 {
   throw *this;
 }
@@ -258,7 +258,7 @@ CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &)
 
 // ****************************************************************
 
-CORBA::TypeCode::BadKind::BadKind (void)
+CORBA::TypeCode::BadKind::BadKind ()
   : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0",
                           "BadKind")
 {
@@ -271,7 +271,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex)
 }
 
 CORBA::Exception *
-CORBA::TypeCode::BadKind::_tao_duplicate (void) const
+CORBA::TypeCode::BadKind::_tao_duplicate () const
 {
   CORBA::Exception *result = 0;
   ACE_NEW_RETURN (result,
@@ -281,7 +281,7 @@ CORBA::TypeCode::BadKind::_tao_duplicate (void) const
 }
 
 void
-CORBA::TypeCode::BadKind::_raise (void) const
+CORBA::TypeCode::BadKind::_raise () const
 {
   throw *this;
 }
@@ -402,7 +402,7 @@ namespace TAO
   }
 
   CORBA::TypeCode_ptr
-  Objref_Traits<CORBA::TypeCode>::nil (void)
+  Objref_Traits<CORBA::TypeCode>::nil ()
   {
     return CORBA::TypeCode::_nil ();
   }
diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h
index d7701ab1c50..9a21085a314 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.h
+++ b/TAO/tao/AnyTypeCode/TypeCode.h
@@ -70,14 +70,14 @@ namespace CORBA
     public:
 
       /// Constructor.
-      Bounds (void);
+      Bounds ();
 
       static Bounds * _downcast (CORBA::Exception * ex);
-      static CORBA::Exception * _alloc (void);
+      static CORBA::Exception * _alloc ();
 
-      virtual CORBA::Exception * _tao_duplicate (void) const;
+      virtual CORBA::Exception * _tao_duplicate () const;
 
-      virtual void _raise (void) const;
+      virtual void _raise () const;
 
       virtual void _tao_encode (TAO_OutputCDR & cdr) const;
       virtual void _tao_decode (TAO_InputCDR & cdr);
@@ -96,14 +96,14 @@ namespace CORBA
     {
     public:
 
-      BadKind (void);
+      BadKind ();
 
       static BadKind * _downcast (CORBA::Exception * ex);
-      static CORBA::Exception * _alloc (void);
+      static CORBA::Exception * _alloc ();
 
-      virtual CORBA::Exception * _tao_duplicate (void) const;
+      virtual CORBA::Exception * _tao_duplicate () const;
 
-      virtual void _raise (void) const;
+      virtual void _raise () const;
 
       virtual void _tao_encode (TAO_OutputCDR & cdr) const;
       virtual void _tao_decode (TAO_InputCDR & cdr);
@@ -123,7 +123,7 @@ namespace CORBA
     static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
 
     /// Returns a NULL typecode.
-    static CORBA::TypeCode_ptr _nil (void);
+    static CORBA::TypeCode_ptr _nil ();
 
     /**
      * @name @c CORBA::TypeCode Methods
@@ -158,7 +158,7 @@ namespace CORBA
     Boolean equivalent (TypeCode_ptr tc) const;
 
     /// The kind of @c TypeCode.
-    TCKind kind (void) const;
+    TCKind kind () const;
 
     /// Return @c TypeCode stripped of optional @c name and
     /// @c member_name fields.
@@ -180,7 +180,7 @@ namespace CORBA
      *       the TAO_IDL compiler by invoking it with its "-Gt"
      *       (i.e. enable optimized TypeCodes) command line option.
      */
-    TypeCode_ptr get_compact_typecode (void) const;
+    TypeCode_ptr get_compact_typecode () const;
 
     /// The @c RepositoryId globally identifying the type.
     /**
@@ -206,7 +206,7 @@ namespace CORBA
      *       is required by the C++ mapping.  In particular, ownership
      *       is maintained by the @c TypeCode.
      */
-    char const * id (void) const;
+    char const * id () const;
 
     /// The simple name identifying the type within its enclosing
     /// scope.
@@ -233,7 +233,7 @@ namespace CORBA
      *       behavior is required by the C++ mapping.  In particular,
      *       ownership is maintained by the @c TypeCode.
      */
-    char const * name (void) const;
+    char const * name () const;
 
     /// The type member count.
     /**
@@ -246,7 +246,7 @@ namespace CORBA
      * @li @c tk_except
      * @li @c tk_event
      */
-    ULong member_count (void) const;
+    ULong member_count () const;
 
     /// The type member name.
     /**
@@ -292,7 +292,7 @@ namespace CORBA
      *
      * @li @c tk_union
      */
-    TypeCode_ptr discriminator_type (void) const;
+    TypeCode_ptr discriminator_type () const;
 
     /// The index of the default union member.
     /**
@@ -300,7 +300,7 @@ namespace CORBA
      *
      * @li @c tk_union
      */
-    Long default_index (void) const;
+    Long default_index () const;
 
     /// The length of the type.
     /**
@@ -311,7 +311,7 @@ namespace CORBA
      * @li @c tk_sequence
      * @li @c tk_array
      */
-    ULong length (void) const;
+    ULong length () const;
 
     /// The underlying content type.
     /**
@@ -322,7 +322,7 @@ namespace CORBA
      * @li @c tk_value_box
      * @li @c tk_alias
      */
-    TypeCode_ptr content_type (void) const;
+    TypeCode_ptr content_type () const;
 
     /// The number of significant digits.
     /**
@@ -330,7 +330,7 @@ namespace CORBA
      *
      * @li @c tk_fixed
      */
-    UShort fixed_digits (void) const;
+    UShort fixed_digits () const;
 
     /// The scale factor.
     /**
@@ -338,7 +338,7 @@ namespace CORBA
      *
      * @li @c tk_fixed
      */
-    UShort fixed_scale (void) const;
+    UShort fixed_scale () const;
 
     /// The @c Visibility of the @c valuetype or @c eventtype member
     /// corresponding to index @a index.
@@ -358,7 +358,7 @@ namespace CORBA
      * @li @c tk_value
      * @li @c tk_event
      */
-    ValueModifier type_modifier (void) const;
+    ValueModifier type_modifier () const;
 
     /// The @c TypeCode corresponding to the concrete base
     /// @c valuetype or @c eventtype.
@@ -372,7 +372,7 @@ namespace CORBA
      *         @c valuetype or @c eventtype.
      *         @c CORBA::TypeCode::_nil() if no concrete base exists.
      */
-    TypeCode_ptr concrete_base_type (void) const;
+    TypeCode_ptr concrete_base_type () const;
     //@}
 
     /// Marshal the @c TypeCode @c TCKind.
@@ -411,10 +411,10 @@ namespace CORBA
                               CORBA::ULong offset) const = 0;
 
     /// Increase the reference count on this @c TypeCode.
-    virtual void tao_duplicate (void) = 0;
+    virtual void tao_duplicate () = 0;
 
     /// Decrease the reference count on this object.
-    virtual void tao_release (void) = 0;
+    virtual void tao_release () = 0;
 
     /// Destruction callback for Anys.
     static void _tao_any_destructor (void * x);
@@ -432,7 +432,7 @@ namespace CORBA
      * Protected destructor to enforce proper memory management
      * through the reference counting mechanism.
      */
-    virtual ~TypeCode (void);
+    virtual ~TypeCode ();
 
     /**
      * @name @c TypeCode Template Methods
@@ -453,23 +453,23 @@ namespace CORBA
     //@{
     virtual Boolean equal_i (TypeCode_ptr tc) const = 0;
     virtual Boolean equivalent_i (TypeCode_ptr tc) const = 0;
-    virtual TypeCode_ptr get_compact_typecode_i (void) const = 0;
+    virtual TypeCode_ptr get_compact_typecode_i () const = 0;
 
-    virtual char const * id_i (void) const;
-    virtual char const * name_i (void) const;
-    virtual ULong member_count_i (void) const;
+    virtual char const * id_i () const;
+    virtual char const * name_i () const;
+    virtual ULong member_count_i () const;
     virtual char const * member_name_i (ULong index) const;
     virtual TypeCode_ptr member_type_i (ULong index) const;
     virtual Any * member_label_i (ULong index) const;
-    virtual TypeCode_ptr discriminator_type_i (void) const;
-    virtual Long default_index_i (void) const;
-    virtual ULong length_i (void) const;
-    virtual TypeCode_ptr content_type_i (void) const;
-    virtual UShort fixed_digits_i (void) const;
-    virtual UShort fixed_scale_i (void) const;
+    virtual TypeCode_ptr discriminator_type_i () const;
+    virtual Long default_index_i () const;
+    virtual ULong length_i () const;
+    virtual TypeCode_ptr content_type_i () const;
+    virtual UShort fixed_digits_i () const;
+    virtual UShort fixed_scale_i () const;
     virtual Visibility member_visibility_i (ULong index) const;
-    virtual ValueModifier type_modifier_i (void) const;
-    virtual TypeCode_ptr concrete_base_type_i (void) const;
+    virtual ValueModifier type_modifier_i () const;
+    virtual TypeCode_ptr concrete_base_type_i () const;
     //@}
 
   private:
@@ -549,7 +549,7 @@ namespace TAO
   {
     static ::CORBA::TypeCode_ptr duplicate (::CORBA::TypeCode_ptr);
     static void release (::CORBA::TypeCode_ptr);
-    static ::CORBA::TypeCode_ptr nil (void);
+    static ::CORBA::TypeCode_ptr nil ();
     static CORBA::Boolean marshal (::CORBA::TypeCode_ptr p,
                                    TAO_OutputCDR & cdr);
   };
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
index 1616339555c..193de495ea3 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
@@ -51,11 +51,11 @@ namespace TAO
       Base_Attributes (char const * id);
 
       /// Get the @c RepositoryId globally identifying the type.
-      char const * id (void) const;
+      char const * id () const;
 
       /// Get the simple name identifying the type within its
       /// enclosing scope.
-      char const * name (void) const;
+      char const * name () const;
 
       /// Set the simple name identifying the type within its
       /// enclosing scope.
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index b3d656e61cb..e80e1c653a4 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -44,7 +44,7 @@ namespace TAO
     struct TC_Info
     {
       /// Constructor.
-      TC_Info (void) : id (0), type () {}
+      TC_Info () : id (0), type () {}
 
       /// Repository ID.
       char const * id;
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 32f411cb9e5..f383c79659d 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -18,13 +18,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void)
 template <typename StringType, typename TypeCodeType>
 bool
 TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
-                                                      CORBA::TypeCode_ptr tc
-                                                      ) const
+                                                      CORBA::TypeCode_ptr tc) const
 {
   // Check case names.
   char const * const lhs_name = this->name ();
-  char const * const rhs_name = tc->member_name (index
-                                                );
+  char const * const rhs_name = tc->member_name (index);
 
   if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
     return false;
@@ -32,49 +30,40 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
   // Check case TypeCodes.
   CORBA::TypeCode_ptr const lhs_tc = this->type ();
   CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                    );
+    tc->member_type (index);
 
   CORBA::Boolean const equal_members =
-    lhs_tc->equal (rhs_tc.in ()
-                  );
+    lhs_tc->equal (rhs_tc.in ());
 
   if (!equal_members)
     return false;
 
   // Check case label.
-  return this->equal_label (index,
-                            tc
-                           );
+  return this->equal_label (index, tc);
 }
 
 template <typename StringType, typename TypeCodeType>
 bool
 TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
   CORBA::ULong index,
-  CORBA::TypeCode_ptr tc
-  ) const
+  CORBA::TypeCode_ptr tc) const
 {
   // Member names are ignore when determining equivalence.
 
   // Check case TypeCodes.
   CORBA::TypeCode_ptr const lhs_tc = this->type ();
   CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                    );
+    tc->member_type (index);
 
   CORBA::Boolean const equivalent_members =
-    lhs_tc->equivalent (rhs_tc.in ()
-                       );
+    lhs_tc->equivalent (rhs_tc.in ());
 
   if (!equivalent_members)
     return 0;
 
   // Check case label.
   // The label must be equal when determining equivalence, too.
-  return this->equal_label (index,
-                            tc
-                           );
+  return this->equal_label (index, tc);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
index da96f1360cd..1e420b17592 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -60,20 +60,20 @@ namespace TAO
       /**
        * Constructor used when creating dynamic @c union @c TypeCodes.
        */
-      Case (void);
+      Case ();
 
       /// Destructor.
-      virtual ~Case (void);
+      virtual ~Case ();
 
       /// Cloning/copying operation.
-      virtual Case * clone (void) const = 0;
+      virtual Case * clone () const = 0;
 
       /// Return the IDL @c union case label value embedded within a
       /// @c CORBA::Any.
-      virtual CORBA::Any * label (void) const = 0;
+      virtual CORBA::Any * label () const = 0;
 
       /// Get the name of the @c union case/member.
-      char const * name (void) const;
+      char const * name () const;
 
       /// Set the name of the @c union case/member.
       void name (char const * the_name);
@@ -83,7 +83,7 @@ namespace TAO
        * @note The reference count is not manipulated by this method,
        *       i.e., ownership is retained by this class.
        */
-      CORBA::TypeCode_ptr type (void) const;
+      CORBA::TypeCode_ptr type () const;
 
       /// Set the @c CORBA::TypeCode of the @c union case/member.
       /**
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
index de360a3cdcb..b44435db95f 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
@@ -71,8 +71,8 @@ namespace TAO
        * @see @c TAO::TypeCode::Case
        */
       //@{
-      Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (void) const;
+      Case<StringType, TypeCodeType> * clone () const;
+      virtual CORBA::Any * label () const;
       virtual bool marshal_label (TAO_OutputCDR & cdr) const;
       virtual bool equal_label (CORBA::ULong index,
                                 CORBA::TypeCode_ptr tc) const;
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
index 86219d92c73..faf3d0745af 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
@@ -112,8 +112,7 @@ bool
 TAO::TypeCode::Case_T<DiscriminatorType,
                       StringType,
                       TypeCodeType>::equal_label (CORBA::ULong index,
-                                                  CORBA::TypeCode_ptr tc
-                                                  ) const
+                                                  CORBA::TypeCode_ptr tc) const
 {
   CORBA::Any_var const any = tc->member_label (index);
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
index d6ab4a1ab36..973edcffb32 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -108,8 +108,8 @@ namespace TAO
        * @see @c TAO::TypeCode::Case
        */
       //@{
-      Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (void) const;
+      Case<StringType, TypeCodeType> * clone () const;
+      virtual CORBA::Any * label () const;
       virtual bool marshal_label (TAO_OutputCDR & cdr) const;
       virtual bool equal_label (CORBA::ULong index,
                                 CORBA::TypeCode_ptr tc) const;
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
index accfab8d9d9..6a6a6b145b9 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -254,8 +254,7 @@ TAO::TypeCode::Union<StringType,
 //           // the compact TypeCode.
 //           tc_cases[i].name = empty_name;
 //           tc_cases[i].type =
-//             this->cases_[i]->type ()->get_compact_typecode (
-//              );
+//             this->cases_[i]->type ()->get_compact_typecode ();
 //         }
 //     }
 
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index 31855ed90a4..99cc7cf771a 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -76,12 +76,12 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
       /// Accessor for cases_
-      const CaseArrayType& cases(void) const;
+      const CaseArrayType& cases() const;
 
     protected:
       /**
@@ -94,15 +94,15 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       virtual CORBA::Any * member_label_i (CORBA::ULong index) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (void) const;
-      virtual CORBA::Long default_index_i (void) const;
+      virtual CORBA::TypeCode_ptr discriminator_type_i () const;
+      virtual CORBA::Long default_index_i () const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index b3bb39e4aac..d702bec5bfc 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -78,7 +78,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                     TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
@@ -87,7 +87,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
+                     TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -198,7 +198,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
 //   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
 //                                              CORBA::TypeCode_var> > elem_type;
@@ -218,8 +218,7 @@ TAO::TypeCode::Union<char const *,
 //           // the compact TypeCode.
 //           tc_cases[i].name = empty_name;
 //           tc_cases[i].type =
-//             this->cases_[i]->type ()->get_compact_typecode (
-//              );
+//             this->cases_[i]->type ()->get_compact_typecode ();
 //         }
 //     }
 
@@ -254,7 +253,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::id_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -266,7 +265,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::name_i (void) const
+                     TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -278,7 +277,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (void) const
+                     TAO::Null_RefCount_Policy>::member_count_i () const
 {
   return this->ncases_;
 }
@@ -353,7 +352,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::discriminator_type_i (void) const
+                     TAO::Null_RefCount_Policy>::discriminator_type_i () const
 {
   return
     CORBA::TypeCode::_duplicate (
@@ -365,7 +364,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::default_index_i (void) const
+                     TAO::Null_RefCount_Policy>::default_index_i () const
 {
   return this->default_index_;
 }
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
index 180747f1428..e624fcbece0 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
@@ -80,8 +80,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -95,15 +95,15 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       virtual CORBA::Any * member_label_i (CORBA::ULong index) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (void) const;
-      virtual CORBA::Long default_index_i (void) const;
+      virtual CORBA::TypeCode_ptr discriminator_type_i () const;
+      virtual CORBA::Long default_index_i () const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index a720506dc0b..e19f8a95c33 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -162,8 +162,7 @@ TAO::TypeCode::Value<StringType,
     tc->concrete_base_type ();
 
   CORBA::Boolean const equal_concrete_base_types =
-    this->equal (rhs_concrete_base_type.in ()
-                );
+    this->equal (rhs_concrete_base_type.in ());
 
   if (!equal_concrete_base_types)
     return false;
@@ -180,9 +179,7 @@ TAO::TypeCode::Value<StringType,
         this->fields_[i];
 
       CORBA::Visibility const lhs_visibility = lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                              );
+      CORBA::Visibility const rhs_visibility = tc->member_visibility (i);
 
       if (lhs_visibility != rhs_visibility)
         return false;
@@ -262,8 +259,7 @@ TAO::TypeCode::Value<StringType,
         tc->member_type (i);
 
       CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ()
-                           );
+        lhs_tc->equivalent (rhs_tc.in ());
 
       if (!equiv_types)
         return false;
@@ -300,8 +296,7 @@ TAO::TypeCode::Value<StringType,
           tc_fields[i].name = empty_name;
           tc_fields[i].type =
             Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                );
+              this->fields_[i].type)->get_compact_typecode ();
           tc_fields[i].visibility = this->fields_[i].visibility;
         }
     }
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h
index c454d0cbe1a..836403fd08d 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -76,12 +76,12 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
       /// Accessor for concrete_base_
-      const TypeCodeType& concrete_base(void) const;
+      const TypeCodeType& concrete_base() const;
 
       /// Accessor for fields_
       const FieldArrayType& fields() const;
@@ -98,15 +98,15 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const;
-      virtual CORBA::ValueModifier type_modifier_i (void) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const;
+      virtual CORBA::ValueModifier type_modifier_i () const;
+      virtual CORBA::TypeCode_ptr concrete_base_type_i () const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 6bff91a30bc..54d40980a78 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -87,7 +87,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                     TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
@@ -96,7 +96,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
+                     TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -224,7 +224,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
     tc_fields (this->nfields_);
@@ -244,8 +244,7 @@ TAO::TypeCode::Value<char const *,
           tc_fields[i].name = empty_name;
           tc_fields[i].type =
             Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                );
+              this->fields_[i].type)->get_compact_typecode ();
           tc_fields[i].visibility = this->fields_[i].visibility;
         }
     }
@@ -276,7 +275,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::id_i (void) const
+                     TAO::Null_RefCount_Policy>::id_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -288,7 +287,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::name_i (void) const
+                     TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -300,7 +299,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (void) const
+                     TAO::Null_RefCount_Policy>::member_count_i () const
 {
   return this->nfields_;
 }
@@ -356,7 +355,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::type_modifier_i (void) const
+                     TAO::Null_RefCount_Policy>::type_modifier_i () const
 {
   return this->type_modifier_;
 }
@@ -367,7 +366,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::concrete_base_type_i (
-  void) const
+  ) const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
index b159728edb8..e269498b648 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
@@ -79,8 +79,8 @@ namespace TAO
        */
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -95,15 +95,15 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const;
-      virtual CORBA::ValueModifier type_modifier_i (void) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const;
+      virtual CORBA::ValueModifier type_modifier_i () const;
+      virtual CORBA::TypeCode_ptr concrete_base_type_i () const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index 0ae018b16e5..69d88d32aba 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -586,8 +586,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
     tc->member_type (current_member);
   return TAO_Marshal_Object::perform_append (member_tc.in (),
                                              src,
-                                             dest
-                                            );
+                                             dest);
 }
 
 TAO::traverse_status
@@ -809,8 +808,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
             {
               retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                            src,
-                                                           dest
-                                                           );
+                                                           dest);
             }
           break;
         }// end of switch
@@ -996,8 +994,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
         {
           retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                        src,
-                                                       dest
-                                                      );
+                                                       dest);
         }
       break;
     }// end of switch
@@ -1050,8 +1047,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
 TAO::traverse_status
 TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            )
+                            TAO_OutputCDR *dest)
 {
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
@@ -1092,8 +1088,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
 TAO::traverse_status
 TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
                              TAO_InputCDR *src,
-                             TAO_OutputCDR *dest
-                             )
+                             TAO_OutputCDR *dest)
 {
   CORBA::Boolean continue_append = true;
 
@@ -1120,8 +1115,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
 TAO::traverse_status
 TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           )
+                           TAO_OutputCDR *dest)
 {
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
@@ -1181,8 +1175,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
       param = tc->content_type ();
       retval = TAO_Marshal_Object::perform_append (param.in (),
                                                    src,
-                                                   dest
-                                                   );
+                                                   dest);
     }
   else // tc->kind () must be  tk_value  or  tk_event
     {
@@ -1192,8 +1185,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
         {
           retval = this->append (param.in (),
                                  src,
-                                 dest
-                                );
+                                 dest);
         }
 
       if (retval == TAO::TRAVERSE_CONTINUE)
@@ -1212,8 +1204,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
               retval =
                 TAO_Marshal_Object::perform_append (param.in (),
                                                     src,
-                                                    dest
-                                                   );
+                                                    dest);
             }
         }
     }
diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp
index 325f0fd6a1c..e06af880abb 100644
--- a/TAO/tao/AnyTypeCode_Adapter.cpp
+++ b/TAO/tao/AnyTypeCode_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void)
+TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h
index 395fdb7df83..e7e793c952c 100644
--- a/TAO/tao/AnyTypeCode_Adapter.h
+++ b/TAO/tao/AnyTypeCode_Adapter.h
@@ -62,7 +62,7 @@ class TAO_Export TAO_AnyTypeCode_Adapter
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_AnyTypeCode_Adapter (void);
+  virtual ~TAO_AnyTypeCode_Adapter ();
 
 #define ANYTYPECODE__EXCEPTION_LIST \
     TAO_SYSTEM_EXCEPTION (UNKNOWN) \
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index 0125be2ffea..fab7b1d7514 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Argument::~Argument (void)
+TAO::Argument::~Argument ()
 {
 }
 
@@ -22,7 +22,7 @@ TAO::Argument::demarshal (TAO_InputCDR &)
 TAO::Argument *
 TAO::Argument::clone ()
 {
-  return 0;
+  return nullptr;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -33,25 +33,25 @@ TAO::Argument::interceptor_value (CORBA::Any *) const
 }
 
 CORBA::ParameterMode
-TAO::InArgument::mode (void) const
+TAO::InArgument::mode () const
 {
   return CORBA::PARAM_IN;
 }
 
 CORBA::ParameterMode
-TAO::InoutArgument::mode (void) const
+TAO::InoutArgument::mode () const
 {
   return CORBA::PARAM_INOUT;
 }
 
 CORBA::ParameterMode
-TAO::OutArgument::mode (void) const
+TAO::OutArgument::mode () const
 {
   return CORBA::PARAM_OUT;
 }
 
 CORBA::ParameterMode
-TAO::RetArgument::mode (void) const
+TAO::RetArgument::mode () const
 {
   return CORBA::PARAM_OUT;
 }
@@ -59,12 +59,12 @@ TAO::RetArgument::mode (void) const
 #endif /* TAO_HAS_INTERCEPTORS */
 
 TAO::Argument *
-TAO::Void_Return_Argument::clone (void)
+TAO::Void_Return_Argument::clone ()
 {
-  TAO::Argument *clone_arg = 0;
+  TAO::Argument *clone_arg = nullptr;
   ACE_NEW_RETURN (clone_arg,
                   Void_Return_Argument (),
-                  0);
+                  nullptr);
   return clone_arg;
 }
 
diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h
index 96b084c29b5..f47baa2a74f 100644
--- a/TAO/tao/Argument.h
+++ b/TAO/tao/Argument.h
@@ -51,7 +51,7 @@ namespace TAO
   public:
 
     /// Destructor.
-    virtual ~Argument (void);
+    virtual ~Argument ();
 
     /// Marshal the argument into the given CDR output stream.
     /**
@@ -66,7 +66,7 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
     /// Template method to clone a TAO Argument
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -86,7 +86,7 @@ namespace TAO
     virtual void interceptor_value (CORBA::Any *) const;
 
     /// Get the parameter mode of this argument
-    virtual CORBA::ParameterMode mode (void) const = 0;
+    virtual CORBA::ParameterMode mode () const = 0;
     //@}
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
@@ -97,7 +97,7 @@ namespace TAO
   class TAO_Export InArgument : public Argument
   {
   public:
-    virtual CORBA::ParameterMode mode (void) const;
+    virtual CORBA::ParameterMode mode () const;
   };
 #else
   typedef Argument InArgument;
@@ -107,7 +107,7 @@ namespace TAO
   class TAO_Export InoutArgument : public Argument
   {
   public:
-    virtual CORBA::ParameterMode mode (void) const;
+    virtual CORBA::ParameterMode mode () const;
   };
 #else
   typedef Argument InoutArgument;
@@ -117,7 +117,7 @@ namespace TAO
   class TAO_Export OutArgument : public Argument
   {
   public:
-    virtual CORBA::ParameterMode mode (void) const;
+    virtual CORBA::ParameterMode mode () const;
   };
 #else
   typedef Argument OutArgument;
@@ -127,7 +127,7 @@ namespace TAO
   class TAO_Export RetArgument : public Argument
   {
   public:
-    virtual CORBA::ParameterMode mode (void) const;
+    virtual CORBA::ParameterMode mode () const;
   };
 #else
   typedef Argument RetArgument;
@@ -136,7 +136,7 @@ namespace TAO
   class TAO_Export Void_Return_Argument : public RetArgument
   {
   public:
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
   };
 }
 
diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h
index 086cd3eacc1..33a79646a44 100644
--- a/TAO/tao/Array_Traits_T.h
+++ b/TAO/tao/Array_Traits_T.h
@@ -37,7 +37,7 @@ struct array_traits
     TAO::Array_Traits<forany_type>::free (value);
   }
 
-  inline static slice_type * alloc (void)
+  inline static slice_type * alloc ()
   {
     return TAO::Array_Traits<forany_type>::alloc ();
   }
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp
index c898e7a09fd..49c04124aea 100644
--- a/TAO/tao/Array_VarOut_T.cpp
+++ b/TAO/tao/Array_VarOut_T.cpp
@@ -28,8 +28,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p)
 template<typename T, typename T_slice, typename TAG>
 TAO_FixedArray_Var_T<T,T_slice,TAG> &
 TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (
-    const TAO_FixedArray_Var_T<T,T_slice,TAG> & p
-  )
+    const TAO_FixedArray_Var_T<T,T_slice,TAG> & p)
 {
   if (this != &p)
     {
@@ -62,8 +61,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p)
 template<typename T, typename T_slice, typename TAG>
 TAO_VarArray_Var_T<T,T_slice,TAG> &
 TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (
-    const TAO_VarArray_Var_T<T,T_slice,TAG> & p
-  )
+    const TAO_VarArray_Var_T<T,T_slice,TAG> & p)
 {
   if (this != &p)
     {
@@ -81,8 +79,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (
 template<typename T, typename T_slice, typename TAG>
 void
 TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
+    void * _tao_void_pointer)
 {
   T_slice * tmp = static_cast<T_slice *> (_tao_void_pointer);
   TAO::Array_Traits<FORANY>::free (tmp);
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index 294c0c21a37..78ac9ed7eff 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -49,10 +49,10 @@ public:
   typedef T_slice _slice_type;
   typedef TAG _tag_type;
 
-  TAO_Array_Forany_T (void);
+  TAO_Array_Forany_T ();
   TAO_Array_Forany_T (_slice_type *, CORBA::Boolean nocopy = false);
   TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &);
-  ~TAO_Array_Forany_T (void);
+  ~TAO_Array_Forany_T ();
 
   static void _tao_any_destructor (void *);
 
@@ -72,14 +72,14 @@ public:
   typedef       _slice_type *&  _retn_arg_type;
 
   // in, inout, out, _retn
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _out_type     out (void);
-  _retn_type    _retn (void);
-  _slice_type * ptr (void) const;
-  CORBA::Boolean nocopy (void) const;
-
-  static _slice_type * tao_alloc (void);
+  _in_type      in () const;
+  _inout_type   inout ();
+  _out_type     out ();
+  _retn_type    _retn ();
+  _slice_type * ptr () const;
+  CORBA::Boolean nocopy () const;
+
+  static _slice_type * tao_alloc ();
 private:
   typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY;
   _slice_type * ptr_;
@@ -99,10 +99,10 @@ public:
   typedef T_slice  const & _const_subscript_type;
   typedef T_slice  & _subscript_type;
 
-  TAO_Array_Var_Base_T (void);
+  TAO_Array_Var_Base_T ();
   TAO_Array_Var_Base_T (_slice_type *);
   TAO_Array_Var_Base_T (const TAO_Array_Var_Base_T<T,T_slice,TAG> &);
-  ~TAO_Array_Var_Base_T (void);
+  ~TAO_Array_Var_Base_T ();
 
   _subscript_type operator[] (CORBA::ULong index);
   _const_subscript_type operator[] (CORBA::ULong index) const;
@@ -114,13 +114,13 @@ public:
   typedef       _slice_type *&  _retn_arg_type;
 
   // in, inout, out, _retn
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _retn_type    _retn (void);
-  _retn_arg_type  _retn_arg (void);
+  _in_type      in () const;
+  _inout_type   inout ();
+  _retn_type    _retn ();
+  _retn_arg_type  _retn_arg ();
 
   // TAO extension.
-  _retn_type    ptr (void) const;
+  _retn_type    ptr () const;
 protected:
   typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY;
   _slice_type * ptr_;
@@ -139,7 +139,7 @@ public:
   typedef T_slice _slice_type;
   typedef T_slice *_out_type;
 
-  TAO_FixedArray_Var_T (void);
+  TAO_FixedArray_Var_T ();
   TAO_FixedArray_Var_T (_slice_type *);
   TAO_FixedArray_Var_T (const TAO_FixedArray_Var_T<T,T_slice,TAG> &);
 
@@ -147,7 +147,7 @@ public:
   TAO_FixedArray_Var_T<T,T_slice,TAG> &operator= (
       const TAO_FixedArray_Var_T<T,T_slice,TAG> &);
 
-  _out_type     out (void);
+  _out_type     out ();
 
 private:
   // Some compilers don't look into the base class when parsing
@@ -168,7 +168,7 @@ public:
   typedef T_slice _slice_type;
   typedef T_slice *&_out_type;
 
-  TAO_VarArray_Var_T (void);
+  TAO_VarArray_Var_T ();
   TAO_VarArray_Var_T (_slice_type *);
   TAO_VarArray_Var_T (const TAO_VarArray_Var_T<T,T_slice,TAG> &);
 
@@ -176,7 +176,7 @@ public:
   TAO_VarArray_Var_T<T,T_slice,TAG> &operator= (
       const TAO_VarArray_Var_T<T,T_slice,TAG> &);
 
-  _out_type     out (void);
+  _out_type     out ();
 
   operator _slice_type *& ();
 
@@ -208,7 +208,7 @@ public:
   TAO_Array_Out_T<T,T_var,T_slice,TAG> &operator= (_slice_type *);
 
   operator _slice_type *& ();
-  _slice_type *& ptr (void);
+  _slice_type *& ptr ();
 
   _slice_type & operator[] (CORBA::ULong index);
   const _slice_type & operator[] (CORBA::ULong index) const;
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index a3ab61af4b8..b2be7077f10 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -189,8 +189,7 @@ TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_var & p)
 template<typename T, typename T_var, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (
-    const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p
-  )
+    const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p)
   : ptr_ (const_cast<THIS_OUT_TYPE &> (p).ptr_)
 {}
 
@@ -198,8 +197,7 @@ template<typename T, typename T_var, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Out_T<T,T_var,T_slice,TAG> &
 TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator= (
-    const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p
-  )
+    const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p)
 {
   this->ptr_ = const_cast<THIS_OUT_TYPE &> (p).ptr_;
   return *this;
@@ -250,8 +248,7 @@ template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (
     T_slice * p,
-    CORBA::Boolean nocopy
-  )
+    CORBA::Boolean nocopy)
   : ptr_ (p),
     nocopy_ (nocopy)
 {}
@@ -259,8 +256,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (
 template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (
-    const TAO_Array_Forany_T<T,T_slice,TAG> & p
-  )
+    const TAO_Array_Forany_T<T,T_slice,TAG> & p)
   : ptr_ (p.ptr_),
     nocopy_ (p.nocopy_)
 {
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index f79242ceac2..e2952ff3569 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -24,7 +24,7 @@ TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (
   , offset_ (0)
   , abs_timeout_ (ACE_Time_Value::zero)
 {
-  if (timeout != 0)// && *timeout != ACE_Time_Value::zero)
+  if (timeout != nullptr)// && *timeout != ACE_Time_Value::zero)
     {
       this->abs_timeout_ = ACE_High_Res_Timer::gettimeofday_hr () + *timeout;
     }
@@ -33,7 +33,7 @@ TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (
 
   size_t copy_offset = 0;
   for (const ACE_Message_Block *i = contents;
-       i != 0;
+       i != nullptr;
        i = i->cont ())
     {
       ACE_OS::memcpy (this->buffer_ + copy_offset,
@@ -57,20 +57,20 @@ TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (char *buf,
 {
 }
 
-TAO_Asynch_Queued_Message::~TAO_Asynch_Queued_Message (void)
+TAO_Asynch_Queued_Message::~TAO_Asynch_Queued_Message ()
 {
   // @@ Use a pool for these guys!
   delete [] this->buffer_;
 }
 
 size_t
-TAO_Asynch_Queued_Message::message_length (void) const
+TAO_Asynch_Queued_Message::message_length () const
 {
   return this->size_ - this->offset_;
 }
 
 int
-TAO_Asynch_Queued_Message::all_data_sent (void) const
+TAO_Asynch_Queued_Message::all_data_sent () const
 {
   return this->size_ == this->offset_;
 }
@@ -112,7 +112,7 @@ TAO_Asynch_Queued_Message::bytes_transferred (size_t &byte_count)
 TAO_Queued_Message *
 TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc)
 {
-  char *buf = 0;
+  char *buf = nullptr;
 
   // @todo: Need to use a memory pool. But certain things need to
   // change a bit in this class for that. Till then.
@@ -123,13 +123,13 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc)
 
   ACE_NEW_RETURN (buf,
                   char[sz],
-                  0);
+                  nullptr);
 
   ACE_OS::memcpy (buf,
                   this->buffer_ + this->offset_,
                   sz);
 
-  TAO_Asynch_Queued_Message *qm = 0;
+  TAO_Asynch_Queued_Message *qm = nullptr;
 
   if (alloc)
     {
@@ -142,7 +142,7 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc)
                                                         this->abs_timeout_,
                                                         alloc,
                                                         true),
-                             0);
+                             nullptr);
     }
   else
     {
@@ -160,16 +160,16 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc)
                                                  this->orb_core_,
                                                  sz,
                                                  this->abs_timeout_,
-                                                 0,
+                                                 nullptr,
                                                  true),
-                      0);
+                      nullptr);
     }
 
   return qm;
 }
 
 void
-TAO_Asynch_Queued_Message::destroy (void)
+TAO_Asynch_Queued_Message::destroy ()
 {
   if (this->is_heap_created_)
     {
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
index a80ac9e9700..8fe4a8281e7 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
@@ -28,8 +28,8 @@ TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base (
                 TAO_DEF_GIOP_MAJOR,
                 TAO_DEF_GIOP_MINOR,
                 orb_core)
-  , transport_ (0)
-  , lock_ (0)
+  , transport_ (nullptr)
+  , lock_ (nullptr)
   , is_reply_dispatched_ (false)
 {
   // @@ NOTE: Need a separate option for this..
@@ -38,10 +38,10 @@ TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base (
 }
 
 // Destructor.
-TAO_Asynch_Reply_Dispatcher_Base::~TAO_Asynch_Reply_Dispatcher_Base (void)
+TAO_Asynch_Reply_Dispatcher_Base::~TAO_Asynch_Reply_Dispatcher_Base ()
 {
   // Release the transport that we own
-  if (this->transport_ != 0)
+  if (this->transport_ != nullptr)
     this->transport_->remove_reference ();
 
   if (this->lock_)
@@ -51,7 +51,7 @@ TAO_Asynch_Reply_Dispatcher_Base::~TAO_Asynch_Reply_Dispatcher_Base (void)
 void
 TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t)
 {
-  if (this->transport_ != 0)
+  if (this->transport_ != nullptr)
     this->transport_->remove_reference ();
 
   this->transport_ = t;
@@ -60,7 +60,7 @@ TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t)
 }
 
 bool
-TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply (void)
+TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply ()
 {
   if (this->is_reply_dispatched_)
     {
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index ca07c546f93..ada4e29eacb 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -70,11 +70,11 @@ public:
    * Why are we clumping everything in one method. Answer is we need
    * atomicity?
    */
-  bool try_dispatch_reply (void);
+  bool try_dispatch_reply ();
 
 protected:
   /// Destructor.
-  virtual ~TAO_Asynch_Reply_Dispatcher_Base (void);
+  virtual ~TAO_Asynch_Reply_Dispatcher_Base ();
 
 private:
   void operator= (const TAO_Asynch_Reply_Dispatcher_Base &);
diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp
index 4a4f834c157..17a83e1a618 100644
--- a/TAO/tao/Base_Transport_Property.cpp
+++ b/TAO/tao/Base_Transport_Property.cpp
@@ -7,21 +7,21 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void)
+TAO_Base_Transport_Property::~TAO_Base_Transport_Property ()
 {
 }
 
 TAO_Transport_Descriptor_Interface *
-TAO_Base_Transport_Property::duplicate (void)
+TAO_Base_Transport_Property::duplicate ()
 {
   // Get a copy of the underlying endpoint
   TAO_Endpoint *const endpt = this->endpoint_->duplicate ();
-  if (endpt == 0)
-    return 0;
+  if (endpt == nullptr)
+    return nullptr;
 
   // Construct a copy of our class
-  TAO_Base_Transport_Property *prop = 0;
-  ACE_NEW_RETURN (prop, TAO_Base_Transport_Property (endpt, true), 0);
+  TAO_Base_Transport_Property *prop = nullptr;
+  ACE_NEW_RETURN (prop, TAO_Base_Transport_Property (endpt, true), nullptr);
   return prop;
 }
 
@@ -33,7 +33,7 @@ TAO_Base_Transport_Property::is_equivalent
   const TAO_Base_Transport_Property *other_desc =
     dynamic_cast<const TAO_Base_Transport_Property *> (rhs);
 
-  if (other_desc == 0)
+  if (other_desc == nullptr)
     return false;
 
   return this->endpoint_->is_equivalent (other_desc->endpoint_);
@@ -41,7 +41,7 @@ TAO_Base_Transport_Property::is_equivalent
 
 
 u_long
-TAO_Base_Transport_Property::hash (void) const
+TAO_Base_Transport_Property::hash () const
 {
   return this->endpoint_->hash ();
 }
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index 8af4f039df8..806620dc950 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -39,7 +39,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S arg (void) const;
+    S arg () const;
 
   protected:
     S const & x_;
@@ -58,9 +58,9 @@ namespace TAO
   {
   public:
     In_Basic_Clonable_Argument_T (S const & x);
-    virtual ~In_Basic_Clonable_Argument_T (void);
+    virtual ~In_Basic_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -84,7 +84,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_;
@@ -107,7 +107,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_;
@@ -124,16 +124,16 @@ namespace TAO
   class Ret_Basic_Argument_T : public RetArgument
   {
   public:
-    Ret_Basic_Argument_T (void);
+    Ret_Basic_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 */
-    S & arg (void);
+    S & arg ();
 
-    S excp (void);
-    S retn (void);
+    S excp ();
+    S retn ();
 
   private:
     S x_;
diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp
index c5e01c278f8..1149f04dc66 100644
--- a/TAO/tao/BiDir_Adapter.cpp
+++ b/TAO/tao/BiDir_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void)
+TAO_BiDir_Adapter::~TAO_BiDir_Adapter ()
 {
 }
 
diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp
index 7922d29f21c..09a144d62f3 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.cpp
+++ b/TAO/tao/Bind_Dispatcher_Guard.cpp
@@ -21,7 +21,7 @@ TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (CORBA::ULong request_id,
     this->status_ = TAO_Bind_Dispatcher_Guard::NO_UNBIND;
 }
 
-TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard (void)
+TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard ()
 {
   // We try unbinding. If it works it works, else cant do much about
   // it..
diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h
index 13ffed795ee..d1e26eedb8b 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.h
+++ b/TAO/tao/Bind_Dispatcher_Guard.h
@@ -29,10 +29,10 @@ public:
                              TAO_Reply_Dispatcher* rd,
                              TAO_Transport_Mux_Strategy* tms);
 
-  ~TAO_Bind_Dispatcher_Guard (void);
+  ~TAO_Bind_Dispatcher_Guard ();
 
   /// Returns 0 if successful and non-zero otherwise.
-  int unbind_dispatcher (void);
+  int unbind_dispatcher ();
 
   /// State information
   enum TAO_Bind_Dispatcher_Status
@@ -44,7 +44,7 @@ public:
     };
 
   /// Get status
-  TAO_Bind_Dispatcher_Status status (void) const;
+  TAO_Bind_Dispatcher_Status status () const;
 
   /// Set status
   void status (TAO_Bind_Dispatcher_Status status);
diff --git a/TAO/tao/Bind_Dispatcher_Guard.inl b/TAO/tao/Bind_Dispatcher_Guard.inl
index 3068dfd7608..f38bc197f40 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.inl
+++ b/TAO/tao/Bind_Dispatcher_Guard.inl
@@ -22,13 +22,13 @@ TAO_Bind_Dispatcher_Guard::status (TAO_Bind_Dispatcher_Status s)
 }
 
 ACE_INLINE TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Status
-TAO_Bind_Dispatcher_Guard::status (void) const
+TAO_Bind_Dispatcher_Guard::status () const
 {
   return this->status_;
 }
 
 ACE_INLINE int
-TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void)
+TAO_Bind_Dispatcher_Guard::unbind_dispatcher ()
 {
   int const retval =
     this->tms_->unbind_dispatcher (this->request_id_);
diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp
index b55e0ff00c2..0c731feb8e4 100644
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ b/TAO/tao/Blocked_Connect_Strategy.cpp
@@ -15,7 +15,7 @@ void
 TAO_Blocked_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
                                              ACE_Synch_Options &options)
 {
-  if (timeout != 0)
+  if (timeout != nullptr)
     {
       // Blocking with a timeout
       options.set (ACE_Synch_Options::USE_TIMEOUT, *timeout);
diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h
index 553d70f6349..a249e9110ff 100644
--- a/TAO/tao/Bounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h
@@ -12,7 +12,6 @@
 #include "tao/Generic_Sequence_T.h"
 #include "tao/String_Sequence_Element_T.h"
 #include "tao/String_Const_Sequence_Element_T.h"
-#include "tao/MM_Sequence_Iterator_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -38,7 +37,7 @@ public:
   typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
 
   // @copydoc TAO::details::generic_sequence::generic_sequence()
-  inline bounded_basic_string_sequence(void)
+  inline bounded_basic_string_sequence()
     : impl_()
   {}
   // @copydoc TAO::details::generic_sequence::generic_sequence()
@@ -105,77 +104,6 @@ public:
     implementation_type::freebuf(buffer);
   }
 
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  ///
-  /// Additions to support iterator semantics for TAO unbounded basic
-  /// string sequences.
-  ///
-
-  // = Traits and factory methods that create iterators.
-  typedef MM_Sequence_Iterator<bounded_basic_string_sequence<charT, MAX> > iterator;
-  typedef Const_MM_Sequence_Iterator<bounded_basic_string_sequence<charT, MAX> > const_iterator;
-  typedef MM_Sequence_Reverse_Iterator<bounded_basic_string_sequence<charT, MAX> > reverse_iterator;
-  typedef Const_MM_Sequence_Reverse_Iterator<bounded_basic_string_sequence<charT, MAX> > const_reverse_iterator;
-
-  /// Get an iterator that points to the beginning of the sequence.
-  inline iterator begin (void)
-  {
-    return iterator (&this->impl_);
-  }
-
-  /// Get a const iterator that points to the beginning of the sequence.
-  inline const_iterator begin (void) const
-  {
-    return const_iterator (&this->impl_);
-  }
-
-  /// Get an iterator that points to the end of the sequence.
-  inline iterator end (void)
-  {
-    return iterator (&this->impl_,
-                     this->impl_.length ());
-  }
-
-  /// Get a const iterator that points to the end of the sequence.
-  inline const_iterator end (void) const
-  {
-    return const_iterator (&this->impl_,
-                           this->impl_.length ());
-  }
-
-  /// Get a reverse iterator that points to the end of the sequence.
-  inline reverse_iterator rbegin (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             this->impl_.length () - 1);
-  }
-
-  /// Get a const reverse iterator that points to the end of the sequence.
-  inline const_reverse_iterator rbegin (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   this->impl_.length () - 1);
-  }
-
-  /// Get a reverse iterator that points to one before the beginning
-  /// of the sequence.
-  inline reverse_iterator rend (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             -1);
-  }
-
-  /// Get a const reverse iterator that points to one before the
-  /// beginning of the sequence.
-  inline const_reverse_iterator rend (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   -1);
-  }
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 private:
   implementation_type impl_;
 };
diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h
index 7a8cda5385a..1f3c7d0d577 100644
--- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h
+++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h
@@ -12,7 +12,6 @@
 #include "Generic_Sequence_T.h"
 #include "Object_Reference_Sequence_Element_T.h"
 #include "Object_Reference_Const_Sequence_Element_T.h"
-#include "tao/MM_Sequence_Iterator_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -109,78 +108,6 @@ public:
     implementation_type::freebuf(buffer);
   }
 
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  ///
-  /// Additions to support iterator semantics for TAO bounded object
-  /// reference sequences.
-  ///
-
-  // = Traits and factory methods that create iterators.
-  typedef MM_Sequence_Iterator<bounded_object_reference_sequence<object_t, object_t_var, MAX> > iterator;
-  typedef Const_MM_Sequence_Iterator<bounded_object_reference_sequence<object_t, object_t_var, MAX> > const_iterator;
-  typedef MM_Sequence_Reverse_Iterator<bounded_object_reference_sequence<object_t, object_t_var, MAX> > reverse_iterator;
-  typedef Const_MM_Sequence_Reverse_Iterator<bounded_object_reference_sequence<object_t, object_t_var, MAX> > const_reverse_iterator;
-
-  /// Get an iterator that points to the beginning of the sequence.
-  iterator begin (void)
-  {
-    return iterator (&this->impl_);
-  }
-
-  /// Get a const iterator that points to the beginning of the sequence.
-  const_iterator begin (void) const
-  {
-    return const_iterator (&this->impl_);
-  }
-
-  /// Get an iterator that points to the end of the sequence.
-  iterator end (void)
-  {
-    return iterator (&this->impl_,
-                     this->impl_.length ());
-  }
-
-  /// Get a const iterator that points to the end of the sequence.
-  const_iterator end (void) const
-  {
-    return const_iterator (&this->impl_,
-                           this->impl_.length ());
-  }
-
-  /// Get a reverse iterator that points to the end of the sequence.
-  reverse_iterator rbegin (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             this->impl_.length () - 1);
-  }
-
-  /// Get a const reverse iterator that points to the end of the sequence.
-  const_reverse_iterator rbegin (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   this->impl_.length () - 1);
-  }
-
-  /// Get a reverse iterator that points to one before the beginning
-  /// of the sequence.
-  reverse_iterator rend (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             -1);
-  }
-
-  /// Get a const reverse iterator that points to one before the
-  /// beginning of the sequence.
-  const_reverse_iterator rend (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   -1);
-  }
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 private:
   implementation_type impl_;
 };
diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h
index bed4622609c..723de777a9e 100644
--- a/TAO/tao/Buffer_Allocator_T.h
+++ b/TAO/tao/Buffer_Allocator_T.h
@@ -39,7 +39,7 @@ namespace TAO
       typedef alloc_type ALLOC_TYPE;
       TAO_Buffer_Allocator (alloc_type *allocator);
 
-      virtual handler_type *allocate (void);
+      virtual handler_type *allocate ();
       virtual void release (handler_type *ptr);
     private:
       alloc_type* allocator_;
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 53c4318b9c1..79835eacf2c 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -64,12 +64,12 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size,
                    memcpy_tradeoff,
                    major_version,
                    minor_version)
-  , fragmentation_strategy_ (0)
+  , fragmentation_strategy_ (nullptr)
   , more_fragments_ (false)
   , request_id_ (0)
-  , stub_ (0)
+  , stub_ (nullptr)
   , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
-  , timeout_ (0)
+  , timeout_ (nullptr)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER);
 
@@ -100,12 +100,12 @@ TAO_OutputCDR::TAO_OutputCDR (char *data,
                    memcpy_tradeoff,
                    major_version,
                    minor_version)
-  , fragmentation_strategy_ (0)
+  , fragmentation_strategy_ (nullptr)
   , more_fragments_ (false)
   , request_id_ (0)
-  , stub_ (0)
+  , stub_ (nullptr)
   , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
-  , timeout_ (0)
+  , timeout_ (nullptr)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER);
 }
@@ -132,9 +132,9 @@ TAO_OutputCDR::TAO_OutputCDR (char *data,
   , fragmentation_strategy_ (fs)
   , more_fragments_ (false)
   , request_id_ (0)
-  , stub_ (0)
+  , stub_ (nullptr)
   , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
-  , timeout_ (0)
+  , timeout_ (nullptr)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER);
 }
@@ -149,12 +149,12 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data,
                    memcpy_tradeoff,
                    major_version,
                    minor_version)
-  , fragmentation_strategy_ (0)
+  , fragmentation_strategy_ (nullptr)
   , more_fragments_ (false)
   , request_id_ (0)
-  , stub_ (0)
+  , stub_ (nullptr)
   , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
-  , timeout_ (0)
+  , timeout_ (nullptr)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR4_ENTER);
 }
@@ -175,9 +175,9 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Data_Block *data_block,
   , fragmentation_strategy_ (fs)
   , more_fragments_ (false)
   , request_id_ (0)
-  , stub_ (0)
+  , stub_ (nullptr)
   , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
-  , timeout_ (0)
+  , timeout_ (nullptr)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR5_ENTER);
 }
@@ -291,15 +291,15 @@ TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs,
   : ACE_InputCDR (rhs,
                   buffer_allocator
                   ? buffer_allocator
-                  : (orb_core ? orb_core->output_cdr_buffer_allocator () : 0),
+                  : (orb_core ? orb_core->output_cdr_buffer_allocator () : nullptr),
                   data_block_allocator
                   ? data_block_allocator
                   : (orb_core ? orb_core->output_cdr_dblock_allocator () :
-                     0),
+                     nullptr),
                   message_block_allocator
                   ? message_block_allocator
                   : (orb_core ?
-                     orb_core->output_cdr_msgblock_allocator () : 0)),
+                     orb_core->output_cdr_msgblock_allocator () : nullptr)),
   orb_core_ (orb_core)
 {
 }
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index f7406c6000d..1b1168c5cf2 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -163,7 +163,7 @@ public:
                  ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR);
 
   /// Destructor.
-  ~TAO_OutputCDR (void);
+  ~TAO_OutputCDR ();
 
   // @todo do we want a special method to write an array of
   // strings and wstrings?
@@ -190,7 +190,7 @@ public:
                         ACE_CDR::ULong pending_length);
 
   /// Are there more data fragments to come?
-  bool more_fragments (void) const;
+  bool more_fragments () const;
 
   /// Specify whether there are more data fragments to come.
   void more_fragments (bool more);
@@ -202,16 +202,16 @@ public:
                            ACE_Time_Value * timeout);
 
   /// Fragmented message request ID.
-  CORBA::ULong request_id (void) const;
+  CORBA::ULong request_id () const;
 
   /// Stub object associated with the request.
-  TAO_Stub * stub (void) const;
+  TAO_Stub * stub () const;
 
   /// Message semantics (twoway, oneway, reply)
-  TAO_Message_Semantics message_semantics (void) const;
+  TAO_Message_Semantics message_semantics () const;
 
   /// Maximum time to wait for outgoing message to be sent.
-  ACE_Time_Value * timeout (void) const;
+  ACE_Time_Value * timeout () const;
   //@}
 
   /// These methods are used by valuetype indirection support.
@@ -240,9 +240,10 @@ public:
   int offset (char* pos);
 
 private:
-  // disallow copying...
-  TAO_OutputCDR (const TAO_OutputCDR& rhs);
-  TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs);
+  TAO_OutputCDR (const TAO_OutputCDR&rhs) = delete;
+  TAO_OutputCDR& operator= (const TAO_OutputCDR&) = delete;
+  TAO_OutputCDR (TAO_OutputCDR&&) = delete;
+  TAO_OutputCDR& operator= (TAO_OutputCDR&&) = delete;
 
 private:
   /**
@@ -408,17 +409,15 @@ public:
   TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs,
                 TAO_ORB_Core* orb_core = 0);
 
-#if defined (ACE_HAS_CPP11)
   TAO_InputCDR& operator= (const TAO_InputCDR&) = default;
-#endif /* ACE_HAS_CPP11 */
 
   /// Destructor
-  virtual ~TAO_InputCDR (void);
+  virtual ~TAO_InputCDR ();
 
   // = TAO specific methods.
 
   /// Accessor
-  TAO_ORB_Core *orb_core (void) const;
+  TAO_ORB_Core *orb_core () const;
 
   ACE_Message_Block::Message_Flags
     clr_mb_flags( ACE_Message_Block::Message_Flags less_flags );
diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl
index c4fb156fcc5..08d0efeae3e 100644
--- a/TAO/tao/CDR.inl
+++ b/TAO/tao/CDR.inl
@@ -454,14 +454,10 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       const std::string &x)
 {
-#if defined (ACE_HAS_CPP11)
   return
     os.fragment_stream (ACE_CDR::OCTET_ALIGN,
                         sizeof (char))
     && static_cast<ACE_OutputCDR &> (os) << x;
-#else
-  return os << x.c_str ();
-#endif
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
@@ -479,16 +475,12 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       const std::wstring &x)
 {
-#if defined (ACE_HAS_CPP11)
   return
     os.fragment_stream ((sizeof (CORBA::WChar) == 2
                          ? ACE_CDR::SHORT_ALIGN
                          : ACE_CDR::LONG_ALIGN),
                         sizeof (CORBA::WChar))
     && static_cast<ACE_OutputCDR &> (os) << x;
-#else
-  return os << x.c_str ();
-#endif
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index fd98b445944..dff01bf48c0 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -31,7 +31,7 @@ static const char iiop_token_len = sizeof iiop_token - 1;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void)
+TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser ()
 {
 }
 
@@ -49,7 +49,7 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
                                               TAO_MProfile &mprofile)
 {
   // Create a TAO_Stub.
-  TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0, mprofile);
+  TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) nullptr, mprofile);
 
   TAO_Stub_Auto_Ptr safe_data (data);
 
@@ -137,10 +137,10 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb)
     size_t ndx = endpoints.size();
     endpoints.size(ndx+1);
     bool uiop_compatible = false;
-    TAO_ConnectorSetIterator conn_iter = 0;
+    TAO_ConnectorSetIterator conn_iter = nullptr;
     for (conn_iter = conn_reg->begin();
          conn_iter != conn_reg->end() &&
-           endpoints[ndx].profile_ == 0;
+           endpoints[ndx].profile_ == nullptr;
          conn_iter ++)
       {
         endpoints[ndx].profile_ =
@@ -156,7 +156,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb)
           }
       }
 
-    if (endpoints[ndx].profile_ == 0)
+    if (endpoints[ndx].profile_ == nullptr)
       {
         if (TAO_debug_level)
           TAOLIB_ERROR ((LM_ERROR,
@@ -212,7 +212,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb)
       endpoints[i].profile_->parse_string (str);
       int const share = orb->orb_core()->orb_params()->shared_profile();
       if (mprofile.give_profile(endpoints[i].profile_, share) != -1)
-        endpoints[i].profile_ = 0;
+        endpoints[i].profile_ = nullptr;
       else
         {
           // Although this ought never happen, we want to make some
@@ -252,7 +252,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
   const char *addr_tail = ior + prot_addr_len;
   // skip past version, if any
   separator = ACE_OS::strchr (addr_base,'@');
-  if (separator != 0 && separator < addr_tail)
+  if (separator != nullptr && separator < addr_tail)
     {
       canonical_endpoint.set (addr_base,(separator - addr_base)+1,1);
       addr_base = separator + 1;
@@ -293,7 +293,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
     }
 #endif /* ACE_HAS_IPV6 */
 
-  if (separator != 0 && separator < addr_tail)
+  if (separator != nullptr && separator < addr_tail)
     {
       // we have a port number
       raw_host.set (addr_base, (separator - addr_base), 1);
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 0cdd89afda9..2bd5edee9be 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -18,7 +18,7 @@ static const char corbaname_prefix[] = "corbaname:";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser (void)
+TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser ()
 {
 }
 
@@ -51,7 +51,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
                                     11,
                                     TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY);
 
-  tao_call.invoke (0, 0);
+  tao_call.invoke (nullptr, 0);
 
   return _tao_retval.retn ();
 }
@@ -73,7 +73,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb)
       // string
       ACE_CString::size_type pos_seperator = 0;
 
-      ACE_CString corbaname_str (corbaname, 0, 1);
+      ACE_CString corbaname_str (corbaname, nullptr, 1);
 
       pos_seperator = corbaname_str.find ("#", 0);
 
@@ -90,13 +90,12 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb)
       // CORBALOC assumes "NameService" for the object key if none
       // is provided, so just pass everything between "corbaname:"
       // and "#" as the address
-      ACE_CString corbaloc_addr ("corbaloc:", 0, 1);
+      ACE_CString corbaloc_addr ("corbaloc:", nullptr, 1);
       corbaloc_addr += corbaname_str.substring (0, pos_seperator);
 
       // Obtain a reference to the naming context
       CORBA::Object_var name_context =
-        orb->string_to_object (corbaloc_addr.c_str ()
-                               );
+        orb->string_to_object (corbaloc_addr.c_str ());
 
       // Check if the Object reference is nil.
       if (CORBA::is_nil (name_context.in ()))
diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h
index 81dd555f150..5e308bc9ad2 100644
--- a/TAO/tao/CORBA_String.h
+++ b/TAO/tao/CORBA_String.h
@@ -52,7 +52,7 @@ namespace TAO
     typedef TAO::details::string_traits_base <character_type> s_traits;
 
     /// Default constructor.
-    inline String_var (void) : ptr_ (0)
+    inline String_var () : ptr_ (0)
     {
     }
 
@@ -72,7 +72,7 @@ namespace TAO
     }
 
     /// Destructor.
-    inline ~String_var (void)
+    inline ~String_var ()
     {
       s_traits::release (this->ptr_);
     }
@@ -128,19 +128,19 @@ namespace TAO
     }
 
     /// For in parameter.
-    inline const character_type *in (void) const
+    inline const character_type *in () const
     {
       return this->ptr_;
     }
 
     /// For inout parameter.
-    inline character_type *&inout (void)
+    inline character_type *&inout ()
     {
       return this->ptr_;
     }
 
     /// For out parameter.
-    inline character_type *&out (void)
+    inline character_type *&out ()
     {
       s_traits::release (this->ptr_);
       this->ptr_ = 0;
@@ -148,7 +148,7 @@ namespace TAO
     }
 
     /// For string of return type.
-    inline character_type *_retn (void)
+    inline character_type *_retn ()
     {
       character_type *temp = this->ptr_;
       this->ptr_ = 0;
@@ -225,7 +225,7 @@ namespace TAO
     }
 
     /// Return underlying instance.
-    inline character_type *&ptr (void)
+    inline character_type *&ptr ()
     {
       return this->ptr_;
     }
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 28bbada650c..84741bf7299 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -30,8 +30,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                  lock,
                                  thread_lock,
                                  orb_core,
-                                 object_adapter
-                                ),
+                                 object_adapter),
                     CORBA::NO_MEMORY ());
 
 
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index a77bb5f32e9..9729e0950ac 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -70,8 +70,7 @@ TAO_CSD_POA::new_POA (const String &name,
                              lock,
                              thread_lock,
                              orb_core,
-                             object_adapter
-                            ),
+                             object_adapter),
                     CORBA::NO_MEMORY ());
 
   TAO_CSD_Strategy_Repository *repo =
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
index 73597bdd60f..d4664257a1c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
@@ -41,7 +41,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Synch_Helper
     {
     public:
-
       /// Constructor.  Sets initial state to PENDING.
       TP_Synch_Helper();
 
@@ -63,7 +62,6 @@ namespace TAO
       /// wait_while_pending() to unblock.
       void cancelled();
 
-
     private:
       /// Enumeration Type for all possible states of this helper object.
       enum HelperState
@@ -89,7 +87,6 @@ namespace TAO
       /// state is something other than the PENDING state.
       ConditionType condition_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
index adf5c1b1bc3..05930380a53 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
@@ -10,13 +10,11 @@ TAO::CSD::TP_Synch_Helper::TP_Synch_Helper()
 {
 }
 
-
 ACE_INLINE
 TAO::CSD::TP_Synch_Helper::~TP_Synch_Helper()
 {
 }
 
-
 ACE_INLINE
 bool
 TAO::CSD::TP_Synch_Helper::wait_while_pending()
@@ -31,7 +29,6 @@ TAO::CSD::TP_Synch_Helper::wait_while_pending()
   return (this->state_ == DISPATCHED);
 }
 
-
 ACE_INLINE
 void
 TAO::CSD::TP_Synch_Helper::dispatched()
@@ -41,7 +38,6 @@ TAO::CSD::TP_Synch_Helper::dispatched()
   this->condition_.signal();
 }
 
-
 ACE_INLINE
 void
 TAO::CSD::TP_Synch_Helper::cancelled()
diff --git a/TAO/tao/Cache_Entries_T.cpp b/TAO/tao/Cache_Entries_T.cpp
index e047a890c89..2b3bd726512 100644
--- a/TAO/tao/Cache_Entries_T.cpp
+++ b/TAO/tao/Cache_Entries_T.cpp
@@ -25,7 +25,7 @@ namespace TAO
   }
 
   template <typename TRANSPORT_TYPE>
-  Cache_IntId_T<TRANSPORT_TYPE>::~Cache_IntId_T (void)
+  Cache_IntId_T<TRANSPORT_TYPE>::~Cache_IntId_T ()
   {
     if (this->transport_)
       this->transport_->remove_reference ();
diff --git a/TAO/tao/Cache_Entries_T.h b/TAO/tao/Cache_Entries_T.h
index a4762e34cc8..ed391738a38 100644
--- a/TAO/tao/Cache_Entries_T.h
+++ b/TAO/tao/Cache_Entries_T.h
@@ -65,7 +65,7 @@ namespace TAO
     typedef TRANSPORT_TYPE transport_type;
 
     /// Constructor.
-    Cache_IntId_T (void);
+    Cache_IntId_T ();
 
     /// Constructor.
     Cache_IntId_T (transport_type *transport);
@@ -74,7 +74,7 @@ namespace TAO
     Cache_IntId_T (const Cache_IntId_T & rhs);
 
     /// Destructor.
-    ~Cache_IntId_T (void);
+    ~Cache_IntId_T ();
 
     /// Assignment operator (does copy memory).
     Cache_IntId_T& operator= (const Cache_IntId_T &rhs);
@@ -86,16 +86,16 @@ namespace TAO
     bool operator!= (const Cache_IntId_T &rhs) const;
 
     /// Return the underlying transport
-    transport_type *transport (void);
+    transport_type *transport ();
 
     /// Return the underlying transport
-    const transport_type *transport (void) const;
+    const transport_type *transport () const;
 
     /// Set recycle_state.
     void recycle_state (Cache_Entries_State new_state);
 
     /// Get recycle_state.
-    Cache_Entries_State recycle_state (void) const;
+    Cache_Entries_State recycle_state () const;
 
     /// Relinquish ownership of the TAO_Transport object associated with
     /// this Cache_IntId_T.
@@ -106,10 +106,10 @@ namespace TAO
      *       This method really only exists to get around inadequacies
      *       in the Transport_Cache_Map_Manager interface.
      */
-    transport_type *relinquish_transport (void);
+    transport_type *relinquish_transport ();
 
     /// Get the connected flag
-    bool is_connected (void) const;
+    bool is_connected () const;
 
     /// Set the connected flag
     void is_connected (bool connected);
@@ -144,7 +144,7 @@ namespace TAO
     typedef TRANSPORT_DESCRIPTOR_TYPE transport_descriptor_type;
 
     /// Constructor.
-    Cache_ExtId_T (void);
+    Cache_ExtId_T ();
 
     /// Constructor.
     explicit Cache_ExtId_T (transport_descriptor_type *prop);
@@ -153,7 +153,7 @@ namespace TAO
     Cache_ExtId_T (const Cache_ExtId_T & rhs);
 
     /// Destructor.
-    ~Cache_ExtId_T (void);
+    ~Cache_ExtId_T ();
 
     // = Assignment and comparison operators.
     /// Assignment operator (does copy memory).
@@ -167,24 +167,24 @@ namespace TAO
 
     /// hash function is required in order for this class to be usable by
     /// ACE_Hash_Map_Manager_Ex.
-    u_long hash (void) const;
+    u_long hash () const;
 
     /// Make a deep copy of the underlying pointer
-    void duplicate (void);
+    void duplicate ();
 
     /// Return the index value
-    CORBA::ULong index (void) const;
+    CORBA::ULong index () const;
 
     /// Set the index value. This calls should not be used by any users
     /// but for the TAO_Transport_Cache_Manager class.
     void index (CORBA::ULong index);
 
     /// Increment the index value
-    void incr_index (void);
+    void incr_index ();
 
     // = Accessors
     /// Get the underlying the property pointer
-    transport_descriptor_type *property (void) const;
+    transport_descriptor_type *property () const;
 
   private:
     /// A property object that we represent.
diff --git a/TAO/tao/Cache_Entries_T.inl b/TAO/tao/Cache_Entries_T.inl
index 1b4121eef81..411c7d0e0ff 100644
--- a/TAO/tao/Cache_Entries_T.inl
+++ b/TAO/tao/Cache_Entries_T.inl
@@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   template <typename TRANSPORT_TYPE> ACE_INLINE
-  Cache_IntId_T<TRANSPORT_TYPE>::Cache_IntId_T (void)
+  Cache_IntId_T<TRANSPORT_TYPE>::Cache_IntId_T ()
     : transport_ (0),
       recycle_state_ (ENTRY_UNKNOWN),
       is_connected_ (false)
@@ -37,21 +37,21 @@ namespace TAO
 
   template <typename TRANSPORT_TYPE> ACE_INLINE
   typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type *
-  Cache_IntId_T<TRANSPORT_TYPE>::transport (void)
+  Cache_IntId_T<TRANSPORT_TYPE>::transport ()
   {
     return this->transport_;
   }
 
   template <typename TRANSPORT_TYPE> ACE_INLINE
   const typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type *
-  Cache_IntId_T<TRANSPORT_TYPE>::transport (void) const
+  Cache_IntId_T<TRANSPORT_TYPE>::transport () const
   {
     return this->transport_;
   }
 
   template <typename TRANSPORT_TYPE> ACE_INLINE
   bool
-  Cache_IntId_T<TRANSPORT_TYPE>::is_connected (void) const
+  Cache_IntId_T<TRANSPORT_TYPE>::is_connected () const
   {
     return this->is_connected_;
   }
@@ -64,14 +64,14 @@ namespace TAO
   }
 
   template <typename TRANSPORT_TYPE> ACE_INLINE Cache_Entries_State
-  Cache_IntId_T<TRANSPORT_TYPE>::recycle_state (void) const
+  Cache_IntId_T<TRANSPORT_TYPE>::recycle_state () const
   {
     return this->recycle_state_;
   }
 
   template <typename TRANSPORT_TYPE> ACE_INLINE
   typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type *
-  Cache_IntId_T<TRANSPORT_TYPE>::relinquish_transport (void)
+  Cache_IntId_T<TRANSPORT_TYPE>::relinquish_transport ()
   {
     // Yield ownership of the TAO_Transport object.
     transport_type *val = this->transport_;
@@ -98,7 +98,7 @@ namespace TAO
 
   /*******************************************************/
   template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE
-  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::Cache_ExtId_T (void)
+  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::Cache_ExtId_T ()
     : transport_property_ (0),
       is_delete_ (false),
       index_ (0)
@@ -116,7 +116,7 @@ namespace TAO
   }
 
   template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE
-  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::~Cache_ExtId_T (void)
+  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::~Cache_ExtId_T ()
   {
     if (this->is_delete_)
       delete this->transport_property_;
@@ -173,13 +173,13 @@ namespace TAO
   }
 
   template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE u_long
-  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::hash (void) const
+  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::hash () const
   {
     return (this->transport_property_->hash () + this->index_);
   }
 
   template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE void
-  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::duplicate (void)
+  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::duplicate ()
   {
     transport_descriptor_type *prop = 0;
 
@@ -199,7 +199,7 @@ namespace TAO
 
 
   template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE CORBA::ULong
-  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::index (void) const
+  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::index () const
   {
     return this->index_;
   }
@@ -212,14 +212,14 @@ namespace TAO
   }
 
   template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE void
-  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::incr_index (void)
+  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::incr_index ()
   {
     ++this->index_;
   }
 
   template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE
   typename Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::transport_descriptor_type *
-  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::property (void) const
+  Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::property () const
   {
     return this->transport_property_;
   }
diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp
index 5597de7531d..93ef5cb0c8a 100644
--- a/TAO/tao/Cleanup_Func_Registry.cpp
+++ b/TAO/tao/Cleanup_Func_Registry.cpp
@@ -39,8 +39,8 @@ TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base <void *> &ts_objects)
   for (size_t i = 0; i < len; ++i)
     {
       ACE_CLEANUP_FUNC destructor = this->cleanup_funcs_[i];
-      if (destructor != 0)
-        destructor (ts_objects[i], 0);
+      if (destructor != nullptr)
+        destructor (ts_objects[i], nullptr);
     }
 }
 
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
index f3b02cd4b4c..0970e3a39cd 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -40,10 +40,10 @@ class TAO_Export TAO_Cleanup_Func_Registry
 
 public:
   /// Constructor.
-  TAO_Cleanup_Func_Registry (void);
+  TAO_Cleanup_Func_Registry ();
 
   /// Return the number of registered cleanup functions.
-  size_t size (void) const;
+  size_t size () const;
 
 protected:
   /// Register a cleanup function.  The number of slot the cleanup
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
index c5e425c4cd8..40684f17384 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void)
+TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter ()
 {
 }
 
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index 3ada82f83da..67f3e884033 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -63,7 +63,7 @@ namespace TAO
     : public RequestInterceptor_Adapter
   {
   public:
-    virtual ~ClientRequestInterceptor_Adapter (void);
+    virtual ~ClientRequestInterceptor_Adapter ();
 
     /**
      * @name PortableInterceptor Client Side Interception Points
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
index 7f0347296a5..a7b9989df41 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ClientRequestInterceptor_Adapter_Factory::~TAO_ClientRequestInterceptor_Adapter_Factory (void)
+TAO_ClientRequestInterceptor_Adapter_Factory::~TAO_ClientRequestInterceptor_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
index 0ca15b73e70..0f514b2e3d1 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
@@ -40,9 +40,9 @@ class TAO_Export TAO_ClientRequestInterceptor_Adapter_Factory
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_ClientRequestInterceptor_Adapter_Factory (void);
+  virtual ~TAO_ClientRequestInterceptor_Adapter_Factory ();
 
-  virtual TAO::ClientRequestInterceptor_Adapter *create (void) = 0;
+  virtual TAO::ClientRequestInterceptor_Adapter *create () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index 9058c65b2d2..b029deb4e7b 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
+TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory ()
 {
 }
 
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index 6ff11c9df61..e59d0ee66ee 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -58,16 +58,16 @@ class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object
 public:
 
   /// Destructor
-  virtual ~TAO_Client_Strategy_Factory (void);
+  virtual ~TAO_Client_Strategy_Factory ();
 
   /// Create the correct client request muxing strategy.
   virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport) = 0;
 
   /// Create the correct lock for request muxing strategy.
-  virtual ACE_Lock *create_transport_mux_strategy_lock (void) = 0;
+  virtual ACE_Lock *create_transport_mux_strategy_lock () = 0;
 
   /// Return the size of the reply dispatcher table
-  virtual int reply_dispatcher_table_size (void) const = 0;
+  virtual int reply_dispatcher_table_size () const = 0;
 
   /// Create the correct client wait_for_reply strategy.
   virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport) = 0;
@@ -83,20 +83,20 @@ public:
   };
 
   /// Return the selected connection strategy option.
-  virtual Connect_Strategy connect_strategy (void) const = 0;
+  virtual Connect_Strategy connect_strategy () const = 0;
 
   /// Does the client allow any form of callback?
-  virtual int allow_callback (void) = 0;
+  virtual int allow_callback () = 0;
 
   /// Cleanup options for wait strategy.
   /**
     * Only applicable to RW wait strategy
   */
-  virtual bool use_cleanup_options (void) const = 0;
+  virtual bool use_cleanup_options () const = 0;
 
   /// Return the parameters used to optionally retry invocation
   /// after an exception occurs.
-  virtual const TAO::Invocation_Retry_Params &invocation_retry_params (void) const = 0;
+  virtual const TAO::Invocation_Retry_Params &invocation_retry_params () const = 0;
 
   /// Return the value to be used as the default sync scope for the ORB
   virtual Messaging::SyncScope sync_scope () const = 0;
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index 80e79b20b7c..36729d3dcb3 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -38,7 +38,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/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
index 0d0169cdd11..db3df08c895 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
@@ -170,7 +170,6 @@ ACE_CDR::Boolean
 TAO_UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr,
                                         std::wstring &x)
 {
-#if defined (ACE_HAS_CPP11)
   ACE_CDR::ULong len;
   if (!this->read_4 (cdr, &len))
     return false;
@@ -227,9 +226,6 @@ TAO_UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr,
     }
   x.clear ();
   return false;
-#else
-  return this->ACE_WChar_Codeset_Translator::read_wstring (cdr, x);
-#endif
 }
 #endif
 
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
index 6da6df8f67a..44f03eb740c 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
@@ -121,7 +121,6 @@ ACE_CDR::Boolean
 TAO_UTF8_Latin1_Translator::read_string (ACE_InputCDR &cdr,
                                          std::string &x)
 {
-#if defined (ACE_HAS_CPP11)
   ACE_CDR::ULong len;
   if (!cdr.read_ulong (len))
     return false;
@@ -161,9 +160,6 @@ TAO_UTF8_Latin1_Translator::read_string (ACE_InputCDR &cdr,
 
   x.clear ();
   return false;
-#else
-  return this->ACE_Char_Codeset_Translator::read_string (cdr, x);
-#endif
 }
 
 ACE_CDR::Boolean
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 1fa161ab63a..318904620d3 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -4,14 +4,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager::~TAO_Codeset_Manager (void)
+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 (void)
+TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base ()
 {
 }
 
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp
index a77dfd61797..94aef786b28 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.cpp
+++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp
@@ -5,25 +5,25 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void)
+TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base ()
 {
 }
 
 bool
-TAO_Codeset_Manager_Factory_Base::is_default (void) const
+TAO_Codeset_Manager_Factory_Base::is_default () const
 {
   return true;
 }
 
 TAO_Codeset_Manager *
-TAO_Codeset_Manager_Factory_Base::create (void)
+TAO_Codeset_Manager_Factory_Base::create ()
 {
-  return 0;
+  return nullptr;
 
 }
 
 int
-TAO_Codeset_Manager_Factory_Base::initialize (void)
+TAO_Codeset_Manager_Factory_Base::initialize ()
 {
   return ACE_Service_Config::process_directive
     (ace_svc_desc_TAO_Codeset_Manager_Factory_Base);
diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp
index d269d80a61c..d5b69e09f35 100644
--- a/TAO/tao/Codeset_Translator_Base.cpp
+++ b/TAO/tao/Codeset_Translator_Base.cpp
@@ -16,7 +16,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base (void)
+TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base ()
 {
 
 }
diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp
index 2ddca927e09..7492024fb7a 100644
--- a/TAO/tao/Collocation_Resolver.cpp
+++ b/TAO/tao/Collocation_Resolver.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void)
+TAO_Collocation_Resolver::~TAO_Collocation_Resolver ()
 {
 }
 
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
index c687786d48b..213f37cb44e 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
@@ -20,8 +20,7 @@ Zlib_CompressorFactory::get_compressor (
     // Ensure Compression range 0-9 and will also convert -1(default) to 9(max).
     compression_level = ace_range(  ::Compression::CompressionLevel(Z_NO_COMPRESSION),   // Min value
                                     ::Compression::CompressionLevel(Z_BEST_COMPRESSION), // Max value
-                                    compression_level   // Argument value
-                                  );
+                                    compression_level); // Argument value
 
     ::Compression::Compressor_ptr compressor = 0;
 
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index 0d7a1fd63c4..0b8c59e41b5 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -51,10 +51,10 @@ public:
 
   /// A default constructor. Since no lock is provided by the user,
   /// one will be created internally.
-  TAO_Condition (void);
+  TAO_Condition ();
 
   /// Implicitly destroy the condition variable.
-  ~TAO_Condition (void);
+  ~TAO_Condition ();
 
   // = Lock accessors.
   /**
@@ -66,7 +66,7 @@ public:
   int wait (const ACE_Time_Value *abstime);
 
   /// Block on condition.
-  int wait (void);
+  int wait ();
 
   /**
    * Block on condition or until absolute time-of-day has passed.  If
@@ -79,17 +79,17 @@ public:
   int wait (MUTEX &mutex, const ACE_Time_Value *abstime = 0);
 
   /// Signal one waiting thread.
-  int signal (void);
+  int signal ();
 
   /// Signal *all* waiting threads.
-  int broadcast (void);
+  int broadcast ();
 
   // = Utility methods.
   /// Explicitly destroy the condition variable.
-  int remove (void);
+  int remove ();
 
   /// Returns a reference to the underlying mutex_;
-  MUTEX *mutex (void);
+  MUTEX *mutex ();
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &))
diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp
index 1410e5f1fcd..5f5496f9756 100644
--- a/TAO/tao/Connect_Strategy.cpp
+++ b/TAO/tao/Connect_Strategy.cpp
@@ -12,7 +12,7 @@ TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core)
 }
 
 
-TAO_Connect_Strategy::~TAO_Connect_Strategy (void)
+TAO_Connect_Strategy::~TAO_Connect_Strategy ()
 {
 }
 
@@ -20,7 +20,7 @@ int
 TAO_Connect_Strategy::wait (TAO_Connection_Handler *ch,
                             ACE_Time_Value *max_wait_time)
 {
-  if (ch == 0)
+  if (ch == nullptr)
     return -1;
 
   return this->wait_i (ch, ch->transport (), max_wait_time);
@@ -32,7 +32,7 @@ TAO_Connect_Strategy::wait (TAO_Transport *t, ACE_Time_Value *max_wait_time)
   // Basically the connection was EINPROGRESS, but before we could
   // wait for it some other thread detected a failure and cleaned up
   // the connection handler.
-  if (t == 0)
+  if (t == nullptr)
     return -1;
 
   return this->wait_i (t->connection_handler (), t, max_wait_time);
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 728338137c6..6c0520aed30 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -11,8 +11,6 @@
 #include "ace/os_include/sys/os_socket.h"
 #include "ace/Svc_Handler.h"
 
-//@@ CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 #include "tao/Connection_Handler.inl"
 #endif /* __ACE_INLINE__ */
@@ -21,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core),
-    transport_ (0),
+    transport_ (nullptr),
     connection_pending_ (false),
     is_closed_ (false)
 {
@@ -31,13 +29,12 @@ TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
                        this->orb_core_->leader_follower ());
 }
 
-TAO_Connection_Handler::~TAO_Connection_Handler (void)
+TAO_Connection_Handler::~TAO_Connection_Handler ()
 {
-  //@@ CONNECTION_HANDLER_DESTRUCTOR_ADD_HOOK
 }
 
 int
-TAO_Connection_Handler::shared_open (void)
+TAO_Connection_Handler::shared_open ()
 {
   // This reference counting is related to asynch connections.  It
   // should probably be managed by the ACE_Strategy_Connector, since
@@ -104,7 +101,7 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock,
 }
 
 int
-TAO_Connection_Handler::svc_i (void)
+TAO_Connection_Handler::svc_i ()
 {
   int result = 0;
 
@@ -116,7 +113,7 @@ TAO_Connection_Handler::svc_i (void)
   // in a reactive handler, except that this can simply block waiting
   // for input.
 
-  ACE_Time_Value *max_wait_time = 0;
+  ACE_Time_Value *max_wait_time = nullptr;
   ACE_Time_Value timeout;
   ACE_Time_Value current_timeout;
 
@@ -350,13 +347,13 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
         {
           // If the ORB is nil, get the reactor from orb_core which gets it
           // from LF.
-          if (eh_reactor == 0)
+          if (eh_reactor == nullptr)
             eh_reactor = this->transport()->orb_core()->reactor ();
         }
 
       // The Reactor must not be null, otherwise something else is
       // horribly broken.
-      ACE_ASSERT (eh_reactor != 0);
+      ACE_ASSERT (eh_reactor != nullptr);
 
       if (TAO_debug_level)
         {
@@ -418,15 +415,6 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
   return 1;
 }
 
-/*
- * Comment hook to comment the base class implementations
- * that do nothing. Specialized versions from derived
- * class will directly override these methods. Add
- * all methods that are virtual, have do nothing implementations
- * within this hook for later specialization.
- */
-//@@ CONNECTION_HANDLER_SPL_COMMENT_HOOK_START
-
 int
 TAO_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
 {
@@ -440,13 +428,11 @@ TAO_Connection_Handler::set_dscp_codepoint (CORBA::Long)
 }
 
 int
-TAO_Connection_Handler::release_os_resources (void)
+TAO_Connection_Handler::release_os_resources ()
 {
   return 0;
 }
 
-//@@ CONNECTION_HANDLER_SPL_COMMENT_HOOK_END
-
 void
 TAO_Connection_Handler::pre_io_hook (int &)
 {
@@ -477,6 +463,4 @@ TAO_Connection_Handler::close_handler (u_long)
   return 0;
 }
 
-//@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index a76506d7ceb..6e7c768030a 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -33,12 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Core;
 class TAO_Transport;
 
-/*
- * Hook to specialize the connection handler with the
- * concrete connection handler implementation.
- */
-//@@ CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class TAO_Connection_Handler
  *
@@ -132,13 +126,6 @@ public:
 
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
 
-  /*
-   * Hook to add public methods from concrete connection handler
-   * implementation onto the base connection handler.
-   */
-
-   //@@ CONNECTION_HANDLER_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// Return our TAO_ORB_Core pointer
   TAO_ORB_Core *orb_core (void);
@@ -208,19 +195,8 @@ private:
   /// Once closed make sure the transport is not added back to the cache.
   /// This is distinct from the leader-follower state so it cannot be reset.
   bool is_closed_;
-
-  /*
-   * Hook to add instance members from derived class
-   * onto base Connection_Handler class. Any further
-   * additions to this class should go before this
-   * hook.
-   */
-  //@@ CONNECTION_HANDLER_SPL_PRIVATE_DATA_ADD_HOOK
 };
 
-//@@ CONNECTION_HANDLER_SPL_EXTERN_ADD_HOOK
-
-
 /**
  * @class TAO_Auto_Reference
  *
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index a6c8dc8b242..f143c25b53e 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -69,6 +69,4 @@ TAO_Connection_Handler::handle_write_ready (const ACE_Time_Value *)
   return 0;
 }
 
-//@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp
index b6eface5905..ecdc639fbe4 100644
--- a/TAO/tao/Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Connection_Purging_Strategy.cpp
@@ -6,12 +6,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void)
+TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy ()
 {
 }
 
 int
-TAO_Connection_Purging_Strategy::cache_maximum (void) const
+TAO_Connection_Purging_Strategy::cache_maximum () const
 {
   return cache_maximum_;
 }
diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h
index dc790a99e80..845b8222ffb 100644
--- a/TAO/tao/Connection_Purging_Strategy.h
+++ b/TAO/tao/Connection_Purging_Strategy.h
@@ -42,10 +42,10 @@ public:
   TAO_Connection_Purging_Strategy (int cache_maximum);
 
   /// The destructor
-  virtual ~TAO_Connection_Purging_Strategy (void);
+  virtual ~TAO_Connection_Purging_Strategy ();
 
   /// Return the maximum number of cache entries
-  virtual int cache_maximum (void) const;
+  virtual int cache_maximum () const;
 
   /// Sub-classes must implement these methods
   virtual void update_item (TAO_Transport& transport) = 0;
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 9df7f6418fc..6de1485a595 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -15,13 +15,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Connector_Registry::TAO_Connector_Registry (void)
-  : connectors_ (0),
+TAO_Connector_Registry::TAO_Connector_Registry ()
+  : connectors_ (nullptr),
     size_ (0)
 {
 }
 
-TAO_Connector_Registry::~TAO_Connector_Registry (void)
+TAO_Connector_Registry::~TAO_Connector_Registry ()
 {
   this->close_all ();
 
@@ -41,7 +41,7 @@ TAO_Connector_Registry::get_connector (CORBA::ULong tag) const
         return *connector;
     }
 
-  return 0;
+  return nullptr;
 }
 
 int
@@ -52,7 +52,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
 
   // The array containing the TAO_Connectors will never contain more
   // than the number of loaded protocols in the ORB core.
-  if (this->connectors_ == 0)
+  if (this->connectors_ == nullptr)
     ACE_NEW_RETURN (this->connectors_,
                     TAO_Connector *[pfs->size ()],
                     -1);
@@ -64,11 +64,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
        factory != end;
        ++factory)
     {
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr <TAO_Connector> connector ((*factory)->factory ()->make_connector ());
-#else
-      auto_ptr <TAO_Connector> connector ((*factory)->factory ()->make_connector ());
-#endif /* ACE_HAS_CPP11 */
 
       if (connector.get ())
         {
@@ -92,7 +88,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_Connector_Registry::close_all (void)
+TAO_Connector_Registry::close_all ()
 {
   const TAO_ConnectorSetIterator end = this->end ();
 
@@ -100,7 +96,7 @@ TAO_Connector_Registry::close_all (void)
        i != end;
        ++i)
     {
-      if (*i == 0)
+      if (*i == nullptr)
         continue;
 
       (*i)->close ();
@@ -115,8 +111,7 @@ TAO_Connector_Registry::close_all (void)
 
 int
 TAO_Connector_Registry::make_mprofile (const char *ior,
-                                       TAO_MProfile &mprofile
-                                       )
+                                       TAO_MProfile &mprofile)
 {
   if (!ior)
     // Failure: Null IOR string pointer
@@ -137,8 +132,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
         {
           const int mp_result =
             (*connector)->make_mprofile (ior,
-                                         mprofile
-                                        );
+                                         mprofile);
 
           if (mp_result == 0)
             return 0;  // Success
@@ -172,13 +166,13 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
     TAOLIB_ERROR ((LM_ERROR,
                    ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
                    ACE_TEXT ("create_profile: Unable to extract tag from CDR stream\n")));
-    return 0;
+    return nullptr;
   }
 
   TAO_Connector *connector =
     this->get_connector (tag);
 
-  if (connector == 0)
+  if (connector == nullptr)
     {
       if (TAO_debug_level > 0)
         {
@@ -189,7 +183,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
         }
 
       TAO_ORB_Core *orb_core = cdr.orb_core ();
-      if (orb_core == 0)
+      if (orb_core == nullptr)
         {
           orb_core = TAO_ORB_Core_instance ();
           if (TAO_debug_level > 0)
@@ -202,18 +196,18 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
             }
         }
 
-      TAO_Profile *pfile = 0;
+      TAO_Profile *pfile = nullptr;
       ACE_NEW_RETURN (pfile,
                       TAO_Unknown_Profile (tag,
                                            orb_core),
-                      0);
+                      nullptr);
       if (pfile->decode (cdr) == -1)
         {
           TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
                         ACE_TEXT ("create_profile: Unable to decode unknown profile from CDR stream\n")));
           pfile->_decr_refcnt ();
-          pfile = 0;
+          pfile = nullptr;
         }
 
       return pfile;
@@ -231,7 +225,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
     TAOLIB_ERROR ((LM_ERROR,
                    ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
                    ACE_TEXT ("create_profile: Unable to extract encapsulated length from CDR stream\n")));
-    return 0;
+    return nullptr;
   }
 
   // Create the decoding stream from the encapsulation in the buffer,
@@ -243,7 +237,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
     TAOLIB_ERROR ((LM_ERROR,
                    ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
                    ACE_TEXT ("create_profile: Unable to skip encapsulated stream from CDR stream\n")));
-    return 0;
+    return nullptr;
   }
 
   TAO_Profile* profile = connector->create_profile (str);
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index f9ff5707a93..6a644e300f8 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -81,9 +81,10 @@ public:
   TAO_ConnectorSetIterator end (void) const;
 
 private:
-  // Disallow copying and assignment.
-  TAO_Connector_Registry (const TAO_Connector_Registry&);
-  void operator= (const TAO_Connector_Registry&);
+  TAO_Connector_Registry (const TAO_Connector_Registry&) = delete;
+  void operator= (const TAO_Connector_Registry&) = delete;
+  TAO_Connector_Registry (TAO_Connector_Registry&&) = delete;
+  void operator= (TAO_Connector_Registry&&) = delete;
 
 private:
   /// List of connectors that are currently open.
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index 7666e20d18e..2575c276fcb 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -16,7 +16,7 @@ static const char dll_prefix[] = "DLL:";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DLL_Parser::~TAO_DLL_Parser (void)
+TAO_DLL_Parser::~TAO_DLL_Parser ()
 {
 }
 
@@ -44,7 +44,7 @@ TAO_DLL_Parser::parse_string (const char *ior,
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (oc->configuration(), name);
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       throw
          CORBA::INV_OBJREF
@@ -54,7 +54,7 @@ TAO_DLL_Parser::parse_string (const char *ior,
           CORBA::COMPLETED_NO);
     }
 
-  return loader->create_object (orb, 0, 0);
+  return loader->create_object (orb, 0, nullptr);
 }
 
 
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
index a0f5c95d070..0831fb9a654 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -6,19 +6,19 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory (
-  void)
+  )
   : default_endpoint_selector_ (new TAO_Default_Endpoint_Selector)
 {
 }
 
-TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (void)
+TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory ()
 {
   delete this->default_endpoint_selector_;
 }
 
 
 TAO_Invocation_Endpoint_Selector *
-TAO_Default_Endpoint_Selector_Factory::get_selector (void)
+TAO_Default_Endpoint_Selector_Factory::get_selector ()
 {
   // Trivial endpoint selector.  Just return the default selector.
   return this->default_endpoint_selector_;
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index ee2fa4090c8..ed4cd6f6d3c 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void)
+TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory ()
 {
 }
 
@@ -17,7 +17,7 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id,
                                        const TAO_MProfile &profiles,
                                        TAO_ORB_Core *orb_core)
 {
-  TAO_Stub *retval = 0;
+  TAO_Stub *retval = nullptr;
 
   ACE_NEW_THROW_EX (retval,
                     TAO_Stub (repository_id, profiles, orb_core),
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index 2715e7a9a63..dd5dced5afc 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -13,14 +13,14 @@ TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Man
 {
 }
 
-TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager (void)
+TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager ()
 {
   // Delete the default resources.
   delete this->lane_resources_;
 }
 
 int
-TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (void)
+TAO_Default_Thread_Lane_Resources_Manager::open_default_resources ()
 {
   TAO_ORB_Parameters * const params =
     this->orb_core_->orb_params ();
@@ -38,32 +38,32 @@ TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (void)
 }
 
 void
-TAO_Default_Thread_Lane_Resources_Manager::finalize (void)
+TAO_Default_Thread_Lane_Resources_Manager::finalize ()
 {
   // Finalize default resources.
   this->lane_resources_->finalize ();
 }
 
 TAO_Thread_Lane_Resources &
-TAO_Default_Thread_Lane_Resources_Manager::lane_resources (void)
+TAO_Default_Thread_Lane_Resources_Manager::lane_resources ()
 {
   return *this->lane_resources_;
 }
 
 TAO_Thread_Lane_Resources &
-TAO_Default_Thread_Lane_Resources_Manager::default_lane_resources (void)
+TAO_Default_Thread_Lane_Resources_Manager::default_lane_resources ()
 {
   return this->lane_resources ();
 }
 
 void
-TAO_Default_Thread_Lane_Resources_Manager::shutdown_reactor (void)
+TAO_Default_Thread_Lane_Resources_Manager::shutdown_reactor ()
 {
   this->lane_resources_->shutdown_reactor ();
 }
 
 void
-TAO_Default_Thread_Lane_Resources_Manager::close_all_transports (void)
+TAO_Default_Thread_Lane_Resources_Manager::close_all_transports ()
 {
   this->lane_resources_->close_all_transports ();
 }
@@ -77,19 +77,19 @@ TAO_Default_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mp
 // -------------------------------------------------------
 
 TAO_Default_Thread_Lane_Resources_Manager_Factory::
-~TAO_Default_Thread_Lane_Resources_Manager_Factory (void)
+~TAO_Default_Thread_Lane_Resources_Manager_Factory ()
 {
 }
 
 TAO_Thread_Lane_Resources_Manager *
 TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core)
 {
-  TAO_Thread_Lane_Resources_Manager *manager = 0;
+  TAO_Thread_Lane_Resources_Manager *manager = nullptr;
 
   /// Create the Default Thread Lane Resources Manager.
   ACE_NEW_RETURN (manager,
                   TAO_Default_Thread_Lane_Resources_Manager (core),
-                  0);
+                  nullptr);
 
   return manager;
 }
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index c741c9d4f56..eb03d1253a7 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -24,7 +24,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor from typecode
-TAO_DynAnyFactory::TAO_DynAnyFactory (void)
+TAO_DynAnyFactory::TAO_DynAnyFactory ()
 {
 }
 
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 22c902b6f5d..08864b9686e 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -39,7 +39,7 @@ class TAO_DynamicAny_Export TAO_DynAnyFactory
 {
 public:
   /// Constructor.
-  TAO_DynAnyFactory (void);
+  TAO_DynAnyFactory ();
 
   // = The DynamicAnyFactory methods.
   virtual DynamicAny::DynAny_ptr create_dyn_any (const CORBA::Any & value);
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index bdca250de2c..3506b030283 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -20,7 +20,7 @@ TAO_DynAny_i::TAO_DynAny_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynAny_i::~TAO_DynAny_i (void)
+TAO_DynAny_i::~TAO_DynAny_i ()
 {
 }
 
@@ -165,7 +165,7 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc)
 }
 
 void
-TAO_DynAny_i::init_common (void)
+TAO_DynAny_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -236,7 +236,7 @@ TAO_DynAny_i::from_any (const CORBA::Any &any)
 }
 
 CORBA::Any_ptr
-TAO_DynAny_i::to_any (void)
+TAO_DynAny_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -794,7 +794,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynAny_i::destroy (void)
+TAO_DynAny_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -809,7 +809,7 @@ TAO_DynAny_i::destroy (void)
 
 
 DynamicAny::DynAny_ptr
-TAO_DynAny_i::current_component (void)
+TAO_DynAny_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 2488649d5b4..5530cf49d8e 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -43,7 +43,7 @@ public:
   TAO_DynAny_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynAny_i (void);
+  ~TAO_DynAny_i ();
 
   /// Initialize using just a TypeCode
   void init (CORBA::TypeCode_ptr tc);
@@ -58,13 +58,13 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   /// Check if the typecode is acceptable.
@@ -74,7 +74,7 @@ private:
   void set_to_default_value (CORBA::TypeCode_ptr tc);
 
   /// Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // Use copy() or assign() instead of these.
   TAO_DynAny_i (const TAO_DynAny_i &src);
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index c70f37b1763..574102cc3b2 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -16,12 +16,12 @@ TAO_DynArray_i::TAO_DynArray_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynArray_i::~TAO_DynArray_i (void)
+TAO_DynArray_i::~TAO_DynArray_i ()
 {
 }
 
 void
-TAO_DynArray_i::init_common (void)
+TAO_DynArray_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -131,7 +131,7 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc)
 }
 
 CORBA::TypeCode_ptr
-TAO_DynArray_i::get_element_type (void)
+TAO_DynArray_i::get_element_type ()
 {
   CORBA::TypeCode_var element_type =
     CORBA::TypeCode::_duplicate (this->type_.in ());
@@ -182,7 +182,7 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref)
 // ****************************************************************
 
 DynamicAny::AnySeq *
-TAO_DynArray_i::get_elements (void)
+TAO_DynArray_i::get_elements ()
 {
   if (this->destroyed_)
     {
@@ -255,7 +255,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value)
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynArray_i::get_elements_as_dyn_any (void)
+TAO_DynArray_i::get_elements_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -401,7 +401,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any)
 }
 
 CORBA::Any_ptr
-TAO_DynArray_i::to_any (void)
+TAO_DynArray_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -501,7 +501,7 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynArray_i::destroy (void)
+TAO_DynArray_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -523,7 +523,7 @@ TAO_DynArray_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynArray_i::current_component (void)
+TAO_DynArray_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 6a512602212..01cb6eb8447 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -45,7 +45,7 @@ public:
   TAO_DynArray_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynArray_i (void);
+  ~TAO_DynArray_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -58,11 +58,11 @@ public:
 
   // = Functions specific to DynArray.
 
-  virtual DynamicAny::AnySeq * get_elements (void);
+  virtual DynamicAny::AnySeq * get_elements ();
 
   virtual void set_elements (const DynamicAny::AnySeq & value);
 
-  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (void);
+  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ();
 
   virtual void set_elements_as_dyn_any (const DynamicAny::DynAnySeq & value);
 
@@ -70,23 +70,23 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   /// Returns the type of elements contained in the array.
-  CORBA::TypeCode_ptr get_element_type (void);
+  CORBA::TypeCode_ptr get_element_type ();
 
   /// Gets the length of the array from the typecode.
   CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc);
 
   /// Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // Use copy() or assign() instead of these.
   TAO_DynArray_i (const TAO_DynArray_i &src);
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 55492e790c3..d101bd51339 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -34,12 +34,12 @@ TAO_DynCommon::TAO_DynCommon (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynCommon::~TAO_DynCommon (void)
+TAO_DynCommon::~TAO_DynCommon ()
 {
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::type (void)
+TAO_DynCommon::type ()
 {
   if (this->destroyed_)
     {
@@ -395,61 +395,61 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value)
 // ****************************************************************
 
 CORBA::Boolean
-TAO_DynCommon::get_boolean (void)
+TAO_DynCommon::get_boolean ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::get_value (this);
 }
 
 CORBA::Octet
-TAO_DynCommon::get_octet (void)
+TAO_DynCommon::get_octet ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Octet>::get_value (this);
 }
 
 CORBA::Char
-TAO_DynCommon::get_char (void)
+TAO_DynCommon::get_char ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Char>::get_value (this);
 }
 
 CORBA::Short
-TAO_DynCommon::get_short (void)
+TAO_DynCommon::get_short ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Short>::get_value (this);
 }
 
 CORBA::UShort
-TAO_DynCommon::get_ushort (void)
+TAO_DynCommon::get_ushort ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::UShort>::get_value (this);
 }
 
 CORBA::Long
-TAO_DynCommon::get_long (void)
+TAO_DynCommon::get_long ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Long>::get_value (this);
 }
 
 CORBA::ULong
-TAO_DynCommon::get_ulong (void)
+TAO_DynCommon::get_ulong ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::ULong>::get_value (this);
 }
 
 CORBA::Float
-TAO_DynCommon::get_float (void)
+TAO_DynCommon::get_float ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Float>::get_value (this);
 }
 
 CORBA::Double
-TAO_DynCommon::get_double (void)
+TAO_DynCommon::get_double ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Double>::get_value (this);
 }
 
 char *
-TAO_DynCommon::get_string (void)
+TAO_DynCommon::get_string ()
 {
   if (this->destroyed_)
     {
@@ -493,7 +493,7 @@ TAO_DynCommon::get_string (void)
 }
 
 CORBA::Object_ptr
-TAO_DynCommon::get_reference (void)
+TAO_DynCommon::get_reference ()
 {
   if (this->destroyed_)
     {
@@ -521,7 +521,7 @@ TAO_DynCommon::get_reference (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::get_typecode (void)
+TAO_DynCommon::get_typecode ()
 {
   if (this->destroyed_)
     {
@@ -548,25 +548,25 @@ TAO_DynCommon::get_typecode (void)
 }
 
 CORBA::LongLong
-TAO_DynCommon::get_longlong (void)
+TAO_DynCommon::get_longlong ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::get_value (this);
 }
 
 CORBA::ULongLong
-TAO_DynCommon::get_ulonglong (void)
+TAO_DynCommon::get_ulonglong ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::get_value (this);
 }
 
 CORBA::LongDouble
-TAO_DynCommon::get_longdouble (void)
+TAO_DynCommon::get_longdouble ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::get_value (this);
 }
 
 CORBA::WChar
-TAO_DynCommon::get_wchar (void)
+TAO_DynCommon::get_wchar ()
 {
   if (this->destroyed_)
     {
@@ -593,7 +593,7 @@ TAO_DynCommon::get_wchar (void)
 }
 
 CORBA::WChar *
-TAO_DynCommon::get_wstring (void)
+TAO_DynCommon::get_wstring ()
 {
   if (this->destroyed_)
     {
@@ -627,7 +627,7 @@ TAO_DynCommon::get_wstring (void)
 }
 
 CORBA::Any_ptr
-TAO_DynCommon::get_any (void)
+TAO_DynCommon::get_any ()
 {
   if (this->destroyed_)
     {
@@ -661,7 +661,7 @@ TAO_DynCommon::get_any (void)
 // @@@ (JP) TODO - optimize - this version was intended by the OMG to
 // have fewer Any/DynAny conversions than get_any, not more.
 DynamicAny::DynAny_ptr
-TAO_DynCommon::get_dyn_any (void)
+TAO_DynCommon::get_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -678,7 +678,7 @@ TAO_DynCommon::get_dyn_any (void)
 }
 
 CORBA::ValueBase *
-TAO_DynCommon::get_val (void)
+TAO_DynCommon::get_val ()
 {
   if (this->destroyed_)
     {
@@ -733,8 +733,7 @@ TAO_DynCommon::get_val (void)
 // ****************************************************************
 
 CORBA::Boolean
-TAO_DynCommon::seek (CORBA::Long slot
-                     )
+TAO_DynCommon::seek (CORBA::Long slot)
 {
   if (this->destroyed_)
     {
@@ -760,7 +759,7 @@ TAO_DynCommon::seek (CORBA::Long slot
 }
 
 void
-TAO_DynCommon::rewind (void)
+TAO_DynCommon::rewind ()
 {
   if (this->destroyed_)
     {
@@ -771,7 +770,7 @@ TAO_DynCommon::rewind (void)
 }
 
 CORBA::Boolean
-TAO_DynCommon::next (void)
+TAO_DynCommon::next ()
 {
   if (this->destroyed_)
     {
@@ -794,7 +793,7 @@ TAO_DynCommon::next (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynCommon::copy (void)
+TAO_DynCommon::copy ()
 {
   if (this->destroyed_)
     {
@@ -813,7 +812,7 @@ TAO_DynCommon::copy (void)
 }
 
 CORBA::ULong
-TAO_DynCommon::component_count (void)
+TAO_DynCommon::component_count ()
 {
   if (this->destroyed_)
     {
@@ -899,7 +898,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value)
 }
 
 CORBA::AbstractBase_ptr
-TAO_DynCommon::get_abstract (void)
+TAO_DynCommon::get_abstract ()
 {
   if (this->destroyed_)
     {
@@ -1032,7 +1031,7 @@ TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value)
 // ****************************************************************
 
 CORBA::BooleanSeq *
-TAO_DynCommon::get_boolean_seq (void)
+TAO_DynCommon::get_boolean_seq ()
 {
   const CORBA::BooleanSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::get_value (this);
@@ -1040,7 +1039,7 @@ TAO_DynCommon::get_boolean_seq (void)
 }
 
 CORBA::OctetSeq *
-TAO_DynCommon::get_octet_seq (void)
+TAO_DynCommon::get_octet_seq ()
 {
   const CORBA::OctetSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::get_value (this);
@@ -1048,7 +1047,7 @@ TAO_DynCommon::get_octet_seq (void)
 }
 
 CORBA::CharSeq *
-TAO_DynCommon::get_char_seq (void)
+TAO_DynCommon::get_char_seq ()
 {
   const CORBA::CharSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::get_value (this);
@@ -1056,7 +1055,7 @@ TAO_DynCommon::get_char_seq (void)
 }
 
 CORBA::ShortSeq *
-TAO_DynCommon::get_short_seq (void)
+TAO_DynCommon::get_short_seq ()
 {
   const CORBA::ShortSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::get_value (this);
@@ -1064,7 +1063,7 @@ TAO_DynCommon::get_short_seq (void)
 }
 
 CORBA::UShortSeq *
-TAO_DynCommon::get_ushort_seq (void)
+TAO_DynCommon::get_ushort_seq ()
 {
   const CORBA::UShortSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::get_value (this);
@@ -1072,7 +1071,7 @@ TAO_DynCommon::get_ushort_seq (void)
 }
 
 CORBA::LongSeq *
-TAO_DynCommon::get_long_seq (void)
+TAO_DynCommon::get_long_seq ()
 {
   const CORBA::LongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::get_value (this);
@@ -1080,7 +1079,7 @@ TAO_DynCommon::get_long_seq (void)
 }
 
 CORBA::ULongSeq *
-TAO_DynCommon::get_ulong_seq (void)
+TAO_DynCommon::get_ulong_seq ()
 {
   const CORBA::ULongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::get_value (this);
@@ -1088,7 +1087,7 @@ TAO_DynCommon::get_ulong_seq (void)
 }
 
 CORBA::FloatSeq *
-TAO_DynCommon::get_float_seq (void)
+TAO_DynCommon::get_float_seq ()
 {
   const CORBA::FloatSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::get_value (this);
@@ -1096,7 +1095,7 @@ TAO_DynCommon::get_float_seq (void)
 }
 
 CORBA::DoubleSeq *
-TAO_DynCommon::get_double_seq (void)
+TAO_DynCommon::get_double_seq ()
 {
   const CORBA::DoubleSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::get_value (this);
@@ -1104,7 +1103,7 @@ TAO_DynCommon::get_double_seq (void)
 }
 
 CORBA::LongLongSeq *
-TAO_DynCommon::get_longlong_seq (void)
+TAO_DynCommon::get_longlong_seq ()
 {
   const CORBA::LongLongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::get_value (this);
@@ -1112,7 +1111,7 @@ TAO_DynCommon::get_longlong_seq (void)
 }
 
 CORBA::ULongLongSeq *
-TAO_DynCommon::get_ulonglong_seq (void)
+TAO_DynCommon::get_ulonglong_seq ()
 {
   const CORBA::ULongLongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::get_value (this);
@@ -1120,7 +1119,7 @@ TAO_DynCommon::get_ulonglong_seq (void)
 }
 
 CORBA::LongDoubleSeq *
-TAO_DynCommon::get_longdouble_seq (void)
+TAO_DynCommon::get_longdouble_seq ()
 {
   const CORBA::LongDoubleSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::get_value (this);
@@ -1128,7 +1127,7 @@ TAO_DynCommon::get_longdouble_seq (void)
 }
 
 CORBA::WCharSeq *
-TAO_DynCommon::get_wchar_seq (void)
+TAO_DynCommon::get_wchar_seq ()
 {
   const CORBA::WCharSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::get_value (this);
@@ -1269,19 +1268,19 @@ TAO_DynCommon::is_basic_type_seq (CORBA::TypeCode_ptr tc)
 }
 
 CORBA::Boolean
-TAO_DynCommon::has_components (void) const
+TAO_DynCommon::has_components () const
 {
   return this->has_components_;
 }
 
 CORBA::Boolean
-TAO_DynCommon::destroyed (void) const
+TAO_DynCommon::destroyed () const
 {
   return this->destroyed_;
 }
 
 CORBA::Any &
-TAO_DynCommon::the_any (void)
+TAO_DynCommon::the_any ()
 {
   return this->any_;
 }
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 4d8da9d2790..0d11430f27c 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -35,11 +35,11 @@ public:
   TAO_DynCommon (CORBA::Boolean allow_truncation);
 
   /// Destructor.
-  virtual ~TAO_DynCommon (void);
+  virtual ~TAO_DynCommon ();
 
   // = Some functions common to all Dynamic Any types.
 
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
   virtual void assign (DynamicAny::DynAny_ptr dyn_any);
 
@@ -81,59 +81,59 @@ public:
 
   virtual void insert_val (CORBA::ValueBase * value);
 
-  virtual CORBA::Boolean get_boolean (void);
+  virtual CORBA::Boolean get_boolean ();
 
-  virtual CORBA::Octet get_octet (void);
+  virtual CORBA::Octet get_octet ();
 
-  virtual CORBA::Char get_char (void);
+  virtual CORBA::Char get_char ();
 
-  virtual CORBA::Short get_short (void);
+  virtual CORBA::Short get_short ();
 
-  virtual CORBA::UShort get_ushort (void);
+  virtual CORBA::UShort get_ushort ();
 
-  virtual CORBA::Long get_long (void);
+  virtual CORBA::Long get_long ();
 
-  virtual CORBA::ULong get_ulong (void);
+  virtual CORBA::ULong get_ulong ();
 
-  virtual CORBA::Float get_float (void);
+  virtual CORBA::Float get_float ();
 
-  virtual CORBA::Double get_double (void);
+  virtual CORBA::Double get_double ();
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual CORBA::Object_ptr get_reference (void);
+  virtual CORBA::Object_ptr get_reference ();
 
-  virtual CORBA::TypeCode_ptr get_typecode (void);
+  virtual CORBA::TypeCode_ptr get_typecode ();
 
-  virtual CORBA::LongLong get_longlong (void);
+  virtual CORBA::LongLong get_longlong ();
 
-  virtual CORBA::ULongLong get_ulonglong (void);
+  virtual CORBA::ULongLong get_ulonglong ();
 
-  virtual CORBA::LongDouble get_longdouble (void);
+  virtual CORBA::LongDouble get_longdouble ();
 
-  virtual CORBA::WChar get_wchar (void);
+  virtual CORBA::WChar get_wchar ();
 
-  virtual CORBA::WChar * get_wstring (void);
+  virtual CORBA::WChar * get_wstring ();
 
-  virtual CORBA::Any * get_any (void);
+  virtual CORBA::Any * get_any ();
 
-  virtual DynamicAny::DynAny_ptr get_dyn_any (void);
+  virtual DynamicAny::DynAny_ptr get_dyn_any ();
 
-  virtual CORBA::ValueBase * get_val (void);
+  virtual CORBA::ValueBase * get_val ();
 
   virtual CORBA::Boolean seek (CORBA::Long index);
 
-  virtual void rewind (void);
+  virtual void rewind ();
 
-  virtual CORBA::Boolean next (void);
+  virtual CORBA::Boolean next ();
 
-  virtual DynamicAny::DynAny_ptr copy (void);
+  virtual DynamicAny::DynAny_ptr copy ();
 
-  virtual CORBA::ULong component_count (void);
+  virtual CORBA::ULong component_count ();
 
   virtual void insert_abstract (CORBA::AbstractBase_ptr value);
 
-  virtual CORBA::AbstractBase_ptr get_abstract (void);
+  virtual CORBA::AbstractBase_ptr get_abstract ();
 
   virtual void insert_boolean_seq (const CORBA::BooleanSeq & value);
 
@@ -161,31 +161,31 @@ public:
 
   virtual void insert_wchar_seq (const CORBA::WCharSeq & value);
 
-  virtual CORBA::BooleanSeq * get_boolean_seq (void);
+  virtual CORBA::BooleanSeq * get_boolean_seq ();
 
-  virtual CORBA::OctetSeq * get_octet_seq (void);
+  virtual CORBA::OctetSeq * get_octet_seq ();
 
-  virtual CORBA::CharSeq * get_char_seq (void);
+  virtual CORBA::CharSeq * get_char_seq ();
 
-  virtual CORBA::ShortSeq * get_short_seq (void);
+  virtual CORBA::ShortSeq * get_short_seq ();
 
-  virtual CORBA::UShortSeq * get_ushort_seq (void);
+  virtual CORBA::UShortSeq * get_ushort_seq ();
 
-  virtual CORBA::LongSeq * get_long_seq (void);
+  virtual CORBA::LongSeq * get_long_seq ();
 
-  virtual CORBA::ULongSeq * get_ulong_seq (void);
+  virtual CORBA::ULongSeq * get_ulong_seq ();
 
-  virtual CORBA::FloatSeq * get_float_seq (void);
+  virtual CORBA::FloatSeq * get_float_seq ();
 
-  virtual CORBA::DoubleSeq * get_double_seq (void);
+  virtual CORBA::DoubleSeq * get_double_seq ();
 
-  virtual CORBA::LongLongSeq * get_longlong_seq (void);
+  virtual CORBA::LongLongSeq * get_longlong_seq ();
 
-  virtual CORBA::ULongLongSeq * get_ulonglong_seq (void);
+  virtual CORBA::ULongLongSeq * get_ulonglong_seq ();
 
-  virtual CORBA::LongDoubleSeq * get_longdouble_seq (void);
+  virtual CORBA::LongDoubleSeq * get_longdouble_seq ();
 
-  virtual CORBA::WCharSeq * get_wchar_seq (void);
+  virtual CORBA::WCharSeq * get_wchar_seq ();
 
   /// This sets one of two flags in this base class. CORBA 2.4.2
   /// requires that destroy() do nothing if it is called on
@@ -208,9 +208,9 @@ public:
 
   // Accessors
 
-  CORBA::Boolean has_components (void) const;
-  CORBA::Boolean destroyed (void) const;
-  CORBA::Any &the_any (void);
+  CORBA::Boolean has_components () const;
+  CORBA::Boolean destroyed () const;
+  CORBA::Any &the_any ();
 
   // Mutators
 
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index bb5529b24b6..7f25e22f02d 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -16,12 +16,12 @@ TAO_DynEnum_i::TAO_DynEnum_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynEnum_i::~TAO_DynEnum_i (void)
+TAO_DynEnum_i::~TAO_DynEnum_i ()
 {
 }
 
 void
-TAO_DynEnum_i::init_common (void)
+TAO_DynEnum_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -103,7 +103,7 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref)
 // ****************************************************************
 
 char *
-TAO_DynEnum_i::get_as_string (void)
+TAO_DynEnum_i::get_as_string ()
 {
   CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
@@ -143,7 +143,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string)
 }
 
 CORBA::ULong
-TAO_DynEnum_i::get_as_ulong (void)
+TAO_DynEnum_i::get_as_ulong ()
 {
   return this->value_;
 }
@@ -205,7 +205,7 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any)
 }
 
 CORBA::Any_ptr
-TAO_DynEnum_i::to_any (void)
+TAO_DynEnum_i::to_any ()
 {
   TAO_OutputCDR out_cdr;
 
@@ -269,7 +269,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynEnum_i::destroy (void)
+TAO_DynEnum_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -283,7 +283,7 @@ TAO_DynEnum_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynEnum_i::current_component (void)
+TAO_DynEnum_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 471cd24ce6d..6d05d6d7fae 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -45,7 +45,7 @@ public:
   TAO_DynEnum_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynEnum_i (void);
+  ~TAO_DynEnum_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -58,11 +58,11 @@ public:
 
   // = Functions specific to DynEnum.
 
-  virtual char * get_as_string (void);
+  virtual char * get_as_string ();
 
   virtual void set_as_string (const char * value);
 
-  virtual CORBA::ULong get_as_ulong (void);
+  virtual CORBA::ULong get_as_ulong ();
 
   virtual void set_as_ulong (CORBA::ULong value);
 
@@ -70,17 +70,17 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   // Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // = Use copy() or assign() instead of these.
   TAO_DynEnum_i (const TAO_DynEnum_i &src);
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 702fb10a131..749a3b79e93 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -16,12 +16,12 @@ TAO_DynSequence_i::TAO_DynSequence_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynSequence_i::~TAO_DynSequence_i (void)
+TAO_DynSequence_i::~TAO_DynSequence_i ()
 {
 }
 
 void
-TAO_DynSequence_i::init_common (void)
+TAO_DynSequence_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -137,7 +137,7 @@ TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref)
 // ****************************************************************
 
 CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_element_type (void)
+TAO_DynSequence_i::get_element_type ()
 {
   CORBA::TypeCode_var element_type =
     CORBA::TypeCode::_duplicate (this->type_.in ());
@@ -161,7 +161,7 @@ TAO_DynSequence_i::get_element_type (void)
 // = Functions specific to DynSequence.
 
 CORBA::ULong
-TAO_DynSequence_i::get_length (void)
+TAO_DynSequence_i::get_length ()
 {
   if (this->destroyed_)
     {
@@ -247,7 +247,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length)
 }
 
 DynamicAny::AnySeq *
-TAO_DynSequence_i::get_elements (void)
+TAO_DynSequence_i::get_elements ()
 {
   if (this->destroyed_)
     {
@@ -360,7 +360,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value)
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynSequence_i::get_elements_as_dyn_any (void)
+TAO_DynSequence_i::get_elements_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -562,7 +562,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any)
 }
 
 CORBA::Any_ptr
-TAO_DynSequence_i::to_any (void)
+TAO_DynSequence_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -668,7 +668,7 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynSequence_i::destroy (void)
+TAO_DynSequence_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -690,7 +690,7 @@ TAO_DynSequence_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynSequence_i::current_component (void)
+TAO_DynSequence_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index f76bc51aa9d..276a39f7022 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -44,7 +44,7 @@ public:
   TAO_DynSequence_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynSequence_i (void);
+  ~TAO_DynSequence_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -57,15 +57,15 @@ public:
 
   // = Functions specific to DynSequence.
 
-  virtual CORBA::ULong get_length (void);
+  virtual CORBA::ULong get_length ();
 
   virtual void set_length (CORBA::ULong len);
 
-  virtual DynamicAny::AnySeq * get_elements (void);
+  virtual DynamicAny::AnySeq * get_elements ();
 
   virtual void set_elements (const DynamicAny::AnySeq & value);
 
-  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (void);
+  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ();
 
   virtual void set_elements_as_dyn_any (const DynamicAny::DynAnySeq & value);
 
@@ -74,20 +74,20 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   // Utility, turns the type of elements contained in the sequence.
-  CORBA::TypeCode_ptr get_element_type (void);
+  CORBA::TypeCode_ptr get_element_type ();
 
   // Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // = Use copy() or assign() instead of these
   TAO_DynSequence_i (const TAO_DynSequence_i &src);
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index bd366d20ad2..bfa40f2874e 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -16,7 +16,7 @@ TAO_DynStruct_i::TAO_DynStruct_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynStruct_i::~TAO_DynStruct_i (void)
+TAO_DynStruct_i::~TAO_DynStruct_i ()
 {
 }
 
@@ -34,7 +34,7 @@ TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc)
 }
 
 void
-TAO_DynStruct_i::init_common (void)
+TAO_DynStruct_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -179,7 +179,7 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref)
 // ****************************************************************
 
 DynamicAny::FieldName
-TAO_DynStruct_i::current_member_name (void)
+TAO_DynStruct_i::current_member_name ()
 {
   if (this->destroyed_)
     {
@@ -208,7 +208,7 @@ TAO_DynStruct_i::current_member_name (void)
 
 // Returns the unaliased TCKind.
 CORBA::TCKind
-TAO_DynStruct_i::current_member_kind (void)
+TAO_DynStruct_i::current_member_kind ()
 {
   if (this->destroyed_)
     {
@@ -238,7 +238,7 @@ TAO_DynStruct_i::current_member_kind (void)
 }
 
 DynamicAny::NameValuePairSeq *
-TAO_DynStruct_i::get_members (void)
+TAO_DynStruct_i::get_members ()
 {
   if (this->destroyed_)
     {
@@ -305,8 +305,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values)
 
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                   );
+    TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
@@ -335,7 +334,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values)
 }
 
 DynamicAny::NameDynAnyPairSeq *
-TAO_DynStruct_i::get_members_as_dyn_any (void)
+TAO_DynStruct_i::get_members_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -397,8 +396,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
 
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                   );
+    TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
@@ -435,8 +433,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any)
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent =
-    this->type_->equivalent (tc.in ()
-                            );
+    this->type_->equivalent (tc.in ());
 
   if (equivalent)
     {
@@ -474,8 +471,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any)
 
       CORBA::TypeCode_var field_tc;
       CORBA::TypeCode_var unaliased =
-        TAO::unaliased_typecode (this->type_.in ()
-                                );
+        TAO::unaliased_typecode (this->type_.in ());
 
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
@@ -510,7 +506,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any)
 }
 
 CORBA::Any_ptr
-TAO_DynStruct_i::to_any (void)
+TAO_DynStruct_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -619,7 +615,7 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynStruct_i::destroy (void)
+TAO_DynStruct_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -641,7 +637,7 @@ TAO_DynStruct_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynStruct_i::current_component (void)
+TAO_DynStruct_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index f390cda7a22..ba993d6c84c 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -44,7 +44,7 @@ public:
   TAO_DynStruct_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynStruct_i (void);
+  ~TAO_DynStruct_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -57,15 +57,15 @@ public:
 
   // = Functions specific to DynStruct.
 
-  virtual DynamicAny::FieldName current_member_name (void);
+  virtual DynamicAny::FieldName current_member_name ();
 
-  virtual CORBA::TCKind current_member_kind (void);
+  virtual CORBA::TCKind current_member_kind ();
 
-  virtual DynamicAny::NameValuePairSeq *get_members (void);
+  virtual DynamicAny::NameValuePairSeq *get_members ();
 
   virtual void set_members (const DynamicAny::NameValuePairSeq& value);
 
-  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (void);
+  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ();
 
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value);
@@ -74,13 +74,13 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   /// Check if the typecode is acceptable.
@@ -91,7 +91,7 @@ private:
   void set_from_any (const CORBA::Any &any);
 
   /// Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // = Use copy() or assign() instead of these.
   TAO_DynStruct_i (const TAO_DynStruct_i &src);
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 92007447d85..bba6b5e1a72 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -18,12 +18,12 @@ TAO_DynUnion_i::TAO_DynUnion_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynUnion_i::~TAO_DynUnion_i (void)
+TAO_DynUnion_i::~TAO_DynUnion_i ()
 {
 }
 
 void
-TAO_DynUnion_i::init_common (void)
+TAO_DynUnion_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -108,8 +108,7 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc)
     }
 
   CORBA::TypeCode_var first_type =
-    unaliased_tc->member_type (this->current_position_
-                              );
+    unaliased_tc->member_type (this->current_position_);
 
   // Recursively initialize the member to its default value.
   this->member_ =
@@ -261,8 +260,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any)
           CORBA::ULong index = static_cast<CORBA::ULong> (default_index);
 
           CORBA::TypeCode_var default_tc =
-            tc->member_type (index
-                            );
+            tc->member_type (index);
 
           CORBA::Any default_any;
           TAO::Unknown_IDL_Type *unk = 0;
@@ -285,7 +283,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any)
 // ****************************************************************
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::get_discriminator (void)
+TAO_DynUnion_i::get_discriminator ()
 {
   if (this->destroyed_)
     {
@@ -427,7 +425,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value)
 }
 
 void
-TAO_DynUnion_i::set_to_default_member (void)
+TAO_DynUnion_i::set_to_default_member ()
 {
   if (this->destroyed_)
     {
@@ -470,7 +468,7 @@ TAO_DynUnion_i::set_to_default_member (void)
 }
 
 void
-TAO_DynUnion_i::set_to_no_active_member (void)
+TAO_DynUnion_i::set_to_no_active_member ()
 {
   if (this->destroyed_)
     {
@@ -519,7 +517,7 @@ TAO_DynUnion_i::set_to_no_active_member (void)
 }
 
 CORBA::Boolean
-TAO_DynUnion_i::has_no_active_member (void)
+TAO_DynUnion_i::has_no_active_member ()
 {
   if (this->destroyed_)
     {
@@ -531,7 +529,7 @@ TAO_DynUnion_i::has_no_active_member (void)
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::discriminator_kind (void)
+TAO_DynUnion_i::discriminator_kind ()
 {
   if (this->destroyed_)
     {
@@ -545,7 +543,7 @@ TAO_DynUnion_i::discriminator_kind (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::member (void)
+TAO_DynUnion_i::member ()
 {
   if (this->destroyed_)
     {
@@ -562,15 +560,13 @@ TAO_DynUnion_i::member (void)
 
   // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
   // Set the flag so the caller can't destroy.
-  this->set_flag (this->member_.in (),
-                  0
-                 );
+  this->set_flag (this->member_.in (), 0);
 
   return DynamicAny::DynAny::_duplicate (this->member_.in ());
 }
 
 char *
-TAO_DynUnion_i::member_name (void)
+TAO_DynUnion_i::member_name ()
 {
   if (this->destroyed_)
     {
@@ -591,7 +587,7 @@ TAO_DynUnion_i::member_name (void)
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::member_kind (void)
+TAO_DynUnion_i::member_kind ()
 {
   if (this->destroyed_)
     {
@@ -635,8 +631,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any)
 
       // Set the from_factory arg to FALSE, so any problems will throw
       // TypeMismatch.
-      this->set_from_any (any
-                         );
+      this->set_from_any (any);
     }
   else
     {
@@ -645,7 +640,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any)
 }
 
 CORBA::Any_ptr
-TAO_DynUnion_i::to_any (void)
+TAO_DynUnion_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -775,7 +770,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynUnion_i::destroy (void)
+TAO_DynUnion_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -802,7 +797,7 @@ TAO_DynUnion_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::current_component (void)
+TAO_DynUnion_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index e12129861e0..27436f421af 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -43,7 +43,7 @@ public:
   TAO_DynUnion_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynUnion_i (void);
+  ~TAO_DynUnion_i ();
 
   /// Constructor taking an Any argument.
   void init (const CORBA::Any& any);
@@ -56,35 +56,35 @@ public:
 
   // = Functions specific to DynUnion.
 
-  virtual DynamicAny::DynAny_ptr get_discriminator (void);
+  virtual DynamicAny::DynAny_ptr get_discriminator ();
 
   virtual void set_discriminator (DynamicAny::DynAny_ptr d);
 
-  virtual void set_to_default_member (void);
+  virtual void set_to_default_member ();
 
-  virtual void set_to_no_active_member (void);
+  virtual void set_to_no_active_member ();
 
-  virtual CORBA::Boolean has_no_active_member (void);
+  virtual CORBA::Boolean has_no_active_member ();
 
-  virtual CORBA::TCKind discriminator_kind (void);
+  virtual CORBA::TCKind discriminator_kind ();
 
-  virtual DynamicAny::DynAny_ptr member (void);
+  virtual DynamicAny::DynAny_ptr member ();
 
-  virtual char * member_name (void);
+  virtual char * member_name ();
 
-  virtual CORBA::TCKind member_kind (void);
+  virtual CORBA::TCKind member_kind ();
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   /// Code common to the constructor from an Any arg and the member
@@ -92,7 +92,7 @@ private:
   void set_from_any (const CORBA::Any &any);
 
   /// Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   /// Iterative check for label value match.
   CORBA::Boolean label_match (const CORBA::Any &my_any,
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index 4f6976e784e..4b522011808 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -18,12 +18,12 @@ TAO_DynValueBox_i::TAO_DynValueBox_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynValueBox_i::~TAO_DynValueBox_i (void)
+TAO_DynValueBox_i::~TAO_DynValueBox_i ()
 {
 }
 
 void
-TAO_DynValueBox_i::set_to_value (void)
+TAO_DynValueBox_i::set_to_value ()
 {
   if (CORBA::is_nil (this->boxed_.in ()))
     {
@@ -87,7 +87,7 @@ TAO_DynValueBox_i::_narrow (CORBA::Object_ptr _tao_objref)
 }
 
 CORBA::Any *
-TAO_DynValueBox_i::get_boxed_value (void)
+TAO_DynValueBox_i::get_boxed_value ()
 {
   if (this->destroyed_)
     {
@@ -127,7 +127,7 @@ TAO_DynValueBox_i::set_boxed_value (const CORBA::Any & boxed)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynValueBox_i::get_boxed_value_as_dyn_any (void)
+TAO_DynValueBox_i::get_boxed_value_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -216,7 +216,7 @@ TAO_DynValueBox_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynValueBox_i::destroy (void)
+TAO_DynValueBox_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -237,7 +237,7 @@ TAO_DynValueBox_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynValueBox_i::current_component (void)
+TAO_DynValueBox_i::current_component ()
 {
   if (this->destroyed_)
     {
@@ -324,7 +324,7 @@ TAO_DynValueBox_i::set_from_any (const CORBA::Any & any)
 }
 
 CORBA::Any_ptr
-TAO_DynValueBox_i::to_any (void)
+TAO_DynValueBox_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -336,7 +336,7 @@ TAO_DynValueBox_i::to_any (void)
   // Is this an NULL Valuetype?
   if (!CORBA::ValueBase::_tao_write_special_value (
        out_cdr, reinterpret_cast <CORBA::ValueBase *> (
-         this->is_null_ ? 0 : this                 )   ))
+         this->is_null_ ? 0 : this)))
     {
       // Build <value-tag>, which states if chunking is used
       // and if type information ((list of) repository id(s))
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.h b/TAO/tao/DynamicAny/DynValueBox_i.h
index 992fa8aedb4..3dadf64cb6c 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.h
+++ b/TAO/tao/DynamicAny/DynValueBox_i.h
@@ -39,7 +39,7 @@ public:
   TAO_DynValueBox_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynValueBox_i (void);
+  ~TAO_DynValueBox_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -51,27 +51,27 @@ public:
   static TAO_DynValueBox_i *_narrow (CORBA::Object_ptr obj);
 
   // = Functions specific to DynValueBox.
-  virtual CORBA::Any * get_boxed_value (void);
+  virtual CORBA::Any * get_boxed_value ();
 
   virtual void set_boxed_value (const CORBA::Any & boxed);
 
-  virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any (void);
+  virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any ();
 
   virtual void set_boxed_value_as_dyn_any (DynamicAny::DynAny_ptr boxed);
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
   // = DynValueCommon needed to be provided here
-  virtual void set_to_value (void);
+  virtual void set_to_value ();
 
 private:
   /// Check if the typecode is acceptable.
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
index 08400a45e9a..7a105953409 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
@@ -11,18 +11,18 @@ TAO_DynValueCommon_i::TAO_DynValueCommon_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynValueCommon_i::~TAO_DynValueCommon_i (void)
+TAO_DynValueCommon_i::~TAO_DynValueCommon_i ()
 {
 }
 
 CORBA::Boolean
-TAO_DynValueCommon_i::is_null (void)
+TAO_DynValueCommon_i::is_null ()
 {
   return this->is_null_;
 }
 
 void
-TAO_DynValueCommon_i::set_to_null (void)
+TAO_DynValueCommon_i::set_to_null ()
 {
   this->is_null_        = true;
   this->component_count_  = 0u;
@@ -30,7 +30,7 @@ TAO_DynValueCommon_i::set_to_null (void)
 }
 
 void
-TAO_DynValueCommon_i::init_common (void)
+TAO_DynValueCommon_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.h b/TAO/tao/DynamicAny/DynValueCommon_i.h
index 30cc907773d..7dbf099ecbf 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.h
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.h
@@ -39,20 +39,20 @@ public:
   TAO_DynValueCommon_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynValueCommon_i (void);
+  ~TAO_DynValueCommon_i ();
 
   // = LocalObject methods.
   static TAO_DynValueCommon_i *_narrow (CORBA::Object_ptr obj);
 
   /// Called by DynValue and DynValueBox init() functions.
-  void init_common (void);
+  void init_common ();
 
   // = Functions specific to DynValueCommon.
-  virtual CORBA::Boolean is_null (void);
+  virtual CORBA::Boolean is_null ();
 
-  virtual void set_to_null (void);
+  virtual void set_to_null ();
 
-  virtual void set_to_value (void) = 0;
+  virtual void set_to_value () = 0;
 
 private:
   // = Use copy() or assign() instead of these.
diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp
index 7a58d303fb3..728b5614b1a 100644
--- a/TAO/tao/DynamicAny/DynValue_i.cpp
+++ b/TAO/tao/DynamicAny/DynValue_i.cpp
@@ -21,7 +21,7 @@ TAO_DynValue_i::TAO_DynValue_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynValue_i::~TAO_DynValue_i (void)
+TAO_DynValue_i::~TAO_DynValue_i ()
 {
 }
 
@@ -205,7 +205,7 @@ TAO_DynValue_i::get_member_name (
 }
 
 void
-TAO_DynValue_i::set_to_value (void)
+TAO_DynValue_i::set_to_value ()
 {
   this->component_count_ =
     static_cast <CORBA::ULong> (this->da_members_.size ());
@@ -234,7 +234,7 @@ TAO_DynValue_i::_narrow (CORBA::Object_ptr _tao_objref)
 }
 
 DynamicAny::FieldName
-TAO_DynValue_i::current_member_name (void)
+TAO_DynValue_i::current_member_name ()
 {
   if (this->destroyed_)
     {
@@ -253,7 +253,7 @@ TAO_DynValue_i::current_member_name (void)
 }
 
 CORBA::TCKind
-TAO_DynValue_i::current_member_kind (void)
+TAO_DynValue_i::current_member_kind ()
 {
   if (this->destroyed_)
     {
@@ -273,7 +273,7 @@ TAO_DynValue_i::current_member_kind (void)
 }
 
 DynamicAny::NameValuePairSeq *
-TAO_DynValue_i::get_members (void)
+TAO_DynValue_i::get_members ()
 {
   if (this->destroyed_)
     {
@@ -351,7 +351,7 @@ TAO_DynValue_i::set_members (
 }
 
 DynamicAny::NameDynAnyPairSeq *
-TAO_DynValue_i::get_members_as_dyn_any (void)
+TAO_DynValue_i::get_members_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -491,7 +491,7 @@ TAO_DynValue_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynValue_i::destroy (void)
+TAO_DynValue_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -519,7 +519,7 @@ TAO_DynValue_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynValue_i::current_component (void)
+TAO_DynValue_i::current_component ()
 {
   if (this->destroyed_)
     {
@@ -602,7 +602,7 @@ TAO_DynValue_i::insert_val (CORBA::ValueBase *value)
 // which then will be wrong type for the valuetype
 // output we want.
 CORBA::ValueBase *
-TAO_DynValue_i::get_val (void)
+TAO_DynValue_i::get_val ()
 {
   if (this->destroyed_)
     {
@@ -626,7 +626,7 @@ TAO_DynValue_i::get_val (void)
 }
 
 CORBA::Any_ptr
-TAO_DynValue_i::to_any (void)
+TAO_DynValue_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -704,7 +704,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr)
   if (!CORBA::ValueBase::_tao_write_special_value (
         out_cdr,
         reinterpret_cast <CORBA::ValueBase *>
-          (this->is_null_ ? 0 : this)             ))
+          (this->is_null_ ? 0 : this)))
     {
       // OK since a special_value hasn't been written we are
       // NOT a NULL or indirect ValueType. We need to create
@@ -1201,7 +1201,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm)
               // base-type's state.
               if (!( (currentBase || !requires_truncation) ?
                      ci.handle_chunking (strm) :
-                     ci.skip_chunks (strm)                  ))
+                     ci.skip_chunks (strm)))
                 {
                   TAOLIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ")
diff --git a/TAO/tao/DynamicAny/DynValue_i.h b/TAO/tao/DynamicAny/DynValue_i.h
index ce0194f7211..f3f8884342e 100644
--- a/TAO/tao/DynamicAny/DynValue_i.h
+++ b/TAO/tao/DynamicAny/DynValue_i.h
@@ -39,7 +39,7 @@ public:
   TAO_DynValue_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynValue_i (void);
+  ~TAO_DynValue_i ();
 
   /// Initialize using an Any.
   void init (const CORBA::Any& any);
@@ -54,15 +54,15 @@ public:
   static TAO_DynValue_i *_narrow (CORBA::Object_ptr obj);
 
   // = Functions specific to DynValue.
-  virtual DynamicAny::FieldName current_member_name (void);
+  virtual DynamicAny::FieldName current_member_name ();
 
-  virtual CORBA::TCKind current_member_kind (void);
+  virtual CORBA::TCKind current_member_kind ();
 
-  virtual DynamicAny::NameValuePairSeq * get_members (void);
+  virtual DynamicAny::NameValuePairSeq * get_members ();
 
   virtual void set_members (const DynamicAny::NameValuePairSeq & value);
 
-  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (void);
+  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ();
 
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value);
@@ -70,20 +70,20 @@ public:
   // = DynAny common functions not implemented in class TAO_DynCommon.
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
   virtual void insert_val (CORBA::ValueBase * value);
 
-  virtual CORBA::ValueBase * get_val (void);
+  virtual CORBA::ValueBase * get_val ();
 
   // = DynValueCommon needed to be provided here
-  virtual void set_to_value (void);
+  virtual void set_to_value ();
 
 private:
   /// List of base types.
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 1b6128a6254..ccb3723a2b5 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -12,7 +12,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
+TAO_DynamicAny_Loader::TAO_DynamicAny_Loader ()
 {
 }
 
@@ -29,7 +29,7 @@ TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr,
 }
 
 int
-TAO_DynamicAny_Loader::Initializer (void)
+TAO_DynamicAny_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_DynamicAny_Loader);
 }
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index 6d8059ff461..6c64249fdca 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -32,7 +32,7 @@ class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader
 {
 public:
   /// Constructor
-  TAO_DynamicAny_Loader (void);
+  TAO_DynamicAny_Loader ();
 
   /// Creates a DynamicAny factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
@@ -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/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 2b421eb3c91..52bf4e2517a 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -302,11 +302,7 @@ TAO_AMH_DSI_Exception_Holder::_tao_unmarshal (
 void
 TAO_AMH_DSI_Exception_Holder::raise_invoke ()
 {
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr< ::CORBA::Exception> safety (this->exception_);
-#else
-  auto_ptr< ::CORBA::Exception> safety (this->exception_);
-#endif /* ACE_HAS_CPP11 */
   this->exception_->_raise ();
 }
 
@@ -411,7 +407,7 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
       this->_tao_out.write_char_array (encap.buffer (),
                                        ACE_Utils::truncate_cast<ACE_CDR::ULong> (encap.length ()));
       // This will prevent the marshaling of any parameters into this reply.
-      //  this->sent_gateway_exception_ = 1;
+      //  this->sent_gateway_exception_ = true;
       this->_tao_rh_send_reply ();
     }
   catch (const CORBA::Exception &)
@@ -456,7 +452,7 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
   // to the original source of the reply.
     this->_tao_out.write_octet_array_mb (encap.start());
   // This will prevent the marshaling of any parameters into this reply.
-  //  this->sent_gateway_exception_ = 1;
+  //  this->sent_gateway_exception_ = true;
     this->_tao_rh_send_reply ();
   }
   catch (const CORBA::Exception &)
@@ -484,7 +480,7 @@ TAO_AMH_DSI_Response_Handler::_unchecked_narrow (CORBA::Object_ptr obj)
   if (CORBA::is_nil (obj))
     return TAO_AMH_DSI_Response_Handler::_nil ();
 
-  return dynamic_cast < TAO_AMH_DSI_Response_Handler_ptr > (obj);
+  return dynamic_cast <TAO_AMH_DSI_Response_Handler_ptr> (obj);
 }
 
 const char*
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 4076983b754..dd9eb9cfc5a 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -31,11 +31,7 @@
 #include "tao/default_environment.h"
 
 #include "ace/Unbounded_Queue.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -113,11 +109,7 @@ namespace CORBA
 
   private:
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
   };
 
   /**
@@ -182,11 +174,7 @@ namespace CORBA
     ContextList &operator= (const ContextList &);
 
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
     /// Internal list of typecodes.
     ACE_Unbounded_Queue<char *> ctx_list_;
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index d95e1c7ab1b..7ca4ea488b9 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -59,7 +59,6 @@ namespace TAO
   CORBA::Boolean
   NVList_Argument::demarshal (TAO_InputCDR &cdr)
   {
-
     try
       {
         // Now, get all the "return", "out", and "inout" parameters
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index db7200985ed..a59a7b059eb 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -30,11 +30,7 @@
 #include "tao/Pseudo_VarOut_T.h"
 
 #include "ace/Unbounded_Queue.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -106,11 +102,7 @@ namespace CORBA
     ExceptionList &operator= (const ExceptionList &);
 
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
     /// Internal list of typecodes.
     ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_;
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 6613188666b..19054aa74c2 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -40,11 +40,7 @@
 #endif /* TAO_HAS_AMI */
 
 #include "ace/SString.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -248,11 +244,7 @@ namespace CORBA
     CORBA::Context_ptr ctx_;
 
     /// Reference counting.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
     /// Protect the response_received_.
     TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index e946d3179b8..6c4fcd680da 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -37,7 +37,7 @@ CORBA::ServerRequest::_decr_refcount (void)
 }
 
 CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request)
-  : lazy_evaluation_ (0),
+  : lazy_evaluation_ (false),
     ctx_ (CORBA::Context::_nil ()),
     params_ (CORBA::NVList::_nil ()),
     retval_ (0),
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 555e1c4f8f7..8532a92c237 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -29,11 +29,7 @@
 
 #include "tao/TAO_Server_Request.h"
 #include "tao/CDR.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -150,11 +146,7 @@ namespace CORBA
     CORBA::Any_ptr exception_;
 
     /// Reference counting.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
     /// Request from the ORB.
     TAO_ServerRequest &orb_server_request_;
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
index 76a6e2bb58d..3c0641d1acc 100644
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ b/TAO/tao/Dynamic_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void)
+TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter ()
 {
 }
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Config.h b/TAO/tao/Dynamic_TP/DTP_Config.h
index 9cda4ab6d86..1cb1cb90ead 100644
--- a/TAO/tao/Dynamic_TP/DTP_Config.h
+++ b/TAO/tao/Dynamic_TP/DTP_Config.h
@@ -47,7 +47,6 @@ struct TAO_Dynamic_TP_Export TAO_DTP_Definition
     stack_size_(ACE_DEFAULT_THREAD_STACKSIZE),
     timeout_(60,0),
     queue_depth_(0){}
-
 };
 
 class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry_Installer
@@ -101,7 +100,6 @@ private:
   int parse_string (int &curarg, int argc, ACE_TCHAR* argv[], const ACE_TCHAR *match, ACE_TCHAR *&value);
   void report_option_value_error (const ACE_TCHAR* option_name,
                                   const ACE_TCHAR* option_value);
-
 };
 
 static TAO_DTP_Config_Registry_Installer config_installer;
diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
index b3aa6d5ffd4..fd884660896 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
@@ -42,7 +42,6 @@ class TAO_DTP_ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-
   TAO_DTP_ORBInitializer (void);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
@@ -50,11 +49,8 @@ public:
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register Dynamic_TP policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
-
-private:
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
index b1a30f0a276..8b81afd949f 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
@@ -33,7 +33,6 @@ class TAO_ORB_Core;
 class TAO_Dynamic_TP_Export TAO_DTP_ORB_Loader : public ACE_Service_Object
 {
 public:
-
   /// Constructor.
   TAO_DTP_ORB_Loader (void);
 
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
index 530af5a0300..a0a021149f0 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
@@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Dynamic_TP_Export TAO_DTP_POA_Loader : public ACE_Service_Object
 {
 public:
-
   /// Constructor.
   TAO_DTP_POA_Loader (void);
 
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
index 2d8608d0960..3b9acd43681 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
@@ -32,10 +32,8 @@
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 #include "ace/OS_NS_strings.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
 class TAO_DTP_POA_Strategy;
 typedef TAO_Intrusive_Ref_Count_Handle<TAO_DTP_POA_Strategy>
         TAO_DTP_POA_Strategy_Handle;
@@ -58,7 +56,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
   public TAO::CSD::Strategy_Base
 {
  public:
-
   /// Constructors.
   /// This constructor supports situations where dynamic instantiation
   /// of a thread pool for POAs is initiated from a svc.conf file.
@@ -110,7 +107,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
   /// This is requested on the user application level.
   void cancel_requests(PortableServer::Servant servant);
 
-
  protected:
   /// Handle the dispatching of a remote request.
   ///
@@ -157,8 +153,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
      const PortableServer::ObjectId& oid);
 
  private:
-
-
   /**
    * Helper method that is responsible for looking up the servant
    * state object in the servant state map *if* the "serialize
@@ -201,10 +195,8 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
   /// been sent in from an application or, if false, needs to be
   /// looked up from a Dynamic TP Config repo. It works in conjunction with
   /// dynamic_tp_config_name_ above.
-
   bool config_initialized_;
 
-
   void set_dtp_config(TAO_DTP_Definition &tp_config);
 };
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp
index e587d7eb746..80a3bbd2dd2 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp
@@ -153,8 +153,7 @@ TAO_DTP_Task::open (void* /* args */)
                     this->max_pool_threads_,
                     this->max_request_queue_depth_,
                     this->thread_stack_size_,
-                    this->thread_idle_time_.sec ())
-                   );
+                    this->thread_idle_time_.sec ()));
     }
 
   // We can't activate 0 threads.  Make sure this isn't the case.
@@ -346,7 +345,7 @@ TAO_DTP_Task::svc (void)
                               ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ")
                               ACE_TEXT ("Decrementing busy_threads_. ")
                               ACE_TEXT ("Busy thread count:%d\n"),
-                              this->busy_threads_.value()));
+                              this->busy_threads_.load()));
                 }
 
               ACE_Time_Value tmp_sec = this->thread_idle_time_.to_absolute_time();
@@ -386,7 +385,7 @@ TAO_DTP_Task::svc (void)
                               ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ")
                               ACE_TEXT ("Incrementing busy_threads_. ")
                               ACE_TEXT ("Busy thread count:%d\n"),
-                              this->busy_threads_.value ()));
+                              this->busy_threads_.load ()));
                 }
             }
         }
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h
index 77f2cfabdd4..c39e3b57772 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.h
+++ b/TAO/tao/Dynamic_TP/DTP_Task.h
@@ -31,178 +31,178 @@
 #include "ace/Synch.h"
 #include "ace/Containers_T.h"
 #include "ace/Vector_T.h"
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-    /**
-     * @class TP_Task
-     *
-     * @brief Active Object managing a queue of request objects.
-     *
-     * There are two types of "users" of a TP_Task object:
-     *
-     *    1) The TP_Strategy object that "owns" this task object.
-     *    2) The worker threads that "run" this task object as an
-     *       "active object".
-     *
-     * The TP_Strategy object that "owns" this task object dictates
-     * when the worker threads are activated and when they are shutdown.  It
-     * also injects requests into this task's queue via calls to the
-     * add_request() method.  It is also the TP_Strategy object that
-     * dictates the number of worker threads to be activated via a call to
-     * the set_num_threads() method.
-     *
-     * The active object pattern is implemented via the use of the
-     * the ACE_Task_Base base class, and each worker thread will
-     * invoke this task's svc() method, and when the svc() returns, the
-     * worker thread will invoke this task's close() method (with the
-     * flag argument equal to 0).
-     */
-    class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base
-    {
-    public:
-
-      /// Default Constructor.
-      TAO_DTP_Task();
+/**
+  * @class TP_Task
+  *
+  * @brief Active Object managing a queue of request objects.
+  *
+  * There are two types of "users" of a TP_Task object:
+  *
+  *    1) The TP_Strategy object that "owns" this task object.
+  *    2) The worker threads that "run" this task object as an
+  *       "active object".
+  *
+  * The TP_Strategy object that "owns" this task object dictates
+  * when the worker threads are activated and when they are shutdown.  It
+  * also injects requests into this task's queue via calls to the
+  * add_request() method.  It is also the TP_Strategy object that
+  * dictates the number of worker threads to be activated via a call to
+  * the set_num_threads() method.
+  *
+  * The active object pattern is implemented via the use of the
+  * the ACE_Task_Base base class, and each worker thread will
+  * invoke this task's svc() method, and when the svc() returns, the
+  * worker thread will invoke this task's close() method (with the
+  * flag argument equal to 0).
+  */
+class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base
+{
+public:
 
-      /// Virtual Destructor.
-      virtual ~TAO_DTP_Task();
+  /// Default Constructor.
+  TAO_DTP_Task();
 
-      struct Open_Args {
-        TAO_DTP_Definition task_thread_config;
-      };
+  /// Virtual Destructor.
+  virtual ~TAO_DTP_Task();
 
+  struct Open_Args {
+    TAO_DTP_Definition task_thread_config;
+  };
 
-      /// Put a request object on to the request queue.
-      /// Returns true if successful, false otherwise (it has been "rejected").
-      bool add_request(TAO::CSD::TP_Request* request);
 
-      /// Activate the worker threads
-      virtual int open(void* args = 0);
+  /// Put a request object on to the request queue.
+  /// Returns true if successful, false otherwise (it has been "rejected").
+  bool add_request(TAO::CSD::TP_Request* request);
 
-      /// The "mainline" executed by each worker thread.
-      virtual int svc();
+  /// Activate the worker threads
+  virtual int open(void* args = 0);
 
-      virtual int close (u_long flag = 0);
+  /// The "mainline" executed by each worker thread.
+  virtual int svc();
 
-      /// Set the thread and queue config.
+  virtual int close (u_long flag = 0);
 
-      void set_init_pool_threads(size_t thr_count);
+  /// Set the thread and queue config.
 
-      void set_min_pool_threads(size_t thr_count);
+  void set_init_pool_threads(size_t thr_count);
 
-      void set_max_pool_threads(size_t thr_count);
+  void set_min_pool_threads(size_t thr_count);
 
-      void set_thread_stack_size(size_t stack_sz);
+  void set_max_pool_threads(size_t thr_count);
 
-      void set_thread_idle_time(ACE_Time_Value thr_timeout);
+  void set_thread_stack_size(size_t stack_sz);
 
-      void set_max_request_queue_depth(size_t queue_depth);
+  void set_thread_idle_time(ACE_Time_Value thr_timeout);
 
-      /// Get the thread and queue config.
+  void set_max_request_queue_depth(size_t queue_depth);
 
-      size_t get_init_pool_threads();
+  /// Get the thread and queue config.
 
-      size_t get_min_pool_threads();
+  size_t get_init_pool_threads();
 
-      size_t get_max_pool_threads();
+  size_t get_min_pool_threads();
 
-      size_t get_max_request_queue_depth();
+  size_t get_max_pool_threads();
 
-      size_t get_thread_stack_size();
+  size_t get_max_request_queue_depth();
 
-      time_t get_thread_idle_time();
+  size_t get_thread_stack_size();
 
-      /// Cancel all requests that are targeted for the provided servant.
-      void cancel_servant (PortableServer::Servant servant);
+  time_t get_thread_idle_time();
 
-    private:
-      /// get the next available request. Return true if one available, nonblocking
-      bool request_ready (TAO::CSD::TP_Dispatchable_Visitor &v,
-                          TAO::CSD::TP_Request_Handle &r);
+  /// Cancel all requests that are targeted for the provided servant.
+  void cancel_servant (PortableServer::Servant servant);
 
-      /// release the request, reset the accepting flag if necessary
-      void clear_request (TAO::CSD::TP_Request_Handle &r);
+private:
+  /// get the next available request. Return true if one available, nonblocking
+  bool request_ready (TAO::CSD::TP_Dispatchable_Visitor &v,
+                      TAO::CSD::TP_Request_Handle &r);
 
-      void add_busy (void);
-      void remove_busy (void);
-      void add_active (void);
-      bool remove_active (bool);
-      bool need_active (void);
-      bool above_minimum (void);
+  /// release the request, reset the accepting flag if necessary
+  void clear_request (TAO::CSD::TP_Request_Handle &r);
 
-      typedef TAO_SYNCH_MUTEX         LockType;
-      typedef TAO_Condition<LockType> ConditionType;
+  void add_busy (void);
+  void remove_busy (void);
+  void add_active (void);
+  bool remove_active (bool);
+  bool need_active (void);
+  bool above_minimum (void);
 
-      /// Lock used to synchronize the "active_workers_" condition
-      LockType aw_lock_;
-      /// Lock used to synchronize manipulation of the queue
-      LockType queue_lock_;
-      /// Lock used to synchronize the "work_available_" condition
-      LockType work_lock_;
+  typedef TAO_SYNCH_MUTEX         LockType;
+  typedef TAO_Condition<LockType> ConditionType;
 
-      /// Condition used to signal worker threads that they may be able to
-      /// find a request in the queue_ that needs to be dispatched to a
-      /// servant that is currently "not busy".
-      /// This condition will be signal()'ed each time a new request is
-      /// added to the queue_, and also when a servant has become "not busy".
-      ConditionType work_available_;
+  /// Lock used to synchronize the "active_workers_" condition
+  LockType aw_lock_;
+  /// Lock used to synchronize manipulation of the queue
+  LockType queue_lock_;
+  /// Lock used to synchronize the "work_available_" condition
+  LockType work_lock_;
 
-      /// This condition will be signal()'ed each time the num_threads_
-      /// data member has its value changed.  This is used to keep the
-      /// close(1) invocation (ie, a shutdown request) blocked until all
-      /// of the worker threads have stopped running.
-      ConditionType active_workers_;
+  /// Condition used to signal worker threads that they may be able to
+  /// find a request in the queue_ that needs to be dispatched to a
+  /// servant that is currently "not busy".
+  /// This condition will be signal()'ed each time a new request is
+  /// added to the queue_, and also when a servant has become "not busy".
+  ConditionType work_available_;
 
-      /// The number of threads that are currently active. This may be
-      /// different than the total number of threads since the latter
-      /// may include threads that are shutting down but not reaped.
-      size_t active_count_;
+  /// This condition will be signal()'ed each time the num_threads_
+  /// data member has its value changed.  This is used to keep the
+  /// close(1) invocation (ie, a shutdown request) blocked until all
+  /// of the worker threads have stopped running.
+  ConditionType active_workers_;
 
-      /// Flag used to indicate when this task will (or will not) accept
-      /// requests via the the add_request() method.
-      bool accepting_requests_;
+  /// The number of threads that are currently active. This may be
+  /// different than the total number of threads since the latter
+  /// may include threads that are shutting down but not reaped.
+  size_t active_count_;
 
-      /// Flag used to initiate a shutdown request to all worker threads.
-      bool shutdown_;
+  /// Flag used to indicate when this task will (or will not) accept
+  /// requests via the the add_request() method.
+  bool accepting_requests_;
 
-      /// Flag to indicate something is on the queue. works in conjunction with
-      /// the work_available condition
-      bool check_queue_;
+  /// Flag used to initiate a shutdown request to all worker threads.
+  bool shutdown_;
 
-      /// Flag used to avoid multiple open() calls.
-      bool opened_;
+  /// Flag to indicate something is on the queue. works in conjunction with
+  /// the work_available condition
+  bool check_queue_;
 
-      /// The number of requests in the local queue.
-      size_t num_queue_requests_;
+  /// Flag used to avoid multiple open() calls.
+  bool opened_;
 
-      /// The number of currently active worker threads.
-      ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long> busy_threads_;
+  /// The number of requests in the local queue.
+  size_t num_queue_requests_;
 
-      /// The queue of pending servant requests (a.k.a. the "request queue").
-      TAO::CSD::TP_Queue queue_;
+  /// The number of currently active worker threads.
+  std::atomic<unsigned long> busy_threads_;
 
-      /// The low water mark for dynamic threads to settle to.
-      size_t init_pool_threads_;
+  /// The queue of pending servant requests (a.k.a. the "request queue").
+  TAO::CSD::TP_Queue queue_;
 
-      /// The low water mark for dynamic threads to settle to.
-      size_t min_pool_threads_;
+  /// The low water mark for dynamic threads to settle to.
+  size_t init_pool_threads_;
 
-      /// The high water mark for dynamic threads to be limited to.
-      size_t max_pool_threads_;
+  /// The low water mark for dynamic threads to settle to.
+  size_t min_pool_threads_;
 
-      /// If the max_pool_threads_ value has been met, then ORB requests coming in can be queued.
-      /// This is the maximum number that will be allowed.
-      size_t max_request_queue_depth_;
+  /// The high water mark for dynamic threads to be limited to.
+  size_t max_pool_threads_;
 
-      /// This is the memory stack size allowable for each thread.
-      size_t thread_stack_size_;
+  /// If the max_pool_threads_ value has been met, then ORB requests coming in can be queued.
+  /// This is the maximum number that will be allowed.
+  size_t max_request_queue_depth_;
 
-      /// This is the maximum amount of time in seconds that an idle thread can
-      /// stay alive before being taken out of the pool.
-      ACE_Time_Value thread_idle_time_;
-    };
+  /// This is the memory stack size allowable for each thread.
+  size_t thread_stack_size_;
 
+  /// This is the maximum amount of time in seconds that an idle thread can
+  /// stay alive before being taken out of the pool.
+  ACE_Time_Value thread_idle_time_;
+};
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
index a51873958c1..bfc7bcc1a0d 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
@@ -519,11 +519,7 @@ CORBA::ULong
 TAO_DTP_Thread_Pool_Manager::create_threadpool_helper (TAO_DTP_Thread_Pool *thread_pool)
 {
   // Make sure of safe deletion in case of errors.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_DTP_Thread_Pool> safe_thread_pool (thread_pool);
-#else
-  auto_ptr<TAO_DTP_Thread_Pool> safe_thread_pool (thread_pool);
-#endif /* ACE_HAS_CPP11 */
 
   // Open the pool.
   thread_pool->open ();
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
index 520d3e5964c..df83f5f3124 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
@@ -48,7 +48,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_New_Leader_Generator
   : public TAO_New_Leader_Generator
 {
 public:
-
   /// Constructor.
   TAO_DTP_New_Leader_Generator (TAO_DTP_Thread_Pool &lane);
 
@@ -57,7 +56,6 @@ public:
   bool no_leaders_available (void);
 
 private:
-
   /// Pool associated with this leader generator.
   TAO_DTP_Thread_Pool &pool_;
 };
@@ -243,7 +241,6 @@ public:
   // @}
 
 private:
-
   /// @name Helpers
   // @{
 
@@ -255,7 +252,6 @@ private:
   // @}
 
 private:
-
   TAO_ORB_Core &orb_core_;
 
   THREAD_POOLS thread_pools_;
diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp
index 7142c6ab8fe..2fc670189d8 100644
--- a/TAO/tao/Endpoint.cpp
+++ b/TAO/tao/Endpoint.cpp
@@ -7,18 +7,16 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Endpoint::~TAO_Endpoint (void)
+TAO_Endpoint::~TAO_Endpoint ()
 {
 }
 
 TAO_Endpoint *
 TAO_Endpoint::next_filtered (TAO_ORB_Core *, TAO_Endpoint *root)
 {
-  if (root == 0)
+  if (root == nullptr)
     return this;
   return this->next();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
-
-//@@ TAO_ENDPOINT_SPL_METHODS_ADD_HOOK
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index 130f465c02d..f4a943177b9 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -28,12 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 
-/*
- * Includes and forward decls for specializing TAO's
- * endpoint implementation.
- */
-//@@ TAO_ENDPOINT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class TAO_Endpoint
  *
@@ -119,12 +113,6 @@ public:
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (void)  = 0;
 
-  /*
-   * Hook to add public methods from derived class onto base
-   * Endpoint class.
-   */
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// Lock for the address lookup.
   /**
@@ -150,20 +138,11 @@ protected:
   CORBA::Short priority_;
 
 private:
-
   /// Endpoints should not be copied.
   TAO_Endpoint (const TAO_Endpoint&);
   void operator= (const TAO_Endpoint&);
-
-  /*
-   * Addition of private members from derived class.
-   */
-  //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_ADD_HOOK
-
 };
 
-//@@ TAO_ENDPOINT_SPL_EXTERN_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp
index 7078166b809..aaa972099ba 100644
--- a/TAO/tao/Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Endpoint_Selector_Factory.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void)
+TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory ()
 {
 }
 
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 5f4cb9a9d53..779bea6f483 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -11,22 +11,22 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::Environment::Environment (void)
-  : exception_ (0)
-  , previous_ (0)
+CORBA::Environment::Environment ()
+  : exception_ (nullptr)
+  , previous_ (nullptr)
 {
 }
 
 CORBA::Environment::Environment (const CORBA::Environment& rhs)
-  : exception_ (0)
-  , previous_ (0)
+  : exception_ (nullptr)
+  , previous_ (nullptr)
 {
   if (rhs.exception_)
     this->exception_ = rhs.exception_->_tao_duplicate ();
 }
 
 CORBA::Environment::Environment (TAO_ORB_Core* orb_core)
-  : exception_ (0)
+  : exception_ (nullptr)
   , previous_ (orb_core->default_environment ())
 {
   orb_core->default_environment (this);
@@ -49,14 +49,14 @@ CORBA::Environment::operator= (const CORBA::Environment& rhs)
   return *this;
 }
 
-CORBA::Environment::~Environment (void)
+CORBA::Environment::~Environment ()
 {
   this->clear ();
 
   // If previous is 0 then this is the first Environment, allocated
   // with the ORB, it shouldn't try to pop because the ORB is being
   // destroyed also.
-  if (this->previous_ != 0)
+  if (this->previous_ != nullptr)
     TAO_ORB_Core_instance ()->default_environment (this->previous_);
 }
 
@@ -84,15 +84,15 @@ CORBA::Environment::exception (CORBA::Exception *ex)
 
   this->exception_ = ex;
 
-  if (this->exception_ != 0)
+  if (this->exception_ != nullptr)
     this->exception_->_raise ();
 }
 
 void
-CORBA::Environment::clear (void)
+CORBA::Environment::clear ()
 {
   delete this->exception_;
-  this->exception_ = 0;
+  this->exception_ = nullptr;
 }
 
 CORBA::Environment&
@@ -118,7 +118,7 @@ CORBA::Environment::default_environment ()
 // Convenience -- say if the exception is a system exception or not.
 
 int
-CORBA::Environment::exception_type (void) const
+CORBA::Environment::exception_type () const
 {
   // @@ Carlos, is this stuff that's properly "transformed" for EBCDIC
   //    platforms?!
@@ -156,10 +156,10 @@ CORBA::Environment::exception_type (void) const
 }
 
 const char*
-CORBA::Environment::exception_id (void) const
+CORBA::Environment::exception_id () const
 {
-  if (this->exception_ == 0)
-    return 0;
+  if (this->exception_ == nullptr)
+    return nullptr;
 
   return this->exception_->_rep_id ();
 }
@@ -182,7 +182,7 @@ CORBA::Environment::print_exception (const char *info,
       CORBA::SystemException *x2 =
         CORBA::SystemException::_downcast (this->exception_);
 
-      if (x2 != 0)
+      if (x2 != nullptr)
         x2->_tao_print_system_exception ();
       else
         // @@ we can use the exception's typecode to dump all the data
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index 8b3e2269022..d381afd7329 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -74,7 +74,7 @@ namespace CORBA
   public:
     /// The default constructor.  The environment will hold no
     /// exceptions.
-    Environment (void);
+    Environment ();
 
     /// Copy constructor.
     Environment (const Environment &ACE_TRY_ENV);
@@ -83,11 +83,11 @@ namespace CORBA
     Environment &operator=(const Environment &ACE_TRY_ENV);
 
     /// Destructor, release the exception.
-    ~Environment (void);
+    ~Environment ();
 
     /// Some static methods that need to be defined in every pseudo object
     static Environment * _duplicate (Environment *);
-    static Environment * _nil (void);
+    static Environment * _nil ();
 
     /// Return the contained CORBA::Exception.
     /**
@@ -98,7 +98,7 @@ namespace CORBA
      * "C++ Language Mapping" (formal/00-01-02). Section 1.27
      * Environment (page 1-113)
      */
-    CORBA::Exception* exception (void) const;
+    CORBA::Exception* exception () const;
 
     /// Set the contained CORBA::Exception to @a ex
     /**
@@ -114,20 +114,20 @@ namespace CORBA
 
     /// Return if the exception is a user exception or a system
     /// exception.
-    int exception_type (void) const;
+    int exception_type () const;
 
     /// return the repository ID for the exception.
-    const char *exception_id (void) const;
+    const char *exception_id () const;
 
     /// Clear the exception.
-    void clear (void);
+    void clear ();
 
     /// Print the exception to output determined by f.  This function
     /// is not CORBA compliant.
     void print_exception (const char *info, FILE *f=stdout) const;
 
     // = Obtain a default environment to use with TAO.
-    static CORBA::Environment &default_environment (void);
+    static CORBA::Environment &default_environment ();
 
     // Useful for template programming.
     typedef CORBA::Environment_ptr _ptr_type;
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index b6de9c41fce..a0234612fc2 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -45,13 +45,13 @@ CORBA::Exception::Exception (const CORBA::Exception &src)
 // responsible for releasing any storage owned by the exception.  It
 // can do this because it's got the local name and the id.
 
-CORBA::Exception::Exception (void)
+CORBA::Exception::Exception ()
   : id_ (),
     name_ ()
 {
 }
 
-CORBA::Exception::~Exception (void)
+CORBA::Exception::~Exception ()
 {
 }
 
@@ -68,13 +68,13 @@ CORBA::Exception::operator= (const CORBA::Exception &src)
 }
 
 const char *
-CORBA::Exception::_rep_id (void) const
+CORBA::Exception::_rep_id () const
 {
   return this->id_.in ();
 }
 
 const char *
-CORBA::Exception::_name (void) const
+CORBA::Exception::_name () const
 {
   return this->name_.in ();
 }
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 84a1be86263..cec1728c15d 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -110,25 +110,25 @@ namespace CORBA
     Exception (const Exception &src);
 
     /// Destructor.
-    virtual ~Exception (void);
+    virtual ~Exception ();
 
     // = To throw the exception (when using the standard mapping).
-    virtual void _raise (void) const = 0;
+    virtual void _raise () const = 0;
 
     // = The static narrow operations.
     static Exception * _downcast (Exception * x);
     static Exception const * _downcast (Exception const * x);
 
     /// Return the repository ID of the Exception.
-    virtual const char * _rep_id (void) const;
+    virtual const char * _rep_id () const;
 
     /// Return the name of the Exception.
-    virtual const char * _name (void) const;
+    virtual const char * _name () const;
 
     // = These are TAO-specific extensions.
 
     /// Will be overridden in the concrete derived classes.
-    virtual CORBA::TypeCode_ptr _tao_type (void) const = 0;
+    virtual CORBA::TypeCode_ptr _tao_type () const = 0;
 
     /// Print the exception to output determined by @a f.
     /**
@@ -146,7 +146,7 @@ namespace CORBA
 
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
-    virtual ACE_CString _info (void) const = 0;
+    virtual ACE_CString _info () const = 0;
 
     virtual void _tao_encode (TAO_OutputCDR &cdr) const = 0;
 
@@ -171,18 +171,17 @@ namespace CORBA
      *     ACE_NEW_RETURN (
      *         result,
      *         SomeException (*this),
-     *         0
-     *       );
+     *         0);
      *     return result;
      *   }
      * };
      * </PRE>
      */
-    virtual CORBA::Exception *_tao_duplicate (void) const = 0;
+    virtual CORBA::Exception *_tao_duplicate () const = 0;
 
   protected:
     /// Default constructor.
-    Exception (void);
+    Exception ();
 
     /// Assignment operator.
     Exception & operator = (const Exception & src);
diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h
index e10b104bf0c..071d6cfd8dc 100644
--- a/TAO/tao/Exception_Data.h
+++ b/TAO/tao/Exception_Data.h
@@ -35,7 +35,7 @@ namespace TAO
   // Function pointer returning a pointer to CORBA::Exception. This is used to
   // describe the allocator for user-defined exceptions that are used internally
   // by the interpreter.
-  typedef CORBA::Exception* (*TAO_Exception_Alloc) (void);
+  typedef CORBA::Exception* (*TAO_Exception_Alloc) ();
 
   /**
    * @struct Exception_Data
diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp
index 1b414fa7c6f..f7c3e9c936f 100644
--- a/TAO/tao/Exclusive_TMS.cpp
+++ b/TAO/tao/Exclusive_TMS.cpp
@@ -9,11 +9,11 @@ TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport)
   : TAO_Transport_Mux_Strategy (transport),
     request_id_generator_ (0),
     request_id_ (0),
-    rd_ (0)
+    rd_ (nullptr)
 {
 }
 
-TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void)
+TAO_Exclusive_TMS::~TAO_Exclusive_TMS ()
 {
 }
 
@@ -21,7 +21,7 @@ TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void)
 // invocation. We can actually return a predecided ULong, since we
 // allow only one invocation over this connection at a time.
 CORBA::ULong
-TAO_Exclusive_TMS::request_id (void)
+TAO_Exclusive_TMS::request_id ()
 {
   ++this->request_id_generator_;
 
@@ -58,9 +58,9 @@ TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id,
 }
 
 bool
-TAO_Exclusive_TMS::has_request (void)
+TAO_Exclusive_TMS::has_request ()
 {
-  return this->rd_ != 0;
+  return this->rd_ != nullptr;
 }
 
 int
@@ -125,17 +125,17 @@ TAO_Exclusive_TMS::reply_timed_out (CORBA::ULong request_id)
 }
 
 bool
-TAO_Exclusive_TMS::idle_after_send (void)
+TAO_Exclusive_TMS::idle_after_send ()
 {
   // if there is no reply dispatcher (possible in case of AMI requests)
   // release the transport now
-  if (this->rd_ != 0)
+  if (this->rd_ != nullptr)
     {
       return false;
     }
   else
     {
-      if (this->transport_ != 0)
+      if (this->transport_ != nullptr)
         {
           // let WS know we're finished
           this->transport_->wait_strategy ()->finished_request ();
@@ -147,12 +147,12 @@ TAO_Exclusive_TMS::idle_after_send (void)
 }
 
 bool
-TAO_Exclusive_TMS::idle_after_reply (void)
+TAO_Exclusive_TMS::idle_after_reply ()
 {
   // Irrespective of whether we are successful or not we need to
   // return true. If *this* class is not successful in idling the
   // transport no one can.
-  if (this->transport_ != 0)
+  if (this->transport_ != nullptr)
   {
     // let WS know we're finished
     this->transport_->wait_strategy ()->finished_request ();
@@ -164,9 +164,9 @@ TAO_Exclusive_TMS::idle_after_reply (void)
 }
 
 void
-TAO_Exclusive_TMS::connection_closed (void)
+TAO_Exclusive_TMS::connection_closed ()
 {
-  if (this->rd_ != 0)
+  if (this->rd_ != nullptr)
     this->rd_->connection_closed ();
 }
 
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index 0c9398e27c9..ea0224d4f79 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -15,7 +15,7 @@ static const char file_prefix[] = "file:";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FILE_Parser::~TAO_FILE_Parser (void)
+TAO_FILE_Parser::~TAO_FILE_Parser ()
 {
 }
 
@@ -39,14 +39,14 @@ TAO_FILE_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb)
   FILE* file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR (filename),
                               ACE_TEXT("r"));
 
-  if (file == 0)
+  if (file == nullptr)
     return CORBA::Object::_nil ();
 
   ACE_Read_Buffer reader (file, true);
 
   char* string = reader.read ();
 
-  if (string == 0)
+  if (string == nullptr)
     return CORBA::Object::_nil ();
 
   CORBA::Object_ptr object = CORBA::Object::_nil ();
diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp
index cee4f82a00a..c38de0e1be8 100644
--- a/TAO/tao/Fault_Tolerance_Service.cpp
+++ b/TAO/tao/Fault_Tolerance_Service.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void)
+TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service ()
 {
   delete this->ft_service_callback_;
 }
@@ -21,7 +21,7 @@ TAO_Fault_Tolerance_Service::init (TAO_ORB_Core *orb_core)
 {
   // Look in to the svc conf stuff to get an instance of the
   // FT_Service.
-  if (this->ft_service_callback_ == 0)
+  if (this->ft_service_callback_ == nullptr)
     {
       TAO_Services_Activate *service =
         ACE_Dynamic_Service <TAO_Services_Activate>::instance ("FT_ClientService_Activate");
diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h
index 5a6e4c7e7e4..e7bd1f7e1af 100644
--- a/TAO/tao/Fault_Tolerance_Service.h
+++ b/TAO/tao/Fault_Tolerance_Service.h
@@ -41,16 +41,16 @@ class TAO_Export TAO_Fault_Tolerance_Service
 
 public:
   /// Ctor
-  TAO_Fault_Tolerance_Service (void);
+  TAO_Fault_Tolerance_Service ();
 
   /// Dtor
-  ~TAO_Fault_Tolerance_Service (void);
+  ~TAO_Fault_Tolerance_Service ();
 
   /// Initialize the internal data structures
   void init (TAO_ORB_Core *orb_core);
 
   /// Return the underlying callback object
-  TAO_Service_Callbacks *service_callback (void);
+  TAO_Service_Callbacks *service_callback ();
 
 private:
   void operator= (const TAO_Fault_Tolerance_Service &);
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index a33d537d286..83b5f0a45c9 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -41,7 +41,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type const * arg (void) const;
+    typename S_forany::_slice_type const * arg () const;
 
   protected:
     S_forany x_;
@@ -60,9 +60,9 @@ namespace TAO
   {
   public:
     In_Fixed_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x);
-    virtual ~In_Fixed_Array_Clonable_Argument_T (void);
+    virtual ~In_Fixed_Array_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -86,7 +86,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     S_forany x_;
@@ -109,7 +109,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     S_forany x_;
@@ -127,16 +127,16 @@ namespace TAO
   class Ret_Fixed_Array_Argument_T : public RetArgument
   {
   public:
-    Ret_Fixed_Array_Argument_T (void);
+    Ret_Fixed_Array_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_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
-    typename S_forany::_slice_type * excp (void);
-    typename S_forany::_slice_type * retn (void);
+    typename S_forany::_slice_type * excp ();
+    typename S_forany::_slice_type * retn ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index 706229b5a46..6369762f23d 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -39,7 +39,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
+    S const & arg () const;
 
   protected:
     S const * x_;
@@ -58,9 +58,9 @@ namespace TAO
   {
   public:
     In_Fixed_Size_Clonable_Argument_T (S const & x);
-    virtual ~In_Fixed_Size_Clonable_Argument_T (void);
+    virtual ~In_Fixed_Size_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -84,7 +84,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_;
@@ -107,7 +107,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_;
@@ -124,15 +124,15 @@ namespace TAO
   class Ret_Fixed_Size_Argument_T : public RetArgument
   {
   public:
-    Ret_Fixed_Size_Argument_T (void);
+    Ret_Fixed_Size_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 */
-    S & arg (void);
-    S excp (void);
-    S retn (void);
+    S & arg ();
+    S excp ();
+    S retn ();
 
   protected:
     S x_;
diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp
index c14d50a30a5..0da9874cc48 100644
--- a/TAO/tao/Flushing_Strategy.cpp
+++ b/TAO/tao/Flushing_Strategy.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void)
+TAO_Flushing_Strategy::~TAO_Flushing_Strategy ()
 {
 }
 
diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.cpp b/TAO/tao/GIOP_Fragmentation_Strategy.cpp
index 77e62f54c1f..96c4dd80bbc 100644
--- a/TAO/tao/GIOP_Fragmentation_Strategy.cpp
+++ b/TAO/tao/GIOP_Fragmentation_Strategy.cpp
@@ -1,6 +1,6 @@
 
 #include "tao/GIOP_Fragmentation_Strategy.h"
 
-TAO_GIOP_Fragmentation_Strategy::~TAO_GIOP_Fragmentation_Strategy (void)
+TAO_GIOP_Fragmentation_Strategy::~TAO_GIOP_Fragmentation_Strategy ()
 {
 }
diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.h b/TAO/tao/GIOP_Fragmentation_Strategy.h
index be6d1f43034..47ff70e4865 100644
--- a/TAO/tao/GIOP_Fragmentation_Strategy.h
+++ b/TAO/tao/GIOP_Fragmentation_Strategy.h
@@ -38,10 +38,10 @@ class TAO_Export TAO_GIOP_Fragmentation_Strategy
 {
 public:
   /// Constructor
-  TAO_GIOP_Fragmentation_Strategy (void) {}
+  TAO_GIOP_Fragmentation_Strategy () {}
 
   /// Destructor.
-  virtual ~TAO_GIOP_Fragmentation_Strategy (void);
+  virtual ~TAO_GIOP_Fragmentation_Strategy ();
 
   /// Fragment the (potentially partially) encoded GIOP message.
   /**
@@ -68,9 +68,10 @@ public:
                         ACE_CDR::ULong pending_length) = 0;
 
 private:
-  // Disallow copying and assignment.
-  TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &);
-  void operator= (TAO_GIOP_Fragmentation_Strategy const &);
+  TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &) = delete;
+  void operator= (TAO_GIOP_Fragmentation_Strategy const &) = delete;
+  TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy&&) = delete;
+  void operator= (TAO_GIOP_Fragmentation_Strategy &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 355b3190fb8..9b42415725f 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -14,11 +14,6 @@
 #include "tao/ZIOP_Adapter.h"
 #include "ace/Min_Max.h"
 
-/*
- * Hook to add additional include files during specializations.
- */
-//@@ GIOP_MESSAGE_BASE_INCLUDE_ADD_HOOK
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
@@ -26,7 +21,7 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
                                               size_t input_cdr_size)
   : orb_core_ (orb_core)
   , fragmentation_strategy_ (orb_core->fragmentation_strategy (transport))
-  , out_stream_ (0,
+  , out_stream_ (nullptr,
                  input_cdr_size,
                  TAO_ENCAP_BYTE_ORDER,
                  orb_core->output_cdr_buffer_allocator (),
@@ -51,7 +46,7 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
 }
 
 
-TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void)
+TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base ()
 {
 #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1)
   this->out_stream_.unregister_monitor ();
@@ -67,7 +62,7 @@ TAO_GIOP_Message_Base::init (CORBA::Octet major, CORBA::Octet minor)
 }
 
 TAO_OutputCDR &
-TAO_GIOP_Message_Base::out_stream (void)
+TAO_GIOP_Message_Base::out_stream ()
 {
   return this->out_stream_;
 }
@@ -238,10 +233,10 @@ TAO_GIOP_Message_Base::dump_consolidated_msg (TAO_OutputCDR &stream)
   // Check whether the output cdr stream is build up of multiple
   // messageblocks. If so, consolidate them to one block that can be
   // dumped
-  ACE_Message_Block* consolidated_block = 0;
+  ACE_Message_Block* consolidated_block = nullptr;
   char *buf = const_cast <char*> (stream.buffer ());
   size_t const total_len = stream.total_length ();
-  if (stream.begin()->cont () != 0)
+  if (stream.begin()->cont () != nullptr)
     {
       ACE_NEW_RETURN (consolidated_block, ACE_Message_Block, 0);
       ACE_CDR::consolidate (consolidated_block, stream.begin ());
@@ -251,7 +246,7 @@ TAO_GIOP_Message_Base::dump_consolidated_msg (TAO_OutputCDR &stream)
   this->dump_msg ("send", reinterpret_cast <u_char *> (buf), total_len);
 
   delete consolidated_block;
-  consolidated_block = 0;
+  consolidated_block = nullptr;
 
   return 0;
 }
@@ -391,7 +386,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
 
           qd = this->make_queued_data (buf_size);
 
-          if (qd == 0)
+          if (qd == nullptr)
             {
               if (TAO_debug_level > 0)
                 {
@@ -411,7 +406,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
       else
         {
           // handle not initialized variables
-          qd = 0;  // reset
+          qd = nullptr;  // reset
         }
 
       return 0;
@@ -427,7 +422,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
 
   qd = this->make_queued_data (copying_len);
 
-  if (qd == 0)
+  if (qd == nullptr)
     {
       if (TAO_debug_level > 0)
         {
@@ -615,7 +610,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
                          ACE_Message_Block::MB_DATA,
                          repbuf,
                          this->orb_core_->input_cdr_buffer_allocator (),
-                         0,
+                         nullptr,
                          ACE_Message_Block::DONT_DELETE,
                          this->orb_core_->input_cdr_dblock_allocator ());
 
@@ -652,7 +647,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
   // we pass it on to the higher layers of the ORB. So we dont to any
   // copies at all here. The same is also done in the higher layers.
 
-  ACE_Data_Block *db = 0;
+  ACE_Data_Block *db = nullptr;
 
   // Get the flag in the message block
   ACE_Message_Block::Message_Flags flg = qd->msg_block ()->self_flags ();
@@ -773,7 +768,7 @@ TAO_GIOP_Message_Base::process_reply_message (
   size_t wr_pos = qd->msg_block ()->wr_ptr () - qd->msg_block ()->base ();
   rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN;
 
-  ACE_Data_Block *db = 0;
+  ACE_Data_Block *db = nullptr;
 
   // Get the flag in the message block
   ACE_Message_Block::Message_Flags flg = qd->msg_block ()->self_flags ();
@@ -852,7 +847,7 @@ TAO_GIOP_Message_Base::process_reply_message (
     return retval;
 
   params.input_cdr_ = &input_cdr;
-  params.transport_->assign_translators (params.input_cdr_, 0);
+  params.transport_->assign_translators (params.input_cdr_, nullptr);
 
   retval = params.transport_->tms ()->dispatch_reply (params);
 
@@ -980,21 +975,12 @@ TAO_GIOP_Message_Base::process_request (
 
       CORBA::Object_var forward_to;
 
-      /*
-       * Hook to specialize request processing within TAO
-       * This hook will be replaced by specialized request
-       * processing implementation.
-       */
-//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START
-
       // Do this before the reply is sent.
       this->orb_core_->request_dispatcher ()->dispatch (
           this->orb_core_,
           request,
           forward_to);
 
-//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_END
-
       if (request.is_forwarded ())
         {
           CORBA::Boolean const permanent_forward_condition =
@@ -1016,9 +1002,9 @@ TAO_GIOP_Message_Base::process_request (
             &request.reply_service_info ());
 
           output.message_attributes (request_id,
-                                     0,
+                                     nullptr,
                                      TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY),
-                                     0);
+                                     nullptr);
 
           // Make the GIOP header and Reply header
           this->generate_reply_header (output, reply_params);
@@ -1036,7 +1022,7 @@ TAO_GIOP_Message_Base::process_request (
           output.more_fragments (false);
 
           int const result = transport->send_message (output,
-                                                      0,
+                                                      nullptr,
                                                       &request,
                                                       TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
           if (result == -1)
@@ -1290,8 +1276,8 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport,
 
   // Send the message
   int const result = transport->send_message (output,
-                                              0,
-                                              0,
+                                              nullptr,
+                                              nullptr,
                                               TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
 
   // Print out message if there is an error
@@ -1341,10 +1327,10 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport)
   ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN,
                              ACE_Message_Block::MB_DATA,
                              error_message,
-                             0,
-                             0,
+                             nullptr,
+                             nullptr,
                              ACE_Message_Block::DONT_DELETE,
-                             0);
+                             nullptr);
   ACE_Message_Block message_block(&data_block,
                                   ACE_Message_Block::DONT_DELETE);
   message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
@@ -1449,10 +1435,10 @@ TAO_GIOP_Message_Base::
   ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN,
                              ACE_Message_Block::MB_DATA,
                              close_message,
-                             0,
-                             0,
+                             nullptr,
+                             nullptr,
                              ACE_Message_Block::DONT_DELETE,
-                             0);
+                             nullptr);
   ACE_Message_Block message_block(&data_block);
   message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
 
@@ -1492,7 +1478,7 @@ TAO_GIOP_Message_Base::send_reply_exception (
   // this).
   reply_params.service_context_notowned (svc_info);
 
-  if (CORBA::SystemException::_downcast (x) != 0)
+  if (CORBA::SystemException::_downcast (x) != nullptr)
     {
       reply_params.reply_status (GIOP::SYSTEM_EXCEPTION);
     }
@@ -1506,7 +1492,7 @@ TAO_GIOP_Message_Base::send_reply_exception (
 
   output.more_fragments (false);
 
-  return transport->send_message (output, 0, 0, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
+  return transport->send_message (output, nullptr, nullptr, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
 }
 
 void
@@ -1548,7 +1534,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
     // request/reply id.
     CORBA::ULong tmp = 0;
     CORBA::ULong *id = &tmp;
-    char *tmp_id = 0;
+    char *tmp_id = nullptr;
 
     if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::Request ||
         ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::Reply ||
@@ -1658,7 +1644,7 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz)
                  this->orb_core_->input_cdr_msgblock_allocator (),
                  db);
 
-  if (qd == 0)
+  if (qd == nullptr)
     {
       if (TAO_debug_level > 0)
         {
@@ -1667,14 +1653,14 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz)
             ACE_TEXT ("out of memory, failed to allocate queued data object\n")));
         }
       db->release ();
-      return 0; // NULL pointer
+      return nullptr; // NULL pointer
     }
 
   return qd;
 }
 
 size_t
-TAO_GIOP_Message_Base::header_length (void) const
+TAO_GIOP_Message_Base::header_length () const
 {
   return TAO_GIOP_MESSAGE_HEADER_LEN;
 }
@@ -1710,7 +1696,7 @@ TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd,
   // copies at all here. The same is also done in the higher layers.
 
   ACE_Message_Block::Message_Flags flg = 0;
-  ACE_Data_Block *db = 0;
+  ACE_Data_Block *db = nullptr;
 
   // Get the flag in the message block
   flg = qd->msg_block ()->self_flags ();
@@ -1804,15 +1790,15 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message (
 {
   TAO::Incoming_Message_Stack reverse_stack;
 
-  TAO_Queued_Data *tail = 0;
-  TAO_Queued_Data *head = 0;
+  TAO_Queued_Data *tail = nullptr;
+  TAO_Queued_Data *head = nullptr;
 
   //
   // CONSOLIDATE FRAGMENTED MESSAGE
   //
 
   // check for error-condition
-  if (qd == 0)
+  if (qd == nullptr)
     {
       return -1;
     }
@@ -1828,7 +1814,7 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message (
     {
       this->fragment_stack_.push (qd);
 
-      msg = 0;   // no consolidated message available yet
+      msg = nullptr;   // no consolidated message available yet
       return 1;  // status: more messages expected.
     }
 
@@ -1864,7 +1850,7 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message (
 
               head->msg_block ()->cont (tail->msg_block ());
 
-              tail->msg_block (0);
+              tail->msg_block (nullptr);
 
               TAO_Queued_Data::release (tail);
 
@@ -1905,7 +1891,7 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message (
 
               head->msg_block ()->cont (tail->msg_block ());
 
-              tail->msg_block (0);
+              tail->msg_block (nullptr);
 
               TAO_Queued_Data::release (tail);
 
@@ -1958,7 +1944,7 @@ TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel
       return -1;
     }
 
-  TAO_Queued_Data *head = 0;
+  TAO_Queued_Data *head = nullptr;
 
   // Revert stack
   while (this->fragment_stack_.pop (head) != -1)
@@ -2010,7 +1996,7 @@ TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel
 }
 
 TAO_GIOP_Fragmentation_Strategy *
-TAO_GIOP_Message_Base::fragmentation_strategy (void)
+TAO_GIOP_Message_Base::fragmentation_strategy ()
 {
   return this->fragmentation_strategy_;
 }
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index f726e620176..73faaaa4a49 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -54,7 +54,7 @@ public:
                          size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE);
 
   /// Destructor
-  ~TAO_GIOP_Message_Base (void);
+  ~TAO_GIOP_Message_Base ();
 
   /// Initialize the underlying state object based on the @a major and
   /// @a minor revision numbers
@@ -121,13 +121,13 @@ public:
       const CORBA::Exception &x);
 
   /// Header length
-  size_t header_length (void) const;
+  size_t header_length () const;
 
   /// The header length of a fragment
   size_t fragment_header_length (
     const TAO_GIOP_Message_Version& giop_version) const;
 
-  TAO_OutputCDR &out_stream (void);
+  TAO_OutputCDR &out_stream ();
 
   /// Consolidate fragmented message with associated fragments, being
   /// stored within this class.  If reliable transport is used (like
@@ -149,7 +149,7 @@ public:
   int discard_fragmented_message (const TAO_Queued_Data *cancel_request);
 
   /// Outgoing GIOP message fragmentation strategy.
-  TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (void);
+  TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy ();
 
   /// Is the messaging object ready for processing BiDirectional
   /// request/response?
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp
index bf339a05610..3d5efa6a49d 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser (void)
+TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser ()
 {
 }
 
@@ -90,7 +90,7 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply (
 }
 
 bool
-TAO_GIOP_Message_Generator_Parser::is_ready_for_bidirectional (void) const
+TAO_GIOP_Message_Generator_Parser::is_ready_for_bidirectional () const
 {
   return false;
 }
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index 78a429daa0a..7a901a16a41 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -46,7 +46,7 @@ class TAO_ServerRequest;
 class TAO_GIOP_Message_Generator_Parser
 {
 public:
-  virtual ~TAO_GIOP_Message_Generator_Parser (void);
+  virtual ~TAO_GIOP_Message_Generator_Parser ();
 
   /// Write the request header in to @a msg
   virtual bool write_request_header (
@@ -93,15 +93,15 @@ public:
                                   TAO_Pluggable_Reply_Params &params);
 
   /// Our versions
-  virtual CORBA::Octet major_version (void) const = 0;
-  virtual CORBA::Octet minor_version (void) const = 0;
+  virtual CORBA::Octet major_version () const = 0;
+  virtual CORBA::Octet minor_version () const = 0;
 
   /// Is the messaging object ready for processing BiDirectional
   /// request/response?
-  virtual bool is_ready_for_bidirectional (void) const;
+  virtual bool is_ready_for_bidirectional () const;
 
   /// The header length of a fragment
-  virtual size_t fragment_header_length (void) const = 0;
+  virtual size_t fragment_header_length () const = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index e9a6ca9f4bc..3775c7789be 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -456,21 +456,21 @@ TAO_GIOP_Message_Generator_Parser_10::parse_locate_reply (
 }
 
 CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_10::major_version (void) const
+TAO_GIOP_Message_Generator_Parser_10::major_version () const
 {
   // Any harm in hardcoding??
   return static_cast<CORBA::Octet> (1);
 }
 
 CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_10::minor_version (void) const
+TAO_GIOP_Message_Generator_Parser_10::minor_version () const
 {
   // Any harm in hardcoding??
   return 0;
 }
 
 size_t
-TAO_GIOP_Message_Generator_Parser_10::fragment_header_length (void) const
+TAO_GIOP_Message_Generator_Parser_10::fragment_header_length () const
 {
   return 0;
 }
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
index 936913a0b27..b4c277bb3d2 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -75,11 +75,11 @@ public:
                                   TAO_Pluggable_Reply_Params &params);
 
   /// Our versions
-  virtual CORBA::Octet major_version (void) const;
-  virtual CORBA::Octet minor_version (void) const;
+  virtual CORBA::Octet major_version () const;
+  virtual CORBA::Octet minor_version () const;
 
   /// The header length of a fragment
-  virtual size_t fragment_header_length (void) const;
+  virtual size_t fragment_header_length () const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
index 9dcc9dfe78d..9f030a51d1f 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
@@ -4,7 +4,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_11::minor_version (void) const
+TAO_GIOP_Message_Generator_Parser_11::minor_version () const
 {
   return static_cast<CORBA::Octet> (1);
 }
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h
index 23f5c33822c..b63749b7a5d 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h
@@ -34,7 +34,7 @@ class TAO_GIOP_Message_Generator_Parser_11
 {
 public:
   /// Our minor version
-  virtual CORBA::Octet minor_version (void) const;
+  virtual CORBA::Octet minor_version () const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 9b0c1a683cf..aec9acbfd60 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -380,20 +380,20 @@ TAO_GIOP_Message_Generator_Parser_12::parse_locate_reply (
 
 
 CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_12::major_version (void) const
+TAO_GIOP_Message_Generator_Parser_12::major_version () const
 {
   return static_cast<CORBA::Octet> (1);
 }
 
 
 CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_12::minor_version (void) const
+TAO_GIOP_Message_Generator_Parser_12::minor_version () const
 {
   return static_cast<CORBA::Octet> (2);
 }
 
 bool
-TAO_GIOP_Message_Generator_Parser_12::is_ready_for_bidirectional (void) const
+TAO_GIOP_Message_Generator_Parser_12::is_ready_for_bidirectional () const
 {
   // We do support bidirectional
   return true;
@@ -465,7 +465,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec (
           return false;
 
         // Get the IOR
-        IOP::IOR *ior = 0;
+        IOP::IOR *ior = nullptr;
         CORBA::ULong const index = spec.iop_ior (ior);
 
         if (ior)
@@ -502,7 +502,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec (
 }
 
 size_t
-TAO_GIOP_Message_Generator_Parser_12::fragment_header_length (void) const
+TAO_GIOP_Message_Generator_Parser_12::fragment_header_length () const
 {
   return TAO_GIOP_MESSAGE_FRAGMENT_HEADER;
 }
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index b188879bdfb..8bfb114ce92 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -77,15 +77,15 @@ public:
                                   TAO_Pluggable_Reply_Params &params);
 
   /// Our versions
-  virtual CORBA::Octet major_version (void) const;
-  virtual CORBA::Octet minor_version (void) const;
+  virtual CORBA::Octet major_version () const;
+  virtual CORBA::Octet minor_version () const;
 
   /// Is the messaging object ready for processing BiDirectional
   /// request/response?
-  virtual bool is_ready_for_bidirectional (void) const;
+  virtual bool is_ready_for_bidirectional () const;
 
   /// The header length of a fragment
-  virtual size_t fragment_header_length (void) const;
+  virtual size_t fragment_header_length () const;
 
 private:
   /// Marshall the TargetSpecification
diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h
index 8245ff6842b..0619ff42814 100644
--- a/TAO/tao/GIOP_Message_State.h
+++ b/TAO/tao/GIOP_Message_State.h
@@ -39,7 +39,7 @@ class TAO_Export TAO_GIOP_Message_State
 {
 public:
   /// Constructor
-  TAO_GIOP_Message_State (void);
+  TAO_GIOP_Message_State ();
 
   /// Parse the message header.
   ///
@@ -50,27 +50,27 @@ public:
   int parse_message_header (ACE_Message_Block &incoming);
 
   /// Return the message size
-  CORBA::ULong message_size (void) const;
+  CORBA::ULong message_size () const;
 
   /// Return the message size
-  CORBA::ULong payload_size (void) const;
+  CORBA::ULong payload_size () const;
 
   /// Return the byte order information
-  CORBA::Octet byte_order (void) const;
+  CORBA::Octet byte_order () const;
 
   /// Return the message type
-  GIOP::MsgType message_type (void) const;
+  GIOP::MsgType message_type () const;
 
   /// Return the more fragments
-  CORBA::Boolean more_fragments (void) const;
+  CORBA::Boolean more_fragments () const;
 
   void more_fragments (CORBA::Boolean fragment);
 
   /// Get the GIOP version
-  TAO_GIOP_Message_Version const &giop_version (void) const;
+  TAO_GIOP_Message_Version const &giop_version () const;
 
   /// Return the compressed information
-  CORBA::Boolean compressed (void) const;
+  CORBA::Boolean compressed () const;
 
 private:
   /// Parse the message header.
diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h
index 517c40658fa..4605ad57ff4 100644
--- a/TAO/tao/GIOP_Message_Version.h
+++ b/TAO/tao/GIOP_Message_Version.h
@@ -41,13 +41,13 @@ public:
   CORBA::Octet major;
 
   /// Get major version number
-  CORBA::Octet major_version (void) const;
+  CORBA::Octet major_version () const;
 
   /// Minor version number
   CORBA::Octet minor;
 
   /// Get minor version number
-  CORBA::Octet minor_version (void) const;
+  CORBA::Octet minor_version () const;
 
   /// Copy constructor
   TAO_GIOP_Message_Version (const TAO_GIOP_Message_Version &src);
diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
index 27f7a008861..18e9854bf0d 100644
--- a/TAO/tao/GUIResource_Factory.cpp
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -1,22 +1,23 @@
 #include "tao/GUIResource_Factory.h"
 #include "ace/Reactor.h"
+#include "ace/Guard_T.h"
 #include "tao/debug.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  GUIResource_Factory::GUIResource_Factory (void)
+  GUIResource_Factory::GUIResource_Factory ()
     : dynamically_allocated_reactor_ (false)
   {
   }
 
-  GUIResource_Factory::~GUIResource_Factory (void)
+  GUIResource_Factory::~GUIResource_Factory ()
   {
   }
 
   ACE_Reactor *
-  GUIResource_Factory::get_reactor (void)
+  GUIResource_Factory::get_reactor ()
   {
     // @@Marek, do we need a lock here??
     // @Bala, I suppose we don't need locking for any
@@ -27,17 +28,17 @@ namespace TAO
     //   what for. Nevertheless, just for a case  I sync the creation of reactor.
     //   I think, that double checked locking is
     //   not necessary, because the performance is not an issue here.
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-    ACE_Reactor *reactor = 0;
+    ACE_Reactor *reactor = nullptr;
     ACE_NEW_RETURN (reactor,
                     ACE_Reactor (this->reactor_impl (), 1),
-                    0);
+                    nullptr);
 
     if (reactor->initialized () == 0)
     {
       delete reactor;
-      reactor = 0;
+      reactor = nullptr;
     }
     else
       this->dynamically_allocated_reactor_ = true;
diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h
index f34e92110e3..07a46d0d6f4 100644
--- a/TAO/tao/Generic_Sequence_T.h
+++ b/TAO/tao/Generic_Sequence_T.h
@@ -66,38 +66,11 @@ namespace TAO
 namespace details
 {
 
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-// Forward declare the iterators
-template<typename T>
-class Generic_Sequence_Iterator;
-
-template<typename T>
-class Const_Generic_Sequence_Iterator;
-
-template<typename T>
-class Generic_Sequence_Reverse_Iterator;
-
-template<typename T>
-class Const_Generic_Sequence_Reverse_Iterator;
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 template<typename T,
          class ALLOCATION_TRAITS,
          class ELEMENT_TRAITS>
 class generic_sequence
 {
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  friend class Generic_Sequence_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> >;
-  friend class Const_Generic_Sequence_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> >;
-  friend class Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> >;
-  friend class Const_Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> >;
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 public:
   typedef T value_type;
   typedef ALLOCATION_TRAITS allocation_traits;
@@ -105,7 +78,7 @@ public:
   typedef range_checking<value_type,true> range;
 
   /// Default constructor.
-  generic_sequence(void)
+  generic_sequence()
     : maximum_(allocation_traits::default_maximum())
     , length_(0)
     , buffer_(allocation_traits::default_buffer_allocation())
@@ -361,80 +334,6 @@ public:
     allocation_traits::freebuf(buffer);
   }
 
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  ///
-  /// Additions to support iterator semantics for TAO sequences.
-  ///
-
-  // = Traits and factory methods that create iterators.
-  typedef Generic_Sequence_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > iterator;
-  typedef Const_Generic_Sequence_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > const_iterator;
-  typedef Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > reverse_iterator;
-  typedef Const_Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > const_reverse_iterator;
-
-  /// Get an iterator that points to the beginning of the sequence.
-  iterator begin (void)
-  {
-    return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::iterator (this);
-  }
-
-  /// Get a const iterator that points to the beginning of the sequence.
-  const_iterator begin (void) const
-  {
-    return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_iterator (this);
-  }
-
-  /// Get an iterator that points to the end of the sequence.
-  iterator end (void)
-  {
-    return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::iterator (this,
-      this->length_);
-  }
-
-  /// Get a const iterator that points to the end of the sequence.
-  const_iterator end (void) const
-  {
-    return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_iterator (this,
-            this->length_);
-  }
-
-  // Get a reverse iterator that points to the end of the sequence.
-  reverse_iterator rbegin (void)
-  {
-    // Here we need to be at the last element - not one past.
-    return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::reverse_iterator (this,
-              this->length_ - 1);
-  }
-
-  // Get a const reverse iterator that points to the end of the sequence.
-  const_reverse_iterator rbegin (void) const
-  {
-    // Here we need to be at the last element - not one past.
-    return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_reverse_iterator (this,
-                     this->length_ - 1);
-  }
-
-  // Get a reverse iterator that points to one before the
-  // beginning of the sequence.
-  reverse_iterator rend (void)
-  {
-    // Here we need to be at one before the first element - not the first.
-    return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::reverse_iterator (this,
-              -1);
-  }
-
-  // Get a const reverse iterator that points to one before the
-  // beginning of the sequence.
-  const_reverse_iterator rend (void) const
-  {
-    // Here we need to be at one before the first element - not the first.
-    return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_reverse_iterator (this,
-              -1);
-  }
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 private:
   /// The maximum number of elements the buffer can contain.
   CORBA::ULong maximum_;
@@ -446,891 +345,6 @@ private:
   /// destroyed.
   mutable CORBA::Boolean release_;
 };
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-/**
- * @class Generic_Sequence_Iterator
- * @brief Implements a random access iterator for generic sequence type
- *        classes.
- */
-template <typename SEQUENCE_T>
-  class Generic_Sequence_Iterator
-{
-  friend class Const_Generic_Sequence_Iterator<SEQUENCE_T>;
-
-public:
-  // = Necessary traits
-  typedef std::random_access_iterator_tag iterator_category;
-  typedef typename SEQUENCE_T::value_type value_type;
-  typedef typename SEQUENCE_T::value_type *pointer;
-  typedef typename SEQUENCE_T::value_type &reference;
-  typedef typename SEQUENCE_T::allocation_traits allocation_traits;
-  typedef typename SEQUENCE_T::element_traits element_traits;
-  typedef CORBA::Long difference_type;
-
-  /// Construct a Generic_Sequence_Iterator at position pos.
-  Generic_Sequence_Iterator (generic_sequence<value_type,
-                            allocation_traits,
-                            element_traits> *sequence,
-           size_t pos = 0)
-    : sequence_ (sequence),
-    pos_ (pos)
-      {
-      }
-
-  /// Copy constructor
-  Generic_Sequence_Iterator (Generic_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Assignment operator
-  Generic_Sequence_Iterator & operator= (
-          Generic_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    {
-      Generic_Sequence_Iterator tmp(rhs);
-      swap (tmp);
-      return * this;
-    }
-
-  /// swaps all members
-  void swap(Generic_Sequence_Iterator<SEQUENCE_T> & rhs)
-    throw()
-    {
-      std::swap (sequence_, rhs.sequence_);
-      std::swap (this->pos_, rhs.pos_);
-    }
-
-  /// typecast operator to Const_Generic_Sequence_Iterator
-  operator Const_Generic_Sequence_Iterator<SEQUENCE_T> ()
-  {
-    return Const_Generic_Sequence_Iterator<SEQUENCE_T> (*this);
-  }
-
-  /// Dereference operator returns a reference to the item contained
-  /// at the current position
-  value_type & operator* (void)
-    {
-      // Access the underlying element in the sequence.
-      return (*(this->sequence_))[this->pos_];
-    }
-
-  /// Returns a const reference to the item contained at the current position
-  const value_type & operator* (void) const
-    {
-      // Access the underlying element in the sequence.
-      return (*(this->sequence_))[this->pos_];
-    }
-
-  /// Preincrement operator
-  Generic_Sequence_Iterator<SEQUENCE_T> &operator++ (void)
-    {
-      // Increment the position.
-      // We also need to check if we're now past the end.
-      ++this->pos_;
-      return *this;
-    }
-
-  /// Postincrement operator
-  Generic_Sequence_Iterator<SEQUENCE_T> operator++ (int)
-    {
-      // Create a temporary to return so that it's not modified.
-      Generic_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Increment the position.
-      // We also need to check if we're now past the end.
-      ++this->pos_;
-      return temp_iter;
-    }
-
-  /// Predecrement operator
-  Generic_Sequence_Iterator<SEQUENCE_T> &operator-- (void)
-    {
-      --this->pos_;
-      return *this;
-    }
-
-  /// Postdecrement operator
-  Generic_Sequence_Iterator<SEQUENCE_T> operator-- (int)
-    {
-      // Create a temporary to return so that it's not modified.
-      Generic_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      --this->pos_;
-      return temp_iter;
-    }
-
-  /// Iterator addition
-  Generic_Sequence_Iterator<SEQUENCE_T> &operator+= (difference_type n)
-    {
-      // Move ahead n elements.
-      this->pos_ += n;
-      return *this;
-    }
-
-  /// Iterator addition
-  Generic_Sequence_Iterator<SEQUENCE_T> operator+ (difference_type n)
-    {
-      // Create a temporary to return and move it ahead n elements.
-      return Generic_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n);
-    }
-
-  /// Iterator subtraction
-  Generic_Sequence_Iterator<SEQUENCE_T> &operator-= (difference_type n)
-    {
-      // Move back n elements.
-      this->pos_ -= n;
-      return *this;
-    }
-
-  /// Iterator subtraction
-  Generic_Sequence_Iterator<SEQUENCE_T> operator- (difference_type n)
-    {
-      // Create a temporary to return and move it back n elements.
-      return Generic_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n);
-    }
-
-  /// Difference
-  difference_type operator- (const Generic_Sequence_Iterator<SEQUENCE_T> & rhs)
-    {
-      // I think order is important here (i.e., rhs before this).
-      return this->pos_ - rhs.pos_;
-    }
-
-  /// Difference
-  difference_type operator- (const Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs)
-    {
-      // I think order is important here (i.e., rhs before this).
-      return this->pos_ - rhs.pos_;
-    }
-
-
-  /// Element operator/assignment
-  value_type & operator[] (difference_type n)
-    {
-      // Return the element at position n
-      return (*(this->sequence_))[this->pos_ + n];
-    }
-
-  /// Less than
-  bool operator< (const Generic_Sequence_Iterator<SEQUENCE_T> & rhs)
-    {
-      // Return if this iterator is less than the passed in iterator.
-      return this->pos_ < rhs.pos_;
-    }
-
-  /// Less than
-  bool operator< (const Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs)
-    {
-      // Return if this iterator is less than the passed in iterator.
-      return this->pos_ < rhs.pos_;
-    }
-
-
-  /// Equality operator
-  bool operator== (const Generic_Sequence_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-        && this->pos_ == rhs.pos_;
-  }
-
-  /// Nonequality operator
-  bool operator!= (const Generic_Sequence_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-private:
-  /// the sequence with which we are dealing
-  generic_sequence<value_type, allocation_traits, element_traits> *sequence_;
-
-  /// Our current position in the sequence.
-  mutable difference_type pos_;
-};
-
-
-/// Iterator addition with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Generic_Sequence_Iterator<SEQUENCE_T>
-  operator+ (typename Generic_Sequence_Iterator<SEQUENCE_T>::difference_type n,
-             const Generic_Sequence_Iterator<SEQUENCE_T> & iter)
-   {
-     // Create an iter and move it ahead n elements.
-     return Generic_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n);
-   }
-
-/// Iterator subtraction with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Generic_Sequence_Iterator<SEQUENCE_T> operator-
-   (typename Generic_Sequence_Iterator<SEQUENCE_T>::difference_type n,
-    Generic_Sequence_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it back n elements.
-     return Generic_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n);
-   }
-
-
-/**
- * @class Const_Generic_Sequence_Iterator
- * @brief Implements a constant random access iterator for generic sequence
- *        type classes.
- *
- * Note:  Having a const Iterator does not guarantee that the current
- * *position* that it points to will not change, it only guarantees that
- * you cannot change the underlying array!
- */
-template <typename SEQUENCE_T>
-class Const_Generic_Sequence_Iterator
-{
-  friend class Generic_Sequence_Iterator<SEQUENCE_T>;
-
-public:
-  // = Necessary traits
-  typedef std::random_access_iterator_tag iterator_category;
-  typedef typename SEQUENCE_T::value_type value_type;
-  typedef typename SEQUENCE_T::value_type *pointer;
-  typedef typename SEQUENCE_T::value_type &reference;
-  typedef typename SEQUENCE_T::allocation_traits allocation_traits;
-  typedef typename SEQUENCE_T::element_traits element_traits;
-  typedef int difference_type;
-
-  /// Construct a Const_Generic_Sequence_Iterator at position pos from
-  /// a const sequence.
-  Const_Generic_Sequence_Iterator (const generic_sequence<value_type,
-                                                          allocation_traits,
-                                                          element_traits> *sequence,
-           size_t pos = 0)
-    : sequence_ (sequence),
-    pos_ (pos)
-      {
-      }
-
-  virtual ~Const_Generic_Sequence_Iterator ()
-    {
-    }
-
-  /// Copy constructor
-  Const_Generic_Sequence_Iterator (
-    Const_Generic_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Copy constructor initializing by a Generic_Sequence_Iterator
-  explicit Const_Generic_Sequence_Iterator (
-    Generic_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Assignment operator
-  Const_Generic_Sequence_Iterator & operator= (
-                Const_Generic_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    {
-      Const_Generic_Sequence_Iterator tmp(rhs);
-      swap (tmp);
-      return * this;
-    }
-
-  /// swaps all members
-  void swap(Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs)
-    throw()
-    {
-      std::swap (sequence_, rhs.sequence_);
-      std::swap (this->pos_, rhs.pos_);
-    }
-
-  /// Dereference operator returns a reference to the item contained
-  /// at the current position
-  const value_type & operator* (void) const
-    {
-      // Access the underlying element in the sequence.
-      return (*(this->sequence_))[this->pos_];
-    }
-
-  /// Preincrement operator
-  const Const_Generic_Sequence_Iterator<SEQUENCE_T> &operator++ (void) const
-    {
-      // Increment the position.
-      // We also need to check if we're now past the end.
-      ++this->pos_;
-      return * this;
-    }
-
-  /// Postincrement operator
-  Const_Generic_Sequence_Iterator<SEQUENCE_T> operator++ (int) const
-    {
-      // Create a temporary to return so that it's not modified.
-      Const_Generic_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Increment the position.
-      // We also need to check if we're now past the end.
-      ++this->pos_;
-      return temp_iter;
-    }
-
-  /// Predecrement operator
-  const Const_Generic_Sequence_Iterator<SEQUENCE_T> &operator-- (void) const
-    {
-      --this->pos_;
-      return * this;
-    }
-
-  /// Postdecrement operator
-  Const_Generic_Sequence_Iterator<SEQUENCE_T> operator-- (int) const
-    {
-      // Create a temporary to return so that it's not modified.
-      Const_Generic_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      --this->pos_;
-      return temp_iter;
-    }
-
-  /// Iterator addition
-  const Const_Generic_Sequence_Iterator<SEQUENCE_T> &operator+= (difference_type n) const
-    {
-      // Move ahead n elements.
-      this->pos_ += n;
-      return * this;
-    }
-
-  /// Iterator addition
-  Const_Generic_Sequence_Iterator<SEQUENCE_T> operator+ (difference_type n) const
-    {
-      // Create a temporary to return and move it ahead n elements.
-      return Const_Generic_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n);
-    }
-
-  /// Iterator subtraction
-  const Const_Generic_Sequence_Iterator<SEQUENCE_T> &operator-= (difference_type n) const
-    {
-      // Move back n elements.
-      this->pos_ -= n;
-      return * this;
-    }
-
-  /// Iterator subtraction
-  Const_Generic_Sequence_Iterator<SEQUENCE_T> operator- (difference_type n) const
-    {
-      // Create a temporary to return and move it back n elements.
-      return Const_Generic_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n);
-    }
-
-  /// Difference
-  difference_type operator- (const Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs) const
-    {
-      // I think the order is important here (i.e., rhs before this).
-      return this->pos_ - rhs.pos_;
-    }
-
-  /// Element operator/assignment
-  const value_type & operator[] (difference_type n) const
-    {
-      // Return the element at position n
-      return (*(this->sequence_))[this->pos_ + n];
-    }
-
-  /// Less than
-  virtual bool operator< (const Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs) const
-    {
-      // Return if this iterator is less than the passed in iterator.
-      return this->pos_ < rhs.pos_;
-    }
-
-  /// Equality operator
-  bool operator== (const Const_Generic_Sequence_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-        && this->pos_ == rhs.pos_;
-  }
-
-  /// Nonequality operator
-  bool operator!= (const Const_Generic_Sequence_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-private:
-  /// the array we are dealing with
-  const generic_sequence<value_type, allocation_traits, element_traits> *sequence_;
-
-  /// Our current position in the sequence.
-  mutable difference_type pos_;
-};
-
-/// Iterator addition with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Const_Generic_Sequence_Iterator<SEQUENCE_T> operator+
-   (typename Generic_Sequence_Iterator<SEQUENCE_T>::difference_type n,
-    Const_Generic_Sequence_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it ahead n elements.
-     return Const_Generic_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n);
-   }
-
-/// Iterator subtraction with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Const_Generic_Sequence_Iterator<SEQUENCE_T> operator-
-   (typename Generic_Sequence_Iterator<SEQUENCE_T>::difference_type n,
-    Const_Generic_Sequence_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it back n elements.
-     return Const_Generic_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n);
-   }
-
-
-/**
- * @class Generic_Sequence_Reverse_Iterator
- * @brief Implements a reverse random access iterator for generic sequence
- *        type classes.
- */
-template <typename SEQUENCE_T>
-class Generic_Sequence_Reverse_Iterator
-{
-  friend class Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T>;
-
-public:
-  // = Necessary traits
-  typedef std::random_access_iterator_tag iterator_category;
-  typedef typename SEQUENCE_T::value_type value_type;
-  typedef typename SEQUENCE_T::value_type *pointer;
-  typedef typename SEQUENCE_T::value_type &reference;
-  typedef typename SEQUENCE_T::allocation_traits allocation_traits;
-  typedef typename SEQUENCE_T::element_traits element_traits;
-  typedef int difference_type;
-
-  /// Construct a Generic_Sequence_Reverse_Iterator at position pos with before_start flag.
-  Generic_Sequence_Reverse_Iterator (generic_sequence<value_type,
-                              allocation_traits,
-                              element_traits> *sequence,
-             size_t pos)
-    : sequence_ (sequence),
-    pos_ (pos)
-      {
-      }
-
-  /// Copy constructor
-  Generic_Sequence_Reverse_Iterator (
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Assignment operator
-  Generic_Sequence_Reverse_Iterator & operator= (
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    {
-      Generic_Sequence_Reverse_Iterator tmp(rhs);
-      swap (tmp);
-      return * this;
-    }
-
-  /// swaps all members
-  void swap(Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    throw()
-    {
-      std::swap (sequence_, rhs.sequence_);
-      std::swap (this->pos_, rhs.pos_);
-    }
-
-  /// Dereference operator returns a reference to the item contained
-  /// at the current position
-  value_type & operator* (void)
-    {
-      // Access the underlying element in the sequence.
-      return (*(this->sequence_))[this->pos_];
-    }
-
-  /// Returns a const reference to the item contained at the current position
-  const value_type& operator* (void) const
-    {
-      // Access the underlying element in the sequence.
-      return (*(this->sequence_))[this->pos_];
-    }
-
-  /// Preincrement operator
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator++ (void)
-    {
-      // Decrement the position for reverse iterators.
-      // We also need to check if we're now before the start.
-      --this->pos_;
-      return *this;
-    }
-
-  /// Postincrement operator
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator++ (int)
-    {
-      // Create a temporary to return so that it's not modified.
-      Generic_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Decrement the position for reverse iterators.
-      // We also need to check if we're now past the end.
-      --this->pos_;
-      return temp_iter;
-    }
-
-  /// Predecrement operator
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-- (void)
-    {
-      // Increment the position for reverse iterators.
-      ++this->pos_;
-      return *this;
-    }
-
-  /// Postdecrement operator
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator-- (int)
-    {
-      // Create a temporary to return so that it's not modified.
-      Generic_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Increment the position for reverse iterators.
-      ++this->pos_;
-      return temp_iter;
-    }
-
-  /// Iterator addition
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator+= (difference_type n)
-    {
-      // Move back n elements for reverse iterators.
-      this->pos_ -= n;
-      return *this;
-    }
-
-  /// Iterator addition
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ (difference_type n)
-    {
-      // Create a temporary to return and move it back n elements for
-      // reverse iterators.
-      return Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n);
-    }
-
-  /// Iterator subtraction
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-= (difference_type n)
-    {
-      // Move ahead n elements for reverse iterators.
-      this->pos_ += n;
-      return *this;
-    }
-
-  /// Iterator subtraction
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator- (difference_type n)
-    {
-      // Create a temporary to return and move it ahead n elements for
-      // reverse iterators.
-      return Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n);
-    }
-
-  /// Difference
-  difference_type operator- (const Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    {
-      // I think order is important here (i.e., rhs before this).
-      return rhs.pos_ - this->pos_;
-    }
-
-  /// Difference
-  difference_type operator- (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    {
-      // I think order is important here (i.e., rhs before this).
-      return rhs.pos_ - this->pos_;
-    }
-
-
-  /// Element operator/assignment
-  value_type & operator[] (difference_type n)
-    {
-      // Return the element at position n
-      return (*(this->sequence_))[this->pos_ - n];
-    }
-
-  /// Less than
-  bool operator< (const Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    {
-      // Return if this iterator is less than the passed in iterator.
-      // For reverse iterators reverse the logic.
-      return this->pos_ > rhs.pos_;
-    }
-
-  /// Less than
-  bool operator< (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    {
-      // Return if this iterator is less than the passed in iterator.
-      // For reverse iterators reverse the logic.
-      return this->pos_ > rhs.pos_;
-    }
-
-
-  /// Equality operator
-  bool operator== (const Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-           && this->pos_ == rhs.pos_;
-  }
-
-  /// Equality operator
-  bool operator== (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-           && this->pos_ == rhs.pos_;
-  }
-
-  /// Nonequality operator
-  bool operator!= (const Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-  /// Nonequality operator
-  bool operator!= (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-private:
-  /// The sequence with which we are dealing
-  generic_sequence<value_type, allocation_traits, element_traits> *sequence_;
-
-  /// Our current position in the sequence.
-  mutable difference_type pos_;
-};
-
-/// Iterator addition with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator+
-   (typename Generic_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n,
-    Generic_Sequence_Reverse_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it back n elements for reverse iterators.
-     return Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n);
-   }
-
-/// Iterator subtraction with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator-
-   (typename Generic_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n,
-    Generic_Sequence_Reverse_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it ahead n elements for reverse iterators.
-     return Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n);
-   }
-
-
-/**
- * @class Const_Generic_Sequence_Reverse_Iterator
- * @brief Implements a constant reverse random access iterator for generic
- *        sequence type classes.
- *
- * Note:  Having a const Iterator does not guarantee that the current
- * *position* that it points to will not change, it only guarantees that
- * you cannot change the underlying array!
- */
-template <typename SEQUENCE_T>
-class Const_Generic_Sequence_Reverse_Iterator
-{
-  friend class Generic_Sequence_Reverse_Iterator<SEQUENCE_T>;
-
-public:
-  // = Necessary traits
-  typedef std::random_access_iterator_tag iterator_category;
-  typedef typename SEQUENCE_T::value_type value_type;
-  typedef typename SEQUENCE_T::value_type *pointer;
-  typedef typename SEQUENCE_T::value_type &reference;
-  typedef typename SEQUENCE_T::allocation_traits allocation_traits;
-  typedef typename SEQUENCE_T::element_traits element_traits;
-  typedef int difference_type;
-
-  /// Construct a Const_Generic_Sequence_Reverse_Iterator at position pos
-  /// using a const sequence.
-  Const_Generic_Sequence_Reverse_Iterator (const generic_sequence<value_type,
-                                    allocation_traits,
-                                    element_traits> *sequence,
-             size_t pos)
-    : sequence_ (sequence),
-    pos_ (pos)
-      {
-      }
-
-  /// Copy constructor
-  Const_Generic_Sequence_Reverse_Iterator (
-  Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Copy constructor
-  Const_Generic_Sequence_Reverse_Iterator (
-  Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Assignment operator
-  Const_Generic_Sequence_Reverse_Iterator & operator= (
-  Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    {
-      Const_Generic_Sequence_Reverse_Iterator tmp(rhs);
-      swap (tmp);
-      return * this;
-    }
-
-  /// swaps all members
-  void swap(Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    throw()
-    {
-      std::swap (sequence_, rhs.sequence_);
-      std::swap (this->pos_, rhs.pos_);
-    }
-
-  /// typecast operator to Generic_Sequence_Reverse_Iterator
-
-  /// Dereference operator returns a reference to the item contained
-  /// at the current position
-  const value_type& operator* (void) const
-    {
-      // Access the underlying element in the sequence.
-      return (*this->sequence_)[this->pos_];
-    }
-
-  /// Preincrement operator
-  const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator++ (void) const
-    {
-      // Decrement the position for reveres iterators.
-      // We also need to check if we're now before the start.
-      --this->pos_;
-      return *this;
-    }
-
-  /// Postincrement operator
-  Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator++ (int) const
-    {
-      // Create a temporary to return so that it's not modified.
-      Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Decrement the position for reverse iterators.
-      // We also need to check if we're now before the start.
-      --this->pos_;
-      return temp_iter;
-    }
-
-  /// Predecrement operator
-  const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-- (void) const
-    {
-      // Increment the position for reverse iterators.
-      ++this->pos_;
-      return *this;
-    }
-
-  /// Postdecrement operator
-  Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator-- (int) const
-    {
-      // Create a temporary to return so that it's not modified.
-      Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Increment the position for reverse iterators.
-      ++this->pos_;
-      return temp_iter;
-    }
-
-  /// Iterator addition
-  const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator+= (difference_type n) const
-    {
-      // Move back n elements for reverse iterators.
-      this->pos_ -= n;
-      return *this;
-    }
-
-  /// Iterator addition
-  Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ (difference_type n) const
-    {
-      // Create a temporary to return and move it back n elements for
-      // reverse iterators.
-      return Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n);
-    }
-
-  /// Iterator subtraction
-  const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-= (difference_type n) const
-    {
-      // Move ahead n elements for reverse iterators.
-      this->pos_ += n;
-      return *this;
-    }
-
-  /// Iterator subtraction
-  Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator- (difference_type n) const
-    {
-      // Create a temporary to return and move it ahead n elements for
-      // reverse iterators.
-      return Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n);
-    }
-
-  /// Difference
-  difference_type operator- (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) const
-    {
-      // I think order is important here (i.e., rhs before this).
-      return rhs.pos_ - this->pos_;
-    }
-
-  /// Element operator/assignment
-  const value_type & operator[] (difference_type n) const
-    {
-      // Return the element at position n
-      return (*(this->sequence_))[this->pos_ - n];
-    }
-
-  /// Less than
-  bool operator< (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) const
-    {
-      // Return if this iterator is less than the passed in iterator.
-      // For reverse iterators reverse the logic.
-      return this->pos_ > rhs.pos_;
-    }
-
-  /// Equality operator
-  bool operator== (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-        && this->pos_ == rhs.pos_;
-  }
-
-  /// Nonequality operator
-  bool operator!= (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-private:
-  /// the array we are dealing with
-  const generic_sequence<value_type, allocation_traits, element_traits> *sequence_;
-
-  /// Our current position in the sequence.
-  mutable difference_type pos_;
-};
-
-/// Iterator addition with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator+
-   (typename Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n,
-    Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it back n elements for reverse iterators.
-     return Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n);
-   }
-
-/// Iterator subtraction with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator-
-   (typename Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n,
-    Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it ahead n elements for reverse iterators.
-     return Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n);
-   }
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 } // namespace details
 } // namespace TAO
 
diff --git a/TAO/tao/HR_Time_Policy_Strategy.cpp b/TAO/tao/HR_Time_Policy_Strategy.cpp
index 33cd3180412..6cd1a821445 100644
--- a/TAO/tao/HR_Time_Policy_Strategy.cpp
+++ b/TAO/tao/HR_Time_Policy_Strategy.cpp
@@ -13,15 +13,15 @@ TAO_HR_Time_Policy_Strategy::~TAO_HR_Time_Policy_Strategy ()
 {
 }
 
-ACE_Timer_Queue * TAO_HR_Time_Policy_Strategy::create_timer_queue (void)
+ACE_Timer_Queue * TAO_HR_Time_Policy_Strategy::create_timer_queue ()
 {
-  ACE_Timer_Queue * tmq = 0;
+  ACE_Timer_Queue * tmq = nullptr;
 
   typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
                            ACE_Event_Handler_Handle_Timeout_Upcall,
                            ACE_SYNCH_RECURSIVE_MUTEX,
                            ACE_HR_Time_Policy> timer_queue_type;
-  ACE_NEW_RETURN (tmq, timer_queue_type (), 0);
+  ACE_NEW_RETURN (tmq, timer_queue_type (), nullptr);
 
   return tmq;
 }
@@ -32,7 +32,7 @@ TAO_HR_Time_Policy_Strategy::destroy_timer_queue (ACE_Timer_Queue *tmq)
   delete tmq;
 }
 
-ACE_Dynamic_Time_Policy_Base * TAO_HR_Time_Policy_Strategy::get_time_policy (void)
+ACE_Dynamic_Time_Policy_Base * TAO_HR_Time_Policy_Strategy::get_time_policy ()
 {
   return &time_policy_;
 }
diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp
index f4ddaa6678d..80938aac971 100644
--- a/TAO/tao/HTTP_Client.cpp
+++ b/TAO/tao/HTTP_Client.cpp
@@ -9,12 +9,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_HTTP_Client::TAO_HTTP_Client (void)
-  : filename_ (0)
+TAO_HTTP_Client::TAO_HTTP_Client ()
+  : filename_ (nullptr)
 {
 }
 
-TAO_HTTP_Client::~TAO_HTTP_Client (void)
+TAO_HTTP_Client::~TAO_HTTP_Client ()
 {
   this->close ();
 }
@@ -47,12 +47,12 @@ TAO_HTTP_Client::read (ACE_Message_Block *mb)
 }
 
 int
-TAO_HTTP_Client::close (void)
+TAO_HTTP_Client::close ()
 {
   if (this->filename_)
     {
       ACE_OS::free ((void *) this->filename_);
-      this->filename_ = 0;
+      this->filename_ = nullptr;
     }
   return 0;
 }
diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp
index c645b03007a..5c70d7425b9 100644
--- a/TAO/tao/HTTP_Handler.cpp
+++ b/TAO/tao/HTTP_Handler.cpp
@@ -9,9 +9,9 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_HTTP_Handler::TAO_HTTP_Handler (void) :
-  mb_ (0),
-  filename_ (0),
+TAO_HTTP_Handler::TAO_HTTP_Handler () :
+  mb_ (nullptr),
+  filename_ (nullptr),
   bytecount_ (0)
 {
 }
@@ -24,12 +24,12 @@ TAO_HTTP_Handler::TAO_HTTP_Handler (ACE_Message_Block * mb,
 {
 }
 
-TAO_HTTP_Handler::~TAO_HTTP_Handler (void)
+TAO_HTTP_Handler::~TAO_HTTP_Handler ()
 {
   if (this->filename_)
     {
       ACE_OS::free (this->filename_);
-      filename_ = 0;
+      filename_ = nullptr;
     }
 }
 
@@ -52,19 +52,19 @@ TAO_HTTP_Handler::close (u_long)
 }
 
 int
-TAO_HTTP_Handler::send_request (void)
+TAO_HTTP_Handler::send_request ()
 {
   return -1;
 }
 
 int
-TAO_HTTP_Handler::receive_reply (void)
+TAO_HTTP_Handler::receive_reply ()
 {
   return -1;
 }
 
 size_t
-TAO_HTTP_Handler::byte_count (void) const
+TAO_HTTP_Handler::byte_count () const
 {
   return bytecount_;
 }
@@ -82,7 +82,7 @@ TAO_HTTP_Reader::TAO_HTTP_Reader (ACE_Message_Block * mb,
 }
 
 int
-TAO_HTTP_Reader::send_request (void)
+TAO_HTTP_Reader::send_request ()
 {
   char mesg [MAX_HEADER_SIZE];
 
@@ -105,27 +105,27 @@ TAO_HTTP_Reader::send_request (void)
 }
 
 int
-TAO_HTTP_Reader::receive_reply (void)
+TAO_HTTP_Reader::receive_reply ()
 {
   size_t num_recvd = 0;
   char buf [MTU+1];
-  char *buf_ptr = 0;
+  char *buf_ptr = nullptr;
   size_t bytes_read = 0;
 
   // Receive the first MTU bytes and strip the header off.
   // Note that we assume that the header will fit into MTU bytes.
-  if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0)
+  if (peer ().recv_n (buf, MTU, nullptr, &num_recvd) >= 0)
     {
       //Make sure that response type is 200 OK
-      if (ACE_OS::strstr (buf,"200 OK") == 0)
+      if (ACE_OS::strstr (buf,"200 OK") == nullptr)
         TAOLIB_ERROR_RETURN ((LM_ERROR,
                             "TAO (%P|%t) - HTTP_Reader::receive_reply, Response is not 200 OK\n" ), -1);
 
       // Search for the header termination string "\r\n\r\n", or "\n\n". If
       // found, move past it to get to the data portion.
-      if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0)
+      if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != nullptr)
         buf_ptr += 4;
-      else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0)     //for compatibility with JAWS
+      else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != nullptr)     //for compatibility with JAWS
         buf_ptr += 2;
       else
         buf_ptr = buf;
@@ -145,7 +145,7 @@ TAO_HTTP_Reader::receive_reply (void)
   // At this point, we have stripped off the header and are ready to
   // process data. buf_ptr points to the data
 
-  ACE_Message_Block* temp = 0;
+  ACE_Message_Block* temp = nullptr;
   ACE_Message_Block* curr = this->mb_;
 
   ACE_NEW_RETURN (temp,
@@ -175,7 +175,7 @@ TAO_HTTP_Reader::receive_reply (void)
       curr = curr->cont ();
     }
 
-  if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0)
+  if (peer ().recv_n (curr->wr_ptr (), curr->space (), nullptr, &num_recvd) >= 0)
     {
       // Move the write pointer
       curr->wr_ptr (num_recvd);
diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp
index 7090dea4d03..e4922fb4a7d 100644
--- a/TAO/tao/HTTP_Parser.cpp
+++ b/TAO/tao/HTTP_Parser.cpp
@@ -18,7 +18,7 @@ static const ACE_TCHAR file_prefix[] = ACE_TEXT ("http:");
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_HTTP_Parser::~TAO_HTTP_Parser (void)
+TAO_HTTP_Parser::~TAO_HTTP_Parser ()
 {
 }
 
@@ -42,9 +42,9 @@ TAO_HTTP_Parser::parse_string (const char *nior,
   const ACE_TCHAR *http_url =
     ior.c_str () + sizeof (::file_prefix) + 1;
 
-  ACE_TCHAR *hostname = 0;
-  ACE_TCHAR *filename = 0;
-  const ACE_TCHAR *ptr = 0;
+  ACE_TCHAR *hostname = nullptr;
+  ACE_TCHAR *filename = nullptr;
+  const ACE_TCHAR *ptr = nullptr;
   u_short port = 80;
 
   if (http_url[0] == '/')
@@ -60,11 +60,11 @@ TAO_HTTP_Parser::parse_string (const char *nior,
         ptr = ACE_OS::strstr (http_url, ACE_TEXT ("/"));
 
     if(!ptr)
-      return 0;
+      return nullptr;
     else
     {
       size_t const host_len = ptr - http_url;
-      ACE_NEW_RETURN (hostname, ACE_TCHAR [host_len + 1], 0 );
+      ACE_NEW_RETURN (hostname, ACE_TCHAR [host_len + 1], nullptr );
       ACE_OS::strncpy (hostname, http_url, host_len);
       hostname [host_len] = '\0';
       ptr = ACE_OS::strstr (ptr, ACE_TEXT ("/"));
@@ -75,12 +75,12 @@ TAO_HTTP_Parser::parse_string (const char *nior,
       else
       {
         delete [] hostname;
-        return 0;
+        return nullptr;
       }
     }
   }
 
-  ACE_Message_Block* mb = 0;
+  ACE_Message_Block* mb = nullptr;
   ACE_NEW_THROW_EX (mb,
                     ACE_Message_Block (),
                     CORBA::INTERNAL ());
@@ -101,7 +101,7 @@ TAO_HTTP_Parser::parse_string (const char *nior,
                    port) == -1)
   {
       client.close ();
-      return 0;
+      return nullptr;
   }
 
   delete [] hostname;
@@ -111,13 +111,13 @@ TAO_HTTP_Parser::parse_string (const char *nior,
   if (client.read (mb) <= 0)
   {
       client.close ();
-      return 0;
+      return nullptr;
   }
 
   // We get multiple message blocks back, concatenate them to
   // one large string
   ACE_CString string;
-  for (ACE_Message_Block * curr = mb; curr != 0; curr = curr->cont ())
+  for (ACE_Message_Block * curr = mb; curr != nullptr; curr = curr->cont ())
     string += curr->rd_ptr();
 
   return orb->string_to_object (string.c_str());
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 3a7f2807b69..1f8244e94b9 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -1,7 +1,3 @@
-/*
- * Hook to copy all include and forward declarations.
- */
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
 #include "tao/IIOP_Acceptor.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -24,15 +20,15 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
+TAO_IIOP_Acceptor::TAO_IIOP_Acceptor ()
   : TAO_Acceptor (IOP::TAG_INTERNET_IOP),
-    addrs_ (0),
+    addrs_ (nullptr),
     port_span_ (1),
-    hosts_ (0),
-    hostname_in_ior_ (0),
+    hosts_ (nullptr),
+    hostname_in_ior_ (nullptr),
     endpoint_count_ (0),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0),
+    orb_core_ (nullptr),
     reuse_addr_ (1),
 #if defined (ACE_HAS_IPV6) && !defined (ACE_USES_IPV4_IPV6_MIGRATION)
     default_address_ (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6),
@@ -40,9 +36,9 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
     default_address_ (static_cast<unsigned short> (0), static_cast<ACE_UINT32> (INADDR_ANY)),
 #endif /* ACE_HAS_IPV6  && !ACE_USES_IPV4_IPV6_MIGRATION */
     base_acceptor_ (this),
-    creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    accept_strategy_ (0)
+    creation_strategy_ (nullptr),
+    concurrency_strategy_ (nullptr),
+    accept_strategy_ (nullptr)
 {
 #if defined (ACE_HAS_IPV6) && defined (ACE_USES_IPV4_IPV6_MIGRATION)
   if (ACE::ipv6_enabled())
@@ -53,9 +49,7 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
 #endif /* ACE_HAS_IPV6 && ACE_USES_IPV4_IPV6_MIGRATION */
 }
 
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END
-
-TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
+TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor ()
 {
   // Make sure we are closed before we start destroying the
   // strategies.
@@ -75,8 +69,6 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
   delete [] this->hostname_in_ior_;
 }
 
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
-
 // TODO =
 //    2) For V1.[1,2] there are tagged components
 int
@@ -117,7 +109,7 @@ TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
           && ACE_OS::strcmp(this->hosts_[i], this->hosts_[0]) == 0)
         continue;
 
-      TAO_IIOP_Profile *pfile = 0;
+      TAO_IIOP_Profile *pfile = nullptr;
       ACE_NEW_RETURN (pfile,
                       TAO_IIOP_Profile (this->hosts_[i],
                                         this->addrs_[i].get_port_number (),
@@ -131,7 +123,7 @@ TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
       if (mprofile.give_profile (pfile) == -1)
         {
           pfile->_decr_refcnt ();
-          pfile = 0;
+          pfile = nullptr;
           return -1;
         }
 
@@ -158,8 +150,8 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                           CORBA::Short priority)
 {
   CORBA::ULong index = 0;
-  TAO_Profile *pfile = 0;
-  TAO_IIOP_Profile *iiop_profile = 0;
+  TAO_Profile *pfile = nullptr;
+  TAO_IIOP_Profile *iiop_profile = nullptr;
 
   // First see if @a mprofile already contains a IIOP profile.
   for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i)
@@ -174,7 +166,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
 
   // If <mprofile> doesn't contain a IIOP_Profile, we need to create
   // one.
-  if (iiop_profile == 0)
+  if (iiop_profile == nullptr)
     {
       ACE_NEW_RETURN (iiop_profile,
                       TAO_IIOP_Profile (this->hosts_[0],
@@ -190,7 +182,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
       if (mprofile.give_profile (iiop_profile) == -1)
         {
           iiop_profile->_decr_refcnt ();
-          iiop_profile = 0;
+          iiop_profile = nullptr;
           return -1;
         }
 
@@ -219,7 +211,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
           ACE_OS::strcmp(this->hosts_[index], this->hosts_[0]) == 0)
         continue;
 
-      TAO_IIOP_Endpoint *endpoint = 0;
+      TAO_IIOP_Endpoint *endpoint = nullptr;
       ACE_NEW_RETURN (endpoint,
                       TAO_IIOP_Endpoint (this->hosts_[index],
                                          this->addrs_[index].get_port_number (),
@@ -239,7 +231,7 @@ TAO_IIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
     dynamic_cast<const TAO_IIOP_Endpoint *> (endpoint);
 
   // Make sure the dynamically cast pointer is valid.
-  if (endp == 0)
+  if (endp == nullptr)
     return 0;
 
   for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
@@ -248,7 +240,7 @@ TAO_IIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
       // this code by comparing the IP address instead.  That would
       // trigger the following bug:
       //
-      // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
+      // http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220
       //
       if (endp->port() == this->addrs_[i].get_port_number()
           && ACE_OS::strcmp(endp->host(), this->hosts_[i]) == 0)
@@ -259,7 +251,7 @@ TAO_IIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 }
 
 int
-TAO_IIOP_Acceptor::close (void)
+TAO_IIOP_Acceptor::close ()
 {
   return this->base_acceptor_.close ();
 }
@@ -282,7 +274,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
 
   this->orb_core_ = orb_core;
 
-  if (this->hosts_ != 0)
+  if (this->hosts_ != nullptr)
     {
       // The hostname cache has already been set!
       // This is bad mojo, i.e. an internal TAO error.
@@ -293,7 +285,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
                         -1);
     }
 
-  if (address == 0)
+  if (address == nullptr)
     return -1;
 
   if (major >=0 && minor >= 0)
@@ -365,9 +357,9 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
                   char *[this->endpoint_count_],
                   -1);
 
-  this->hosts_[0] = 0;
+  this->hosts_[0] = nullptr;
 
-  if (this->hostname_in_ior_ != 0)
+  if (this->hostname_in_ior_ != nullptr)
     {
       if (TAO_debug_level > 2)
         {
@@ -403,7 +395,7 @@ TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->hosts_ != 0)
+  if (this->hosts_ != nullptr)
     {
       // The hostname cache has already been set!
       // This is bad mojo, i.e. an internal TAO error.
@@ -462,7 +454,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
                                      this->creation_strategy_,
                                      this->accept_strategy_,
                                      this->concurrency_strategy_,
-                                     0, 0, 0, ACE_DEFAULT_ACCEPTOR_USE_SELECT,
+                                     nullptr, nullptr, nullptr, ACE_DEFAULT_ACCEPTOR_USE_SELECT,
                                      this->reuse_addr_) == -1)
         {
           if (TAO_debug_level > 0)
@@ -498,7 +490,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
                                          this->creation_strategy_,
                                          this->accept_strategy_,
                                          this->concurrency_strategy_,
-                                         0, 0, 0, ACE_DEFAULT_ACCEPTOR_USE_SELECT,
+                                         nullptr, nullptr, nullptr, ACE_DEFAULT_ACCEPTOR_USE_SELECT,
                                          this->reuse_addr_) != -1)
             {
               found_a_port = true;
@@ -602,7 +594,7 @@ TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
                              char *&host,
                              const char *specified_hostname)
 {
-  if (this->hostname_in_ior_ != 0)
+  if (this->hostname_in_ior_ != nullptr)
     {
       if (TAO_debug_level >= 5)
           TAOLIB_DEBUG ((LM_DEBUG,
@@ -618,7 +610,7 @@ TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
       // just return ours.
       return this->dotted_decimal_address (addr, host);
     }
-  else if (specified_hostname != 0)
+  else if (specified_hostname != nullptr)
     {
       // If the user specified a hostname, pass it back
       // blindly as it overrides our choice of hostname.
@@ -718,7 +710,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
 #endif /* ACE_HAS_IPV6 */
     if (!host_defaulted)
       {
-        if (port_separator_loc != 0)
+        if (port_separator_loc != nullptr)
           {
             // Extract out just the host part of the address.
             size_t const len = port_separator_loc - address;
@@ -747,7 +739,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
     {
       // First convert the port into a usable form.
       unsigned short portno = 0;
-      if (port_separator_loc != 0)
+      if (port_separator_loc != nullptr)
         {
           portno =
             static_cast<u_short> (ACE_OS::atoi (port_separator_loc +
@@ -759,7 +751,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
       if (addr.set (this->default_address_) != 0)
         return -1;
     }
-  else if (port_separator_loc == 0)
+  else if (port_separator_loc == nullptr)
     {
       // The address is a hostname.  No port was specified, so assume
       // port zero (port will be chosen for us).
@@ -796,7 +788,7 @@ TAO_IIOP_Acceptor::dotted_decimal_address (const ACE_INET_Addr &addr,
                                            char *&host)
 {
   int result = 0;
-  const char *tmp = 0;
+  const char *tmp = nullptr;
 
   // If the IP address in the INET_Addr is the IN(6)ADDR_ANY address,
   // then force the actual IP address to be used by initializing a new
@@ -820,7 +812,7 @@ TAO_IIOP_Acceptor::dotted_decimal_address (const ACE_INET_Addr &addr,
   else
     tmp = addr.get_host_addr ();
 
-  if (tmp == 0 || result != 0)
+  if (tmp == nullptr || result != 0)
     {
       if (TAO_debug_level > 0)
         TAOLIB_ERROR ((LM_ERROR,
@@ -842,7 +834,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type)
   // it.  The hostnames will then be used when creating a
   // TAO_IIOP_Profile for each endpoint setup on the probed
   // network interfaces.
-  ACE_INET_Addr *if_addrs = 0;
+  ACE_INET_Addr *if_addrs = nullptr;
   size_t if_cnt = 0;
 
   if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0
@@ -854,7 +846,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type)
       return -1;
     }
 
-  if (if_cnt == 0 || if_addrs == 0)
+  if (if_cnt == 0 || if_addrs == nullptr)
     {
       if (TAO_debug_level > 0)
         {
@@ -1057,7 +1049,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type)
 }
 
 CORBA::ULong
-TAO_IIOP_Acceptor::endpoint_count (void)
+TAO_IIOP_Acceptor::endpoint_count ()
 {
   return this->endpoint_count_;
 }
@@ -1120,7 +1112,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 int
 TAO_IIOP_Acceptor::parse_options (const char *str)
 {
-  if (str == 0)
+  if (str == nullptr)
     return 0;  // No options to parse.  Not a problem.
 
   // Use an option format similar to the one used for CGI scripts in
@@ -1148,9 +1140,9 @@ TAO_IIOP_Acceptor::parse_options (const char *str)
   //    `option1=foo'
   //    `option2=bar'
 
-  ACE_CString *argv_base = 0;
+  ACE_CString *argv_base = nullptr;
   ACE_NEW_RETURN (argv_base, ACE_CString[argc],-1);
-  ACE_CString **argv = 0;
+  ACE_CString **argv = nullptr;
   ACE_NEW_RETURN (argv, ACE_CString*[argc],-1);
 
   ACE_CString::size_type begin = 0;
@@ -1230,7 +1222,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
                           -1);
       if (name == "portspan")
         {
-          int range = static_cast <int> (ACE_OS::atoi (value.c_str ()));
+          int const range = ACE_OS::atoi (value.c_str ());
           // @@ What's the lower bound on the range?  zero, or one?
           if (range < 1 || range > ACE_MAX_DEFAULT_PORT)
             TAOLIB_ERROR_RETURN ((LM_ERROR,
@@ -1272,5 +1264,3 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
-
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index cd8883ff27b..361580a4f40 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -45,13 +45,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
 {
 public:
-
-  /*
-   * Hook that marks beginning of all concrete i.e. non virtual
-   * methods implemented in IIOP_Acceptor class.
-   */
-  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START
-
   /// Constructor.
   TAO_IIOP_Acceptor (void);
 
@@ -76,8 +69,6 @@ public:
   typedef TAO_Concurrency_Strategy<TAO_IIOP_Connection_Handler> CONCURRENCY_STRATEGY;
   typedef TAO_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> ACCEPT_STRATEGY;
 
-  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END
-
   /**
    * The TAO_Acceptor methods, check the documentation in
    * Transport_Acceptor.h for details.
@@ -103,7 +94,6 @@ public:
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
 
-  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START
   /**
    * Set the host name for the given @a addr.
    * A hostname may be forced by using @a specified_hostname.  This
@@ -127,7 +117,6 @@ public:
                         const char *specified_hostname = 0);
 
 protected:
-
   /**
    * Helper method
    * Clear out 'addr' & 'specified_hostname' and initialize them based
@@ -208,15 +197,12 @@ protected:
   int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
-  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END
 
 private:
   void operator= (const TAO_IIOP_Acceptor &);
   TAO_IIOP_Acceptor (const TAO_IIOP_Acceptor &);
 
-  //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_START
 protected:
-
   /// Array of ACE_INET_Addr instances, each one corresponding to a
   /// given network interface.
   ACE_INET_Addr *addrs_;
@@ -263,7 +249,6 @@ protected:
   ACE_INET_Addr default_address_;
 
 private:
-
   /// The concrete acceptor, as a pointer to it's base class.
   BASE_ACCEPTOR base_acceptor_;
 
@@ -271,8 +256,6 @@ private:
   CREATION_STRATEGY *creation_strategy_;
   CONCURRENCY_STRATEGY *concurrency_strategy_;
   ACCEPT_STRATEGY *accept_strategy_;
-
-  //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 552eff0856b..55126126816 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -56,8 +56,8 @@ TAO_IIOP_Connection_Handler::remove_reference (void)
 
 
 TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_IIOP_SVC_HANDLER (t, 0 , 0),
-    TAO_Connection_Handler (0),
+  : TAO_IIOP_SVC_HANDLER (t, nullptr , nullptr),
+    TAO_Connection_Handler (nullptr),
     dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
   // This constructor should *never* get called, it is just here to
@@ -71,11 +71,11 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t)
 
 TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
   TAO_ORB_Core *orb_core)
-  : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
+  : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), nullptr, nullptr),
     TAO_Connection_Handler (orb_core),
     dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
-  TAO_IIOP_Transport* specific_transport = 0;
+  TAO_IIOP_Transport* specific_transport = nullptr;
   ACE_NEW (specific_transport,
            TAO_IIOP_Transport (this, orb_core));
 
@@ -86,7 +86,7 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
                   ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::")
                   ACE_TEXT("IIOP_Connection_Handler, ")
                   ACE_TEXT("this=%@\n"),
-                  tport != 0 ? tport->id () : 0,
+                  tport != nullptr ? tport->id () : 0,
                   this));
     }
 
@@ -94,7 +94,7 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
   this->transport (specific_transport);
 }
 
-TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
+TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler ()
 {
   if (TAO_debug_level > 9)
     {
@@ -103,7 +103,7 @@ TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
                   ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::")
                   ACE_TEXT("~IIOP_Connection_Handler, ")
                   ACE_TEXT("this=%@, transport=%@\n"),
-                  tport != 0 ? tport->id () : 0,
+                  tport != nullptr ? tport->id () : 0,
                   this,
                   tport));
     }
@@ -120,13 +120,6 @@ TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
     }
 }
 
-/* Copy hook that copies over the concrete methods from this class
- * to the base Connection_Handler class as a part of the specialization
- * process. Add all concrete and virtual
- * methods implemented in this class within this hook.
- */
-//@@ CONNECTION_HANDLER_SPL_COPY_HOOK_START
-
 int
 TAO_IIOP_Connection_Handler::open_handler (void *v)
 {
@@ -157,7 +150,7 @@ TAO_IIOP_Connection_Handler::open (void*)
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  if (tph != 0)
+  if (tph != nullptr)
     {
       try
         {
@@ -365,13 +358,13 @@ TAO_IIOP_Connection_Handler::open (void*)
 }
 
 int
-TAO_IIOP_Connection_Handler::resume_handler (void)
+TAO_IIOP_Connection_Handler::resume_handler ()
 {
   return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
 }
 
 int
-TAO_IIOP_Connection_Handler::close_connection (void)
+TAO_IIOP_Connection_Handler::close_connection ()
 {
   // To maintain maximum compatibility, we only set this socket option
   // if the user has provided a linger timeout.
@@ -467,13 +460,13 @@ TAO_IIOP_Connection_Handler::close (u_long flags)
 }
 
 int
-TAO_IIOP_Connection_Handler::release_os_resources (void)
+TAO_IIOP_Connection_Handler::release_os_resources ()
 {
   return this->peer ().close ();
 }
 
 int
-TAO_IIOP_Connection_Handler::add_transport_to_cache (void)
+TAO_IIOP_Connection_Handler::add_transport_to_cache ()
 {
   ACE_INET_Addr addr;
 
@@ -651,7 +644,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
     {
       TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-      if (tph != 0)
+      if (tph != nullptr)
         {
           CORBA::Long codepoint = tph->get_dscp_codepoint ();
 
@@ -664,7 +657,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
 }
 
 void
-TAO_IIOP_Connection_Handler::abort (void)
+TAO_IIOP_Connection_Handler::abort ()
 {
   struct linger lval = { 0, 0 };
   lval.l_onoff = 1;
@@ -690,12 +683,6 @@ TAO_IIOP_Connection_Handler::handle_write_ready (const ACE_Time_Value *timeout)
   return ACE::handle_write_ready (this->peer ().get_handle (), timeout);
 }
 
-
-//@@ CONNECTION_HANDLER_SPL_COPY_HOOK_END
-/*
- * End copy hook
- */
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 0992972b9d7..28ea80707e8 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -50,7 +50,7 @@ class TAO_IIOP_Connection_Handler_Array_Guard
 {
 public:
   TAO_IIOP_Connection_Handler_Array_Guard (TAO_IIOP_Connection_Handler **p, unsigned count);
-  ~TAO_IIOP_Connection_Handler_Array_Guard (void);
+  ~TAO_IIOP_Connection_Handler_Array_Guard ();
 
 private:
   /// Handler.
@@ -66,10 +66,10 @@ TAO_IIOP_Connection_Handler_Array_Guard::TAO_IIOP_Connection_Handler_Array_Guard
 {
 }
 
-TAO_IIOP_Connection_Handler_Array_Guard::~TAO_IIOP_Connection_Handler_Array_Guard (void)
+TAO_IIOP_Connection_Handler_Array_Guard::~TAO_IIOP_Connection_Handler_Array_Guard ()
 {
   ACE_Errno_Guard eguard (errno);
-  if (this->ptr_ != 0)
+  if (this->ptr_ != nullptr)
     {
       for (unsigned i = 0; i < this->count_; i++)
         this->ptr_[i]->remove_reference ();
@@ -79,15 +79,14 @@ TAO_IIOP_Connection_Handler_Array_Guard::~TAO_IIOP_Connection_Handler_Array_Guar
 //---------------------------------------------------------------------------
 
 
-TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
+TAO_IIOP_Connector::~TAO_IIOP_Connector ()
 {
 }
 
-//@@ TAO_CONNECTOR_SPL_COPY_HOOK_START
-TAO_IIOP_Connector::TAO_IIOP_Connector (void)
+TAO_IIOP_Connector::TAO_IIOP_Connector ()
   : TAO_Connector (IOP::TAG_INTERNET_IOP)
   , connect_strategy_ ()
-  , base_connector_ (0)
+  , base_connector_ (nullptr)
 {
 }
 
@@ -106,7 +105,7 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
     return -1;
 
   /// Our connect creation strategy
-  TAO_IIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
+  TAO_IIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = nullptr;
 
   ACE_NEW_RETURN (connect_creation_strategy,
                   TAO_IIOP_CONNECT_CREATION_STRATEGY
@@ -115,7 +114,7 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
                   -1);
 
   /// Our activation strategy
-  TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0;
+  TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = nullptr;
 
   ACE_NEW_RETURN (concurrency_strategy,
                   TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core),
@@ -128,7 +127,7 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
 }
 
 int
-TAO_IIOP_Connector::close (void)
+TAO_IIOP_Connector::close ()
 {
   delete this->base_connector_.concurrency_strategy ();
   delete this->base_connector_.creation_strategy ();
@@ -136,7 +135,7 @@ TAO_IIOP_Connector::close (void)
 }
 
 int
-TAO_IIOP_Connector::supports_parallel_connects(void) const
+TAO_IIOP_Connector::supports_parallel_connects() const
 {
   return 1;
 }
@@ -146,7 +145,7 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 {
   TAO_IIOP_Endpoint *iiop_endpoint = this->remote_endpoint (endpoint);
 
-  if (iiop_endpoint == 0)
+  if (iiop_endpoint == nullptr)
     return -1;
 
   const ACE_INET_Addr &remote_address = iiop_endpoint->object_addr ();
@@ -181,11 +180,11 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
                                      TAO_Transport_Descriptor_Interface &desc,
                                      ACE_Time_Value *timeout)
 {
-  TAO_IIOP_Connection_Handler *svc_handler = 0;
+  TAO_IIOP_Connection_Handler *svc_handler = nullptr;
   TAO_IIOP_Endpoint *iiop_endpoint =
     this->remote_endpoint (desc.endpoint());
-  if (iiop_endpoint == 0)
-    return 0;
+  if (iiop_endpoint == nullptr)
+    return nullptr;
 
   int const result =
     this->begin_connection (svc_handler, r, iiop_endpoint, timeout);
@@ -205,7 +204,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
                       iiop_endpoint->port (),
                       ACE_TEXT("errno")));
         }
-      return 0;
+      return nullptr;
     }
 
   TAO_IIOP_Connection_Handler **sh_ptr = &svc_handler;
@@ -225,7 +224,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
 
   // If complete_connection was unsuccessful then remove
   // the last reference that we have to the svc_handler.
-  if (transport == 0)
+  if (transport == nullptr)
     {
       if (TAO_debug_level > 1)
         {
@@ -235,7 +234,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
                       iiop_endpoint->host (),
                       iiop_endpoint->port ()));
         }
-      return 0;
+      return nullptr;
     }
 
   svc_handler_auto_ptr.release ();
@@ -254,8 +253,8 @@ TAO_IIOP_Connector::make_parallel_connection (
     this->orb_core ()->orb_params ()->parallel_connect_delay ();
   time_t sec_stagger = ns_stagger/1000;
   ns_stagger = (ns_stagger % 1000) * 1000000;
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(), 0);
-       ep != 0;
+  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(), nullptr);
+       ep != nullptr;
        ep = ep->next_filtered (this->orb_core(), root_ep))
     ++max_count;
 
@@ -264,20 +263,20 @@ TAO_IIOP_Connector::make_parallel_connection (
                 ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::")
                 ACE_TEXT ("make_parallel_connection, ")
                 ACE_TEXT ("to %d endpoints\n"), max_count));
-  TAO_IIOP_Endpoint **eplist = 0;
-  TAO_IIOP_Connection_Handler **shlist = 0;
-  ACE_NEW_RETURN (shlist, TAO_IIOP_Connection_Handler *[max_count], 0);
-  ACE_NEW_RETURN (eplist, TAO_IIOP_Endpoint *[max_count], 0);
+  TAO_IIOP_Endpoint **eplist = nullptr;
+  TAO_IIOP_Connection_Handler **shlist = nullptr;
+  ACE_NEW_RETURN (shlist, TAO_IIOP_Connection_Handler *[max_count], nullptr);
+  ACE_NEW_RETURN (eplist, TAO_IIOP_Endpoint *[max_count], nullptr);
 
   TAO_LF_Multi_Event mev;
   int result = 0;
   unsigned count = 0;
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0);
-       ep != 0;
+  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),nullptr);
+       ep != nullptr;
        ep = ep->next_filtered(this->orb_core(),root_ep))
     {
       eplist[count] = this->remote_endpoint (ep);
-      shlist[count] = 0;
+      shlist[count] = nullptr;
       result = this->begin_connection (shlist[count],
                                        r,
                                        eplist[count],
@@ -292,7 +291,7 @@ TAO_IIOP_Connector::make_parallel_connection (
           if (errno == EWOULDBLOCK)
             {
               mev.add_event(shlist[count++]);
-              if (ep->next() != 0)
+              if (ep->next() != nullptr)
                 {
                   struct timespec nsleep = {sec_stagger, ns_stagger};
                   ACE_OS::nanosleep (&nsleep);
@@ -315,7 +314,7 @@ TAO_IIOP_Connector::make_parallel_connection (
         }
     }
 
-  TAO_Transport *winner = 0;
+  TAO_Transport *winner = nullptr;
   if (count > 0) // only complete if at least one pending or success
     {
       // Make sure that we always do a remove_reference for every member
@@ -382,7 +381,7 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler,
   // The code used to set the timeout to zero, with the intent of
   // polling the reactor for connection completion. However, the side-effect
   // was to cause the connection to timeout immediately.
-  svc_handler = 0;
+  svc_handler = nullptr;
 
   int result = -1;
   u_short span = this->orb_core ()->orb_params ()->iiop_client_port_span ();
@@ -406,10 +405,10 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler,
         }
       else
         {
-          if (svc_handler != 0)
+          if (svc_handler != nullptr)
             {
               svc_handler->remove_reference ();
-              svc_handler = 0;
+              svc_handler = nullptr;
             }
         }
     }
@@ -424,19 +423,19 @@ namespace TAO_IIOP
   {
   public:
     TList_Holder (size_t count)
-      : tlist_ (0)
+      : tlist_ (nullptr)
     {
       // Resources are acquired during initialization (RAII)
       ACE_NEW (tlist_, TAO_Transport*[count]);
     }
 
-    ~TList_Holder (void)
+    ~TList_Holder ()
     {
       // Resources are unacquired during uninitialization
       delete [] tlist_;
     }
 
-    operator TAO_Transport** (void)
+    operator TAO_Transport** ()
     {
       return tlist_;
     }
@@ -461,7 +460,7 @@ TAO_IIOP_Connector::complete_connection (int result,
 {
   TAO_IIOP::TList_Holder tlist(count);
 
-  TAO_Transport *transport  = 0;
+  TAO_Transport *transport  = nullptr;
 
   //  populate the transport list
   for (unsigned i = 0; i < count; i++)
@@ -483,7 +482,7 @@ TAO_IIOP_Connector::complete_connection (int result,
         {
           // Cache is full, so close the connection again
           sh_list[count-1]->close ();
-          transport = 0;
+          transport = nullptr;
         }
     }
   else
@@ -541,10 +540,10 @@ TAO_IIOP_Connector::complete_connection (int result,
 
   // At this point, the connection has been successfully created
   // connected or not connected, but we have a connection.
-  TAO_IIOP_Connection_Handler *svc_handler = 0;
-  TAO_IIOP_Endpoint *iiop_endpoint = 0;
+  TAO_IIOP_Connection_Handler *svc_handler = nullptr;
+  TAO_IIOP_Endpoint *iiop_endpoint = nullptr;
 
-  if (transport != 0)
+  if (transport != nullptr)
     {
       for (unsigned i = 0; i < count; i++)
         {
@@ -572,7 +571,7 @@ TAO_IIOP_Connector::complete_connection (int result,
                           ACE_TEXT("errno")));
             }
         }
-      return 0;
+      return nullptr;
     }
 
   TAO_Leader_Follower &leader_follower = this->orb_core ()->leader_follower ();
@@ -600,7 +599,7 @@ TAO_IIOP_Connector::complete_connection (int result,
                    ACE_TEXT("TAO (%P|%t) - IIOP_Connector::make_connection, ")
                    ACE_TEXT("transport in error before cache!\n")));
       transport->connection_handler()->cancel_pending_connection();
-      return 0;
+      return nullptr;
     }
 
   if (TAO_debug_level > 2)
@@ -646,7 +645,7 @@ TAO_IIOP_Connector::complete_connection (int result,
                       ACE_TEXT ("could not add new connection to cache\n")));
         }
 
-      return 0;
+      return nullptr;
     }
 
   // Other part of fix for bug 2654.
@@ -662,7 +661,7 @@ TAO_IIOP_Connector::complete_connection (int result,
                    ACE_TEXT("transport in error after cache!\n")));
       svc_handler->cancel_pending_connection();
       transport->purge_entry();
-      return 0;
+      return nullptr;
     }
 
 
@@ -678,7 +677,7 @@ TAO_IIOP_Connector::complete_connection (int result,
   // deal with the transport cache if there is a failure.
   if (!transport->register_if_necessary ())
     {
-      return 0;
+      return nullptr;
     }
 
   return transport;
@@ -687,30 +686,30 @@ TAO_IIOP_Connector::complete_connection (int result,
 TAO_Profile *
 TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
 {
-  TAO_Profile *pfile = 0;
+  TAO_Profile *pfile = nullptr;
   ACE_NEW_RETURN (pfile,
                   TAO_IIOP_Profile (this->orb_core ()),
-                  0);
+                  nullptr);
 
   int const r = pfile->decode (cdr);
   if (r == -1)
     {
       pfile->_decr_refcnt ();
-      pfile = 0;
+      pfile = nullptr;
     }
 
   return pfile;
 }
 
 TAO_Profile *
-TAO_IIOP_Connector::make_profile (void)
+TAO_IIOP_Connector::make_profile ()
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
   // or:
   //    host:port/object_key
 
-  TAO_Profile *profile = 0;
+  TAO_Profile *profile = nullptr;
   ACE_NEW_THROW_EX (profile,
                     TAO_IIOP_Profile (this->orb_core ()),
                     CORBA::NO_MEMORY (
@@ -751,7 +750,7 @@ TAO_IIOP_Connector::check_prefix (const char *endpoint)
 }
 
 char
-TAO_IIOP_Connector::object_key_delimiter (void) const
+TAO_IIOP_Connector::object_key_delimiter () const
 {
   return TAO_IIOP_Profile::object_key_delimiter_;
 }
@@ -760,13 +759,13 @@ TAO_IIOP_Endpoint *
 TAO_IIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 {
   if (endpoint->tag () != IOP::TAG_INTERNET_IOP)
-    return 0;
+    return nullptr;
 
   TAO_IIOP_Endpoint *iiop_endpoint =
     dynamic_cast<TAO_IIOP_Endpoint *> (endpoint );
 
-  if (iiop_endpoint == 0)
-    return 0;
+  if (iiop_endpoint == nullptr)
+    return nullptr;
 
   return iiop_endpoint;
 }
@@ -788,8 +787,6 @@ TAO_IIOP_Connector::cancel_svc_handler (
   return -1;
 }
 
-//@@ TAO_CONNECTOR_SPL_COPY_HOOK_END
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index c0de19a25d0..1ecabbcf012 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -67,9 +67,6 @@ public:
   virtual char object_key_delimiter (void) const;
 
 public:
-
-  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_START
-
   typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
           TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY;
 
@@ -83,7 +80,6 @@ public:
   typedef ACE_Strategy_Connector<TAO_IIOP_Connection_Handler,
                                  ACE_SOCK_CONNECTOR>
           TAO_IIOP_BASE_CONNECTOR;
-  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_END
 
 protected:
   /// A flag indicating the actual connector supports parallel
@@ -113,12 +109,6 @@ protected:
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
-/*
- * Hook to copy over the protected and private data from this class to
- * base Connector class.
- */
-//@@ TAO_CONNECTOR_SPL_COPY_HOOK_START
-
 private:
   /// This is the first half of making a connection. Both make_connection
   /// and make_parallel_connection will start out using begin_connection.
@@ -146,15 +136,11 @@ private:
   TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 
 private:
-
   /// Our connect strategy
   TAO_IIOP_CONNECT_STRATEGY connect_strategy_;
 
   /// The connector initiating connection requests for IIOP.
   TAO_IIOP_BASE_CONNECTOR base_connector_;
-
-//@@ TAO_CONNECTOR_SPL_COPY_HOOK_END
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index ee036dfc7e3..8ec0fde8237 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -1,10 +1,4 @@
 // -*- C++ -*-
-/*
- * Add all include files within the following
- * two markers.
- */
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
-
 #include "tao/IIOP_Endpoint.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -31,11 +25,8 @@
 #include "ace/INET_Addr.h"
 #include "ace/Sock_Connect.h"
 
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP)
@@ -48,7 +39,7 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
   , object_addr_set_ (false)
   , object_addr_ (addr)
   , preferred_path_ ()
-  , next_ (0)
+  , next_ (nullptr)
 {
   this->set (addr, use_dotted_decimal_addresses);
 }
@@ -67,12 +58,12 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
   , object_addr_set_ (false)
   , object_addr_ (addr)
   , preferred_path_ ()
-  , next_ (0)
+  , next_ (nullptr)
 {
   this->host(host); // With IPv6 performs check for decimal address
 }
 
-TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (void)
+TAO_IIOP_Endpoint::TAO_IIOP_Endpoint ()
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP)
   , host_ ()
   , port_ (683)  // default port (IANA assigned)
@@ -83,7 +74,7 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (void)
   , object_addr_set_ (false)
   , object_addr_ ()
   , preferred_path_ ()
-  , next_ (0)
+  , next_ (nullptr)
 {
 }
 
@@ -100,12 +91,10 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
   , object_addr_set_ (false)
   , object_addr_ ()
   , preferred_path_ ()
-  , next_ (0)
+  , next_ (nullptr)
 {
   this->host(host); // With IPv6 performs check for decimal address
 }
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
-
 
 TAO_IIOP_Endpoint &
 TAO_IIOP_Endpoint::operator= (const TAO_IIOP_Endpoint &other)
@@ -121,17 +110,15 @@ TAO_IIOP_Endpoint::operator= (const TAO_IIOP_Endpoint &other)
       this->object_addr_set_ = other.object_addr_set_;
       this->object_addr_ = other.object_addr_;
       this->preferred_path_ = other.preferred_path_;
-      this->next_ = 0; // do not copy list membership, since we are only cloning the values
+      this->next_ = nullptr; // do not copy list membership, since we are only cloning the values
     }
   return *this;
 }
 
-TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint (void)
+TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint ()
 {
 }
 
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
-
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs)
   : TAO_Endpoint (rhs.tag_, rhs.priority_)
   , host_ (rhs.host_)
@@ -143,7 +130,7 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs)
   , object_addr_set_ (rhs.object_addr_set_)
   , object_addr_ (rhs.object_addr_)
   , preferred_path_  (rhs.preferred_path_)
-  , next_ (0)
+  , next_ (nullptr)
 {
 }
 
@@ -169,7 +156,7 @@ TAO_IIOP_Endpoint::set (const ACE_INET_Addr &addr,
         }
 
       const char *tmp = addr.get_host_addr ();
-      if (tmp == 0)
+      if (tmp == nullptr)
         {
           if (TAO_debug_level > 0)
             {
@@ -239,7 +226,7 @@ TAO_IIOP_Endpoint::host (const char *h)
 }
 
 TAO_Endpoint *
-TAO_IIOP_Endpoint::next (void)
+TAO_IIOP_Endpoint::next ()
 {
   return this->next_;
 }
@@ -273,8 +260,8 @@ TAO_IIOP_Endpoint::next_filtered_i (TAO_IIOP_Endpoint *root,
   // the candidate is nominally the next entry in the list, but since
   // the list may loop back on itself, the root of the list needs to be
   // initialized.
-  TAO_IIOP_Endpoint *candidate = (root == 0) ? this : next_;
-  if (root == 0)
+  TAO_IIOP_Endpoint *candidate = (root == nullptr) ? this : next_;
+  if (root == nullptr)
     root = this;
 
 #if defined (ACE_HAS_IPV6)
@@ -314,18 +301,18 @@ TAO_IIOP_Endpoint::next_filtered_i (TAO_IIOP_Endpoint *root,
 }
 
 TAO_Endpoint *
-TAO_IIOP_Endpoint::duplicate (void)
+TAO_IIOP_Endpoint::duplicate ()
 {
-  TAO_IIOP_Endpoint *endpoint = 0;
+  TAO_IIOP_Endpoint *endpoint = nullptr;
 
   // @@ NOTE: Not exception safe..
-  ACE_NEW_RETURN (endpoint, TAO_IIOP_Endpoint (*this), 0);
+  ACE_NEW_RETURN (endpoint, TAO_IIOP_Endpoint (*this), nullptr);
 
   return endpoint;
 }
 
 const ACE_INET_Addr &
-TAO_IIOP_Endpoint::object_addr (void) const
+TAO_IIOP_Endpoint::object_addr () const
 {
   // The object_addr_ is initialized here, rather than at IOR decode
   // time for several reasons:
@@ -351,7 +338,7 @@ TAO_IIOP_Endpoint::object_addr (void) const
 }
 
 void
-TAO_IIOP_Endpoint::object_addr_i (void) const
+TAO_IIOP_Endpoint::object_addr_i () const
 {
   // We should have already held the lock
 
@@ -414,7 +401,7 @@ TAO_IIOP_Endpoint::add_local_endpoint (TAO_IIOP_Endpoint *ep,
 static void
 TAO_IIOP_Endpoint_get_ip_interfaces (ACE_Vector<ACE_CString> &local_ips)
 {
-  ACE_INET_Addr* tmp = 0;
+  ACE_INET_Addr* tmp = nullptr;
   size_t cnt = 0u;
   int err = ACE::get_ip_interfaces (cnt, tmp);
   if (err != 0)
@@ -427,7 +414,7 @@ TAO_IIOP_Endpoint_get_ip_interfaces (ACE_Vector<ACE_CString> &local_ips)
   for (size_t i = 0u; i < cnt; ++i)
   {
     const char *s_if = tmp[i].get_host_addr (buf, sizeof (buf));
-    ACE_ASSERT (s_if != 0);
+    ACE_ASSERT (s_if != nullptr);
     ACE_CString tmp (s_if);
     local_ips.push_back (tmp);
   }
@@ -548,7 +535,7 @@ TAO_IIOP_Endpoint::preferred_interfaces (const char *csv,
   find_preferred_interfaces(this->host_.in(), csv, preferred);
   CORBA::ULong count = static_cast<CORBA::ULong> (preferred.size());
   size_t i = 0;
-  while (i < count && ACE_OS::strstr (preferred[i].c_str(), "if=") != 0)
+  while (i < count && ACE_OS::strstr (preferred[i].c_str(), "if=") != nullptr)
     {
       // For now we disregard these with IIOP
       ++i;
@@ -560,7 +547,7 @@ TAO_IIOP_Endpoint::preferred_interfaces (const char *csv,
     TAO_IIOP_Endpoint* ep = this;
     for (++i; i < count; ++i)
     {
-      if (ACE_OS::strstr (preferred[i].c_str(), "if=") == 0)
+      if (ACE_OS::strstr (preferred[i].c_str(), "if=") == nullptr)
         ep = add_local_endpoint (ep, preferred[i].c_str(), profile);
     }
 
@@ -584,7 +571,7 @@ TAO_IIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
   const TAO_IIOP_Endpoint *endpoint =
     dynamic_cast<const TAO_IIOP_Endpoint *> (other_endpoint);
 
-  if (endpoint == 0)
+  if (endpoint == nullptr)
     return 0;
 
   return (this->port_ == endpoint->port_
@@ -592,7 +579,7 @@ TAO_IIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 }
 
 CORBA::ULong
-TAO_IIOP_Endpoint::hash (void)
+TAO_IIOP_Endpoint::hash ()
 {
   if (this->hash_val_ != 0)
     return this->hash_val_;
@@ -622,20 +609,18 @@ TAO_IIOP_Endpoint::hash (void)
 }
 
 bool
-TAO_IIOP_Endpoint::is_preferred_network (void) const
+TAO_IIOP_Endpoint::is_preferred_network () const
 {
-  return (this->preferred_path_.host.in () != 0 &&
+  return (this->preferred_path_.host.in () != nullptr &&
           this->preferred_path_.host.in ()[0] != 0);
 }
 
 const char *
-TAO_IIOP_Endpoint::preferred_network (void) const
+TAO_IIOP_Endpoint::preferred_network () const
 {
   return this->preferred_path_.host.in ();
 }
 
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index 47db490ef26..4279c0fa733 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -45,8 +45,6 @@ class TAO_IIOP_Profile;
 class TAO_Export TAO_IIOP_Endpoint : public TAO_Endpoint
 {
 public:
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START
-
   // @todo Lose these friends!
   friend class TAO_IIOP_Profile;
   friend class TAO_SSLIOP_Profile;
@@ -70,9 +68,6 @@ public:
                      CORBA::UShort port,
                      CORBA::Short priority);
 
-
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_END
-
   /// Destructor.
   ~TAO_IIOP_Endpoint (void);
 
@@ -113,12 +108,6 @@ public:
 
   // = IIOP_Endpoint-specific methods.
 
-  /*
-   * Hook to copy only the non virtual concrete methods implemented
-   * in this class to the derived class in the specialization.
-   */
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START
-
   /// Return a reference to the <object_addr>.
   const ACE_INET_Addr &object_addr (void) const;
 
@@ -147,9 +136,6 @@ public:
   bool is_ipv6_decimal (void) const;
 #endif /* ACE_HAS_IPV6 */
 
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_END
-
-
   /// Need to have an assignment operator since the IIOP_Profile class may
   /// have to reorder its list of endpoints based on filtering by the EndpointPolicy.
   TAO_IIOP_Endpoint & operator= (const TAO_IIOP_Endpoint& other);
@@ -169,9 +155,6 @@ private:
                                       bool prefer_ipv6,
                                       bool want_ipv6);
 
-
-  //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_START
-
   /// Helper method for setting INET_Addr.
   int set (const ACE_INET_Addr &addr,
            int use_dotted_decimal_addresses);
@@ -228,8 +211,6 @@ private:
   /// IIOP Endpoints can be strung into a list.  Return the next
   /// endpoint in the list, if any.
   TAO_IIOP_Endpoint *next_;
-
-  //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_END
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
index 33b614739de..d8155105036 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -12,12 +12,12 @@ static const char the_prefix[] = "iiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void)
+TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory ()
   :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP)
 {
 }
 
-TAO_IIOP_Protocol_Factory::~TAO_IIOP_Protocol_Factory (void)
+TAO_IIOP_Protocol_Factory::~TAO_IIOP_Protocol_Factory ()
 {
 }
 
@@ -29,25 +29,25 @@ TAO_IIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 }
 
 const char *
-TAO_IIOP_Protocol_Factory::prefix (void) const
+TAO_IIOP_Protocol_Factory::prefix () const
 {
   return ::the_prefix;
 }
 
 char
-TAO_IIOP_Protocol_Factory::options_delimiter (void) const
+TAO_IIOP_Protocol_Factory::options_delimiter () const
 {
   return '/';
 }
 
 TAO_Acceptor *
-TAO_IIOP_Protocol_Factory::make_acceptor (void)
+TAO_IIOP_Protocol_Factory::make_acceptor ()
 {
-  TAO_Acceptor *acceptor = 0;
+  TAO_Acceptor *acceptor = nullptr;
 
   ACE_NEW_RETURN (acceptor,
                   TAO_IIOP_Acceptor,
-                  0);
+                  nullptr);
 
   return acceptor;
 }
@@ -60,18 +60,18 @@ TAO_IIOP_Protocol_Factory::init (int /* argc */,
 }
 
 TAO_Connector *
-TAO_IIOP_Protocol_Factory::make_connector (void)
+TAO_IIOP_Protocol_Factory::make_connector ()
 {
-  TAO_Connector *connector = 0;
+  TAO_Connector *connector = nullptr;
 
   ACE_NEW_RETURN (connector,
                   TAO_IIOP_Connector,
-                  0);
+                  nullptr);
   return connector;
 }
 
 int
-TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const
+TAO_IIOP_Protocol_Factory::requires_explicit_endpoint () const
 {
   return 0;
 }
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index fee07e0b832..a33b42085e7 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -17,14 +17,14 @@ static const char the_prefix[] = "iiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
+TAO_IIOP_Profile::~TAO_IIOP_Profile ()
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
-  TAO_Endpoint *tmp = 0;
+  TAO_Endpoint *tmp = nullptr;
 
   for (TAO_Endpoint *next = this->endpoint ()->next ();
-       next != 0;
+       next != nullptr;
        next = tmp)
     {
       tmp = next->next ();
@@ -32,18 +32,14 @@ TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
     }
 }
 
-//@@ TAO_PROFILE_SPL_COPY_HOOK_START
-
 const char TAO_IIOP_Profile::object_key_delimiter_ = '/';
 
 char
-TAO_IIOP_Profile::object_key_delimiter (void) const
+TAO_IIOP_Profile::object_key_delimiter () const
 {
   return TAO_IIOP_Profile::object_key_delimiter_;
 }
 
-//@@ TAO_PROFILE_SPL_COPY_HOOK_END
-
 TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
                                     const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
@@ -86,7 +82,6 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-//@@ TAO_PROFILE_SPL_COPY_HOOK_START
 int
 TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 {
@@ -115,7 +110,7 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
       this->endpoint_.object_addr_.set_type (-1);
 
       const char* csv = this->orb_core()->orb_params()->preferred_interfaces();
-      if (csv != 0 && *csv != '\0')
+      if (csv != nullptr && *csv != '\0')
         {
           bool const enforce =
             this->orb_core()->orb_params()->enforce_pref_interfaces();
@@ -135,7 +130,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior)
 
   const char *okd = ACE_OS::strchr (ior, this->object_key_delimiter_);
 
-  if (okd == 0 || okd == ior)
+  if (okd == nullptr || okd == ior)
     {
       // No object key delimiter or no hostname specified.
       throw ::CORBA::INV_OBJREF (
@@ -149,7 +144,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior)
   CORBA::ULong length_host = 0;
 
   const char *cp_pos_overrun = ACE_OS::strchr (ior, ':');  // Look for a port
-  const char *cp_pos = (cp_pos_overrun < okd) ? cp_pos_overrun : 0; // but before object key
+  const char *cp_pos = (cp_pos_overrun < okd) ? cp_pos_overrun : nullptr; // but before object key
 #if defined (ACE_HAS_IPV6)
   // IPv6 numeric address in host string?
   bool ipv6_in_host = false;
@@ -208,13 +203,13 @@ TAO_IIOP_Profile::parse_string_i (const char *ior)
                      EINVAL),
                    CORBA::COMPLETED_NO);
     }
-  else if (cp_pos != 0)
+  else if (cp_pos != nullptr)
     {
       // A port number or port name was specified.
       CORBA::ULong length_port = ACE_Utils::truncate_cast<CORBA::ULong> (okd - cp_pos - 1);
       CORBA::String_var tmp = CORBA::string_alloc (length_port);
 
-      if (tmp.in() != 0)
+      if (tmp.in() != nullptr)
         {
           ACE_OS::strncpy (tmp.inout (), cp_pos + 1, length_port);
           tmp[length_port] = '\0';
@@ -225,7 +220,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior)
           this->endpoint_.port_ = 2809; // default IIOP port for
           // parsing corbaloc strings
         }
-      else if (tmp.in () != 0 && ACE_OS::strspn (tmp.in (), "1234567890") == length_port)
+      else if (tmp.in () != nullptr && ACE_OS::strspn (tmp.in (), "1234567890") == length_port)
         {
           this->endpoint_.port_ =
             static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ()));
@@ -233,7 +228,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior)
       else
         {
           ACE_INET_Addr ia;
-          if (tmp.in () == 0 || ia.string_to_addr (tmp.in ()) == -1)
+          if (tmp.in () == nullptr || ia.string_to_addr (tmp.in ()) == -1)
             {
               throw ::CORBA::INV_OBJREF (
                              CORBA::SystemException::_tao_minor_code (
@@ -327,7 +322,7 @@ TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
     dynamic_cast<const TAO_IIOP_Profile *> (other_profile);
 
   // Make sure we have a TAO_IIOP_Profile.
-  if (op == 0)
+  if (op == nullptr)
     return false;
 
   if (this->count_ == 0 && op->count_ == 0)
@@ -337,7 +332,7 @@ TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
   // Check endpoints equivalence.
   const TAO_IIOP_Endpoint *other_endp = &op->endpoint_;
   for (TAO_IIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
+       endp != nullptr;
        endp = endp->next_)
     {
       if (endp->is_equivalent (other_endp))
@@ -355,7 +350,7 @@ TAO_IIOP_Profile::hash (CORBA::ULong max)
   // Get the hash value for all endpoints.
   CORBA::ULong hashval = 0;
   for (TAO_IIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
+       endp != nullptr;
        endp = endp->next_)
     {
       hashval += endp->hash ();
@@ -379,13 +374,13 @@ TAO_IIOP_Profile::hash (CORBA::ULong max)
 }
 
 TAO_Endpoint*
-TAO_IIOP_Profile::endpoint (void)
+TAO_IIOP_Profile::endpoint ()
 {
   return &this->endpoint_;
 }
 
 TAO_Endpoint *
-TAO_IIOP_Profile::base_endpoint (void)
+TAO_IIOP_Profile::base_endpoint ()
 {
   // do not call endpoint(), return the value directly. This is to
   // avoid calling a derived implementation of endpoint().
@@ -393,7 +388,7 @@ TAO_IIOP_Profile::base_endpoint (void)
 }
 
 CORBA::ULong
-TAO_IIOP_Profile::endpoint_count (void) const
+TAO_IIOP_Profile::endpoint_count () const
 {
   return this->count_;
 }
@@ -410,7 +405,7 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp)
 void
 TAO_IIOP_Profile::remove_endpoint (TAO_IIOP_Endpoint *endp)
 {
-  if (endp == 0)
+  if (endp == nullptr)
     return;
 
   // special handling for the target matching the base endpoint
@@ -435,7 +430,7 @@ TAO_IIOP_Profile::remove_endpoint (TAO_IIOP_Endpoint *endp)
   TAO_IIOP_Endpoint* prev = &this->endpoint_;
   TAO_IIOP_Endpoint* cur = this->endpoint_.next_;
 
-  while (cur != 0)
+  while (cur != nullptr)
   {
     if (cur == endp)
       break;
@@ -443,10 +438,10 @@ TAO_IIOP_Profile::remove_endpoint (TAO_IIOP_Endpoint *endp)
     cur = cur->next_;
   }
 
-  if (cur != 0)
+  if (cur != nullptr)
   {
     prev->next_ = cur->next_;
-    cur->next_ = 0;
+    cur->next_ = nullptr;
     --this->count_;
     if (this->last_endpoint_ == cur)
       {
@@ -466,7 +461,7 @@ void
 TAO_IIOP_Profile::add_generic_endpoint (TAO_Endpoint *endp)
 {
   TAO_IIOP_Endpoint *iep = dynamic_cast<TAO_IIOP_Endpoint *>(endp);
-  if (iep != 0)
+  if (iep != nullptr)
     {
       TAO_IIOP_Endpoint *clone;
       ACE_NEW (clone, TAO_IIOP_Endpoint(*iep));
@@ -475,7 +470,7 @@ TAO_IIOP_Profile::add_generic_endpoint (TAO_Endpoint *endp)
 }
 
 char *
-TAO_IIOP_Profile::to_string (void) const
+TAO_IIOP_Profile::to_string () const
 {
   // corbaloc:iiop:1.2@host:port,iiop:1.2@host:port,.../key
 
@@ -492,8 +487,8 @@ TAO_IIOP_Profile::to_string (void) const
        ACE_OS::strlen (::the_prefix) /* "iiop" */ +
        1 /* colon separator */);
 
- const TAO_IIOP_Endpoint *endp = 0;
- for (endp = &this->endpoint_; endp != 0; endp = endp->next_)
+ const TAO_IIOP_Endpoint *endp = nullptr;
+ for (endp = &this->endpoint_; endp != nullptr; endp = endp->next_)
    {
       buflen += (
           pfx_len +
@@ -517,7 +512,7 @@ TAO_IIOP_Profile::to_string (void) const
 
   ACE_OS::strcpy(buf, "corbaloc:");
 
-  for (endp = &this->endpoint_; endp != 0; endp = endp->next_)
+  for (endp = &this->endpoint_; endp != nullptr; endp = endp->next_)
     {
       if(&this->endpoint_ != endp)
       ACE_OS::strcat(buf, ",");
@@ -561,7 +556,7 @@ TAO_IIOP_Profile::to_string (void) const
 }
 
 const char *
-TAO_IIOP_Profile::prefix (void)
+TAO_IIOP_Profile::prefix ()
 {
   return ::the_prefix;
 }
@@ -611,7 +606,7 @@ TAO_IIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 }
 
 int
-TAO_IIOP_Profile::encode_alternate_endpoints (void)
+TAO_IIOP_Profile::encode_alternate_endpoints ()
 {
   // encode IOP::TAG_ALTERNATE_IIOP_ADDRESS tags if there are more
   // than one endpoints to listen to.
@@ -667,7 +662,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void)
         tagged_component.component_data.get_buffer ();
 
       for (const ACE_Message_Block *iterator = out_cdr.begin ();
-                 iterator != 0;
+                 iterator != nullptr;
            iterator = iterator->cont ())
         {
           size_t i_length = iterator->length ();
@@ -684,7 +679,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void)
 }
 
 int
-TAO_IIOP_Profile::encode_endpoints (void)
+TAO_IIOP_Profile::encode_endpoints ()
 {
   CORBA::ULong actual_count = 0;
 
@@ -756,7 +751,7 @@ TAO_IIOP_Profile::encode_endpoints (void)
 
 
 int
-TAO_IIOP_Profile::decode_endpoints (void)
+TAO_IIOP_Profile::decode_endpoints ()
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
@@ -796,7 +791,7 @@ TAO_IIOP_Profile::decode_endpoints (void)
            i > 0;
            --i)
         {
-          TAO_IIOP_Endpoint *endpoint = 0;
+          TAO_IIOP_Endpoint *endpoint = nullptr;
           ACE_NEW_RETURN (endpoint,
                           TAO_IIOP_Endpoint (endpoints[i].host,
                                              endpoints[i].port,
@@ -834,7 +829,7 @@ TAO_IIOP_Profile::decode_endpoints (void)
       if (!(in_cdr >> host.out()) || !(in_cdr >> port))
         return -1;
 
-      TAO_IIOP_Endpoint *endpoint = 0;
+      TAO_IIOP_Endpoint *endpoint = nullptr;
       ACE_NEW_RETURN (endpoint,
                       TAO_IIOP_Endpoint (host.in(),
                                          port,
@@ -846,7 +841,6 @@ TAO_IIOP_Profile::decode_endpoints (void)
 
   return 0;
 }
-//@@ TAO_PROFILE_SPL_COPY_HOOK_END
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index b4a0a10b527..a3c45dc3fca 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -42,8 +42,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_IIOP_Profile : public TAO_Profile
 {
 public:
-
-  //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_START
   static const char object_key_delimiter_;
 
   /// Return the char string prefix.
@@ -87,8 +85,6 @@ public:
   /// Add an endpoint when the specific endpoint type is unknown
   virtual void add_generic_endpoint (TAO_Endpoint *ep);
 
-  //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_END
-
   /// The object key delimiter that IIOP uses or expects.
   virtual char object_key_delimiter (void) const;
 
@@ -130,18 +126,12 @@ protected:
    * encapsulation of a sequence of structs, each representing a
    * single endpoint.  Data format is specified in iiop_endpoins.pidl.
    */
-
-  //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_COPY_HOOK_START
-
   int encode_endpoints_for_rt (void);
 
-  //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_COPY_HOOK_END
-
   /// Template methods. Please see Profile.h for the documentation.
   virtual int decode_profile (TAO_InputCDR &cdr);
   virtual int decode_endpoints (void);
-  virtual void parse_string_i (const char *string
-                              );
+  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);
 
@@ -176,9 +166,6 @@ protected:
    * <encode_endpoints> method documentation above for how the rest of
    * the endpoint list is transmitted.
    */
-
-  //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_START
-
   TAO_IIOP_Endpoint endpoint_;
 
   /// For efficient insertion at the end of the list
@@ -186,8 +173,6 @@ protected:
 
   /// Number of endpoints in the list headed by <endpoint_>.
   CORBA::ULong count_;
-
-  //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_END
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 9e9318f8489..bb63d2ce313 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -27,28 +27,18 @@ TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler,
 {
 }
 
-TAO_IIOP_Transport::~TAO_IIOP_Transport (void)
+TAO_IIOP_Transport::~TAO_IIOP_Transport ()
 {
 }
 
-/*
- * Hook to copy over all concrete implementations
- * of Transport class from this class to the base
- * class as a part of the specialization.
- * All enhancements to the IIOP_Transport
- * class, i.e., addition of new concrete non virtual
- * methods should be added within this hook.
- */
-
-//@@ TAO_TRANSPORT_SPL_COPY_HOOK_START
 ACE_Event_Handler *
-TAO_IIOP_Transport::event_handler_i (void)
+TAO_IIOP_Transport::event_handler_i ()
 {
   return this->connection_handler_;
 }
 
 TAO_Connection_Handler *
-TAO_IIOP_Transport::connection_handler_i (void)
+TAO_IIOP_Transport::connection_handler_i ()
 {
   return this->connection_handler_;
 }
@@ -92,7 +82,7 @@ TAO_IIOP_Transport::sendfile (TAO_MMAP_Allocator * allocator,
 
   // If we don't have an allocator, fallback to the regular way of sending
   // data
-  if (allocator == 0)
+  if (allocator == nullptr)
     return this->send (iov, iovcnt, bytes_transferred, this->io_timeout(dc));
 
   // We can only use sendfile when all data is coming from the mmap allocator,
@@ -217,7 +207,7 @@ TAO_IIOP_Transport::send_request (TAO_Stub *stub,
 
   if (this->send_message (stream,
                           stub,
-                          0,
+                          nullptr,
                           message_semantics,
                           max_wait_time) == -1)
     {
@@ -351,7 +341,7 @@ TAO_IIOP_Transport::get_listen_point (
   TAO_IIOP_Acceptor *iiop_acceptor =
     dynamic_cast<TAO_IIOP_Acceptor *> (acceptor);
 
-  if (iiop_acceptor == 0)
+  if (iiop_acceptor == nullptr)
     return -1;
 
   // Get the array of endpoints serviced by TAO_IIOP_Acceptor
@@ -436,10 +426,6 @@ TAO_IIOP_Transport::get_listen_point (
     }
   return 1;
 }
-//@@ TAO_TRANSPORT_SPL_COPY_HOOK_END
-/*
- * End of copy hook.
- */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp
index c4b785595ab..48b8f0e9bf6 100644
--- a/TAO/tao/IORInterceptor_Adapter.cpp
+++ b/TAO/tao/IORInterceptor_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void)
+TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter ()
 {
 }
 
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index bfcd27e935e..f85484f38a0 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -59,7 +59,7 @@ class TAO_Root_POA;
 class TAO_Export TAO_IORInterceptor_Adapter
 {
 public:
-  virtual ~TAO_IORInterceptor_Adapter (void);
+  virtual ~TAO_IORInterceptor_Adapter ();
 
   virtual void add_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor) = 0;
@@ -68,7 +68,7 @@ public:
       PortableInterceptor::IORInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies) = 0;
 
-  virtual void destroy_interceptors (void) = 0;
+  virtual void destroy_interceptors () = 0;
 
   /// Call the IORInterceptor::establish_components() method on all
   /// registered IORInterceptors.
@@ -82,8 +82,7 @@ public:
 
   /// Call the IORInterceptor::components_established() method on all
   /// registered IORInterceptors.
-  virtual void components_established (PortableInterceptor::IORInfo_ptr info)
-    = 0;
+  virtual void components_established (PortableInterceptor::IORInfo_ptr info) = 0;
 
   virtual void adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.cpp b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
index 4a1b09b31b3..280fc46ab4a 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory (void)
+TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 6c86e8fbea0..8eac641e59e 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -46,11 +46,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
   // get the profile lists, start by initialize the composite reference
   // by using the first Object.  Then for each subsequent Object verify
   // they are the same type and they do not have duplicate profiles.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ());
-#else
-  auto_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ());
-#endif /* ACE_HAS_CPP11 */
   if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0)
     throw TAO_IOP::Invalid_IOR ();
   CORBA::String_var id =
@@ -145,11 +141,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
   // initialize with estimated pfile count.
   TAO_MProfile Diff_Profiles (count);
 
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ());
-#else
-  auto_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ());
-#endif /* ACE_HAS_CPP11 */
   if (Diff_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
     throw TAO_IOP::Invalid_IOR ();
 
@@ -165,8 +157,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
   TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
-                                          Diff_Profiles
-                                         );
+                                          Diff_Profiles);
 
   // Make the stub memory allocation exception safe for the duration
   // of this method.
@@ -278,13 +269,8 @@ TAO_IOR_Manipulation_impl::is_in_ior (
   CORBA::ULong count = 0;
   TAO_Profile *pfile1 = 0;
   TAO_Profile *pfile2 = 0;
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ());
   std::unique_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ());
-#else
-  auto_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ());
-  auto_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ());
-#endif /* ACE_HAS_CPP11 */
 
   tmp_pfiles1->rewind ();
   while ((pfile1 = tmp_pfiles1->get_next ()) != 0)
diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp
index 7049b1b6ff0..cee044f8785 100644
--- a/TAO/tao/IOR_Parser.cpp
+++ b/TAO/tao/IOR_Parser.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IOR_Parser::~TAO_IOR_Parser (void)
+TAO_IOR_Parser::~TAO_IOR_Parser ()
 {
 }
 
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index 89e112c8547..1ab29881e66 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -58,8 +58,7 @@ public:
    * The call may raise the standard system exceptions (NO_MEMORY,
    * INV_OBJREF, etc.)
    */
-  virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb)
-    = 0;
+  virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp
index 4b9048426ec..5622b387571 100644
--- a/TAO/tao/Incoming_Message_Queue.cpp
+++ b/TAO/tao/Incoming_Message_Queue.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void)
+TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue ()
 {
   CORBA::ULong const sz = this->size_;
 
@@ -27,10 +27,10 @@ TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void)
 
 
 TAO_Queued_Data *
-TAO_Incoming_Message_Queue::dequeue_head (void)
+TAO_Incoming_Message_Queue::dequeue_head ()
 {
   if (this->size_ == 0)
-    return 0;
+    return nullptr;
 
   // Get the node on the head of the queue...
   TAO_Queued_Data * const head = this->last_added_->next ();
@@ -40,17 +40,17 @@ TAO_Incoming_Message_Queue::dequeue_head (void)
 
   // Decrease the size and reset last_added_ if empty
   if (--this->size_ == 0)
-    this->last_added_ = 0;
+    this->last_added_ = nullptr;
 
   return head;
 }
 
 TAO_Queued_Data *
-TAO_Incoming_Message_Queue::dequeue_tail (void)
+TAO_Incoming_Message_Queue::dequeue_tail ()
 {
   // This is a bit painful stuff...
   if (this->size_ == 0)
-    return 0;
+    return nullptr;
 
   // Get the node on the head of the queue...
   TAO_Queued_Data *head = this->last_added_->next ();
@@ -69,7 +69,7 @@ TAO_Incoming_Message_Queue::dequeue_tail (void)
 
   // Decrease the size
   if (--this->size_ == 0)
-    this->last_added_ = 0;
+    this->last_added_ = nullptr;
 
  return ret_qd;
 }
diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h
index 2ad553aad59..fd128efea0c 100644
--- a/TAO/tao/Incoming_Message_Queue.h
+++ b/TAO/tao/Incoming_Message_Queue.h
@@ -55,15 +55,15 @@ public:
   TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core);
 
   /// Destructor.
-  ~TAO_Incoming_Message_Queue (void);
+  ~TAO_Incoming_Message_Queue ();
 
   /// Adding and deleting a node from the queue.
-  TAO_Queued_Data *dequeue_head (void);
-  TAO_Queued_Data *dequeue_tail (void);
+  TAO_Queued_Data *dequeue_head ();
+  TAO_Queued_Data *dequeue_tail ();
   int enqueue_tail (TAO_Queued_Data *nd);
 
   /// Return the length of the queue..
-  CORBA::ULong queue_length (void) const;
+  CORBA::ULong queue_length () const;
 
 private:
 
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h
index c4c6f181b75..69108c9836f 100644
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h
@@ -20,12 +20,7 @@
 #include /**/ "tao/Versioned_Namespace.h"
 
 #include "tao/Basic_Types.h"
-
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -43,20 +38,16 @@ template <class ACE_LOCK>
 class TAO_Intrusive_Ref_Count_Base
 {
 public:
-  virtual ~TAO_Intrusive_Ref_Count_Base (void);
+  virtual ~TAO_Intrusive_Ref_Count_Base ();
 
-  void _add_ref (void);
-  void _remove_ref (void);
+  void _add_ref ();
+  void _remove_ref ();
 
 protected:
-  TAO_Intrusive_Ref_Count_Base (void);
+  TAO_Intrusive_Ref_Count_Base ();
 
 private:
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<ACE_LOCK, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
   // Prevent copying/assignment.
   TAO_Intrusive_Ref_Count_Base (const TAO_Intrusive_Ref_Count_Base&);
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
index 1974d07e2bf..2b293e14b47 100644
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
@@ -65,7 +65,7 @@ class TAO_Intrusive_Ref_Count_Handle
 public:
 
   /// Default Constructor - enters the "nil" state.
-  TAO_Intrusive_Ref_Count_Handle (void);
+  TAO_Intrusive_Ref_Count_Handle ();
 
   /// Ctor - By default, takes ownership of passed-in "copy" of reference
   ///        to T.  But the second argument (bool) can be changed from
@@ -83,7 +83,7 @@ public:
   TAO_Intrusive_Ref_Count_Handle (const TAO_Intrusive_Ref_Count_Handle& b);
 
   /// Destructor
-  ~TAO_Intrusive_Ref_Count_Handle (void);
+  ~TAO_Intrusive_Ref_Count_Handle ();
 
   /// Assignment Operator with T* argument.
   /// Takes ownership of passed-in "copy" of reference to T.
@@ -99,21 +99,21 @@ public:
 
   /// Returns true if underlying pointer is NULL (0).
   /// Returns false otherwise.
-  bool is_nil (void) const;
+  bool is_nil () const;
 
   /// Used to pass the underlying pointer as an "IN" argument to a method.
-  T* in (void) const;
+  T* in () const;
 
   /// Used to pass the underlying pointer as an "IN/OUT" argument to a method.
-  T*& inout (void);
+  T*& inout ();
 
   /// Used to pass the underlying pointer as an "OUT" argument to a method.
-  T*& out (void);
+  T*& out ();
 
   /// Used to take-away the underlying pointer from this smart pointer object.
   /// Caller becomes responsibe for the returned "copy" to the reference.
   /// Always leaves the smart pointer in the "nil" state upon return.
-  T* _retn (void);
+  T* _retn ();
 
   /// Equality operator allows the refcounted object to be used generically
   /// as a contained object
@@ -124,14 +124,14 @@ 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.
-  void claim (void);
+  void claim ();
 
   /// Drop our "copy" of the reference-counted object by removing
   /// one from its reference counter.  Do nothing if this smart pointer
   /// object is currently in the "nil" state.
   /// Note that this method will always leave this smart pointer
   /// in the "nil" state upon its return.
-  void drop (void);
+  void drop ();
 
   /// The underlying pointer to the (intrusively) reference-counted object.
   /// Set to 0 when this smart pointer is in the "nil" state.  Otherwise,
diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h
index c3429bb15e9..1d97550e93e 100644
--- a/TAO/tao/Intrusive_Ref_Count_Object_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h
@@ -38,13 +38,13 @@ class TAO_Intrusive_Ref_Count_Object : public TAO_Intrusive_Ref_Count_Base <ACE_
 public:
   /// take ownership of obj.
   TAO_Intrusive_Ref_Count_Object (OBJ* obj);
-  virtual ~TAO_Intrusive_Ref_Count_Object (void);
+  virtual ~TAO_Intrusive_Ref_Count_Object ();
 
   OBJ* get () const;
 
 private:
   // Prevent default constructor used.
-  TAO_Intrusive_Ref_Count_Object (void);
+  TAO_Intrusive_Ref_Count_Object ();
 
   // Prevent copying/assignment.
   TAO_Intrusive_Ref_Count_Object (const TAO_Intrusive_Ref_Count_Object&);
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index e9e71701152..78b9eaafbfd 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -25,7 +25,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  Invocation_Adapter::~Invocation_Adapter (void)
+  Invocation_Adapter::~Invocation_Adapter ()
   {
   }
 
@@ -63,7 +63,7 @@ namespace TAO
 
     // Initial state
     TAO::Invocation_Status status = TAO_INVOKE_START;
-    ACE_Time_Value *max_wait_time = 0;
+    ACE_Time_Value *max_wait_time = nullptr;
     ACE_Time_Value tmp_wait_time = ACE_Time_Value::zero;
     if (this->get_timeout (stub, tmp_wait_time))
       {
@@ -139,11 +139,11 @@ namespace TAO
   }
 
   TAO_Stub *
-  Invocation_Adapter::get_stub (void) const
+  Invocation_Adapter::get_stub () const
   {
     TAO_Stub * const stub = this->target_->_stubobj ();
 
-    if (stub == 0)
+    if (stub == nullptr)
       {
         if (TAO_debug_level > 0)
           {
@@ -365,7 +365,7 @@ namespace TAO
   {
     // The object pointer has to be changed to a TAO_Stub pointer
     // in order to obtain the profiles.
-    TAO_Stub *stubobj = 0;
+    TAO_Stub *stubobj = nullptr;
 
     bool nil_forward_ref = false;
     if (CORBA::is_nil (effective_target.in ()))
@@ -385,7 +385,7 @@ namespace TAO
           0),
         CORBA::COMPLETED_NO);
 
-    if (stubobj == 0)
+    if (stubobj == nullptr)
       throw ::CORBA::INTERNAL (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
@@ -395,7 +395,7 @@ namespace TAO
     // Reset the profile in the stubs
     stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward);
 
-    if (stub->next_profile () == 0)
+    if (stub->next_profile () == nullptr)
       throw ::CORBA::TRANSIENT (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
@@ -409,7 +409,7 @@ namespace TAO
     TAO::Collocation_Strategy strategy = TAO::TAO_CS_REMOTE_STRATEGY;
     TAO_Stub *stub = object->_stubobj ();
     if (!CORBA::is_nil (stub->servant_orb_var ().in ()) &&
-        stub->servant_orb_var ()->orb_core () != 0)
+        stub->servant_orb_var ()->orb_core () != nullptr)
       {
         TAO_ORB_Core *orb_core = stub->servant_orb_var ()->orb_core ();
 
@@ -447,7 +447,7 @@ namespace TAO
                 {
                   if (ACE_BIT_ENABLED (this->collocation_opportunity_,
                                       TAO::TAO_CO_DIRECT_STRATEGY)
-                                      && (object->_servant () != 0))
+                                      && (object->_servant () != nullptr))
                     {
                       strategy = TAO::TAO_CS_DIRECT_STRATEGY;
                     }
@@ -474,7 +474,7 @@ namespace TAO
                 {
                   if (ACE_BIT_ENABLED (this->collocation_opportunity_,
                                       TAO::TAO_CO_DIRECT_STRATEGY)
-                      && (object->_servant () != 0))
+                      && (object->_servant () != nullptr))
                     {
                       strategy = TAO::TAO_CS_DIRECT_STRATEGY;
                     }
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 68e9bc4d40b..9f2304da7f4 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -111,7 +111,7 @@ namespace TAO
                         TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION,
                         bool has_in_args = true);
 
-    virtual ~Invocation_Adapter (void);
+    virtual ~Invocation_Adapter ();
 
     /// Invoke the target, and used by the generated code.
     /**
@@ -231,7 +231,7 @@ namespace TAO
     bool get_timeout (TAO_Stub *stub, ACE_Time_Value &val);
 
     /// Helper method that extracts TAO_Stub from the target object.
-    TAO_Stub *get_stub (void) const;
+    TAO_Stub *get_stub () const;
 
     /// Helper method that takes care of setting the profiles within
     /// the stub object if the target gets forwarded
@@ -245,7 +245,7 @@ namespace TAO
 
   private:
     /// Don't allow default initializations
-    Invocation_Adapter (void);
+    Invocation_Adapter ();
 
     // Prevent copying
     Invocation_Adapter (Invocation_Adapter const &);
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index 8571d40c0b5..0af8f490d8f 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -33,7 +33,7 @@ namespace TAO
                                     bool response_expected,
                                     bool TAO_INTERCEPTOR (request_is_remote))
     : details_ (details)
-    , forwarded_to_ (0)
+    , forwarded_to_ (nullptr)
     , response_expected_ (response_expected)
     , reply_status_ (GIOP::NO_EXCEPTION)
     , otarget_ (ot)
@@ -44,33 +44,33 @@ namespace TAO
     , sri_adapter_ (stub_->orb_core ()->serverrequestinterceptor_adapter ())
     , stack_size_ (0)
     , invoke_status_ (TAO_INVOKE_START)
-    , caught_exception_ (0)
+    , caught_exception_ (nullptr)
     , is_remote_request_ (request_is_remote)
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
   {
   }
 
-  Invocation_Base::~Invocation_Base (void)
+  Invocation_Base::~Invocation_Base ()
   {
-    TAO_INTERCEPTOR (cri_adapter_= 0);
-    TAO_INTERCEPTOR (sri_adapter_= 0);
+    TAO_INTERCEPTOR (cri_adapter_= nullptr);
+    TAO_INTERCEPTOR (sri_adapter_= nullptr);
   }
 
   TAO_Service_Context &
-  Invocation_Base::request_service_context (void)
+  Invocation_Base::request_service_context ()
   {
     return this->details_.request_service_context ();
   }
 
   TAO_Service_Context &
-  Invocation_Base::reply_service_context (void)
+  Invocation_Base::reply_service_context ()
   {
     return this->details_.reply_service_context ();
   }
 
 #if TAO_HAS_INTERCEPTORS == 1
   Invocation_Status
-  Invocation_Base::send_request_interception (void)
+  Invocation_Base::send_request_interception ()
   {
     if (cri_adapter_)
       {
@@ -105,7 +105,7 @@ namespace TAO
   }
 
   Invocation_Status
-  Invocation_Base::receive_reply_interception (void)
+  Invocation_Base::receive_reply_interception ()
   {
     if (cri_adapter_)
       {
@@ -137,7 +137,7 @@ namespace TAO
   }
 
   Invocation_Status
-  Invocation_Base::receive_other_interception (void)
+  Invocation_Base::receive_other_interception ()
   {
     if (cri_adapter_)
       {
@@ -199,7 +199,7 @@ namespace TAO
   }
 
   PortableInterceptor::ReplyStatus
-  Invocation_Base::handle_all_exception (void)
+  Invocation_Base::handle_all_exception ()
   {
     this->exception (&unknown_exception);
 
@@ -224,9 +224,9 @@ namespace TAO
   void
   Invocation_Base::exception (CORBA::Exception *exception)
   {
-    if (CORBA::SystemException::_downcast (exception) != 0)
+    if (CORBA::SystemException::_downcast (exception) != nullptr)
       this->invoke_status_ = TAO::TAO_INVOKE_SYSTEM_EXCEPTION;
-    else if (CORBA::UserException::_downcast (exception) != 0)
+    else if (CORBA::UserException::_downcast (exception) != nullptr)
       this->invoke_status_ = TAO::TAO_INVOKE_USER_EXCEPTION;
 
     this->forwarded_to_ = CORBA::Object::_nil ();
@@ -235,7 +235,7 @@ namespace TAO
   }
 
   PortableInterceptor::ReplyStatus
-  Invocation_Base::pi_reply_status (void) const
+  Invocation_Base::pi_reply_status () const
   {
     if (cri_adapter_)
       {
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 91e2c97e768..c44772a678d 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -57,11 +57,11 @@ namespace TAO
   class TAO_Export Invocation_Base
   {
   public:
-    virtual ~Invocation_Base (void);
+    virtual ~Invocation_Base ();
 
     /// Accessor and mutator methods
     //@{
-    TAO_Stub *stub (void) const;
+    TAO_Stub *stub () const;
 
     /// Accessor and mutator methods for forwarded object
     /// locations.
@@ -69,7 +69,7 @@ namespace TAO
      * These access methods have to be public so that the
      * PortableInterceptor can use them
      */
-    CORBA::Object_ptr forwarded_reference (void);
+    CORBA::Object_ptr forwarded_reference ();
     void forwarded_reference (CORBA::Object_ptr o);
 
     /// Accessors for the service context list.
@@ -78,33 +78,33 @@ namespace TAO
      * elsewhere. Providing this accessor helps the PI to access this
      * list in both remote and collocated mode.
      */
-    TAO_Service_Context &request_service_context (void);
-    TAO_Service_Context &reply_service_context (void);
+    TAO_Service_Context &request_service_context ();
+    TAO_Service_Context &reply_service_context ();
 
     /// Return the forwarded object location by loosing ownership.
-    CORBA::Object_ptr steal_forwarded_reference (void);
+    CORBA::Object_ptr steal_forwarded_reference ();
 
     /// Return the effective target of the invocation.
     /**
      * Please see the PortableInterceptor specification in the CORBA
      * spec to understand what effective target means.
      */
-    CORBA::Object_ptr effective_target (void) const;
+    CORBA::Object_ptr effective_target () const;
 
     /// Return the target object
-    CORBA::Object_ptr target (void) const;
+    CORBA::Object_ptr target () const;
 
     /// Does this invocation return a response?
-    CORBA::Boolean response_expected (void) const;
+    CORBA::Boolean response_expected () const;
 
     /// Accessor of reply_status of the invocation.
-    GIOP::ReplyStatusType reply_status (void) const;
+    GIOP::ReplyStatusType reply_status () const;
 
     /// Mutator of reply_status of the invocation.
     void reply_status (GIOP::ReplyStatusType s);
 
     /// The operaton details of the invocation
-    TAO_Operation_Details &operation_details (void);
+    TAO_Operation_Details &operation_details ();
     //@}
 
   protected:
@@ -174,19 +174,19 @@ namespace TAO
      *       code must be able to modify this value and use that value
      *       at a later time without being forced to use TSS.
      */
-    size_t &stack_size (void);
+    size_t &stack_size ();
 
-    CORBA::Exception *caught_exception (void);
+    CORBA::Exception *caught_exception ();
 
     /// Change the exception status.
     void exception (CORBA::Exception *exception);
 
     /// Invocation status.
-    TAO::Invocation_Status invoke_status (void) const;
+    TAO::Invocation_Status invoke_status () const;
     /// Mutator to set the invocation status.
     void invoke_status (Invocation_Status s);
 
-    PortableInterceptor::ReplyStatus pi_reply_status (void) const;
+    PortableInterceptor::ReplyStatus pi_reply_status () const;
 
     /// Accessor used to determine if the current invocation is part
     /// of a remote request, and if not, it will be considered to be
@@ -196,22 +196,22 @@ namespace TAO
   protected:
     /// Helper method to invoke send_request interception call to all
     /// the registered interceptors.
-    Invocation_Status send_request_interception (void);
+    Invocation_Status send_request_interception ();
 
     /// Helper method to invoke receive_reply interception call to all
     /// the registered interceptors.
-    Invocation_Status receive_reply_interception (void);
+    Invocation_Status receive_reply_interception ();
 
     /// Helper method to invoke receive_other interception call to all
     /// the registered interceptors.
-    Invocation_Status receive_other_interception (void);
+    Invocation_Status receive_other_interception ();
 
     /// Helper methods to handle interception calls when exceptions
     /// are thrown by the PortableInterceptor.
     PortableInterceptor::ReplyStatus
         handle_any_exception (CORBA::Exception * e);
 
-    PortableInterceptor::ReplyStatus handle_all_exception (void);
+    PortableInterceptor::ReplyStatus handle_all_exception ();
 
   protected:
     /// The client requestor adapter
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 913169b2ad6..9d4999cbd25 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -10,13 +10,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void)
+TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector ()
 {
 }
 
 // ****************************************************************
 
-TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void)
+TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector ()
 {
 }
 
@@ -55,7 +55,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
             }
 
           for (TAO_Endpoint *ep = r->profile ()->first_filtered_endpoint ();
-               ep != 0;
+               ep != nullptr;
                ep = r->profile ()->next_filtered_endpoint (ep))
             {
               TAO_Base_Transport_Property desc (ep);
diff --git a/TAO/tao/Invocation_Retry_Params.cpp b/TAO/tao/Invocation_Retry_Params.cpp
index 48519b3ea0f..c900114d007 100644
--- a/TAO/tao/Invocation_Retry_Params.cpp
+++ b/TAO/tao/Invocation_Retry_Params.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Invocation_Retry_Params::Invocation_Retry_Params (void)
+TAO::Invocation_Retry_Params::Invocation_Retry_Params ()
   : forward_on_reply_closed_limit_ (0)
   , init_retry_delay_ (0, 100000) // Set default to 0.1 seconds
 {
diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp
index 9c168b12f9c..d3ae6c39d35 100644
--- a/TAO/tao/LF_CH_Event.cpp
+++ b/TAO/tao/LF_CH_Event.cpp
@@ -6,14 +6,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_CH_Event::TAO_LF_CH_Event (void)
+TAO_LF_CH_Event::TAO_LF_CH_Event ()
   : TAO_LF_Event (),
     prev_state_ (TAO_LF_Event::LFS_IDLE)
 
 {
 }
 
-TAO_LF_CH_Event::~TAO_LF_CH_Event (void)
+TAO_LF_CH_Event::~TAO_LF_CH_Event ()
 {
 }
 
@@ -39,7 +39,7 @@ TAO_LF_CH_Event::state_changed_i (LFS_STATE new_state)
       if (TAO_debug_level > 9)
         {
           size_t id = 0;
-          TAO_Connection_Handler *ch = 0;
+          TAO_Connection_Handler *ch = nullptr;
           if ((ch = dynamic_cast<TAO_Connection_Handler *> (this))
               && ch->transport ())
             {
@@ -109,7 +109,7 @@ TAO_LF_CH_Event::validate_state_change (LFS_STATE new_state)
 }
 
 bool
-TAO_LF_CH_Event::successful_i (void) const
+TAO_LF_CH_Event::successful_i () const
 {
   if (this->prev_state_ == TAO_LF_Event::LFS_CONNECTION_WAIT)
     return this->state_ == TAO_LF_Event::LFS_SUCCESS;
@@ -118,7 +118,7 @@ TAO_LF_CH_Event::successful_i (void) const
 }
 
 bool
-TAO_LF_CH_Event::error_detected_i (void) const
+TAO_LF_CH_Event::error_detected_i () const
 {
   if (this->prev_state_ == TAO_LF_Event::LFS_CONNECTION_WAIT)
     return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED;
@@ -137,7 +137,7 @@ TAO_LF_CH_Event::set_state (LFS_STATE new_state)
       if (TAO_debug_level > 9)
         {
           size_t id = 0;
-          TAO_Connection_Handler *ch = 0;
+          TAO_Connection_Handler *ch = nullptr;
           if ((ch = dynamic_cast<TAO_Connection_Handler *> (this)) &&
               ch->transport ())
             {
@@ -150,7 +150,7 @@ TAO_LF_CH_Event::set_state (LFS_STATE new_state)
 }
 
 bool
-TAO_LF_CH_Event::is_state_final (void) const
+TAO_LF_CH_Event::is_state_final () const
 {
   return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED;
 }
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
index 8bc6dce0c6c..b59e184e042 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -17,7 +17,7 @@ TAO_LF_Connect_Strategy::TAO_LF_Connect_Strategy (TAO_ORB_Core *orb_core,
 {
 }
 
-TAO_LF_Connect_Strategy::~TAO_LF_Connect_Strategy (void)
+TAO_LF_Connect_Strategy::~TAO_LF_Connect_Strategy ()
 {
 }
 
@@ -25,7 +25,7 @@ void
 TAO_LF_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
                                         ACE_Synch_Options &options)
 {
-  if (timeout != 0)
+  if (timeout != nullptr)
     {
       options.set (ACE_Synch_Options::USE_REACTOR, *timeout);
     }
@@ -41,7 +41,7 @@ TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev,
                                  TAO_Transport *transport,
                                  ACE_Time_Value *max_wait_time)
 {
-  if (transport == 0)
+  if (transport == nullptr)
     return -1;
 
   TAO::Nested_Upcall_Guard guard(transport, this->no_upcall_);
diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp
index 16139aeb985..d8cf240ce1c 100644
--- a/TAO/tao/LF_Event.cpp
+++ b/TAO/tao/LF_Event.cpp
@@ -10,13 +10,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Event::TAO_LF_Event (void)
+TAO_LF_Event::TAO_LF_Event ()
   : state_ (TAO_LF_Event::LFS_IDLE)
-  , follower_ (0)
+  , follower_ (nullptr)
 {
 }
 
-TAO_LF_Event::~TAO_LF_Event (void)
+TAO_LF_Event::~TAO_LF_Event ()
 {
 }
 
@@ -30,7 +30,7 @@ TAO_LF_Event::state_changed (LFS_STATE new_state, TAO_Leader_Follower &lf)
       this->state_changed_i (new_state);
 
       /// Sort of double-checked optimization..
-      if (this->follower_ != 0)
+      if (this->follower_ != nullptr)
         this->follower_->signal ();
     }
 }
diff --git a/TAO/tao/LF_Event_Binder.cpp b/TAO/tao/LF_Event_Binder.cpp
index 7a052e90f2a..1d916f80544 100644
--- a/TAO/tao/LF_Event_Binder.cpp
+++ b/TAO/tao/LF_Event_Binder.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Event_Binder::~TAO_LF_Event_Binder (void)
+TAO_LF_Event_Binder::~TAO_LF_Event_Binder ()
 {
   this->event_->unbind (follower_);
 }
diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp
index b1bf0a45bff..9f57ef471d8 100644
--- a/TAO/tao/LF_Follower.cpp
+++ b/TAO/tao/LF_Follower.cpp
@@ -13,12 +13,12 @@ TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower)
 {
 }
 
-TAO_LF_Follower::~TAO_LF_Follower (void)
+TAO_LF_Follower::~TAO_LF_Follower ()
 {
 }
 
 int
-TAO_LF_Follower::signal (void)
+TAO_LF_Follower::signal ()
 {
   // We *must* remove ourselves from the list of followers, otherwise
   // we could get signaled twice: to wake up as a follower and as the
diff --git a/TAO/tao/LF_Follower_Auto_Adder.cpp b/TAO/tao/LF_Follower_Auto_Adder.cpp
index 69e26eb5caf..ec4d4ddd668 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.cpp
+++ b/TAO/tao/LF_Follower_Auto_Adder.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder (void)
+TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder ()
 {
   this->leader_follower_.remove_follower (this->follower_);
 }
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.cpp b/TAO/tao/LF_Follower_Auto_Ptr.cpp
index 87aa0780e6c..6d3adc40080 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.cpp
+++ b/TAO/tao/LF_Follower_Auto_Ptr.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr (void)
+TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr ()
 {
   this->leader_follower_.release_follower (this->follower_);
 }
diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp
index 16964032c5b..7c627c4cdfb 100644
--- a/TAO/tao/LF_Invocation_Event.cpp
+++ b/TAO/tao/LF_Invocation_Event.cpp
@@ -3,12 +3,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Invocation_Event::TAO_LF_Invocation_Event (void)
+TAO_LF_Invocation_Event::TAO_LF_Invocation_Event ()
   : TAO_LF_Event ()
 {
 }
 
-TAO_LF_Invocation_Event::~TAO_LF_Invocation_Event (void)
+TAO_LF_Invocation_Event::~TAO_LF_Invocation_Event ()
 {
 }
 
@@ -62,13 +62,13 @@ TAO_LF_Invocation_Event::state_changed_i (LFS_STATE new_state)
 }
 
 bool
-TAO_LF_Invocation_Event::successful_i (void) const
+TAO_LF_Invocation_Event::successful_i () const
 {
   return this->state_ == TAO_LF_Event::LFS_SUCCESS;
 }
 
 bool
-TAO_LF_Invocation_Event::error_detected_i (void) const
+TAO_LF_Invocation_Event::error_detected_i () const
 {
   return (this->state_ == TAO_LF_Event::LFS_FAILURE
           || this->state_ == TAO_LF_Event::LFS_TIMEOUT
@@ -76,7 +76,7 @@ TAO_LF_Invocation_Event::error_detected_i (void) const
 }
 
 bool
-TAO_LF_Invocation_Event::is_state_final (void) const
+TAO_LF_Invocation_Event::is_state_final () const
 {
   if (this->state_ == TAO_LF_Event::LFS_TIMEOUT ||
       this->state_ == TAO_LF_Event::LFS_FAILURE)
diff --git a/TAO/tao/LF_Multi_Event.cpp b/TAO/tao/LF_Multi_Event.cpp
index 4d15cfa1e0e..244ea609a55 100644
--- a/TAO/tao/LF_Multi_Event.cpp
+++ b/TAO/tao/LF_Multi_Event.cpp
@@ -5,16 +5,16 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-TAO_LF_Multi_Event::TAO_LF_Multi_Event (void)
+TAO_LF_Multi_Event::TAO_LF_Multi_Event ()
   : TAO_LF_Event (),
-    events_ (0),
-    winner_ (0)
+    events_ (nullptr),
+    winner_ (nullptr)
 {
 }
 
-TAO_LF_Multi_Event::~TAO_LF_Multi_Event (void)
+TAO_LF_Multi_Event::~TAO_LF_Multi_Event ()
 {
-  while (this->events_ != 0)
+  while (this->events_ != nullptr)
     {
       Event_Node *n = this->events_->next_;
       delete this->events_;
@@ -30,7 +30,7 @@ TAO_LF_Multi_Event::bind (TAO_LF_Follower *follower)
       return -1;
     }
 
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
+  for (Event_Node *n = this->events_; n != nullptr; n = n->next_)
     if (n->ptr_->bind(follower) == -1)
       {
         return -1;
@@ -46,7 +46,7 @@ TAO_LF_Multi_Event::unbind (TAO_LF_Follower *follower)
       return -1;
     }
 
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
+  for (Event_Node *n = this->events_; n != nullptr; n = n->next_)
     if (n->ptr_->unbind (follower) == -1)
       {
         return -1;
@@ -58,7 +58,7 @@ TAO_LF_Multi_Event::unbind (TAO_LF_Follower *follower)
 void
 TAO_LF_Multi_Event::add_event (TAO_Connection_Handler *ev)
 {
-  Event_Node *node = 0;
+  Event_Node *node = nullptr;
   ACE_NEW (node, Event_Node);
   node->next_ = this->events_;
   node->ptr_ = ev;
@@ -67,21 +67,21 @@ TAO_LF_Multi_Event::add_event (TAO_Connection_Handler *ev)
 }
 
 TAO_Connection_Handler*
-TAO_LF_Multi_Event::winner (void)
+TAO_LF_Multi_Event::winner ()
 {
   return this->winner_;
 }
 
 TAO_Transport *
-TAO_LF_Multi_Event::base_transport (void)
+TAO_LF_Multi_Event::base_transport ()
 {
-  return (this->events_ == 0) ? 0 : this->events_->ptr_->transport();
+  return (this->events_ == nullptr) ? nullptr : this->events_->ptr_->transport();
 }
 
 bool
-TAO_LF_Multi_Event::successful_i (void) const
+TAO_LF_Multi_Event::successful_i () const
 {
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
+  for (Event_Node *n = this->events_; n != nullptr; n = n->next_)
     if (n->ptr_->successful_i())
       {
         this->winner_ = n->ptr_;
@@ -91,9 +91,9 @@ TAO_LF_Multi_Event::successful_i (void) const
 }
 
 bool
-TAO_LF_Multi_Event::error_detected_i (void) const
+TAO_LF_Multi_Event::error_detected_i () const
 {
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
+  for (Event_Node *n = this->events_; n != nullptr; n = n->next_)
     {
       if (!n->ptr_->error_detected_i ())
         {
@@ -109,9 +109,9 @@ TAO_LF_Multi_Event::state_changed_i (LFS_STATE )
 }
 
 bool
-TAO_LF_Multi_Event::is_state_final (void) const
+TAO_LF_Multi_Event::is_state_final () const
 {
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
+  for (Event_Node *n = this->events_; n != nullptr; n = n->next_)
     {
       if (!n->ptr_->is_state_final ())
         {
diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp
index 327816a7a94..a1c4293458c 100644
--- a/TAO/tao/LF_Strategy.cpp
+++ b/TAO/tao/LF_Strategy.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Strategy::~TAO_LF_Strategy (void)
+TAO_LF_Strategy::~TAO_LF_Strategy ()
 {
 }
 
diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp
index 96628848401..1b7d4e4c60c 100644
--- a/TAO/tao/LF_Strategy_Complete.cpp
+++ b/TAO/tao/LF_Strategy_Complete.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void)
+TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete ()
 {
 }
 
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
index 3ed8ef1a4e3..57482d1a29f 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
@@ -11,7 +11,7 @@ TAO_LRU_Connection_Purging_Strategy::TAO_LRU_Connection_Purging_Strategy (
 }
 
 
-TAO_LRU_Connection_Purging_Strategy::~TAO_LRU_Connection_Purging_Strategy (void)
+TAO_LRU_Connection_Purging_Strategy::~TAO_LRU_Connection_Purging_Strategy ()
 {
 }
 
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index 62b3527edd8..7baf6687771 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -30,7 +30,7 @@ ACE_Event_Handler* TAO_Leader_Follower::Deferred_Event::handler () const
   return this->eh_.handler ();
 }
 
-TAO_Leader_Follower::~TAO_Leader_Follower (void)
+TAO_Leader_Follower::~TAO_Leader_Follower ()
 {
   while (!this->deferred_event_set_.is_empty ())
     {
@@ -49,19 +49,19 @@ TAO_Leader_Follower::~TAO_Leader_Follower (void)
   else
     this->orb_core_->resource_factory ()->reclaim_reactor (this->reactor_);
 
-  this->reactor_ = 0;
+  this->reactor_ = nullptr;
 }
 
 TAO_LF_Follower *
-TAO_Leader_Follower::allocate_follower (void)
+TAO_Leader_Follower::allocate_follower ()
 {
   if (!this->follower_free_list_.is_empty ())
     return this->follower_free_list_.pop_front ();
 
-  TAO_LF_Follower* ptr = 0;
+  TAO_LF_Follower* ptr = nullptr;
   ACE_NEW_RETURN (ptr,
                   TAO_LF_Follower (*this),
-                  0);
+                  nullptr);
   return ptr;
 }
 
@@ -72,7 +72,7 @@ TAO_Leader_Follower::release_follower (TAO_LF_Follower *follower)
 }
 
 int
-TAO_Leader_Follower::elect_new_leader_i (void)
+TAO_Leader_Follower::elect_new_leader_i ()
 {
   TAO_LF_Follower* const follower = this->follower_set_.head ();
 
@@ -97,7 +97,7 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai
 
   while (this->client_thread_is_leader_ && result != -1)
     {
-      if (max_wait_time == 0)
+      if (max_wait_time == nullptr)
         {
           if (this->event_loop_threads_condition_.wait () == -1)
             {
@@ -134,12 +134,12 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai
 }
 
 ACE_Reactor *
-TAO_Leader_Follower::reactor (void)
+TAO_Leader_Follower::reactor ()
 {
-  if (this->reactor_ == 0)
+  if (this->reactor_ == nullptr)
     {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), 0);
-      if (this->reactor_ == 0)
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), nullptr);
+      if (this->reactor_ == nullptr)
         {
           // use GUI reactor factory if available
           if ( this->orb_core_->gui_resource_factory () )
@@ -154,7 +154,7 @@ TAO_Leader_Follower::reactor (void)
 }
 
 void
-TAO_Leader_Follower::set_client_thread (void)
+TAO_Leader_Follower::set_client_thread ()
 {
   // If we were a leader thread or an event loop thread, give up
   // leadership.
@@ -178,7 +178,7 @@ TAO_Leader_Follower::set_client_thread (void)
 }
 
 void
-TAO_Leader_Follower::reset_client_thread (void)
+TAO_Leader_Follower::reset_client_thread ()
 {
   // If we were a leader thread or an event loop thread, take back
   // leadership.
@@ -211,7 +211,7 @@ TAO_Leader_Follower::defer_event (ACE_Event_Handler* eh)
                 ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::defer_event, ")
                 ACE_TEXT ("deferring event handler[%d]\n"),
                 eh->get_handle ()));
-  Deferred_Event* ptr = 0;
+  Deferred_Event* ptr = nullptr;
   ACE_NEW_RETURN (ptr,
                   Deferred_Event (eh),
                   -1);
@@ -265,7 +265,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
   // in PathFinder
   size_t t_id = 0;
 
-  if (TAO_debug_level && transport != 0)
+  if (TAO_debug_level && transport != nullptr)
   {
     t_id = transport->id ();
   }
@@ -283,7 +283,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
     // leader loop below can end, other than the event being complete
     while (event->keep_waiting_i ()
            && !(result == 0 &&
-                max_wait_time != 0 &&
+                max_wait_time != nullptr &&
                 *max_wait_time == ACE_Time_Value::zero)
            && result != -1)
     { // Scope #2: threads here alternate between being leader/followers
@@ -296,7 +296,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
 
         // Grab a follower:
         TAO_LF_Follower_Auto_Ptr follower (*this);
-        if (follower.get () == 0)
+        if (follower.get () == nullptr)
           return -1;
 
         if (TAO_debug_level >= 5)
@@ -338,7 +338,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
           // lost.
           TAO_LF_Follower_Auto_Adder auto_adder (*this, follower);
 
-          if (max_wait_time == 0)
+          if (max_wait_time == nullptr)
           {
             if (follower->wait (max_wait_time) == -1)
               {
@@ -506,7 +506,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
 
             // Did we timeout? If so, stop running the loop.
             if (result == 0 &&
-                max_wait_time != 0 &&
+                max_wait_time != nullptr &&
                 *max_wait_time == ACE_Time_Value::zero)
               break;
 
@@ -600,7 +600,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
                       -1);
 
   // Return an error if there was a problem receiving the reply...
-  if (max_wait_time != 0)
+  if (max_wait_time != nullptr)
     {
       if (!event->successful_i ()
           && *max_wait_time == ACE_Time_Value::zero)
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
index 0c2763b1a84..ed8f4654227 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -48,7 +48,7 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport (
           // transport we're coping with here and this thread will block.
           // Instead we do run for a small amount of time and then recheck
           // the queue.
-          if (max_wait_time == 0)
+          if (max_wait_time == nullptr)
             {
               ACE_Errno_Guard eguard (errno);
 
@@ -61,7 +61,7 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport (
               orb_core->orb ()->perform_work (max_wait_time);
             }
 
-          if (max_wait_time != 0) {
+          if (max_wait_time != nullptr) {
             if (*max_wait_time <= ACE_Time_Value::zero) {
               errno = ETIME;
               return -1;
diff --git a/TAO/tao/Load_Protocol_Factory_T.h b/TAO/tao/Load_Protocol_Factory_T.h
index 29a2519aa05..af0c7f18731 100644
--- a/TAO/tao/Load_Protocol_Factory_T.h
+++ b/TAO/tao/Load_Protocol_Factory_T.h
@@ -33,11 +33,7 @@ namespace TAO
                            const char *name)
     {
       TAO_Protocol_Factory *protocol_factory = 0;
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO_Protocol_Factory> safe_protocol_factory;
-#else
-      auto_ptr<TAO_Protocol_Factory> safe_protocol_factory;
-#endif /* ACE_HAS_CPP11 */
 
       TAO_Protocol_Item *item = 0;
 
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 9ddb386e204..0d806c12689 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -13,7 +13,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::LocalObject::~LocalObject (void)
+CORBA::LocalObject::~LocalObject ()
 {
 }
 
@@ -50,7 +50,7 @@ CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj)
 
 
 TAO::ObjectKey *
-CORBA::LocalObject::_key (void)
+CORBA::LocalObject::_key ()
 {
   if (TAO_debug_level > 0)
     TAOLIB_ERROR ((LM_ERROR,
@@ -66,14 +66,14 @@ CORBA::LocalObject::_key (void)
 // the latter case, return FALSE.
 
 CORBA::Boolean
-CORBA::LocalObject::_non_existent (void)
+CORBA::LocalObject::_non_existent ()
 {
   // Always return false.
   return false;
 }
 
 char *
-CORBA::LocalObject::_repository_id (void)
+CORBA::LocalObject::_repository_id ()
 {
   if (TAO_debug_level > 0)
     TAOLIB_ERROR ((LM_ERROR,
@@ -126,7 +126,7 @@ CORBA::LocalObject::_request (const char *)
 }
 
 CORBA::Object_ptr
-CORBA::LocalObject::_get_component (void)
+CORBA::LocalObject::_get_component ()
 {
   if (TAO_debug_level > 0)
     TAOLIB_ERROR ((LM_ERROR,
@@ -136,7 +136,7 @@ CORBA::LocalObject::_get_component (void)
 }
 
 CORBA::InterfaceDef_ptr
-CORBA::LocalObject::_get_interface (void)
+CORBA::LocalObject::_get_interface ()
 {
   if (TAO_debug_level > 0)
     TAOLIB_ERROR ((LM_ERROR,
@@ -204,7 +204,7 @@ CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out)
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 CORBA::ORB_ptr
-CORBA::LocalObject::_get_orb (void)
+CORBA::LocalObject::_get_orb ()
 {
   if (TAO_debug_level > 0)
     TAOLIB_ERROR ((LM_ERROR,
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index 0e11bcd646d..bd6732bd654 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -46,13 +46,13 @@ namespace CORBA
   public:
 
     /// Destructor
-    virtual ~LocalObject (void);
+    virtual ~LocalObject ();
 
     /// Increment the ref count
     static LocalObject_ptr _duplicate (LocalObject_ptr obj);
 
     /// Return a NIL object
-    static LocalObject_ptr _nil (void);
+    static LocalObject_ptr _nil ();
 
     /**
      * @todo Narrowing a LocalObject to a CORBA::Object is broken
@@ -66,17 +66,17 @@ namespace CORBA
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     /// Always returns false.
-    virtual CORBA::Boolean _non_existent (void);
+    virtual CORBA::Boolean _non_existent ();
 
     /// Get the repository id.
-    virtual char * _repository_id (void);
+    virtual char * _repository_id ();
 
 #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     /// Gets info about object from the Interface Repository.
-    virtual CORBA::InterfaceDef_ptr _get_interface (void);
+    virtual CORBA::InterfaceDef_ptr _get_interface ();
 
     /// Throws NO_IMPLEMENT.
-    virtual CORBA::Object_ptr _get_component (void);
+    virtual CORBA::Object_ptr _get_component ();
 
     virtual void _create_request (CORBA::Context_ptr ctx,
                                   const char * operation,
@@ -139,12 +139,12 @@ namespace CORBA
      */
     virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj);
 
-    virtual CORBA::ORB_ptr _get_orb (void);
+    virtual CORBA::ORB_ptr _get_orb ();
 
     // = TAO extensions
 
     /// Throws CORBA::NO_IMPLEMENT.
-    virtual TAO::ObjectKey * _key (void);
+    virtual TAO::ObjectKey * _key ();
 
     /// Useful for template programming.
     typedef LocalObject_ptr _ptr_type;
@@ -156,7 +156,7 @@ namespace CORBA
     /**
      * Make it protected to prevent instantiation of this class.
      */
-    LocalObject (void);
+    LocalObject ();
 
   private:
     /**
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index deff77755ff..55fba329255 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -34,7 +34,7 @@ namespace TAO
   public:
     First_Request_Guard (TAO_Transport &transport);
 
-    ~First_Request_Guard (void);
+    ~First_Request_Guard ();
 
   private:
     /// The transport that we guard.
@@ -50,7 +50,7 @@ namespace TAO
     this->is_first_ = this->transport_.first_request ();
   }
 
-  First_Request_Guard::~First_Request_Guard (void)
+  First_Request_Guard::~First_Request_Guard ()
   {
     this->transport_.first_request_sent (this->is_first_);
   }
@@ -71,7 +71,7 @@ namespace TAO
   {
     TAO::ORB_Countdown_Time countdown (max_wait_time);
 
-    TAO_Synch_Reply_Dispatcher *rd_p = 0;
+    TAO_Synch_Reply_Dispatcher *rd_p = nullptr;
     ACE_NEW_NORETURN (rd_p, TAO_Synch_Reply_Dispatcher (this->resolver_.stub ()->orb_core (),
                                           this->details_.reply_service_info ()));
     if (!rd_p)
@@ -148,7 +148,7 @@ namespace TAO
     TAO_InputCDR &cdr = rd.reply_cdr ();
 
     // Set the translators
-    this->resolver_.transport ()->assign_translators (&cdr, 0);
+    this->resolver_.transport ()->assign_translators (&cdr, nullptr);
 
     switch (rd.locate_reply_status ())
       {
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
index 531dba39b28..e7920ac5439 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -18,19 +18,19 @@ namespace TAO
   LocateRequest_Invocation_Adapter::LocateRequest_Invocation_Adapter (
     CORBA::Object_ptr target)
     : target_ (target)
-    , list_ (0)
+    , list_ (nullptr)
   {
   }
 
   void
-  LocateRequest_Invocation_Adapter::invoke (void)
+  LocateRequest_Invocation_Adapter::invoke ()
   {
     CORBA::Object_var effective_target =
       CORBA::Object::_duplicate (this->target_);
 
     TAO_Stub * const stub =
       this->target_->_stubobj ();
-    if (stub == 0)
+    if (stub == nullptr)
       throw ::CORBA::INTERNAL (
                      CORBA::SystemException::_tao_minor_code (
                        0,
@@ -45,7 +45,7 @@ namespace TAO
     ACE_Service_Config_Guard scg (stub->orb_core ()->configuration ());
 
     ACE_Time_Value tmp_wait_time;
-    ACE_Time_Value *max_wait_time = 0;
+    ACE_Time_Value *max_wait_time = nullptr;
 
     if (this->get_timeout (tmp_wait_time))
       max_wait_time = &tmp_wait_time;
@@ -70,7 +70,7 @@ namespace TAO
 
             // Dummy operation details that is used to instantiate the
             // LocateRequest class.
-            TAO_Operation_Details op (0, 0);
+            TAO_Operation_Details op (nullptr, 0);
 
             op.request_id (resolver.transport ()->tms ()->request_id ());
             TAO::LocateRequest_Invocation synch (this->target_, resolver, op);
@@ -101,7 +101,7 @@ namespace TAO
   }
 
   CORBA::PolicyList *
-  LocateRequest_Invocation_Adapter::get_inconsistent_policies (void)
+  LocateRequest_Invocation_Adapter::get_inconsistent_policies ()
   {
     return this->list_._retn ();
   }
@@ -125,7 +125,7 @@ namespace TAO
   {
     // The object pointer has to be changed to a TAO_Stub pointer
     // in order to obtain the profiles.
-    TAO_Stub *stubobj = 0;
+    TAO_Stub *stubobj = nullptr;
 
     bool nil_forward_ref = false;
     if (CORBA::is_nil (effective_target.in ()))
@@ -146,7 +146,7 @@ namespace TAO
           0),
         CORBA::COMPLETED_NO);
 
-    if (stubobj == 0)
+    if (stubobj == nullptr)
       throw ::CORBA::INTERNAL (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
@@ -156,7 +156,7 @@ namespace TAO
     // Reset the profile in the stubs
     stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward);
 
-    if (stub->next_profile () == 0)
+    if (stub->next_profile () == nullptr)
       throw ::CORBA::TRANSIENT (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 5eda8d95184..101a9c54238 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -21,7 +21,7 @@ static const char mcast_prefix[] = "mcast:";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_MCAST_Parser::~TAO_MCAST_Parser (void)
+TAO_MCAST_Parser::~TAO_MCAST_Parser ()
 {
 }
 
@@ -247,13 +247,13 @@ TAO_MCAST_Parser::multicast_query (char* & buf,
                             result));
               // Wait for response until timeout.
               ACE_Time_Value tv (
-                timeout == 0
+                timeout == nullptr
                 ? ACE_Time_Value (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
                 : *timeout);
 
               // Accept reply connection from server.
               if (acceptor.accept (stream,
-                                   0,
+                                   nullptr,
                                    &tv) == -1)
                 {
                   if (TAO_debug_level > 0)
@@ -293,7 +293,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf,
                       if (ior_len >= TAO_DEFAULT_IOR_SIZE)
                         {
                           buf = CORBA::string_alloc (ior_len);
-                          if (buf == 0)
+                          if (buf == nullptr)
                             {
                               if (TAO_debug_level > 0)
                                 {
diff --git a/TAO/tao/MMAP_Allocator.cpp b/TAO/tao/MMAP_Allocator.cpp
index aca4124f7b1..04453f7cd8d 100644
--- a/TAO/tao/MMAP_Allocator.cpp
+++ b/TAO/tao/MMAP_Allocator.cpp
@@ -54,20 +54,20 @@ namespace
 // read(2)) for the open()ed /dev/zero device.  Reading through the
 // /dev/zero file descriptor simply returns zero, as /dev/zero was
 // designed to do.  So unfortunate. :)
-TAO_MMAP_Allocator::TAO_MMAP_Allocator (void)
-  : TAO_MMAP_Allocator_Base ((char const *) 0 /* pool name */,
-                             0,  // No need to explicitly name the lock.
+TAO_MMAP_Allocator::TAO_MMAP_Allocator ()
+  : TAO_MMAP_Allocator_Base ((char const *) nullptr /* pool name */,
+                             nullptr,  // No need to explicitly name the lock.
                              &the_pool_options)
 {
 }
 
-TAO_MMAP_Allocator::~TAO_MMAP_Allocator (void)
+TAO_MMAP_Allocator::~TAO_MMAP_Allocator ()
 {
 }
 
 // @@ Should be const but underlying allocator methods are not!
 ACE_HANDLE
-TAO_MMAP_Allocator::handle (void)
+TAO_MMAP_Allocator::handle ()
 {
   return this->alloc ().memory_pool ().mmap ().handle ();
 }
diff --git a/TAO/tao/MMAP_Allocator.h b/TAO/tao/MMAP_Allocator.h
index 07c5aa64c11..2967593191a 100644
--- a/TAO/tao/MMAP_Allocator.h
+++ b/TAO/tao/MMAP_Allocator.h
@@ -44,7 +44,6 @@ class TAO_MMAP_Allocator
   : public TAO_MMAP_Allocator_Base
 {
 public:
-
   /// Constructor
   TAO_MMAP_Allocator (void);
 
@@ -59,11 +58,10 @@ public:
   off_t offset (void * p);
 
 private:
-
-  // Disallow copying.
-  TAO_MMAP_Allocator (TAO_MMAP_Allocator const &);
-  void operator= (TAO_MMAP_Allocator const &);
-
+  TAO_MMAP_Allocator (TAO_MMAP_Allocator const &) = delete;
+  void operator= (TAO_MMAP_Allocator const &) = delete;
+  TAO_MMAP_Allocator (TAO_MMAP_Allocator &&) = delete;
+  void operator= (TAO_MMAP_Allocator &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MM_Sequence_Iterator_T.h b/TAO/tao/MM_Sequence_Iterator_T.h
deleted file mode 100644
index f71cd34f8fb..00000000000
--- a/TAO/tao/MM_Sequence_Iterator_T.h
+++ /dev/null
@@ -1,957 +0,0 @@
-#ifndef mm_sequence_iterator_h
-#define mm_sequence_iterator_h
-
-/**
- * @file
- *
- * @brief Implement the iterator for CORBA sequences that need
- *        memory management.
- *
- * There are some CORBA sequences that need to manage memory (e.g.,
- * string sequences). Iterators for these classes also need to
- * manage memory and therefore do not use the iterators defined
- * for the generic sequences.
- *
- * Essentially, only the iterators operators that reference and return
- * elements (e.g.,operator*, operator[]) need to be overridden from the
- * behavior provided by the generic sequence iterators. Template
- * specialization code is appropriate here but I couldn't figure out how
- * to make the compiler happy.
- *
- * In lieu of template specialization code separate iterators exist
- * for sequences that manage memory. Here are those iterators.
- *
- * @author Joe Hoffert
- */
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-namespace TAO
-{
-
-// Forward declare the iterators
-template<typename T>
-class MM_Sequence_Iterator;
-
-template<typename T>
-class Const_MM_Sequence_Iterator;
-
-template<typename T>
-class MM_Sequence_Reverse_Iterator;
-
-template<typename T>
-class Const_MM_Sequence_Reverse_Iterator;
-
-
-/**
- * @class MM_Sequence_Iterator
- * @brief Implements a random access iterator for generic sequence type
- *        classes that need to manage memory. MM stands for memory managed.
- */
-template <typename SEQUENCE_T>
-  class MM_Sequence_Iterator
-{
-  friend class Const_MM_Sequence_Iterator<SEQUENCE_T>;
-
-public:
-  // = Necessary traits
-  typedef std::random_access_iterator_tag iterator_category;
-  typedef typename SEQUENCE_T::value_type value_type;
-  typedef typename SEQUENCE_T::value_type *pointer;
-  typedef typename SEQUENCE_T::value_type &reference;
-  typedef typename SEQUENCE_T::element_type element_type;
-  typedef typename SEQUENCE_T::const_element_type const_element_type;
-  typedef typename SEQUENCE_T::allocation_traits allocation_traits;
-  typedef typename SEQUENCE_T::element_traits element_traits;
-  typedef typename SEQUENCE_T::implementation_type implementation_type;
-  typedef CORBA::Long difference_type;
-
-  /// Construct a MM_Sequence_Iterator at position pos.
-  MM_Sequence_Iterator (implementation_type *sequence,
-       size_t pos = 0)
-    : sequence_ (sequence),
-    pos_ (pos)
-      {
-      }
-
-  /// Copy constructor
-  MM_Sequence_Iterator (MM_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Assignment operator
-  MM_Sequence_Iterator & operator= (MM_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    {
-      MM_Sequence_Iterator tmp(rhs);
-      swap (tmp);
-      return * this;
-    }
-
-  /// swaps all members
-  void swap(MM_Sequence_Iterator<SEQUENCE_T> & rhs)
-    throw()
-    {
-      std::swap (sequence_, rhs.sequence_);
-      std::swap (this->pos_, rhs.pos_);
-    }
-
-  /// typecast operator to Const_MM_Sequence_Iterator
-  operator Const_MM_Sequence_Iterator<SEQUENCE_T> ()
-  {
-    return Const_MM_Sequence_Iterator<SEQUENCE_T> (*this);
-  }
-
-  /// Dereference operator returns a reference to the item contained
-  /// at the current position
-  element_type operator* (void)
-    {
-      // Access the underlying element in the sequence.
-      return element_type ((*(this->sequence_))[this->pos_],
-                           this->sequence_->release ());
-    }
-
-  /// Returns a const reference to the item contained at the current position
-  const_element_type operator* (void) const
-    {
-      // Access the underlying element in the sequence.
-      return const_element_type ((*(this->sequence_))[this->pos_],
-                                 this->sequence_->release ());
-    }
-
-  /// Preincrement operator
-  MM_Sequence_Iterator<SEQUENCE_T> &operator++ (void)
-    {
-      // Increment the position.
-      // We also need to check if we're now past the end.
-      ++this->pos_;
-      return *this;
-    }
-
-  /// Postincrement operator
-  MM_Sequence_Iterator<SEQUENCE_T> operator++ (int)
-    {
-      // Create a temporary to return so that it's not modified.
-      MM_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Increment the position.
-      // We also need to check if we're now past the end.
-      ++this->pos_;
-      return temp_iter;
-    }
-
-  /// Predecrement operator
-  MM_Sequence_Iterator<SEQUENCE_T> &operator-- (void)
-    {
-      --this->pos_;
-      return *this;
-    }
-
-  /// Postdecrement operator
-  MM_Sequence_Iterator<SEQUENCE_T> operator-- (int)
-    {
-      // Create a temporary to return so that it's not modified.
-      MM_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      --this->pos_;
-      return temp_iter;
-    }
-
-  /// Iterator addition
-  MM_Sequence_Iterator<SEQUENCE_T> &operator+= (difference_type n)
-    {
-      // Move ahead n elements.
-      this->pos_ += n;
-      return *this;
-    }
-
-  /// Iterator addition
-  MM_Sequence_Iterator<SEQUENCE_T> operator+ (difference_type n)
-    {
-      // Create a temporary to return and move it ahead n elements.
-      return MM_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n);
-    }
-
-  /// Iterator subtraction
-  MM_Sequence_Iterator<SEQUENCE_T> &operator-= (difference_type n)
-    {
-      // Move back n elements.
-      this->pos_ -= n;
-      return *this;
-    }
-
-  /// Iterator subtraction
-  MM_Sequence_Iterator<SEQUENCE_T> operator- (difference_type n)
-    {
-      // Create a temporary to return and move it back n elements.
-      return MM_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n);
-    }
-
-  /// Difference
-  difference_type operator- (const MM_Sequence_Iterator<SEQUENCE_T> & rhs)
-    {
-      // I think order is important here (i.e., this before rhs).
-      return this->pos_ - rhs.pos_;
-    }
-
-  /// Difference
-  difference_type operator- (const Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs)
-    {
-      // I think order is important here (i.e., this before rhs).
-      return this->pos_ - rhs.pos_;
-    }
-
-  /// Element operator/assignment
-  element_type operator[] (difference_type n)
-    {
-      // Return the element at position pos_ + n
-      return element_type ((*(this->sequence_))[this->pos_ + n],
-                           this->sequence_->release ());
-    }
-
-  /// Element operator/assignment
-  const_element_type operator[] (difference_type n) const
-    {
-      // Return the element at position pos_ + n
-      return const_element_type ((*(this->sequence_))[this->pos_ + n],
-                                 this->sequence_->release ());
-    }
-
-  /// Less than
-  bool operator< (const MM_Sequence_Iterator<SEQUENCE_T> & rhs)
-    {
-      // Return if this iterator is less than the passed in iterator.
-      return this->pos_ < rhs.pos_;
-    }
-
-  /// Less than
-  bool operator< (const Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs)
-    {
-      // Return if this iterator is less than the passed in iterator.
-      return this->pos_ < rhs.pos_;
-    }
-
-
-  /// Equality operator
-  bool operator== (const MM_Sequence_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-        && this->pos_ == rhs.pos_;
-  }
-
-  /// Nonequality operator
-  bool operator!= (const MM_Sequence_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-private:
-  /// the sequence with which we are dealing
-  implementation_type *sequence_;
-
-  /// Our current position in the sequence.
-  mutable difference_type pos_;
-};
-
-
-/// Iterator addition with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- MM_Sequence_Iterator<SEQUENCE_T>
-  operator+ (typename MM_Sequence_Iterator<SEQUENCE_T>::difference_type n,
-             const MM_Sequence_Iterator<SEQUENCE_T> & iter)
-   {
-     // Create an iter and move it ahead n elements.
-     return MM_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n);
-   }
-
-/// Iterator subtraction with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- MM_Sequence_Iterator<SEQUENCE_T> operator-
-   (typename MM_Sequence_Iterator<SEQUENCE_T>::difference_type n,
-    MM_Sequence_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it back n elements.
-     return MM_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n);
-   }
-
-
-/**
- * @class Const_MM_Sequence_Iterator
- * @brief Implements a constant random access iterator for generic sequence
- *        type classes that need to manage memory. MM stands for memory
- *        managed.
- *
- * Note:  Having a const Iterator does not guarantee that the current
- * *position* that it points to will not change, it only guarantees that
- * you cannot change the underlying array!
- */
-template <typename SEQUENCE_T>
-class Const_MM_Sequence_Iterator
-{
-  friend class MM_Sequence_Iterator<SEQUENCE_T>;
-
-public:
-  // = Necessary traits
-  typedef std::random_access_iterator_tag iterator_category;
-  typedef typename SEQUENCE_T::value_type value_type;
-  typedef typename SEQUENCE_T::value_type *pointer;
-  typedef typename SEQUENCE_T::value_type &reference;
-  typedef typename SEQUENCE_T::const_element_type const_element_type;
-  typedef typename SEQUENCE_T::allocation_traits allocation_traits;
-  typedef typename SEQUENCE_T::element_traits element_traits;
-  typedef typename SEQUENCE_T::implementation_type implementation_type;
-  typedef int difference_type;
-
-  /// Construct a Const_MM_Sequence_Iterator at position pos from
-  /// a const sequence.
-  explicit Const_MM_Sequence_Iterator (const implementation_type *sequence,
-                                      size_t pos = 0)
-    : sequence_ (sequence),
-    pos_ (pos)
-      {
-      }
-
-  virtual ~Const_MM_Sequence_Iterator ()
-    {
-    }
-
-  /// Copy constructor
-  Const_MM_Sequence_Iterator (
-    Const_MM_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Copy constructor initializing by a MM_Sequence_Iterator
-  explicit Const_MM_Sequence_Iterator (
-    MM_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Assignment operator
-  Const_MM_Sequence_Iterator & operator= (
-                Const_MM_Sequence_Iterator<SEQUENCE_T> const & rhs)
-    {
-      Const_MM_Sequence_Iterator tmp(rhs);
-      swap (tmp);
-      return * this;
-    }
-
-  /// swaps all members
-  void swap(Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs)
-    throw()
-    {
-      std::swap (sequence_, rhs.sequence_);
-      std::swap (this->pos_, rhs.pos_);
-    }
-
-  /// Dereference operator returns a reference to the item contained
-  /// at the current position
-  const_element_type operator* (void) const
-    {
-      // Access the underlying element in the sequence.
-      return const_element_type ((*(this->sequence_))[this->pos_],
-                                 this->sequence_->release ());
-    }
-
-  /// Preincrement operator
-  const Const_MM_Sequence_Iterator<SEQUENCE_T> &operator++ (void) const
-    {
-      // Increment the position.
-      ++this->pos_;
-      return * this;
-    }
-
-  /// Postincrement operator
-  Const_MM_Sequence_Iterator<SEQUENCE_T> operator++ (int) const
-    {
-      // Create a temporary to return so that it's not modified.
-      Const_MM_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Increment the position.
-      // We also need to check if we're now past the end.
-      ++this->pos_;
-      return temp_iter;
-    }
-
-  /// Predecrement operator
-  const Const_MM_Sequence_Iterator<SEQUENCE_T> &operator-- (void) const
-    {
-      --this->pos_;
-      return * this;
-    }
-
-  /// Postdecrement operator
-  Const_MM_Sequence_Iterator<SEQUENCE_T> operator-- (int) const
-    {
-      // Create a temporary to return so that it's not modified.
-      Const_MM_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      --this->pos_;
-      return temp_iter;
-    }
-
-  /// Iterator addition
-  const Const_MM_Sequence_Iterator<SEQUENCE_T> &operator+= (difference_type n) const
-    {
-      // Move ahead n elements.
-      this->pos_ += n;
-      return * this;
-    }
-
-  /// Iterator addition
-  Const_MM_Sequence_Iterator<SEQUENCE_T> operator+ (difference_type n) const
-    {
-      // Create a temporary to return and move it ahead n elements.
-      return Const_MM_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n);
-    }
-
-  /// Iterator subtraction
-  const Const_MM_Sequence_Iterator<SEQUENCE_T> &operator-= (difference_type n) const
-    {
-      // Move back n elements.
-      this->pos_ -= n;
-      return * this;
-    }
-
-  /// Iterator subtraction
-  Const_MM_Sequence_Iterator<SEQUENCE_T> operator- (difference_type n) const
-    {
-      // Create a temporary to return and move it back n elements.
-      return Const_MM_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n);
-    }
-
-  /// Difference
-  difference_type operator- (const Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs) const
-    {
-      // I think the order is important here (i.e., this before rhs).
-      return this->pos_ - rhs.pos_;
-    }
-
-  /// Element operator
-  const_element_type operator[] (difference_type n) const
-    {
-      // Return the element at position pos_ + n
-      return const_element_type ((*(this->sequence_))[this->pos_ + n],
-                                 this->sequence_->release ());
-    }
-
-  /// Less than
-  virtual bool operator< (const Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs) const
-    {
-      // Return if this iterator is less than the passed in iterator.
-      return this->pos_ < rhs.pos_;
-    }
-
-  /// Equality operator
-  bool operator== (const Const_MM_Sequence_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-        && this->pos_ == rhs.pos_;
-  }
-
-  /// Nonequality operator
-  bool operator!= (const Const_MM_Sequence_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-private:
-  /// the sequence with which we are dealing
-  const implementation_type *sequence_;
-
-  /// Our current position in the sequence.
-  mutable difference_type pos_;
-};
-
-/// Iterator addition with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Const_MM_Sequence_Iterator<SEQUENCE_T> operator+
-   (typename MM_Sequence_Iterator<SEQUENCE_T>::difference_type n,
-    Const_MM_Sequence_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it ahead n elements.
-     return Const_MM_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n);
-   }
-
-/// Iterator subtraction with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Const_MM_Sequence_Iterator<SEQUENCE_T> operator-
-   (typename MM_Sequence_Iterator<SEQUENCE_T>::difference_type n,
-    Const_MM_Sequence_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it back n elements.
-     return Const_MM_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n);
-   }
-
-
-/**
- * @class MM_Sequence_Reverse_Iterator
- * @brief Implements a reverse random access iterator for generic sequence type
- *        classes that need to manage memory. MM stands for memory managed.
- */
-template <typename SEQUENCE_T>
-class MM_Sequence_Reverse_Iterator
-{
-  friend class Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T>;
-
-public:
-  // = Necessary traits
-  typedef std::random_access_iterator_tag iterator_category;
-  typedef typename SEQUENCE_T::value_type value_type;
-  typedef typename SEQUENCE_T::value_type *pointer;
-  typedef typename SEQUENCE_T::value_type &reference;
-  typedef typename SEQUENCE_T::element_type element_type;
-  typedef typename SEQUENCE_T::const_element_type const_element_type;
-  typedef typename SEQUENCE_T::allocation_traits allocation_traits;
-  typedef typename SEQUENCE_T::element_traits element_traits;
-  typedef typename SEQUENCE_T::implementation_type implementation_type;
-  typedef int difference_type;
-
-  /// Construct a MM_Sequence_Reverse_Iterator at position pos
-  MM_Sequence_Reverse_Iterator (implementation_type *sequence,
-                                 size_t pos)
-    : sequence_ (sequence),
-    pos_ (pos)
-      {
-      }
-
-  /// Copy constructor
-  MM_Sequence_Reverse_Iterator (
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Assignment operator
-  MM_Sequence_Reverse_Iterator & operator= (
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    {
-      MM_Sequence_Reverse_Iterator tmp(rhs);
-      swap (tmp);
-      return * this;
-    }
-
-  /// swaps all members
-  void swap(MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    throw()
-    {
-      std::swap (sequence_, rhs.sequence_);
-      std::swap (this->pos_, rhs.pos_);
-    }
-
-  /// Dereference operator returns a reference to the item contained
-  /// at the current position
-  element_type operator* (void)
-    {
-      // Access the underlying element in the sequence.
-      return element_type ((*(this->sequence_))[this->pos_],
-                           this->sequence_->release ());
-    }
-
-  /// Returns a const reference to the item contained at the current position
-  const_element_type operator* (void) const
-    {
-      // Access the underlying element in the sequence.
-      return const_element_type ((*(this->sequence_))[this->pos_],
-                                 this->sequence_->release ());
-    }
-
-  /// Preincrement operator
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator++ (void)
-    {
-      // Decrement the position for reverse iterators.
-      // We also need to check if we're now before the start.
-      --this->pos_;
-      return *this;
-    }
-
-  /// Postincrement operator
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator++ (int)
-    {
-      // Create a temporary to return so that it's not modified.
-      MM_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Decrement the position for reverse iterators.
-      // We also need to check if we're now past the end.
-      --this->pos_;
-      return temp_iter;
-    }
-
-  /// Predecrement operator
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-- (void)
-    {
-      // Increment the position for reverse iterators.
-      ++this->pos_;
-      return *this;
-    }
-
-  /// Postdecrement operator
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator-- (int)
-    {
-      // Create a temporary to return so that it's not modified.
-      MM_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Increment the position for reverse iterators.
-      ++this->pos_;
-      return temp_iter;
-    }
-
-  /// Iterator addition
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator+= (difference_type n)
-    {
-      // Move back n elements for reverse iterators.
-      this->pos_ -= n;
-      return *this;
-    }
-
-  /// Iterator addition
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ (difference_type n)
-    {
-      // Create a temporary to return and move it back n elements for
-      // reverse iterators.
-      return MM_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n);
-    }
-
-  /// Iterator subtraction
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-= (difference_type n)
-    {
-      // Move ahead n elements for reverse iterators.
-      this->pos_ += n;
-      return *this;
-    }
-
-  /// Iterator subtraction
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator- (difference_type n)
-    {
-      // Create a temporary to return and move it ahead n elements for
-      // reverse iterators.
-      return MM_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n);
-    }
-
-  /// Difference
-  difference_type operator- (const MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    {
-      // I think order is important here (i.e., rhs before this).
-      return rhs.pos_ - this->pos_;
-    }
-
-  /// Difference
-  difference_type operator- (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    {
-      // I think order is important here (i.e., rhs before this).
-      return rhs.pos_ - this->pos_;
-    }
-
-  /// Element operator/assignment
-  element_type operator[] (difference_type n)
-    {
-      // Return the element at position pos_ + n
-      return element_type ((*(this->sequence_))[this->pos_ + n],
-                           this->sequence_->release ());
-    }
-
-  /// Element operator/assignment
-  const_element_type operator[] (difference_type n) const
-    {
-      // Return the element at position pos_ + n
-      return const_element_type ((*(this->sequence_))[this->pos_ + n],
-                                 this->sequence_->release ());
-    }
-
-  /// Less than
-  bool operator< (const MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    {
-      // Return if this iterator is less than the passed in iterator.
-      // For reverse iterators reverse the logic.
-      return this->pos_ > rhs.pos_;
-    }
-
-  /// Less than
-  bool operator< (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    {
-      // Return if this iterator is less than the passed in iterator.
-      // For reverse iterators reverse the logic.
-      return this->pos_ > rhs.pos_;
-    }
-
-
-  /// Equality operator
-  bool operator== (const MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-           && this->pos_ == rhs.pos_;
-  }
-
-  /// Equality operator
-  bool operator== (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-           && this->pos_ == rhs.pos_;
-  }
-
-  /// Nonequality operator
-  bool operator!= (const MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-  /// Nonequality operator
-  bool operator!= (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-private:
-  /// The sequence with which we are dealing
-  implementation_type *sequence_;
-
-  /// Our current position in the sequence.
-  mutable difference_type pos_;
-};
-
-/// Iterator addition with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator+
-   (typename MM_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n,
-    MM_Sequence_Reverse_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it back n elements for reverse iterators.
-     return MM_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n);
-   }
-
-/// Iterator subtraction with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator-
-   (typename MM_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n,
-    MM_Sequence_Reverse_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it ahead n elements for reverse iterators.
-     return MM_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n);
-   }
-
-
-/**
- * @class Const_MM_Sequence_Reverse_Iterator
- * @brief Implements a constant reverse random access iterator for generic
- *        sequence type classes that need to manage memory. MM stands for
- *        memory managed.
- *
- * Note:  Having a const Iterator does not guarantee that the current
- * *position* that it points to will not change, it only guarantees that
- * you cannot change the underlying array!
- */
-template <typename SEQUENCE_T>
-class Const_MM_Sequence_Reverse_Iterator
-{
-  friend class MM_Sequence_Reverse_Iterator<SEQUENCE_T>;
-
-public:
-  // = Necessary traits
-  typedef std::random_access_iterator_tag iterator_category;
-  typedef typename SEQUENCE_T::value_type value_type;
-  typedef typename SEQUENCE_T::value_type *pointer;
-  typedef typename SEQUENCE_T::value_type &reference;
-  typedef typename SEQUENCE_T::const_element_type const_element_type;
-  typedef typename SEQUENCE_T::allocation_traits allocation_traits;
-  typedef typename SEQUENCE_T::element_traits element_traits;
-  typedef typename SEQUENCE_T::implementation_type implementation_type;
-  typedef int difference_type;
-
-  /// Construct a Const_MM_Sequence_Reverse_Iterator at position pos
-  /// using a const sequence.
-  Const_MM_Sequence_Reverse_Iterator (const implementation_type *sequence,
-                                       size_t pos)
-    : sequence_ (sequence),
-    pos_ (pos)
-      {
-      }
-
-  /// Copy constructor
-  Const_MM_Sequence_Reverse_Iterator (
-  Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Copy constructor
-  Const_MM_Sequence_Reverse_Iterator (
-  MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    : sequence_ (rhs.sequence_),
-    pos_ (rhs.pos_)
-      {
-      }
-
-  /// Assignment operator
-  Const_MM_Sequence_Reverse_Iterator & operator= (
-  Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs)
-    {
-      Const_MM_Sequence_Reverse_Iterator tmp(rhs);
-      swap (tmp);
-      return * this;
-    }
-
-  /// swaps all members
-  void swap(Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs)
-    throw()
-    {
-      std::swap (sequence_, rhs.sequence_);
-      std::swap (this->pos_, rhs.pos_);
-    }
-
-  /// typecast operator to MM_Sequence_Reverse_Iterator
-
-  /// Dereference operator returns a reference to the item contained
-  /// at the current position
-  const_element_type operator* (void) const
-    {
-      // Access the underlying element in the sequence.
-      return const_element_type ((*(this->sequence_))[this->pos_],
-                                 this->sequence_->release ());
-    }
-
-  /// Preincrement operator
-  const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator++ (void) const
-    {
-      // Decrement the position for reveres iterators.
-      // We also need to check if we're now before the start.
-      --this->pos_;
-      return *this;
-    }
-
-  /// Postincrement operator
-  Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator++ (int) const
-    {
-      // Create a temporary to return so that it's not modified.
-      Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Decrement the position for reverse iterators.
-      // We also need to check if we're now before the start.
-      --this->pos_;
-      return temp_iter;
-    }
-
-  /// Predecrement operator
-  const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-- (void) const
-    {
-      // Increment the position for reverse iterators.
-      ++this->pos_;
-      return *this;
-    }
-
-  /// Postdecrement operator
-  Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator-- (int) const
-    {
-      // Create a temporary to return so that it's not modified.
-      Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_);
-      // Increment the position for reverse iterators.
-      ++this->pos_;
-      return temp_iter;
-    }
-
-  /// Iterator addition
-  const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator+= (difference_type n) const
-    {
-      // Move back n elements for reverse iterators.
-      this->pos_ -= n;
-      return *this;
-    }
-
-  /// Iterator addition
-  Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ (difference_type n) const
-    {
-      // Create a temporary to return and move it back n elements for
-      // reverse iterators.
-      return Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n);
-    }
-
-  /// Iterator subtraction
-  const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-= (difference_type n) const
-    {
-      // Move ahead n elements for reverse iterators.
-      this->pos_ += n;
-      return *this;
-    }
-
-  /// Iterator subtraction
-  Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator- (difference_type n) const
-    {
-      // Create a temporary to return and move it ahead n elements for
-      // reverse iterators.
-      return Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n);
-    }
-
-  /// Difference
-  difference_type operator- (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) const
-    {
-      // I think order is important here (i.e., rhs before this).
-      return rhs.pos_ - this->pos_;
-    }
-
-  /// Element operator/assignment
-  const_element_type operator[] (difference_type n) const
-    {
-      // Return the element at position pos_ + n
-      return const_element_type ((*(this->sequence_))[this->pos_ + n],
-                                 this->sequence_->release ());
-    }
-
-  /// Less than
-  bool operator< (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) const
-    {
-      // Return if this iterator is less than the passed in iterator.
-      // For reverse iterators reverse the logic.
-      return this->pos_ > rhs.pos_;
-    }
-
-  /// Equality operator
-  bool operator== (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    // Compare all the data members for equality.
-    return this->sequence_ == rhs.sequence_
-        && this->pos_ == rhs.pos_;
-  }
-
-  /// Nonequality operator
-  bool operator!= (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-private:
-  /// the sequence with which we are dealing
-  const implementation_type *sequence_;
-
-  /// Our current position in the sequence.
-  mutable difference_type pos_;
-};
-
-/// Iterator addition with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator+
-   (typename Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n,
-    Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it back n elements for reverse iterators.
-     return Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n);
-   }
-
-/// Iterator subtraction with the difference_type being the first argument.
-template<typename SEQUENCE_T>
- Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator-
-   (typename Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n,
-    Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> iter)
-   {
-     // Create an iter and move it ahead n elements for reverse iterators.
-     return Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n);
-   }
-
-
-} // namespace TAO
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS == 1 */
-
-#endif // mm_sequence_iterator_h
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index cfadbaed48d..a8590c3d08a 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -15,9 +15,9 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_MProfile::~TAO_MProfile (void)
+TAO_MProfile::~TAO_MProfile ()
 {
-  if (this->policy_list_ != 0)
+  if (this->policy_list_ != nullptr)
     {
       CORBA::ULong const len = this->policy_list_->length ();
       for (CORBA::ULong i = 0; i < len; ++i)
@@ -41,15 +41,15 @@ TAO_MProfile::~TAO_MProfile (void)
 }
 
 void
-TAO_MProfile::cleanup (void)
+TAO_MProfile::cleanup ()
 {
-  if (this->pfiles_ != 0)
+  if (this->pfiles_ != nullptr)
     {
       for (TAO_PHandle i = 0; i < this->last_; ++i)
         if (this->pfiles_[i])
           this->pfiles_[i]->_decr_refcnt ();
       delete [] this->pfiles_;
-      this->pfiles_ = 0;
+      this->pfiles_ = nullptr;
     }
 
   this->current_ = 0;
@@ -78,7 +78,7 @@ TAO_MProfile::set (CORBA::ULong sz)
         if (this->pfiles_[h])
           {
             this->pfiles_[h]->_decr_refcnt ();
-            this->pfiles_[h] = 0;
+            this->pfiles_[h] = nullptr;
           }
 
       // Next see if we can reuse our profile list memory
@@ -107,7 +107,7 @@ TAO_MProfile::set (CORBA::ULong sz)
   this->current_ = 0;
 
   for (TAO_PHandle i = 0; i != this->size_; ++i)
-    this->pfiles_[i] = 0;
+    this->pfiles_[i] = nullptr;
 
   return this->size_;
 }
@@ -132,7 +132,7 @@ TAO_MProfile::set (const TAO_MProfile &mprofile)
   for (TAO_PHandle h = 0; h < this->last_; ++h)
     {
       this->pfiles_[h] = mprofile.pfiles_[h];
-      if (this->pfiles_[h] != 0)
+      if (this->pfiles_[h] != nullptr)
         this->pfiles_[h]->_incr_refcnt ();
     }
 
@@ -147,8 +147,8 @@ TAO_MProfile::grow (CORBA::ULong sz)
     return 0;
 
   // get the additional space
-  TAO_Profile **new_pfiles = 0;
-  TAO_Profile **old_pfiles = 0;
+  TAO_Profile **new_pfiles = nullptr;
+  TAO_Profile **old_pfiles = nullptr;
   ACE_NEW_RETURN (new_pfiles,
                   TAO_Profile *[sz],
                   -1);
@@ -159,7 +159,7 @@ TAO_MProfile::grow (CORBA::ULong sz)
   for (TAO_PHandle h = 0; h < this->size_; ++h)
     {
       new_pfiles[h] = old_pfiles[h];
-      old_pfiles[h] = 0;
+      old_pfiles[h] = nullptr;
     }
 
   this->pfiles_ = new_pfiles;
@@ -235,7 +235,7 @@ TAO_MProfile::remove_profile (const TAO_Profile *pfile)
       if (this->pfiles_[h]->is_equivalent (pfile))
         { // remove it!
           TAO_Profile *old = this->pfiles_[h];
-          this->pfiles_[h] = 0;
+          this->pfiles_[h] = nullptr;
           old->_decr_refcnt ();
           // shift other profiles up one
           // note, if h == last_ - 1 then do nothing.
@@ -300,17 +300,16 @@ TAO_MProfile::hash (CORBA::ULong max)
 }
 
 void
-TAO_MProfile::create_policy_list (void)
+TAO_MProfile::create_policy_list ()
 {
   ACE_NEW_THROW_EX (this->policy_list_,
                     CORBA::PolicyList,
                     CORBA::NO_MEMORY (0,
-                                      CORBA::COMPLETED_NO)
-                    );
+                                      CORBA::COMPLETED_NO));
 }
 
 void
-TAO_MProfile::init_policy_list (void)
+TAO_MProfile::init_policy_list ()
 {
   // The first time this method is called
   // it causes the initialization of the policies
@@ -322,23 +321,23 @@ TAO_MProfile::init_policy_list (void)
 }
 
 CORBA::PolicyList *
-TAO_MProfile::policy_list (void)
+TAO_MProfile::policy_list ()
 {
   if (!this->is_policy_list_initialized_)
     {
       ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                         guard,
                         this->mutex_,
-                        0);
+                        nullptr);
 
-      if (this->policy_list_ == 0)
+      if (this->policy_list_ == nullptr)
         {
           this->create_policy_list ();
 
           this->init_policy_list ();
         }
     }
-  CORBA::PolicyList *ret_val = 0;
+  CORBA::PolicyList *ret_val = nullptr;
   ACE_NEW_THROW_EX (ret_val,
                     CORBA::PolicyList (*this->policy_list_),
                     CORBA::NO_MEMORY (0,
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 7d3aa640e01..d00ce8384b7 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -69,7 +69,7 @@ public:
 
   /// Destructor: decrements reference count on all references
   /// profiles!
-  ~TAO_MProfile (void);
+  ~TAO_MProfile ();
 
   /// Inits MProfile to hold sz TAO_Profiles.
   /// NOT THREAD SAFE
@@ -88,20 +88,20 @@ public:
   int grow (CORBA::ULong sz);
 
   /// Treat as a circular list.
-  TAO_Profile *get_cnext (void);
+  TAO_Profile *get_cnext ();
 
   /// Get next profile in list, return 0 at end of list.
-  TAO_Profile *get_next (void);
+  TAO_Profile *get_next ();
 
   /// Assume a circular list of profiles.
-  TAO_Profile *get_cprev (void);
+  TAO_Profile *get_cprev ();
 
   /// Get previous profile, stop at beginning of list and return 0.
-  TAO_Profile *get_prev (void);
+  TAO_Profile *get_prev ();
 
   /// Return a pointer to the current profile, will not increment
   /// reference pointer.
-  TAO_Profile *get_current_profile (void);
+  TAO_Profile *get_current_profile ();
 
   /// Return a pointer to the profile referenced by handle void.
   TAO_Profile *get_profile (TAO_PHandle handle);
@@ -109,24 +109,24 @@ public:
   // rem_profile (TAO_PHandle handle); let's wait.
 
   /// Returns the index for the current profile.
-  TAO_PHandle get_current_handle (void);
+  TAO_PHandle get_current_handle ();
 
   /// Returns the index for the current profile.
-  TAO_PHandle get_current_handle (void) const;
+  TAO_PHandle get_current_handle () const;
 
   /// Returns the number of profiles stored in the list (last_+1).
-  CORBA::ULong profile_count (void) const;
+  CORBA::ULong profile_count () const;
 
   /// return the maximum number of profiles that can be stored in this
   /// container, (size_+1)
-  CORBA::ULong size (void) const;
+  CORBA::ULong size () const;
 
   /// Return the profile at position <slot>.  If <slot> is out of range
   /// it returns 0.
   const TAO_Profile* get_profile (CORBA::ULong slot) const;
 
   /// Sets the current slot back to 0.
-  void rewind (void);
+  void rewind ();
 
   /// Return the index of this entry or -1 if it can not be added.
   /// reference count on profile in incremented!
@@ -151,7 +151,7 @@ public:
   void forward_from (TAO_MProfile *mprofiles);
 
   /// Returns a pointer to the profile which was forwarded.
-  TAO_MProfile *forward_from (void);
+  TAO_MProfile *forward_from ();
 
   /**
    * Returns true of there is at least one profile in first which
@@ -171,7 +171,7 @@ public:
 protected:
   /// This method handle the dynamic allocation of the data member
   /// <policy_list_>.
- void create_policy_list (void);
+ void create_policy_list ();
 
 public:
   /// Sets the policies list associated with the profiles
@@ -180,11 +180,11 @@ public:
 
   /// Gets the policies list associated with the profiles
   /// owned by the TAO_MProfile.
-  CORBA::PolicyList *policy_list (void);
+  CORBA::PolicyList *policy_list ();
 
 protected:
   /// Initialize the policy list, demarsharling the policy.
-  void init_policy_list (void);
+  void init_policy_list ();
 
 protected:
   /// Stores the policy list for the profile of this MProfile.
@@ -200,12 +200,12 @@ protected:
 protected:
   /// Return the complete list of profiles, this object retains
   /// ownership!
-  TAO_Profile **pfiles (void) const;
+  TAO_Profile **pfiles () const;
 
 
 private:
   /// Helper method to implement the destructor
-  void cleanup (void);
+  void cleanup ();
 
   /// A helper to give_profile to be used when share is true. This
   /// method is used primarily to help the corbaloc parser create a
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index ed3b08b2b17..f1ab26afb16 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -29,7 +29,7 @@ TAO_AMH_Response_Handler::TAO_AMH_Response_Handler ()
 {
 }
 
-TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void)
+TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler ()
 {
   this->transport_->remove_reference ();
 
@@ -86,7 +86,7 @@ TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request,
 }
 
 void
-TAO_AMH_Response_Handler::_tao_rh_init_reply (void)
+TAO_AMH_Response_Handler::_tao_rh_init_reply ()
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -126,7 +126,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void)
 }
 
 void
-TAO_AMH_Response_Handler::_tao_rh_send_reply (void)
+TAO_AMH_Response_Handler::_tao_rh_send_reply ()
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -311,7 +311,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd,
 }
 
 void
-TAO_AMH_Response_Handler::_remove_ref (void)
+TAO_AMH_Response_Handler::_remove_ref ()
 {
   if (--this->refcount_ == 0)
     {
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 703728eba77..a7fbfbcbe69 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -74,7 +74,7 @@ public:
    * Releases the transport and in case of an error, sends the appropriate
    * exception back to the client
    */
-  virtual ~TAO_AMH_Response_Handler (void);
+  virtual ~TAO_AMH_Response_Handler ();
 
   /**
    * Stores necessary information from a TAO_Server_Request onto the heap
@@ -84,17 +84,17 @@ public:
 
   /// @name Mutators for refcount
   //@{
-  virtual void _remove_ref (void);
+  virtual void _remove_ref ();
   //@}
 
 protected:
   /// Sets up the various parameters in anticipation of returning a reply
   /// to the client. return/OUT/INOUT arguments are marshalled into the
   /// Output stream after this method has been called.
-  void _tao_rh_init_reply (void);
+  void _tao_rh_init_reply ();
 
   /// Sends the marshalled reply back to the client.
-  void _tao_rh_send_reply (void);
+  void _tao_rh_send_reply ();
 
   /// Send back an exception to the client.
   void _tao_rh_send_exception (const CORBA::Exception &ex);
diff --git a/TAO/tao/Messaging/AMH_Skeletons.cpp b/TAO/tao/Messaging/AMH_Skeletons.cpp
index f2781a1b81e..284ad831305 100644
--- a/TAO/tao/Messaging/AMH_Skeletons.cpp
+++ b/TAO/tao/Messaging/AMH_Skeletons.cpp
@@ -22,7 +22,7 @@
 #include "tao/TAO_Server_Request.h"
 
 void
-_is_a_amh_Upcall_Command::execute (void)
+_is_a_amh_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
     TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -83,7 +83,7 @@ TAO_AMH_Skeletons::_is_a_amh_skel (TAO_ServerRequest & server_request,
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 void
-_non_existent_amh_Upcall_Command::execute (void)
+_non_existent_amh_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
     TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -163,7 +163,7 @@ TAO_AMH_Skeletons::_interface_amh_skel (TAO_ServerRequest & server_request,
 }
 
 void
-_get_component_amh_Upcall_Command::execute (void)
+_get_component_amh_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
     TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
@@ -214,7 +214,7 @@ TAO_AMH_Skeletons::_component_amh_skel (TAO_ServerRequest & server_request,
 
 
 void
-_repository_id_amh_Upcall_Command::execute (void)
+_repository_id_amh_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< char *>::ret_arg_type retval =
     TAO::Portable_Server::get_ret_arg< char *> (
diff --git a/TAO/tao/Messaging/AMH_Skeletons.h b/TAO/tao/Messaging/AMH_Skeletons.h
index 3157a9c6793..fa6aa742f03 100644
--- a/TAO/tao/Messaging/AMH_Skeletons.h
+++ b/TAO/tao/Messaging/AMH_Skeletons.h
@@ -61,7 +61,7 @@ public:
     , args_ (args)
   {}
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
@@ -89,7 +89,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 private:
   TAO_ServantBase * const servant_;
   TAO_Operation_Details const * const operation_details_;
@@ -116,7 +116,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
@@ -144,7 +144,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
index d47234ebb0d..ff0302be5d1 100644
--- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
@@ -120,7 +120,7 @@ TAO_AMI_Arguments_Converter_Impl::handle_corba_exception (
 // Initialization and registration of dynamic service object.
 
 int
-TAO_AMI_Arguments_Converter_Impl::Initializer (void)
+TAO_AMI_Arguments_Converter_Impl::Initializer ()
 {
   return ACE_Service_Config::process_directive (
     ace_svc_desc_TAO_AMI_Arguments_Converter_Impl);
diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
index 6f0ebd8cb1f..59a5ead3ebc 100644
--- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
+++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h
@@ -58,7 +58,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/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index c6af67798b7..7175889b3a4 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -94,7 +94,7 @@ namespace TAO
 
   private:
     /// Don't allow default initializations
-    Asynch_Invocation_Adapter (void);
+    Asynch_Invocation_Adapter ();
 
     Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &);
     Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &);
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index 31e20589456..a85a96033e8 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -23,7 +23,7 @@ TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (
 }
 
 // Destructor.
-TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void)
+TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher ()
 {
 }
 
@@ -147,7 +147,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params &params)
 }
 
 void
-TAO_Asynch_Reply_Dispatcher::connection_closed (void)
+TAO_Asynch_Reply_Dispatcher::connection_closed ()
 {
   try
     {
@@ -196,7 +196,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 // AMI Timeout Handling Begin
 
 void
-TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
+TAO_Asynch_Reply_Dispatcher::reply_timed_out ()
 {
   try
     {
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index 392487aa8a4..9ecb3b3abb5 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -42,17 +42,17 @@ public:
       ACE_Allocator *allocator);
 
   /// Destructor.
-  virtual ~TAO_Asynch_Reply_Dispatcher (void);
+  virtual ~TAO_Asynch_Reply_Dispatcher ();
 
   /// @name The Reply Dispatcher methods
   //@{
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
 
-  virtual void connection_closed (void);
+  virtual void connection_closed ();
   //@}
 
   /// Inform that the reply timed out
-  virtual void reply_timed_out (void);
+  virtual void reply_timed_out ();
 
   /// Install the timeout handler
   long schedule_timer (CORBA::ULong request_id,
diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
index f6f4993050e..ed468eb16fa 100644
--- a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
@@ -31,7 +31,7 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff
 }
 
 CORBA::PolicyType
-TAO_Buffering_Constraint_Policy::policy_type (void)
+TAO_Buffering_Constraint_Policy::policy_type ()
 {
   return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE;
 }
@@ -53,7 +53,7 @@ TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val)
 
 
 TAO_Buffering_Constraint_Policy *
-TAO_Buffering_Constraint_Policy::clone (void) const
+TAO_Buffering_Constraint_Policy::clone () const
 {
   TAO_Buffering_Constraint_Policy *copy = 0;
   ACE_NEW_RETURN (copy,
@@ -63,13 +63,13 @@ TAO_Buffering_Constraint_Policy::clone (void) const
 }
 
 TAO::BufferingConstraint
-TAO_Buffering_Constraint_Policy::buffering_constraint (void)
+TAO_Buffering_Constraint_Policy::buffering_constraint ()
 {
   return this->buffering_constraint_;
 }
 
 CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::copy (void)
+TAO_Buffering_Constraint_Policy::copy ()
 {
   TAO_Buffering_Constraint_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -80,12 +80,12 @@ TAO_Buffering_Constraint_Policy::copy (void)
 }
 
 void
-TAO_Buffering_Constraint_Policy::destroy (void)
+TAO_Buffering_Constraint_Policy::destroy ()
 {
 }
 
 TAO_Cached_Policy_Type
-TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const
+TAO_Buffering_Constraint_Policy::_tao_cached_type () const
 {
   return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT;
 }
diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.h b/TAO/tao/Messaging/Buffering_Constraint_Policy.h
index 63e207ab560..f65dc35667f 100644
--- a/TAO/tao/Messaging/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.h
@@ -54,22 +54,22 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of @c this.
-  virtual TAO_Buffering_Constraint_Policy *clone (void) const;
+  virtual TAO_Buffering_Constraint_Policy *clone () const;
 
   // = The TAO::Buffering_Constraint_Policy methods
 
-  virtual TAO::BufferingConstraint buffering_constraint (void);
+  virtual TAO::BufferingConstraint buffering_constraint ();
 
   void get_buffering_constraint (TAO::BufferingConstraint &) const;
 
-  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 (void) const;
+  virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
 private:
   /// The attribute
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index ee9cbf65964..d8ebe3a5c3d 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -32,13 +32,13 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
 }
 
 TimeBase::TimeT
-TAO_ConnectionTimeoutPolicy::relative_expiry (void)
+TAO_ConnectionTimeoutPolicy::relative_expiry ()
 {
   return this->relative_expiry_;
 }
 
 CORBA::PolicyType
-TAO_ConnectionTimeoutPolicy::policy_type (void)
+TAO_ConnectionTimeoutPolicy::policy_type ()
 {
   return TAO::CONNECTION_TIMEOUT_POLICY_TYPE;
 }
@@ -119,7 +119,7 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val)
 }
 
 TAO_ConnectionTimeoutPolicy *
-TAO_ConnectionTimeoutPolicy::clone (void) const
+TAO_ConnectionTimeoutPolicy::clone () const
 {
   TAO_ConnectionTimeoutPolicy *copy = 0;
   ACE_NEW_RETURN (copy,
@@ -129,7 +129,7 @@ TAO_ConnectionTimeoutPolicy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_ConnectionTimeoutPolicy::copy (void)
+TAO_ConnectionTimeoutPolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -143,12 +143,12 @@ TAO_ConnectionTimeoutPolicy::copy (void)
 }
 
 void
-TAO_ConnectionTimeoutPolicy::destroy (void)
+TAO_ConnectionTimeoutPolicy::destroy ()
 {
 }
 
 TAO_Cached_Policy_Type
-TAO_ConnectionTimeoutPolicy::_tao_cached_type (void) const
+TAO_ConnectionTimeoutPolicy::_tao_cached_type () const
 {
   return TAO_CACHED_POLICY_CONNECTION_TIMEOUT;
 }
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index 839d5024450..02a182a3a54 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -64,22 +64,22 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
-  virtual TAO_ConnectionTimeoutPolicy *clone (void) const;
+  virtual TAO_ConnectionTimeoutPolicy *clone () const;
 
   // = The TAO::ConnectionTinoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (void);
+  virtual TimeBase::TimeT relative_expiry ();
 
-  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 ();
 
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value);
 
   /// Return the cached policy type for this policy.
-  virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+  virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
 private:
   /// The attribute
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp
index d96e916f00c..12378b020b4 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.cpp
+++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp
@@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  ExceptionHolder::ExceptionHolder (void) :
+  ExceptionHolder::ExceptionHolder () :
     data_ (0),
     count_ (0),
     char_translator_ (0),
@@ -47,7 +47,7 @@ namespace TAO
     this->count_ = exceptions_count;
   }
 
-  void ExceptionHolder::raise_exception (void)
+  void ExceptionHolder::raise_exception ()
     {
       TAO_InputCDR _tao_in ((const char*) this->marshaled_exception ().get_buffer (),
                             this->marshaled_exception ().length (),
@@ -138,7 +138,7 @@ namespace TAO
     }
 
   CORBA::ValueBase*
-  ExceptionHolder::_copy_value (void)
+  ExceptionHolder::_copy_value ()
   {
     TAO::ExceptionHolder* ret_val = 0;
     ACE_NEW_THROW_EX (ret_val,
@@ -156,7 +156,7 @@ namespace TAO
   }
 
   CORBA::ValueBase *
-  ExceptionHolderFactory::create_for_unmarshal (void)
+  ExceptionHolderFactory::create_for_unmarshal ()
   {
     TAO::ExceptionHolder* ret_val = 0;
     ACE_NEW_THROW_EX (ret_val,
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h
index f60bc86a0b0..0a1bda88ebb 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.h
+++ b/TAO/tao/Messaging/ExceptionHolder_i.h
@@ -45,7 +45,7 @@ namespace TAO
       public virtual ::CORBA::DefaultValueRefCountBase
   {
   public:
-    ExceptionHolder (void);
+    ExceptionHolder ();
 
     ExceptionHolder (
       ::CORBA::Boolean is_system_exception,
@@ -59,16 +59,16 @@ namespace TAO
     void set_exception_data (::TAO::Exception_Data* data,
                              ::CORBA::ULong exceptions_count);
 
-    virtual void raise_exception (void);
+    virtual void raise_exception ();
 
     virtual void raise_exception_with_list (
         const ::Dynamic::ExceptionList & exc_list);
 
-    virtual CORBA::ValueBase* _copy_value (void);
+    virtual CORBA::ValueBase* _copy_value ();
 
   protected:
 
-    virtual ~ExceptionHolder (void);
+    virtual ~ExceptionHolder ();
 
   private:
     TAO::Exception_Data* data_;
@@ -88,7 +88,7 @@ namespace TAO
     public virtual CORBA::ValueFactoryBase
   {
   public:
-    virtual CORBA::ValueBase * create_for_unmarshal (void);
+    virtual CORBA::ValueBase * create_for_unmarshal ();
   };
 
 }
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index afc92538ba0..afa6ebef8a8 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -7,7 +7,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Messaging_Initializer::init (void)
+TAO_Messaging_Initializer::init ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Messaging_Loader);
 }
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index d9520e92332..7a3aa49b9a0 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -33,7 +33,7 @@ class TAO_Messaging_Export TAO_Messaging_Initializer
 {
 public:
   /// Used to force the initialisation of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static const int TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init ();
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index bd25ad2d9e2..4b17c72cfa3 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -8,12 +8,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Messaging_Loader::TAO_Messaging_Loader (void)
+TAO_Messaging_Loader::TAO_Messaging_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_Messaging_Loader::~TAO_Messaging_Loader (void)
+TAO_Messaging_Loader::~TAO_Messaging_Loader ()
 {
 }
 
diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h
index aa9b3247527..8229dd7a1c8 100644
--- a/TAO/tao/Messaging/Messaging_Loader.h
+++ b/TAO/tao/Messaging/Messaging_Loader.h
@@ -29,10 +29,10 @@ class TAO_Messaging_Export TAO_Messaging_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_Messaging_Loader (void);
+  TAO_Messaging_Loader ();
 
   /// Destructor.
-  virtual ~TAO_Messaging_Loader (void);
+  virtual ~TAO_Messaging_Loader ();
 
   /// Initialize the Messaging loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index a3aadf66749..6bb83e9eee6 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -34,13 +34,13 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
 }
 
 TimeBase::TimeT
-TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (void)
+TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ()
 {
   return this->relative_expiry_;
 }
 
 CORBA::PolicyType
-TAO_RelativeRoundtripTimeoutPolicy::policy_type (void)
+TAO_RelativeRoundtripTimeoutPolicy::policy_type ()
 {
   return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE;
 }
@@ -121,7 +121,7 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val)
 }
 
 TAO_RelativeRoundtripTimeoutPolicy *
-TAO_RelativeRoundtripTimeoutPolicy::clone (void) const
+TAO_RelativeRoundtripTimeoutPolicy::clone () const
 {
   TAO_RelativeRoundtripTimeoutPolicy *copy = 0;
   ACE_NEW_RETURN (copy,
@@ -131,7 +131,7 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy::copy (void)
+TAO_RelativeRoundtripTimeoutPolicy::copy ()
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -145,12 +145,12 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (void)
 }
 
 void
-TAO_RelativeRoundtripTimeoutPolicy::destroy (void)
+TAO_RelativeRoundtripTimeoutPolicy::destroy ()
 {
 }
 
 TAO_Cached_Policy_Type
-TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type (void) const
+TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type () const
 {
   return TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT;
 }
@@ -200,7 +200,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
 }
 
 CORBA::PolicyType
-TAO_Sync_Scope_Policy::policy_type (void)
+TAO_Sync_Scope_Policy::policy_type ()
 {
   return Messaging::SYNC_SCOPE_POLICY_TYPE;
 }
@@ -268,7 +268,7 @@ TAO_Sync_Scope_Policy::create (const CORBA::Any& val)
 }
 
 TAO_Sync_Scope_Policy *
-TAO_Sync_Scope_Policy::clone (void) const
+TAO_Sync_Scope_Policy::clone () const
 {
   TAO_Sync_Scope_Policy *copy = 0;
   ACE_NEW_RETURN (copy,
@@ -278,13 +278,13 @@ TAO_Sync_Scope_Policy::clone (void) const
 }
 
 Messaging::SyncScope
-TAO_Sync_Scope_Policy::synchronization (void)
+TAO_Sync_Scope_Policy::synchronization ()
 {
   return this->synchronization_;
 }
 
 CORBA::Policy_ptr
-TAO_Sync_Scope_Policy::copy (void)
+TAO_Sync_Scope_Policy::copy ()
 {
   TAO_Sync_Scope_Policy *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -295,11 +295,11 @@ TAO_Sync_Scope_Policy::copy (void)
 }
 
 void
-TAO_Sync_Scope_Policy::destroy (void)
+TAO_Sync_Scope_Policy::destroy ()
 {
 }
 TAO_Cached_Policy_Type
-TAO_Sync_Scope_Policy::_tao_cached_type (void) const
+TAO_Sync_Scope_Policy::_tao_cached_type () const
 {
   return TAO_CACHED_POLICY_SYNC_SCOPE;
 }
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index ba8ad68fcc5..27901cb7115 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -57,22 +57,22 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of @c this.
-  virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const;
+  virtual TAO_RelativeRoundtripTimeoutPolicy *clone () const;
 
   // = The Messaging::RelativeRoundtripTimeoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (void);
+  virtual TimeBase::TimeT relative_expiry ();
 
-  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 ();
 
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value);
 
   /// Return the cached policy type for this policy.
-  virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+  virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
 private:
   /// The attribute
@@ -117,22 +117,22 @@ public:
   static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
-  virtual TAO_Sync_Scope_Policy *clone (void) const;
+  virtual TAO_Sync_Scope_Policy *clone () const;
 
   // = The Messaging::SyncScopePolicy methods.
 
-  virtual Messaging::SyncScope synchronization (void);
+  virtual Messaging::SyncScope synchronization ();
 
   void get_synchronization (Messaging::SyncScope &synchronization) const;
 
-  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 (void) const;
+  virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 private:
 
   /// The attribute
diff --git a/TAO/tao/Monitor/Monitor_Impl.h b/TAO/tao/Monitor/Monitor_Impl.h
index 5984d73a56b..59c6bf39eba 100644
--- a/TAO/tao/Monitor/Monitor_Impl.h
+++ b/TAO/tao/Monitor/Monitor_Impl.h
@@ -48,7 +48,6 @@ public:
       const ::Monitor::ConstraintStructList & constraint);
 
 private:
-
   /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index e7d9022413a..c80043ad541 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport)
   : TAO_Transport_Mux_Strategy (transport)
-    , lock_ (0)
+    , lock_ (nullptr)
     , request_id_generator_ (0)
     , orb_core_ (transport->orb_core ())
     , dispatcher_table_ (this->orb_core_->client_factory ()->reply_dispatcher_table_size ())
@@ -18,7 +18,7 @@ TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport)
     this->orb_core_->client_factory ()->create_transport_mux_strategy_lock ();
 }
 
-TAO_Muxed_TMS::~TAO_Muxed_TMS (void)
+TAO_Muxed_TMS::~TAO_Muxed_TMS ()
 {
   delete this->lock_;
 }
@@ -26,7 +26,7 @@ TAO_Muxed_TMS::~TAO_Muxed_TMS (void)
 // Generate and return an unique request id for the current
 // invocation.
 CORBA::ULong
-TAO_Muxed_TMS::request_id (void)
+TAO_Muxed_TMS::request_id ()
 {
   // @@ What is a good error return value?
   ACE_GUARD_RETURN (ACE_Lock,
@@ -67,7 +67,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id,
                     *this->lock_,
                     -1);
 
-  if (rd == 0)
+  if (rd == nullptr)
     {
       if (TAO_debug_level > 0)
         {
@@ -106,7 +106,7 @@ TAO_Muxed_TMS::unbind_dispatcher (CORBA::ULong request_id)
 }
 
 bool
-TAO_Muxed_TMS::has_request (void)
+TAO_Muxed_TMS::has_request ()
 {
   ACE_GUARD_RETURN (ACE_Lock,
                     ace_mon,
@@ -120,7 +120,7 @@ int
 TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
 {
   int result = 0;
-  ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(0);
+  ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(nullptr);
 
   // Grab the reply dispatcher for this id.
   {
@@ -167,7 +167,7 @@ int
 TAO_Muxed_TMS::reply_timed_out (CORBA::ULong request_id)
 {
   int result = 0;
-  ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(0);
+  ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(nullptr);
 
   // Grab the reply dispatcher for this id.
   {
@@ -218,25 +218,25 @@ TAO_Muxed_TMS::reply_timed_out (CORBA::ULong request_id)
 
 
 bool
-TAO_Muxed_TMS::idle_after_send (void)
+TAO_Muxed_TMS::idle_after_send ()
 {
   // Irrespective of whether we are successful or not we need to
   // return true. If *this* class is not successful in idling the
   // transport no one can.
-  if (this->transport_ != 0)
+  if (this->transport_ != nullptr)
     (void) this->transport_->make_idle ();
 
   return true;
 }
 
 bool
-TAO_Muxed_TMS::idle_after_reply (void)
+TAO_Muxed_TMS::idle_after_reply ()
 {
   return false;
 }
 
 void
-TAO_Muxed_TMS::connection_closed (void)
+TAO_Muxed_TMS::connection_closed ()
 {
   ACE_GUARD (ACE_Lock,
              ace_mon,
@@ -251,7 +251,7 @@ TAO_Muxed_TMS::connection_closed (void)
 }
 
 int
-TAO_Muxed_TMS::clear_cache_i (void)
+TAO_Muxed_TMS::clear_cache_i ()
 {
   if (this->dispatcher_table_.current_size () == 0)
     return -1;
@@ -274,7 +274,7 @@ TAO_Muxed_TMS::clear_cache_i (void)
 
   for (size_t k = 0 ; k != sz ; ++k)
     {
-      ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(0);
+      ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(nullptr);
 
       if (ubs.pop (rd) == 0)
         {
diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h
index a680d25cc84..58bbe6fdbf3 100644
--- a/TAO/tao/Muxed_TMS.h
+++ b/TAO/tao/Muxed_TMS.h
@@ -46,17 +46,16 @@ class TAO_Reply_Dispatcher;
  */
 class TAO_Export TAO_Muxed_TMS : public TAO_Transport_Mux_Strategy
 {
-
 public:
   /// Constructor.
   TAO_Muxed_TMS (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Muxed_TMS (void);
+  virtual ~TAO_Muxed_TMS ();
 
   /// Generate and return an unique request id for the current
   /// invocation.
-  virtual CORBA::ULong request_id (void);
+  virtual CORBA::ULong request_id ();
 
   // = Please read the documentation in the TAO_Transport_Mux_Strategy
   //   class.
@@ -67,10 +66,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 ();
 
 private:
   void operator= (const TAO_Muxed_TMS &);
@@ -98,7 +97,7 @@ private:
   /// Table of <Request ID, Reply Dispatcher> pairs.
   REQUEST_DISPATCHER_TABLE dispatcher_table_;
 
-  int clear_cache_i (void);
+  int clear_cache_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp
index a1b542673cc..f4050918d63 100644
--- a/TAO/tao/NVList_Adapter.cpp
+++ b/TAO/tao/NVList_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_NVList_Adapter::~TAO_NVList_Adapter (void)
+TAO_NVList_Adapter::~TAO_NVList_Adapter ()
 {
 }
 
diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h
index 22d33393918..7b961a81f0e 100644
--- a/TAO/tao/NVList_Adapter.h
+++ b/TAO/tao/NVList_Adapter.h
@@ -40,7 +40,7 @@ namespace CORBA
 class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_NVList_Adapter (void);
+  virtual ~TAO_NVList_Adapter ();
 
   virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) = 0;
 
diff --git a/TAO/tao/Nested_Upcall_Guard.h b/TAO/tao/Nested_Upcall_Guard.h
index 60c95f9e8ca..3673bae0fde 100644
--- a/TAO/tao/Nested_Upcall_Guard.h
+++ b/TAO/tao/Nested_Upcall_Guard.h
@@ -84,9 +84,10 @@ namespace TAO
   private:
     Nested_Upcall_Guard (void);
 
-    /// Disallow copying and assignment.
-    Nested_Upcall_Guard (const Nested_Upcall_Guard&);
-    Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&);
+    Nested_Upcall_Guard (const Nested_Upcall_Guard&) = delete;
+    Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&) = delete;
+    Nested_Upcall_Guard (Nested_Upcall_Guard&&) = delete;
+    Nested_Upcall_Guard &operator= (Nested_Upcall_Guard&&) = delete;
 
   private:
     /// Pointer to the transport that we plan to use.
diff --git a/TAO/tao/Network_Priority_Protocols_Hooks.cpp b/TAO/tao/Network_Priority_Protocols_Hooks.cpp
index db6e3aaea66..8f7d55568c4 100644
--- a/TAO/tao/Network_Priority_Protocols_Hooks.cpp
+++ b/TAO/tao/Network_Priority_Protocols_Hooks.cpp
@@ -4,7 +4,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Network_Priority_Protocols_Hooks::
-~TAO_Network_Priority_Protocols_Hooks (void)
+~TAO_Network_Priority_Protocols_Hooks ()
 {
 }
 
diff --git a/TAO/tao/New_Leader_Generator.cpp b/TAO/tao/New_Leader_Generator.cpp
index e490ae08f73..17e0cb12f97 100644
--- a/TAO/tao/New_Leader_Generator.cpp
+++ b/TAO/tao/New_Leader_Generator.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_New_Leader_Generator::~TAO_New_Leader_Generator (void)
+TAO_New_Leader_Generator::~TAO_New_Leader_Generator ()
 {
 }
 
diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h
index 25c289aa65d..9560a347fa1 100644
--- a/TAO/tao/New_Leader_Generator.h
+++ b/TAO/tao/New_Leader_Generator.h
@@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_New_Leader_Generator
 {
 public:
-
   /// Destructor.
   virtual ~TAO_New_Leader_Generator (void);
 
diff --git a/TAO/tao/Null_Fragmentation_Strategy.cpp b/TAO/tao/Null_Fragmentation_Strategy.cpp
index d41d7f42d34..f04ae96cad2 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.cpp
+++ b/TAO/tao/Null_Fragmentation_Strategy.cpp
@@ -1,6 +1,6 @@
 #include "tao/Null_Fragmentation_Strategy.h"
 
-TAO_Null_Fragmentation_Strategy::~TAO_Null_Fragmentation_Strategy (void)
+TAO_Null_Fragmentation_Strategy::~TAO_Null_Fragmentation_Strategy ()
 {
 }
 
diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h
index 528b1a28714..6efc37b0450 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.h
+++ b/TAO/tao/Null_Fragmentation_Strategy.h
@@ -40,17 +40,15 @@ class TAO_Null_Fragmentation_Strategy
   : public TAO_GIOP_Fragmentation_Strategy
 {
 public:
-
   TAO_Null_Fragmentation_Strategy (void) {}
   virtual ~TAO_Null_Fragmentation_Strategy (void);
   virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong);
 
 private:
-
-  // Disallow copying and assignment.
-  TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &);
-  void operator= (TAO_Null_Fragmentation_Strategy const &);
-
+  TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &) = delete;
+  void operator= (TAO_Null_Fragmentation_Strategy const &) = delete;
+  TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy &&) = delete;
+  void operator= (TAO_Null_Fragmentation_Strategy &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 9b930da8c0d..70f9681685e 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -45,14 +45,14 @@ static const char ior_prefix[] = "IOR:";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::ORB::InvalidName::InvalidName (void)
+CORBA::ORB::InvalidName::InvalidName ()
   : CORBA::UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0",
                           "InvalidName")
 {
 }
 
 // Destructor - all members are of self managing types.
-CORBA::ORB::InvalidName::~InvalidName (void)
+CORBA::ORB::InvalidName::~InvalidName ()
 {
 }
 
@@ -77,25 +77,25 @@ CORBA::ORB::InvalidName::_downcast (CORBA::Exception *exc)
   return dynamic_cast<InvalidName *> (exc);
 }
 
-CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void)
+CORBA::Exception *CORBA::ORB::InvalidName::_alloc ()
 {
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::ORB::InvalidName, 0);
+  CORBA::Exception *retval = nullptr;
+  ACE_NEW_RETURN (retval, ::CORBA::ORB::InvalidName, nullptr);
   return retval;
 }
 
 CORBA::Exception *
-CORBA::ORB::InvalidName::_tao_duplicate (void) const
+CORBA::ORB::InvalidName::_tao_duplicate () const
 {
-  CORBA::Exception *result = 0;
+  CORBA::Exception *result = nullptr;
   ACE_NEW_RETURN (
       result,
       ::CORBA::ORB::InvalidName (*this),
-      0);
+      nullptr);
   return result;
 }
 
-void CORBA::ORB::InvalidName::_raise (void) const
+void CORBA::ORB::InvalidName::_raise () const
 {
   throw *this;
 }
@@ -116,11 +116,11 @@ CORBA::ORB::ORB (TAO_ORB_Core *orb_core)
   : refcount_ (1)
   , orb_core_ (orb_core)
   , use_omg_ior_format_ (1)
-  , timeout_ (0)
+  , timeout_ (nullptr)
 {
 }
 
-CORBA::ORB::~ORB (void)
+CORBA::ORB::~ORB ()
 {
   // This destructor is only invoked when the last ORB reference (not
   // instance) is being destroyed.
@@ -138,9 +138,9 @@ CORBA::ORB::shutdown (CORBA::Boolean wait_for_completion)
 }
 
 void
-CORBA::ORB::destroy (void)
+CORBA::ORB::destroy ()
 {
-  if (this->orb_core () == 0)
+  if (this->orb_core () == nullptr)
     {
       // If the ORB_Core pointer is zero, assume that the ORB_Core has
       // been destroyed.
@@ -163,13 +163,13 @@ CORBA::ORB::destroy (void)
 
   // Now invalidate the pointer to the ORB_Core that created this
   // ORB.
-  this->orb_core_ = 0;
+  this->orb_core_ = nullptr;
 }
 
 void
-CORBA::ORB::run (void)
+CORBA::ORB::run ()
 {
-  this->run (0);
+  this->run (nullptr);
 }
 
 void
@@ -187,9 +187,9 @@ CORBA::ORB::run (ACE_Time_Value *tv)
 }
 
 void
-CORBA::ORB::perform_work (void)
+CORBA::ORB::perform_work ()
 {
-  this->perform_work (0);
+  this->perform_work (nullptr);
 }
 
 void
@@ -224,7 +224,7 @@ CORBA::ORB::work_pending (ACE_Time_Value &tv)
 }
 
 CORBA::Boolean
-CORBA::ORB::work_pending (void)
+CORBA::ORB::work_pending ()
 {
   // This method should not be called if the ORB has been shutdown.
   this->check_shutdown ();
@@ -247,7 +247,7 @@ CORBA::ORB::create_list (CORBA::Long count, CORBA::NVList_ptr &new_list)
   TAO_NVList_Adapter *adapter =
     ACE_Dynamic_Service<TAO_NVList_Adapter>::instance ("TAO_NVList_Adapter");
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       TAOLIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) %p\n"),
@@ -277,7 +277,7 @@ CORBA::ORB::create_operation_list (CORBA::OperationDef_ptr opDef,
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTF_REPOS ();
     }
@@ -305,7 +305,7 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv)
     ACE_Dynamic_Service<TAO_NVList_Adapter>::instance (
         "TAO_NVList_Adapter");
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       TAOLIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) %p\n"),
@@ -384,7 +384,7 @@ CORBA::ORB::get_next_response (CORBA::Request_ptr &)
 }
 
 CORBA::Boolean
-CORBA::ORB::poll_next_response (void)
+CORBA::ORB::poll_next_response ()
 {
   throw ::CORBA::NO_IMPLEMENT (
     CORBA::SystemException::_tao_minor_code (
@@ -405,7 +405,7 @@ CORBA::ORB::create_struct_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -424,7 +424,7 @@ CORBA::ORB::create_union_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -445,7 +445,7 @@ CORBA::ORB::create_enum_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -463,7 +463,7 @@ CORBA::ORB::create_alias_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -481,7 +481,7 @@ CORBA::ORB::create_exception_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -498,7 +498,7 @@ CORBA::ORB::create_interface_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -514,7 +514,7 @@ CORBA::ORB::create_string_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -530,7 +530,7 @@ CORBA::ORB::create_wstring_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -547,7 +547,7 @@ CORBA::ORB::create_fixed_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -564,7 +564,7 @@ CORBA::ORB::create_sequence_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -581,7 +581,7 @@ CORBA::ORB::create_array_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -601,7 +601,7 @@ CORBA::ORB::create_value_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -622,7 +622,7 @@ CORBA::ORB::create_value_box_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -637,7 +637,7 @@ CORBA::ORB::create_native_tc (const char *id, const char *name)
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -652,7 +652,7 @@ CORBA::ORB::create_recursive_tc (const char *id)
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -667,7 +667,7 @@ CORBA::ORB::create_abstract_interface_tc (const char *id, const char *name)
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -682,7 +682,7 @@ CORBA::ORB::create_local_interface_tc (const char *id, const char *name)
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -697,7 +697,7 @@ CORBA::ORB::create_component_tc (const char *id, const char *name)
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -712,7 +712,7 @@ CORBA::ORB::create_home_tc (const char *id, const char *name)
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -732,7 +732,7 @@ CORBA::ORB::create_event_tc (
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
         TAO_ORB_Core::typecodefactory_adapter_name ());
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -749,13 +749,13 @@ CORBA::ORB::create_event_tc (
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 CORBA::Object_ptr
-CORBA::ORB::resolve_policy_manager (void)
+CORBA::ORB::resolve_policy_manager ()
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
   TAO_Policy_Manager *policy_manager = this->orb_core_->policy_manager ();
 
-  if (policy_manager == 0)
+  if (policy_manager == nullptr)
     {
       return CORBA::Object::_nil ();
     }
@@ -770,7 +770,7 @@ CORBA::ORB::resolve_policy_manager (void)
 }
 
 CORBA::Object_ptr
-CORBA::ORB::resolve_policy_current (void)
+CORBA::ORB::resolve_policy_current ()
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -827,7 +827,7 @@ CORBA::ORB::resolve_service (TAO::MCAST_SERVICEID mcast_service_id)
           char const * const port_number =
             ACE_OS::getenv (env_service_port[mcast_service_id]);
 
-          if (port_number != 0)
+          if (port_number != nullptr)
             port = static_cast<unsigned short> (ACE_OS::atoi (port_number));
           else
             port = default_service_port[mcast_service_id];
@@ -1005,7 +1005,7 @@ CORBA::ORB::resolve_initial_references (const char *name,
 void
 CORBA::ORB::register_initial_reference (const char * id, CORBA::Object_ptr obj)
 {
-  if (id == 0 || ACE_OS::strlen (id) == 0)
+  if (id == nullptr || ACE_OS::strlen (id) == 0)
     throw ::CORBA::ORB::InvalidName ();
 
   if (CORBA::is_nil (obj))
@@ -1020,7 +1020,7 @@ CORBA::ORB::register_initial_reference (const char * id, CORBA::Object_ptr obj)
 CORBA::Object_ptr
 CORBA::ORB::unregister_initial_reference (const char * id)
 {
-  if (id == 0 || ACE_OS::strlen (id) == 0)
+  if (id == nullptr || ACE_OS::strlen (id) == 0)
     throw ::CORBA::ORB::InvalidName ();
 
   TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
@@ -1034,7 +1034,7 @@ CORBA::ORB::unregister_initial_reference (const char * id)
 #endif
 
 CORBA::ORB::ObjectIdList_ptr
-CORBA::ORB::list_initial_services (void)
+CORBA::ORB::list_initial_services ()
 {
   this->check_shutdown ();
 
@@ -1042,9 +1042,9 @@ CORBA::ORB::list_initial_services (void)
 }
 
 void
-CORBA::ORB::check_shutdown (void)
+CORBA::ORB::check_shutdown ()
 {
-  if (this->orb_core () != 0)
+  if (this->orb_core () != nullptr)
     {
       this->orb_core ()->check_shutdown ();
     }
@@ -1134,7 +1134,7 @@ namespace TAO
       // big as the default repository
       if  (ACE_OS::strcasecmp (arg, ACE_TEXT("LOCAL")) == 0)
         {
-          ACE_Service_Gestalt* gestalt = 0;
+          ACE_Service_Gestalt* gestalt = nullptr;
           ACE_NEW_THROW_EX (gestalt,
                             ACE_Service_Gestalt
                             (ACE_Service_Gestalt::MAX_SERVICES / 4, true),
@@ -1166,7 +1166,7 @@ namespace TAO
           // Get ORB Core
           TAO_ORB_Core_Auto_Ptr oc (TAO::ORB_Table::instance ()->find (
             ACE_TEXT_ALWAYS_CHAR(orbid.c_str ())));
-          if (oc.get () != 0)
+          if (oc.get () != nullptr)
               return oc->configuration ();
 
           if (TAO_debug_level > 0)
@@ -1237,7 +1237,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid)
                                      : 0);
 
   if ((argc == 0 && argv0_len != 0)
-      || (argc != 0  && (argv == 0 || argv[0] == 0)))
+      || (argc != 0  && (argv == nullptr || argv[0] == nullptr)))
     {
       throw ::CORBA::BAD_PARAM (
         CORBA::SystemException::_tao_minor_code (
@@ -1273,7 +1273,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid)
     ACE_TEXT_ALWAYS_CHAR(orbid_string.c_str ())));
 
     // The ORB was already initialized.  Just return that one.
-  if (oc.get () != 0)
+  if (oc.get () != nullptr)
     {
       return CORBA::ORB::_duplicate (oc->orb ());
     }
@@ -1288,7 +1288,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid)
 
   // An ORB corresponding to the desired ORBid doesn't exist so create
   // a new one.
-  TAO_ORB_Core * tmp = 0;
+  TAO_ORB_Core * tmp = nullptr;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ORB_Core (ACE_TEXT_ALWAYS_CHAR(orbid_string.c_str ()),
                       gestalt),
@@ -1343,7 +1343,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid)
   PortableInterceptor::SlotId slotid = 0;
   size_t pre_init_count = 0;
 
-  if (orbinitializer_registry != 0)
+  if (orbinitializer_registry != nullptr)
     {
       pre_init_count =
         orbinitializer_registry->pre_init (oc.get (),
@@ -1356,7 +1356,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid)
   result = oc->init (command_line.get_argc(),
                      command_line.get_ASCII_argv());
 
-  if (orbinitializer_registry != 0)
+  if (orbinitializer_registry != nullptr)
     {
       orbinitializer_registry->post_init (pre_init_count,
                                           oc.get (),
@@ -1400,7 +1400,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
       char* user_string =
         obj->convert_to_ior (this->use_omg_ior_format_, ior_prefix);
 
-      if (user_string != 0)
+      if (user_string != nullptr)
         return user_string;
     }
 
@@ -1448,20 +1448,20 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
       // return that string.
       size_t const total_len = cdr.total_length ();
 
-      char *cp = 0;
+      char *cp = nullptr;
       ACE_ALLOCATOR_RETURN (cp,
                             CORBA::string_alloc (
                               sizeof ior_prefix
                               + 2
                               * static_cast<CORBA::ULong> (total_len)),
-                            0);
+                            nullptr);
 
       CORBA::String_var string = cp;
 
       ACE_OS::strcpy (cp, ior_prefix);
       cp += sizeof (ior_prefix) - 1;
 
-      for (const ACE_Message_Block *i = cdr.begin (); i != 0; i = i->cont ())
+      for (const ACE_Message_Block *i = cdr.begin (); i != nullptr; i = i->cont ())
         {
           const char *bytes = i->rd_ptr ();
           size_t len = i->length ();
@@ -1483,7 +1483,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
       // It is perfectly valid to marshal a nil object reference.
       // However, it is not possible to convert a nil object reference
       // to a URL IOR, so throw an exception.
-      if (CORBA::is_nil (obj) || obj->_stubobj () == 0)
+      if (CORBA::is_nil (obj) || obj->_stubobj () == nullptr)
         {
           if (TAO_debug_level > 0)
             TAOLIB_ERROR ((LM_ERROR,
@@ -1530,7 +1530,7 @@ CORBA::ORB::string_to_object (const char *str)
   this->check_shutdown ();
 
   // Check for NULL pointer
-  if (str == 0)
+  if (str == nullptr)
     throw ::CORBA::INV_OBJREF (
       CORBA::SystemException::_tao_minor_code (
         0,
@@ -1540,7 +1540,7 @@ CORBA::ORB::string_to_object (const char *str)
   TAO_IOR_Parser *ior_parser =
     this->orb_core_->parser_registry ()->match_parser (str);
 
-  if (ior_parser != 0)
+  if (ior_parser != nullptr)
     {
       return ior_parser->parse_string (str, this);
     }
@@ -1562,7 +1562,7 @@ CORBA::ORB::string_to_object (const wchar_t *str)
 // ****************************************************************
 
 char *
-CORBA::ORB::id (void)
+CORBA::ORB::id ()
 {
   return CORBA::string_dup (this->orb_core_->orbid ());
 }
@@ -1578,7 +1578,7 @@ CORBA::ORB::create_policy (CORBA::PolicyType type, const CORBA::Any& val)
   TAO::PolicyFactory_Registry_Adapter *adapter =
     this->orb_core_->policy_factory_registry ();
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -1597,7 +1597,7 @@ CORBA::ORB::_create_policy (CORBA::PolicyType type)
   TAO::PolicyFactory_Registry_Adapter *adapter =
     this->orb_core_->policy_factory_registry ();
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTERNAL ();
     }
@@ -1689,7 +1689,7 @@ CORBA::ORB::url_ior_string_to_object (const char* str)
     }
 
   // Now make the TAO_Stub.
-  TAO_Stub *data = this->orb_core_->create_stub ((char *) 0, mprofile);
+  TAO_Stub *data = this->orb_core_->create_stub ((char *) nullptr, mprofile);
 
   TAO_Stub_Auto_Ptr safe_objdata (data);
 
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 7878dbbb274..81e5633180d 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -35,11 +35,7 @@
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -171,18 +167,18 @@ namespace CORBA
     class TAO_Export InvalidName : public CORBA::UserException
     {
     public:
-      InvalidName (void);
+      InvalidName ();
       InvalidName (const InvalidName &);
-      ~InvalidName (void);
+      ~InvalidName ();
 
       InvalidName &operator= (const InvalidName &);
 
       static InvalidName *_downcast (CORBA::Exception *);
-      static CORBA::Exception *_alloc (void);
+      static CORBA::Exception *_alloc ();
 
-      virtual CORBA::Exception *_tao_duplicate (void) const;
+      virtual CORBA::Exception *_tao_duplicate () const;
 
-      virtual void _raise (void) const;
+      virtual void _raise () const;
 
       virtual void _tao_encode (TAO_OutputCDR &) const;
 
@@ -209,10 +205,10 @@ namespace CORBA
 
     /// Returns a pointer to a nil ORB, i.e., an non-existent ORB.  This
     /// can be used for initialization or in comparisons.
-    static CORBA::ORB_ptr _nil (void);
+    static CORBA::ORB_ptr _nil ();
 
     /// Return this ORB's ORBid.
-    char * id (void);
+    char * id ();
 
     /**
      * Turn a string-ified object reference back into an object
@@ -284,7 +280,7 @@ namespace CORBA
 
     void get_next_response (CORBA::Request_ptr &req);
 
-    CORBA::Boolean poll_next_response (void);
+    CORBA::Boolean poll_next_response ();
 
     /// The ORB TypeCode creation functions.
 
@@ -381,7 +377,7 @@ namespace CORBA
      * If an error occurs during initialization or at runtime, a CORBA
      * system exception will be thrown.
      */
-    void run (void);
+    void run ();
 
     /**
      * Instructs the ORB to initialize itself and run its event loop in
@@ -417,7 +413,7 @@ namespace CORBA
 
     /// Returns an indication of whether the ORB needs to perform some
     /// work.
-    CORBA::Boolean work_pending (void);
+    CORBA::Boolean work_pending ();
 
     /// Returns an indication of whether the ORB needs to perform some
     /// work but will look for work pending for no more than the
@@ -434,7 +430,7 @@ namespace CORBA
      * is not present; this behavior can be modified by passing an
      * appropriate @c ACE_Time_Value as described in run().
      **/
-    void perform_work (void);
+    void perform_work ();
     void perform_work (ACE_Time_Value &tv);
     void perform_work (ACE_Time_Value *tv);
 
@@ -460,7 +456,7 @@ namespace CORBA
      * the ORB in one thread and trying to service a request in another
      * thread are not well defined. TAO does not support such cases.
      */
-    void destroy (void);
+    void destroy ();
 
     /**
      * This method acts as a mini-bootstrapping Naming Service, which is
@@ -492,7 +488,7 @@ namespace CORBA
 
     /// Returns a sequence of ObjectIds that lists which objects have
     /// references available via the initial references mechanism.
-    CORBA::ORB::ObjectIdList_ptr list_initial_services (void);
+    CORBA::ORB::ObjectIdList_ptr list_initial_services ();
 
 #if !defined(CORBA_E_MICRO)
     CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
@@ -510,18 +506,18 @@ namespace CORBA
 #endif
 
     /// Reference counting...
-    unsigned long _incr_refcount (void);
-    unsigned long _decr_refcount (void);
-    unsigned long _refcount (void) const;
+    unsigned long _incr_refcount ();
+    unsigned long _decr_refcount ();
+    unsigned long _refcount () const;
 
     /// Set the IOR flag.
     void _use_omg_ior_format (CORBA::Boolean ior);
 
     /// Get the IOR flag.
-    CORBA::Boolean _use_omg_ior_format (void);
+    CORBA::Boolean _use_omg_ior_format ();
 
     /// Get the ORB core.
-    TAO_ORB_Core *orb_core (void) const;
+    TAO_ORB_Core *orb_core () const;
 
     /// Factory method that creates an ORB.
     static CORBA::ORB_ptr _tao_make_ORB (TAO_ORB_Core * orb_core);
@@ -532,7 +528,7 @@ namespace CORBA
     typedef ORB_out _out_type;
 
     /// Get the Timeout value
-    ACE_Time_Value *get_timeout (void);
+    ACE_Time_Value *get_timeout ();
 
   protected:
     // We must be created via the @c CORBA::ORB_init() function.
@@ -543,13 +539,13 @@ namespace CORBA
      * Protected destructor to enforce proper memory management
      * through the reference counting mechanism.
      */
-    ~ORB (void);
+    ~ORB ();
 
     /// Resolve the Policy Manager for this ORB.
-    CORBA::Object_ptr resolve_policy_manager (void);
+    CORBA::Object_ptr resolve_policy_manager ();
 
     /// Resolve the Policy Current for this thread.
-    CORBA::Object_ptr resolve_policy_current (void);
+    CORBA::Object_ptr resolve_policy_current ();
 
   private:
     /// Resolve the given service based on the service ID.
@@ -568,7 +564,7 @@ namespace CORBA
 
     /// Check if ORB has shutdown.  If it has, throw the appropriate
     /// exception.
-    void check_shutdown (void);
+    void check_shutdown ();
 
     /// Set the timeout value
     void set_timeout (ACE_Time_Value * timeout);
@@ -576,11 +572,7 @@ namespace CORBA
   private:
     /// Maintains a reference count of number of instantiations of the
     /// ORB.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
     /// The ORB_Core that created us....
     TAO_ORB_Core * orb_core_;
@@ -594,7 +586,6 @@ namespace CORBA
 
     /// Timeout value
     ACE_Time_Value * timeout_;
-
   };
 }  // End namespace CORBA
 
diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl
index b46a2f83819..1043a54de32 100644
--- a/TAO/tao/ORB.inl
+++ b/TAO/tao/ORB.inl
@@ -26,11 +26,7 @@ CORBA::ORB::_incr_refcount (void)
 ACE_INLINE unsigned long
 CORBA::ORB::_refcount (void) const
 {
-#if defined (ACE_HAS_CPP11)
   return this->refcount_;
-#else
-  return this->refcount_.value ();
-#endif /* ACE_HAS_CPP11 */
 }
 
 ACE_INLINE unsigned long
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 309110a79cc..9b74ab3f3a7 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -42,7 +42,7 @@ namespace PortableInterceptor
       ("ORBInitializer_Registry", true); // only look in the local repo
 
 #if !defined (TAO_AS_STATIC_LIBS)
-    if (orbinitializer_registry_ == 0)
+    if (orbinitializer_registry_ == nullptr)
       {
         ACE_Service_Config::process_directive (
           ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("ORBInitializer_Registry",
@@ -56,7 +56,7 @@ namespace PortableInterceptor
       }
 #endif /* !TAO_AS_STATIC_LIBS */
 
-    if (orbinitializer_registry_ != 0)
+    if (orbinitializer_registry_ != nullptr)
       {
         orbinitializer_registry_->register_orb_initializer (init);
       }
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.cpp b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
index 874bca2e5fc..aac674bc9d7 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
@@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  ORBInitializer_Registry_Adapter::~ORBInitializer_Registry_Adapter (void)
+  ORBInitializer_Registry_Adapter::~ORBInitializer_Registry_Adapter ()
   {
   }
 }
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h
index 69b2f23f059..7c973c2b44f 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.h
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.h
@@ -46,7 +46,7 @@ namespace TAO
     : public ACE_Service_Object
   {
     public:
-      virtual ~ORBInitializer_Registry_Adapter (void);
+      virtual ~ORBInitializer_Registry_Adapter ();
 
       /// Register an ORBInitializer with the underlying ORBInitializer
       /// array.
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index e91407c0d79..cb2d45bff86 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -91,7 +91,7 @@ ACE_FACTORY_DEFINE (TAO, TAO_ORB_Core_Static_Resources)
 // ****************************************************************
 
 CORBA::Environment&
-TAO_default_environment (void)
+TAO_default_environment ()
 {
   return *TAO_TSS_Resources::instance ()->default_environment_;
 }
@@ -111,14 +111,14 @@ TAO_ORB_Core_Static_Resources::initialization_reference_ =
   TAO_ORB_Core_Static_Resources::instance ();
 
 TAO_ORB_Core_Static_Resources*
-TAO_ORB_Core_Static_Resources::instance (void)
+TAO_ORB_Core_Static_Resources::instance ()
 {
   ACE_Service_Gestalt *current = ACE_Service_Config::current();
   TAO_ORB_Core_Static_Resources* tocsr =
     ACE_Dynamic_Service<TAO_ORB_Core_Static_Resources>::instance
     (current, "TAO_ORB_Core_Static_Resources", true);
 
-  if (tocsr == 0)
+  if (tocsr == nullptr)
     {
       // This new is never freed on purpose.  The data specified by
       // it needs to be around for the last shared library that references
@@ -136,7 +136,7 @@ TAO_ORB_Core_Static_Resources::instance (void)
             ACE_Dynamic_Service<TAO_ORB_Core_Static_Resources>::instance
             (global,"TAO_ORB_Core_Static_Resources");
 
-          if (global_tocsr != 0)
+          if (global_tocsr != nullptr)
             *tocsr = *global_tocsr;
         }
     }
@@ -144,17 +144,17 @@ TAO_ORB_Core_Static_Resources::instance (void)
   return tocsr;
 }
 
-TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
+TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources ()
   : network_priority_protocols_hooks_name_ (
       "Network_Priority_Protocols_Hooks"),
-    connection_timeout_hook_ (0),
+    connection_timeout_hook_ (nullptr),
     resource_factory_name_ ("Resource_Factory"),
     dynamic_adapter_name_ ("Dynamic_Adapter"),
     ifr_client_adapter_name_ ("IFR_Client_Adapter"),
     typecodefactory_adapter_name_ ("TypeCodeFactory_Adapter"),
     iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"),
     valuetype_adapter_factory_name_ ("Valuetype_Adapter_Factory"),
-    alt_connection_timeout_hook_ (0)
+    alt_connection_timeout_hook_ (nullptr)
 {
 }
 
@@ -180,18 +180,18 @@ TAO_ORB_Core_Static_Resources::operator=(const TAO_ORB_Core_Static_Resources& ot
 
 TAO_ORB_Core::TAO_ORB_Core (const char *orbid,
                             ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> gestalt)
-  : protocols_hooks_ (0),
-    network_priority_protocols_hooks_ (0),
+  : protocols_hooks_ (nullptr),
+    network_priority_protocols_hooks_ (nullptr),
 #if TAO_USE_LOCAL_MEMORY_POOL == 1
     use_local_memory_pool_ (true),
 #else
     use_local_memory_pool_ (false),
 #endif
     lock_ (),
-    thread_lane_resources_manager_ (0),
-    collocation_resolver_ (0),
-    stub_factory_ (0),
-    protocol_factories_ (0),
+    thread_lane_resources_manager_ (nullptr),
+    collocation_resolver_ (nullptr),
+    stub_factory_ (nullptr),
+    protocol_factories_ (nullptr),
     implrepo_service_ (CORBA::Object::_nil ()),
     use_implrepo_ (0),
     imr_endpoints_in_ior_ (1),
@@ -210,9 +210,9 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid,
     object_ref_table_ (),
     object_key_table_ (),
     orbid_ (ACE_OS::strdup (orbid ? orbid : "")),
-    resource_factory_ (0),
-    client_factory_ (0),
-    server_factory_ (0),
+    resource_factory_ (nullptr),
+    client_factory_ (nullptr),
+    server_factory_ (nullptr),
     ft_send_extended_sc_ (false),
     opt_for_collocation_ (true),
     use_global_collocation_ (true),
@@ -220,15 +220,15 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid,
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-    policy_manager_ (0),
-    default_policies_ (0),
-    policy_current_ (0),
+    policy_manager_ (nullptr),
+    default_policies_ (nullptr),
+    policy_current_ (nullptr),
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
     poa_current_ (),
     adapter_registry_ (this),
-    poa_adapter_ (0),
+    poa_adapter_ (nullptr),
     tm_ (),
     tss_cleanup_funcs_ (),
     tss_resources_ (),
@@ -239,33 +239,33 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid,
                            // can only be initialized once.
     thread_per_connection_use_timeout_ (1),
     open_lock_ (),
-    endpoint_selector_factory_ (0),
+    endpoint_selector_factory_ (nullptr),
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-    eager_transport_queueing_strategy_ (0),
-    delayed_transport_queueing_strategy_ (0),
-    flush_transport_queueing_strategy_ (0),
+    eager_transport_queueing_strategy_ (nullptr),
+    delayed_transport_queueing_strategy_ (nullptr),
+    flush_transport_queueing_strategy_ (nullptr),
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
     refcount_ (1),
-    policy_factory_registry_ (0),
-    orbinitializer_registry_ (0),
+    policy_factory_registry_ (nullptr),
+    orbinitializer_registry_ (nullptr),
 #if (TAO_HAS_INTERCEPTORS == 1)
     pi_current_ (CORBA::Object::_nil ()),
-    client_request_interceptor_adapter_ (0),
-    server_request_interceptor_adapter_ (0),
+    client_request_interceptor_adapter_ (nullptr),
+    server_request_interceptor_adapter_ (nullptr),
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-    ior_interceptor_adapter_ (0),
-    valuetype_adapter_ (0),
+    ior_interceptor_adapter_ (nullptr),
+    valuetype_adapter_ (nullptr),
     parser_registry_ (),
-    bidir_adapter_ (0),
+    bidir_adapter_ (nullptr),
     bidir_giop_policy_ (0),
-    ziop_adapter_ (0),
+    ziop_adapter_ (nullptr),
     ziop_enabled_ (false),
-    flushing_strategy_ (0),
-    codeset_manager_ (0),
+    flushing_strategy_ (nullptr),
+    codeset_manager_ (nullptr),
     config_ (gestalt),
-    sync_scope_hook_ (0),
+    sync_scope_hook_ (nullptr),
     default_sync_scope_ (Messaging::SYNC_WITH_TRANSPORT),
-    timeout_hook_ (0)
+    timeout_hook_ (nullptr)
 {
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
@@ -294,7 +294,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid,
   this->set_sync_scope_hook (TAO_ORB_Core::default_sync_scope_hook);
 }
 
-TAO_ORB_Core::~TAO_ORB_Core (void)
+TAO_ORB_Core::~TAO_ORB_Core ()
 {
   delete this->thread_lane_resources_manager_;
 
@@ -323,12 +323,12 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
   delete this->policy_factory_registry_;
 
   // Don't delete, is a process wide singleton shared by all orbs
-  orbinitializer_registry_ = 0;
+  orbinitializer_registry_ = nullptr;
 
   ::CORBA::release (this->orb_);
 
   delete this->codeset_manager_;
-  this->codeset_manager_ = 0;
+  this->codeset_manager_ = nullptr;
 
   // This will destroy the service repository for this core
   (void) TAO::ORB::close_services (this->config_);
@@ -434,19 +434,19 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
   // the "-ORBUseIMR" command line argument.
   //
   char* const use_IMR_env_var_value = ACE_OS::getenv  ("TAO_USE_IMR") ;
-  if  (use_IMR_env_var_value != 0)
+  if  (use_IMR_env_var_value != nullptr)
     {
       this->use_implrepo_ = ACE_OS::atoi  (use_IMR_env_var_value) ;
     }
 
   while (arg_shifter.is_anything_left ())
     {
-      const ACE_TCHAR *current_arg = 0;
+      const ACE_TCHAR *current_arg = nullptr;
 
       ////////////////////////////////////////////////////////////////
       // begin with the 'parameterless' flags                       //
       ////////////////////////////////////////////////////////////////
-      if (0 != (current_arg = arg_shifter.get_the_parameter
+      if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDottedDecimalAddresses"))))
         {
           // Use dotted decimal addresses
@@ -456,7 +456,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNoServerSideNameLookups"))))
         {
           // Don't look up the host name for incoming connections
@@ -465,7 +465,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNameServicePort"))))
         {
           // Specify the port number for the NameService.
@@ -475,7 +475,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBMulticastDiscoveryEndpoint"))))
         {
           // Specify mcast address:port@network_interface for the
@@ -488,7 +488,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNodelay"))))
         {
           // Use TCP_NODELAY or not.
@@ -497,7 +497,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBKeepalive"))))
         {
           // Use SO_KEEPALIVE or not.
@@ -506,7 +506,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDontRoute"))))
         {
           // Use SO_DONTROUTE or not.
@@ -515,7 +515,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBIPHopLimit"))))
         {
           // Number of IP hops.
@@ -524,7 +524,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBIPMulticastLoop"))))
         {
           // Use IP_MULTICAST_LOOP or not.
@@ -533,7 +533,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBTradingServicePort"))))
         {
           // Specify the port number for the TradingService.
@@ -542,7 +542,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBImplRepoServicePort"))))
         {
           // Specify the multicast port number for the Implementation
@@ -551,7 +551,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBRcvSock"))))
         {
           // @@ All protocol implementation may not use sockets, so
@@ -564,7 +564,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBSndSock"))))
         {
           // @@ All protocol implementation may not use sockets, so
@@ -576,7 +576,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBObjRefStyle"))))
         {
           // Specifies the style of printed objrefs: URL or IOR
@@ -606,7 +606,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCollocationStrategy"))))
         {
           // Specify which collocation policy we want to use.
@@ -626,7 +626,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCollocation"))))
         {
           // Specify whether we want to optimize against collocation
@@ -658,21 +658,21 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                      (ACE_TEXT("-ORBIIOPClientPortBase"))))
         {
           this->orb_params ()->iiop_client_port_base (ACE_OS::atoi (current_arg));
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                      (ACE_TEXT("-ORBIIOPClientPortSpan"))))
         {
           this->orb_params ()->iiop_client_port_span (ACE_OS::atoi (current_arg));
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBPreferredInterfaces"))) ||
-               0 != (current_arg = arg_shifter.get_the_parameter
+               nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBPreferredInterface"))) )
         {
           if (this->orb_params ()->preferred_interfaces (
@@ -685,9 +685,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBEnforcePreferredInterfaces"))) ||
-               0 != (current_arg = arg_shifter.get_the_parameter
+               nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBEnforcePreferredInterface"))) )
         {
           this->orb_params ()->enforce_pref_interfaces (
@@ -698,7 +698,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
       else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBPreferIPV6Interfaces"))))
         {
-          int prefer_ipv6_interfaces = ACE_OS::atoi (current_arg);
+          int const prefer_ipv6_interfaces = ACE_OS::atoi (current_arg);
           if (prefer_ipv6_interfaces)
             this->orb_params ()->prefer_ipv6_interfaces (true);
           else
@@ -709,7 +709,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
       else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBConnectIPV6Only"))))
         {
-          int connect_ipv6_only = ACE_OS::atoi (current_arg);
+          int const connect_ipv6_only = ACE_OS::atoi (current_arg);
           if (connect_ipv6_only)
             this->orb_params ()->connect_ipv6_only (true);
           else
@@ -720,7 +720,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
       else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBUseIPV6LinkLocal"))))
         {
-          int use_ipv6_link_local = ACE_OS::atoi (current_arg);
+          int const use_ipv6_link_local = ACE_OS::atoi (current_arg);
           if (use_ipv6_link_local)
             this->orb_params ()->use_ipv6_link_local (true);
           else
@@ -729,7 +729,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
           arg_shifter.consume_arg ();
         }
 #endif /* ACE_HAS_IPV6 */
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCDRTradeoff"))))
         {
           cdr_tradeoff = ACE_OS::atoi (current_arg);
@@ -740,11 +740,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
       // A new <ObjectID>:<IOR> mapping has been specified. This will be
       // used by the resolve_initial_references ().
 
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBInitRef"))))
         {
           const ACE_TCHAR *pos = ACE_OS::strchr (current_arg, '=');
-          if (pos == 0)
+          if (pos == nullptr)
             {
               TAOLIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("Invalid ORBInitRef argument '%s'")
@@ -775,7 +775,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
             }
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDefaultInitRef"))))
         {
           // Set the list of prefixes from -ORBDefaultInitRef.
@@ -784,14 +784,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBStdProfileComponents"))))
         {
           std_profile_components =
             ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBAMICollocation"))))
         {
           int const ami_collocation = ACE_OS::atoi (current_arg);
@@ -802,7 +802,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBResources"))))
         {
           TAOLIB_DEBUG ((LM_WARNING,
@@ -811,7 +811,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBLogFile"))))
         {
           // redirect all TAOLIB_DEBUG and TAOLIB_ERROR output to a file
@@ -834,7 +834,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
 #else /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
-          ofstream* output_stream = 0;
+          ofstream* output_stream = nullptr;
 
           //
           // note: we are allocating dynamic memory here....but
@@ -862,7 +862,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
           ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
           ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBVerboseLogging"))))
         {
           unsigned long const verbose_logging = ACE_OS::atoi (current_arg);
@@ -894,14 +894,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
             dynamic_cast<ACE_Logging_Strategy*> (
               ACE_Dynamic_Service<ACE_Service_Object>::instance (current_arg));
 
-          if (logging_strategy != 0)
+          if (logging_strategy != nullptr)
             {
               logging_strategy->reactor (this->reactor ());
             }
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBUseIMR"))))
         {
           // Use IR or not.
@@ -909,14 +909,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBIMREndpointsInIOR"))))
         {
           this->imr_endpoints_in_ior_ = ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBid"))))
         {
           // The ORBid is actually set in ORB_init(), and then passed
@@ -935,7 +935,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBServerId"))))
         {
           // The this->server_id_ is to uniquely identify a server to
@@ -945,21 +945,21 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                (ACE_TEXT("-ORBLingerTimeout"))))
         {
           linger = ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                (ACE_TEXT("-ORBAcceptErrorDelay"))))
         {
           accept_error_delay = ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBEndpoint"))))
         {
           // Each "endpoint" is of the form:
@@ -986,7 +986,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBListenEndpoints"))))
         {
           // This option is similar to the -ORBEndPoint option. May be
@@ -999,9 +999,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if ((0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBLaneEndpoint")))) ||
-               (0 != (current_arg = arg_shifter.get_the_parameter
+               (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBLaneListenEndpoints")))))
         {
           // This option is similar to the -ORBEndPoint option but
@@ -1022,7 +1022,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           this->set_endpoint_helper (lane, endpoints);
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNoProprietaryActivation"))))
         {
           // This option can be used to set to not use any proprietary
@@ -1035,34 +1035,34 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           throw ::CORBA::NO_IMPLEMENT ();
         }
-       else if (0 != (current_arg = arg_shifter.get_the_parameter
+       else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBUseSharedProfile"))))
          {
            this->orb_params ()->shared_profile (ACE_OS::atoi (current_arg));
 
            arg_shifter.consume_arg ();
          }
-       else if (0 != (current_arg = arg_shifter.get_the_parameter
+       else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBNegotiateCodesets"))))
          {
            negotiate_codesets = (ACE_OS::atoi (current_arg));
 
            arg_shifter.consume_arg ();
          }
-       else if (0 != (current_arg = arg_shifter.get_the_parameter
+       else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBUseParallelConnects"))))
          {
            use_parallel_connects = ACE_OS::atoi (current_arg);
            arg_shifter.consume_arg ();
          }
-       else if (0 != (current_arg = arg_shifter.get_the_parameter
+       else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBParallelConnectDelay"))))
          {
            this->orb_params ()->parallel_connect_delay
              (ACE_OS::atoi (current_arg));
            arg_shifter.consume_arg ();
          }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBSingleReadOptimization"))))
         {
           this->orb_params ()->single_read_optimization
@@ -1070,7 +1070,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDisableRTCollocation"))))
         {
           int disable_rt_collocation = ACE_OS::atoi (current_arg);
@@ -1081,31 +1081,31 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBUseLocalMemoryPool"))))
         {
           this->use_local_memory_pool_ = (0 != ACE_OS::atoi (current_arg));
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBMaxMessageSize"))))
         {
           this->orb_params_.max_message_size (ACE_OS::atoi (current_arg));
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBFTSendFullGroupTC"))))
         {
           this->ft_send_extended_sc_ = ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBForwardInvocationOnObjectNotExist"))))
         {
-          int forward = ACE_OS::atoi (current_arg);
+          int const forward = ACE_OS::atoi (current_arg);
           if (forward)
             this->orb_params_.forward_invocation_on_object_not_exist (true);
           else
@@ -1113,81 +1113,81 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBForwardOnTransientLimit"))))
         {
-          int limit = ACE_OS::atoi (current_arg);
+          int const limit = ACE_OS::atoi (current_arg);
           this->orb_params_.forward_on_exception_limit (TAO::FOE_TRANSIENT, limit);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                      (ACE_TEXT("-ORBForwardOnCommFailureLimit"))))
         {
-          int limit = ACE_OS::atoi (current_arg);
+          int const limit = ACE_OS::atoi (current_arg);
           this->orb_params_.forward_on_exception_limit (
                               TAO::FOE_COMM_FAILURE, limit);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                      (ACE_TEXT("-ORBForwardOnObjectNotExistLimit"))))
         {
-          int limit = ACE_OS::atoi (current_arg);
+          int const limit = ACE_OS::atoi (current_arg);
           this->orb_params_.forward_on_exception_limit (
                               TAO::FOE_OBJECT_NOT_EXIST, limit);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBForwardOnInvObjrefLimit"))))
         {
-          int limit = ACE_OS::atoi (current_arg);
+          int const limit = ACE_OS::atoi (current_arg);
           this->orb_params_.forward_on_exception_limit (
                               TAO::FOE_INV_OBJREF, limit);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                      (ACE_TEXT("-ORBForwardOnReplyClosedLimit"))))
         {
-          int limit = ACE_OS::atoi (current_arg);
+          int const limit = ACE_OS::atoi (current_arg);
           this->orb_params_.invocation_retry_params ()
             .forward_on_reply_closed_limit_ = limit;
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBForwardDelay"))))
         {
-          int msecs = ACE_OS::atoi (current_arg);
+          int const msecs = ACE_OS::atoi (current_arg);
           ACE_Time_Value delay(0, 1000*msecs);
           this->orb_params_.forward_on_exception_delay (delay);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                      (ACE_TEXT("-ORBForwardOnceOnObjectNotExist"))))
         {
-          int forward = ACE_OS::atoi (current_arg);
+          int const forward = ACE_OS::atoi (current_arg);
           if (forward)
             this->orb_params_.forward_once_exception (TAO::FOE_OBJECT_NOT_EXIST);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBForwardOnceOnCommFailure"))))
         {
-          int forward = ACE_OS::atoi (current_arg);
+          int const forward = ACE_OS::atoi (current_arg);
           if (forward)
             this->orb_params_.forward_once_exception (TAO::FOE_COMM_FAILURE);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBForwardOnceOnTransient"))))
         {
-          int forward = ACE_OS::atoi (current_arg);
+          int const forward = ACE_OS::atoi (current_arg);
           if (forward)
             this->orb_params_.forward_once_exception (TAO::FOE_TRANSIENT);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBForwardOnceOnInvObjref"))))
         {
           int forward = ACE_OS::atoi (current_arg);
@@ -1196,14 +1196,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
           arg_shifter.consume_arg ();
         }
-     else if (0 != (current_arg = arg_shifter.get_the_parameter
+     else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                     (ACE_TEXT("-ORBAllowZIOPNoServerPolicies"))))
         {
           // This option takes a boolean 0 (off/dissallow) or 1 (on/allow)
           this->orb_params_.allow_ziop_no_server_policies (!!ACE_OS::atoi (current_arg));
           arg_shifter.consume_arg ();
         }
-     else if (0 != (current_arg = arg_shifter.get_the_parameter
+     else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                     (ACE_TEXT("-ORBDynamicThreadPoolName"))))
         {
           this->orb_params_.dynamic_thread_pool_config_name (ACE_TEXT_ALWAYS_CHAR
@@ -1222,7 +1222,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
               TAOLIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("ERROR: Unknown \"-ORB\" option ")
                           ACE_TEXT ("<%s>.\n"),
-                          ((current_arg == 0) ? ACE_TEXT("<NULL>")
+                          ((current_arg == nullptr) ? ACE_TEXT("<NULL>")
                                               : current_arg)));
             }
 
@@ -1247,7 +1247,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
   const char *env_endpoint =
     ACE_OS::getenv ("TAO_ORBENDPOINT");
 
-  if (env_endpoint != 0)
+  if (env_endpoint != nullptr)
     {
       int result =
         this->orb_params ()->add_endpoints (TAO_DEFAULT_LANE, env_endpoint);
@@ -1293,7 +1293,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
   // services because we'll load the factory from there.
   TAO_Resource_Factory *trf = this->resource_factory ();
 
-  if (trf == 0)
+  if (trf == nullptr)
     {
       TAOLIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("TAO (%P|%t) - %p\n"),
@@ -1313,7 +1313,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
   // @@ ????
   // Make sure the reactor is initialized...
   ACE_Reactor *reactor = this->reactor ();
-  if (reactor == 0)
+  if (reactor == nullptr)
     {
       TAOLIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("TAO (%P|%t) - %p\n"),
@@ -1327,7 +1327,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
   TAO_Server_Strategy_Factory *ssf = this->server_factory ();
 
-  if (ssf == 0)
+  if (ssf == nullptr)
     {
       TAOLIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("TAO (%P|%t) - %p\n"),
@@ -1465,7 +1465,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
     (this->configuration (),
      ACE_TEXT_CHAR_TO_TCHAR (protocols_hooks_name));
 
-  if (this->protocols_hooks_ != 0)
+  if (this->protocols_hooks_ != nullptr)
     {
       // Initialize the protocols hooks instance.
       this->protocols_hooks_->init_hooks (this);
@@ -1477,9 +1477,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
       this->configuration (),
       this->orb_params ()->poa_factory_name ());
 
-  if (adapter_factory != 0)
+  if (adapter_factory != nullptr)
     {
-      adapter_factory->init (0, 0);
+      adapter_factory->init (0, nullptr);
     }
 
   // Look in the service repository for an instance of the
@@ -1493,7 +1493,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
     (this->configuration (),
      ACE_TEXT_CHAR_TO_TCHAR (network_priority_protocols_hooks_name.c_str()));
 
-  if (this->network_priority_protocols_hooks_ != 0)
+  if (this->network_priority_protocols_hooks_ != nullptr)
     {
       // Initialize the protocols hooks instance.
       this->network_priority_protocols_hooks_->init_hooks (this);
@@ -1511,7 +1511,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
 
 int
-TAO_ORB_Core::fini (void)
+TAO_ORB_Core::fini ()
 {
   try
     {
@@ -1565,7 +1565,7 @@ TAO_ORB_Core::fini (void)
   //
   // @todo Fix potential seg fault in
   //       TAO_ORB_Core::thread_lane_resources_manager().
-  if (this->thread_lane_resources_manager_ != 0)
+  if (this->thread_lane_resources_manager_ != nullptr)
     this->thread_lane_resources_manager_->finalize ();
 
   // Destroy the object_key table
@@ -1586,7 +1586,7 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
 void
 TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory)
 {
-  if (TAO_TSS_Resources::instance ()->gui_resource_factory_ != 0)
+  if (TAO_TSS_Resources::instance ()->gui_resource_factory_ != nullptr)
     {
       if (TAO_debug_level > 2)
         {
@@ -1606,7 +1606,7 @@ TAO_ORB_Core::dynamic_adapter_name (const char *name)
 }
 
 const char *
-TAO_ORB_Core::dynamic_adapter_name (void)
+TAO_ORB_Core::dynamic_adapter_name ()
 {
   return TAO_ORB_Core_Static_Resources::instance ()->dynamic_adapter_name_.c_str();
 }
@@ -1618,7 +1618,7 @@ TAO_ORB_Core::ifr_client_adapter_name (const char *name)
 }
 
 const char *
-TAO_ORB_Core::ifr_client_adapter_name (void)
+TAO_ORB_Core::ifr_client_adapter_name ()
 {
   return TAO_ORB_Core_Static_Resources::instance ()->ifr_client_adapter_name_.c_str();
 }
@@ -1630,7 +1630,7 @@ TAO_ORB_Core::typecodefactory_adapter_name (const char *name)
 }
 
 const char *
-TAO_ORB_Core::typecodefactory_adapter_name (void)
+TAO_ORB_Core::typecodefactory_adapter_name ()
 {
   return TAO_ORB_Core_Static_Resources::instance ()->typecodefactory_adapter_name_.c_str();
 }
@@ -1642,7 +1642,7 @@ TAO_ORB_Core::iorinterceptor_adapter_factory_name (const char *name)
 }
 
 const char *
-TAO_ORB_Core::iorinterceptor_adapter_factory_name (void)
+TAO_ORB_Core::iorinterceptor_adapter_factory_name ()
 {
   return TAO_ORB_Core_Static_Resources::instance ()->iorinterceptor_adapter_factory_name_.c_str();
 }
@@ -1654,16 +1654,16 @@ TAO_ORB_Core::valuetype_adapter_factory_name (const char *name)
 }
 
 const char *
-TAO_ORB_Core::valuetype_adapter_factory_name (void)
+TAO_ORB_Core::valuetype_adapter_factory_name ()
 {
   return TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_factory_name_.c_str();
 }
 
 TAO_Resource_Factory *
-TAO_ORB_Core::resource_factory (void)
+TAO_ORB_Core::resource_factory ()
 {
   // Check if there is a cached reference.
-  if (this->resource_factory_ != 0)
+  if (this->resource_factory_ != nullptr)
     {
       return this->resource_factory_;
     }
@@ -1681,17 +1681,17 @@ TAO_ORB_Core::resource_factory (void)
 }
 
 TAO::GUIResource_Factory *
-TAO_ORB_Core::gui_resource_factory (void)
+TAO_ORB_Core::gui_resource_factory ()
 {
   return TAO_TSS_Resources::instance ()->gui_resource_factory_;
 }
 
 
 TAO_Thread_Lane_Resources_Manager &
-TAO_ORB_Core::thread_lane_resources_manager (void)
+TAO_ORB_Core::thread_lane_resources_manager ()
 {
   // Check if there is a cached reference.
-  if (this->thread_lane_resources_manager_ != 0)
+  if (this->thread_lane_resources_manager_ != nullptr)
     return *this->thread_lane_resources_manager_;
 
   // If not, lookup the corresponding factory and ask it to make one.
@@ -1710,10 +1710,10 @@ TAO_ORB_Core::thread_lane_resources_manager (void)
 }
 
 TAO_Collocation_Resolver &
-TAO_ORB_Core::collocation_resolver (void)
+TAO_ORB_Core::collocation_resolver ()
 {
   // Check if there is a cached reference.
-  if (this->collocation_resolver_ != 0)
+  if (this->collocation_resolver_ != nullptr)
     return *this->collocation_resolver_;
 
   // If not, lookup it up.
@@ -1726,7 +1726,7 @@ TAO_ORB_Core::collocation_resolver (void)
 }
 
 TAO::PolicyFactory_Registry_Adapter *
-TAO_ORB_Core::policy_factory_registry_i (void)
+TAO_ORB_Core::policy_factory_registry_i ()
 {
 
   TAO_PolicyFactory_Registry_Factory *loader =
@@ -1734,7 +1734,7 @@ TAO_ORB_Core::policy_factory_registry_i (void)
       (this->configuration (),
        ACE_TEXT ("PolicyFactory_Loader"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration ()->process_directive (
         ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("PolicyFactory_Loader",
@@ -1748,7 +1748,7 @@ TAO_ORB_Core::policy_factory_registry_i (void)
            ACE_TEXT ("PolicyFactory_Loader"));
     }
 
-  if (loader != 0)
+  if (loader != nullptr)
     {
       this->policy_factory_registry_ =
         loader->create ();
@@ -1758,10 +1758,10 @@ TAO_ORB_Core::policy_factory_registry_i (void)
 }
 
 TAO_ZIOP_Adapter *
-TAO_ORB_Core::ziop_adapter_i (void)
+TAO_ORB_Core::ziop_adapter_i ()
 {
   // Check if there is a cached reference.
-  if (this->ziop_adapter_ != 0)
+  if (this->ziop_adapter_ != nullptr)
     return this->ziop_adapter_;
 
   this->ziop_adapter_ =
@@ -1773,7 +1773,7 @@ TAO_ORB_Core::ziop_adapter_i (void)
 }
 
 TAO::ORBInitializer_Registry_Adapter *
-TAO_ORB_Core::orbinitializer_registry_i (void)
+TAO_ORB_Core::orbinitializer_registry_i ()
 {
   // @todo The ORBInitializer_Registry is supposed to be a singleton.
 
@@ -1787,7 +1787,7 @@ TAO_ORB_Core::orbinitializer_registry_i (void)
       // In case we build shared, try to load the PI Client library, in a
       // static build we just can't do this, so don't try it, lower layers
       // output an error then.
-  if (this->orbinitializer_registry_ == 0)
+  if (this->orbinitializer_registry_ == nullptr)
     {
       this->configuration ()->process_directive (
         ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
@@ -1806,10 +1806,10 @@ TAO_ORB_Core::orbinitializer_registry_i (void)
 }
 
 TAO_Stub_Factory *
-TAO_ORB_Core::stub_factory (void)
+TAO_ORB_Core::stub_factory ()
 {
   // Check if there is a cached reference.
-  if (this->stub_factory_ != 0)
+  if (this->stub_factory_ != nullptr)
     return this->stub_factory_;
 
   // If not, look in the service repository for an instance.
@@ -1825,10 +1825,10 @@ TAO_ORB_Core::stub_factory (void)
 }
 
 TAO_Endpoint_Selector_Factory *
-TAO_ORB_Core::endpoint_selector_factory (void)
+TAO_ORB_Core::endpoint_selector_factory ()
 {
   // Check if there is a cached reference.
-  if (this->endpoint_selector_factory_ != 0)
+  if (this->endpoint_selector_factory_ != nullptr)
     return this->endpoint_selector_factory_;
 
   // If not, look in the service repository for an instance.
@@ -1854,7 +1854,7 @@ TAO_ORB_Core::set_network_priority_protocols_hooks (
 }
 
 void
-TAO_ORB_Core::services_callbacks_init (void)
+TAO_ORB_Core::services_callbacks_init ()
 {
   // We (should) know what are the services that would need
   // callbacks. So, what we do is go through the Service Configurator
@@ -1899,9 +1899,9 @@ TAO_ORB_Core::service_raise_transient_failure (
 }
 
 TAO_Client_Strategy_Factory *
-TAO_ORB_Core::client_factory (void)
+TAO_ORB_Core::client_factory ()
 {
-  if (this->client_factory_ == 0)
+  if (this->client_factory_ == nullptr)
     {
       // Look in the service repository for an instance.
       this->client_factory_ =
@@ -1914,9 +1914,9 @@ TAO_ORB_Core::client_factory (void)
 }
 
 TAO_Server_Strategy_Factory *
-TAO_ORB_Core::server_factory (void)
+TAO_ORB_Core::server_factory ()
 {
-  if (this->server_factory_ == 0)
+  if (this->server_factory_ == nullptr)
     {
       // Look in the service repository for an instance.
       this->server_factory_ =
@@ -1929,7 +1929,7 @@ TAO_ORB_Core::server_factory (void)
 }
 
 CORBA::Object_ptr
-TAO_ORB_Core::root_poa (void)
+TAO_ORB_Core::root_poa ()
 {
   // DCL ..
   if (CORBA::is_nil (this->root_poa_.in ()))
@@ -1943,7 +1943,7 @@ TAO_ORB_Core::root_poa (void)
           (this->configuration (),
           this->orb_params ()->poa_factory_name ());
 
-      if (factory == 0)
+      if (factory == nullptr)
         {
           this->configuration()->process_directive (
              this->orb_params ()->poa_factory_directive ());
@@ -1954,7 +1954,7 @@ TAO_ORB_Core::root_poa (void)
               this->orb_params ()->poa_factory_name ());
         }
 
-      if (factory == 0)
+      if (factory == nullptr)
         {
           return CORBA::Object::_nil ();
         }
@@ -1962,15 +1962,11 @@ TAO_ORB_Core::root_poa (void)
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         monitor,
                         this->open_lock_,
-                        0);
+                        nullptr);
 
       if (CORBA::is_nil (this->root_poa_.in ()))
         {
-#if defined (ACE_HAS_CPP11)
           std::unique_ptr<TAO_Adapter> poa_adapter (factory->create (this));
-#else
-          auto_ptr<TAO_Adapter> poa_adapter (factory->create (this));
-#endif /* ACE_HAS_CPP11 */
           poa_adapter->open ();
 
           // @@ Not exception safe
@@ -1986,12 +1982,12 @@ TAO_ORB_Core::root_poa (void)
 }
 
 TAO_Adapter *
-TAO_ORB_Core::poa_adapter (void)
+TAO_ORB_Core::poa_adapter ()
 {
-  if (this->poa_adapter_ == 0)
+  if (this->poa_adapter_ == nullptr)
     {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->poa_adapter_ == 0)
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
+      if (this->poa_adapter_ == nullptr)
         {
           this->poa_adapter_ =
             this->adapter_registry_.find_adapter ("RootPOA");
@@ -2033,7 +2029,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
   // orbos\98-05-05.pdf Section 5.4)
   if (policy_list->length () != 0)
     {
-      TAO_Profile * profile = 0;
+      TAO_Profile * profile = nullptr;
 
       CORBA::ULong const count = mprofile.profile_count ();
       for (CORBA::ULong i = 0; i < count; ++i)
@@ -2055,7 +2051,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
 void
 TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator)
 {
-  if (this->bidir_adapter_ == 0)
+  if (this->bidir_adapter_ == nullptr)
     {
       this->bidir_adapter_ =
         ACE_Dynamic_Service<TAO_BiDir_Adapter>::instance
@@ -2085,7 +2081,7 @@ TAO_ORB_Core::create_object (TAO_Stub *stub)
   // @@ We should thow CORBA::NO_MEMORY in platforms with exceptions,
   // but we are stuck in platforms without exceptions!
   TAO_ORB_Core_Auto_Ptr collocated_orb_core;
-  CORBA::Object_ptr x = 0;
+  CORBA::Object_ptr x = nullptr;
 
   {
     // Lock the ORB_Table against concurrent modification while we
@@ -2123,7 +2119,7 @@ TAO_ORB_Core::create_object (TAO_Stub *stub)
       // Remote one.
       ACE_NEW_RETURN (x,
                       CORBA::Object (stub, 0),
-                      0);
+                      nullptr);
     }
 
   return x;
@@ -2198,7 +2194,7 @@ TAO_ORB_Core::is_collocation_enabled (TAO_ORB_Core *orb_core,
 {
   TAO_MProfile mp_temp;
 
-  TAO_Profile* profile = 0;
+  TAO_Profile* profile = nullptr;
   if (this->service_profile_selection(mp, profile) && profile)
   {
     if (mp_temp.add_profile(profile) == -1)
@@ -2239,13 +2235,13 @@ TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
 // ****************************************************************
 
 TAO_Leader_Follower &
-TAO_ORB_Core::leader_follower (void)
+TAO_ORB_Core::leader_follower ()
 {
   return this->lane_resources ().leader_follower ();
 }
 
 TAO_LF_Strategy &
-TAO_ORB_Core::lf_strategy (void)
+TAO_ORB_Core::lf_strategy ()
 {
   return this->thread_lane_resources_manager ().lf_strategy ();
 }
@@ -2333,7 +2329,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work)
           break;
         }
       if (result == 0
-          && tv != 0
+          && tv != nullptr
           && *tv == ACE_Time_Value::zero)
         {
           // A timeout, terminate the loop...
@@ -2352,7 +2348,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work)
   // wait only in the parent thread.
   if (this->has_shutdown () == true &&
       (this->server_factory_->activate_server_connections () ||
-       (this->tm_.task() == 0 && this->tm_.count_threads() > 0) ) )
+       (this->tm_.task() == nullptr && this->tm_.count_threads() > 0) ) )
     {
       this->tm_.wait ();
     }
@@ -2415,7 +2411,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion)
     ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
     delete this->valuetype_adapter_;
-    this->valuetype_adapter_ = 0;
+    this->valuetype_adapter_ = nullptr;
   }
 
   // Explicitly destroy the object reference table since it
@@ -2436,7 +2432,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion)
 }
 
 void
-TAO_ORB_Core::destroy (void)
+TAO_ORB_Core::destroy ()
 {
   // All destroy() should do is (a) call shutdown() and (b) unbind()
   // from the ORB table.  Nothing else should really be added to this
@@ -2472,7 +2468,7 @@ TAO_ORB_Core::destroy (void)
 }
 
 void
-TAO_ORB_Core::check_shutdown (void)
+TAO_ORB_Core::check_shutdown ()
 {
   if (this->has_shutdown ())
     {
@@ -2485,36 +2481,36 @@ TAO_ORB_Core::check_shutdown (void)
 }
 
 void
-TAO_ORB_Core::destroy_interceptors (void)
+TAO_ORB_Core::destroy_interceptors ()
 {
   try
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
 #if TAO_HAS_INTERCEPTORS == 1
-      if (this->client_request_interceptor_adapter_ != 0)
+      if (this->client_request_interceptor_adapter_ != nullptr)
         {
           this->client_request_interceptor_adapter_->destroy_interceptors ();
 
           delete this->client_request_interceptor_adapter_;
-          this->client_request_interceptor_adapter_ = 0;
+          this->client_request_interceptor_adapter_ = nullptr;
         }
 
-      if (this->server_request_interceptor_adapter_ != 0)
+      if (this->server_request_interceptor_adapter_ != nullptr)
         {
           this->server_request_interceptor_adapter_->destroy_interceptors ();
 
           delete this->server_request_interceptor_adapter_;
-          this->server_request_interceptor_adapter_ = 0;
+          this->server_request_interceptor_adapter_ = nullptr;
         }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-      if (this->ior_interceptor_adapter_ != 0)
+      if (this->ior_interceptor_adapter_ != nullptr)
         {
           this->ior_interceptor_adapter_->destroy_interceptors ();
 
-          this->ior_interceptor_adapter_ = 0;
+          this->ior_interceptor_adapter_ = nullptr;
         }
 
     }
@@ -2533,20 +2529,20 @@ TAO_ORB_Core::destroy_interceptors (void)
 }
 
 TAO_Thread_Lane_Resources &
-TAO_ORB_Core::lane_resources (void)
+TAO_ORB_Core::lane_resources ()
 {
   return this->thread_lane_resources_manager ().lane_resources ();
 }
 
 void
-TAO_ORB_Core::resolve_typecodefactory_i (void)
+TAO_ORB_Core::resolve_typecodefactory_i ()
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (this->configuration (),
        ACE_TEXT ("TypeCodeFactory_Loader"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration ()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TypeCodeFactory",
@@ -2559,7 +2555,7 @@ TAO_ORB_Core::resolve_typecodefactory_i (void)
         (this->configuration (),
          ACE_TEXT ("TypeCodeFactory_Loader"));
 
-      if (loader == 0)
+      if (loader == nullptr)
         {
           TAOLIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("TAO (%P|%t) Unable to instantiate ")
@@ -2569,18 +2565,18 @@ TAO_ORB_Core::resolve_typecodefactory_i (void)
     }
 
   this->typecode_factory_ =
-    loader->create_object (this->orb_, 0, 0);
+    loader->create_object (this->orb_, 0, nullptr);
 }
 
 void
-TAO_ORB_Core::resolve_codecfactory_i (void)
+TAO_ORB_Core::resolve_codecfactory_i ()
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (this->configuration (),
        ACE_TEXT ("CodecFactory_Loader"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("CodecFactory",
@@ -2593,22 +2589,22 @@ TAO_ORB_Core::resolve_codecfactory_i (void)
           (this->configuration (), ACE_TEXT ("CodecFactory_Loader"));
     }
 
-  if (loader != 0)
+  if (loader != nullptr)
     {
       this->codec_factory_ =
-        loader->create_object (this->orb_, 0, 0);
+        loader->create_object (this->orb_, 0, nullptr);
     }
 }
 
 void
-TAO_ORB_Core::resolve_compression_manager_i (void)
+TAO_ORB_Core::resolve_compression_manager_i ()
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (this->configuration (),
        ACE_TEXT ("Compression_Loader"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("Compression",
@@ -2621,21 +2617,21 @@ TAO_ORB_Core::resolve_compression_manager_i (void)
           (this->configuration (), ACE_TEXT ("Compression_Loader"));
     }
 
-  if (loader != 0)
+  if (loader != nullptr)
     {
-      this->compression_manager_ = loader->create_object (this->orb_, 0, 0);
+      this->compression_manager_ = loader->create_object (this->orb_, 0, nullptr);
     }
 }
 
 void
-TAO_ORB_Core::resolve_poa_current_i (void)
+TAO_ORB_Core::resolve_poa_current_i ()
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (this->configuration(),
        ACE_TEXT ("TAO_POA_Current_Factory"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
@@ -2648,9 +2644,9 @@ TAO_ORB_Core::resolve_poa_current_i (void)
           (this->configuration(), ACE_TEXT ("TAO_POA_Current_Factory"));
     }
 
-  if (loader != 0)
+  if (loader != nullptr)
     {
-      this->poa_current_ = loader->create_object (this->orb_, 0, 0);
+      this->poa_current_ = loader->create_object (this->orb_, 0, nullptr);
     }
 }
 
@@ -2658,14 +2654,14 @@ TAO_ORB_Core::resolve_poa_current_i (void)
 #if TAO_HAS_INTERCEPTORS == 1
 
 void
-TAO_ORB_Core::resolve_picurrent_i (void)
+TAO_ORB_Core::resolve_picurrent_i ()
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (this->configuration (),
        ACE_TEXT ("PICurrent_Loader"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration ()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("PICurrent_Loader",
@@ -2678,9 +2674,9 @@ TAO_ORB_Core::resolve_picurrent_i (void)
           (this->configuration (), ACE_TEXT ("PICurrent_Loader"));
     }
 
-  if (loader != 0)
+  if (loader != nullptr)
     {
-      CORBA::Object_ptr pi = loader->create_object (this->orb_, 0, 0);
+      CORBA::Object_ptr pi = loader->create_object (this->orb_, 0, nullptr);
 
       this->pi_current_ = pi;
     }
@@ -2690,14 +2686,14 @@ TAO_ORB_Core::resolve_picurrent_i (void)
 
 
 void
-TAO_ORB_Core::resolve_dynanyfactory_i (void)
+TAO_ORB_Core::resolve_dynanyfactory_i ()
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (this->configuration (),
        ACE_TEXT ("DynamicAny_Loader"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration ()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("DynamicAny_Loader",
@@ -2711,21 +2707,21 @@ TAO_ORB_Core::resolve_dynanyfactory_i (void)
          ACE_TEXT ("DynamicAny_Loader"));
     }
 
-  if (loader != 0)
+  if (loader != nullptr)
     {
-      this->dynany_factory_ = loader->create_object (this->orb_, 0, 0);
+      this->dynany_factory_ = loader->create_object (this->orb_, 0, nullptr);
     }
 }
 
 void
-TAO_ORB_Core::resolve_iormanipulation_i (void)
+TAO_ORB_Core::resolve_iormanipulation_i ()
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (this->configuration (),
        ACE_TEXT ("IORManip_Loader"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("IORManip_Loader",
@@ -2738,19 +2734,19 @@ TAO_ORB_Core::resolve_iormanipulation_i (void)
           (this->configuration (), ACE_TEXT ("IORManip_Loader"));
     }
 
-  if (loader != 0)
+  if (loader != nullptr)
     {
-      this->ior_manip_factory_ = loader->create_object (this->orb_, 0, 0);
+      this->ior_manip_factory_ = loader->create_object (this->orb_, 0, nullptr);
     }
 }
 
 void
-TAO_ORB_Core::resolve_ior_table_i (void)
+TAO_ORB_Core::resolve_ior_table_i ()
 {
   TAO_Adapter_Factory *factory =
   ACE_Dynamic_Service<TAO_Adapter_Factory>::instance
     (this->configuration (), ACE_TEXT("TAO_IORTable"));
-  if (factory == 0)
+  if (factory == nullptr)
     {
       this->configuration ()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_IORTable",
@@ -2763,7 +2759,7 @@ TAO_ORB_Core::resolve_ior_table_i (void)
         (this->configuration (), ACE_TEXT("TAO_IORTable"));
     }
 
-  if (factory != 0)
+  if (factory != nullptr)
     {
       ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this));
       iortable_adapter->open ();
@@ -2779,12 +2775,12 @@ TAO_ORB_Core::resolve_ior_table_i (void)
 }
 
 void
-TAO_ORB_Core::resolve_async_ior_table_i (void)
+TAO_ORB_Core::resolve_async_ior_table_i ()
 {
   TAO_Adapter_Factory *factory =
   ACE_Dynamic_Service<TAO_Adapter_Factory>::instance
     (this->configuration (), ACE_TEXT("TAO_Async_IORTable"));
-  if (factory == 0)
+  if (factory == nullptr)
     {
       this->configuration ()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Async_IORTable",
@@ -2797,7 +2793,7 @@ TAO_ORB_Core::resolve_async_ior_table_i (void)
         (this->configuration (), ACE_TEXT("TAO_Async_IORTable"));
     }
 
-  if (factory != 0)
+  if (factory != nullptr)
     {
       ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this));
       iortable_adapter->open ();
@@ -2813,14 +2809,14 @@ TAO_ORB_Core::resolve_async_ior_table_i (void)
 }
 
 void
-TAO_ORB_Core::resolve_monitor_i (void)
+TAO_ORB_Core::resolve_monitor_i ()
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
       (this->configuration (),
        ACE_TEXT ("Monitor_Init"));
 
-  if (loader == 0)
+  if (loader == nullptr)
     {
       this->configuration ()->process_directive
         (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("Monitor_Init",
@@ -2834,9 +2830,9 @@ TAO_ORB_Core::resolve_monitor_i (void)
          ACE_TEXT ("Monitor_Init"));
     }
 
-  if (loader != 0)
+  if (loader != nullptr)
     {
-      this->monitor_ = loader->create_object (this->orb_, 0, 0);
+      this->monitor_ = loader->create_object (this->orb_, 0, nullptr);
     }
 }
 
@@ -2918,7 +2914,7 @@ TAO_ORB_Core::resolve_rir (const char *name)
 }
 
 CORBA::ORB::ObjectIdList *
-TAO_ORB_Core::list_initial_references (void)
+TAO_ORB_Core::list_initial_references ()
 {
   // Unsupported initial services should NOT be included in the below list!
   static const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES };
@@ -2933,7 +2929,7 @@ TAO_ORB_Core::list_initial_references (void)
     + this->init_ref_map_.size ()
     + this->object_ref_table_.current_size ();
 
-  CORBA::ORB::ObjectIdList *tmp = 0;
+  CORBA::ORB::ObjectIdList *tmp = nullptr;
 
   ACE_NEW_THROW_EX (tmp,
                     CORBA::ORB::ObjectIdList (
@@ -2976,46 +2972,46 @@ TAO_ORB_Core::list_initial_references (void)
 
 // ****************************************************************
 ACE_Allocator*
-TAO_ORB_Core::input_cdr_dblock_allocator (void)
+TAO_ORB_Core::input_cdr_dblock_allocator ()
 {
   return this->lane_resources ().input_cdr_dblock_allocator ();
 }
 
 ACE_Allocator*
-TAO_ORB_Core::input_cdr_buffer_allocator (void)
+TAO_ORB_Core::input_cdr_buffer_allocator ()
 {
   return this->lane_resources ().input_cdr_buffer_allocator ();
 }
 
 ACE_Allocator*
-TAO_ORB_Core::input_cdr_msgblock_allocator (void)
+TAO_ORB_Core::input_cdr_msgblock_allocator ()
 {
   return this->lane_resources ().input_cdr_msgblock_allocator ();
 }
 
 ACE_Allocator*
-TAO_ORB_Core::output_cdr_dblock_allocator (void)
+TAO_ORB_Core::output_cdr_dblock_allocator ()
 {
 
   return this->lane_resources ().output_cdr_dblock_allocator ();
 }
 
 ACE_Allocator*
-TAO_ORB_Core::output_cdr_buffer_allocator (void)
+TAO_ORB_Core::output_cdr_buffer_allocator ()
 {
   return this->lane_resources ().output_cdr_buffer_allocator ();
 }
 
 
 ACE_Allocator*
-TAO_ORB_Core::output_cdr_msgblock_allocator (void)
+TAO_ORB_Core::output_cdr_msgblock_allocator ()
 {
   return this->lane_resources ().output_cdr_msgblock_allocator ();
 }
 
 
 ACE_Allocator *
-TAO_ORB_Core::transport_message_buffer_allocator (void)
+TAO_ORB_Core::transport_message_buffer_allocator ()
 {
   return this->lane_resources ().transport_message_buffer_allocator ();
 }
@@ -3025,15 +3021,15 @@ ACE_Data_Block*
 TAO_ORB_Core::create_input_cdr_data_block (size_t size)
 {
 
-  ACE_Allocator *dblock_allocator = 0;
-  ACE_Allocator *buffer_allocator = 0;
+  ACE_Allocator *dblock_allocator = nullptr;
+  ACE_Allocator *buffer_allocator = nullptr;
 
   dblock_allocator =
     this->input_cdr_dblock_allocator ();
   buffer_allocator =
     this->input_cdr_buffer_allocator ();
 
-  ACE_Lock* lock_strategy = 0;
+  ACE_Lock* lock_strategy = nullptr;
   if (this->resource_factory ()->use_locked_data_blocks ())
     {
       lock_strategy = &this->data_block_lock_;
@@ -3051,7 +3047,7 @@ TAO_ORB_Core::create_data_block_i (size_t size,
                                    ACE_Allocator *dblock_allocator,
                                    ACE_Lock *lock_strategy)
 {
-  ACE_Data_Block *nb = 0;
+  ACE_Data_Block *nb = nullptr;
 
   ACE_NEW_MALLOC_RETURN (
                          nb,
@@ -3059,18 +3055,18 @@ TAO_ORB_Core::create_data_block_i (size_t size,
                            dblock_allocator->malloc (sizeof (ACE_Data_Block))),
                          ACE_Data_Block (size,
                                          ACE_Message_Block::MB_DATA,
-                                         0,
+                                         nullptr,
                                          buffer_allocator,
                                          lock_strategy,
                                          0,
                                          dblock_allocator),
-                         0);
+                         nullptr);
 
   return nb;
 }
 
 TAO_Connector_Registry *
-TAO_ORB_Core::connector_registry (void)
+TAO_ORB_Core::connector_registry ()
 {
   TAO_Connector_Registry *conn =
     this->lane_resources ().connector_registry ();
@@ -3088,13 +3084,13 @@ TAO_ORB_Core::fragmentation_strategy (TAO_Transport * transport)
 }
 
 ACE_Reactor *
-TAO_ORB_Core::reactor (void)
+TAO_ORB_Core::reactor ()
 {
   return this->leader_follower ().reactor ();
 }
 
 CORBA::Object_ptr
-TAO_ORB_Core::implrepo_service (void)
+TAO_ORB_Core::implrepo_service ()
 {
   if (!this->use_implrepo_)
     return CORBA::Object::_nil ();
@@ -3130,7 +3126,7 @@ TAO_ORB_Core::default_sync_scope_hook (TAO_ORB_Core *oc,
                                        Messaging::SyncScope &scope)
 {
   has_synchronization = true;
-  scope = (oc == 0) ? Messaging::SYNC_WITH_TRANSPORT : oc->default_sync_scope_;
+  scope = (oc == nullptr) ? Messaging::SYNC_WITH_TRANSPORT : oc->default_sync_scope_;
 }
 
 void
@@ -3140,7 +3136,7 @@ TAO_ORB_Core::call_sync_scope_hook (TAO_Stub *stub,
 {
   Sync_Scope_Hook sync_scope_hook = this->sync_scope_hook_;
 
-  if (sync_scope_hook == 0)
+  if (sync_scope_hook == nullptr)
     {
       has_synchronization = false;
       return;
@@ -3176,7 +3172,7 @@ TAO_ORB_Core::get_transport_queueing_strategy (TAO_Stub *,
     break;
     default:
     {
-      return 0;
+      return nullptr;
     }
   }
 }
@@ -3196,7 +3192,7 @@ TAO_ORB_Core::call_timeout_hook (TAO_Stub *stub,
 {
   Timeout_Hook timeout_hook = this->timeout_hook_;
 
-  if (timeout_hook == 0)
+  if (timeout_hook == nullptr)
     {
       has_timeout = false;
       return;
@@ -3212,7 +3208,7 @@ TAO_ORB_Core::connection_timeout (TAO_Stub *stub,
   Timeout_Hook connection_timeout_hook =
     TAO_ORB_Core_Static_Resources::instance ()->connection_timeout_hook_;
 
-  if (connection_timeout_hook == 0)
+  if (connection_timeout_hook == nullptr)
     {
       has_timeout = false;
       return;
@@ -3223,7 +3219,7 @@ TAO_ORB_Core::connection_timeout (TAO_Stub *stub,
   Timeout_Hook alt_connection_timeout_hook =
     TAO_ORB_Core_Static_Resources::instance ()->alt_connection_timeout_hook_;
 
-  if (alt_connection_timeout_hook == 0)
+  if (alt_connection_timeout_hook == nullptr)
     return;
 
   if (!has_timeout || time_value == ACE_Time_Value::zero )
@@ -3267,7 +3263,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
   // keep this code lockless as it always was, assuming no
   // simultanious overwrite will occur.
 
-  if (TOCSRi->connection_timeout_hook_ == 0)
+  if (TOCSRi->connection_timeout_hook_ == nullptr)
     {
       if (TAO_debug_level > 2)
         {
@@ -3278,7 +3274,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
       TOCSRi->connection_timeout_hook_ = hook;
     }
   else if (TOCSRi->connection_timeout_hook_ != hook &&
-           TOCSRi->alt_connection_timeout_hook_ == 0)
+           TOCSRi->alt_connection_timeout_hook_ == nullptr)
     {
       if (TAO_debug_level > 2)
         {
@@ -3308,7 +3304,7 @@ TAO_ORB_Core::get_policy (CORBA::PolicyType type)
   CORBA::Policy_var result;
 
   TAO_Policy_Manager *policy_manager = this->policy_manager ();
-  if (policy_manager != 0)
+  if (policy_manager != nullptr)
     {
       result = policy_manager->get_policy (type);
     }
@@ -3342,7 +3338,7 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type)
   CORBA::Policy_var result;
 
   TAO_Policy_Manager *policy_manager = this->policy_manager ();
-  if (policy_manager != 0)
+  if (policy_manager != nullptr)
     {
       result = policy_manager->get_cached_policy (type);
     }
@@ -3373,7 +3369,7 @@ TAO_ORB_Core::get_cached_policy_including_current (TAO_Cached_Policy_Type type)
 #endif /* (TAO_HAS_CORBA_MESSAGING == 1) */
 
 CORBA::Environment *
-TAO_ORB_Core::default_environment (void) const
+TAO_ORB_Core::default_environment () const
 {
   return TAO_TSS_Resources::instance ()->default_environment_;
 }
@@ -3404,16 +3400,16 @@ TAO_ORB_Core::add_interceptor (
 }
 
 TAO_IORInterceptor_Adapter *
-TAO_ORB_Core::ior_interceptor_adapter (void)
+TAO_ORB_Core::ior_interceptor_adapter ()
 {
-  if (this->ior_interceptor_adapter_ == 0)
+  if (this->ior_interceptor_adapter_ == nullptr)
     {
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         ace_mon,
                         this->lock_,
-                        0);
+                        nullptr);
 
-      if (this->ior_interceptor_adapter_ == 0)
+      if (this->ior_interceptor_adapter_ == nullptr)
         {
           try
             {
@@ -3462,16 +3458,16 @@ TAO_ORB_Core::add_interceptor (
 }
 
 TAO::ClientRequestInterceptor_Adapter *
-TAO_ORB_Core::clientrequestinterceptor_adapter_i (void)
+TAO_ORB_Core::clientrequestinterceptor_adapter_i ()
 {
-  if (this->client_request_interceptor_adapter_ == 0)
+  if (this->client_request_interceptor_adapter_ == nullptr)
     {
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         ace_mon,
                         this->lock_,
-                        0);
+                        nullptr);
 
-      if (this->client_request_interceptor_adapter_ == 0)
+      if (this->client_request_interceptor_adapter_ == nullptr)
         {
           TAO_ClientRequestInterceptor_Adapter_Factory *factory =
             ACE_Dynamic_Service<TAO_ClientRequestInterceptor_Adapter_Factory>::instance
@@ -3559,16 +3555,16 @@ TAO_ORB_Core::add_interceptor (
 }
 
 TAO::ServerRequestInterceptor_Adapter *
-TAO_ORB_Core::serverrequestinterceptor_adapter_i (void)
+TAO_ORB_Core::serverrequestinterceptor_adapter_i ()
 {
-  if (this->server_request_interceptor_adapter_ == 0)
+  if (this->server_request_interceptor_adapter_ == nullptr)
     {
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         ace_mon,
                         this->lock_,
-                        0);
+                        nullptr);
 
-      if (this->server_request_interceptor_adapter_ == 0)
+      if (this->server_request_interceptor_adapter_ == nullptr)
         {
           TAO_ServerRequestInterceptor_Adapter_Factory *factory =
             ACE_Dynamic_Service<TAO_ServerRequestInterceptor_Adapter_Factory>::instance
@@ -3589,16 +3585,16 @@ TAO_ORB_Core::serverrequestinterceptor_adapter_i (void)
 #endif  /* TAO_HAS_INTERCEPTORS == 1  */
 
 TAO_Valuetype_Adapter *
-TAO_ORB_Core::valuetype_adapter (void)
+TAO_ORB_Core::valuetype_adapter ()
 {
-  if (this->valuetype_adapter_ == 0)
+  if (this->valuetype_adapter_ == nullptr)
     {
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         ace_mon,
                         this->lock_,
-                        0);
+                        nullptr);
 
-      if (this->valuetype_adapter_ == 0)
+      if (this->valuetype_adapter_ == nullptr)
         {
           try
             {
@@ -3618,7 +3614,7 @@ TAO_ORB_Core::valuetype_adapter (void)
             }
         }
 
-      if (this->valuetype_adapter_ == 0)
+      if (this->valuetype_adapter_ == nullptr)
         {
            throw ::CORBA::INTERNAL ();
         }
@@ -3638,11 +3634,11 @@ TAO_ORB_Core::register_value_factory (const char *repository_id,
 {
   if (this->valuetype_adapter ())
     {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->valuetype_adapter_ == 0)
+      if (this->valuetype_adapter_ == nullptr)
         {
-          return 0;
+          return nullptr;
         }
 
       int const result =
@@ -3650,7 +3646,7 @@ TAO_ORB_Core::register_value_factory (const char *repository_id,
 
       if (result == 0) // No previous factory found
         {
-          return 0;
+          return nullptr;
         }
 
       if (result == -1)
@@ -3672,7 +3668,7 @@ TAO_ORB_Core::unregister_value_factory (const char *repository_id)
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-      if (this->valuetype_adapter_ == 0)
+      if (this->valuetype_adapter_ == nullptr)
         {
           return;
         }
@@ -3689,34 +3685,34 @@ TAO_ORB_Core::lookup_value_factory (const char *repository_id)
 {
   if (this->valuetype_adapter ())
     {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->valuetype_adapter_ == 0)
+      if (this->valuetype_adapter_ == nullptr)
         {
-          return 0;
+          return nullptr;
         }
 
       return this->valuetype_adapter_->vf_map_find (repository_id);
     }
 
-  return 0;
+  return nullptr;
 }
 #endif
 
 // ****************************************************************
 
 TAO_Export TAO_ORB_Core *
-TAO_ORB_Core_instance (void)
+TAO_ORB_Core_instance ()
 {
   // @@ This is a slight violation of layering, we should use
   //    TAO_ORB_Core_instance(), but that breaks during startup.
   TAO::ORB_Table * const orb_table = TAO::ORB_Table::instance ();
-  if (orb_table->first_orb () == 0)
+  if (orb_table->first_orb () == nullptr)
     {
       ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard,
-                                *ACE_Static_Object_Lock::instance (), 0));
+                                *ACE_Static_Object_Lock::instance (), nullptr));
 
-      if (orb_table->first_orb () == 0)
+      if (orb_table->first_orb () == nullptr)
         {
           // Calling CORBA::ORB_init() returns a duplicated ORB
           // reference, so make sure that reference is stored in an
@@ -3729,7 +3725,7 @@ TAO_ORB_Core_instance (void)
           try
             {
               int argc = 0;
-              ACE_TCHAR **const argv= 0;
+              ACE_TCHAR **const argv= nullptr;
               CORBA::ORB_var orb =
                 CORBA::ORB_init (argc, argv);
             }
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index f29cd02430d..35b2b599763 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -41,11 +41,7 @@
 #include "ace/Lock_Adapter_T.h"
 #include "ace/TSS_T.h"
 #include "ace/Service_Config.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Data_Block;
@@ -171,7 +167,7 @@ public:
   TAO_ORB_Core (const char* id, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> g);
 
   /// Accessor for the ORB parameters.
-  TAO_ORB_Parameters *orb_params (void);
+  TAO_ORB_Parameters *orb_params ();
 
   /**
    * @todo
@@ -186,46 +182,46 @@ public:
    */
   /// Accessor to the POA current.
   //@{
-  CORBA::Object_ptr poa_current(void);
+  CORBA::Object_ptr poa_current();
   //@}
 
   /// Get the connector registry
-  TAO_Connector_Registry *connector_registry (void);
+  TAO_Connector_Registry *connector_registry ();
 
   /// Get the IOR parser registry
-  TAO_Parser_Registry *parser_registry (void);
+  TAO_Parser_Registry *parser_registry ();
 
   /// Return pointer to the policy factory registry associated with
   /// this ORB core.
-  TAO::PolicyFactory_Registry_Adapter *policy_factory_registry (void);
+  TAO::PolicyFactory_Registry_Adapter *policy_factory_registry ();
 
   /// Return pointer to the orb initializer registry associated with
   /// this ORB core. Tries to load the PI library if it is not loaded
   /// yet
-  TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry (void);
+  TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry ();
 
   TAO_ZIOP_Adapter *ziop_adapter () const;
   void ziop_adapter (TAO_ZIOP_Adapter *adapter);
 
-  TAO_Service_Context_Registry &service_context_registry (void);
+  TAO_Service_Context_Registry &service_context_registry ();
 
   /// Get the protocol factories
-  TAO_ProtocolFactorySet *protocol_factories (void);
+  TAO_ProtocolFactorySet *protocol_factories ();
 
   /// Get pointer to the ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// Wrappers that forward the request to the concurrency strategy.
-  ACE_Reactor *reactor (void);
+  ACE_Reactor *reactor ();
 
   /// Get the ACE_Thread_Manager
-  ACE_Thread_Manager *thr_mgr (void);
+  ACE_Thread_Manager *thr_mgr ();
 
   /// Return the RootPOA, or try to load it if not initialized already.
-  CORBA::Object_ptr root_poa (void);
+  CORBA::Object_ptr root_poa ();
 
   /// Get the adapter registry
-  TAO_Adapter_Registry &adapter_registry (void);
+  TAO_Adapter_Registry &adapter_registry ();
 
   /// @name Collocation Strategies as configured by the user
   //@{
@@ -250,17 +246,17 @@ public:
   /// Set/get the collocation flags
   //@{
   void optimize_collocation_objects (CORBA::Boolean opt);
-  CORBA::Boolean optimize_collocation_objects (void) const;
+  CORBA::Boolean optimize_collocation_objects () const;
 
   void use_global_collocation (CORBA::Boolean opt);
-  CORBA::Boolean use_global_collocation (void) const;
+  CORBA::Boolean use_global_collocation () const;
 
-  CORBA::ULong get_collocation_strategy (void) const;
+  CORBA::ULong get_collocation_strategy () const;
   //@}
 
   /// Get the adapter named "RootPOA" and cache the result, this is an
   /// optimization for the POA.
-  TAO_Adapter *poa_adapter (void);
+  TAO_Adapter *poa_adapter ();
 
   /**
    * @name Access to Factories
@@ -272,31 +268,31 @@ public:
    */
   //@{
   /// Returns pointer to the resource factory.
-  TAO_Resource_Factory *resource_factory (void);
+  TAO_Resource_Factory *resource_factory ();
 
   /// Returns pointer to the factory for creating gui resources
-  TAO::GUIResource_Factory *gui_resource_factory (void);
+  TAO::GUIResource_Factory *gui_resource_factory ();
 
   /// Returns pointer to the client factory.
-  TAO_Client_Strategy_Factory *client_factory (void);
+  TAO_Client_Strategy_Factory *client_factory ();
 
   /// Returns pointer to the server factory.
-  TAO_Server_Strategy_Factory *server_factory (void);
+  TAO_Server_Strategy_Factory *server_factory ();
 
   /// Returns pointer to the Protocols_Hooks.
-  TAO_Protocols_Hooks *protocols_hooks (void);
+  TAO_Protocols_Hooks *protocols_hooks ();
 
   /// Returns a pointer to the Thread Lane Resources Manager.
-  TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (void);
+  TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager ();
 
   /// Returns a pointer to the Collocation Resolver.
-  TAO_Collocation_Resolver &collocation_resolver (void);
+  TAO_Collocation_Resolver &collocation_resolver ();
 
   /// Returns a pointer to the Stub factory.
-  TAO_Stub_Factory *stub_factory (void);
+  TAO_Stub_Factory *stub_factory ();
 
   /// Returns a pointer to the endpoint selector factory.
-  TAO_Endpoint_Selector_Factory *endpoint_selector_factory (void);
+  TAO_Endpoint_Selector_Factory *endpoint_selector_factory ();
 
   //@}
 
@@ -315,41 +311,41 @@ public:
     const char *network_priority_protocols_hooks_name);
 
   /// Gets the value of TAO_ORB_Core::protocols_hooks__
-  TAO_Protocols_Hooks * get_protocols_hooks (void);
+  TAO_Protocols_Hooks * get_protocols_hooks ();
 
   /// Gets the value of TAO_ORB_Core::network_priority_protocols_hooks__
   TAO_Network_Priority_Protocols_Hooks *
-    get_network_priority_protocols_hooks (void);
+    get_network_priority_protocols_hooks ();
 
   /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_.
   static void dynamic_adapter_name (const char *name);
 
   /// Gets the value of TAO_ORB_Core::dynamic_adapter_name_.
-  static const char *dynamic_adapter_name (void);
+  static const char *dynamic_adapter_name ();
 
   /// Sets the value of TAO_ORB_Core::ifr_client_adapter_name_.
   static void ifr_client_adapter_name (const char *name);
 
   /// Gets the value of TAO_ORB_Core::ifr_client_adapter_name_.
-  static const char *ifr_client_adapter_name (void);
+  static const char *ifr_client_adapter_name ();
 
   /// Sets the value of TAO_ORB_Core::typecodefactory_adapter_name_.
   static void typecodefactory_adapter_name (const char *name);
 
   /// Gets the value of TAO_ORB_Core::typecodefactory_adapter_name_.
-  static const char *typecodefactory_adapter_name (void);
+  static const char *typecodefactory_adapter_name ();
 
   /// Sets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_.
   static void iorinterceptor_adapter_factory_name (const char *name);
 
   /// Gets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_.
-  static const char *iorinterceptor_adapter_factory_name (void);
+  static const char *iorinterceptor_adapter_factory_name ();
 
   /// Sets the value of TAO_ORB_Core::valuetype_adapter_factory_name.
   static void valuetype_adapter_factory_name (const char *name);
 
   /// Gets the value of TAO_ORB_Core::valuetype_adapter_factory_name.
-  static const char *valuetype_adapter_factory_name (void);
+  static const char *valuetype_adapter_factory_name ();
 
   /// See if we have a collocated address, if yes, return the POA
   /// associated with the address.
@@ -358,46 +354,46 @@ public:
   /// This allocator is always TSS and has no locks. It is intended
   /// for allocating the ACE_Data_Blocks used in *outgoing* CDR
   /// streams.
-  ACE_Allocator *output_cdr_dblock_allocator (void);
+  ACE_Allocator *output_cdr_dblock_allocator ();
 
   /// This allocator is always TSS and has no locks. It is intended
   /// for allocating the buffers used in *outgoing* CDR streams.
-  ACE_Allocator *output_cdr_buffer_allocator (void);
+  ACE_Allocator *output_cdr_buffer_allocator ();
 
   /// This allocator is always TSS and has no locks. It is intended
   /// for allocating the ACE_Data_Blocks used in *outgoing* CDR
   /// streams.
-  ACE_Allocator *output_cdr_msgblock_allocator (void);
+  ACE_Allocator *output_cdr_msgblock_allocator ();
 
   /// This allocator is global, may or may not have locks. It is
   /// intended for allocating the ACE_Data_Blocks used in *incoming*
   /// CDR streams.
-  ACE_Allocator *input_cdr_dblock_allocator (void);
+  ACE_Allocator *input_cdr_dblock_allocator ();
 
   /// This allocator is always global and has no locks. It is intended
   /// for allocating the buffers used in *incoming* CDR streams.
-  ACE_Allocator *input_cdr_buffer_allocator (void);
+  ACE_Allocator *input_cdr_buffer_allocator ();
 
   /// This allocator is always global and has no locks. It is intended
   /// for allocating the buffers used in *incoming* CDR streams.
-  ACE_Allocator *input_cdr_msgblock_allocator (void);
+  ACE_Allocator *input_cdr_msgblock_allocator ();
 
   /// This allocator is always global and has no locks. It is intended
   /// for allocating the buffers used to queue messages in
   /// transports.
-  ACE_Allocator *transport_message_buffer_allocator (void);
+  ACE_Allocator *transport_message_buffer_allocator ();
 
   /// The Message Blocks used for input CDRs must have appropriate
   /// locking strategies.
   ACE_Data_Block *create_input_cdr_data_block (size_t size);
 
   /// Return the locking strategy used for the data blocks.
-  ACE_Lock *locking_strategy (void);
+  ACE_Lock *locking_strategy ();
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
   /// Accessor method for the default_policies_
-  TAO_Policy_Set *get_default_policies (void);
+  TAO_Policy_Set *get_default_policies ();
 
   /// Get a policy.  First, check the ORB-level Policy Manager, then
   /// check the ORB defaults.
@@ -437,19 +433,19 @@ public:
    * tradeoffs and take a decision.
    */
   //@{
-  CORBA::Environment *default_environment (void) const;
+  CORBA::Environment *default_environment () const;
   void default_environment (CORBA::Environment*);
   //@}
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
   /// Return the Policy_Manager for this ORB.
-  TAO_Policy_Manager *policy_manager (void);
+  TAO_Policy_Manager *policy_manager ();
 
   /// Accesors to the policy current, this object should be kept in
   /// TSS storage.  The POA has to reset the policy current object on
   /// every upcall.
-  TAO_Policy_Current &policy_current (void);
+  TAO_Policy_Current &policy_current ();
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -540,7 +536,7 @@ public:
                                        Messaging::SyncScope &scope);
 
   /// Return the default sync scope configured for this ORB
-  Messaging::SyncScope default_sync_scope (void);
+  Messaging::SyncScope default_sync_scope ();
 
   /// Handle to the factory for protocols_hooks_..
   TAO_Protocols_Hooks *protocols_hooks_;
@@ -549,7 +545,7 @@ public:
   TAO_Network_Priority_Protocols_Hooks *network_priority_protocols_hooks_;
 
   /// Obtain the TSS resources of this orb.
-  TAO_ORB_Core_TSS_Resources* get_tss_resources (void);
+  TAO_ORB_Core_TSS_Resources* get_tss_resources ();
 
   /// Obtain the TSS resource in the given slot.
   void* get_tss_resource (size_t slot_id);
@@ -567,13 +563,13 @@ public:
   void tss_cleanup (ACE_Array_Base<void *> &ts_objects);
 
   /// Get access to the leader_follower class.
-  TAO_Leader_Follower &leader_follower (void);
+  TAO_Leader_Follower &leader_follower ();
 
   /// Get access to the leader follower strategy.
-  TAO_LF_Strategy &lf_strategy (void);
+  TAO_LF_Strategy &lf_strategy ();
 
   /// Get access to the thread lane resources.
-  TAO_Thread_Lane_Resources &lane_resources (void);
+  TAO_Thread_Lane_Resources &lane_resources ();
 
   /// Run the event loop.
   int run (ACE_Time_Value *tv, int perform_work);
@@ -582,13 +578,13 @@ public:
   void shutdown (CORBA::Boolean wait_for_completion);
 
   /// Get the shutdown flag value
-  bool has_shutdown (void) const;
+  bool has_shutdown () const;
 
   /// Shutdown the ORB and free resources
-  void destroy (void);
+  void destroy ();
 
   /// Check if ORB has shutdown.  If it has, throw an exception.
-  void check_shutdown (void);
+  void check_shutdown ();
 
   /// Returns the @a timeout value used by the server threads to poll
   /// the shutdown flag. If the return value is zero then the server
@@ -602,7 +598,7 @@ public:
                                 CORBA::PolicyList *policy_list);
 
   /// Factory method that create the "right" Stub depending on
-  /// wheather RTCORBA is loaded or not. The factory used to create
+  /// whether RTCORBA is loaded or not. The factory used to create
   /// the stub, is loaded at ORB initialization, and its type depends
   /// on the fact that RTCORBA is being used or not.
   TAO_Stub *create_stub (const char *repository_id,
@@ -628,53 +624,53 @@ public:
   CORBA::Long reinitialize_object (TAO_Stub *stub);
 
   /// Return ORBid string.
-  const char *orbid (void) const;
+  const char *orbid () const;
 
   /// Set/Get the IOR of the Implementation Repository service.
   //@{
-  CORBA::Object_ptr implrepo_service (void);
+  CORBA::Object_ptr implrepo_service ();
   void implrepo_service (const CORBA::Object_ptr ir);
   //@}
 
   /// Do we attempt to register with the Implementation Repository
-  CORBA::Boolean use_implrepo (void);
+  CORBA::Boolean use_implrepo ();
 
   /// Do we put the ImR's endpoints into persistent object references we create
-  CORBA::Boolean imr_endpoints_in_ior (void);
+  CORBA::Boolean imr_endpoints_in_ior ();
 
   /// Resolve the TypeCodeFactory DLL.
-  CORBA::Object_ptr resolve_typecodefactory (void);
+  CORBA::Object_ptr resolve_typecodefactory ();
 
 #if TAO_HAS_INTERCEPTORS == 1
   /// Resolve the PICurrent.
-  CORBA::Object_ptr resolve_picurrent (void);
+  CORBA::Object_ptr resolve_picurrent ();
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
   /// Resolve POA Current.
-  CORBA::Object_ptr resolve_poa_current (void);
+  CORBA::Object_ptr resolve_poa_current ();
 
   /// Resolve the CodecFactory DLL.
-  CORBA::Object_ptr resolve_codecfactory (void);
+  CORBA::Object_ptr resolve_codecfactory ();
 
   /// Resolve the Compression DLL.
-  CORBA::Object_ptr resolve_compression_manager (void);
+  CORBA::Object_ptr resolve_compression_manager ();
 
   /// Resolve the Dynamic Any Factory
-  CORBA::Object_ptr resolve_dynanyfactory (void);
+  CORBA::Object_ptr resolve_dynanyfactory ();
 
   /// Resolve the IOR Manipulation reference for this ORB.
-  CORBA::Object_ptr resolve_ior_manipulation (void);
+  CORBA::Object_ptr resolve_ior_manipulation ();
 
-  TAO_ZIOP_Adapter* ziop_adapter_i (void);
+  TAO_ZIOP_Adapter* ziop_adapter_i ();
 
   /// Resolve the IOR Table reference for this ORB.
-  CORBA::Object_ptr resolve_ior_table (void);
+  CORBA::Object_ptr resolve_ior_table ();
 
   /// Resolve the Async IOR Table reference for this ORB.
-  CORBA::Object_ptr resolve_async_ior_table (void);
+  CORBA::Object_ptr resolve_async_ior_table ();
 
   /// Resolve the Monitor reference for this ORB.
-  CORBA::Object_ptr resolve_monitor (void);
+  CORBA::Object_ptr resolve_monitor ();
 
   /// Resolve an initial reference via the -ORBInitRef and
   // -ORBDefaultInitRef options.
@@ -682,20 +678,20 @@ public:
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   /// Resolve the RT ORB reference for this ORB.
-  CORBA::Object_ptr resolve_rt_orb (void);
+  CORBA::Object_ptr resolve_rt_orb ();
 #endif
 
   /// Resolve the RT Current flyweight for this ORB.
   /// Return server_id string.
-  const char *server_id (void) const;
+  const char *server_id () const;
 
   /// List all the service known by the ORB
-  CORBA::ORB_ObjectIdList *list_initial_references (void);
+  CORBA::ORB_ObjectIdList *list_initial_references ();
 
   /// Reference counting...
-  unsigned long _incr_refcnt (void);
-  unsigned long _decr_refcnt (void);
-  unsigned long _refcnt (void) const;
+  unsigned long _incr_refcnt ();
+  unsigned long _decr_refcnt ();
+  unsigned long _refcnt () const;
 
   /// Register the handle of an open connection with the ORB Core
   /// handle set.  This handle set will be used to explicitly remove
@@ -748,12 +744,12 @@ public:
   CORBA::ULong hash_service (TAO_Profile *this_p, CORBA::ULong max);
 
   /// Return a reference to the Fault Tolerant service object.
-  TAO_Fault_Tolerance_Service &fault_tolerance_service (void);
+  TAO_Fault_Tolerance_Service &fault_tolerance_service ();
 
   /// Transmit the entire TAG_FT_GROUP component data from a server IOGR as
   /// a FT_GROUP_VERSION tagged service context on requests to that IOGR instead
   /// of just the group version.
-  CORBA::Boolean ft_send_extended_sc (void);
+  CORBA::Boolean ft_send_extended_sc ();
 
   /// Raise a comm failure exception if a service is not loaded, else
   /// delegate to the service to see what the service has to do for
@@ -782,7 +778,7 @@ public:
 #if TAO_HAS_INTERCEPTORS == 1
 
   /// Return a pointer to the cached TAO::PICurrent object.
-  CORBA::Object_ptr pi_current (void);
+  CORBA::Object_ptr pi_current ();
 
   /// Set the pointer to the cached TAO::PICurrent object.
   void pi_current (CORBA::Object_ptr current);
@@ -807,11 +803,11 @@ public:
 
   /// Get the Client Request Interceptor adapter.
   /// Will not create a new one if not available yet.
-  TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (void);
+  TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter ();
 
   /// Get the Server Request Interceptor adapter.
   /// Will not create a new one if not available yet.
-  TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter (void);
+  TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter ();
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
@@ -820,7 +816,7 @@ public:
   //@}
 
   /// Return the valuetype adapter
-  TAO_Valuetype_Adapter *valuetype_adapter (void);
+  TAO_Valuetype_Adapter *valuetype_adapter ();
 
 #if !defined(CORBA_E_MICRO)
   /// Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
@@ -839,25 +835,25 @@ public:
 
   /// Get the IOR Interceptor adapter. If not created, this method will try
   /// to create one.
-  TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void);
+  TAO_IORInterceptor_Adapter *ior_interceptor_adapter ();
 
   /// Set and Get methods to indicate whether a BiDir IIOP policy has
   /// been set in the POA.
   /// @note At present, the value will be true even if one of the POA's
   ///       is set with the Bi Dir GIOP policy.
-  CORBA::Boolean bidir_giop_policy (void);
+  CORBA::Boolean bidir_giop_policy ();
   void bidir_giop_policy (CORBA::Boolean);
 
   /// Return the table that maps object key/name to de-stringified
   /// object reference.  It is needed for supporting local objects in
   /// the resolve_initial_references() mechanism.
-  TAO_Object_Ref_Table &object_ref_table (void);
+  TAO_Object_Ref_Table &object_ref_table ();
 
   /// Acceessor to the table that stores the object_keys.
-  TAO::ObjectKey_Table &object_key_table (void);
+  TAO::ObjectKey_Table &object_key_table ();
 
   /// Return the current request dispatcher strategy.
-  TAO_Request_Dispatcher *request_dispatcher (void);
+  TAO_Request_Dispatcher *request_dispatcher ();
 
   /// Set a new request dispatcher.  The ORB Core retains ownership
   /// of the request dispatcher once it gets it.  Currently, this only
@@ -876,15 +872,15 @@ public:
    * The flushing strategies are stateless, therefore, there is only
    * one per ORB.
    */
-  TAO_Flushing_Strategy *flushing_strategy (void);
+  TAO_Flushing_Strategy *flushing_strategy ();
 
   /// Get Code Set Manager
-  TAO_Codeset_Manager *codeset_manager (void);
+  TAO_Codeset_Manager *codeset_manager ();
 
   typedef ACE_Array_Map<ACE_CString, ACE_CString> InitRefMap;
 
   /// Return a pointer to the -ORBInitRef map.
-  InitRefMap * init_ref_map (void);
+  InitRefMap * init_ref_map ();
 
   /// Set the ORB related to the orb_id as the default ORB and not the
   /// ORB that is first binded in the ORB Table
@@ -918,7 +914,7 @@ protected:
 
   /// Destructor is protected since the ORB Core is a reference
   /// counted object.
-  ~TAO_ORB_Core (void);
+  ~TAO_ORB_Core ();
 
   /// Initialize the guts of the ORB Core.  It is intended that this be
   /// called by CORBA::ORB_init().
@@ -926,7 +922,7 @@ protected:
 
   /// Final termination hook, typically called by CORBA::ORB's
   /// destructor.
-  int fini (void);
+  int fini ();
 
   /// Routine that creates a ACE_Data_Block given the lock and allocators.
   ACE_Data_Block *create_data_block_i (size_t size,
@@ -935,48 +931,48 @@ protected:
                                        ACE_Lock *lock);
 
   /// Obtain and cache the typecode factory object reference.
-  void resolve_typecodefactory_i (void);
+  void resolve_typecodefactory_i ();
 
   /// Obtain and cache the poa current.
-  void resolve_poa_current_i (void);
+  void resolve_poa_current_i ();
 
 #if TAO_HAS_INTERCEPTORS == 1
   /// Obtain and cache the picurrent factory object reference.
-  void resolve_picurrent_i (void);
+  void resolve_picurrent_i ();
 
   /// Get the Client Request Interceptor adapter.
   /// If not created, this method will try to create one if needed.
-  TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter_i (void);
+  TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter_i ();
 
   /// Get the Server Request Interceptor adapter.
   /// If not created, this method will try to create one if needed.
-  TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter_i (void);
+  TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter_i ();
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
   /// Obtain and cache the codec factory object reference.
-  void resolve_codecfactory_i (void);
+  void resolve_codecfactory_i ();
 
   /// Obtain and cache the compression manager object reference.
-  void resolve_compression_manager_i (void);
+  void resolve_compression_manager_i ();
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_dynanyfactory_i (void);
+  void resolve_dynanyfactory_i ();
 
   /// Obtain and cache the IORManipulation factory object reference.
-  void resolve_iormanipulation_i (void);
+  void resolve_iormanipulation_i ();
 
   /// Obtain and cache the Monitor object reference.
-  void resolve_monitor_i (void);
+  void resolve_monitor_i ();
 
   /// Search the Dynamic service list for well known services that has
   /// callbacks  which can be dynamically loaded.
-  void services_callbacks_init (void);
+  void services_callbacks_init ();
 
   /// Helper method that invokes Interceptor::destroy() on all
   /// registered interceptors when ORB::destroy() is called. Prevents
   /// exceptions from propagating up the call chain.
-  void destroy_interceptors (void);
+  void destroy_interceptors ();
 
   /// Pointer to the list of protocol loaded into this ORB instance.
   /// Helper method to hold the common code part for -ORBEndpoint and
@@ -986,11 +982,11 @@ protected:
 
   /// Return pointer to the policy factory registry associated with
   /// this ORB core.
-  TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_i (void);
+  TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_i ();
 
   /// Return pointer to the orb initializer registry associated with
   /// this ORB core.
-  TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (void);
+  TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i ();
 
   /// Common code from ::initialize_object and ::reinitialize_object
   CORBA::Long initialize_object_i (TAO_Stub *the_stub,
@@ -1005,10 +1001,10 @@ private:
   //@}
 
   /// Obtain and cache the ior table object reference.
-  void resolve_ior_table_i (void);
+  void resolve_ior_table_i ();
 
   /// Obtain and cache the async ior table object reference.
-  void resolve_async_ior_table_i (void);
+  void resolve_async_ior_table_i ();
 
   /// Checks to see whether collocation optimizations have to be
   /// applied on objects in the @a other_orb
@@ -1211,11 +1207,7 @@ protected:
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
   /// Number of outstanding references to this object.
-#if defined (ACE_HAS_CPP11)
   std::atomic<uint32_t> refcount_;
-#else
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
   /// Registry containing all registered policy factories.
   TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_;
@@ -1306,7 +1298,7 @@ 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 (void);
+  static TAO_ORB_Core_Static_Resources* instance ();
 
 public:
   /**
@@ -1376,7 +1368,7 @@ public:
 //private:
 
   /// Constructor.
-  TAO_ORB_Core_Static_Resources (void);
+  TAO_ORB_Core_Static_Resources ();
   TAO_ORB_Core_Static_Resources& operator=
       (const TAO_ORB_Core_Static_Resources&);
 
@@ -1392,7 +1384,7 @@ private:
 
 /// Obtain an instance of the first ORB core registered in the ORB
 /// table.
-TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void);
+TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance ();
 
 // ****************************************************************
 
diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl
index f68d3beef3d..f6ebac0549d 100644
--- a/TAO/tao/ORB_Core.inl
+++ b/TAO/tao/ORB_Core.inl
@@ -19,11 +19,7 @@ TAO_ORB_Core::_incr_refcnt (void)
 ACE_INLINE unsigned long
 TAO_ORB_Core::_refcnt (void) const
 {
-#if defined (ACE_HAS_CPP11)
   return this->refcount_;
-#else
-  return this->refcount_.value ();
-#endif /* ACE_HAS_CPP11 */
 }
 
 ACE_INLINE unsigned long
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp
index 44b464abf54..e3904b7661e 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.cpp
+++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp
@@ -8,9 +8,9 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void)
+TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr ()
 {
-  if (this->get () != 0)
+  if (this->get () != nullptr)
     {
       this->get ()->_decr_refcnt ();
     }
@@ -19,7 +19,7 @@ TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void)
 void
 TAO_ORB_Core_Auto_Ptr::reset (TAO_ORB_Core *p)
 {
-  if (this->get () != p && this->get () != 0)
+  if (this->get () != p && this->get () != nullptr)
     {
       this->get ()->_decr_refcnt ();
     }
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h
index be8c62fbd8c..0b7a3f6f6a3 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.h
+++ b/TAO/tao/ORB_Core_Auto_Ptr.h
@@ -38,7 +38,6 @@ class TAO_ORB_Core;
 class TAO_Export TAO_ORB_Core_Auto_Ptr
 {
 public:
-
   /**
    * @name Initialization and termination methods
    */
@@ -46,7 +45,7 @@ public:
   explicit TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p = 0);
   TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &ap);
   TAO_ORB_Core_Auto_Ptr &operator= (TAO_ORB_Core_Auto_Ptr &rhs);
-  ~TAO_ORB_Core_Auto_Ptr (void);
+  ~TAO_ORB_Core_Auto_Ptr ();
   //@}
 
   /**
@@ -54,8 +53,8 @@ public:
    */
   //@{
   TAO_ORB_Core &operator *() const;
-  TAO_ORB_Core *get (void) const;
-  TAO_ORB_Core *release (void);
+  TAO_ORB_Core *get () const;
+  TAO_ORB_Core *release ();
   void reset (TAO_ORB_Core *p = 0);
   TAO_ORB_Core *operator-> () const;
   //@}
diff --git a/TAO/tao/ORB_Core_TSS_Resources.cpp b/TAO/tao/ORB_Core_TSS_Resources.cpp
index 7e554596102..f59d131c6d6 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.cpp
+++ b/TAO/tao/ORB_Core_TSS_Resources.cpp
@@ -3,29 +3,29 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
+TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources ()
   : event_loop_thread_ (0)
   , client_leader_thread_ (0)
-  , lane_ (0)
+  , lane_ (nullptr)
   , ts_objects_ ()
   , upcalls_temporarily_suspended_on_this_thread_ (false)
-  , orb_core_ (0)
+  , orb_core_ (nullptr)
 {
 }
 
-TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
+TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources ()
 {
   this->fini ();
 }
 
 void
-TAO_ORB_Core_TSS_Resources::fini (void)
+TAO_ORB_Core_TSS_Resources::fini ()
 {
-  if (this->orb_core_ != 0)
+  if (this->orb_core_ != nullptr)
     {
       this->orb_core_->tss_cleanup (this->ts_objects_);
     }
-  this->orb_core_ = 0;
+  this->orb_core_ = nullptr;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h
index f5c12f9dd32..01e5a60de9c 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.h
+++ b/TAO/tao/ORB_Core_TSS_Resources.h
@@ -41,13 +41,13 @@ class TAO_Export TAO_ORB_Core_TSS_Resources
 public:
 
   /// Constructor
-  TAO_ORB_Core_TSS_Resources (void);
+  TAO_ORB_Core_TSS_Resources ();
 
   /// destructor
-  ~TAO_ORB_Core_TSS_Resources (void);
+  ~TAO_ORB_Core_TSS_Resources ();
 
   /// Cleans TSS resources.
-  void fini (void);
+  void fini ();
 
 private:
 
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index d31aea67b24..174c9272ecf 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -11,11 +11,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::ORB_Table::ORB_Table (void)
+TAO::ORB_Table::ORB_Table ()
   : lock_ (),
     first_orb_not_default_ (false),
     table_ (TAO_DEFAULT_ORB_TABLE_SIZE),
-    first_orb_ (0)
+    first_orb_ (nullptr)
 {
 }
 
@@ -25,7 +25,7 @@ TAO::ORB_Table::bind (char const * orb_id,
 {
   // Make sure that the supplied ORB core pointer is valid,
   // i.e. non-zero.
-  if (orb_id == 0 || orb_core == 0)
+  if (orb_id == nullptr || orb_core == nullptr)
     {
       errno = EINVAL;
       return -1;
@@ -46,7 +46,7 @@ TAO::ORB_Table::bind (char const * orb_id,
       // This is not the first ORB, but if the current default ORB
       // decided not to be the default and there is more than one ORB
       // then set this ORB to be the default.
-      if (this->first_orb_ != 0
+      if (this->first_orb_ != nullptr
           && this->first_orb_not_default_)
         {
           this->first_orb_ = orb_core;
@@ -55,7 +55,7 @@ TAO::ORB_Table::bind (char const * orb_id,
 
       // Set the "first_orb_" member for the first given ORB Core
       // that was successfully added to the ORB table.
-      if (this->first_orb_ == 0)
+      if (this->first_orb_ == nullptr)
         {
           this->first_orb_ = orb_core;
         }
@@ -67,12 +67,12 @@ TAO::ORB_Table::bind (char const * orb_id,
 TAO_ORB_Core *
 TAO::ORB_Table::find (char const * orb_id)
 {
-  TAO_ORB_Core * orb_core = 0;
+  TAO_ORB_Core * orb_core = nullptr;
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
                     this->lock_,
-                    0);
+                    nullptr);
 
   iterator const i = this->table_.find (Table::key_type (orb_id));
 
@@ -110,7 +110,7 @@ TAO::ORB_Table::unbind (const char *orb_id)
             }
           else
             {
-              this->first_orb_ = 0;
+              this->first_orb_ = nullptr;
             }
         }
     }
@@ -145,7 +145,7 @@ TAO::ORB_Table::not_default (char const * orb_id)
   // Check if there is a default ORB already and if it is *not* the
   // same as the orb_id thats passed in.  We don't have to do
   // anything.
-  if (this->first_orb_ != 0)
+  if (this->first_orb_ != nullptr)
     {
       if (ACE_OS::strcmp (this->first_orb_->orbid (), orb_id) != 0)
         {
@@ -162,7 +162,7 @@ TAO::ORB_Table::not_default (char const * orb_id)
 }
 
 TAO::ORB_Table *
-TAO::ORB_Table::instance (void)
+TAO::ORB_Table::instance ()
 {
   return TAO_Singleton<TAO::ORB_Table, TAO_SYNCH_MUTEX>::instance ();
 }
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index c1e5ed0d60e..8841c8d34a3 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -67,7 +67,7 @@ namespace TAO
      * @note See the note in the class description for an explanation
      *       of why this constructor is not protected.
      */
-    ORB_Table (void);
+    ORB_Table ();
 
     typedef ACE_Array_Map<CORBA::String_var,
                           ORB_Core_Ref_Counter,
@@ -82,8 +82,8 @@ namespace TAO
      * @name The canonical ACE_Map methods.
      */
     //@{
-    iterator begin (void);
-    iterator end (void);
+    iterator begin ();
+    iterator end ();
     int bind (const char *orb_id, ::TAO_ORB_Core *orb_core);
 
     /// Return @c TAO_ORB_Core corresponding to ORB with given @a
@@ -99,10 +99,10 @@ namespace TAO
 
     /// Obtain the first ORB for the @c ORB_Core_instance()
     /// implementation.
-    ::TAO_ORB_Core * first_orb (void);
+    ::TAO_ORB_Core * first_orb ();
 
     /// Return a unique instance
-    static ORB_Table * instance (void);
+    static ORB_Table * instance ();
 
     /// Set the ORB related to the orb_id as the default ORB and not the
     /// ORB that is first binded.
@@ -113,10 +113,10 @@ namespace TAO
     void not_default (char const * orb_id);
 
     /// Accessor to the underlying table_
-    Table * table (void);
+    Table * table ();
 
     /// Return reference to underlying lock.
-    TAO_SYNCH_MUTEX & lock (void);
+    TAO_SYNCH_MUTEX & lock ();
 
   private:
 
@@ -158,13 +158,13 @@ namespace TAO
   public:
 
     /// Constructor.
-    ORB_Core_Ref_Counter (void);
+    ORB_Core_Ref_Counter ();
 
     /// Constructor.
     ORB_Core_Ref_Counter (::TAO_ORB_Core * core);
 
     /// Destructor.
-    ~ORB_Core_Ref_Counter (void);
+    ~ORB_Core_Ref_Counter ();
 
     /// Copy constructor.
     ORB_Core_Ref_Counter (ORB_Core_Ref_Counter const & rhs);
@@ -173,7 +173,7 @@ namespace TAO
     void operator= (ORB_Core_Ref_Counter const & rhs);
 
     /// ORB_Core pointer accessor.
-    ::TAO_ORB_Core * core (void) const { return this->core_; }
+    ::TAO_ORB_Core * core () const { return this->core_; }
 
   private:
     ::TAO_ORB_Core * core_;
diff --git a/TAO/tao/ORB_Time_Policy.cpp b/TAO/tao/ORB_Time_Policy.cpp
index a8c9fe9672a..242197c6362 100644
--- a/TAO/tao/ORB_Time_Policy.cpp
+++ b/TAO/tao/ORB_Time_Policy.cpp
@@ -13,13 +13,13 @@ namespace TAO
 
   void ORB_Time_Policy::set_time_policy (ACE_Dynamic_Time_Policy_Base const * pol)
   {
-    if (pol != 0 )
+    if (pol != nullptr )
       {
         active_policy_ = pol;
       }
   }
 
-  void ORB_Time_Policy::reset_time_policy (void)
+  void ORB_Time_Policy::reset_time_policy ()
   {
     active_policy_ = &default_policy_;
   }
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index b96ae7b5125..f1be9002e7d 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -30,7 +30,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::Object::~Object (void)
+CORBA::Object::~Object ()
 {
   if (this->protocol_proxy_)
     (void) this->protocol_proxy_->_decr_refcnt ();
@@ -43,16 +43,16 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy,
   : refcount_ (1)
     , is_local_ (false)
     , is_evaluated_ (true)
-    , ior_ (0)
+    , ior_ (nullptr)
     , orb_core_ (orb_core)
     , protocol_proxy_ (protocol_proxy)
 {
   /// This constructor should not be called when the protocol proxy is
   /// null ie. when the object is a LocalObject. Assert that
   /// requirement.
-  ACE_ASSERT (this->protocol_proxy_ != 0);
+  ACE_ASSERT (this->protocol_proxy_ != nullptr);
 
-  if (this->orb_core_ == 0)
+  if (this->orb_core_ == nullptr)
     this->orb_core_ = this->protocol_proxy_->orb_core ();
 
   // Set the collocation marker on the stub. This may not be news to it.
@@ -70,7 +70,7 @@ CORBA::Object::Object (IOP::IOR *ior,
     , is_evaluated_ (false)
     , ior_ (ior)
     , orb_core_ (orb_core)
-    , protocol_proxy_ (0)
+    , protocol_proxy_ (nullptr)
 {
 }
 
@@ -93,13 +93,13 @@ if (!this->is_evaluated_) \
   }
 
 void
-CORBA::Object::_add_ref (void)
+CORBA::Object::_add_ref ()
 {
   ++this->refcount_;
 }
 
 void
-CORBA::Object::_remove_ref (void)
+CORBA::Object::_remove_ref ()
 {
   if (--this->refcount_ == 0)
     {
@@ -108,13 +108,9 @@ CORBA::Object::_remove_ref (void)
 }
 
 CORBA::ULong
-CORBA::Object::_refcount_value(void) const
+CORBA::Object::_refcount_value() const
 {
-#if defined (ACE_HAS_CPP11)
   return this->refcount_;
-#else
-  return this->refcount_.value ();
-#endif /* ACE_HAS_CPP11 */
 }
 
 void
@@ -134,7 +130,7 @@ CORBA::Object::marshal (TAO_OutputCDR &cdr)
 /*static*/ CORBA::Boolean
 CORBA::Object::marshal (const CORBA::Object_ptr x, TAO_OutputCDR &cdr)
 {
-  if (x == 0)
+  if (x == nullptr)
     {
       // NIL objrefs ... marshal as empty type hint, no elements.
       cdr.write_ulong (1);
@@ -164,7 +160,7 @@ CORBA::Object::_tao_stream_v (std::ostream &strm) const
 #endif /* GEN_OSTREAM_OPS */
 
 bool
-CORBA::Object::can_convert_to_ior (void) const
+CORBA::Object::can_convert_to_ior () const
 {
   // By default, objects can not be stringified if they are local
   return !this->_is_local ();
@@ -173,16 +169,16 @@ CORBA::Object::can_convert_to_ior (void) const
 char*
 CORBA::Object::convert_to_ior (bool, const char*) const
 {
-  return 0;
+  return nullptr;
 }
 
 TAO_Abstract_ServantBase*
-CORBA::Object::_servant (void) const
+CORBA::Object::_servant () const
 {
-  if (this->protocol_proxy_ == 0)
+  if (this->protocol_proxy_ == nullptr)
     {
       // No stub set. Should not happen.
-      return 0;
+      return nullptr;
     }
 
   return this->protocol_proxy_->collocated_servant ();
@@ -212,7 +208,7 @@ CORBA::Object::_is_a (const char *type_id)
   //
   // XXX if type_id is that of CORBA::Object, "yes, we comply" :-)
 
-  if (this->protocol_proxy_ == 0)
+  if (this->protocol_proxy_ == nullptr)
     {
       if (TAO_debug_level > 0)
         TAOLIB_ERROR ((LM_ERROR,
@@ -222,7 +218,7 @@ CORBA::Object::_is_a (const char *type_id)
       throw ::CORBA::NO_IMPLEMENT ();
     }
 
-  if (this->_stubobj ()->type_id.in () != 0
+  if (this->_stubobj ()->type_id.in () != nullptr
       && ACE_OS::strcmp (type_id,
                          this->_stubobj ()->type_id.in ()) == 0)
     return true;
@@ -231,13 +227,13 @@ CORBA::Object::_is_a (const char *type_id)
 }
 
 const char*
-CORBA::Object::_interface_repository_id (void) const
+CORBA::Object::_interface_repository_id () const
 {
   return "IDL:omg.org/CORBA/Object:1.0";
 }
 
 CORBA::Boolean
-CORBA::Object::_is_collocated (void) const
+CORBA::Object::_is_collocated () const
 {
   if (this->protocol_proxy_)
     {
@@ -248,19 +244,19 @@ CORBA::Object::_is_collocated (void) const
 }
 
 CORBA::Boolean
-CORBA::Object::_is_local (void) const
+CORBA::Object::_is_local () const
 {
   return this->is_local_;
 }
 
 TAO_Stub *
-CORBA::Object::_stubobj (void) const
+CORBA::Object::_stubobj () const
 {
   return this->protocol_proxy_;
 }
 
 TAO_Stub *
-CORBA::Object::_stubobj (void)
+CORBA::Object::_stubobj ()
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
   return this->protocol_proxy_;
@@ -271,7 +267,7 @@ CORBA::Object::_hash (CORBA::ULong maximum)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
-  if (this->protocol_proxy_ != 0)
+  if (this->protocol_proxy_ != nullptr)
     return this->protocol_proxy_->hash (maximum);
   else
     {
@@ -291,7 +287,7 @@ CORBA::Object::_hash (CORBA::ULong maximum)
 CORBA::Boolean
 CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj)
 {
-  if (other_obj == 0)
+  if (other_obj == nullptr)
     {
       return false;
     }
@@ -303,7 +299,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj)
 
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
-  if (this->protocol_proxy_ != 0)
+  if (this->protocol_proxy_ != nullptr)
     return this->protocol_proxy_->is_equivalent (other_obj);
 
   return false;
@@ -312,7 +308,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj)
 // TAO's extensions
 
 TAO::ObjectKey *
-CORBA::Object::_key (void)
+CORBA::Object::_key ()
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
@@ -342,13 +338,12 @@ CORBA::Object::_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker)
 CORBA::Boolean
 CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
 {
-
-  // If the profile length is zero for a non-evaluted IOR it is a
+  // If the profile length is zero for a non-evaluated IOR it is a
   // null-object.
   if ((!obj->is_evaluated ()) && obj->ior ().profiles.length () == 0)
     return true;
 
-  // To accomodate new definitions.
+  // To accommodate new definitions.
   if (obj->orb_core_)
     {
       return obj->orb_core_->object_is_nil (obj);
@@ -357,8 +352,6 @@ CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
   return false;
 }
 
-
-
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -376,7 +369,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
   // is a no-no.
   // Neither can we create a request object from locality constrained
   // object references.
-  if (ctx != 0 || this->protocol_proxy_ == 0)
+  if (ctx != nullptr || this->protocol_proxy_ == nullptr)
     {
       if (TAO_debug_level > 0)
         TAOLIB_ERROR ((LM_ERROR,
@@ -397,10 +390,9 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
                        operation,
                        arg_list,
                        result,
-                       0,
+                       nullptr,
                        request,
-                       req_flags
-                     );
+                       req_flags);
 }
 #endif
 
@@ -421,7 +413,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
   // is a no-no.
   // Neither can we create a request object from locality constrained
   // object references.
-  if (ctx != 0 || this->protocol_proxy_ == 0)
+  if (ctx != nullptr || this->protocol_proxy_ == nullptr)
     {
       if (TAO_debug_level > 0)
         TAOLIB_ERROR ((LM_ERROR,
@@ -481,7 +473,7 @@ CORBA::Object::_request (const char *operation)
 // the latter case, return true.
 
 CORBA::Boolean
-CORBA::Object::_non_existent (void)
+CORBA::Object::_non_existent ()
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
@@ -502,14 +494,14 @@ CORBA::Object::_non_existent (void)
 
 #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
 CORBA::InterfaceDef_ptr
-CORBA::Object::_get_interface (void)
+CORBA::Object::_get_interface ()
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
   return this->proxy_broker ()->_get_interface (this);
 }
 
 CORBA::Object_ptr
-CORBA::Object::_get_component (void)
+CORBA::Object::_get_component ()
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
   return this->proxy_broker ()->_get_component (this);
@@ -517,7 +509,7 @@ CORBA::Object::_get_component (void)
 #endif
 
 char*
-CORBA::Object::_repository_id (void)
+CORBA::Object::_repository_id ()
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
   return this->proxy_broker ()->_repository_id (this);
@@ -601,7 +593,7 @@ CORBA::Object::_set_policy_overrides (
 
   // If the stub is collocated and we don't have a collocated server we need
   // to reinitialize it to get it.
-  if (stub->is_collocated () && stub->collocated_servant () == 0)
+  if (stub->is_collocated () && stub->collocated_servant () == nullptr)
     {
       obj->orb_core ()->reinitialize_object (stub);
     }
@@ -633,7 +625,7 @@ CORBA::Object::_validate_connection (
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
-  inconsistent_policies = 0;
+  inconsistent_policies = nullptr;
   CORBA::Boolean retval = true;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -665,9 +657,9 @@ CORBA::Object::_validate_connection (
 
 
 CORBA::ORB_ptr
-CORBA::Object::_get_orb (void)
+CORBA::Object::_get_orb ()
 {
-  if (this->orb_core_ != 0)
+  if (this->orb_core_ != nullptr)
     {
       return CORBA::ORB::_duplicate (this->orb_core_->orb ());
     }
@@ -688,12 +680,11 @@ CORBA::Object::_get_orb (void)
 }
 
 TAO::Object_Proxy_Broker *
-CORBA::Object::proxy_broker (void) const
+CORBA::Object::proxy_broker () const
 {
   // Paranoid check. We *should* never access the proxy_broker
   // when the object has not been initialised so there *should*
-  // alway be a stub, but just in case...
-
+  // always be a stub, but just in case...
   if (this->protocol_proxy_)
     {
       return this->protocol_proxy_->object_proxy_broker ();
@@ -710,7 +701,7 @@ CORBA::Object::proxy_broker (void) const
 CORBA::Boolean
 operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x)
 {
-  if (x == 0)
+  if (x == nullptr)
     {
       // NIL objrefs ... marshal as empty type hint, no elements.
       cdr.write_ulong (1);
@@ -729,7 +720,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x)
 
    TAO_Stub *stubobj = x->_stubobj ();
 
-   if (stubobj == 0)
+   if (stubobj == nullptr)
      return false;
 
   return (stubobj->marshal (cdr));
@@ -751,7 +742,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
   TAO_MProfile mp (profile_count);
 
   TAO_ORB_Core *&orb_core = obj->orb_core_;
-  if (orb_core == 0)
+  if (orb_core == nullptr)
     {
       orb_core = TAO_ORB_Core_instance ();
       if (TAO_debug_level > 0)
@@ -763,7 +754,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
         }
     }
 
-  TAO_Stub *objdata = 0;
+  TAO_Stub *objdata = nullptr;
 
   try
     {
@@ -789,7 +780,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
 
           TAO_Profile *pfile = connector_registry->create_profile (cdr);
 
-          if (pfile != 0)
+          if (pfile != nullptr)
             {
               if (mp.give_profile (pfile) == -1)
               {
@@ -837,7 +828,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
   obj->is_evaluated_ = true;
 
   // Release the contents of the ior to keep memory consumption down.
-  obj->ior_ = 0;
+  obj->ior_ = nullptr;
 
   // Transfer ownership to the CORBA::Object
   (void) safe_objdata.release ();
@@ -849,7 +840,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
   bool lazy_strategy = false;
   TAO_ORB_Core *orb_core = cdr.orb_core ();
 
-  if (orb_core == 0)
+  if (orb_core == nullptr)
     {
       orb_core = TAO_ORB_Core_instance ();
       if (TAO_debug_level > 0)
@@ -872,7 +863,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
     {
       // If the user has set up a eager strategy..
       CORBA::String_var type_hint;
-
       if (!(cdr >> type_hint.inout ()))
         return false;
 
@@ -890,7 +880,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
       TAO_MProfile mp (profile_count);
 
       TAO_ORB_Core *orb_core = cdr.orb_core ();
-      if (orb_core == 0)
+      if (orb_core == nullptr)
         {
           orb_core = TAO_ORB_Core_instance ();
           if (TAO_debug_level > 0)
@@ -904,8 +894,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 
       // Ownership of type_hint is given to TAO_Stub
       // TAO_Stub will make a copy of mp!
-
-      TAO_Stub *objdata = 0;
+      TAO_Stub *objdata = nullptr;
 
       try
         {
@@ -915,7 +904,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
           for (CORBA::ULong i = 0; i != profile_count && cdr.good_bit (); ++i)
             {
               TAO_Profile *pfile = connector_registry->create_profile (cdr);
-              if (pfile != 0)
+              if (pfile != nullptr)
                 {
                   if (mp.give_profile (pfile) == -1)
                     {
@@ -966,7 +955,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
   else
     {
       // Lazy strategy!
-      IOP::IOR *ior = 0;
+      IOP::IOR *ior = nullptr;
 
       ACE_NEW_RETURN (ior,
                       IOP::IOR (),
@@ -983,7 +972,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
       ACE_NEW_NORETURN (x,
                         CORBA::Object (ior, orb_core));
 
-      if (x == 0)
+      if (x == nullptr)
         {
           // Can't allocate a CORBA Object so delete first the
           // memory we already allocated before we return
@@ -1009,7 +998,6 @@ operator<< (std::ostream &strm, CORBA::Object_ptr _tao_objref)
 // Traits specializations for CORBA::Object.
 namespace TAO
 {
-
   void In_Object_Argument_Cloner_T<CORBA::InterfaceDef_ptr>::duplicate
                                               (CORBA::InterfaceDef_ptr)
   {
@@ -1033,7 +1021,7 @@ namespace TAO
   }
 
   CORBA::Object_ptr
-  Objref_Traits<CORBA::Object>::nil (void)
+  Objref_Traits<CORBA::Object>::nil ()
   {
     return CORBA::Object::_nil ();
   }
@@ -1046,8 +1034,6 @@ namespace TAO
   }
 } // close TAO namespace
 
-
-TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void) = 0;
-
+TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) () = nullptr;
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index a2d2dd26fae..c7f9752374f 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -30,11 +30,7 @@
 #include "tao/Object_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
 #include "tao/Any_Insert_Policy_T.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 #if defined (HPUX) && defined (IOR)
    /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
@@ -101,9 +97,8 @@ namespace CORBA
   class TAO_Export Object
   {
   public:
-
     /// Destructor.
-    virtual ~Object (void);
+    virtual ~Object ();
 
     /**
      * @name Spec defined methods
@@ -116,7 +111,7 @@ namespace CORBA
     static CORBA::Object_ptr _duplicate (CORBA::Object_ptr obj);
 
     /// Return a NULL object.
-    static CORBA::Object_ptr _nil (void);
+    static CORBA::Object_ptr _nil ();
 
     /// No-op it is just here to simplify some templates.
     static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj);
@@ -132,7 +127,7 @@ namespace CORBA
 
     /// The repository ID for the most derived class, this is an
     /// implementation method and does no remote invocations!
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _interface_repository_id () const;
 
     /**
      * Return a (potentially non-unique) hash value for this object.
@@ -153,18 +148,18 @@ namespace CORBA
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-    virtual CORBA::Boolean _non_existent (void);
+    virtual CORBA::Boolean _non_existent ();
 
 #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     /// Get info about the object from the Interface Repository.
-    virtual InterfaceDef_ptr _get_interface (void);
+    virtual InterfaceDef_ptr _get_interface ();
 
     /// Get info about the object from the Interface Repository.
-    virtual CORBA::Object_ptr _get_component (void);
+    virtual CORBA::Object_ptr _get_component ();
 #endif
 
     /// Get the repository id.
-    virtual char * _repository_id (void);
+    virtual char * _repository_id ();
 
 #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     // DII operations to create a request.
@@ -218,7 +213,7 @@ namespace CORBA
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
-    virtual CORBA::ORB_ptr _get_orb (void);
+    virtual CORBA::ORB_ptr _get_orb ();
 
     /**
      * @name Reference Count Management
@@ -228,13 +223,13 @@ namespace CORBA
      */
     //@{
     /// Increment the reference count.
-    virtual void _add_ref (void);
+    virtual void _add_ref ();
 
     /// Decrement the reference count.
-    virtual void _remove_ref (void);
+    virtual void _remove_ref ();
 
     /// Get the refcount
-    virtual CORBA::ULong _refcount_value (void) const;
+    virtual CORBA::ULong _refcount_value () const;
     //@}
 
     // Useful for template programming.
@@ -252,15 +247,15 @@ namespace CORBA
 
     /// Accessor for the cached servant reference held on the stub
     /// if this object is collocated
-    virtual TAO_Abstract_ServantBase *_servant (void) const;
+    virtual TAO_Abstract_ServantBase *_servant () const;
 
     /// Is this object collocated with the servant?
     /// Note this does not return this->is_collocated_ but will instead
     /// query the underlying stub for its collocation status
-    virtual CORBA::Boolean _is_collocated (void) const;
+    virtual CORBA::Boolean _is_collocated () const;
 
     /// Is this a local object?
-    virtual CORBA::Boolean _is_local (void) const;
+    virtual CORBA::Boolean _is_local () const;
 
     /// Used in the implementation of CORBA::Any
     static void _tao_any_destructor (void*);
@@ -273,7 +268,7 @@ namespace CORBA
 
     /// Return the object key as an out parameter.  Caller should release
     /// return value when finished with it.
-    virtual TAO::ObjectKey *_key (void);
+    virtual TAO::ObjectKey *_key ();
 
     /// Constructor
     Object (TAO_Stub *p,
@@ -284,14 +279,13 @@ namespace CORBA
     Object (IOP::IOR *ior, TAO_ORB_Core *orb_core);
 
     /// Get the underlying stub object.
-    virtual TAO_Stub *_stubobj (void) const;
-    virtual TAO_Stub *_stubobj (void);
+    virtual TAO_Stub *_stubobj () const;
+    virtual TAO_Stub *_stubobj ();
 
     /// Set the proxy broker.
     virtual void _proxy_broker (TAO::Object_Proxy_Broker *proxy_broker);
 
   public:
-
     /// Allows us to forbid marshaling of local interfaces.
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -306,10 +300,10 @@ namespace CORBA
 #endif /* GEN_OSTREAM_OPS */
 
     /// Accessor to the flag..
-    CORBA::Boolean is_evaluated (void) const;
+    CORBA::Boolean is_evaluated () const;
 
     /// Accessor for the ORB_Core..
-    TAO_ORB_Core *orb_core (void) const;
+    TAO_ORB_Core *orb_core () const;
 
     /// Accessors for the underlying IOP::IOR's.
     /**
@@ -317,14 +311,14 @@ namespace CORBA
      * the IOR. This is useful for cases when one wants to initialize
      * a new CORBA Object
      */
-    IOP::IOR *steal_ior (void);
+    IOP::IOR *steal_ior ();
 
-    const IOP::IOR &ior (void) const;
+    const IOP::IOR &ior () const;
 
     //@} End of TAO-specific methods..
 
     /// Can this object be stringified?
-    virtual bool can_convert_to_ior (void) const;
+    virtual bool can_convert_to_ior () const;
 
     /// A hook to allow users to provide custom object stringification.
     /// @note This method is intended to be used by classes that
@@ -333,7 +327,7 @@ namespace CORBA
                                   const char* ior_prefix) const;
 
     /// Wrapper for _remove_ref(), naming convention for templatizing.
-    void _decr_refcount (void);
+    void _decr_refcount ();
 
   protected:
     /// Initializing a local object.
@@ -344,15 +338,10 @@ namespace CORBA
     TAO::Object_Proxy_Broker *proxy_broker () const;
 
     /// Number of outstanding references to this object.
-#if defined (ACE_HAS_CPP11)
 # define TAO_OBJECT_USES_STD_ATOMIC_REFCOUNT
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
   private:
-
     // = Unimplemented methods
     ACE_UNIMPLEMENTED_FUNC (Object (const Object &))
     ACE_UNIMPLEMENTED_FUNC (Object &operator = (const Object &))
@@ -419,7 +408,7 @@ namespace TAO
   {
     static CORBA::Object_ptr duplicate (CORBA::Object_ptr);
     static void release (CORBA::Object_ptr);
-    static CORBA::Object_ptr nil (void);
+    static CORBA::Object_ptr nil ();
     static CORBA::Boolean marshal (const CORBA::Object_ptr p,
                                    TAO_OutputCDR & cdr);
   };
@@ -436,7 +425,7 @@ namespace TAO
 /// library is present.
 extern
   TAO_Export TAO::Object_Proxy_Broker *
-  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void);
+  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) ();
 
 TAO_Export CORBA::Boolean
 operator<< (TAO_OutputCDR&, const CORBA::Object*);
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
index 328df7abc63..b6c5474b37f 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -31,19 +31,19 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs,
 }
 
 /********************************************************/
-TAO::ObjectKey_Table::ObjectKey_Table (void)
+TAO::ObjectKey_Table::ObjectKey_Table ()
   : table_ ()
 {
 
 }
 
-TAO::ObjectKey_Table::~ObjectKey_Table (void)
+TAO::ObjectKey_Table::~ObjectKey_Table ()
 {
   this->table_.close ();
 }
 
 int
-TAO::ObjectKey_Table::destroy (void)
+TAO::ObjectKey_Table::destroy ()
 {
   if (this->table_.current_size ())
     {
@@ -92,7 +92,7 @@ TAO::ObjectKey_Table::bind_i (const TAO::ObjectKey &key,
 int
 TAO::ObjectKey_Table::unbind_i (TAO::Refcounted_ObjectKey *&key_new)
 {
-  TAO::Refcounted_ObjectKey *tmp = 0;
+  TAO::Refcounted_ObjectKey *tmp = nullptr;
 
   if (this->table_.unbind (key_new->object_key (), tmp) != -1)
     {
diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
index d467e6d2711..55fa8ddcc0c 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -87,12 +87,12 @@ namespace TAO
   {
   public:
     /// Default Constructor and destructor..
-    ObjectKey_Table (void);
+    ObjectKey_Table ();
 
-    ~ObjectKey_Table (void);
+    ~ObjectKey_Table ();
 
     /// Iterates and unbinds the contents of the table.
-    int destroy (void);
+    int destroy ();
 
     /// Bind the ObjectKey in the table.
     /**
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index 5befb04c321..a2e2937c869 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -41,7 +41,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr arg (void) const;
+    S_ptr arg () const;
 
   protected:
     S_ptr x_;
@@ -67,9 +67,9 @@ namespace TAO
   {
   public:
     In_Object_Clonable_Argument_T (S_ptr x);
-    virtual ~In_Object_Clonable_Argument_T (void);
+    virtual ~In_Object_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -94,7 +94,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr & arg (void);
+    S_ptr & arg ();
 
   private:
     S_ptr & x_;
@@ -118,7 +118,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_out arg (void);
+    S_out arg ();
 
   private:
     S_ptr & x_;
@@ -137,16 +137,16 @@ namespace TAO
   {
   public:
 
-    Ret_Object_Argument_T (void);
+    Ret_Object_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 */
-    S_ptr & arg (void);
+    S_ptr & arg ();
 
-    S_ptr excp (void);
-    S_ptr retn (void);
+    S_ptr excp ();
+    S_ptr retn ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 6f128153b13..dc0c4745f8d 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -52,7 +52,7 @@ namespace TAO
 #if !defined (_TAO_OBJECTKEY_CS_)
 #define _TAO_OBJECTKEY_CS_
 
-TAO::ObjectKey::ObjectKey (void)
+TAO::ObjectKey::ObjectKey ()
 {}
 
 TAO::ObjectKey::ObjectKey (
@@ -76,7 +76,7 @@ TAO::ObjectKey::ObjectKey (
     (max, length, buffer, release)
 {}
 
-TAO::ObjectKey::~ObjectKey (void)
+TAO::ObjectKey::~ObjectKey ()
 {}
 
 // Hand crafted.
@@ -143,7 +143,7 @@ TAO::ObjectKey::decode_string_to_sequence (
   TAO::unbounded_value_sequence<CORBA::Octet> & seq,
   char const * str)
 {
-  if (str == 0)
+  if (str == nullptr)
     {
       seq.length (0);
       return;
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 9854f40b8d0..3ad8a251c09 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -84,7 +84,7 @@ namespace TAO
           >
   {
   public:
-    ObjectKey (void);
+    ObjectKey ();
     ObjectKey (CORBA::ULong max);
     ObjectKey (
         CORBA::ULong max,
@@ -92,13 +92,11 @@ namespace TAO
         CORBA::Octet* buffer,
         CORBA::Boolean release = false
       );
-#if defined (ACE_HAS_CPP11)
     ObjectKey (const ObjectKey &) = default;
     ObjectKey (ObjectKey &&) = default;
     ObjectKey& operator= (const ObjectKey &) = default;
     ObjectKey& operator= (ObjectKey &&) = default;
-#endif /* ACE_HAS_CPP11 */
-    ~ObjectKey (void);
+    ~ObjectKey ();
 
     typedef ObjectKey_var _var_type;
 
diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp
index 3dc0eb22099..4a1b32c30b6 100644
--- a/TAO/tao/Object_Loader.cpp
+++ b/TAO/tao/Object_Loader.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Object_Loader::~TAO_Object_Loader (void)
+TAO_Object_Loader::~TAO_Object_Loader ()
 {
 }
 
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index a40fe96d375..cbed00313fb 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -48,7 +48,7 @@ class TAO_Export TAO_Object_Loader : public ACE_Service_Object
 {
 public:
   /// The destructor
-  virtual ~TAO_Object_Loader (void);
+  virtual ~TAO_Object_Loader ();
 
   /**
    * Create and activate a new object into the orb.
diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp
index f5f4c45eff0..0870e737deb 100644
--- a/TAO/tao/Object_Proxy_Broker.cpp
+++ b/TAO/tao/Object_Proxy_Broker.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Object_Proxy_Broker::~Object_Proxy_Broker (void)
+TAO::Object_Proxy_Broker::~Object_Proxy_Broker ()
 {
 }
 
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index 4eaac3cbf0e..27fc4c656d2 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -49,9 +49,8 @@ namespace TAO
   class TAO_Export Object_Proxy_Broker
   {
   public:
-
     /// Destructor
-    virtual ~Object_Proxy_Broker (void);
+    virtual ~Object_Proxy_Broker ();
 
     virtual CORBA::Boolean _is_a (CORBA::Object_ptr target,
                                   const char *logical_type_id) = 0;
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index 3b2bf7360bc..e5268b7612e 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -64,7 +64,7 @@ TAO_Object_Ref_Table::bind_i (const char *id, CORBA::Object_ptr obj)
 {
   // Make sure that the supplied Object reference is valid,
   // i.e. not nil.
-  if (id == 0
+  if (id == nullptr
       || ACE_OS::strlen (id) == 0
       || ::CORBA::is_nil (obj))
     {
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
index 1eb79612fea..fb7ca8039ae 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -49,7 +49,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_Object_Ref_Table
 {
 public:
-
   typedef ACE_Array_Map<CORBA::String_var,
                         CORBA::Object_var,
                         TAO::String_Var_Equal_To> Table;
@@ -57,7 +56,7 @@ public:
   typedef Table::iterator iterator;
 
   /// Constructor
-  TAO_Object_Ref_Table (void);
+  TAO_Object_Ref_Table ();
 
   /**
    * Register an object reference with the table, and map the given
@@ -79,21 +78,20 @@ public:
   CORBA::Object_ptr resolve_initial_reference (const char * id);
 
   /// Explicitly destroy the contents of the object reference table.
-  void destroy (void);
+  void destroy ();
 
   /**
    * @name Forward Iterators
    */
   //@{
-  iterator begin (void);
-  iterator end (void);
+  iterator begin ();
+  iterator end ();
   //@}
 
   /// Return the current size of the underlying table.
-  size_t current_size (void) const;
+  size_t current_size () const;
 
 private:
-
   /**
    * @name The canonical ACE_Map methods
    */
@@ -104,19 +102,17 @@ private:
   //@}
 
 private:
-
-  // Disallow copying and assignment.
-  TAO_Object_Ref_Table (const TAO_Object_Ref_Table &);
-  void operator= (const TAO_Object_Ref_Table &);
+  TAO_Object_Ref_Table (const TAO_Object_Ref_Table &) = delete;
+  void operator= (const TAO_Object_Ref_Table &) = delete;
+  TAO_Object_Ref_Table (TAO_Object_Ref_Table &&) = delete;
+  void operator= (TAO_Object_Ref_Table &&) = delete;
 
 private:
-
   /// The implementation.
   Table table_;
 
   /// Table synchronization lock.
   TAO_SYNCH_MUTEX lock_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h
index 9f32df30fed..31f3aa3226e 100644
--- a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h
+++ b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h
@@ -45,12 +45,12 @@ public:
   {
   }
 
-  inline operator object_reference_type * (void) const
+  inline operator object_reference_type * () const
   {
     return *this->element_;
   }
 
-  inline object_reference_type * in (void) const
+  inline object_reference_type * in () const
   {
     return *this->element_;
   }
diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h
index c1d04e108fb..08e283e91e7 100644
--- a/TAO/tao/Object_Reference_Sequence_Element_T.h
+++ b/TAO/tao/Object_Reference_Sequence_Element_T.h
@@ -89,11 +89,11 @@ public:
     return *this->element_;
   }
 
-  inline object_reference_type *in (void) const {
+  inline object_reference_type *in () const {
     return *this->element_;
   }
 
-  inline object_reference_type *&inout (void) const {
+  inline object_reference_type *&inout () const {
     return *this->element_;
   }
 
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index 95c88afbe54..3d31c1cc941 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -47,14 +47,14 @@ template <typename T>
 class TAO_Objref_Var_T : private TAO_Base_var
 {
 public:
-  TAO_Objref_Var_T (void);
+  TAO_Objref_Var_T ();
   TAO_Objref_Var_T (T * p) : ptr_ (p) {}
   TAO_Objref_Var_T (const TAO_Objref_Var_T<T> &);
-  ~TAO_Objref_Var_T (void);
+  ~TAO_Objref_Var_T ();
 
   TAO_Objref_Var_T<T> & operator= (T *);
   TAO_Objref_Var_T<T> & operator= (const TAO_Objref_Var_T<T> &);
-  T * operator-> (void) const;
+  T * operator-> () const;
 
   /// Cast operators.
   operator T * const & () const;
@@ -66,17 +66,17 @@ public:
   typedef T *&  _out_type;
   typedef T *   _retn_type;
 
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _out_type     out (void);
-  _retn_type    _retn (void);
+  _in_type      in () const;
+  _inout_type   inout ();
+  _out_type     out ();
+  _retn_type    _retn ();
 
   /// TAO extension.
-  _retn_type    ptr (void) const;
+  _retn_type    ptr () const;
 
 protected:
   T * ptr_;
-  void free (void);
+  void free ();
   void reset (T *);
 
 private:
@@ -105,8 +105,8 @@ public:
   /// Cast operator.
   operator T *& ();
 
-  T *& ptr (void);
-  T * operator-> (void);
+  T *& ptr ();
+  T * operator-> ();
 
 private:
   T *& ptr_;
diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.cpp b/TAO/tao/On_Demand_Fragmentation_Strategy.cpp
index e9b790dd6fa..b5261fde697 100644
--- a/TAO/tao/On_Demand_Fragmentation_Strategy.cpp
+++ b/TAO/tao/On_Demand_Fragmentation_Strategy.cpp
@@ -17,7 +17,7 @@ TAO_On_Demand_Fragmentation_Strategy::TAO_On_Demand_Fragmentation_Strategy (
 }
 
 TAO_On_Demand_Fragmentation_Strategy::~TAO_On_Demand_Fragmentation_Strategy (
-  void)
+  )
 {
 }
 
@@ -27,7 +27,7 @@ TAO_On_Demand_Fragmentation_Strategy::fragment (
   ACE_CDR::ULong pending_alignment,
   ACE_CDR::ULong pending_length)
 {
-  if (this->transport_ == 0)
+  if (this->transport_ == nullptr)
     return 0;  // No transport.  Can't fragment.
 
   TAO_GIOP_Message_Version giop_version;
@@ -80,7 +80,7 @@ TAO_On_Demand_Fragmentation_Strategy::fragment (
       // bit.
       if (this->transport_->send_message (cdr,
                                           cdr.stub (),
-                                          0,
+                                          nullptr,
                                           cdr.message_semantics (),
                                           cdr.timeout ()) == -1
 
diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.h b/TAO/tao/On_Demand_Fragmentation_Strategy.h
index ef893a8849a..a695f89f735 100644
--- a/TAO/tao/On_Demand_Fragmentation_Strategy.h
+++ b/TAO/tao/On_Demand_Fragmentation_Strategy.h
@@ -52,9 +52,10 @@ public:
                         ACE_CDR::ULong pending_length);
 
 private:
-  // Disallow copying and assignment.
-  TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &);
-  void operator= (TAO_On_Demand_Fragmentation_Strategy const &);
+  TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &) = delete;
+  void operator= (TAO_On_Demand_Fragmentation_Strategy const &) = delete;
+  TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy &&) = delete;
+  void operator= (TAO_On_Demand_Fragmentation_Strategy &&) = delete;
 
 private:
   /// Pointer to the underlying transport object.
diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
index 2aa46394c6a..9907aa92961 100644
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ b/TAO/tao/PI/ClientRequestDetails.h
@@ -49,8 +49,7 @@ namespace TAO
   class ClientRequestDetails
   {
   public:
-
-    ClientRequestDetails (void);
+    ClientRequestDetails ();
 
     void apply_policies (const CORBA::PolicyList& policies);
 
@@ -61,7 +60,6 @@ namespace TAO
     bool should_be_processed (bool is_remote_request) const;
 
   private:
-
     /// The ProcessingMode setting that can be adjusted via the
     /// PortableInterceptor::ProcessingModePolicy.
     PortableInterceptor::ProcessingMode processing_mode_;
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index fc7a4980394..d2b95eb562e 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -31,7 +31,7 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv)
 }
 
 void
-TAO_ClientRequestInfo::setup_picurrent (void)
+TAO_ClientRequestInfo::setup_picurrent ()
 {
   // Retrieve the thread scope current (no TSS access incurred yet).
   CORBA::Object_ptr pi_current_obj =
@@ -75,7 +75,7 @@ TAO_ClientRequestInfo::get_service_context_i (
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::target (void)
+TAO_ClientRequestInfo::target ()
 {
   this->check_validity ();
 
@@ -83,7 +83,7 @@ TAO_ClientRequestInfo::target (void)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::effective_target (void)
+TAO_ClientRequestInfo::effective_target ()
 {
   this->check_validity ();
 
@@ -91,7 +91,7 @@ TAO_ClientRequestInfo::effective_target (void)
 }
 
 IOP::TaggedProfile *
-TAO_ClientRequestInfo::effective_profile (void)
+TAO_ClientRequestInfo::effective_profile ()
 {
   this->check_validity ();
 
@@ -128,7 +128,7 @@ TAO_ClientRequestInfo::effective_profile (void)
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ClientRequestInfo::received_exception (void)
+TAO_ClientRequestInfo::received_exception ()
 {
   this->check_validity ();
 
@@ -163,7 +163,7 @@ TAO_ClientRequestInfo::received_exception (void)
 }
 
 char *
-TAO_ClientRequestInfo::received_exception_id (void)
+TAO_ClientRequestInfo::received_exception_id ()
 {
   this->check_validity ();
 
@@ -309,7 +309,7 @@ TAO_ClientRequestInfo::add_request_service_context (
 }
 
 CORBA::ULong
-TAO_ClientRequestInfo::request_id (void)
+TAO_ClientRequestInfo::request_id ()
 {
   this->check_validity ();
 
@@ -393,7 +393,7 @@ TAO_ClientRequestInfo::request_id (void)
 }
 
 char *
-TAO_ClientRequestInfo::operation (void)
+TAO_ClientRequestInfo::operation ()
 {
   this->check_validity ();
 
@@ -401,7 +401,7 @@ TAO_ClientRequestInfo::operation (void)
 }
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo::arguments (void)
+TAO_ClientRequestInfo::arguments ()
 {
   this->check_validity ();
 
@@ -443,7 +443,7 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList &param_list)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo::exceptions (void)
+TAO_ClientRequestInfo::exceptions ()
 {
   this->check_validity ();
 
@@ -481,7 +481,7 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
 }
 
 Dynamic::ContextList *
-TAO_ClientRequestInfo::contexts (void)
+TAO_ClientRequestInfo::contexts ()
 {
   this->check_validity ();
 
@@ -489,7 +489,7 @@ TAO_ClientRequestInfo::contexts (void)
 }
 
 Dynamic::RequestContext *
-TAO_ClientRequestInfo::operation_context (void)
+TAO_ClientRequestInfo::operation_context ()
 {
   this->check_validity ();
 
@@ -497,7 +497,7 @@ TAO_ClientRequestInfo::operation_context (void)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::result (void)
+TAO_ClientRequestInfo::result ()
 {
   this->check_validity ();
 
@@ -526,7 +526,7 @@ TAO_ClientRequestInfo::result (CORBA::Any *any)
 }
 
 CORBA::Boolean
-TAO_ClientRequestInfo::response_expected (void)
+TAO_ClientRequestInfo::response_expected ()
 {
   this->check_validity ();
 
@@ -534,7 +534,7 @@ TAO_ClientRequestInfo::response_expected (void)
 }
 
 Messaging::SyncScope
-TAO_ClientRequestInfo::sync_scope (void)
+TAO_ClientRequestInfo::sync_scope ()
 {
   this->check_validity ();
 
@@ -542,7 +542,7 @@ TAO_ClientRequestInfo::sync_scope (void)
 }
 
 PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo::reply_status (void)
+TAO_ClientRequestInfo::reply_status ()
 {
   this->check_validity ();
 
@@ -558,7 +558,7 @@ TAO_ClientRequestInfo::reply_status (void)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::forward_reference (void)
+TAO_ClientRequestInfo::forward_reference ()
 {
   this->check_validity ();
 
@@ -606,7 +606,7 @@ TAO_ClientRequestInfo::get_reply_service_context (IOP::ServiceId id)
 }
 
 void
-TAO_ClientRequestInfo::check_validity (void)
+TAO_ClientRequestInfo::check_validity ()
 {
   if (this->invocation_ == 0)
     throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
@@ -619,7 +619,7 @@ TAO_ClientRequestInfo::tao_ft_expiration_time (TimeBase::TimeT time)
 }
 
 TimeBase::TimeT
-TAO_ClientRequestInfo::tao_ft_expiration_time (void) const
+TAO_ClientRequestInfo::tao_ft_expiration_time () const
 {
   return this->invocation_->operation_details ().ft_expiration_time ();
 }
@@ -631,7 +631,7 @@ TAO_ClientRequestInfo::tao_ft_retention_id (CORBA::Long request_id)
 }
 
 CORBA::Long
-TAO_ClientRequestInfo::tao_ft_retention_id (void) const
+TAO_ClientRequestInfo::tao_ft_retention_id () const
 {
   return this->invocation_->operation_details ().ft_retention_id ();
 }
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 00f692f7ffc..fe41ecb1f83 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -75,34 +75,34 @@ public:
 
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
-  virtual CORBA::ULong request_id (void);
+  virtual CORBA::ULong request_id ();
 
   /// Return the operation name for the current request.
-  virtual char * operation (void);
+  virtual char * operation ();
 
   /// Return the list of arguments passed to the current operation.
-  virtual Dynamic::ParameterList * arguments (void);
+  virtual Dynamic::ParameterList * arguments ();
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
-  virtual Dynamic::ExceptionList * exceptions (void);
+  virtual Dynamic::ExceptionList * exceptions ();
 
-  virtual Dynamic::ContextList * contexts (void);
+  virtual Dynamic::ContextList * contexts ();
 
-  virtual Dynamic::RequestContext * operation_context (void);
+  virtual Dynamic::RequestContext * operation_context ();
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
-  virtual CORBA::Any * result (void);
+  virtual CORBA::Any * result ();
 
   /// Returns true for a two-way operation, and false otherwise.
-  virtual CORBA::Boolean response_expected (void);
+  virtual CORBA::Boolean response_expected ();
 
   /// Return the sync_scope policy value for the current one-way
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
-  virtual Messaging::SyncScope sync_scope (void);
+  virtual Messaging::SyncScope sync_scope ();
 
   /// Return the reply status for the current request.
   /**
@@ -110,11 +110,11 @@ public:
    * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD,
    * TRANSPORT_RETRY, UNKNOWN.
    */
-  virtual PortableInterceptor::ReplyStatus reply_status (void);
+  virtual PortableInterceptor::ReplyStatus reply_status ();
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// return the object reference to which the request was forwarded.
-  virtual CORBA::Object_ptr forward_reference (void);
+  virtual CORBA::Object_ptr forward_reference ();
 
   virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id);
 
@@ -129,23 +129,23 @@ public:
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
-  virtual CORBA::Object_ptr target (void);
+  virtual CORBA::Object_ptr target ();
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
-  virtual CORBA::Object_ptr effective_target (void);
+  virtual CORBA::Object_ptr effective_target ();
 
-  virtual IOP::TaggedProfile * effective_profile (void);
+  virtual IOP::TaggedProfile * effective_profile ();
 
   /// Return an Any containing the received exception, if any.
   /// Otherwise, throw a CORBA::BAD_INV_ORDER exception.
   /**
    * @note There is no trivial way to extract the exception from an Any.
    */
-  virtual CORBA::Any * received_exception (void);
+  virtual CORBA::Any * received_exception ();
 
   /// Return the repository ID for the received exception.
-  virtual char * received_exception_id (void);
+  virtual char * received_exception_id ();
 
   /// Return the first IOP::TaggedComponent that matches the given
   /// IOP::ComponentId in the object reference for the current
@@ -176,20 +176,19 @@ public:
   void tao_ft_expiration_time (TimeBase::TimeT time);
 
   /// Get the absolute FT expiration time for this request
-  TimeBase::TimeT tao_ft_expiration_time (void) const;
+  TimeBase::TimeT tao_ft_expiration_time () const;
 
   /// Set the FT request retention ID for this request.
   void tao_ft_retention_id (CORBA::Long request_id);
 
   /// Get the FT request retention ID for this request.
-  CORBA::Long tao_ft_retention_id (void) const;
+  CORBA::Long tao_ft_retention_id () const;
 
   /*
   * End proprietary FT methods.
   */
 
 private:
-
   bool parameter_list (Dynamic::ParameterList &param_list);
 
   bool exception_list (Dynamic::ExceptionList &exception_list);
@@ -198,11 +197,11 @@ private:
 
   /// Check if this ClientRequestInfo object is called within the
   /// context of a request.
-  void check_validity (void);
+  void check_validity ();
 
   /// Setup thread scope and request scope
   /// PortableInterceptor::Current objects.
-  void setup_picurrent (void);
+  void setup_picurrent ();
 
   /// Helper method to get the request and response service contexts.
   IOP::ServiceContext *get_service_context_i (
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 6d746b2ea5a..2c4a2db3e32 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -255,7 +255,7 @@ namespace TAO
   }
 
   void
-  ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (void)
+  ClientRequestInterceptor_Adapter_Impl::destroy_interceptors ()
   {
     this->interceptor_list_.destroy_interceptors ();
   }
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index de01f6487f1..3f1c10c7af9 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -64,7 +64,7 @@ namespace TAO
     , public TAO_RequestInterceptor_Adapter_Impl
   {
   public:
-    ClientRequestInterceptor_Adapter_Impl (void);
+    ClientRequestInterceptor_Adapter_Impl ();
 
     /**
      * @name PortableInterceptor Client Side Interception Points
@@ -101,7 +101,7 @@ namespace TAO
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies);
 
-    virtual void destroy_interceptors (void);
+    virtual void destroy_interceptors ();
 
     virtual PortableInterceptor::ReplyStatus pi_reply_status (
       TAO::Invocation_Base const &invocation_base);
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
index 2b85812b366..10260d213a7 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
@@ -20,7 +20,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ClientRequestInterceptor_Adapter*
-TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void)
+TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create ()
 {
   TAO::ClientRequestInterceptor_Adapter_Impl* obj = 0;
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
index 75b079061b3..2166b6491a8 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
@@ -38,7 +38,7 @@ class TAO_PI_Export TAO_ClientRequestInterceptor_Adapter_Factory_Impl
   : public TAO_ClientRequestInterceptor_Adapter_Factory
 {
 public:
-  virtual TAO::ClientRequestInterceptor_Adapter *create (void);
+  virtual TAO::ClientRequestInterceptor_Adapter *create ();
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl)
diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
index 338bfbf4f58..306e088b265 100644
--- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
+++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
@@ -51,13 +51,9 @@ namespace PortableInterceptor
         const ACE_TCHAR * dll_name);
       virtual ~DLL_Resident_ORB_Initializer ();
 
-      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:
     PortableInterceptor::ORBInitializer_var initializer_;
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 8e9cdd52325..249b6bc2a84 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -180,8 +180,7 @@ namespace TAO
                     0,
                     EINVAL
                   ),
-                CORBA::COMPLETED_NO
-            );
+                CORBA::COMPLETED_NO);
       }
   }
 
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index 77da79213eb..e8fd6b39c04 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -60,7 +60,7 @@ namespace TAO
     };
 
     /// Constructor.
-    Interceptor_List (void);
+    Interceptor_List ();
 
     void add_interceptor (InterceptorType_ptr_type i);
 
@@ -68,7 +68,7 @@ namespace TAO
     void add_interceptor (InterceptorType_ptr_type i,
                           const CORBA::PolicyList& policies);
 
-    void destroy_interceptors (void);
+    void destroy_interceptors ();
 
     /// Return the registered interceptor in sequence element @a index.
     RegisteredInterceptor& registered_interceptor (size_t index);
@@ -76,7 +76,7 @@ namespace TAO
     /// Return the interceptor in sequence element @a index.
     InterceptorType_ptr_type interceptor (size_t index);
 
-    size_t size (void) const;
+    size_t size () const;
 
   private:
     typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray;
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 1006abbccec..aba8e1fb7b8 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -35,7 +35,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release (TAO_ORBInitInfo_ptr p)
 }
 
 TAO_ORBInitInfo_ptr
-TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void)
+TAO::Objref_Traits<TAO_ORBInitInfo>::nil ()
 {
   return TAO_ORBInitInfo::_nil ();
 }
@@ -61,12 +61,12 @@ TAO_ORBInitInfo::TAO_ORBInitInfo (TAO_ORB_Core *orb_core,
 {
 }
 
-TAO_ORBInitInfo::~TAO_ORBInitInfo (void)
+TAO_ORBInitInfo::~TAO_ORBInitInfo ()
 {
 }
 
 CORBA::StringSeq *
-TAO_ORBInitInfo::arguments (void)
+TAO_ORBInitInfo::arguments ()
 {
   this->check_validity ();
 
@@ -94,7 +94,7 @@ TAO_ORBInitInfo::arguments (void)
 }
 
 char *
-TAO_ORBInitInfo::orb_id (void)
+TAO_ORBInitInfo::orb_id ()
 {
   this->check_validity ();
 
@@ -104,7 +104,7 @@ TAO_ORBInitInfo::orb_id (void)
 }
 
 IOP::CodecFactory_ptr
-TAO_ORBInitInfo::codec_factory (void)
+TAO_ORBInitInfo::codec_factory ()
 {
   if (CORBA::is_nil (this->codec_factory_.in ()))
     {
@@ -277,7 +277,7 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy (
 }
 
 PortableInterceptor::SlotId
-TAO_ORBInitInfo::allocate_slot_id (void)
+TAO_ORBInitInfo::allocate_slot_id ()
 {
   this->check_validity ();
 
@@ -333,7 +333,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup)
 }
 
 void
-TAO_ORBInitInfo::check_validity (void)
+TAO_ORBInitInfo::check_validity ()
 {
   if (this->orb_core_ == 0)
     {
@@ -348,7 +348,7 @@ TAO_ORBInitInfo::check_validity (void)
 }
 
 CORBA::ORB_ptr
-TAO_ORBInitInfo::_get_orb (void)
+TAO_ORBInitInfo::_get_orb ()
 {
   this->check_validity ();
 
@@ -379,7 +379,7 @@ TAO_ORBInitInfo::_duplicate (TAO_ORBInitInfo_ptr obj)
   return obj;
 }
 
-const char* TAO_ORBInitInfo::_interface_repository_id (void) const
+const char* TAO_ORBInitInfo::_interface_repository_id () const
 {
   return "IDL:TAO_ORBInitInfo:1.0";
 }
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 4dc4efdca3f..a8b960f33d4 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -71,14 +71,14 @@ public:
   //@{
   /// Return the argument vector for the ORB currently being
   /// initialized as a string sequence.
-  virtual CORBA::StringSeq * arguments (void);
+  virtual CORBA::StringSeq * arguments ();
 
   /// Return the ORBid for the ORB currently being initialized.
-  virtual char * orb_id (void);
+  virtual char * orb_id ();
 
   /// Return the CodecFactory for the ORB currently being
   /// initialized.
-  virtual IOP::CodecFactory_ptr codec_factory (void);
+  virtual IOP::CodecFactory_ptr codec_factory ();
 
   /// Register a mapping between a string and a corresponding object
   /// reference with the ORB being initialized.
@@ -132,7 +132,7 @@ public:
 
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
-  virtual PortableInterceptor::SlotId allocate_slot_id (void);
+  virtual PortableInterceptor::SlotId allocate_slot_id ();
 
   /// Register a policy factory of the given policy type with the ORB
   /// currently being initialized.
@@ -140,7 +140,7 @@ public:
       CORBA::PolicyType type,
       PortableInterceptor::PolicyFactory_ptr policy_factory);
 
-  virtual CORBA::ORB_ptr _get_orb (void);
+  virtual CORBA::ORB_ptr _get_orb ();
   //@}
 
   /**
@@ -171,18 +171,18 @@ public:
    *
    * @note Only use this method if you know what you are doing.
    */
-  TAO_ORB_Core *orb_core (void) const;
+  TAO_ORB_Core *orb_core () const;
 
   /// Invalidate this ORBInitInfo instance.
   /**
    * @note This method is only meant to be called by the
    *       CORBA::ORB_init() function.
    */
-  void invalidate (void);
+  void invalidate ();
 
   /// Return the number of allocated slots in for the PICurrent
   /// object.
-  PortableInterceptor::SlotId slot_count (void) const;
+  PortableInterceptor::SlotId slot_count () const;
   //@}
 
   /**
@@ -202,24 +202,24 @@ public:
   static TAO_ORBInitInfo_ptr _unchecked_narrow (CORBA::Object_ptr obj);
 
 
-  static TAO_ORBInitInfo_ptr _nil (void)
+  static TAO_ORBInitInfo_ptr _nil ()
     {
       return (TAO_ORBInitInfo_ptr)0;
     }
   //@}
 
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _interface_repository_id () const;
 
 protected:
 
   /// Destructor is protected to enforce proper memory management
   /// through the reference counting mechanism.
-  ~TAO_ORBInitInfo (void);
+  ~TAO_ORBInitInfo ();
 
   /// Check if this ORBInitInfo instance is valid.  Once post_init()
   /// has been called on each of the ORBInitializers, this ORBInitInfo
   /// is no longer valid.  Throw an exception in that case.
-  void check_validity (void);
+  void check_validity ();
 
 private:
 
@@ -258,7 +258,7 @@ namespace TAO
   {
     static TAO_ORBInitInfo_ptr duplicate (TAO_ORBInitInfo_ptr);
     static void release (TAO_ORBInitInfo_ptr);
-    static TAO_ORBInitInfo_ptr nil (void);
+    static TAO_ORBInitInfo_ptr nil ();
     static CORBA::Boolean marshal (TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr);
   };
 }
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index c74c4f5e385..f21bc49245c 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -16,7 +16,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
+TAO::ORBInitializer_Registry::ORBInitializer_Registry ()
   : lock_ (),
     initializers_ ()
 {
@@ -66,7 +66,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
 }
 
 int
-TAO::ORBInitializer_Registry::fini (void)
+TAO::ORBInitializer_Registry::fini ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index f6c9de7cd2c..40156abfe85 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -43,7 +43,7 @@ namespace TAO
     : public ORBInitializer_Registry_Adapter
   {
   public:
-    ORBInitializer_Registry (void);
+    ORBInitializer_Registry ();
 
     /// Added to provide registration for the several static service
     /// objects, brought in with this ORBInitializer_Registry
@@ -57,7 +57,7 @@ namespace TAO
 
     /// Service config fini method, release all ORBInitializers at this
     /// moment
-    virtual int fini (void);
+    virtual int fini ();
 
     /// Register an ORBInitializer with the underlying ORBInitializer
     /// array.
@@ -81,8 +81,8 @@ namespace TAO
 
   private:
     // Prevent copying
-    ORBInitializer_Registry (const ORBInitializer_Registry &);
-    void operator= (const ORBInitializer_Registry &);
+    ORBInitializer_Registry (const ORBInitializer_Registry &) = delete;
+    void operator= (const ORBInitializer_Registry &) = delete;
 
   private:
     TAO_SYNCH_RECURSIVE_MUTEX lock_;
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 4a8dde4d7a1..319c44c812a 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // This one is used during static initialization while the other is used
 // when PI is a shared library.
 int
-TAO_PI_Init::Initializer (void)
+TAO_PI_Init::Initializer ()
 {
 #if TAO_HAS_INTERCEPTORS == 1
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_ClientRequestInterceptor_Adapter_Factory_Impl);
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index 2d0f9cbe662..addfd85df07 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -31,7 +31,7 @@ class TAO_PI_Export TAO_PI_Init
 public:
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 #if defined (TAO_AS_STATIC_LIBS) || (defined (ACE_VXWORKS) && !defined (__RTP__))
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 2a673e1eb3f..86bb1f2c632 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -20,10 +20,6 @@ TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core)
 {
 }
 
-TAO::PICurrent::~PICurrent (void)
-{
-}
-
 CORBA::Any *
 TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier)
 {
@@ -50,14 +46,14 @@ namespace
 }
 
 TAO::PICurrent_Impl *
-TAO::PICurrent::tsc (void)
+TAO::PICurrent::tsc ()
 {
   TAO::PICurrent_Impl *impl =
     static_cast<TAO::PICurrent_Impl *> (
       this->orb_core_.get_tss_resource (this->tss_slot_));
 
   // If this TSS has not yet been set-up, give it it's own PICurrent_Impl.
-  if (0 == impl)
+  if (!impl)
   {
     ACE_NEW_THROW_EX (impl,
                       TAO::PICurrent_Impl (&this->orb_core_, this->tss_slot_),
@@ -89,7 +85,7 @@ TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier)
 }
 
 CORBA::ORB_ptr
-TAO::PICurrent::_get_orb (void)
+TAO::PICurrent::_get_orb ()
 {
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index c5fb1391941..78ae7d699ec 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -76,14 +76,14 @@ namespace TAO
                            const CORBA::Any & data);
     //@}
 
-    virtual CORBA::ORB_ptr _get_orb (void);
+    virtual CORBA::ORB_ptr _get_orb ();
 
     /// Number of slots allocated in the slot table.
-    PortableInterceptor::SlotId slot_count (void) const;
+    PortableInterceptor::SlotId slot_count () const;
 
     /// Retrieve the PICurrent implementation from TSS, i.e. the thread
     /// scope current (TSC).
-    PICurrent_Impl * tsc (void);
+    PICurrent_Impl * tsc ();
 
     /// Verify the validity of the given SlotId.
     void check_validity (const PortableInterceptor::SlotId &identifier);
@@ -98,14 +98,14 @@ namespace TAO
      * counted, and should not be destroyed using delete() by anything
      * other than the reference counting mechanism.
      */
-    virtual ~PICurrent (void);
+    virtual ~PICurrent () = default;
 
   private:
     /// Prevent copying through the copy constructor and the assignment
     /// operator.
     //@{
-    PICurrent (const PICurrent &);
-    void operator= (const PICurrent &);
+    PICurrent (const PICurrent &) = delete;
+    void operator= (const PICurrent &) = delete;
     //@}
 
   private:
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index 3c3ae41dd95..9f8ccaba8f8 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -171,7 +171,7 @@ TAO::PICurrent_Impl::~PICurrent_Impl ()
 }
 
 void
-TAO::PICurrent_Impl::push (void)
+TAO::PICurrent_Impl::push ()
 {
   if (this->orb_core_) // We have a stack to adjust
     {
@@ -197,7 +197,7 @@ TAO::PICurrent_Impl::push (void)
 }
 
 void
-TAO::PICurrent_Impl::pop (void)
+TAO::PICurrent_Impl::pop ()
 {
   if (this->orb_core_) // We have a stack to adjust
     {
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 3d22b82bb1e..7819fdda9cc 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -52,7 +52,7 @@ namespace TAO
                     size_t tss_slot= 0,
                     PICurrent_Impl *pop= 0);
     /// Destructor.
-    ~PICurrent_Impl (void);
+    ~PICurrent_Impl ();
 
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
@@ -66,10 +66,10 @@ namespace TAO
     void take_lazy_copy (PICurrent_Impl *p);
 
     /// Push a new PICurrent_Impl on stack
-    void push (void);
+    void push ();
 
     /// Pop old PICurrent_Impl from stack
-    void pop (void);
+    void pop ();
 
   private:
     /// Force this object to convert from a logical (referenced)
@@ -97,8 +97,8 @@ namespace TAO
     /// Prevent copying through the copy constructor and the assignment
     /// operator.
     //@{
-    PICurrent_Impl (const PICurrent_Impl &);
-    void operator= (const PICurrent_Impl &);
+    PICurrent_Impl (const PICurrent_Impl &) = delete;
+    void operator= (const PICurrent_Impl &) = delete;
     //@}
 
   private:
diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp
index 5aa02eea3a9..123d4f54ea8 100644
--- a/TAO/tao/PI/PI_ORBInitializer.cpp
+++ b/TAO/tao/PI/PI_ORBInitializer.cpp
@@ -16,7 +16,6 @@ TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 {
 }
 
-
 void
 TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 {
@@ -39,7 +38,6 @@ TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   this->register_policy_factories (info);
 }
 
-
 void
 TAO_PI_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info)
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
index 082f9a3fdc5..8a7af55048d 100644
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ b/TAO/tao/PI/PI_ORBInitializer.h
@@ -37,7 +37,6 @@ class TAO_PI_Export TAO_PI_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name PortableInterceptor::ORBInitializer methods
    *
@@ -51,7 +50,6 @@ public:
   //@}
 
 private:
-
   /// Register PortableInterceptor policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
index fac7f3071af..85236c1f2cf 100644
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ b/TAO/tao/PI/PI_PolicyFactory.h
@@ -34,8 +34,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory
     public virtual ::CORBA::LocalObject
 {
 public:
-  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value);
+  CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index cf36dafbbb1..eb614ce9dbb 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.cpp
@@ -63,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
 }
 
 PortableInterceptor::PolicyFactory_ptr
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil ()
 {
   return PortableInterceptor::PolicyFactory::_nil ();
 }
@@ -77,10 +77,10 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal (
   return ::CORBA::Object::marshal (p, cdr);
 }
 
-PortableInterceptor::PolicyFactory::PolicyFactory (void)
+PortableInterceptor::PolicyFactory::PolicyFactory ()
 {}
 
-PortableInterceptor::PolicyFactory::~PolicyFactory (void)
+PortableInterceptor::PolicyFactory::~PolicyFactory ()
 {}
 
 PortableInterceptor::PolicyFactory_ptr
@@ -146,7 +146,7 @@ PortableInterceptor::PolicyFactory::_is_a (const char *value)
     }
 }
 
-const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const
+const char* PortableInterceptor::PolicyFactory::_interface_repository_id () const
 {
   return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
 }
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index 0b2dfabc75b..f97f52df981 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -106,7 +106,7 @@ namespace PortableInterceptor
 
       );
 
-    static PolicyFactory_ptr _nil (void)
+    static PolicyFactory_ptr _nil ()
     {
       return static_cast<PolicyFactory_ptr> (0);
     }
@@ -137,14 +137,14 @@ namespace PortableInterceptor
 
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _interface_repository_id () const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
   protected:
     // Abstract or local interface only.
-    PolicyFactory (void);
+    PolicyFactory ();
 
-    virtual ~PolicyFactory (void);
+    virtual ~PolicyFactory ();
 
   private:
     // Private and unimplemented for concrete interfaces.
@@ -179,7 +179,7 @@ namespace TAO
     static void release (
         ::PortableInterceptor::PolicyFactory_ptr
       );
-    static ::PortableInterceptor::PolicyFactory_ptr nil (void);
+    static ::PortableInterceptor::PolicyFactory_ptr nil ();
     static ::CORBA::Boolean marshal (
         ::PortableInterceptor::PolicyFactory_ptr p,
         TAO_OutputCDR & cdr
diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp
index 81cd0387879..252e0f9f1cf 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.cpp
+++ b/TAO/tao/PI/PolicyFactory_Loader.cpp
@@ -17,7 +17,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PolicyFactory_Registry_Adapter*
-TAO_PolicyFactory_Loader::create (void)
+TAO_PolicyFactory_Loader::create ()
 {
   TAO::PolicyFactory_Registry_Adapter* obj = 0;
   ACE_NEW_RETURN (obj,
@@ -27,7 +27,7 @@ TAO_PolicyFactory_Loader::create (void)
 }
 
 int
-TAO_PolicyFactory_Loader::Initializer (void)
+TAO_PolicyFactory_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader);
 }
diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h
index d96c7d39abd..98ad244420f 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.h
+++ b/TAO/tao/PI/PolicyFactory_Loader.h
@@ -31,10 +31,10 @@ class TAO_PI_Export TAO_PolicyFactory_Loader
 {
 public:
   /// Creates a Codec factory and returns it.
-  virtual TAO::PolicyFactory_Registry_Adapter* create (void);
+  virtual TAO::PolicyFactory_Registry_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/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index 0ff905feef5..fc8d396aece 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -6,12 +6,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
+TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry ()
   : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
 {
 }
 
-TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void)
+TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry ()
 {
   const TABLE::iterator end (this->factories_.end ());
 
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index ddd26b87151..9ea5fb17330 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -39,7 +39,6 @@ class TAO_PolicyFactory_Registry
   : public TAO::PolicyFactory_Registry_Adapter
 {
 public:
-
   /**
    * The type of table that maps policy type to policy factory.
    *
@@ -51,16 +50,14 @@ public:
    */
   typedef ACE_Map_Manager<CORBA::PolicyType,
                           PortableInterceptor::PolicyFactory_ptr,
-                          ACE_Null_Mutex>
-    TABLE;
+                          ACE_Null_Mutex> TABLE;
 
 public:
-
   /// Constructor
-  TAO_PolicyFactory_Registry (void);
+  TAO_PolicyFactory_Registry ();
 
   /// Destructor.  Releases duplicated PolicyFactory references.
-  ~TAO_PolicyFactory_Registry (void);
+  ~TAO_PolicyFactory_Registry ();
 
   /// Register a PolicyFactory with the underlying PolicyFactory
   /// sequence.  This method should only be called during ORB
@@ -83,10 +80,8 @@ public:
   bool factory_exists (CORBA::PolicyType & type) const;
 
 private:
-
   /// The table that maps policy type to policy factory.
   TABLE factories_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
index 046e5014ac4..85938fec13d 100644
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ b/TAO/tao/PI/ProcessingModePolicy.cpp
@@ -17,9 +17,9 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
 }
 
 CORBA::Policy_ptr
-TAO_ProcessingModePolicy::copy (void)
+TAO_ProcessingModePolicy::copy ()
 {
-  TAO_ProcessingModePolicy *copy = 0;
+  TAO_ProcessingModePolicy *copy {};
   ACE_NEW_THROW_EX (copy,
                     TAO_ProcessingModePolicy (this->processing_mode_),
                     CORBA::NO_MEMORY ());
@@ -28,18 +28,18 @@ TAO_ProcessingModePolicy::copy (void)
 }
 
 void
-TAO_ProcessingModePolicy::destroy (void)
+TAO_ProcessingModePolicy::destroy ()
 {
 }
 
 PortableInterceptor::ProcessingMode
-TAO_ProcessingModePolicy::processing_mode (void)
+TAO_ProcessingModePolicy::processing_mode ()
 {
   return processing_mode_;
 }
 
 CORBA::PolicyType
-TAO_ProcessingModePolicy::policy_type (void)
+TAO_ProcessingModePolicy::policy_type ()
 {
   return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE;
 }
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
index ce6d12690db..ecc270c8e3d 100644
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ b/TAO/tao/PI/ProcessingModePolicy.h
@@ -44,13 +44,13 @@ public:
   /// Constructor.
   TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode);
 
-  virtual PortableInterceptor::ProcessingMode processing_mode (void);
+  virtual PortableInterceptor::ProcessingMode processing_mode ();
 
-  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 ();
 
 private:
   /// The attribute
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 29ec2f53511..adb2c7c0597 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -13,7 +13,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Dynamic::ParameterList *
-TAO_RequestInfo_Util::make_parameter_list (void)
+TAO_RequestInfo_Util::make_parameter_list ()
 {
   Dynamic::ParameterList *parameter_list = 0;
   ACE_NEW_THROW_EX (parameter_list,
@@ -30,7 +30,7 @@ TAO_RequestInfo_Util::make_parameter_list (void)
 }
 
 Dynamic::ExceptionList *
-TAO_RequestInfo_Util::make_exception_list (void)
+TAO_RequestInfo_Util::make_exception_list ()
 {
   Dynamic::ExceptionList *exception_list = 0;
   ACE_NEW_THROW_EX (exception_list,
@@ -47,7 +47,7 @@ TAO_RequestInfo_Util::make_exception_list (void)
 }
 
 Dynamic::ContextList *
-TAO_RequestInfo_Util::make_context_list (void)
+TAO_RequestInfo_Util::make_context_list ()
 {
   Dynamic::ContextList *context_list = 0;
   ACE_NEW_THROW_EX (context_list,
@@ -64,7 +64,7 @@ TAO_RequestInfo_Util::make_context_list (void)
 }
 
 Dynamic::RequestContext *
-TAO_RequestInfo_Util::make_request_context (void)
+TAO_RequestInfo_Util::make_request_context ()
 {
   Dynamic::RequestContext *request_context = 0;
   ACE_NEW_THROW_EX (request_context,
diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index cf4c1b20366..56537358735 100644
--- a/TAO/tao/PI/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -51,7 +51,6 @@ namespace Dynamic
 class TAO_PI_Export TAO_RequestInfo_Util
 {
 public:
-
   /**
    * @name Factory Methods
    *
@@ -61,13 +60,13 @@ public:
    * class.
    */
   //@{
-  static Dynamic::ParameterList * make_parameter_list (void);
+  static Dynamic::ParameterList * make_parameter_list ();
 
-  static Dynamic::ExceptionList * make_exception_list (void);
+  static Dynamic::ExceptionList * make_exception_list ();
 
-  static Dynamic::ContextList * make_context_list (void);
+  static Dynamic::ContextList * make_context_list ();
 
-  static Dynamic::RequestContext * make_request_context (void);
+  static Dynamic::RequestContext * make_request_context ();
 
   static CORBA::Any * make_any (CORBA::Boolean tk_void_any);
   //@}
diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
index ce14ce596b4..b9c074cd79e 100644
--- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
@@ -20,7 +20,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl (void)
+TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl ()
 {
 }
 
diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h
index a3ff67558ef..44d76c58261 100644
--- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h
@@ -43,7 +43,7 @@ class TAO_PI_Export TAO_RequestInterceptor_Adapter_Impl
   : public TAO::RequestInterceptor_Adapter
 {
 public:
-  ~TAO_RequestInterceptor_Adapter_Impl (void);
+  ~TAO_RequestInterceptor_Adapter_Impl ();
 
   void popTSC (TAO_ORB_Core *orb_core);
   void pushTSC (TAO_ORB_Core *orb_core);
diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp
index 87500e8ff82..61f12fffadf 100644
--- a/TAO/tao/PI_Server/PICurrent_Guard.cpp
+++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp
@@ -53,7 +53,7 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
     }
 }
 
-TAO::PICurrent_Guard::~PICurrent_Guard (void)
+TAO::PICurrent_Guard::~PICurrent_Guard ()
 {
   if (this->src_ != 0 && this->dest_ != 0
       && this->src_ != this->dest_)
diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h
index 8eaee4ec81d..16014c78dca 100644
--- a/TAO/tao/PI_Server/PICurrent_Guard.h
+++ b/TAO/tao/PI_Server/PICurrent_Guard.h
@@ -72,7 +72,7 @@ namespace TAO
      * points are invoked, and after the starting and intermediate (if
      * any) interception points are invoked.
      */
-    ~PICurrent_Guard (void);
+    ~PICurrent_Guard ();
 
   private:
 
diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp
index 0c222f5d26b..322d9be2505 100644
--- a/TAO/tao/PI_Server/PI_Server.cpp
+++ b/TAO/tao/PI_Server/PI_Server.cpp
@@ -6,7 +6,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_PI_Server_Init::Initializer (void)
+TAO_PI_Server_Init::Initializer ()
 {
 #if TAO_HAS_INTERCEPTORS == 1
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_ServerRequestInterceptor_Adapter_Factory_Impl);
diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h
index 63b7f2b2281..f38922a5209 100644
--- a/TAO/tao/PI_Server/PI_Server.h
+++ b/TAO/tao/PI_Server/PI_Server.h
@@ -31,7 +31,7 @@ class TAO_PI_Server_Export TAO_PI_Server_Init
 public:
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index 6971657efc8..3c38f5cf1fd 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -8,12 +8,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PI_Server_Loader::TAO_PI_Server_Loader (void)
+TAO_PI_Server_Loader::TAO_PI_Server_Loader ()
   : initialized_ (false)
 {
 }
 
-TAO_PI_Server_Loader::~TAO_PI_Server_Loader (void)
+TAO_PI_Server_Loader::~TAO_PI_Server_Loader ()
 {
 }
 
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h
index 367a84faa81..d466c9a2564 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.h
+++ b/TAO/tao/PI_Server/PI_Server_Loader.h
@@ -27,10 +27,10 @@ class TAO_PI_Server_Export TAO_PI_Server_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_PI_Server_Loader (void);
+  TAO_PI_Server_Loader ();
 
   /// Destructor.
-  virtual ~TAO_PI_Server_Loader (void);
+  virtual ~TAO_PI_Server_Loader ();
 
   /// Initialize the PI_Server loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
@@ -40,7 +40,6 @@ private:
   bool initialized_;
 };
 
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PI_Server, TAO_PI_Server_Loader)
 ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_PI_Server_Loader)
 
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index d2499fe18a8..cf8df3cfa6d 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -29,7 +29,6 @@ class TAO_PortableServer_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name PortableInterceptor::ORBInitializer methods
    *
@@ -43,7 +42,6 @@ public:
   //@}
 
 private:
-
   /// Register PortableServer policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 };
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index d0cf73ac879..93470b44b2d 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -15,7 +15,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void)
+TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl ()
 {
 }
 
@@ -229,8 +229,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
   size_t nargs,
   TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  CORBA::ULong nexceptions
-  )
+  CORBA::ULong nexceptions)
 {
   // This method implements an "intermediate" server side interception
   // point.  Interceptors are invoked in the same order they were
@@ -258,7 +257,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
 
   try
     {
-      bool is_remote_request = !server_request.collocated ();
+      bool const is_remote_request = !server_request.collocated ();
 
       for (size_t i = 0; i < server_request.interceptor_count (); ++i)
         {
@@ -507,13 +506,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
 }
 
 void
-TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (void)
+TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors ()
 {
   this->interceptor_list_.destroy_interceptors ();
 }
 
 TAO::PICurrent_Impl *
-TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void)
+TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current ()
 {
   TAO::PICurrent_Impl *pi = 0;
   ACE_NEW_RETURN (pi,
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index 6c3efa5c4c7..15630621c6a 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -68,7 +68,7 @@ namespace TAO
   {
   public:
     /// Constructor.
-    ServerRequestInterceptor_Adapter_Impl (void);
+    ServerRequestInterceptor_Adapter_Impl ();
 
     /**
      * @name PortableInterceptor Server Side Interception Points
@@ -93,7 +93,7 @@ namespace TAO
 
     /// This method implements the "intermediate" server side
     /// interception point if the above #ifdef is set to 1 and a
-    /// starting intercetion point if it is not set to 1.
+    /// starting interception point if it is not set to 1.
     ///
     /// @note This method should have been the "starting" interception
     ///       point according to the interceptor spec. This will be
@@ -154,9 +154,9 @@ namespace TAO
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies);
 
-    virtual void destroy_interceptors (void);
+    virtual void destroy_interceptors ();
 
-    virtual TAO::PICurrent_Impl *allocate_pi_current (void);
+    virtual TAO::PICurrent_Impl *allocate_pi_current ();
 
     virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent);
 
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h
index 1e47815ef05..69ea625353f 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.h
+++ b/TAO/tao/PI_Server/ServerRequestDetails.h
@@ -49,7 +49,7 @@ namespace TAO
   class ServerRequestDetails
   {
   public:
-    ServerRequestDetails (void);
+    ServerRequestDetails ();
 
     void apply_policies (const CORBA::PolicyList& policies);
 
@@ -60,7 +60,6 @@ namespace TAO
     bool should_be_processed (bool is_remote_request) const;
 
   private:
-
     /// The ProcessingMode setting that can be adjusted via the
     /// PortableInterceptor::ProcessingModePolicy.
     PortableInterceptor::ProcessingMode processing_mode_;
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index bd0a9afa68b..418c92be0b1 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -27,7 +27,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::ULong
-TAO::ServerRequestInfo::request_id (void)
+TAO::ServerRequestInfo::request_id ()
 {
   // The request ID returned by this method need not correspond to the
   // GIOP request ID sent with the client request.  The request ID
@@ -65,15 +65,15 @@ TAO::ServerRequestInfo::request_id (void)
 }
 
 char *
-TAO::ServerRequestInfo::operation (void)
+TAO::ServerRequestInfo::operation ()
 {
   return CORBA::string_dup (this->server_request_.operation ());
 }
 
 Dynamic::ParameterList *
-TAO::ServerRequestInfo::arguments (void)
+TAO::ServerRequestInfo::arguments ()
 {
-  if (this->args_ == 0)
+  if (!this->args_)
     {
       throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
@@ -115,9 +115,9 @@ TAO::ServerRequestInfo::arguments (void)
 }
 
 Dynamic::ExceptionList *
-TAO::ServerRequestInfo::exceptions (void)
+TAO::ServerRequestInfo::exceptions ()
 {
-  if (this->args_ == 0)
+  if (!this->args_)
     {
       throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
@@ -145,21 +145,21 @@ TAO::ServerRequestInfo::exceptions (void)
 }
 
 Dynamic::ContextList *
-TAO::ServerRequestInfo::contexts (void)
+TAO::ServerRequestInfo::contexts ()
 {
   throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 Dynamic::RequestContext *
-TAO::ServerRequestInfo::operation_context (void)
+TAO::ServerRequestInfo::operation_context ()
 {
   throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 CORBA::Any *
-TAO::ServerRequestInfo::result (void)
+TAO::ServerRequestInfo::result ()
 {
-  if (this->args_ == 0)
+  if (!this->args_)
     {
       throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
     }
@@ -167,8 +167,7 @@ TAO::ServerRequestInfo::result (void)
   // Generate the result on demand.
   static CORBA::Boolean const tk_void_any = true;
 
-  CORBA::Any * result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any);
+  CORBA::Any * result_any = TAO_RequestInfo_Util::make_any (tk_void_any);
 
   CORBA::Any_var safe_result_any = result_any;
 
@@ -181,35 +180,41 @@ TAO::ServerRequestInfo::result (void)
 }
 
 CORBA::Boolean
-TAO::ServerRequestInfo::response_expected (void)
+TAO::ServerRequestInfo::response_expected ()
 {
   return this->server_request_.response_expected ();
 }
 
 Messaging::SyncScope
-TAO::ServerRequestInfo::sync_scope (void)
+TAO::ServerRequestInfo::sync_scope ()
 {
   if (this->server_request_.sync_with_server ())
+  {
     return Messaging::SYNC_WITH_SERVER;
+  }
 
   throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 PortableInterceptor::ReplyStatus
-TAO::ServerRequestInfo::reply_status (void)
+TAO::ServerRequestInfo::reply_status ()
 {
   if (this->server_request_.pi_reply_status () == -1)
+  {
     // A reply hasn't been received yet.
     throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
+  }
 
   return this->server_request_.pi_reply_status ();
 }
 
 CORBA::Object_ptr
-TAO::ServerRequestInfo::forward_reference (void)
+TAO::ServerRequestInfo::forward_reference ()
 {
   if (this->server_request_.pi_reply_status () != PortableInterceptor::LOCATION_FORWARD)
+  {
     throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
+  }
 
   // TAO_ServerRequest::forward_location() already duplicates the
   // object reference.  There is no need to duplicate it here.
@@ -227,7 +232,7 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
   TAO::PICurrent *pi_current =
     dynamic_cast <TAO::PICurrent*> (pi_current_obj);
 
-  if (pi_current == 0)
+  if (!pi_current)
     throw ::CORBA::INTERNAL ();
 
   pi_current->check_validity (id);
@@ -236,7 +241,6 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
   TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current ();
 
   return rsc->get_slot (id);
-
 }
 
 IOP::ServiceContext *
@@ -280,7 +284,7 @@ TAO::ServerRequestInfo::get_service_context_i (
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO::ServerRequestInfo::sending_exception (void)
+TAO::ServerRequestInfo::sending_exception ()
 {
   if (this->server_request_.pi_reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
       && this->server_request_.pi_reply_status () != PortableInterceptor::USER_EXCEPTION)
@@ -291,8 +295,7 @@ TAO::ServerRequestInfo::sending_exception (void)
   // The spec says that if it is a user exception which cannot be
   // inserted then the UNKNOWN exception should be thrown with minor
   // code 1.
-
-  CORBA::Any * temp = 0;
+  CORBA::Any * temp {};
 
   ACE_NEW_THROW_EX (temp,
                     CORBA::Any,
@@ -304,56 +307,61 @@ TAO::ServerRequestInfo::sending_exception (void)
 
   CORBA::Any_var caught_exception_var = temp;
 
-  if (this->server_request_.caught_exception () != 0)
+  if (this->server_request_.caught_exception ())
+  {
     (*temp) <<= *(this->server_request_.caught_exception ());
+  }
 
   return caught_exception_var._retn ();
 }
 
 char *
-TAO::ServerRequestInfo::server_id (void)
+TAO::ServerRequestInfo::server_id ()
 {
-  if (this->servant_upcall_ != 0)
-    return
-      CORBA::string_dup (this->server_request_.orb_core ()->server_id ());
+  if (this->servant_upcall_)
+  {
+    return CORBA::string_dup (this->server_request_.orb_core ()->server_id ());
+  }
 
   throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 char *
-TAO::ServerRequestInfo::orb_id (void)
+TAO::ServerRequestInfo::orb_id ()
 {
-  if (this->servant_upcall_ != 0)
-    return
-      CORBA::string_dup (this->server_request_.orb_core ()->orbid ());
+  if (this->servant_upcall_)
+  {
+    return CORBA::string_dup (this->server_request_.orb_core ()->orbid ());
+  }
 
   throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 PortableInterceptor::AdapterName *
-TAO::ServerRequestInfo::adapter_name (void)
+TAO::ServerRequestInfo::adapter_name ()
 {
   // The adapter_name attribute defines a name for the object adapter
   // that services requests for the invoked object. In the case of the
   // POA, the adapter_name is the sequence of names from the root POA
   // to the POA that services the request. The root POA is not named
   // in this sequence.
-  if (this->servant_upcall_ != 0)
-    return
-      this->servant_upcall_->poa ().adapter_name ();
+  if (this->servant_upcall_)
+  {
+    return this->servant_upcall_->poa ().adapter_name ();
+  }
 
   throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 PortableInterceptor::ObjectId *
-TAO::ServerRequestInfo::object_id (void)
+TAO::ServerRequestInfo::object_id ()
 {
   if (this->servant_upcall_ != 0)
     {
       const PortableServer::ObjectId &id =
         this->servant_upcall_->user_id ();
 
-      PortableInterceptor::ObjectId *tmp = 0;
+      PortableInterceptor::ObjectId *tmp {};
 
       ACE_NEW_THROW_EX (tmp,
                         PortableInterceptor::ObjectId,
@@ -385,21 +393,25 @@ TAO::ServerRequestInfo::object_id (void)
 }
 
 CORBA::OctetSeq *
-TAO::ServerRequestInfo::adapter_id (void)
+TAO::ServerRequestInfo::adapter_id ()
 {
-  if (this->servant_upcall_ != 0)
+  if (this->servant_upcall_)
+  {
     return this->servant_upcall_->poa ().id ();
+  }
 
   throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 char *
-TAO::ServerRequestInfo::target_most_derived_interface (void)
+TAO::ServerRequestInfo::target_most_derived_interface ()
 {
-  PortableServer::Servant const servant =
-    (this->servant_upcall_ == 0
-     ? 0
-     : this->servant_upcall_->servant ());
+  if (this->servant_upcall_ == 0)
+  {
+    throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
+  }
+
+  PortableServer::Servant const servant = this->servant_upcall_->servant ();
 
   if (servant == 0)
     {
@@ -446,7 +458,7 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
   TAO::PICurrent *pi_current =
     dynamic_cast <TAO::PICurrent*> (pi_current_obj);
 
-  if (pi_current == 0)
+  if (!pi_current)
     throw ::CORBA::INTERNAL ();
 
   pi_current->check_validity (id);
@@ -460,12 +472,13 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
 CORBA::Boolean
 TAO::ServerRequestInfo::target_is_a (const char * id)
 {
-  // Implemented in the generated skeleton.
+  if (this->servant_upcall_ == 0)
+  {
+    throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
+  }
 
-  PortableServer::Servant const servant =
-    (this->servant_upcall_ == 0
-     ? 0
-     : this->servant_upcall_->servant ());
+  // Implemented in the generated skeleton.
+  PortableServer::Servant const servant = this->servant_upcall_->servant ();
 
   if (servant == 0)
     {
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index af0274b0509..279a231b79c 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -70,7 +70,6 @@ namespace TAO
     , public virtual ::CORBA::LocalObject
   {
   public:
-
     /// Constructor.
     ServerRequestInfo (TAO_ServerRequest & server_request,
                        TAO::Argument * const * args,
@@ -81,34 +80,34 @@ namespace TAO
 
     /// Return an ID unique to the current request.  This request ID may
     /// or may not be the same as the GIOP request ID.
-    virtual CORBA::ULong request_id (void);
+    virtual CORBA::ULong request_id ();
 
     /// Return the operation name for the current request.
-    virtual char * operation (void);
+    virtual char * operation ();
 
     /// Return the list of arguments passed to the current operation.
-    virtual Dynamic::ParameterList * arguments (void);
+    virtual Dynamic::ParameterList * arguments ();
 
     /// Return the list of exceptions the current operation is capable
     /// of throwing.
-    virtual Dynamic::ExceptionList * exceptions (void);
+    virtual Dynamic::ExceptionList * exceptions ();
 
-    virtual Dynamic::ContextList * contexts (void);
+    virtual Dynamic::ContextList * contexts ();
 
-    virtual Dynamic::RequestContext * operation_context (void);
+    virtual Dynamic::RequestContext * operation_context ();
 
     /// Return the result of the current request.  If there is no
     /// return value then an @c Any with @c tk_void @c TypeCode is
     /// returned.  This method is not valid for oneway operations.
-    virtual CORBA::Any * result (void);
+    virtual CORBA::Any * result ();
 
     /// Returns @c true for a two-way operation, and @c false otherwise.
-    virtual CORBA::Boolean response_expected (void);
+    virtual CORBA::Boolean response_expected ();
 
     /// 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 (void);
+    virtual Messaging::SyncScope sync_scope ();
 
     /// Return the reply status for the current request.
     /**
@@ -116,12 +115,12 @@ namespace TAO
      * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD,
      * @c TRANSPORT_RETRY, @c UNKNOWN..
      */
-    virtual PortableInterceptor::ReplyStatus reply_status (void);
+    virtual PortableInterceptor::ReplyStatus reply_status ();
 
     /// If the reply status is
     /// @c PortableInterceptor::LOCATION_FORWARD return the
     /// object reference to which the request was forwarded.
-    virtual CORBA::Object_ptr forward_reference (void);
+    virtual CORBA::Object_ptr forward_reference ();
 
     /// Retrieve data from the "request scope" @c PICurrent object.
     virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id);
@@ -142,29 +141,29 @@ namespace TAO
      * @note There is no trivial way to extract the exception from an
      *       @c Any.
      */
-    virtual CORBA::Any * sending_exception (void);
+    virtual CORBA::Any * sending_exception ();
 
     /// Return the @c ObjectId for the target object.
-    virtual PortableInterceptor::ObjectId * object_id (void);
+    virtual PortableInterceptor::ObjectId * object_id ();
 
     /// Return the @c AdapterId for the POA handling the current
     /// request.
-    virtual CORBA::OctetSeq * adapter_id (void);
+    virtual CORBA::OctetSeq * adapter_id ();
 
     /// Return the server_id of the server. The value is passed to
     /// the ORB via @c -ORBServerId parameter.
-    virtual char * server_id (void);
+    virtual char * server_id ();
 
     /// Return the ORBId value that is passed to the @c ORB_init
     /// call.
-    virtual char * orb_id (void);
+    virtual char * orb_id ();
 
     /// Return the name of the object adapter that services requests
     /// for the invoked object.
-    virtual PortableInterceptor::AdapterName * adapter_name (void);
+    virtual PortableInterceptor::AdapterName * adapter_name ();
 
     /// Return the most derived interface of the target object.
-    virtual char * target_most_derived_interface (void);
+    virtual char * target_most_derived_interface ();
 
     /// Return the policy of the given type in effect for the current
     /// request.
@@ -185,7 +184,6 @@ namespace TAO
         CORBA::Boolean replace);
 
   public:
-
     /**
      * @name Helper methods specific to TAO.
      */
@@ -209,10 +207,9 @@ namespace TAO
 
     /// Return a reference to the underlying @c TAO_ServerRequest
     /// object.
-    TAO_ServerRequest &server_request (void);
+    TAO_ServerRequest &server_request ();
 
   protected:
-
     /// Helper method to get the request and response service
     /// contexts.
     IOP::ServiceContext * get_service_context_i (
@@ -220,7 +217,6 @@ namespace TAO
         IOP::ServiceId id);
 
   protected:
-
     /// Underlying request object that contains much of the
     /// information encapsulated by this @c ServerRequestInfo
     /// implementation.
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl
index 190306e3b6c..836e40c0572 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -1,7 +1,6 @@
 // -*- C++ -*-
 #include "tao/PortableServer/Servant_Upcall.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
@@ -27,7 +26,6 @@ TAO::ServerRequestInfo::forward_reference (
 {
   // Note that we're converting the ForwardRequest exception in to a
   // LOCATION_FORWARD reply, so we do not set the exception status.
-
   this->server_request_.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
 
   // Store the forward reference in the TAO_ServerRequest object.
@@ -39,7 +37,6 @@ TAO::ServerRequestInfo::forward_reference (CORBA::Object_ptr obj)
 {
   // We only get here if a servant manager threw a
   // PortableServer::ForwardRequest exception.
-
   this->server_request_.pi_reply_status (PortableInterceptor::LOCATION_FORWARD);
 
   // Store the forward reference in the TAO_ServerRequest object.
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
index 30d7fe51d1a..80f6f6100b5 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
@@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil ()
 {
   return PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
@@ -78,10 +78,10 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal (
   return ::CORBA::Object::marshal (p, cdr);
 }
 
-PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
+PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor ()
 {}
 
-PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
+PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor ()
 {}
 
 PortableInterceptor::ServerRequestInterceptor_ptr
@@ -156,7 +156,7 @@ PortableInterceptor::ServerRequestInterceptor::_is_a (
     }
 }
 
-const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const
+const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id () const
 {
   return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0";
 }
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index 676567e42ef..4dce9d6cc6a 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -131,7 +131,7 @@ namespace PortableInterceptor
 
       );
 
-    static ServerRequestInterceptor_ptr _nil (void)
+    static ServerRequestInterceptor_ptr _nil ()
     {
       return static_cast<ServerRequestInterceptor_ptr> (0);
     }
@@ -203,14 +203,14 @@ namespace PortableInterceptor
 
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _interface_repository_id () const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
   protected:
     // Abstract or local interface only.
-    ServerRequestInterceptor (void);
+    ServerRequestInterceptor ();
 
-    virtual ~ServerRequestInterceptor (void);
+    virtual ~ServerRequestInterceptor ();
 
   private:
     // Private and unimplemented for concrete interfaces.
@@ -245,7 +245,7 @@ namespace TAO
     static void release (
         ::PortableInterceptor::ServerRequestInfo_ptr
       );
-    static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
+    static ::PortableInterceptor::ServerRequestInfo_ptr nil ();
     static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ServerRequestInfo_ptr p,
         TAO_OutputCDR & cdr
@@ -266,7 +266,7 @@ namespace TAO
     static void release (
         ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
-    static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
+    static ::PortableInterceptor::ServerRequestInterceptor_ptr nil ();
     static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ServerRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
index f04d2565187..c4123f9b325 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
@@ -20,7 +20,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ServerRequestInterceptor_Adapter*
-TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void)
+TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create ()
 {
   TAO::ServerRequestInterceptor_Adapter_Impl* obj = 0;
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h
index 7c7abdab60b..9cacd9b0172 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h
@@ -38,7 +38,7 @@ class TAO_PI_Server_Export TAO_ServerRequestInterceptor_Adapter_Factory_Impl
   : public TAO_ServerRequestInterceptor_Adapter_Factory
 {
 public:
-  virtual TAO::ServerRequestInterceptor_Adapter *create (void);
+  virtual TAO::ServerRequestInterceptor_Adapter *create ();
 };
 
 
diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp
index cd35119b474..eed0f04a2cd 100644
--- a/TAO/tao/Parser_Registry.cpp
+++ b/TAO/tao/Parser_Registry.cpp
@@ -11,13 +11,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Parser_Registry::TAO_Parser_Registry (void)
-  : parsers_ (0),
+TAO_Parser_Registry::TAO_Parser_Registry ()
+  : parsers_ (nullptr),
     size_ (0)
 {
 }
 
-TAO_Parser_Registry::~TAO_Parser_Registry (void)
+TAO_Parser_Registry::~TAO_Parser_Registry ()
 {
   delete [] this->parsers_;
 }
@@ -25,10 +25,10 @@ TAO_Parser_Registry::~TAO_Parser_Registry (void)
 int
 TAO_Parser_Registry::open (TAO_ORB_Core *orb_core)
 {
-  char **names = 0;
+  char **names = nullptr;
   int number_of_names = 0;
 
-  if (orb_core->resource_factory () == 0)
+  if (orb_core->resource_factory () == nullptr)
     {
       return -1;
     }
@@ -51,7 +51,7 @@ TAO_Parser_Registry::open (TAO_ORB_Core *orb_core)
         ACE_Dynamic_Service<TAO_IOR_Parser>::instance (orb_core->configuration (),
                                                        names [i]);
 
-      if (this->parsers_[index] == 0)
+      if (this->parsers_[index] == nullptr)
         {
           --number_of_names;
           if (TAO_debug_level >= 1)
@@ -81,7 +81,7 @@ TAO_Parser_Registry::match_parser (const char *ior_string)
         }
     }
 
-  return 0;
+  return nullptr;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h
index daacd764291..91c355f9bf0 100644
--- a/TAO/tao/Parser_Registry.h
+++ b/TAO/tao/Parser_Registry.h
@@ -45,10 +45,10 @@ class TAO_Export TAO_Parser_Registry
 {
 public:
   /// Default constructor.
-  TAO_Parser_Registry (void);
+  TAO_Parser_Registry ();
 
   /// Dstructor.
-  ~TAO_Parser_Registry (void);
+  ~TAO_Parser_Registry ();
 
   /// Initialize the parser registry with the list of known protocols.
   /// Invoked by the ORB during startup.
@@ -60,8 +60,8 @@ public:
 
   // = Iterator.
   typedef TAO_IOR_Parser** Parser_Iterator;
-  Parser_Iterator begin (void) const;
-  Parser_Iterator end (void) const;
+  Parser_Iterator begin () const;
+  Parser_Iterator end () const;
 
 private:
 
diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp
index fd43f298cee..28b548ce1df 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ b/TAO/tao/Pluggable_Messaging_Utils.cpp
@@ -8,7 +8,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_Transport *t)
-  : input_cdr_ (0)
+  : input_cdr_ (nullptr)
   , transport_ (t)
 {
 }
diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h
index 484ccbd5925..6cab6a91408 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ b/TAO/tao/Pluggable_Messaging_Utils.h
@@ -41,7 +41,7 @@ class TAO_Export TAO_Pluggable_Reply_Params_Base
 {
 public:
   /// Constructor.
-  TAO_Pluggable_Reply_Params_Base (void);
+  TAO_Pluggable_Reply_Params_Base ();
 
   /// The IOP service context list.
   IOP::ServiceContextList svc_ctx_;
@@ -66,17 +66,17 @@ public:
    * a service context list and would like to pass on their contents
    * without a copy.
    */
-  IOP::ServiceContextList &service_context_notowned (void);
+  IOP::ServiceContextList &service_context_notowned ();
   void service_context_notowned (IOP::ServiceContextList *svc);
 
   /// A flag that indicates if there is any data is going to get
   /// marshalled in the reply
   CORBA::Boolean argument_flag_;
 
-  GIOP::ReplyStatusType reply_status (void) const;
+  GIOP::ReplyStatusType reply_status () const;
   void reply_status (GIOP::ReplyStatusType status);
 
-  GIOP::LocateStatusType locate_reply_status (void) const;
+  GIOP::LocateStatusType locate_reply_status () const;
   void locate_reply_status (GIOP::LocateStatusType status);
 
 protected:
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.cpp b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
index 6c75b805ad4..7ec9258e60c 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void)
+TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter ()
 {
 }
 
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h
index 275a419cbc2..e359b804871 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.h
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.h
@@ -53,7 +53,7 @@ namespace TAO
   class TAO_Export PolicyFactory_Registry_Adapter
   {
   public:
-    virtual ~PolicyFactory_Registry_Adapter (void);
+    virtual ~PolicyFactory_Registry_Adapter ();
 
     /// Register a PolicyFactory with the underlying PolicyFactory
     /// sequence.  This method should only be called during ORB
diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp
index 3ba55302382..6bf506d8222 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory (void)
+TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory ()
 {
 }
 
diff --git a/TAO/tao/PolicyFactory_Registry_Factory.h b/TAO/tao/PolicyFactory_Registry_Factory.h
index bc214fe55ba..19b6e383f72 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.h
+++ b/TAO/tao/PolicyFactory_Registry_Factory.h
@@ -34,9 +34,9 @@ class TAO_Export TAO_PolicyFactory_Registry_Factory :
   public ACE_Service_Object
 {
 public:
-  virtual ~TAO_PolicyFactory_Registry_Factory (void);
+  virtual ~TAO_PolicyFactory_Registry_Factory ();
 
-  virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0;
+  virtual TAO::PolicyFactory_Registry_Adapter* create () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index a4ec5b8a0dd..0631b65435d 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -21,7 +21,7 @@ TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
 }
 
 TAO_Policy_Current_Impl &
-TAO_Policy_Current::implementation (void) const
+TAO_Policy_Current::implementation () const
 {
   return *TAO_TSS_Resources::instance ()->policy_current_;
 }
diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h
index 98aaebff6f1..d370f8a7255 100644
--- a/TAO/tao/Policy_Current_Impl.h
+++ b/TAO/tao/Policy_Current_Impl.h
@@ -36,7 +36,7 @@ class TAO_Policy_Current_Impl
 {
 public:
 
-  TAO_Policy_Current_Impl (void);
+  TAO_Policy_Current_Impl ();
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index fbfaea4a28b..87320fbca67 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::PolicyList *
 TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts)
 {
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, nullptr);
   return this->impl_.get_policy_overrides (ts);
 }
 
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 619fb506e3f..97a2fea0484 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -54,9 +54,10 @@ public:
                                      CORBA::SetOverrideType set_add);
 
 private:
-  // Disallow copying.
-  TAO_Policy_Manager (TAO_Policy_Manager const &);
-  TAO_Policy_Manager & operator= (TAO_Policy_Manager const &);
+  TAO_Policy_Manager (TAO_Policy_Manager const &) = delete;
+  TAO_Policy_Manager & operator= (TAO_Policy_Manager const &) = delete;
+  TAO_Policy_Manager (TAO_Policy_Manager &&) = delete;
+  TAO_Policy_Manager & operator= (TAO_Policy_Manager &&) = delete;
 
 private:
   /// Protect access
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index bd3507cfebb..c7e28444dba 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -14,10 +14,10 @@ TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
   : scope_ (scope)
 {
   for (unsigned int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i)
-    this->cached_policies_[i] = 0;
+    this->cached_policies_[i] = nullptr;
 }
 
-TAO_Policy_Set::~TAO_Policy_Set (void)
+TAO_Policy_Set::~TAO_Policy_Set ()
 {
   try
     {
@@ -35,7 +35,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
   // Initialize the cache.
   for (int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i)
     {
-      this->cached_policies_[i] = 0;
+      this->cached_policies_[i] = nullptr;
     }
 
   // Copy over the policy list.
@@ -78,7 +78,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
 void
 TAO_Policy_Set::copy_from (TAO_Policy_Set *source)
 {
-  if (source == 0)
+  if (source == nullptr)
     {
       return;
     }
@@ -119,7 +119,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source)
 }
 
 void
-TAO_Policy_Set::cleanup_i (void)
+TAO_Policy_Set::cleanup_i ()
 {
   CORBA::ULong const len = this->policy_list_.length ();
   // Cleanup the policy list.
@@ -134,7 +134,7 @@ TAO_Policy_Set::cleanup_i (void)
   // Cleanup the cache.
   for (CORBA::ULong j = 0; j < TAO_CACHED_POLICY_MAX_CACHED; ++j)
     {
-      this->cached_policies_[j] = 0;
+      this->cached_policies_[j] = nullptr;
     }
 }
 
@@ -247,7 +247,7 @@ CORBA::PolicyList *
 TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types)
 {
   CORBA::ULong const slots = types.length ();
-  CORBA::PolicyList *policy_list_ptr = 0;
+  CORBA::PolicyList *policy_list_ptr = nullptr;
 
   if (slots == 0)
     {
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 36d8d6c7bc7..1e415564ecd 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -48,7 +48,7 @@ public:
   TAO_Policy_Set (const TAO_Policy_Set &rhs);
 
   /// Destructor
-  ~TAO_Policy_Set (void);
+  ~TAO_Policy_Set ();
 
   /// Copy the state from @a source, it uses the copy() operator to
   /// obtain independent copies of all the policies.
@@ -93,14 +93,14 @@ public:
   /// @c CORBA::Policy::_nil () is returned if the policy doesn't
   /// exist.
   CORBA::Policy *get_policy_by_index (CORBA::ULong index) const;
-  CORBA::ULong num_policies (void) const;
+  CORBA::ULong num_policies () const;
 
 private:
   TAO_Policy_Set & operator= (const TAO_Policy_Set&);
 
   /// Remove and destroy all the policy objects owned by this policy
   /// manager.
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// Utility method to determine if a policy's scope is compatible with ours.
   CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const;
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index 8cacaf38dc9..d2580db35b1 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -6,11 +6,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core)
   : orb_core_ (orb_core),
-    next_ (0)
+    next_ (nullptr)
 {
 }
 
-TAO_Policy_Validator::~TAO_Policy_Validator (void)
+TAO_Policy_Validator::~TAO_Policy_Validator ()
 {
   delete this->next_;
 }
@@ -25,7 +25,7 @@ void
 TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
 {
   // The validator we're adding can't be part of another list
-  ACE_ASSERT (validator->next_ == 0);
+  ACE_ASSERT (validator->next_ == nullptr);
 
   // Why would we want to add ourself to our list
   if (this != validator)
@@ -33,7 +33,7 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
       // Get to the end of the list and make sure that the
       // new validator isn't already part of our list
       TAO_Policy_Validator* current = this;
-      while (current->next_ != 0)
+      while (current->next_ != nullptr)
         {
           if (current->next_ == validator)
             {
@@ -61,7 +61,7 @@ TAO_Policy_Validator::validate (TAO_Policy_Set &policies)
 {
   this->validate_impl (policies);
 
-  if (this->next_ != 0)
+  if (this->next_ != nullptr)
     {
       this->next_->validate (policies);
     }
@@ -82,7 +82,7 @@ CORBA::Boolean
 TAO_Policy_Validator::legal_policy (CORBA::PolicyType type)
 {
   return (this->legal_policy_impl (type)
-          || ((this->next_ != 0)
+          || ((this->next_ != nullptr)
               && this->next_->legal_policy_impl (type)));
 }
 
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index b4ae5a0b7ad..8b26beb62f3 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -54,7 +54,7 @@ public:
   TAO_Policy_Validator (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  virtual ~TAO_Policy_Validator (void);
+  virtual ~TAO_Policy_Validator ();
 
   /**
    * Validate that the policies in the specified set
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
index 383f423fe73..88fa02f2182 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
@@ -50,12 +50,12 @@ class TAO_PortableServer_Export TAO_Acceptor_Filter_Factory
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_Acceptor_Filter_Factory(void);
+  virtual ~TAO_Acceptor_Filter_Factory();
 
   virtual TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager);
 
   /// Static initializer ensures the factory is loaded
-  static int initialize (void);
+  static int initialize ();
 };
 
 
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index b556fa72579..bd30f17ad50 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -116,11 +116,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
     }
 
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy);
-#else
-  auto_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy);
-#endif /* ACE_HAS_CPP11 */
 
   TAO_Lifespan_Strategy *lifespan_strategy = 0;
 
@@ -144,11 +140,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
     }
 
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy);
-#else
-  auto_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy);
-#endif /* ACE_HAS_CPP11 */
 
   TAO_Id_Assignment_Strategy *id_assignment_strategy = 0;
 
@@ -183,11 +175,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
     }
 
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy);
-#else
-  auto_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy);
-#endif /* ACE_HAS_CPP11 */
 
   TAO_Id_Hint_Strategy *id_hint_strategy = 0;
   if ((user_id_policy
@@ -209,11 +197,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
     }
 
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy);
-#else
-  auto_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy);
-#endif /* ACE_HAS_CPP11 */
 
   servant_map *sm = 0;
   if (unique_id_policy)
@@ -247,11 +231,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
     }
 
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<servant_map> new_servant_map (sm);
-#else
-  auto_ptr<servant_map> new_servant_map (sm);
-#endif /* ACE_HAS_CPP11 */
 
   user_id_map *uim = 0;
   if (user_id_policy
@@ -321,11 +301,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
     }
 
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<user_id_map> new_user_id_map (uim);
-#else
-  auto_ptr<user_id_map> new_user_id_map (uim);
-#endif /* ACE_HAS_CPP11 */
 
   id_uniqueness_strategy->set_active_object_map (this);
   lifespan_strategy->set_active_object_map (this);
@@ -333,21 +309,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
 
   // Finally everything is fine.  Make sure to take ownership away
   // from the auto pointer.
-#if defined (ACE_HAS_CPP11)
   this->id_uniqueness_strategy_ = std::move(new_id_uniqueness_strategy);
   this->lifespan_strategy_ =  std::move(new_lifespan_strategy);
   this->id_assignment_strategy_ = std::move(new_id_assignment_strategy);
   this->id_hint_strategy_ = std::move(new_id_hint_strategy);
   this->servant_map_ = std::move(new_servant_map);
   this->user_id_map_ = std::move(new_user_id_map);
-#else
-  this->id_uniqueness_strategy_ = new_id_uniqueness_strategy;
-  this->lifespan_strategy_ =  new_lifespan_strategy;
-  this->id_assignment_strategy_ = new_id_assignment_strategy;
-  this->id_hint_strategy_ = new_id_hint_strategy;
-  this->servant_map_ = new_servant_map;
-  this->user_id_map_ = new_user_id_map;
-#endif /* ACE_HAS_CPP11 */
 
 #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1)
   ACE_NEW (this->monitor_,
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index a37e2fcaee5..d2b688d7dd6 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -57,7 +57,7 @@ public:
     const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
 
   /// Destructor.
-  ~TAO_Active_Object_Map (void);
+  ~TAO_Active_Object_Map ();
 
   /// Must be used with UNIQUE_ID policy.
   int
@@ -179,11 +179,11 @@ public:
 
   /// Size of the map.
   size_t
-  current_size (void);
+  current_size ();
 
   /// Can be used with any policy.
   static size_t
-  system_id_size (void);
+  system_id_size ();
 
   /// Set the system id size.
   static void
@@ -237,46 +237,22 @@ public:
 #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
 
   /// Id map.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<user_id_map> user_id_map_;
-#else
-  auto_ptr<user_id_map> user_id_map_;
-#endif /* ACE_HAS_CPP11 */
 
   /// Servant map.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<servant_map> servant_map_;
-#else
-  auto_ptr<servant_map> servant_map_;
-#endif /* ACE_HAS_CPP11 */
 
   /// Id uniqueness strategy.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_;
-#else
-  auto_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_;
-#endif /* ACE_HAS_CPP11 */
 
   /// Lifespan strategy.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Lifespan_Strategy> lifespan_strategy_;
-#else
-  auto_ptr<TAO_Lifespan_Strategy> lifespan_strategy_;
-#endif /* ACE_HAS_CPP11 */
 
   /// Id assignment strategy.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_;
-#else
-  auto_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_;
-#endif /* ACE_HAS_CPP11 */
 
   /// Id hint strategy.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_;
-#else
-  auto_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_;
-#endif /* ACE_HAS_CPP11 */
 
   /// Flag to see if we are using active maps in this active object
   /// map.
@@ -302,7 +278,7 @@ class TAO_Id_Uniqueness_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_Id_Uniqueness_Strategy (void);
+  virtual ~TAO_Id_Uniqueness_Strategy ();
 
   /// Must be used with UNIQUE_ID policy.
   virtual int
@@ -461,7 +437,7 @@ class TAO_Lifespan_Strategy
 public:
 
   /// Virtual destructor.
-  virtual ~TAO_Lifespan_Strategy (void);
+  virtual ~TAO_Lifespan_Strategy ();
 
   /// Can be used with any policy.
   virtual int
@@ -533,7 +509,7 @@ class TAO_Id_Assignment_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_Id_Assignment_Strategy (void);
+  virtual ~TAO_Id_Assignment_Strategy ();
 
   /// Must be used with SYSTEM_ID policy.
   virtual int
@@ -620,7 +596,7 @@ class TAO_Id_Hint_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_Id_Hint_Strategy (void);
+  virtual ~TAO_Id_Hint_Strategy ();
 
   /// Find the user id from the system id.
   virtual int
@@ -642,7 +618,7 @@ public:
 
   /// How big is the hint generated by this strategy?
   virtual size_t
-  hint_size (void) = 0;
+  hint_size () = 0;
 
   /// Get the system id associated with this entry.
   virtual int
@@ -663,7 +639,7 @@ public:
   TAO_Active_Hint_Strategy (CORBA::ULong map_size);
 
   /// Virtual destructor.
-  virtual ~TAO_Active_Hint_Strategy (void);
+  virtual ~TAO_Active_Hint_Strategy ();
 
   virtual int
   recover_key (const PortableServer::ObjectId &system_id,
@@ -680,7 +656,7 @@ public:
         TAO_Active_Object_Map_Entry *&entry);
 
   virtual size_t
-  hint_size (void);
+  hint_size ();
 
   virtual int
   system_id (PortableServer::ObjectId_out system_id,
@@ -705,7 +681,7 @@ class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_No_Hint_Strategy (void);
+  virtual ~TAO_No_Hint_Strategy ();
 
   virtual int
   recover_key (const PortableServer::ObjectId &system_id,
@@ -722,7 +698,7 @@ public:
         TAO_Active_Object_Map_Entry *&entry);
 
   virtual size_t
-  hint_size (void);
+  hint_size ();
 
   virtual int
   system_id (PortableServer::ObjectId_out system_id,
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h
index 8fc2c4504d8..45429d8b0e8 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 struct TAO_Active_Object_Map_Entry
 {
   /// Default constructor.
-  TAO_Active_Object_Map_Entry (void);
+  TAO_Active_Object_Map_Entry ();
 
   /// User id.
   PortableServer::ObjectId user_id_;
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index fd983213528..b683ed244eb 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -50,27 +50,26 @@ namespace TAO
     class Active_Policy_Strategies
     {
     public:
-      Active_Policy_Strategies (void);
+      Active_Policy_Strategies ();
 
       void update (Cached_Policies &policies,
-                   TAO_Root_POA* poa
-                  );
+                   TAO_Root_POA* poa);
 
-      void cleanup (void);
+      void cleanup ();
 
-      ThreadStrategy *thread_strategy (void) const;
+      ThreadStrategy *thread_strategy () const;
 
-      RequestProcessingStrategy *request_processing_strategy (void) const;
+      RequestProcessingStrategy *request_processing_strategy () const;
 
-      IdAssignmentStrategy *id_assignment_strategy (void) const;
+      IdAssignmentStrategy *id_assignment_strategy () const;
 
-      IdUniquenessStrategy *id_uniqueness_strategy (void) const;
+      IdUniquenessStrategy *id_uniqueness_strategy () const;
 
-      LifespanStrategy *lifespan_strategy (void) const;
+      LifespanStrategy *lifespan_strategy () const;
 
-      ImplicitActivationStrategy *implicit_activation_strategy (void) const;
+      ImplicitActivationStrategy *implicit_activation_strategy () const;
 
-      ServantRetentionStrategy *servant_retention_strategy (void) const;
+      ServantRetentionStrategy *servant_retention_strategy () const;
 
     private:
       ThreadStrategy *thread_strategy_;
@@ -98,9 +97,9 @@ namespace TAO
     {
     public:
       Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p);
-      ~Active_Policy_Strategies_Cleanup_Guard (void);
+      ~Active_Policy_Strategies_Cleanup_Guard ();
 
-      Active_Policy_Strategies *_retn (void);
+      Active_Policy_Strategies *_retn ();
 
     private:
       Active_Policy_Strategies *ptr_;
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h
index ab9d9e0e694..634f04ef1e3 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.h
@@ -34,13 +34,13 @@ namespace TAO
   class In_Basic_SArgument_T : public InArgument
   {
   public:
-    In_Basic_SArgument_T (void);
+    In_Basic_SArgument_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 */
-    S arg (void) const;
+    S arg () const;
 
   private:
     S x_;
@@ -56,14 +56,14 @@ namespace TAO
   class Inout_Basic_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Basic_SArgument_T (void);
+    Inout_Basic_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_;
@@ -79,13 +79,13 @@ namespace TAO
   class Out_Basic_SArgument_T : public OutArgument
   {
   public:
-    Out_Basic_SArgument_T (void);
+    Out_Basic_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_;
@@ -101,13 +101,13 @@ namespace TAO
   class Ret_Basic_SArgument_T : public RetArgument
   {
   public:
-    Ret_Basic_SArgument_T (void);
+    Ret_Basic_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/Collocated_Arguments_Converter.h b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h
index 384db9dc465..656de9a53d2 100644
--- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h
+++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h
@@ -41,7 +41,7 @@ class TAO_PortableServer_Export Collocated_Arguments_Converter :
 {
 public:
 
-  virtual ~Collocated_Arguments_Converter (void);
+  virtual ~Collocated_Arguments_Converter ();
 
   virtual void convert_request (TAO_ServerRequest & server_request,
                                 TAO::Argument * const args[],
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index 572842ebe02..fa862566239 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -210,13 +210,13 @@ namespace TAO
 
 // -----------------------------------------------------
 TAO::Collocated_Object_Proxy_Broker *
-the_tao_collocated_object_proxy_broker (void)
+the_tao_collocated_object_proxy_broker ()
 {
   static TAO::Collocated_Object_Proxy_Broker the_broker;
   return &the_broker;
 }
 
-TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (void)
+TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory ()
 {
   return the_tao_collocated_object_proxy_broker ();
 }
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
index 45c29fc8f13..fcd7e2f0db8 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
@@ -66,7 +66,7 @@ namespace TAO
 
 /// This function is used to access the unique instance of strategized
 /// proxy broker. All the CORBA::Object share the proxy broker.
-TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void);
+TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker ();
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h
index 18de6b7250e..4b13c32be55 100644
--- a/TAO/tao/PortableServer/Creation_Time.h
+++ b/TAO/tao/PortableServer/Creation_Time.h
@@ -35,13 +35,13 @@ namespace TAO
     public:
       explicit Creation_Time (const ACE_Time_Value &creation_time);
 
-      Creation_Time (void);
+      Creation_Time ();
 
       void creation_time (const void *creation_time);
 
-      const void *creation_time (void) const;
+      const void *creation_time () const;
 
-      static CORBA::ULong creation_time_length (void);
+      static CORBA::ULong creation_time_length ();
 
       bool operator== (const Creation_Time &rhs) const;
 
@@ -76,7 +76,7 @@ namespace TAO
     {
     public:
 
-      Temporary_Creation_Time (void);
+      Temporary_Creation_Time ();
 
       void creation_time (const void *creation_time);
 
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index 7c4a1d1412e..ec9ae61a7a8 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
+TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index 5e811e4f16e..c440b985c5d 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -41,7 +41,7 @@ class TAO_PortableServer_Export TAO_Default_Acceptor_Filter
   : public TAO_Acceptor_Filter
 {
 public:
-  TAO_Default_Acceptor_Filter (void);
+  TAO_Default_Acceptor_Filter ();
 
   /// Populate @a mprofile with all available endpoints.
   virtual int fill_profile (const TAO::ObjectKey &object_key,
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index 1c852f9d8a4..84c6d9f06a2 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -12,7 +12,7 @@ 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::~TAO_POA_Default_Policy_Validator ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
index 5642928e9d0..e0f17e71dd4 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -35,7 +35,7 @@ public:
   TAO_POA_Default_Policy_Validator (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_POA_Default_Policy_Validator (void);
+  ~TAO_POA_Default_Policy_Validator ();
 
 protected:
   /**
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index ec83ebed582..ff020b8af2d 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
+TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
index 20abb7509be..a77043c28d2 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -34,7 +34,7 @@ class TAO_PortableServer_Export TAO_Default_Servant_Dispatcher
   : public TAO_Servant_Dispatcher
 {
 public:
-  virtual ~TAO_Default_Servant_Dispatcher (void);
+  virtual ~TAO_Default_Servant_Dispatcher ();
 
   /// Pre_invoke remote request.
   void pre_invoke_remote_request (
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index 6b29a0872b6..45c969025fb 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -36,13 +36,13 @@ namespace TAO
   class In_Fixed_Array_SArgument_T : public InArgument
   {
   public:
-    In_Fixed_Array_SArgument_T (void);
+    In_Fixed_Array_SArgument_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_forany::_slice_type const * arg (void) const;
+    typename S_forany::_slice_type const * arg () const;
 
   private:
     mutable typename S_forany::_array_type x_;
@@ -58,14 +58,14 @@ namespace TAO
   class Inout_Fixed_Array_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Fixed_Array_SArgument_T (void);
+    Inout_Fixed_Array_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     mutable typename S_forany::_array_type x_;
@@ -81,13 +81,13 @@ namespace TAO
   class Out_Fixed_Array_SArgument_T : public OutArgument
   {
   public:
-    Out_Fixed_Array_SArgument_T (void);
+    Out_Fixed_Array_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_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     mutable typename S_forany::_array_type x_;
@@ -105,13 +105,13 @@ namespace TAO
   class Ret_Fixed_Array_SArgument_T : public RetArgument
   {
   public:
-    Ret_Fixed_Array_SArgument_T (void);
+    Ret_Fixed_Array_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_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index 7d0b27b8cc1..44889cf37be 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -56,7 +56,7 @@ namespace TAO
     //@}
 
     /// Retrieve underlying argument.
-    S const & arg (void) const;
+    S const & arg () const;
 
   private:
 
@@ -79,7 +79,7 @@ namespace TAO
   public:
 
     /// Constructor.
-    Inout_Fixed_Size_SArgument_T (void);
+    Inout_Fixed_Size_SArgument_T ();
 
     /**
      * @name @c TAO::Argument Method Overrides
@@ -97,7 +97,7 @@ namespace TAO
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
-    S & arg (void);
+    S & arg ();
 
   private:
 
@@ -118,7 +118,7 @@ namespace TAO
   public:
 
     /// Constructor.
-    Out_Fixed_Size_SArgument_T (void);
+    Out_Fixed_Size_SArgument_T ();
 
     /**
      * @name @c TAO::Argument Method Overrides
@@ -135,7 +135,7 @@ namespace TAO
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
-    S & arg (void);
+    S & arg ();
 
   private:
 
@@ -157,7 +157,7 @@ namespace TAO
   public:
 
     /// Constructor.
-    Ret_Fixed_Size_SArgument_T (void);
+    Ret_Fixed_Size_SArgument_T ();
 
     /**
      * @name @c TAO::Argument Method Overrides
@@ -174,7 +174,7 @@ namespace TAO
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
-    S & arg (void);
+    S & arg ();
 
   private:
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
index 449065c15c2..21f763b3aa6 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -18,7 +18,7 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    IdAssignmentPolicy::copy (void)
+    IdAssignmentPolicy::copy ()
     {
       IdAssignmentPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -29,30 +29,30 @@ namespace TAO
     }
 
     void
-    IdAssignmentPolicy::destroy (void)
+    IdAssignmentPolicy::destroy ()
     {
     }
 
     ::PortableServer::IdAssignmentPolicyValue
-    IdAssignmentPolicy::value (void)
+    IdAssignmentPolicy::value ()
     {
       return value_;
     }
 
     CORBA::PolicyType
-    IdAssignmentPolicy::policy_type (void)
+    IdAssignmentPolicy::policy_type ()
     {
       return ::PortableServer::ID_ASSIGNMENT_POLICY_ID;
     }
 
     TAO_Cached_Policy_Type
-    IdAssignmentPolicy::_tao_cached_type (void) const
+    IdAssignmentPolicy::_tao_cached_type () const
     {
       return TAO_CACHED_POLICY_ID_ASSIGNMENT;
     }
 
     TAO_Policy_Scope
-    IdAssignmentPolicy::_tao_scope (void) const
+    IdAssignmentPolicy::_tao_scope () const
     {
       return TAO_POLICY_POA_SCOPE;
     }
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
index c2688b5f98a..82686e026dc 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h
@@ -43,19 +43,19 @@ namespace TAO
     public:
       IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value);
 
-      CORBA::Policy_ptr copy (void);
+      CORBA::Policy_ptr copy ();
 
-      void destroy (void);
+      void destroy ();
 
-      ::PortableServer::IdAssignmentPolicyValue value (void);
+      ::PortableServer::IdAssignmentPolicyValue value ();
 
-      CORBA::PolicyType policy_type (void);
+      CORBA::PolicyType policy_type ();
 
       /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+      virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
       /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
+      virtual TAO_Policy_Scope _tao_scope () const;
 
     private:
       ::PortableServer::IdAssignmentPolicyValue value_;
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
index aa56af91575..100a129d208 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -12,12 +12,12 @@ namespace TAO
     }
 
     void
-    IdAssignmentStrategy::strategy_cleanup(void)
+    IdAssignmentStrategy::strategy_cleanup()
     {
     }
 
     char
-    IdAssignmentStrategy::key_type_length (void) const
+    IdAssignmentStrategy::key_type_length () const
     {
       return sizeof (char);
     }
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h
index 88bcfce0eee..dca18216db1 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h
@@ -32,21 +32,21 @@ namespace TAO
     public:
       virtual void strategy_init(TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
       /**
        * Returns the key type the says which specific policy we have
        */
-      virtual char id_assignment_key_type (void) const = 0;
+      virtual char id_assignment_key_type () const = 0;
 
       /**
        * Returns the length of the id_assignment type
        */
-      char key_type_length (void) const;
+      char key_type_length () const;
 
       void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
 
-      virtual bool has_system_id (void) const = 0;
+      virtual bool has_system_id () const = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
index dd95809054b..30d87e69e9f 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -8,13 +8,13 @@ namespace TAO
   namespace Portable_Server
   {
     char
-    IdAssignmentStrategySystem::id_assignment_key_type (void) const
+    IdAssignmentStrategySystem::id_assignment_key_type () const
     {
       return 'S';
     }
 
     bool
-    IdAssignmentStrategySystem::has_system_id (void) const
+    IdAssignmentStrategySystem::has_system_id () const
     {
       return true;
     }
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
index e57fc043e30..7ee2acb36f4 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
@@ -31,9 +31,9 @@ namespace TAO
       : public IdAssignmentStrategy
     {
     public:
-      virtual char id_assignment_key_type (void) const;
+      virtual char id_assignment_key_type () const;
 
-      virtual bool has_system_id (void) const;
+      virtual bool has_system_id () const;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
index 57685cf2f83..622dbd3f4ef 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -7,13 +7,13 @@ namespace TAO
   namespace Portable_Server
   {
     char
-    IdAssignmentStrategyUser::id_assignment_key_type (void) const
+    IdAssignmentStrategyUser::id_assignment_key_type () const
     {
       return 'U';
     }
 
     bool
-    IdAssignmentStrategyUser::has_system_id (void) const
+    IdAssignmentStrategyUser::has_system_id () const
     {
       return false;
     }
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
index 7740e89ee86..c64be097bce 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
@@ -31,9 +31,9 @@ namespace TAO
       : public IdAssignmentStrategy
     {
     public:
-      virtual char id_assignment_key_type (void) const;
+      virtual char id_assignment_key_type () const;
 
-      virtual bool has_system_id (void) const;
+      virtual bool has_system_id () const;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
index aedf4a9b876..ce0297809b5 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -19,7 +19,7 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    IdUniquenessPolicy::copy (void)
+    IdUniquenessPolicy::copy ()
     {
       IdUniquenessPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -30,30 +30,30 @@ namespace TAO
     }
 
     void
-    IdUniquenessPolicy::destroy (void)
+    IdUniquenessPolicy::destroy ()
     {
     }
 
     ::PortableServer::IdUniquenessPolicyValue
-    IdUniquenessPolicy::value (void)
+    IdUniquenessPolicy::value ()
     {
       return value_;
     }
 
     CORBA::PolicyType
-    IdUniquenessPolicy::policy_type (void)
+    IdUniquenessPolicy::policy_type ()
     {
       return ::PortableServer::ID_UNIQUENESS_POLICY_ID;
     }
 
     TAO_Cached_Policy_Type
-    IdUniquenessPolicy::_tao_cached_type (void) const
+    IdUniquenessPolicy::_tao_cached_type () const
     {
       return TAO_CACHED_POLICY_ID_UNIQUENESS;
     }
 
     TAO_Policy_Scope
-    IdUniquenessPolicy::_tao_scope (void) const
+    IdUniquenessPolicy::_tao_scope () const
     {
       return TAO_POLICY_POA_SCOPE;
     }
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
index d621b5b9d17..3ecbf3b3492 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h
@@ -43,19 +43,19 @@ namespace TAO
     public:
       IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value);
 
-      CORBA::Policy_ptr copy (void);
+      CORBA::Policy_ptr copy ();
 
-      void destroy (void);
+      void destroy ();
 
-      ::PortableServer::IdUniquenessPolicyValue value (void);
+      ::PortableServer::IdUniquenessPolicyValue value ();
 
-      CORBA::PolicyType policy_type (void);
+      CORBA::PolicyType policy_type ();
 
       /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+      virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
       /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
+      virtual TAO_Policy_Scope _tao_scope () const;
 
     private:
       ::PortableServer::IdUniquenessPolicyValue value_;
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h
index 210d3284ddb..b3372d94343 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategy.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h
@@ -41,7 +41,7 @@ namespace TAO
         PortableServer::Servant s,
         bool &w) = 0;
 
-      virtual bool allow_multiple_activations (void) const = 0;
+      virtual bool allow_multiple_activations () const = 0;
 
       virtual ::PortableServer::IdUniquenessPolicyValue type() const = 0;
     };
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index fde3e6c68e2..170d4a18643 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -13,7 +13,7 @@ namespace TAO
     }
 
     void
-    IdUniquenessStrategyMultiple::strategy_cleanup (void)
+    IdUniquenessStrategyMultiple::strategy_cleanup ()
     {
     }
 
@@ -28,7 +28,7 @@ namespace TAO
     }
 
     bool
-    IdUniquenessStrategyMultiple::allow_multiple_activations (void) const
+    IdUniquenessStrategyMultiple::allow_multiple_activations () const
     {
       return true;
     }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
index b64983f446b..5b1c7ba96eb 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -33,13 +33,13 @@ namespace TAO
     public:
       virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup (void);
+      virtual void strategy_cleanup ();
 
       virtual bool is_servant_activation_allowed (
         PortableServer::Servant servant,
         bool &w);
 
-      virtual bool allow_multiple_activations (void) const;
+      virtual bool allow_multiple_activations () const;
 
       virtual ::PortableServer::IdUniquenessPolicyValue type() const;
     };
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index 89a795db50f..30563653abf 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -7,7 +7,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdUniquenessStrategyUnique::IdUniquenessStrategyUnique (void) :
+    IdUniquenessStrategyUnique::IdUniquenessStrategyUnique () :
       poa_ (0)
     {
     }
@@ -22,7 +22,7 @@ namespace TAO
 
     void
     IdUniquenessStrategyUnique::strategy_cleanup (
-      void)
+      )
     {
       poa_ = 0;
     }
@@ -42,7 +42,7 @@ namespace TAO
     }
 
     bool
-    IdUniquenessStrategyUnique::allow_multiple_activations (void) const
+    IdUniquenessStrategyUnique::allow_multiple_activations () const
     {
       return false;
     }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
index fe25b407ce8..ba910f7dc0f 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
@@ -31,17 +31,17 @@ namespace TAO
       : public IdUniquenessStrategy
     {
     public:
-      IdUniquenessStrategyUnique (void);
+      IdUniquenessStrategyUnique ();
 
       virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup (void);
+      virtual void strategy_cleanup ();
 
       virtual bool is_servant_activation_allowed (
         PortableServer::Servant servant,
         bool &wait_occurred_restart_call);
 
-      virtual bool allow_multiple_activations (void) const;
+      virtual bool allow_multiple_activations () const;
 
       virtual ::PortableServer::IdUniquenessPolicyValue type() const;
 
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
index a21645d1b04..359f2b7f26b 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
@@ -6,7 +6,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ImR_Client_Adapter::~ImR_Client_Adapter (void)
+    ImR_Client_Adapter::~ImR_Client_Adapter ()
     {
     }
   }
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h
index b3113da36a9..5f183ef335c 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.h
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h
@@ -52,7 +52,7 @@ namespace TAO
       public ACE_Service_Object
     {
     public:
-      virtual ~ImR_Client_Adapter (void);
+      virtual ~ImR_Client_Adapter ();
 
       /// ImplRepo helper method, notify the ImplRepo on startup
       virtual void imr_notify_startup (TAO_Root_POA* poa ) = 0;
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
index a2429e9d9a0..ee97fc016db 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -17,7 +17,7 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    ImplicitActivationPolicy::copy (void)
+    ImplicitActivationPolicy::copy ()
     {
       ImplicitActivationPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -28,30 +28,30 @@ namespace TAO
     }
 
     void
-    ImplicitActivationPolicy::destroy (void)
+    ImplicitActivationPolicy::destroy ()
     {
     }
 
     ::PortableServer::ImplicitActivationPolicyValue
-    ImplicitActivationPolicy::value (void)
+    ImplicitActivationPolicy::value ()
     {
       return value_;
     }
 
     CORBA::PolicyType
-    ImplicitActivationPolicy::policy_type (void)
+    ImplicitActivationPolicy::policy_type ()
     {
       return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
     }
 
     TAO_Cached_Policy_Type
-    ImplicitActivationPolicy::_tao_cached_type (void) const
+    ImplicitActivationPolicy::_tao_cached_type () const
     {
       return TAO_CACHED_POLICY_IMPLICIT_ACTIVATION;
     }
 
     TAO_Policy_Scope
-    ImplicitActivationPolicy::_tao_scope (void) const
+    ImplicitActivationPolicy::_tao_scope () const
     {
       return TAO_POLICY_POA_SCOPE;
     }
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
index 861d6b4645d..9a418378fea 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
@@ -43,19 +43,19 @@ namespace TAO
     public:
       ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value);
 
-      CORBA::Policy_ptr copy (void);
+      CORBA::Policy_ptr copy ();
 
-      void destroy (void);
+      void destroy ();
 
-      ::PortableServer::ImplicitActivationPolicyValue value (void);
+      ::PortableServer::ImplicitActivationPolicyValue value ();
 
-      CORBA::PolicyType policy_type (void);
+      CORBA::PolicyType policy_type ();
 
       /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+      virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
       /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
+      virtual TAO_Policy_Scope _tao_scope () const;
 
     private:
       ::PortableServer::ImplicitActivationPolicyValue value_;
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
index 41e8002c1c9..3bc68da0d7e 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -14,7 +14,7 @@ namespace TAO
     }
 
     void
-    ImplicitActivationStrategy::strategy_cleanup (void)
+    ImplicitActivationStrategy::strategy_cleanup ()
     {
     }
   }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
index 70f1731d28d..491df8cf702 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
@@ -30,9 +30,9 @@ namespace TAO
     public:
       virtual void strategy_init(TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
-      virtual bool allow_implicit_activation (void) const = 0;
+      virtual bool allow_implicit_activation () const = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
index 30859b6a30e..98c308606d8 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -8,7 +8,7 @@ namespace TAO
   namespace Portable_Server
   {
     bool
-    ImplicitActivationStrategyExplicit::allow_implicit_activation (void) const
+    ImplicitActivationStrategyExplicit::allow_implicit_activation () const
     {
       return false;
     }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
index 19c1dfb44ff..05846df574a 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
@@ -31,7 +31,7 @@ namespace TAO
        public ImplicitActivationStrategy
     {
     public:
-      virtual bool allow_implicit_activation (void) const;
+      virtual bool allow_implicit_activation () const;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index 0be943ee21c..989dd133b88 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -9,7 +9,7 @@ namespace TAO
   namespace Portable_Server
   {
     bool
-    ImplicitActivationStrategyImplicit::allow_implicit_activation (void) const
+    ImplicitActivationStrategyImplicit::allow_implicit_activation () const
     {
       return true;
     }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
index 06d74edcd93..68d0a997130 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
@@ -33,7 +33,7 @@ namespace TAO
       : public ImplicitActivationStrategy
     {
     public:
-      virtual bool allow_implicit_activation (void) const;
+      virtual bool allow_implicit_activation () const;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index c7ccba1f38c..b48962042fc 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
+TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator ()
   : counter_ (0)
 {
 }
diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h
index 330c219efc8..9bbc42e51ea 100644
--- a/TAO/tao/PortableServer/Key_Adapters.h
+++ b/TAO/tao/PortableServer/Key_Adapters.h
@@ -40,7 +40,7 @@ class TAO_Incremental_Key_Generator
 {
 public:
 
-  TAO_Incremental_Key_Generator (void);
+  TAO_Incremental_Key_Generator ();
 
   int operator() (PortableServer::ObjectId &id);
 
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
index e9d7a4bcd43..04c9a86b4ce 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -19,7 +19,7 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    LifespanPolicy::copy (void)
+    LifespanPolicy::copy ()
     {
       LifespanPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -30,30 +30,30 @@ namespace TAO
     }
 
     void
-    LifespanPolicy::destroy (void)
+    LifespanPolicy::destroy ()
     {
     }
 
     ::PortableServer::LifespanPolicyValue
-    LifespanPolicy::value (void)
+    LifespanPolicy::value ()
     {
       return value_;
     }
 
     CORBA::PolicyType
-    LifespanPolicy::policy_type (void)
+    LifespanPolicy::policy_type ()
     {
       return ::PortableServer::LIFESPAN_POLICY_ID;
     }
 
     TAO_Cached_Policy_Type
-    LifespanPolicy::_tao_cached_type (void) const
+    LifespanPolicy::_tao_cached_type () const
     {
       return TAO_CACHED_POLICY_LIFESPAN;
     }
 
     TAO_Policy_Scope
-    LifespanPolicy::_tao_scope (void) const
+    LifespanPolicy::_tao_scope () const
     {
       return TAO_POLICY_POA_SCOPE;
     }
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
index 0caa634b327..20b90910f9a 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.h
+++ b/TAO/tao/PortableServer/LifespanPolicy.h
@@ -43,19 +43,19 @@ namespace TAO
     public:
       LifespanPolicy (::PortableServer::LifespanPolicyValue value);
 
-      CORBA::Policy_ptr copy (void);
+      CORBA::Policy_ptr copy ();
 
-      void destroy (void);
+      void destroy ();
 
-      ::PortableServer::LifespanPolicyValue value (void);
+      ::PortableServer::LifespanPolicyValue value ();
 
-      CORBA::PolicyType policy_type (void);
+      CORBA::PolicyType policy_type ();
 
       /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+      virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
       /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
+      virtual TAO_Policy_Scope _tao_scope () const;
 
     private:
       ::PortableServer::LifespanPolicyValue value_;
diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp
index c87eec3b84e..e331e653adb 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategy.cpp
@@ -26,13 +26,13 @@ namespace TAO
     }
 
     void
-    LifespanStrategy::strategy_cleanup (void)
+    LifespanStrategy::strategy_cleanup ()
     {
       poa_ = 0;
     }
 
     CORBA::ULong
-    LifespanStrategy::key_type_length (void) const
+    LifespanStrategy::key_type_length () const
     {
       return sizeof (char);
     }
diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h
index da64516525c..6aaa52a0bdf 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.h
+++ b/TAO/tao/PortableServer/LifespanStrategy.h
@@ -33,17 +33,17 @@ namespace TAO
       : public Policy_Strategy
     {
     public:
-      LifespanStrategy (void);
+      LifespanStrategy ();
 
       virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup (void);
+      virtual void strategy_cleanup ();
 
       void create (const char *name, const TAO::ObjectKey &key);
 
-      virtual void notify_startup (void) = 0;
+      virtual void notify_startup () = 0;
 
-      virtual void notify_shutdown (void) = 0;
+      virtual void notify_shutdown () = 0;
 
       /**
        * Validate the passed object key if it belongs to this POA.
@@ -53,12 +53,12 @@ namespace TAO
       /**
        * Returns the length of the key type
        */
-      virtual CORBA::ULong key_length (void) const = 0;
+      virtual CORBA::ULong key_length () const = 0;
 
-      CORBA::ULong key_type_length (void) const;
+      CORBA::ULong key_type_length () const;
 
       /// Do we have set persistent or not,
-      virtual CORBA::Boolean is_persistent (void) const = 0;
+      virtual CORBA::Boolean is_persistent () const = 0;
 
       virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) = 0;
 
@@ -68,7 +68,7 @@ namespace TAO
         const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const = 0;
 
       /// Check the state of the POA.
-      virtual void check_state (void) = 0;
+      virtual void check_state () = 0;
 
       virtual ::PortableServer::LifespanPolicyValue type () const = 0;
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index c20461a0a74..62f681a6f18 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -31,13 +31,13 @@ namespace TAO
     }
 
     char
-    LifespanStrategyPersistent::key_type (void) const
+    LifespanStrategyPersistent::key_type () const
     {
       return 'P';
     }
 
     CORBA::Boolean
-    LifespanStrategyPersistent::is_persistent (void) const
+    LifespanStrategyPersistent::is_persistent () const
     {
       return true;
     }
@@ -59,15 +59,14 @@ namespace TAO
     }
 
     void
-    LifespanStrategyPersistent::notify_startup (void)
+    LifespanStrategyPersistent::notify_startup ()
     {
       if (this->use_imr_)
         {
           // The user specified that the ImR should be used.
           ImR_Client_Adapter *adapter =
             ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-              TAO_Root_POA::imr_client_adapter_name ()
-            );
+              TAO_Root_POA::imr_client_adapter_name ());
 
 #if !defined (TAO_AS_STATIC_LIBS)
           // In case we build shared, try to load the ImR Client library, in a
@@ -105,12 +104,11 @@ namespace TAO
     }
 
     void
-    LifespanStrategyPersistent::notify_shutdown (void)
+    LifespanStrategyPersistent::notify_shutdown ()
     {
       ImR_Client_Adapter *adapter =
         ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-          TAO_Root_POA::imr_client_adapter_name ()
-        );
+          TAO_Root_POA::imr_client_adapter_name ());
 
       if (adapter != 0)
         {
@@ -124,7 +122,7 @@ namespace TAO
     }
 
     void
-    LifespanStrategyPersistent::check_state (void)
+    LifespanStrategyPersistent::check_state ()
     {
       this->poa_->tao_poa_manager().check_state ();
     }
@@ -154,8 +152,7 @@ namespace TAO
       // The user specified that the ImR should be used.
       ImR_Client_Adapter *adapter =
         ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-          TAO_Root_POA::imr_client_adapter_name ()
-        );
+          TAO_Root_POA::imr_client_adapter_name ());
       if (adapter == 0)
         {
           // couldn't load adapter, already reported error
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
index 62d56f94e17..03d2075f81d 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
@@ -36,15 +36,15 @@ namespace TAO
 
       virtual void strategy_init(TAO_Root_POA *poa);
 
-      virtual void notify_startup (void);
+      virtual void notify_startup ();
 
-      virtual void notify_shutdown (void);
+      virtual void notify_shutdown ();
 
-      char key_type (void) const;
+      char key_type () const;
 
-      virtual CORBA::Boolean is_persistent (void) const;
+      virtual CORBA::Boolean is_persistent () const;
 
-      CORBA::ULong key_length (void) const;
+      CORBA::ULong key_length () const;
 
       virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
 
@@ -53,7 +53,7 @@ namespace TAO
                 const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
 
       /// Check the state of the POA.
-      virtual void check_state (void);
+      virtual void check_state ();
 
       virtual ::PortableServer::LifespanPolicyValue type() const;
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
index a701ad0398c..268ea7b3546 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -19,17 +19,17 @@ namespace TAO
     }
 
     void
-    LifespanStrategyTransient::notify_startup (void)
+    LifespanStrategyTransient::notify_startup ()
     {
     }
 
     void
-    LifespanStrategyTransient::notify_shutdown (void)
+    LifespanStrategyTransient::notify_shutdown ()
     {
     }
 
     CORBA::Boolean
-    LifespanStrategyTransient::is_persistent (void) const
+    LifespanStrategyTransient::is_persistent () const
     {
       return false;
     }
@@ -44,7 +44,7 @@ namespace TAO
     }
 
     CORBA::ULong
-    LifespanStrategyTransient::key_length (void) const
+    LifespanStrategyTransient::key_length () const
     {
       CORBA::ULong keylength = sizeof (char);
 
@@ -77,13 +77,13 @@ namespace TAO
     }
 
     char
-    LifespanStrategyTransient::key_type (void) const
+    LifespanStrategyTransient::key_type () const
     {
       return 'T';
     }
 
     void
-    LifespanStrategyTransient::check_state (void)
+    LifespanStrategyTransient::check_state ()
     {
       if (this->poa_->tao_poa_manager ().get_state_i () ==
         PortableServer::POAManager::INACTIVE)
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h
index a3ef34c46fa..161994e964a 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h
@@ -31,17 +31,17 @@ namespace TAO
       : public LifespanStrategy
     {
     public:
-      LifespanStrategyTransient (void);
+      LifespanStrategyTransient ();
 
-      virtual void notify_startup (void);
+      virtual void notify_startup ();
 
-      virtual void notify_shutdown (void);
+      virtual void notify_shutdown ();
 
-      char key_type (void) const;
+      char key_type () const;
 
-      virtual CORBA::Boolean is_persistent (void) const;
+      virtual CORBA::Boolean is_persistent () const;
 
-      CORBA::ULong key_length (void) const;
+      CORBA::ULong key_length () const;
 
       virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
 
@@ -50,7 +50,7 @@ namespace TAO
                      const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
 
       /// Check the state of the POA.
-      virtual void check_state (void);
+      virtual void check_state ();
 
       virtual ::PortableServer::LifespanPolicyValue type() const;
 
diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
index b143ac6a441..50efd1ee5af 100644
--- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook(void)
+TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook()
 {
 }
 
@@ -25,7 +25,7 @@ TAO_Network_Priority_Hook::set_dscp_codepoint (
 }
 
 int
-TAO_Network_Priority_Hook::initialize (void)
+TAO_Network_Priority_Hook::initialize ()
 {
   return ACE_Service_Config::process_directive
     (ace_svc_desc_TAO_Network_Priority_Hook);
diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.h b/TAO/tao/PortableServer/Network_Priority_Hook.h
index 756e587e26d..29e4cfb2834 100644
--- a/TAO/tao/PortableServer/Network_Priority_Hook.h
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.h
@@ -39,7 +39,7 @@ class TAO_PortableServer_Export TAO_Network_Priority_Hook
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_Network_Priority_Hook(void);
+  virtual ~TAO_Network_Priority_Hook();
 
   virtual void update_network_priority (TAO_Root_POA& poa,
                                         TAO_POA_Policy_Set& poa_policy_set);
@@ -49,7 +49,7 @@ public:
                                    TAO_Root_POA& poa);
 
   /// Static initializer ensures the factory is loaded
-  static int initialize (void);
+  static int initialize ();
 
 };
 
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
index e00befdbd1d..58bb91a3936 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -43,7 +43,7 @@ namespace TAO
       this->object_adapter_.lock ().release ();
     }
 
-    Non_Servant_Upcall::~Non_Servant_Upcall (void)
+    Non_Servant_Upcall::~Non_Servant_Upcall ()
     {
       // Reacquire the Object Adapter lock.
       this->object_adapter_.lock ().acquire ();
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h
index c05b50db449..75041660593 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h
@@ -53,9 +53,9 @@ namespace TAO
       Non_Servant_Upcall (::TAO_Root_POA &poa);
 
       /// Destructor.
-      ~Non_Servant_Upcall (void);
+      ~Non_Servant_Upcall ();
 
-      ::TAO_Root_POA &poa (void) const;
+      ::TAO_Root_POA &poa () const;
 
     protected:
 
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
index 3e7c6b12e3c..ed4e5f5d052 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -68,11 +68,11 @@ namespace TAO
 
     /// Accessor methods to ObjectReferenceTemplate template
     virtual PortableInterceptor::ObjectReferenceTemplate *
-      get_adapter_template (void) = 0;
+      get_adapter_template () = 0;
 
     /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
     virtual PortableInterceptor::ObjectReferenceFactory *
-      get_obj_ref_factory (void) = 0;
+      get_obj_ref_factory () = 0;
 
     /// Release any references on @c ObjectReferenceTemplate @a t.
     virtual void release (
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
index e499d3aa1b0..0411ff7be0b 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
@@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  ORT_Adapter_Factory::~ORT_Adapter_Factory (void)
+  ORT_Adapter_Factory::~ORT_Adapter_Factory ()
   {
   }
 }
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
index 3e018602d4a..d2d1df23f1e 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
@@ -55,7 +55,7 @@ namespace TAO
      *       line option.  Apparently the compiler generated
      *       destructor is inlined.
      */
-    virtual ~ORT_Adapter_Factory (void);
+    virtual ~ORT_Adapter_Factory ();
 
     /// Create a new adapter, in case not possible to allocate, returns 0
     virtual TAO::ORT_Adapter * create () = 0;
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 00819b064ec..bc65cf1fbc3 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -166,11 +166,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
              No_Hint_Strategy);
 
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<Hint_Strategy> new_hint_strategy (hint_strategy);
-#else
-  auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy);
-#endif /* ACE_HAS_CPP11 */
 
   new_hint_strategy->object_adapter (this);
 
@@ -197,11 +193,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
       break;
     }
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm);
-#else
-  auto_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm);
-#endif /* ACE_HAS_CPP11 */
 
   transient_poa_map *tpm = 0;
   switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
@@ -231,11 +223,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
       break;
     }
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<transient_poa_map> new_transient_poa_map (tpm);
-#else
-  auto_ptr<transient_poa_map> new_transient_poa_map (tpm);
-#endif /* ACE_HAS_CPP11 */
 
   this->hint_strategy_ = new_hint_strategy.release ();
   this->persistent_poa_name_map_ = new_persistent_poa_name_map.release ();
@@ -292,7 +280,7 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies)
 #endif
 }
 
-TAO_Object_Adapter::~TAO_Object_Adapter (void)
+TAO_Object_Adapter::~TAO_Object_Adapter ()
 {
   delete this->hint_strategy_;
   delete this->persistent_poa_name_map_;
@@ -552,7 +540,7 @@ TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key,
 }
 
 void
-TAO_Object_Adapter::open (void)
+TAO_Object_Adapter::open ()
 {
   // Add in the default POA policies to the default list.
   this->init_default_policies (this->default_poa_policies ());
@@ -691,7 +679,7 @@ TAO_Object_Adapter::check_close (int wait_for_completion)
 }
 
 int
-TAO_Object_Adapter::priority (void) const
+TAO_Object_Adapter::priority () const
 {
   return 0;
 }
@@ -757,7 +745,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                                          0,  // nargs
                                                          0,  // servant_upcall
                                                          0,  // exceptions
-                                                         0);   // nexceptions
+                                                         0); // nexceptions
 
           // If a PortableInterceptor::ForwardRequest exception was
           // thrown, then set the forward_to object reference and return
@@ -786,8 +774,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                        0,  // nargs
                                        0,  // servant_upcall
                                        0,  // exceptions
-                                       0   // nexceptions
-                                      );
+                                       0); // nexceptions
             }
         }
     }
@@ -829,13 +816,13 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
 }
 
 const char *
-TAO_Object_Adapter::name (void) const
+TAO_Object_Adapter::name () const
 {
   return TAO_OBJID_ROOTPOA;
 }
 
 CORBA::Object_ptr
-TAO_Object_Adapter::root (void)
+TAO_Object_Adapter::root ()
 {
   return CORBA::Object::_duplicate (this->root_);
 }
@@ -936,7 +923,7 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp)
 
 // ****************************************************************
 
-TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void)
+TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy ()
 {
 }
 
@@ -951,7 +938,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::Active_Hint_Strategy (CORBA::ULong map
 {
 }
 
-TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
+TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy ()
 {
 }
 
@@ -1024,7 +1011,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::unbind_persistent_poa (
   return result;
 }
 
-TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
+TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy ()
 {
 }
 
@@ -1115,7 +1102,7 @@ TAO_Object_Adapter::poa_name_iterator::operator* () const
 }
 
 TAO_Object_Adapter::poa_name_iterator &
-TAO_Object_Adapter::poa_name_iterator::operator++ (void)
+TAO_Object_Adapter::poa_name_iterator::operator++ ()
 {
   for (this->last_separator_ = this->position_;
        ;
@@ -1141,7 +1128,7 @@ TAO_Object_Adapter::iteratable_poa_name::iteratable_poa_name (
 }
 
 TAO_Object_Adapter::iteratable_poa_name::iterator
-TAO_Object_Adapter::iteratable_poa_name::begin (void) const
+TAO_Object_Adapter::iteratable_poa_name::begin () const
 {
   return iterator (1,
                    this->folded_name_.length (),
@@ -1149,7 +1136,7 @@ TAO_Object_Adapter::iteratable_poa_name::begin (void) const
 }
 
 TAO_Object_Adapter::iteratable_poa_name::iterator
-TAO_Object_Adapter::iteratable_poa_name::end (void) const
+TAO_Object_Adapter::iteratable_poa_name::end () const
 {
   return iterator (0,
                    this->folded_name_.length (),
@@ -1157,7 +1144,7 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const
 }
 
 void
-TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void)
+TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete ()
 {
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
@@ -1174,7 +1161,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void)
 }
 
 void
-TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void)
+TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw ()
 {
   // Non-exception throwing version.
   try
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 71d0583c0bc..62415aefec9 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -85,7 +85,7 @@ public:
                       TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  ~TAO_Object_Adapter (void);
+  ~TAO_Object_Adapter ();
 
   int dispatch_servant (const TAO::ObjectKey &key,
                         TAO_ServerRequest &req,
@@ -113,31 +113,31 @@ public:
   int activate_poa (const poa_name &folded_name,
                     TAO_Root_POA *&poa);
 
-  ACE_Lock &lock (void);
+  ACE_Lock &lock ();
 
-  TAO_SYNCH_MUTEX &thread_lock (void);
+  TAO_SYNCH_MUTEX &thread_lock ();
 
-  ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void);
+  ACE_Reverse_Lock<ACE_Lock> &reverse_lock ();
 
   /// Access the root poa.
-  TAO_Root_POA *root_poa (void) const;
+  TAO_Root_POA *root_poa () const;
 
   /// Access to ORB Core.
-  TAO_ORB_Core &orb_core (void) const;
+  TAO_ORB_Core &orb_core () const;
 
   /// Wait for non-servant upcalls to complete.
-  void wait_for_non_servant_upcalls_to_complete (void);
+  void wait_for_non_servant_upcalls_to_complete ();
 
   /// Non-exception throwing version.
-  void wait_for_non_servant_upcalls_to_complete_no_throw (void);
+  void wait_for_non_servant_upcalls_to_complete_no_throw ();
 
-  static CORBA::ULong transient_poa_name_size (void);
+  static CORBA::ULong transient_poa_name_size ();
 
   /// Return the validator.
-  TAO_Policy_Validator &validator (void);
+  TAO_Policy_Validator &validator ();
 
   /// Return the set of default policies.
-  TAO_POA_Policy_Set &default_poa_policies (void);
+  TAO_POA_Policy_Set &default_poa_policies ();
 
   /// Set the servant dispatcher method.  Ownership is transferred to
   /// this Object Adapter.  Note: This should only be called
@@ -149,15 +149,15 @@ public:
 
   // = 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 (void) const;
+  virtual int priority () const;
   virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out forward_to);
-  virtual const char *name (void) const;
-  virtual CORBA::Object_ptr root (void);
+  virtual const char *name () const;
+  virtual CORBA::Object_ptr root ();
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
@@ -176,7 +176,7 @@ protected:
 
   void locate_poa (const TAO::ObjectKey &key,
                    PortableServer::ObjectId &id,
-                   TAO_Root_POA *&poa                  );
+                   TAO_Root_POA *&poa);
 
   int find_transient_poa (const poa_name &system_name,
                           CORBA::Boolean root,
@@ -215,7 +215,7 @@ public:
   {
   public:
 
-    virtual ~Hint_Strategy (void);
+    virtual ~Hint_Strategy ();
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_Root_POA *&poa) = 0;
@@ -249,7 +249,7 @@ public:
 
     Active_Hint_Strategy (CORBA::ULong map_size);
 
-    virtual ~Active_Hint_Strategy (void);
+    virtual ~Active_Hint_Strategy ();
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_Root_POA *&poa);
@@ -286,7 +286,7 @@ public:
   {
   public:
 
-    virtual ~No_Hint_Strategy (void);
+    virtual ~No_Hint_Strategy ();
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_Root_POA *&poa);
@@ -403,7 +403,7 @@ public:
     ACE_CString operator* () const;
 
     /// Prefix advance.
-    poa_name_iterator &operator++ (void);
+    poa_name_iterator &operator++ ();
 
   protected:
 
@@ -426,8 +426,8 @@ public:
 
     iteratable_poa_name (const poa_name &folded_name);
 
-    iterator begin (void) const;
-    iterator end (void) const;
+    iterator begin () const;
+    iterator end () const;
 
   protected:
 
@@ -442,7 +442,7 @@ 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 (void) const;
+  TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress () const;
 
 private:
 
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h
index cad8ead9956..56563f63655 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ b/TAO/tao/PortableServer/Object_SArgument_T.h
@@ -46,7 +46,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr arg (void) const;
+    S_ptr arg () const;
 
   private:
     S_var x_;
@@ -64,14 +64,14 @@ namespace TAO
   class Inout_Object_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Object_SArgument_T (void);
+    Inout_Object_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_ptr & arg (void);
+    S_ptr & arg ();
 
   private:
     S_var x_;
@@ -90,13 +90,13 @@ namespace TAO
   class Out_Object_SArgument_T : public OutArgument
   {
   public:
-    Out_Object_SArgument_T (void);
+    Out_Object_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_out arg (void);
+    S_out arg ();
 
   private:
     S_var x_;
@@ -114,13 +114,13 @@ namespace TAO
   class Ret_Object_SArgument_T : public RetArgument
   {
   public:
-    Ret_Object_SArgument_T (void);
+    Ret_Object_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_ptr & arg (void);
+    S_ptr & arg ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index 51d1022d3cb..1caafb83961 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -4,12 +4,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Operation_Table::~TAO_Operation_Table (void)
+TAO_Operation_Table::~TAO_Operation_Table ()
 {
 }
 
 /**************************************************************/
-TAO::Operation_Skeletons::Operation_Skeletons (void)
+TAO::Operation_Skeletons::Operation_Skeletons ()
   : skel_ptr (0)
   , thruPOA_skel_ptr (0)
   , direct_skel_ptr (0)
diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
index bd3e39f380d..11d78518daa 100644
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -79,7 +79,7 @@ namespace TAO
    */
   struct TAO_PortableServer_Export Operation_Skeletons
   {
-    Operation_Skeletons (void);
+    Operation_Skeletons ();
 
     /// Remote skeleton pointer
     TAO_Skeleton skel_ptr;
@@ -123,7 +123,7 @@ public:
   virtual int bind (const char *opname,
                     const TAO::Operation_Skeletons skel_ptr) = 0;
 
-  virtual ~TAO_Operation_Table (void);
+  virtual ~TAO_Operation_Table ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
index bff7610bab2..a36d050310a 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
@@ -26,7 +26,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void)
+TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
index 87c23bce8ea..fa04e2fd156 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
@@ -40,7 +40,7 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable
 public:
 
   /// Do nothing destructor.
-  virtual ~TAO_Binary_Search_OpTable (void);
+  virtual ~TAO_Binary_Search_OpTable ();
 
   /// See the documentation in the base class for details.
   virtual int find (const char *opname,
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
index 5f8f5eda365..95e5d4d8ba3 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
@@ -50,7 +50,7 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (
     }
 }
 
-TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void)
+TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable ()
 {
   // Initialize an iterator.  We need to go thru each entry and free
   // up storage allocated to hold the external ids.  In this case,
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
index 611950d5a64..c2c421691f2 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
@@ -49,7 +49,7 @@ public:
                             ACE_Allocator *alloc);
 
   /// Destructor
-  ~TAO_Dynamic_Hash_OpTable (void);
+  ~TAO_Dynamic_Hash_OpTable ();
 
   /// See the documentation in the base class for details.
   virtual int bind (const char *opname,
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
index 58505e0f0ca..4baed2dea0a 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
@@ -27,7 +27,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void)
+TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
index 380a76e7503..4fa853eca8b 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
@@ -34,7 +34,7 @@ class TAO_PortableServer_Export TAO_Linear_Search_OpTable
 {
 public:
   /// Destructor.
-  ~TAO_Linear_Search_OpTable (void);
+  ~TAO_Linear_Search_OpTable ();
 
   /// See the documentation in the base class for details.
   virtual int find (const char *opname,
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index 37f9429bb4d..3156673cb9b 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -26,7 +26,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Do nothing destructor.
-TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void)
+TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
index 5365cd0aebf..b89d8f511ea 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
@@ -41,7 +41,7 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable
 public:
 
   /// Do nothing destructor.
-  virtual ~TAO_Perfect_Hash_OpTable (void);
+  virtual ~TAO_Perfect_Hash_OpTable ();
 
   /// See the documentation in the base class for details.
   virtual int find (const char *opname,
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index bd72b717853..f1cdd220590 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -39,7 +39,7 @@ TAO_POA_Manager::TAO_POA_Manager (
 #endif
 
 
-TAO_POA_Manager::~TAO_POA_Manager (void)
+TAO_POA_Manager::~TAO_POA_Manager ()
 {
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   poa_manager_factory_._remove_ref ();
@@ -47,13 +47,13 @@ TAO_POA_Manager::~TAO_POA_Manager (void)
 }
 
 char *
-TAO_POA_Manager::get_id (void)
+TAO_POA_Manager::get_id ()
 {
   return CORBA::string_dup (this->id_.in ());
 }
 
 void
-TAO_POA_Manager::activate_i (void)
+TAO_POA_Manager::activate_i ()
 {
   // This operation changes the state of the POA manager to active. If
   // issued while the POA manager is in the inactive state, the
@@ -182,7 +182,6 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion)
   // requests.  Any requests that have been queued but have not
   // started executing will continue to be queued while in the holding
   // state.
-
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
       throw PortableServer::POAManager::AdapterInactive ();
@@ -204,7 +203,6 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion)
   // and the current thread is in an invocation context dispatched by
   // some POA belonging to the same ORB as this POA the BAD_INV_ORDER
   // exception is raised and the state is not changed.
-
   if (wait_for_completion)
     {
       for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
@@ -234,7 +232,6 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion)
   // have not started executing are discarded. When a request is
   // discarded, a TRANSIENT system exception is returned to the
   // client.
-
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
       throw PortableServer::POAManager::AdapterInactive ();
@@ -304,7 +301,7 @@ TAO_POA_Manager::register_poa (TAO_Root_POA *poa)
 }
 
 void
-TAO_POA_Manager::check_state (void)
+TAO_POA_Manager::check_state ()
 {
   if (state_ == PortableServer::POAManager::ACTIVE)
     {
@@ -370,7 +367,7 @@ TAO_POA_Manager::check_state (void)
 }
 
 CORBA::ORB_ptr
-TAO_POA_Manager::_get_orb (void)
+TAO_POA_Manager::_get_orb ()
 {
   return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ());
 }
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index d593c8eba66..a589b63c4d0 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -59,8 +59,7 @@ class TAO_PortableServer_Export TAO_POA_Manager :
   friend class TAO_Object_Adapter;
 
 public:
-
-  void activate (void);
+  void activate ();
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -73,9 +72,9 @@ public:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::POAManager::State get_state (void);
+  PortableServer::POAManager::State get_state ();
 
-  char *get_id (void);
+  char *get_id ();
 
   TAO_POA_Manager (TAO_Object_Adapter &object_adapter,
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -86,22 +85,21 @@ public:
                    const char * id);
 #endif
 
-  ~TAO_POA_Manager (void);
+  ~TAO_POA_Manager ();
 
   /// Check the state of this POA manager
-  void check_state (void);
+  void check_state ();
 
   PortableServer::POAManager::State get_state_i ();
 
-  virtual CORBA::ORB_ptr _get_orb (void);
+  virtual CORBA::ORB_ptr _get_orb ();
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-  CORBA::PolicyList& get_policies (void);
+  CORBA::PolicyList& get_policies ();
 #endif
 
 protected:
-
-  void activate_i (void);
+  void activate_i ();
 
   void deactivate_i (CORBA::Boolean etherealize_objects,
                      CORBA::Boolean wait_for_completion);
@@ -118,14 +116,13 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  ACE_Lock &lock (void);
+  ACE_Lock &lock ();
 
   int remove_poa (TAO_Root_POA *poa);
 
   int register_poa (TAO_Root_POA *poa);
 
 protected:
-
   PortableServer::POAManager::State state_;
 
   ACE_Lock &lock_;
@@ -139,22 +136,18 @@ protected:
   CORBA::String_var id_;
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-
   TAO_POAManager_Factory& poa_manager_factory_;
   CORBA::PolicyList policies_;
-
 #endif
 
-
 private :
-
   /**
    * Generate an id for this POAManager.
    * @return A value that uniquely identifies the POAManager within a
    *         given process.
    * @note: The id_ has the ownership of the memory allocated in this method.
    */
-  char* generate_manager_id (void) const;
+  char* generate_manager_id () const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
index bc1b2cb69c7..afd7c87df6a 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ b/TAO/tao/PortableServer/POAManagerFactory.cpp
@@ -14,7 +14,7 @@ TAO_POAManager_Factory::TAO_POAManager_Factory (TAO_Object_Adapter &object_adapt
 {
 }
 
-TAO_POAManager_Factory::~TAO_POAManager_Factory (void)
+TAO_POAManager_Factory::~TAO_POAManager_Factory ()
 {
   this->remove_all_poamanagers ();
 }
@@ -74,7 +74,7 @@ TAO_POAManager_Factory::create_POAManager (
 }
 
 ::PortableServer::POAManagerFactory::POAManagerSeq *
-TAO_POAManager_Factory::list (void)
+TAO_POAManager_Factory::list ()
 {
   ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers;
   CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong>
@@ -122,7 +122,7 @@ TAO_POAManager_Factory::find (const char * id)
 }
 
 void
-TAO_POAManager_Factory::remove_all_poamanagers (void)
+TAO_POAManager_Factory::remove_all_poamanagers ()
 {
   for (POAMANAGERSET::iterator iterator = this->poamanager_set_.begin ();
         iterator != this->poamanager_set_.end ();
diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h
index 6335b0838dc..319fffaef87 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.h
+++ b/TAO/tao/PortableServer/POAManagerFactory.h
@@ -43,17 +43,17 @@ class TAO_PortableServer_Export TAO_POAManager_Factory :
 public:
   TAO_POAManager_Factory (TAO_Object_Adapter &object_adapter);
 
-  virtual ~TAO_POAManager_Factory (void);
+  virtual ~TAO_POAManager_Factory ();
 
   virtual ::PortableServer::POAManager_ptr create_POAManager (
       const char * id,
       const ::CORBA::PolicyList & policies);
 
-  virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void);
+  virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list ();
 
   virtual ::PortableServer::POAManager_ptr find (const char * id);
 
-  void remove_all_poamanagers (void);
+  void remove_all_poamanagers ();
 
   int remove_poamanager (::PortableServer::POAManager_ptr poamanager);
 
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 64b5098bdfe..9660fdfede2 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -35,7 +35,7 @@ namespace TAO
     }
 
 
-    Cached_Policies::~Cached_Policies (void)
+    Cached_Policies::~Cached_Policies ()
     {
     }
 
@@ -47,8 +47,7 @@ namespace TAO
         {
           CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
 
-          this->update_policy (policy.in ()
-                              );
+          this->update_policy (policy.in ());
         }
     }
 
@@ -59,8 +58,7 @@ namespace TAO
 
     #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
       ::PortableServer::ThreadPolicy_var thread
-        = ::PortableServer::ThreadPolicy::_narrow (policy
-                                                  );
+        = ::PortableServer::ThreadPolicy::_narrow (policy);
 
       if (!CORBA::is_nil (thread.in ()))
         {
@@ -72,8 +70,7 @@ namespace TAO
 
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::LifespanPolicy_var lifespan
-        = ::PortableServer::LifespanPolicy::_narrow (policy
-                                                    );
+        = ::PortableServer::LifespanPolicy::_narrow (policy);
 
       if (!CORBA::is_nil (lifespan.in ()))
         {
@@ -85,8 +82,7 @@ namespace TAO
 
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::IdUniquenessPolicy_var id_uniqueness
-        = ::PortableServer::IdUniquenessPolicy::_narrow (policy
-                                                        );
+        = ::PortableServer::IdUniquenessPolicy::_narrow (policy);
 
       if (!CORBA::is_nil (id_uniqueness.in ()))
         {
@@ -98,8 +94,7 @@ namespace TAO
 
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::IdAssignmentPolicy_var id_assignment
-        = ::PortableServer::IdAssignmentPolicy::_narrow (policy
-                                                        );
+        = ::PortableServer::IdAssignmentPolicy::_narrow (policy);
 
       if (!CORBA::is_nil (id_assignment.in ()))
         {
@@ -112,8 +107,7 @@ namespace TAO
     #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
       ::PortableServer::ImplicitActivationPolicy_var implicit_activation
-        = ::PortableServer::ImplicitActivationPolicy::_narrow (policy
-                                                              );
+        = ::PortableServer::ImplicitActivationPolicy::_narrow (policy);
 
       if (!CORBA::is_nil (implicit_activation.in ()))
         {
@@ -123,8 +117,7 @@ namespace TAO
         }
 
       ::PortableServer::ServantRetentionPolicy_var servant_retention
-        = ::PortableServer::ServantRetentionPolicy::_narrow (policy
-                                                            );
+        = ::PortableServer::ServantRetentionPolicy::_narrow (policy);
 
       if (!CORBA::is_nil (servant_retention.in ()))
         {
@@ -134,8 +127,7 @@ namespace TAO
         }
 
       ::PortableServer::RequestProcessingPolicy_var request_processing
-        = ::PortableServer::RequestProcessingPolicy::_narrow (policy
-                                                             );
+        = ::PortableServer::RequestProcessingPolicy::_narrow (policy);
 
       if (!CORBA::is_nil (request_processing.in ()))
         {
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 93e502abd84..491b9833d83 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -57,40 +57,39 @@ namespace TAO
 
       Cached_Policies ();
 
-      ~Cached_Policies (void);
+      ~Cached_Policies ();
 
       /// Update the cached policy values.
-      void update (TAO_POA_Policy_Set &policy_set
-                  );
+      void update (TAO_POA_Policy_Set &policy_set);
 
       /**
        * @name Accessor methods to cached values.
        */
       //@{
-      ::PortableServer::ThreadPolicyValue thread (void) const;
-      ::PortableServer::LifespanPolicyValue lifespan (void) const;
-      ::PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
-      ::PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
-      ::PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
-      ::PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
-      ::PortableServer::RequestProcessingPolicyValue request_processing (void) const;
-      PriorityModel priority_model (void) const;
-      CORBA::Short server_priority (void) const;
+      ::PortableServer::ThreadPolicyValue thread () const;
+      ::PortableServer::LifespanPolicyValue lifespan () const;
+      ::PortableServer::IdUniquenessPolicyValue id_uniqueness () const;
+      ::PortableServer::IdAssignmentPolicyValue id_assignment () const;
+      ::PortableServer::ImplicitActivationPolicyValue implicit_activation () const;
+      ::PortableServer::ServantRetentionPolicyValue servant_retention () const;
+      ::PortableServer::RequestProcessingPolicyValue request_processing () const;
+      PriorityModel priority_model () const;
+      CORBA::Short server_priority () const;
 
       /// Returns the network priority model that was set using a policy
       /// by the server application.
       ///
-      NetworkPriorityModel network_priority_model (void) const;
+      NetworkPriorityModel network_priority_model () const;
 
       /// Returns the request DiffServ codepoint that was set using a policy
       /// by the server application.
       ///
-      CORBA::Long request_diffserv_codepoint (void) const;
+      CORBA::Long request_diffserv_codepoint () const;
 
       /// Returns the reply DiffServ codepoint that was set using a policy
       /// by the server application.
       ///
-      CORBA::Long reply_diffserv_codepoint (void) const;
+      CORBA::Long reply_diffserv_codepoint () const;
 
       /// Caches the network priority model that was set using a policy
       /// by the server application.
@@ -116,8 +115,7 @@ namespace TAO
     protected:
 
       /// Helper method to update a particular policy.
-      void update_policy (const CORBA::Policy_ptr policy
-                         );
+      void update_policy (const CORBA::Policy_ptr policy);
 
       ::PortableServer::ThreadPolicyValue thread_;
 
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.inl b/TAO/tao/PortableServer/POA_Cached_Policies.inl
index 4c42ccef173..efa253591b3 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.inl
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.inl
@@ -6,55 +6,55 @@ namespace TAO
   namespace Portable_Server
   {
     ACE_INLINE ::PortableServer::ThreadPolicyValue
-    Cached_Policies::thread (void) const
+    Cached_Policies::thread () const
     {
       return this->thread_;
     }
 
     ACE_INLINE ::PortableServer::LifespanPolicyValue
-    Cached_Policies::lifespan (void) const
+    Cached_Policies::lifespan () const
     {
       return this->lifespan_;
     }
 
     ACE_INLINE ::PortableServer::IdUniquenessPolicyValue
-    Cached_Policies::id_uniqueness (void) const
+    Cached_Policies::id_uniqueness () const
     {
       return this->id_uniqueness_;
     }
 
     ACE_INLINE ::PortableServer::IdAssignmentPolicyValue
-    Cached_Policies::id_assignment (void) const
+    Cached_Policies::id_assignment () const
     {
       return this->id_assignment_;
     }
 
     ACE_INLINE ::PortableServer::ImplicitActivationPolicyValue
-    Cached_Policies::implicit_activation (void) const
+    Cached_Policies::implicit_activation () const
     {
       return this->implicit_activation_;
     }
 
     ACE_INLINE ::PortableServer::ServantRetentionPolicyValue
-    Cached_Policies::servant_retention (void) const
+    Cached_Policies::servant_retention () const
     {
       return this->servant_retention_;
     }
 
     ACE_INLINE ::PortableServer::RequestProcessingPolicyValue
-    Cached_Policies::request_processing (void) const
+    Cached_Policies::request_processing () const
     {
       return this->request_processing_;
     }
 
     ACE_INLINE Cached_Policies::PriorityModel
-    Cached_Policies::priority_model (void) const
+    Cached_Policies::priority_model () const
     {
       return this->priority_model_;
     }
 
     ACE_INLINE CORBA::Short
-    Cached_Policies::server_priority (void) const
+    Cached_Policies::server_priority () const
     {
       return this->server_priority_;
     }
@@ -72,19 +72,19 @@ namespace TAO
     }
 
      ACE_INLINE Cached_Policies::NetworkPriorityModel
-    Cached_Policies::network_priority_model (void) const
+    Cached_Policies::network_priority_model () const
     {
       return this->network_priority_model_;
     }
 
     ACE_INLINE CORBA::Long
-    Cached_Policies::request_diffserv_codepoint (void) const
+    Cached_Policies::request_diffserv_codepoint () const
     {
       return this->request_diffserv_codepoint_;
     }
 
     ACE_INLINE CORBA::Long
-    Cached_Policies::reply_diffserv_codepoint (void) const
+    Cached_Policies::reply_diffserv_codepoint () const
     {
       return this->reply_diffserv_codepoint_;
     }
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index 506f938fb96..cdb6a81c23c 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -13,7 +13,7 @@ namespace TAO
   namespace Portable_Server
   {
     PortableServer::POA_ptr
-    POA_Current::get_POA (void)
+    POA_Current::get_POA ()
     {
       POA_Current_Impl *impl = this->implementation ();
 
@@ -23,7 +23,7 @@ namespace TAO
     }
 
     PortableServer::ObjectId *
-    POA_Current::get_object_id (void)
+    POA_Current::get_object_id ()
     {
       POA_Current_Impl *impl = this->implementation ();
 
@@ -33,7 +33,7 @@ namespace TAO
     }
 
     PortableServer::Servant
-    POA_Current::get_servant (void)
+    POA_Current::get_servant ()
     {
       POA_Current_Impl *impl = this->implementation ();
 
@@ -43,7 +43,7 @@ namespace TAO
     }
 
     CORBA::Object_ptr
-    POA_Current::get_reference (void)
+    POA_Current::get_reference ()
     {
       POA_Current_Impl *impl = this->implementation ();
 
@@ -53,7 +53,7 @@ namespace TAO
     }
 
     POA_Current_Impl *
-    POA_Current::implementation (void)
+    POA_Current::implementation ()
     {
       return static_cast <POA_Current_Impl *>
                         (TAO_TSS_Resources::instance ()->poa_current_impl_);
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
index 6891761505d..3c014c7ece7 100644
--- a/TAO/tao/PortableServer/POA_Current.h
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -40,20 +40,19 @@ namespace TAO
       , public ::CORBA::LocalObject
     {
     public:
-
       /**
        * Returns the POA on which the current request is being invoked.
        * Can raise the @c NoContext exception if this function is
        * not invoked in the context of an upcall.
        */
-      PortableServer::POA_ptr get_POA (void);
+      PortableServer::POA_ptr get_POA ();
 
       /**
        * Returns the object id of the current request being invoked.  Can
        * raise the @c NoContext exception if this function is not
        * invoked in the context of an upcall.
        */
-      PortableServer::ObjectId *get_object_id (void);
+      PortableServer::ObjectId *get_object_id ();
 
       /**
        * This operation returns a locally manufactured reference to the object
@@ -64,17 +63,17 @@ namespace TAO
        * Object::is_equivalent operation to compare the two references may not
        * necessarily return true.
        */
-      CORBA::Object_ptr get_reference (void);
+      CORBA::Object_ptr get_reference ();
 
       /**
        * Returns a reference to the servant that hosts the object in whose
        * context it is called. If called outside the context of the POA
        * dispatched operation, a NoContext exception is raised
        */
-      PortableServer::Servant get_servant (void);
+      PortableServer::Servant get_servant ();
 
       /// Returns the class that implements this interface.
-      POA_Current_Impl *implementation (void);
+      POA_Current_Impl *implementation ();
 
       /// Sets the thread-specific pointer to the new POA Current state,
       /// returning a pointer to the existing POA Current state.
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index a3d4e509474..22c8c91e7a6 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -15,7 +15,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    POA_Current_Impl::POA_Current_Impl (void)
+    POA_Current_Impl::POA_Current_Impl ()
       : poa_ (0),
         object_id_ (TAO_POA_OBJECT_ID_BUF_SIZE, 0, object_id_buf_),
         object_key_ (0),
@@ -46,13 +46,13 @@ namespace TAO
     }
 
     POA_Current_Impl *
-    POA_Current_Impl::previous (void) const
+    POA_Current_Impl::previous () const
     {
       return this->previous_current_impl_;
     }
 
     void
-    POA_Current_Impl::teardown (void)
+    POA_Current_Impl::teardown ()
     {
       if (this->setup_done_)
         {
@@ -62,13 +62,13 @@ namespace TAO
     }
 
     PortableServer::POA_ptr
-    POA_Current_Impl::get_POA (void)
+    POA_Current_Impl::get_POA ()
     {
       return PortableServer::POA::_duplicate (this->poa_);
     }
 
     PortableServer::ObjectId *
-    POA_Current_Impl::get_object_id (void)
+    POA_Current_Impl::get_object_id ()
     {
       PortableServer::ObjectId *objid = 0;
 
@@ -80,19 +80,19 @@ namespace TAO
     }
 
     CORBA::Object_ptr
-    POA_Current_Impl::get_reference (void)
+    POA_Current_Impl::get_reference ()
     {
       return this->poa_->id_to_reference (this->object_id_);
     }
 
     PortableServer::Servant
-    POA_Current_Impl::get_servant (void)
+    POA_Current_Impl::get_servant ()
     {
       return this->servant_;
     }
 
     TAO_ORB_Core &
-    POA_Current_Impl::orb_core (void) const
+    POA_Current_Impl::orb_core () const
 
     {
       return this->poa_->orb_core ();
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h
index ef33cc178b9..46fd6c8b9dd 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.h
+++ b/TAO/tao/PortableServer/POA_Current_Impl.h
@@ -68,41 +68,41 @@ namespace TAO
 
       /// Return pointer to the invoking POA.  Raises the
       /// CORBA::NoContext exception.
-      PortableServer::POA_ptr get_POA (void);
+      PortableServer::POA_ptr get_POA ();
 
       /**
        * Return pointer to the object id through which this was invoked.
        * This may be necessary in cases where a <Servant> is serving under
        * the guise of multiple object ids.
        */
-      PortableServer::ObjectId *get_object_id (void);
+      PortableServer::ObjectId *get_object_id ();
 
       /**
        * Returns a reference to the servant that hosts the object in whose
        * context it is called.
        */
-      PortableServer::Servant get_servant (void);
+      PortableServer::Servant get_servant ();
 
       /**
        * This operation returns a locally manufactured reference to the object
        * in the context of which it is called.
        */
-      CORBA::Object_ptr get_reference (void);
+      CORBA::Object_ptr get_reference ();
 
       /// Set the POA implementation.
       void poa (::TAO_Root_POA *);
 
       /// Get the POA implemantation
-      ::TAO_Root_POA *poa (void) const;
+      ::TAO_Root_POA *poa () const;
 
       /// ORB Core for this current.
-      TAO_ORB_Core &orb_core (void) const;
+      TAO_ORB_Core &orb_core () const;
 
       /// Set the object ID.
       void object_id (const PortableServer::ObjectId &id);
 
       /// Get the object ID.
-      const PortableServer::ObjectId &object_id (void) const;
+      const PortableServer::ObjectId &object_id () const;
 
       /// Just replace the object id smartly
       void replace_object_id (const PortableServer::ObjectId &system_id);
@@ -111,34 +111,33 @@ namespace TAO
       void object_key (const TAO::ObjectKey &key);
 
       /// Get the object key.
-      const TAO::ObjectKey &object_key (void) const;
+      const TAO::ObjectKey &object_key () const;
 
       /// Set the servant for the current upcall.
       void servant (PortableServer::Servant servant);
 
       /// Get the servant for the current upcall.
-      PortableServer::Servant servant (void) const;
+      PortableServer::Servant servant () const;
 
       /// Set the priority for the current upcall.
       void priority (CORBA::Short priority);
 
       /// Get the priority for the current upcall.
-      CORBA::Short priority (void) const;
+      CORBA::Short priority () const;
 
       /// Convenience constructor combining construction & initialization.
-      POA_Current_Impl (void);
+      POA_Current_Impl ();
 
       /// Return the previous current implementation.
-      POA_Current_Impl *previous (void) const;
+      POA_Current_Impl *previous () const;
 
       /// Teardown the current for this request.
-      void teardown (void);
+      void teardown ();
 
       /// Setup the current.
       void setup (::TAO_Root_POA *impl, const TAO::ObjectKey &key);
 
     private:
-
       // = Hidden because we don't allow these
       POA_Current_Impl (const POA_Current_Impl &);
       void operator= (const POA_Current_Impl &);
@@ -175,7 +174,6 @@ namespace TAO
 
       /// Pointer to tss resources.
       TAO_TSS_Resources *tss_resources_;
-
     };
   }
 }
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index 9b0df5c9089..8f155ed5ebc 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_POA_Policy_Set::TAO_POA_Policy_Set (void)
+TAO_POA_Policy_Set::TAO_POA_Policy_Set ()
   : impl_ (TAO_POLICY_POA_SCOPE)
 {
 }
@@ -22,7 +22,7 @@ TAO_POA_Policy_Set::TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs)
 {
 }
 
-TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void)
+TAO_POA_Policy_Set::~TAO_POA_Policy_Set ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index d842c2ccbc2..8cc73b11ebe 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -29,19 +29,18 @@ class TAO_Policy_Validator;
 class TAO_PortableServer_Export TAO_POA_Policy_Set
 {
 public:
-
-  TAO_POA_Policy_Set (void);
+  TAO_POA_Policy_Set ();
 
   TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs);
 
-  ~TAO_POA_Policy_Set (void);
+  ~TAO_POA_Policy_Set ();
 
   /// Returns the policy at the specified index.
   /// CORBA::Policy::_nil () is returned if the policy doesn't exist
   CORBA::Policy *get_policy_by_index (CORBA::ULong index);
 
   /// Get the number of policies
-  CORBA::ULong num_policies (void) const;
+  CORBA::ULong num_policies () const;
 
   /// Obtain a single cached policy.
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
@@ -56,7 +55,7 @@ public:
   /// Add all of the client exposed policies to the specified list.
   void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies);
 
-  TAO_Policy_Set &policies (void);
+  TAO_Policy_Set &policies ();
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
index ec0a774404f..1acd9e71912 100644
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -34,9 +34,9 @@ namespace TAO
     public:
       virtual void strategy_init(TAO_Root_POA *poa) = 0;
 
-      virtual void strategy_cleanup(void) = 0;
+      virtual void strategy_cleanup() = 0;
 
-      virtual ~Policy_Strategy (void) {};
+      virtual ~Policy_Strategy () {};
     };
   }
 }
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index dc55e7b8e14..42268bcdfec 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -44,7 +44,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_POA_Initializer::init (void)
+TAO_POA_Initializer::init ()
 {
   ACE_Service_Config::process_directive (
       ace_svc_desc_IdAssignmentStrategySystem);
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
index 6e9d1bd5d98..e236d7c607e 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -27,7 +27,7 @@ class TAO_PortableServer_Export TAO_POA_Initializer
 {
 public:
   /// Used to force the initialization of the ORB code.
-  static int init (void);
+  static int init ();
 };
 
 static const int TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index fad1bcc1272..d95abb8b3ca 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -30,12 +30,12 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name,
 {
 }
 
-TAO_Regular_POA::~TAO_Regular_POA (void)
+TAO_Regular_POA::~TAO_Regular_POA ()
 {
 }
 
 void
-TAO_Regular_POA::remove_from_parent_i (void)
+TAO_Regular_POA::remove_from_parent_i ()
 {
   // Remove POA from the parent
   if (this->parent_ != 0)
@@ -49,13 +49,13 @@ TAO_Regular_POA::remove_from_parent_i (void)
 }
 
 CORBA::Boolean
-TAO_Regular_POA::root (void) const
+TAO_Regular_POA::root () const
 {
   return (parent_ == 0);
 }
 
 char
-TAO_Regular_POA::root_key_type (void)
+TAO_Regular_POA::root_key_type ()
 {
   if (this->parent_ != 0)
     {
diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h
index 3ba38c4130e..9da69970431 100644
--- a/TAO/tao/PortableServer/Regular_POA.h
+++ b/TAO/tao/PortableServer/Regular_POA.h
@@ -47,16 +47,16 @@ public:
                    TAO_ORB_Core &orb_core,
                    TAO_Object_Adapter *object_adapter);
 
-  virtual ~TAO_Regular_POA (void);
+  virtual ~TAO_Regular_POA ();
 
-  PortableServer::POA_ptr the_parent (void);
+  PortableServer::POA_ptr the_parent ();
 
 protected:
-  virtual void remove_from_parent_i (void);
+  virtual void remove_from_parent_i ();
 
-  virtual CORBA::Boolean root (void) const;
+  virtual CORBA::Boolean root () const;
 
-  virtual char root_key_type (void);
+  virtual char root_key_type ();
 
   /// The parent of this POA, be aware that in case this pointer is nill,
   /// we are a parent. This can be achieved by deriving from this Regular_POA
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index 8145883a4cc..a180a70a1c6 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -19,7 +19,7 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    RequestProcessingPolicy::copy (void)
+    RequestProcessingPolicy::copy ()
     {
       RequestProcessingPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -30,30 +30,30 @@ namespace TAO
     }
 
     void
-    RequestProcessingPolicy::destroy (void)
+    RequestProcessingPolicy::destroy ()
     {
     }
 
     ::PortableServer::RequestProcessingPolicyValue
-    RequestProcessingPolicy::value (void)
+    RequestProcessingPolicy::value ()
     {
       return value_;
     }
 
     CORBA::PolicyType
-    RequestProcessingPolicy::policy_type (void)
+    RequestProcessingPolicy::policy_type ()
     {
       return ::PortableServer::REQUEST_PROCESSING_POLICY_ID;
     }
 
     TAO_Cached_Policy_Type
-    RequestProcessingPolicy::_tao_cached_type (void) const
+    RequestProcessingPolicy::_tao_cached_type () const
     {
       return TAO_CACHED_POLICY_REQUEST_PROCESSING;
     }
 
     TAO_Policy_Scope
-    RequestProcessingPolicy::_tao_scope (void) const
+    RequestProcessingPolicy::_tao_scope () const
     {
       return TAO_POLICY_POA_SCOPE;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h
index a93afc63ece..3efefae3963 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h
@@ -43,19 +43,19 @@ namespace TAO
     public:
       RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value);
 
-      CORBA::Policy_ptr copy (void);
+      CORBA::Policy_ptr copy ();
 
-      void destroy (void);
+      void destroy ();
 
-      ::PortableServer::RequestProcessingPolicyValue value (void);
+      ::PortableServer::RequestProcessingPolicyValue value ();
 
-      CORBA::PolicyType policy_type (void);
+      CORBA::PolicyType policy_type ();
 
       /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+      virtual TAO_Cached_Policy_Type _tao_cached_type () const;
 
       /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
+      virtual TAO_Policy_Scope _tao_scope () const;
 
     private:
       ::PortableServer::RequestProcessingPolicyValue value_;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
index 7cd378aa737..f564757c699 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -14,7 +14,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategy::RequestProcessingStrategy (void)
+    RequestProcessingStrategy::RequestProcessingStrategy ()
       : poa_ (0)
     {
     }
@@ -35,7 +35,7 @@ namespace TAO
     }
 
     void
-    RequestProcessingStrategy::strategy_cleanup(void)
+    RequestProcessingStrategy::strategy_cleanup()
     {
       poa_ = 0;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
index 80613323d41..5378d1739a4 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -48,7 +48,7 @@ namespace TAO
       : public Policy_Strategy
     {
     public:
-      RequestProcessingStrategy (void);
+      RequestProcessingStrategy ();
 
       virtual void strategy_init(TAO_Root_POA *poa);
 
@@ -56,18 +56,18 @@ namespace TAO
         TAO_Root_POA *poa,
         ::PortableServer::ServantRetentionPolicyValue);
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-      virtual PortableServer::ServantManager_ptr get_servant_manager (void) = 0;
+      virtual PortableServer::ServantManager_ptr get_servant_manager () = 0;
 
       virtual void set_servant_manager (
         PortableServer::ServantManager_ptr imgr) = 0;
 
       virtual void set_servant (PortableServer::Servant servant) = 0;
 
-      virtual PortableServer::Servant get_servant (void) = 0;
+      virtual PortableServer::Servant get_servant () = 0;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 7827a2189b3..9a77833ffe3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -19,7 +19,7 @@ namespace TAO
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
     PortableServer::ServantManager_ptr
-    RequestProcessingStrategyAOMOnly::get_servant_manager (void)
+    RequestProcessingStrategyAOMOnly::get_servant_manager ()
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -39,7 +39,7 @@ namespace TAO
     }
 
     PortableServer::Servant
-    RequestProcessingStrategyAOMOnly::get_servant (void)
+    RequestProcessingStrategyAOMOnly::get_servant ()
     {
       throw PortableServer::POA::WrongPolicy ();
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index 0ef178c71ce..28718985f5f 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -36,18 +36,18 @@ namespace TAO
       : public RequestProcessingStrategy
     {
     public:
-      RequestProcessingStrategyAOMOnly (void);
+      RequestProcessingStrategyAOMOnly ();
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
       PortableServer::ServantManager_ptr
-      get_servant_manager (void);
+      get_servant_manager ();
 
       void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
       void set_servant (PortableServer::Servant servant);
 
-      PortableServer::Servant get_servant (void);
+      PortableServer::Servant get_servant ();
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 201a95b1eb2..b8661b7fd00 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -18,19 +18,19 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant (void)
+    RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant ()
       : default_servant_ (0)
     {
     }
 
     void
-    RequestProcessingStrategyDefaultServant::strategy_cleanup(void)
+    RequestProcessingStrategyDefaultServant::strategy_cleanup()
     {
       this->default_servant_ = 0;
     }
 
     PortableServer::ServantManager_ptr
-    RequestProcessingStrategyDefaultServant::get_servant_manager (void)
+    RequestProcessingStrategyDefaultServant::get_servant_manager ()
     {
       throw PortableServer::POA::WrongPolicy ();
     }
@@ -43,7 +43,7 @@ namespace TAO
     }
 
     PortableServer::Servant
-    RequestProcessingStrategyDefaultServant::get_servant (void)
+    RequestProcessingStrategyDefaultServant::get_servant ()
     {
       // This operation returns the default servant associated with the
       // POA.
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
index 20ed35f5a4f..e0c9f62f970 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -37,15 +37,15 @@ namespace TAO
       : public RequestProcessingStrategy
     {
     public:
-      RequestProcessingStrategyDefaultServant (void);
+      RequestProcessingStrategyDefaultServant ();
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
-      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);
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index 52082c26dd2..85cd906d642 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -17,13 +17,13 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) :
+    RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator () :
       etherealize_objects_ (true)
     {
     }
 
     void
-    RequestProcessingStrategyServantActivator::strategy_cleanup (void)
+    RequestProcessingStrategyServantActivator::strategy_cleanup ()
     {
       {
         Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -36,7 +36,7 @@ namespace TAO
     }
 
     PortableServer::ServantManager_ptr
-    RequestProcessingStrategyServantActivator::get_servant_manager (void)
+    RequestProcessingStrategyServantActivator::get_servant_manager ()
     {
       return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
index 6ffe7776b8b..c7675ae80a0 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -34,11 +34,11 @@ namespace TAO
       : public RequestProcessingStrategyServantManager
     {
     public:
-      RequestProcessingStrategyServantActivator (void);
+      RequestProcessingStrategyServantActivator ();
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
-      PortableServer::ServantManager_ptr get_servant_manager (void);
+      PortableServer::ServantManager_ptr get_servant_manager ();
 
       void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index e83bd3afe65..01458939b75 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -17,12 +17,12 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator (void)
+    RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator ()
     {
     }
 
     void
-    RequestProcessingStrategyServantLocator::strategy_cleanup(void)
+    RequestProcessingStrategyServantLocator::strategy_cleanup()
     {
       {
         Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -35,7 +35,7 @@ namespace TAO
     }
 
     PortableServer::ServantManager_ptr
-    RequestProcessingStrategyServantLocator::get_servant_manager (void)
+    RequestProcessingStrategyServantLocator::get_servant_manager ()
     {
       return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
index f5306029f20..9cff43232f2 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -34,11 +34,11 @@ namespace TAO
       : public RequestProcessingStrategyServantManager
     {
     public:
-      RequestProcessingStrategyServantLocator (void);
+      RequestProcessingStrategyServantLocator ();
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
-      PortableServer::ServantManager_ptr get_servant_manager (void);
+      PortableServer::ServantManager_ptr get_servant_manager ();
 
       void set_servant_manager (PortableServer::ServantManager_ptr imgr);
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index 73981faf582..6454c9ff55b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -14,12 +14,12 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager (void)
+    RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager ()
     {
     }
 
     PortableServer::Servant
-    RequestProcessingStrategyServantManager::get_servant (void)
+    RequestProcessingStrategyServantManager::get_servant ()
     {
       throw PortableServer::POA::WrongPolicy ();
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
index 8ef06661724..420d9441072 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -33,9 +33,9 @@ namespace TAO
       : public RequestProcessingStrategy
     {
     public:
-      RequestProcessingStrategyServantManager (void);
+      RequestProcessingStrategyServantManager ();
 
-      PortableServer::Servant get_servant (void);
+      PortableServer::Servant get_servant ();
 
       void set_servant (PortableServer::Servant servant);
 
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 972d5057fbc..901ff5ca5a9 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -318,13 +318,13 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
   aps_cleanup_guard._retn ();
 }
 
-TAO_Root_POA::~TAO_Root_POA (void)
+TAO_Root_POA::~TAO_Root_POA ()
 {
   this->poa_manager_._remove_ref();
 }
 
 void
-TAO_Root_POA::complete_destruction_i (void)
+TAO_Root_POA::complete_destruction_i ()
 {
   bool doing_complete_destruction =
     this->waiting_destruction_ != false;
@@ -739,7 +739,7 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant)
 }
 
 PortableServer::POAList *
-TAO_Root_POA::the_children (void)
+TAO_Root_POA::the_children ()
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -793,7 +793,7 @@ TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects,
 }
 
 void
-TAO_Root_POA::remove_from_parent_i (void)
+TAO_Root_POA::remove_from_parent_i ()
 {
   // The root poa has no parent, so this is a noop
 }
@@ -976,7 +976,7 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child)
 }
 
 PortableServer::POAList *
-TAO_Root_POA::the_children_i (void)
+TAO_Root_POA::the_children_i ()
 {
   PortableServer::POAList_var children;
   CORBA::ULong child_current = static_cast <CORBA::ULong>
@@ -1000,7 +1000,7 @@ TAO_Root_POA::the_children_i (void)
 }
 
 PortableInterceptor::AdapterName *
-TAO_Root_POA::adapter_name_i (void)
+TAO_Root_POA::adapter_name_i ()
 {
   // The adapter name is the sequence of names starting from the
   // RootPOA to the one whose name is requested.  The name of the
@@ -1278,7 +1278,7 @@ TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id)
 }
 
 CORBA::Boolean
-TAO_Root_POA::is_persistent (void) const
+TAO_Root_POA::is_persistent () const
 {
   return active_policy_strategies_.lifespan_strategy()->is_persistent ();
 }
@@ -1539,7 +1539,7 @@ TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
 }
 
 CORBA::OctetSeq *
-TAO_Root_POA::id (void)
+TAO_Root_POA::id ()
 {
   CORBA::OctetSeq *id = 0;
   ACE_NEW_THROW_EX (id,
@@ -1905,13 +1905,13 @@ TAO_Root_POA::parse_ir_object_key (const TAO::ObjectKey &object_key,
 }
 
 TAO_Object_Adapter &
-TAO_Root_POA::object_adapter (void)
+TAO_Root_POA::object_adapter ()
 {
   return *this->object_adapter_;
 }
 
 CORBA::Object_ptr
-TAO_Root_POA::invoke_key_to_object (void)
+TAO_Root_POA::invoke_key_to_object ()
 {
   PortableServer::ObjectId_var &system_id =
     *this->key_to_object_params_.system_id_;
@@ -2027,11 +2027,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
     }
 
   // Give ownership to the auto pointer.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Acceptor_Filter> new_filter (filter);
-#else
-  auto_ptr<TAO_Acceptor_Filter> new_filter (filter);
-#endif /* ACE_HAS_CPP11 */
 
   TAO_Stub *data =
     this->create_stub_object (
@@ -2045,7 +2041,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
 }
 
 void
-TAO_Root_POA::establish_components (void)
+TAO_Root_POA::establish_components ()
 {
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->orb_core_.ior_interceptor_adapter ();
@@ -2233,7 +2229,7 @@ TAO_Root_POA::find_servant_priority (
 }
 
 TAO::ORT_Adapter *
-TAO_Root_POA::ORT_adapter_i (void)
+TAO_Root_POA::ORT_adapter_i ()
 {
   if ((this->ort_adapter_factory_) && (this->ort_adapter_ == 0))
     {
@@ -2272,7 +2268,7 @@ TAO_Root_POA::ORT_adapter_i (void)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::AdapterActivator_ptr
-TAO_Root_POA::the_activator (void)
+TAO_Root_POA::the_activator ()
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ());
@@ -2294,7 +2290,7 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::ServantManager_ptr
-TAO_Root_POA::get_servant_manager (void)
+TAO_Root_POA::get_servant_manager ()
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
@@ -2314,14 +2310,14 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
 }
 
 PortableServer::Servant
-TAO_Root_POA::get_servant_i (void)
+TAO_Root_POA::get_servant_i ()
 {
   return this->active_policy_strategies_.request_processing_strategy()->
     get_servant ();
 }
 
 PortableServer::Servant
-TAO_Root_POA::get_servant (void)
+TAO_Root_POA::get_servant ()
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -2374,7 +2370,7 @@ TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant,
 }
 
 bool
-TAO_Root_POA::has_system_id (void) const
+TAO_Root_POA::has_system_id () const
 {
   return this->active_policy_strategies_.id_assignment_strategy ()->
     has_system_id ();
@@ -2402,14 +2398,14 @@ TAO_Root_POA::servant_has_remaining_activations (PortableServer::Servant servant
 }
 
 bool
-TAO_Root_POA::allow_implicit_activation (void) const
+TAO_Root_POA::allow_implicit_activation () const
 {
   return this->active_policy_strategies_.implicit_activation_strategy ()->
     allow_implicit_activation ();
 }
 
 bool
-TAO_Root_POA::allow_multiple_activations (void) const
+TAO_Root_POA::allow_multiple_activations () const
 {
   return this->active_policy_strategies_.id_uniqueness_strategy ()->
     allow_multiple_activations ();
@@ -2425,7 +2421,7 @@ TAO_Root_POA::post_invoke_servant_cleanup(
 }
 
 CORBA::Short
-TAO_Root_POA::server_priority (void) const
+TAO_Root_POA::server_priority () const
 {
   return this->cached_policies_.server_priority ();
 }
@@ -2440,19 +2436,19 @@ TAO_Root_POA::is_servant_active (
 }
 
 TAO::Portable_Server::Cached_Policies&
-TAO_Root_POA::cached_policies (void)
+TAO_Root_POA::cached_policies ()
 {
   return this->cached_policies_;
 }
 
 TAO_Network_Priority_Hook*
-TAO_Root_POA::network_priority_hook (void)
+TAO_Root_POA::network_priority_hook ()
 {
   return this->network_priority_hook_;
 }
 
 TAO::Portable_Server::Cached_Policies::PriorityModel
-TAO_Root_POA::priority_model (void) const
+TAO_Root_POA::priority_model () const
 {
   return cached_policies_.priority_model ();
 }
@@ -2483,13 +2479,13 @@ TAO_Root_POA::validate_lifespan (
 }
 
 CORBA::Boolean
-TAO_Root_POA::root (void) const
+TAO_Root_POA::root () const
 {
   return true;
 }
 
 TAO::ORT_Adapter *
-TAO_Root_POA::ORT_adapter (void)
+TAO_Root_POA::ORT_adapter ()
 {
   if (this->ort_adapter_ != 0)
     return this->ort_adapter_;
@@ -2507,7 +2503,7 @@ TAO_Root_POA::ORT_adapter (void)
 }
 
 CORBA::Policy *
-TAO_Root_POA::server_protocol (void)
+TAO_Root_POA::server_protocol ()
 {
   return 0;
 }
@@ -2529,7 +2525,7 @@ TAO_Root_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id
 }
 
 CORBA::ULong
-TAO_Root_POA::waiting_servant_deactivation (void) const
+TAO_Root_POA::waiting_servant_deactivation () const
 {
   return this->active_policy_strategies_.servant_retention_strategy ()->
           waiting_servant_deactivation ();
@@ -2549,13 +2545,13 @@ TAO_Root_POA::get_policy (CORBA::PolicyType policy)
 }
 
 void
-TAO_Root_POA::check_state (void)
+TAO_Root_POA::check_state ()
 {
   this->active_policy_strategies_.lifespan_strategy ()->check_state ();
 }
 
 const char *
-TAO_Root_POA::ort_adapter_factory_name (void)
+TAO_Root_POA::ort_adapter_factory_name ()
 {
   return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str();
 }
@@ -2567,27 +2563,27 @@ TAO_Root_POA::imr_client_adapter_name (const char *name)
 }
 
 const char *
-TAO_Root_POA::imr_client_adapter_name (void)
+TAO_Root_POA::imr_client_adapter_name ()
 {
   return TAO_POA_Static_Resources::instance ()->imr_client_adapter_name_.c_str();
 }
 
 PortableServer::POAManager_ptr
-TAO_Root_POA::the_POAManager (void)
+TAO_Root_POA::the_POAManager ()
 {
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 PortableServer::POAManagerFactory_ptr
-TAO_Root_POA::the_POAManagerFactory (void)
+TAO_Root_POA::the_POAManagerFactory ()
 {
   return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_);
 }
 #endif
 
 CORBA::ORB_ptr
-TAO_Root_POA::_get_orb (void)
+TAO_Root_POA::_get_orb ()
 {
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
@@ -2604,14 +2600,14 @@ TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ =
   TAO_POA_Static_Resources::instance ();
 
 void
-TAO_POA_Static_Resources::fini (void)
+TAO_POA_Static_Resources::fini ()
 {
   delete TAO_POA_Static_Resources::instance_;
   TAO_POA_Static_Resources::instance_ = 0;
 }
 
 TAO_POA_Static_Resources*
-TAO_POA_Static_Resources::instance (void)
+TAO_POA_Static_Resources::instance ()
 {
   if (TAO_POA_Static_Resources::instance_ == 0)
     {
@@ -2628,7 +2624,7 @@ TAO_POA_Static_Resources::instance (void)
   return TAO_POA_Static_Resources::instance_;
 }
 
-TAO_POA_Static_Resources::TAO_POA_Static_Resources (void)
+TAO_POA_Static_Resources::TAO_POA_Static_Resources ()
   : ort_adapter_factory_name_ ("ORT_Adapter_Factory"),
     imr_client_adapter_name_ ("ImR_Client_Adapter")
 {
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index 5e1124ae33c..37521aad56c 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -176,22 +176,22 @@ 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::POAManagerFactory_ptr the_POAManagerFactory (void);
+  PortableServer::POAManagerFactory_ptr the_POAManagerFactory ();
 #endif
 
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name (void);
+  PortableInterceptor::AdapterName *adapter_name ();
 
   /// Store the given TaggedComponent for eventual insertion into all
   /// object reference profiles.
@@ -204,15 +204,15 @@ public:
     IOP::ProfileId profile_id);
 
 #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);
 #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
@@ -246,10 +246,10 @@ public:
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid);
 
-  CORBA::OctetSeq *id (void);
+  CORBA::OctetSeq *id ();
 
   /// Accessor for POA policies.
-  TAO_POA_Policy_Set &policies (void);
+  TAO_POA_Policy_Set &policies ();
 
   /// Get the set policy of the given type.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
@@ -268,11 +268,11 @@ public:
                 TAO_ORB_Core &orb_core,
                 TAO_Object_Adapter *object_adapter);
 
-  virtual ~TAO_Root_POA (void);
+  virtual ~TAO_Root_POA ();
 
-  static char name_separator (void);
+  static char name_separator ();
 
-  static CORBA::ULong name_separator_length (void);
+  static CORBA::ULong name_separator_length ();
 
   enum
   {
@@ -281,34 +281,34 @@ public:
 
   static CORBA::Octet const objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE];
 
-  const TAO_Object_Adapter::poa_name &folded_name (void) const;
+  const TAO_Object_Adapter::poa_name &folded_name () const;
 
-  const TAO_Object_Adapter::poa_name &system_name (void) const;
+  const TAO_Object_Adapter::poa_name &system_name () const;
 
   static void check_for_valid_wait_for_completions (
       const TAO_ORB_Core &orb_core,
       CORBA::Boolean wait_for_completion);
 
   /// ORB Core for POA.
-  TAO_ORB_Core &orb_core (void) const;
+  TAO_ORB_Core &orb_core () const;
 
   /// obtain a reference to the cached_profiles
-  TAO::Portable_Server::Cached_Policies& cached_policies (void);
+  TAO::Portable_Server::Cached_Policies& cached_policies ();
 
   /// obtain a handle to the network priority hooks
-  TAO_Network_Priority_Hook* network_priority_hook (void);
+  TAO_Network_Priority_Hook* network_priority_hook ();
 
-  TAO::Portable_Server::Cached_Policies::PriorityModel priority_model (void) const;
+  TAO::Portable_Server::Cached_Policies::PriorityModel priority_model () const;
 
-  CORBA::Boolean cleanup_in_progress (void);
+  CORBA::Boolean cleanup_in_progress ();
 
   /// Calls protected static method used when POACurrent is not appropriate.
   static int parse_ir_object_key (const TAO::ObjectKey &object_key,
                                   PortableServer::ObjectId &user_id);
 
-  TAO_Object_Adapter &object_adapter (void);
+  TAO_Object_Adapter &object_adapter ();
 
-  ACE_Lock &lock (void);
+  ACE_Lock &lock ();
 
   /// Create the correct stub, properly initialized with the
   /// attributes and policies attached to the current POA.
@@ -321,33 +321,33 @@ public:
    * The POA can be in one of HOLDING, ACTIVE, DISCARDING, INACTIVE
    * and NON_EXISTENT states.
    */
-  PortableInterceptor::AdapterState get_adapter_state (void);
+  PortableInterceptor::AdapterState get_adapter_state ();
 
-  virtual void *thread_pool (void) const;
+  virtual void *thread_pool () const;
 
-  virtual CORBA::Policy *server_protocol (void);
+  virtual CORBA::Policy *server_protocol ();
 
-  CORBA::ULong outstanding_requests (void) const;
+  CORBA::ULong outstanding_requests () const;
 
-  const ACE_CString &name (void) const;
+  const ACE_CString &name () const;
 
-  CORBA::Boolean waiting_destruction (void) const;
+  CORBA::Boolean waiting_destruction () const;
 
   static void ort_adapter_factory_name (const char *name);
 
-  static const char *ort_adapter_factory_name (void);
+  static const char *ort_adapter_factory_name ();
 
   /// Sets the value of TAO_POA_Static_Resources::imr_client_adapter_name_.
   static void imr_client_adapter_name (const char *name);
 
   /// Gets the value of TAO_POA_Static_Resources::imr_client_adapter_name_.
-  static const char *imr_client_adapter_name (void);
+  static const char *imr_client_adapter_name ();
 
-  CORBA::Object_ptr invoke_key_to_object (void);
+  CORBA::Object_ptr invoke_key_to_object ();
 
-  CORBA::Boolean system_id (void);
+  CORBA::Boolean system_id ();
 
-  CORBA::ULong waiting_servant_deactivation (void) const;
+  CORBA::ULong waiting_servant_deactivation () const;
 
   /// Return the POA Manager related to this POA
   TAO_POA_Manager &tao_poa_manager ();
@@ -373,9 +373,9 @@ public:
   CORBA::Boolean servant_has_remaining_activations (
     PortableServer::Servant servant);
 
-  bool allow_implicit_activation (void) const;
+  bool allow_implicit_activation () const;
 
-  bool allow_multiple_activations (void) const;
+  bool allow_multiple_activations () const;
 
   int is_servant_active (
     PortableServer::Servant servant,
@@ -383,11 +383,11 @@ public:
 
   void deactivate_object_i (const PortableServer::ObjectId &oid);
 
-  CORBA::Boolean is_persistent (void) const;
+  CORBA::Boolean is_persistent () const;
 
-  CORBA::Short server_priority (void) const;
+  CORBA::Short server_priority () const;
 
-  bool has_system_id (void) const;
+  bool has_system_id () const;
 
   PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id);
 
@@ -436,18 +436,18 @@ public:
 
   PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant);
 
-  TAO_SYNCH_CONDITION &servant_deactivation_condition (void);
+  TAO_SYNCH_CONDITION &servant_deactivation_condition ();
 
   int is_poa_generated_id (const PortableServer::ObjectId &id);
 
   /// Check the state of this POA
-  void check_state (void);
+  void check_state ();
 
   int delete_child (const String &child);
 
   PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid);
 
-  virtual CORBA::ORB_ptr _get_orb (void);
+  virtual CORBA::ORB_ptr _get_orb ();
 
   /// These hooks are needed by the CSD strategy to override
   /// and no-ops by default.
@@ -469,9 +469,9 @@ public:
 protected:
 
 #if (TAO_HAS_MINIMUM_POA == 0)
-  int enter (void);
+  int enter ();
 
-  int exit (void);
+  int exit ();
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if ! defined (CORBA_E_MICRO)
@@ -501,14 +501,14 @@ protected:
   void destroy_i (CORBA::Boolean etherealize_objects,
                   CORBA::Boolean wait_for_completion);
 
-  void complete_destruction_i (void);
+  void complete_destruction_i ();
 
-  PortableServer::POAList *the_children_i (void);
+  PortableServer::POAList *the_children_i ();
 
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name_i (void);
+  PortableInterceptor::AdapterName *adapter_name_i ();
 
   /// Method to notify the IOR Interceptors when there is a state
   /// changed not related to POAManager.
@@ -546,7 +546,7 @@ protected:
                                 TAO_Acceptor_Filter *filter,
                                 TAO_Acceptor_Registry &acceptor_registry);
 
-  PortableServer::Servant get_servant_i (void);
+  PortableServer::Servant get_servant_i ();
 
 protected:
   void activate_object_with_id_i (const PortableServer::ObjectId &id,
@@ -554,7 +554,7 @@ protected:
                                   CORBA::Short priority,
                                   bool &wait_occurred_restart_call);
 
-  virtual void remove_from_parent_i (void);
+  virtual void remove_from_parent_i ();
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects);
 
@@ -585,7 +585,7 @@ protected:
    * IORInterceptor::components_established() once the former is
    * completed.
    */
-  void establish_components (void);
+  void establish_components ();
 
   /// Call the IORInterceptor::components_established() method on all
   /// registered IORInterceptors.
@@ -608,13 +608,13 @@ protected:
 protected:
   /// Accessor methods to ObjectReferenceTemplate
   PortableInterceptor::ObjectReferenceTemplate *
-    get_adapter_template (void);
+    get_adapter_template ();
 
   /// Accessor methods to ObjectReferenceTemplate, non locked version
-  PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void);
+  PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i ();
 
   /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-  PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (void);
+  PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory ();
 
   /// Set the object reference factory
   void set_obj_ref_factory (
@@ -640,39 +640,39 @@ 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 (void);
+  TAO::ORT_Adapter *ORT_adapter ();
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
   /// try to create one but assumes the POA lock is already hold
-  TAO::ORT_Adapter *ORT_adapter_i (void);
+  TAO::ORT_Adapter *ORT_adapter_i ();
 
-  CORBA::Boolean persistent (void);
+  CORBA::Boolean persistent ();
 
-  static char persistent_key_char (void);
+  static char persistent_key_char ();
 
-  static char transient_key_char (void);
+  static char transient_key_char ();
 
-  static CORBA::ULong persistent_key_type_length (void);
+  static CORBA::ULong persistent_key_type_length ();
 
-  static char system_id_key_char (void);
+  static char system_id_key_char ();
 
-  static char user_id_key_char (void);
+  static char user_id_key_char ();
 
-  static CORBA::ULong system_id_key_type_length (void);
+  static CORBA::ULong system_id_key_type_length ();
 
-  virtual CORBA::Boolean root (void) const;
+  virtual CORBA::Boolean root () const;
 
-  virtual char root_key_type (void);
+  virtual char root_key_type ();
 
-  static char root_key_char (void);
+  static char root_key_char ();
 
-  static char non_root_key_char (void);
+  static char non_root_key_char ();
 
-  static CORBA::ULong root_key_type_length (void);
+  static CORBA::ULong root_key_type_length ();
 
-  CORBA::ULong increment_outstanding_requests (void);
+  CORBA::ULong increment_outstanding_requests ();
 
-  CORBA::ULong decrement_outstanding_requests (void);
+  CORBA::ULong decrement_outstanding_requests ();
 
   String name_;
 
@@ -797,10 +797,10 @@ class TAO_PortableServer_Export TAO_POA_Static_Resources
 public:
 
   /// Return the singleton instance.
-  static TAO_POA_Static_Resources* instance (void);
+  static TAO_POA_Static_Resources* instance ();
 
   /// Cleanup the static singleton
-  static void fini (void) ACE_GCC_DESTRUCTOR_ATTRIBUTE;
+  static void fini () ACE_GCC_DESTRUCTOR_ATTRIBUTE;
 
 public:
 
@@ -823,7 +823,7 @@ public:
   ACE_CString imr_client_adapter_name_;
 private:
   /// Constructor.
-  TAO_POA_Static_Resources (void);
+  TAO_POA_Static_Resources ();
 
 private:
   /// The singleton instance.
diff --git a/TAO/tao/PortableServer/SUpcall_commands.cpp b/TAO/tao/PortableServer/SUpcall_commands.cpp
index 6ccba4791cb..bcda45a6750 100644
--- a/TAO/tao/PortableServer/SUpcall_commands.cpp
+++ b/TAO/tao/PortableServer/SUpcall_commands.cpp
@@ -16,7 +16,7 @@
 #include "tao/Object.h"
 
 void
-_is_a_thru_poa_Upcall_Command::execute (void)
+_is_a_thru_poa_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
     TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -35,7 +35,7 @@ _is_a_thru_poa_Upcall_Command::execute (void)
 }
 
 void
-_is_a_Upcall_Command::execute (void)
+_is_a_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
     static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg ();
@@ -50,7 +50,7 @@ _is_a_Upcall_Command::execute (void)
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 void
-_non_existent_thru_poa_Upcall_Command::execute (void)
+_non_existent_thru_poa_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
     TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -62,7 +62,7 @@ _non_existent_thru_poa_Upcall_Command::execute (void)
 }
 
 void
-_non_existent_Upcall_Command::execute (void)
+_non_existent_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
     static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg ();
@@ -74,7 +74,7 @@ _non_existent_Upcall_Command::execute (void)
 
 # if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 void
-_get_component_thru_poa_Upcall_Command::execute (void)
+_get_component_thru_poa_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
     TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
@@ -86,7 +86,7 @@ _get_component_thru_poa_Upcall_Command::execute (void)
 }
 
 void
-_get_component_Upcall_Command::execute (void)
+_get_component_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
     static_cast<TAO::SArg_Traits< ::CORBA::Object>::ret_val *> (this->args_[0])->arg ();
@@ -99,7 +99,7 @@ _get_component_Upcall_Command::execute (void)
 
 
 void
-_repository_id_thru_poa_Upcall_Command::execute (void)
+_repository_id_thru_poa_Upcall_Command::execute ()
 {
   TAO::SArg_Traits< char *>::ret_arg_type retval =
     TAO::Portable_Server::get_ret_arg< char *> (
@@ -111,7 +111,7 @@ _repository_id_thru_poa_Upcall_Command::execute (void)
 }
 
 void
-_repository_id_Upcall_Command::execute(void )
+_repository_id_Upcall_Command::execute( )
 {
   TAO::SArg_Traits< char *>::ret_arg_type retval =
     static_cast<TAO::SArg_Traits< char *>::ret_val *> (this->args_[0])->arg ();
diff --git a/TAO/tao/PortableServer/SUpcall_commands.h b/TAO/tao/PortableServer/SUpcall_commands.h
index d68ee481d18..e7ed10c074b 100644
--- a/TAO/tao/PortableServer/SUpcall_commands.h
+++ b/TAO/tao/PortableServer/SUpcall_commands.h
@@ -52,7 +52,7 @@ public:
     , args_ (args)
   {}
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
@@ -77,7 +77,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
@@ -105,7 +105,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 private:
   TAO_ServantBase * const servant_;
   TAO_Operation_Details const * const operation_details_;
@@ -129,7 +129,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
@@ -157,7 +157,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
@@ -182,7 +182,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
@@ -209,7 +209,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
@@ -234,7 +234,7 @@ public:
   {
   }
 
-  virtual void execute (void);
+  virtual void execute ();
 
 private:
   TAO_ServantBase * const servant_;
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index c716959b96f..6c7eb85a171 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -18,7 +18,7 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    ServantRetentionPolicy::copy (void)
+    ServantRetentionPolicy::copy ()
     {
       ServantRetentionPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -29,30 +29,30 @@ namespace TAO
     }
 
     void
-    ServantRetentionPolicy::destroy (void)
+    ServantRetentionPolicy::destroy ()
     {
     }
 
     ::PortableServer::ServantRetentionPolicyValue
-    ServantRetentionPolicy::value (void)
+    ServantRetentionPolicy::value ()
     {
       return this->value_;
     }
 
     CORBA::PolicyType
-    ServantRetentionPolicy::policy_type (void)
+    ServantRetentionPolicy::policy_type ()
     {
       return ::PortableServer::SERVANT_RETENTION_POLICY_ID;
     }
 
     TAO_Cached_Policy_Type
-    ServantRetentionPolicy::_tao_cached_type (void) const
+    ServantRetentionPolicy::_tao_cached_type () const
     {
       return TAO_CACHED_POLICY_SERVANT_RETENTION;
     }
 
     TAO_Policy_Scope
-    ServantRetentionPolicy::_tao_scope (void) const
+    ServantRetentionPolicy::_tao_scope () const
     {
       return TAO_POLICY_POA_SCOPE;
     }
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h
index d62c550b224..b39152dad1c 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h
@@ -43,19 +43,19 @@ namespace TAO
     public:
       ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value);
 
-      CORBA::Policy_ptr copy (void);
+      CORBA::Policy_ptr copy ();
 
-      void destroy (void);
+      void destroy ();
 
-      ::PortableServer::ServantRetentionPolicyValue value (void);
+      ::PortableServer::ServantRetentionPolicyValue value ();
 
-      CORBA::PolicyType policy_type (void);
+      CORBA::PolicyType policy_type ();
 
       /// Return the cached policy type for this policy.
-      TAO_Cached_Policy_Type _tao_cached_type (void) const;
+      TAO_Cached_Policy_Type _tao_cached_type () const;
 
       /// Returns the scope at which this policy can be applied. See orbconf.h.
-      TAO_Policy_Scope _tao_scope (void) const;
+      TAO_Policy_Scope _tao_scope () const;
 
     private:
       ::PortableServer::ServantRetentionPolicyValue value_;
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index 436eb6a185d..eb54dc6520a 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -37,7 +37,7 @@ namespace TAO
       : public Policy_Strategy
     {
     public:
-      virtual CORBA::ULong waiting_servant_deactivation (void) const = 0;
+      virtual CORBA::ULong waiting_servant_deactivation () const = 0;
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
                                      bool &wait_occurred_restart_call) = 0;
@@ -81,7 +81,7 @@ namespace TAO
         const PortableServer::ObjectId &id,
         bool indirect) = 0;
 
-      virtual void deactivate_all_objects (void) = 0;
+      virtual void deactivate_all_objects () = 0;
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant) = 0;
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index 2ace6f13b39..e4e39fbe4bd 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -24,7 +24,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain (void) :
+    ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain () :
       poa_ (0),
       sys_id_count_ (0)
     {
@@ -37,7 +37,7 @@ namespace TAO
     }
 
     void
-    ServantRetentionStrategyNonRetain::strategy_cleanup (void)
+    ServantRetentionStrategyNonRetain::strategy_cleanup ()
     {
       poa_ = 0;
     }
@@ -129,13 +129,13 @@ namespace TAO
     }
 
     CORBA::ULong
-    ServantRetentionStrategyNonRetain::waiting_servant_deactivation (void) const
+    ServantRetentionStrategyNonRetain::waiting_servant_deactivation () const
     {
       return 0;
     }
 
     void
-    ServantRetentionStrategyNonRetain::deactivate_all_objects (void)
+    ServantRetentionStrategyNonRetain::deactivate_all_objects ()
     {
     }
 
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index 837e0868b5a..8d2e46f5336 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -19,7 +19,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Servant_Location.h"
-#include "ace/Atomic_Op.h"
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -33,13 +33,13 @@ namespace TAO
        : public ServantRetentionStrategy
     {
     public:
-      ServantRetentionStrategyNonRetain (void);
+      ServantRetentionStrategyNonRetain ();
 
       virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
-      CORBA::ULong waiting_servant_deactivation (void) const;
+      CORBA::ULong waiting_servant_deactivation () const;
 
       virtual
       PortableServer::ObjectId *
@@ -86,7 +86,7 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         CORBA::Short &priority);
 
-      virtual void deactivate_all_objects (void);
+      virtual void deactivate_all_objects ();
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant);
@@ -123,7 +123,7 @@ namespace TAO
 
     protected:
       TAO_Root_POA *poa_;
-      ACE_Atomic_Op<TAO_SYNCH_MUTEX,ACE_UINT32> sys_id_count_;
+      std::atomic<uint32_t> sys_id_count_;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index 8c5d451f874..b92e56025cc 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -26,7 +26,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    ServantRetentionStrategyRetain::ServantRetentionStrategyRetain (void) :
+    ServantRetentionStrategyRetain::ServantRetentionStrategyRetain () :
       ServantRetentionStrategyNonRetain (),
       active_object_map_ (),
       waiting_servant_deactivation_ (0)
@@ -61,7 +61,7 @@ namespace TAO
     }
 
     void
-    ServantRetentionStrategyRetain::strategy_cleanup (void)
+    ServantRetentionStrategyRetain::strategy_cleanup ()
     {
     }
 
@@ -433,13 +433,13 @@ namespace TAO
     }
 
     CORBA::ULong
-    ServantRetentionStrategyRetain::waiting_servant_deactivation (void) const
+    ServantRetentionStrategyRetain::waiting_servant_deactivation () const
     {
       return waiting_servant_deactivation_;
     }
 
     void
-    ServantRetentionStrategyRetain::deactivate_all_objects (void)
+    ServantRetentionStrategyRetain::deactivate_all_objects ()
     {
       // If the etherealize_objects parameter is TRUE, the POA has the
       // RETAIN policy, and a servant manager is registered with the POA,
@@ -963,7 +963,7 @@ namespace TAO
 
 
     ::PortableServer::ServantRetentionPolicyValue
-    ServantRetentionStrategyRetain::type(void) const
+    ServantRetentionStrategyRetain::type() const
     {
       return ::PortableServer::RETAIN;
     }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index 500629cf1c0..a475bdb69ac 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -32,13 +32,13 @@ namespace TAO
        : public ServantRetentionStrategyNonRetain
     {
     public:
-      ServantRetentionStrategyRetain (void);
+      ServantRetentionStrategyRetain ();
 
-      CORBA::ULong waiting_servant_deactivation (void) const;
+      CORBA::ULong waiting_servant_deactivation () const;
 
       virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
                                      bool &wait_occurred_restart_call);
@@ -85,7 +85,7 @@ namespace TAO
         const PortableServer::ObjectId &system_id,
         CORBA::Short &priority);
 
-      virtual void deactivate_all_objects (void);
+      virtual void deactivate_all_objects ();
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant);
@@ -139,11 +139,7 @@ namespace TAO
       TAO_Active_Object_Map * get_active_object_map() const;
 
     private:
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<TAO_Active_Object_Map> active_object_map_;
-#else
-      auto_ptr<TAO_Active_Object_Map> active_object_map_;
-#endif /* ACE_HAS_CPP11 */
       CORBA::ULong waiting_servant_deactivation_;
     };
   }
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 2824458e957..531be3b10f4 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -29,8 +29,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-//@@ TAO_SERVANT_BASE_INCLUDE_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Servant_Base.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -81,12 +79,12 @@ TAO_ServantBase::operator= (const TAO_ServantBase &rhs)
   return *this;
 }
 
-TAO_ServantBase::~TAO_ServantBase (void)
+TAO_ServantBase::~TAO_ServantBase ()
 {
 }
 
 PortableServer::POA_ptr
-TAO_ServantBase::_default_POA (void)
+TAO_ServantBase::_default_POA ()
 {
   CORBA::Object_var object = TAO_ORB_Core_instance ()->root_poa ();
 
@@ -436,13 +434,13 @@ TAO_ServantBase::_is_a (const char *logical_type_id)
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 CORBA::Boolean
-TAO_ServantBase::_non_existent (void)
+TAO_ServantBase::_non_existent ()
 {
   return false;
 }
 
 CORBA::InterfaceDef_ptr
-TAO_ServantBase::_get_interface (void)
+TAO_ServantBase::_get_interface ()
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -461,13 +459,13 @@ TAO_ServantBase::_get_interface (void)
 
 #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 CORBA::Object_ptr
-TAO_ServantBase::_get_component (void)
+TAO_ServantBase::_get_component ()
 {
   return CORBA::Object::_nil ();
 }
 #endif
 char *
-TAO_ServantBase::_repository_id (void)
+TAO_ServantBase::_repository_id ()
 {
   return CORBA::string_dup (this->_interface_repository_id ());
 }
@@ -495,7 +493,7 @@ TAO_ServantBase::_find (const char *opname,
 }
 
 TAO_Stub *
-TAO_ServantBase::_create_stub (void)
+TAO_ServantBase::_create_stub ()
 {
   TAO_Stub *stub = 0;
 
@@ -569,12 +567,6 @@ TAO_ServantBase::synchronous_upcall_dispatch (
       // case.
       skel (req, servant_upcall, derived_this);
 
-      /*
-       * Dispatch resolution specialization add hook.
-       * Over-ridden with code to handle optimized dispatch.
-       */
-      //@@ TAO_DISPATCH_RESOLUTION_OPT_ADD_HOOK
-
       // It is our job to send the already marshaled reply, but only
       // send if it is expected and it has not already been sent
 
@@ -653,13 +645,13 @@ TAO_ServantBase::asynchronous_upcall_dispatch (
 }
 
 void
-TAO_ServantBase::_add_ref (void)
+TAO_ServantBase::_add_ref ()
 {
   ++this->ref_count_;
 }
 
 void
-TAO_ServantBase::_remove_ref (void)
+TAO_ServantBase::_remove_ref ()
 {
   CORBA::ULong const new_count = --this->ref_count_;
 
@@ -670,13 +662,9 @@ TAO_ServantBase::_remove_ref (void)
 }
 
 CORBA::ULong
-TAO_ServantBase::_refcount_value (void) const
+TAO_ServantBase::_refcount_value () const
 {
-#if defined (ACE_HAS_CPP11)
   return this->ref_count_;
-#else
-  return this->ref_count_.value ();
-#endif /* ACE_HAS_CPP11 */
 }
 
 void
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index b37018662db..9b15c1c26bb 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -22,11 +22,7 @@
 #include "tao/PortableServer/PS_ForwardC.h"
 #include "tao/PortableServer/Servant_var.h"
 #include "tao/Abstract_Servant_Base.h"
-#if defined (ACE_HAS_CPP11)
 #include <atomic>
-#else
-#include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -69,7 +65,7 @@ public:
   typedef CORBA::Object_var _stub_var_type;
 
   /// Destructor.
-  virtual ~TAO_ServantBase (void);
+  virtual ~TAO_ServantBase ();
 
   static void _is_a_skel (TAO_ServerRequest & req,
                           TAO::Portable_Server::Servant_Upcall* servant_upcall,
@@ -108,29 +104,29 @@ public:
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Local implementation of the CORBA::Object::_is_a method.
   virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   /// Default _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (void);
+  virtual CORBA::Boolean _non_existent ();
 
   /// Query the Interface Repository for the interface definition.
-  virtual CORBA::InterfaceDef_ptr _get_interface (void);
+  virtual CORBA::InterfaceDef_ptr _get_interface ();
 
 #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Default _get_component: always returns CORBA::Object::_nil().
-  virtual CORBA::Object_ptr _get_component (void);
+  virtual CORBA::Object_ptr _get_component ();
 #endif
 
   /// Get the repository id.
-  virtual char * _repository_id (void);
+  virtual char * _repository_id ();
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (void);
+  virtual TAO_Stub *_create_stub ();
 
   /**
    * Dispatches a request to the object: find the operation, cast the
@@ -155,26 +151,26 @@ public:
                      const size_t length = 0);
 
   /// Get this interface's repository id (TAO specific).
-  virtual const char *_interface_repository_id (void) const = 0;
+  virtual const char *_interface_repository_id () const = 0;
 
   //@{
   /**
    * @name Reference Counting Operations
    */
   /// Increase reference count by one.
-  virtual void _add_ref (void);
+  virtual void _add_ref ();
 
   /**
    * Decreases reference count by one; if the resulting reference
    * count equals zero, _remove_ref invokes delete on its this pointer
    * in order to destroy the servant.
    */
-  virtual void _remove_ref (void);
+  virtual void _remove_ref ();
 
   /**
    * Returns the current reference count value.
    */
-  virtual CORBA::ULong _refcount_value (void) const;
+  virtual CORBA::ULong _refcount_value () const;
   //@}
 
   virtual void _collocated_dispatch (::CORBA::Object_ptr obj,
@@ -187,7 +183,6 @@ public:
                                      TAO::Collocation_Strategy strategy);
 
 protected:
-
   /// Default constructor, only derived classes can be created.
   explicit TAO_ServantBase (TAO_Operation_Table* optable = 0);
 
@@ -209,11 +204,7 @@ protected:
 
 protected:
   /// Reference counter.
-#if defined (ACE_HAS_CPP11)
   std::atomic<uint32_t> ref_count_;
-#else
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> ref_count_;
-#endif /* ACE_HAS_CPP11 */
 
   /// The operation table for this servant.  It is initialized by the
   /// most derived class.
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
index fe0524cd9d1..722af63e3c9 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void)
+TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index bf48fea7dc4..ced50eec720 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -48,7 +48,7 @@ namespace PortableServer
 class TAO_PortableServer_Export TAO_Servant_Dispatcher
 {
 public:
-  virtual ~TAO_Servant_Dispatcher (void);
+  virtual ~TAO_Servant_Dispatcher ();
 
   /// Pre_invoke remote request.
   virtual void pre_invoke_remote_request (
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index e08ac1ae707..e77ac5fb31a 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -179,7 +179,7 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::pre_invoke_collocated_request (void)
+    Servant_Upcall::pre_invoke_collocated_request ()
     {
       this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request (
         this->poa (),
@@ -188,14 +188,14 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::post_invoke (void)
+    Servant_Upcall::post_invoke ()
     {
       this->object_adapter_->servant_dispatcher_->post_invoke (
         this->poa (),
         this->pre_invoke_state_);
     }
 
-    Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void)
+    Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State ()
       : state_ (NO_ACTION_REQUIRED),
         original_native_priority_ (0),
         original_CORBA_priority_ (0)
@@ -225,13 +225,13 @@ namespace TAO
       return this->poa_;
     }
 
-    Servant_Upcall::~Servant_Upcall (void)
+    Servant_Upcall::~Servant_Upcall ()
     {
       this->upcall_cleanup ();
     }
 
     void
-    Servant_Upcall::upcall_cleanup (void)
+    Servant_Upcall::upcall_cleanup ()
     {
       this->post_invoke ();
 
@@ -292,14 +292,14 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::post_invoke_servant_cleanup (void)
+    Servant_Upcall::post_invoke_servant_cleanup ()
     {
       this->poa_->post_invoke_servant_cleanup (this->current_context_.object_id (),
                                                *this);
     }
 
     void
-    Servant_Upcall::single_threaded_poa_setup (void)
+    Servant_Upcall::single_threaded_poa_setup ()
     {
 #if (TAO_HAS_MINIMUM_POA == 0)
       // Serialize servants (if necessary).
@@ -317,7 +317,7 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::single_threaded_poa_cleanup (void)
+    Servant_Upcall::single_threaded_poa_cleanup ()
     {
 #if (TAO_HAS_MINIMUM_POA == 0)
       // Since the servant lock was acquired, we must release it.
@@ -328,7 +328,7 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::increment_servant_refcount (void)
+    Servant_Upcall::increment_servant_refcount ()
     {
       // Cleanup servant related stuff.
       if (this->active_object_map_entry_ != 0)
@@ -336,7 +336,7 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::servant_cleanup (void)
+    Servant_Upcall::servant_cleanup ()
     {
       // Cleanup servant related stuff.
       if (this->active_object_map_entry_ != 0)
@@ -369,7 +369,7 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::poa_cleanup (void)
+    Servant_Upcall::poa_cleanup ()
     {
       // Decrease <poa->outstanding_requests_> now that the upcall
       // is complete.
diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h
index a7f5f2ae320..319a6074389 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Servant_Upcall.h
@@ -70,7 +70,7 @@ namespace TAO
       {
       public:
         /// Constructor.
-        Pre_Invoke_State (void);
+        Pre_Invoke_State ();
 
         enum State
         {
@@ -93,7 +93,7 @@ namespace TAO
       explicit Servant_Upcall (TAO_ORB_Core *orb_core);
 
       /// Destructor.
-      ~Servant_Upcall (void);
+      ~Servant_Upcall ();
 
       /// Locate POA and servant.
       int prepare_for_upcall (const TAO::ObjectKey &key,
@@ -110,41 +110,41 @@ namespace TAO
       void pre_invoke_remote_request (TAO_ServerRequest &req);
 
       /// Run pre_invoke for a collocated request.
-      void pre_invoke_collocated_request (void);
+      void pre_invoke_collocated_request ();
 
       /// Run post_invoke for a request.
-      void post_invoke (void);
+      void post_invoke ();
 
       /// Locate POA.
       ::TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key);
 
       /// POA accessor.
-      ::TAO_Root_POA &poa (void) const;
+      ::TAO_Root_POA &poa () const;
 
       /// Object Adapter accessor.
-      TAO_Object_Adapter &object_adapter (void) const;
+      TAO_Object_Adapter &object_adapter () const;
 
       /// System ID accessor.
-      const PortableServer::ObjectId &id (void) const;
+      const PortableServer::ObjectId &id () const;
 
       /// User ID accessors.  This is the same value returned by
       /// PortableServer::Current::get_object_id().
       void user_id (const PortableServer::ObjectId *);
-      const PortableServer::ObjectId &user_id (void) const;
+      const PortableServer::ObjectId &user_id () const;
 
       /// Servant accessor.
-      PortableServer::Servant servant (void) const;
+      PortableServer::Servant servant () const;
 
   #if (TAO_HAS_MINIMUM_POA == 0)
 
       /// Get the Servant Locator's cookie
-      void* locator_cookie (void) const;
+      void* locator_cookie () const;
 
       /// Set the Servant Locator's cookie
       void locator_cookie (void* cookie);
 
       /// Get the operation name.
-      const char *operation (void) const;
+      const char *operation () const;
 
       /// Set the operation name.
       void operation (const char *);
@@ -155,10 +155,10 @@ namespace TAO
       void active_object_map_entry (TAO_Active_Object_Map_Entry *entry);
 
       /// Get the active_object_map_entry.
-      TAO_Active_Object_Map_Entry *active_object_map_entry (void) const;
+      TAO_Active_Object_Map_Entry *active_object_map_entry () const;
 
       /// Get the priority for the current upcall.
-      CORBA::Short priority (void) const;
+      CORBA::Short priority () const;
 
       enum State
       {
@@ -170,24 +170,24 @@ namespace TAO
       };
 
       /// Get the state.
-      State state (void) const;
+      State state () const;
 
       /// Set the state.
       void state (State);
 
       /// Increment the refcount
-      void increment_servant_refcount (void);
+      void increment_servant_refcount ();
 
     protected:
 
-      void post_invoke_servant_cleanup (void);
-      void single_threaded_poa_setup (void);
-      void single_threaded_poa_cleanup (void);
-      void servant_cleanup (void);
-      void poa_cleanup (void);
+      void post_invoke_servant_cleanup ();
+      void single_threaded_poa_setup ();
+      void single_threaded_poa_cleanup ();
+      void servant_cleanup ();
+      void poa_cleanup ();
 
       /// Clean-up / reset state of this Servant_Upcall object.
-      void upcall_cleanup (void);
+      void upcall_cleanup ();
 
     protected:
 
diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h
index 1c146dc0eb9..24f66407de2 100644
--- a/TAO/tao/PortableServer/Servant_var.h
+++ b/TAO/tao/PortableServer/Servant_var.h
@@ -55,7 +55,7 @@ namespace PortableServer
     /**
      * This destructor doesn't throw exceptions.
      */
-    ~Servant_var (void);
+    ~Servant_var ();
 
     /// Assignment operator.  Assumes ownership of @c p.
     Servant_var<T> & operator= (T * p);
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
index 710cf1f494f..3e217820af9 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
@@ -38,13 +38,13 @@ namespace TAO
   class In_Special_Basic_SArgument_T : public InArgument
   {
   public:
-    In_Special_Basic_SArgument_T (void);
+    In_Special_Basic_SArgument_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 */
-    S const & arg (void) const;
+    S const & arg () const;
 
   private:
     S x_;
@@ -63,14 +63,14 @@ namespace TAO
   class Inout_Special_Basic_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Special_Basic_SArgument_T (void);
+    Inout_Special_Basic_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_;
@@ -89,13 +89,13 @@ namespace TAO
   class Out_Special_Basic_SArgument_T : public OutArgument
   {
   public:
-    Out_Special_Basic_SArgument_T (void);
+    Out_Special_Basic_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_;
@@ -114,13 +114,13 @@ namespace TAO
   class Ret_Special_Basic_SArgument_T : public RetArgument
   {
   public:
-    Ret_Special_Basic_SArgument_T (void);
+    Ret_Special_Basic_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/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp
index dc03abc1ed4..575067c77bf 100644
--- a/TAO/tao/PortableServer/StrategyFactory.cpp
+++ b/TAO/tao/PortableServer/StrategyFactory.cpp
@@ -8,7 +8,7 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    StrategyFactory::~StrategyFactory (void)
+    StrategyFactory::~StrategyFactory ()
     {
     }
   } /* namespace Portable_Server */
diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h
index fac77d9bff8..ac0b08687ae 100644
--- a/TAO/tao/PortableServer/StrategyFactory.h
+++ b/TAO/tao/PortableServer/StrategyFactory.h
@@ -31,7 +31,7 @@ namespace TAO
       : public ACE_Service_Object
     {
     public:
-      virtual ~StrategyFactory (void);
+      virtual ~StrategyFactory ();
     };
   } /* namespace Portable_Server */
 } /* namespace TAO */
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index c7f2869db2b..38dbb7e1f15 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -18,7 +18,7 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    ThreadPolicy::copy (void)
+    ThreadPolicy::copy ()
     {
       ThreadPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
@@ -29,30 +29,30 @@ namespace TAO
     }
 
     void
-    ThreadPolicy::destroy (void)
+    ThreadPolicy::destroy ()
     {
     }
 
     ::PortableServer::ThreadPolicyValue
-    ThreadPolicy::value (void)
+    ThreadPolicy::value ()
     {
       return value_;
     }
 
     CORBA::PolicyType
-    ThreadPolicy::policy_type (void)
+    ThreadPolicy::policy_type ()
     {
       return ::PortableServer::THREAD_POLICY_ID;
     }
 
     TAO_Cached_Policy_Type
-    ThreadPolicy::_tao_cached_type (void) const
+    ThreadPolicy::_tao_cached_type () const
     {
       return TAO_CACHED_POLICY_THREAD;
     }
 
     TAO_Policy_Scope
-    ThreadPolicy::_tao_scope (void) const
+    ThreadPolicy::_tao_scope () const
     {
       return TAO_POLICY_POA_SCOPE;
     }
diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h
index 9de46c892bd..e48bee84d72 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.h
+++ b/TAO/tao/PortableServer/ThreadPolicy.h
@@ -43,19 +43,19 @@ namespace TAO
     public:
       ThreadPolicy (::PortableServer::ThreadPolicyValue value);
 
-      CORBA::Policy_ptr copy (void);
+      CORBA::Policy_ptr copy ();
 
-      void destroy (void);
+      void destroy ();
 
-      ::PortableServer::ThreadPolicyValue value (void);
+      ::PortableServer::ThreadPolicyValue value ();
 
-      CORBA::PolicyType policy_type (void);
+      CORBA::PolicyType policy_type ();
 
       /// Return the cached policy type for this policy.
-      TAO_Cached_Policy_Type _tao_cached_type (void) const;
+      TAO_Cached_Policy_Type _tao_cached_type () const;
 
       /// Returns the scope at which this policy can be applied. See orbconf.h.
-      TAO_Policy_Scope _tao_scope (void) const;
+      TAO_Policy_Scope _tao_scope () const;
 
     private:
       ::PortableServer::ThreadPolicyValue value_;
diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
index 7b36ab1a869..647081f0660 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -12,7 +12,7 @@ namespace TAO
     }
 
     void
-    ThreadStrategy::strategy_cleanup (void)
+    ThreadStrategy::strategy_cleanup ()
     {
     }
   }
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
index 29b9ab8bafa..14488287a2b 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.h
+++ b/TAO/tao/PortableServer/ThreadStrategy.h
@@ -37,7 +37,7 @@ namespace TAO
 
       virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(void);
+      virtual void strategy_cleanup();
 
       virtual ::PortableServer::ThreadPolicyValue type() const = 0;
     };
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h
index 5b6dea30625..6d3b9bdbac0 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.h
@@ -30,7 +30,6 @@
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Null_Mutex.h"
 
-
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h
index 8e19dc77413..457e761bf06 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h
@@ -33,13 +33,13 @@ namespace TAO
   class In_UB_String_SArgument_T : public InArgument
   {
   public:
-    In_UB_String_SArgument_T (void);
+    In_UB_String_SArgument_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 */
-    S const * arg (void) const;
+    S const * arg () const;
 
   private:
     S_var x_;
@@ -55,14 +55,14 @@ namespace TAO
   class Inout_UB_String_SArgument_T : public InoutArgument
   {
   public:
-    Inout_UB_String_SArgument_T (void);
+    Inout_UB_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 */
-    S *& arg (void);
+    S *& arg ();
 
   private:
     S_var x_;
@@ -78,13 +78,13 @@ namespace TAO
   class Out_UB_String_SArgument_T : public OutArgument
   {
   public:
-    Out_UB_String_SArgument_T (void);
+    Out_UB_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 */
-    S *& arg (void);
+    S *& arg ();
 
   private:
     S_var x_;
@@ -100,13 +100,13 @@ namespace TAO
   class Ret_UB_String_SArgument_T : public RetArgument
   {
   public:
-    Ret_UB_String_SArgument_T (void);
+    Ret_UB_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 */
-    S *& arg (void);
+    S *& arg ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp
index 52dc05020e2..b1133c9f623 100644
--- a/TAO/tao/PortableServer/Upcall_Command.cpp
+++ b/TAO/tao/PortableServer/Upcall_Command.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Upcall_Command::~Upcall_Command (void)
+TAO::Upcall_Command::~Upcall_Command ()
 {
 }
 
diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h
index 6184aa987dd..2b32a23d33e 100644
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ b/TAO/tao/PortableServer/Upcall_Command.h
@@ -41,10 +41,10 @@ namespace TAO
   {
   public:
     /// Destructor.
-    virtual ~Upcall_Command (void);
+    virtual ~Upcall_Command ();
 
     /// Execute the upcall.
-    virtual void execute (void) = 0;
+    virtual void execute () = 0;
   };
 }  // End namespace TAO
 
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
index 4e15f8aadf1..0242a21f24a 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -35,13 +35,13 @@ namespace TAO
   {
   public:
 
-    In_Var_Array_SArgument_T (void);
+    In_Var_Array_SArgument_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_forany::_slice_type const * arg (void) const;
+    typename S_forany::_slice_type const * arg () const;
 
   private:
     mutable typename S_forany::_array_type x_;
@@ -58,14 +58,14 @@ namespace TAO
   class Inout_Var_Array_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Var_Array_SArgument_T (void);
+    Inout_Var_Array_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_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     typename S_forany::_array_type x_;
@@ -83,13 +83,13 @@ namespace TAO
   class Out_Var_Array_SArgument_T : public OutArgument
   {
   public:
-    Out_Var_Array_SArgument_T (void);
+    Out_Var_Array_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_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     S_var x_;
@@ -107,13 +107,13 @@ namespace TAO
   class Ret_Var_Array_SArgument_T : public RetArgument
   {
   public:
-    Ret_Var_Array_SArgument_T (void);
+    Ret_Var_Array_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_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
index a353331aa48..07773260e03 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
@@ -38,7 +38,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
+    S const & arg () const;
 
   private:
     S x_;
@@ -55,14 +55,14 @@ namespace TAO
   class Inout_Var_Size_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Var_Size_SArgument_T (void);
+    Inout_Var_Size_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_;
@@ -79,13 +79,13 @@ namespace TAO
   class Out_Var_Size_SArgument_T : public OutArgument
   {
   public:
-    Out_Var_Size_SArgument_T (void);
+    Out_Var_Size_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:
     typename S::_var_type x_;
@@ -102,13 +102,13 @@ namespace TAO
   class Ret_Var_Size_SArgument_T : public RetArgument
   {
   public:
-    Ret_Var_Size_SArgument_T (void);
+    Ret_Var_Size_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:
     typename S::_var_type x_;
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
index c7934c3238b..a8710e3b283 100644
--- a/TAO/tao/Principal.cpp
+++ b/TAO/tao/Principal.cpp
@@ -11,19 +11,19 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::Principal::Principal (void)
+CORBA::Principal::Principal ()
   : refcount_ (1)
 {
 }
 
-CORBA::Principal::~Principal (void)
+CORBA::Principal::~Principal ()
 {
 }
 
 CORBA::Boolean
 operator<< (TAO_OutputCDR & cdr, CORBA::Principal * x)
 {
-  if (x != 0)
+  if (x != nullptr)
     {
       CORBA::ULong length  = x->id.length ();
       cdr.write_long (length);
@@ -45,7 +45,7 @@ operator>> (TAO_InputCDR & cdr, CORBA::Principal *& x)
 
   if (length == 0 || !cdr.good_bit ())
     {
-      x = 0;
+      x = nullptr;
     }
   else
     {
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index e961e8b419a..756aac6a9a6 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -25,11 +25,7 @@
 #include "tao/OctetSeqC.h"
 #include "tao/Pseudo_VarOut_T.h"
 #include "ace/Thread_Mutex.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -94,11 +90,7 @@ namespace CORBA
 
   private:
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
   };
 }  // End CORBA namespace
 
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 2c332b8fb03..00b5370e7c6 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -27,11 +27,11 @@ TAO_Profile::TAO_Profile (CORBA::ULong tag,
   : version_ (version)
     , are_policies_parsed_ (false)
     , addressing_mode_ (0)
-    , tagged_profile_ (0)
-    , ref_object_key_ (0)
+    , tagged_profile_ (nullptr)
+    , ref_object_key_ (nullptr)
     , tag_ (tag)
     , orb_core_ (orb_core)
-    , forward_to_ (0)
+    , forward_to_ (nullptr)
     , refcount_ (1)
     , tagged_profile_lock_ ()
     , tagged_profile_created_ (false)
@@ -46,18 +46,18 @@ TAO_Profile::TAO_Profile (CORBA::ULong tag,
   : version_ (version)
     , are_policies_parsed_ (false)
     , addressing_mode_ (0)
-    , tagged_profile_ (0)
-    , ref_object_key_ (0)
+    , tagged_profile_ (nullptr)
+    , ref_object_key_ (nullptr)
     , tag_ (tag)
     , orb_core_ (orb_core)
-    , forward_to_ (0)
+    , forward_to_ (nullptr)
     , refcount_ (1)
     , tagged_profile_lock_ ()
     , tagged_profile_created_ (false)
 {
 }
 
-TAO_Profile::~TAO_Profile (void)
+TAO_Profile::~TAO_Profile ()
 {
   if (this->tagged_profile_)
     {
@@ -65,8 +65,6 @@ TAO_Profile::~TAO_Profile (void)
     }
 
   this->orb_core_->object_key_table ().unbind (this->ref_object_key_);
-
-  //@@ TAO_PROFILE_SPL_DESTRUCTOR_ADD_HOOK
 }
 
 void
@@ -88,21 +86,21 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component)
 
 
 TAO_Endpoint *
-TAO_Profile::base_endpoint (void)
+TAO_Profile::base_endpoint ()
 {
   return this->endpoint();
 }
 
 TAO::ObjectKey *
-TAO_Profile::_key (void) const
+TAO_Profile::_key () const
 {
-  TAO::ObjectKey *key = 0;
+  TAO::ObjectKey *key = nullptr;
 
   if (this->ref_object_key_)
     {
       ACE_NEW_RETURN (key,
                       TAO::ObjectKey (this->ref_object_key_->object_key ()),
-                      0);
+                      nullptr);
     }
   return key;
 }
@@ -234,7 +232,7 @@ TAO_Profile::decode (TAO_InputCDR& cdr)
 }
 
 IOP::TaggedProfile *
-TAO_Profile::create_tagged_profile (void)
+TAO_Profile::create_tagged_profile ()
 {
   if (this->tagged_profile_created_)
     return this->tagged_profile_;
@@ -249,7 +247,7 @@ TAO_Profile::create_tagged_profile (void)
     {
       ACE_NEW_RETURN (this->tagged_profile_,
                       IOP::TaggedProfile,
-                      0);
+                      nullptr);
 
       // As we have not created we will now create the TaggedProfile
       this->tagged_profile_->tag = this->tag_;
@@ -305,7 +303,7 @@ TAO_Profile::set_tagged_components (TAO_OutputCDR &out_cdr)
   CORBA::Octet *buf = tagged_component.component_data.get_buffer ();
 
   for (const ACE_Message_Block *iterator = out_cdr.begin ();
-       iterator != 0;
+       iterator != nullptr;
        iterator = iterator->cont ())
     {
       size_t const i_length = iterator->length ();
@@ -323,7 +321,7 @@ TAO_Profile::set_tagged_components (TAO_OutputCDR &out_cdr)
 void
 TAO_Profile::policies (CORBA::PolicyList *policy_list)
 {
-  if (policy_list == 0)
+  if (policy_list == nullptr)
     {
       if (TAO_debug_level)
         {
@@ -338,7 +336,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list)
   Messaging::PolicyValueSeq policy_value_seq;
 
   size_t length = 0;
-  CORBA::Octet *buf = 0;
+  CORBA::Octet *buf = nullptr;
 
   // This loop iterates through CORBA::PolicyList to convert
   // each CORBA::Policy into a CORBA::PolicyValue
@@ -365,7 +363,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list)
       // Copy the CDR buffer data into the octet sequence buffer.
 
       for (const ACE_Message_Block *iterator = out_CDR.begin ();
-           iterator != 0;
+           iterator != nullptr;
            iterator = iterator->cont ())
         {
           ACE_OS::memcpy (buf, iterator->rd_ptr (), iterator->length ());
@@ -392,7 +390,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list)
   buf = tagged_component.component_data.get_buffer ();
 
   for (const ACE_Message_Block *iterator = out_cdr.begin ();
-       iterator != 0;
+       iterator != nullptr;
        iterator = iterator->cont ())
     {
       size_t const i_length = iterator->length ();
@@ -514,7 +512,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl)
 }
 
 void
-TAO_Profile::verify_orb_configuration (void)
+TAO_Profile::verify_orb_configuration ()
 {
   // If the ORB isn't configured to support tagged components, then
   // throw an exception.
@@ -547,7 +545,7 @@ TAO_Profile::verify_orb_configuration (void)
 }
 
 void
-TAO_Profile::verify_profile_version (void)
+TAO_Profile::verify_profile_version ()
 {
   // GIOP 1.0 does not support tagged components.  Throw an exception
   // if the profile is a GIOP 1.0 profile.
@@ -578,14 +576,14 @@ TAO_Profile::verify_profile_version (void)
 }
 
 int
-TAO_Profile::supports_multicast (void) const
+TAO_Profile::supports_multicast () const
 {
   // Most profiles do not support multicast endpoints.
   return 0;
 }
 
 bool
-TAO_Profile::supports_non_blocking_oneways (void) const
+TAO_Profile::supports_non_blocking_oneways () const
 {
   return !(this->version_.major == 1 && this->version_.minor == 0);
 }
@@ -688,23 +686,23 @@ CORBA::Boolean
 TAO_Profile::compare_key (const TAO_Profile *other) const
 {
   return (this->ref_object_key_ == other->ref_object_key_) ||
-    ((this->ref_object_key_ != 0 &&
-      other->ref_object_key_ != 0 &&
+    ((this->ref_object_key_ != nullptr &&
+      other->ref_object_key_ != nullptr &&
       this->ref_object_key_->object_key() ==
       other->ref_object_key_->object_key()));
 }
 
 TAO_Endpoint *
-TAO_Profile::first_filtered_endpoint (void)
+TAO_Profile::first_filtered_endpoint ()
 {
   TAO_Endpoint *ep = this->endpoint();
-  return ep == 0 ? 0 : ep->next_filtered(this->orb_core_,0);
+  return ep == nullptr ? nullptr : ep->next_filtered(this->orb_core_,nullptr);
 }
 
 TAO_Endpoint *
 TAO_Profile::next_filtered_endpoint (TAO_Endpoint *source)
 {
-  if (source == 0)
+  if (source == nullptr)
     return this->first_filtered_endpoint();
   return source->next_filtered(this->orb_core_,this->endpoint());
 }
@@ -728,15 +726,8 @@ TAO_Profile::hash_service_i (CORBA::ULong m)
   return this->orb_core_->hash_service (this, m);
 }
 
-/*
- * Hook to comment out no op method
- * in the base class that is specialized in the
- * derived class.
- */
-//@@ TAO_PROFILE_SPL_COMMENT_HOOK_START
-
 int
-TAO_Profile::encode_alternate_endpoints(void)
+TAO_Profile::encode_alternate_endpoints()
 {
   // this should be a pure virtual, but there are many
   // existing specializations that would need to be
@@ -753,10 +744,6 @@ TAO_Profile::remove_generic_endpoint (TAO_Endpoint *)
   // default for virtual methods, thus a no-op
 }
 
-//@@ TAO_PROFILE_SPL_COMMENT_HOOK_END
-
-//@@ TAO_PROFILE_SPL_METHODS_ADD_HOOK
-
 // ****************************************************************
 
 TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag,
@@ -769,13 +756,13 @@ TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag,
 }
 
 TAO_Endpoint*
-TAO_Unknown_Profile::endpoint (void)
+TAO_Unknown_Profile::endpoint ()
 {
-  return 0;
+  return nullptr;
 }
 
 CORBA::ULong
-TAO_Unknown_Profile::endpoint_count (void) const
+TAO_Unknown_Profile::endpoint_count () const
 {
   return 0;
 }
@@ -793,16 +780,16 @@ TAO_Unknown_Profile::parse_string_i (const char *)
 }
 
 char
-TAO_Unknown_Profile::object_key_delimiter (void) const
+TAO_Unknown_Profile::object_key_delimiter () const
 {
   return 0;
 }
 
 char *
-TAO_Unknown_Profile::to_string (void) const
+TAO_Unknown_Profile::to_string () const
 {
   // @@ THROW something?
-  return 0;
+  return nullptr;
 }
 
 int
@@ -823,7 +810,7 @@ TAO_Unknown_Profile::decode_profile (TAO_InputCDR &)
 }
 
 int
-TAO_Unknown_Profile::decode_endpoints (void)
+TAO_Unknown_Profile::decode_endpoints ()
 {
   return 0;
 }
@@ -836,15 +823,15 @@ TAO_Unknown_Profile::encode (TAO_OutputCDR &stream) const
 }
 
 int
-TAO_Unknown_Profile::encode_endpoints (void)
+TAO_Unknown_Profile::encode_endpoints ()
 {
   return 0;
 }
 
 TAO::ObjectKey *
-TAO_Unknown_Profile::_key (void) const
+TAO_Unknown_Profile::_key () const
 {
-  return 0;
+  return nullptr;
 }
 
 CORBA::Boolean
@@ -853,7 +840,7 @@ TAO_Unknown_Profile::do_is_equivalent (const TAO_Profile* other_profile)
   const TAO_Unknown_Profile * op =
     dynamic_cast <const TAO_Unknown_Profile *> (other_profile);
 
-  return (CORBA::Boolean) (op == 0 ? 0 : this->body_ == op->body_);
+  return (CORBA::Boolean) (op == nullptr ? 0 : this->body_ == op->body_);
 }
 
 TAO_Service_Callbacks::Profile_Equivalence
@@ -893,7 +880,7 @@ operator<< (TAO_OutputCDR& cdr, const TAO_opaque& x)
   cdr.write_ulong (length);
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  if (x.mb () != 0)
+  if (x.mb () != nullptr)
     {
       cdr.write_octet_array_mb (x.mb ());
     }
@@ -915,7 +902,7 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
   if(ACE_BIT_DISABLED(cdr.start()->flags(),
                       ACE_Message_Block::DONT_DELETE)
-     && (cdr.orb_core() == 0
+     && (cdr.orb_core() == nullptr
          || 1 == cdr.orb_core()->
          resource_factory()->
          input_cdr_allocator_type_locked()
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 88423d1657e..8bb9ccdcdcc 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -22,11 +22,7 @@
 #include "tao/GIOP_Message_Version.h"
 #include "tao/Refcounted_ObjectKey.h"
 #include "tao/Service_Callbacks.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
@@ -66,32 +62,32 @@ public:
   */
   //@{
   /// The tag, each concrete class will have a specific tag value.
-  CORBA::ULong tag (void) const;
+  CORBA::ULong tag () const;
 
   /// Return a pointer to this profile's version.  This object
   /// maintains ownership.
-  const TAO_GIOP_Message_Version &version (void) const;
+  const TAO_GIOP_Message_Version &version () const;
 
   /// Get a pointer to the TAO_ORB_Core.
-  TAO_ORB_Core *orb_core (void) const;
+  TAO_ORB_Core *orb_core () const;
 
   /// Increase the reference count by one on this object.
-  unsigned long _incr_refcnt (void);
+  unsigned long _incr_refcnt ();
 
   /// Decrement the object's reference count.  When this count goes to
   /// 0 this object will be deleted.
-  unsigned long _decr_refcnt (void);
+  unsigned long _decr_refcnt ();
 
   /// Keep a pointer to the forwarded profile
   void forward_to (TAO_MProfile *mprofiles);
 
   /// MProfile accessor
-  TAO_MProfile* forward_to (void);
+  TAO_MProfile* forward_to ();
 
   /// Access the tagged components, notice that they they could be
   /// empty (or ignored) for non-GIOP protocols (and even for GIOP-1.0)
-  const TAO_Tagged_Components& tagged_components (void) const;
-  TAO_Tagged_Components& tagged_components (void);
+  const TAO_Tagged_Components& tagged_components () const;
+  TAO_Tagged_Components& tagged_components ();
 
   /// Add the given tagged component to the profile.
   void add_tagged_component (const IOP::TaggedComponent &component);
@@ -100,14 +96,14 @@ public:
    * Return the current addressing mode for this profile.
    * In almost all cases, this is TAO_Target_Specification::Key_Addr.
    */
-  CORBA::Short addressing_mode (void) const;
+  CORBA::Short addressing_mode () const;
 
   /// @deprecated Return a reference to the Object Key.
-  const TAO::ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key () const;
 
   /// Obtain the object key, return 0 if the profile cannot be parsed.
   /// The memory is owned by the caller!
-  TAO::ObjectKey *_key (void) const;
+  TAO::ObjectKey *_key () const;
   //@}
 
   /**
@@ -130,7 +126,7 @@ public:
    * return the reference to that. This method is necessary for GIOP
    * 1.2.
    */
-  IOP::TaggedProfile *create_tagged_profile (void);
+  IOP::TaggedProfile *create_tagged_profile ();
 
   /// This method sets the client exposed policies, i.e., the ones
   /// propagated in the IOR, for this profile.
@@ -140,10 +136,10 @@ public:
   virtual void  get_policies (CORBA::PolicyList &policy_list);
 
   /// Returns true if this profile can specify multicast endpoints.
-  virtual int supports_multicast (void) const;
+  virtual int supports_multicast () const;
 
   /// Returns true if this profile supports non blocking oneways
-  virtual bool supports_non_blocking_oneways (void) const;
+  virtual bool supports_non_blocking_oneways () const;
 
   /**
    * Set the addressing mode if a remote servant replies with
@@ -175,7 +171,7 @@ public:
   virtual void addressing_mode (CORBA::Short addr_mode);
 
   /// The object key delimiter.
-  virtual char object_key_delimiter (void) const = 0;
+  virtual char object_key_delimiter () const = 0;
 
   /// Initialize this object using the given input string.
   /// Supports URL style of object references
@@ -184,14 +180,14 @@ public:
   /// Return a string representation for this profile.  Client must
   /// deallocate memory. Only one endpoint is included into the
   /// string.
-  virtual char* to_string (void) const = 0;
+  virtual char* to_string () const = 0;
 
   /**
    * Encodes this profile's endpoints into a tagged component.
    * This is done only if RTCORBA is enabled, since currently this is
    * the only case when we have more than one endpoint per profile.
    */
-  virtual int encode_endpoints (void) = 0;
+  virtual int encode_endpoints () = 0;
 
   /**
    * Encodes this profile's endpoints into protocol specific tagged
@@ -199,14 +195,14 @@ public:
    * endpoints on profiles. The only known implementation is IIOP, using
    * TAG_ALTERNATE_IIOP_ADDRESS components.
    */
-  virtual int encode_alternate_endpoints (void);
+  virtual int encode_alternate_endpoints ();
 
   /**
    * Return a pointer to this profile's endpoint.  If the profile
    * contains more than one endpoint, i.e., a list, the method returns
    * the head of the list.
    */
-  virtual TAO_Endpoint *endpoint (void) = 0;
+  virtual TAO_Endpoint *endpoint () = 0;
 
 
   /**
@@ -219,17 +215,17 @@ public:
    * to facilitate the Endpoint Policy's filtering function.
    * The default implementation of base_endpoint simply returns endpoint.
    */
-  virtual TAO_Endpoint *base_endpoint (void);
+  virtual TAO_Endpoint *base_endpoint ();
 
   /// Return how many endpoints this profile contains.
-  virtual CORBA::ULong endpoint_count (void) const = 0;
+  virtual CORBA::ULong endpoint_count () const = 0;
 
   /**
    * Return the first endpoint in the list that matches some filtering
    * constraint, such as IPv6 compatibility for IIOP endpoints. This
    * method is implemented in terms of TAO_Endpoint::next_filtered().
    */
-  TAO_Endpoint *first_filtered_endpoint (void);
+  TAO_Endpoint *first_filtered_endpoint ();
 
   /// Return the next filtered endpoint in the list after the one
   /// passed in. This method is implemented in terms of
@@ -273,11 +269,9 @@ public:
   virtual CORBA::ULong hash (CORBA::ULong max) = 0;
   //@}
 
-  //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// If you have a virtual method you need a virtual dtor.
-  virtual ~TAO_Profile (void);
+  virtual ~TAO_Profile ();
 
   /**
    * @name Protected template methods.
@@ -296,7 +290,7 @@ protected:
    * version of TAO or some other ORB.  This is not an error, and we
    * must proceed.  Return 0 on success and -1 on failure.
    */
-  virtual int decode_endpoints (void) = 0;
+  virtual int decode_endpoints () = 0;
 
   /// Protocol specific implementation of parse_string ()
   virtual void parse_string_i (const char *string) = 0;
@@ -333,24 +327,21 @@ protected:
 private:
 
   /// This object keeps ownership of this object
-  TAO_MProfile *forward_to_i (void);
+  TAO_MProfile *forward_to_i ();
 
   /// Verify that the current ORB's configuration supports tagged
   /// components in IORs.
-  void verify_orb_configuration (void);
+  void verify_orb_configuration ();
 
   /// Verify that the given profile supports tagged components,
   /// i.e. is not a GIOP 1.0 profile.
-  void verify_profile_version (void);
+  void verify_profile_version ();
 
   // Profiles should not be copied or assigned!
   TAO_Profile (const TAO_Profile&);
   void operator= (const TAO_Profile&);
 
-  //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_ADD_HOOK
-
 protected:
-
   /// IIOP version number.
   TAO_GIOP_Message_Version version_;
 
@@ -384,11 +375,7 @@ private:
   TAO_MProfile* forward_to_;
 
   /// Number of outstanding references to this object.
-#if defined (ACE_HAS_CPP11)
-    std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
+  std::atomic<uint32_t> refcount_;
 
   /// A lock that protects creation of the tagged profile
   TAO_SYNCH_MUTEX tagged_profile_lock_;
@@ -396,15 +383,10 @@ private:
   /// Having (tagged_profile_ != 0) doesn't mean yet that
   /// tagged_profile_ building is finished.
   bool tagged_profile_created_;
-
-  //@@ TAO_PROFILE_SPL_PRIVATE_DATA_ADD_HOOK
 };
 
-//@@ TAO_PROFILE_SPL_EXTERN_ADD_HOOK
-
 // A helper class to handle the various kinds of octet sequences used
 // inside the ORB.
-
 typedef TAO::unbounded_value_sequence<CORBA::Octet> TAO_opaque;
 
 TAO_Export CORBA::Boolean
@@ -435,19 +417,19 @@ public:
 
   // = The TAO_Profile methods look above
   virtual void parse_string (const char *string);
-  virtual char object_key_delimiter (void) const;
-  virtual char* to_string (void) const;
+  virtual char object_key_delimiter () const;
+  virtual char* to_string () const;
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode (TAO_OutputCDR &stream) const;
-  virtual int encode_endpoints (void);
+  virtual int encode_endpoints ();
 
-  virtual TAO::ObjectKey *_key (void) const;
-  virtual TAO_Endpoint *endpoint (void);
-  virtual CORBA::ULong endpoint_count (void) const;
+  virtual TAO::ObjectKey *_key () const;
+  virtual TAO_Endpoint *endpoint ();
+  virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
 
   virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
 
 protected:
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile* other_profile);
@@ -462,8 +444,6 @@ private:
   TAO_opaque body_;
 };
 
-//@@ TAO_PROFILE_SPL_EXTERN_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 4423d4a25fe..860a3283295 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -28,7 +28,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 
-  Profile_Transport_Resolver::~Profile_Transport_Resolver (void)
+  Profile_Transport_Resolver::~Profile_Transport_Resolver ()
   {
     if (this->profile_)
       {
@@ -82,7 +82,7 @@ namespace TAO
     // Select the endpoint
     es->select_endpoint (this, max_time_val);
 
-    if (this->transport_.get () == 0)
+    if (this->transport_.get () == nullptr)
       {
         // No useable endpoint could be found. We will not
         // be able to send the message. Wait to throw an exception until
@@ -130,7 +130,7 @@ namespace TAO
     TAO_Connector_Registry *conn_reg =
       this->stub_->orb_core ()->connector_registry ();
 
-    if (conn_reg == 0)
+    if (conn_reg == nullptr)
       {
         throw ::CORBA::INTERNAL (
           CORBA::SystemException::_tao_minor_code (
@@ -148,18 +148,18 @@ namespace TAO
       }
     else if (has_con_timeout)
       {
-        if (timeout == 0 || connection_timeout < *timeout)
+        if (timeout == nullptr || connection_timeout < *timeout)
           timeout = &connection_timeout;
         else
           has_con_timeout = false;
       }
     else if (!this->blocked_)
       {
-        timeout = 0;
+        timeout = nullptr;
       }
 
     TAO_Connector *con = conn_reg->get_connector (desc->endpoint ()->tag ());
-    ACE_ASSERT(con != 0);
+    ACE_ASSERT(con != nullptr);
     if (parallel)
       {
         this->transport_.set (con->parallel_connect (this, desc, timeout));
@@ -172,7 +172,7 @@ namespace TAO
     // If the user has set a roundtrip timeout policy, throw a timeout
     // exception.  Otherwise, just fall through and return false to
     // look at the next endpoint.
-    if (this->transport_.get () == 0 &&
+    if (this->transport_.get () == nullptr &&
         has_con_timeout == false &&
         errno == ETIME)
       {
@@ -182,7 +182,7 @@ namespace TAO
             errno),
           CORBA::COMPLETED_NO);
       }
-    else if (this->transport_.get () == 0)
+    else if (this->transport_.get () == nullptr)
       {
         return false;
       }
@@ -200,7 +200,7 @@ namespace TAO
   }
 
   bool
-  Profile_Transport_Resolver::use_parallel_connect (void) const
+  Profile_Transport_Resolver::use_parallel_connect () const
   {
     TAO_ORB_Core *oc = this->stub_->orb_core();
     return (oc->orb_params()->use_parallel_connects()
@@ -229,7 +229,7 @@ namespace TAO
 
 
   void
-  Profile_Transport_Resolver::init_inconsistent_policies (void)
+  Profile_Transport_Resolver::init_inconsistent_policies ()
   {
     ACE_NEW_THROW_EX (this->inconsistent_policies_,
                       CORBA::PolicyList (0),
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 98848a61bc4..22902e6fafe 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -73,7 +73,7 @@ namespace TAO
                                 TAO_Stub *stub,
                                 bool block = true);
 
-    ~Profile_Transport_Resolver (void);
+    ~Profile_Transport_Resolver ();
 
     /// Method where the bunch of the action takes place.
     /**
@@ -95,16 +95,16 @@ namespace TAO
     void profile (TAO_Profile *pfile);
 
     /// Accessor for profile.
-    TAO_Profile *profile (void) const;
+    TAO_Profile *profile () const;
 
     /// Accessor for TAO_Stub
-    TAO_Stub *stub (void) const;
+    TAO_Stub *stub () const;
 
     /// Accessor for the target in use
-    CORBA::Object *object (void) const;
+    CORBA::Object *object () const;
 
     /// Accessor for the transport reserved for this invocation.
-    TAO_Transport *transport (void) const;
+    TAO_Transport *transport () const;
 
     /// See if the transport cache has an available transport and
     /// use that one rather than trying to connect via the connector.
@@ -115,12 +115,12 @@ namespace TAO
 
     /// Accessor to indicate whether we should block while
     /// establishing a connection.
-    bool blocked_connect (void) const;
+    bool blocked_connect () const;
     //@}
 
     /// Signal to let the resolver know that the transport has been
     /// released back to the cache.
-    void transport_released (void) const;
+    void transport_released () const;
 
     /// This is a callback method used by the endpoint selectors to
     /// delegate the responsibility of reserving a transport from the
@@ -139,15 +139,15 @@ namespace TAO
     /// This method wraps a call to the orb core to see if parallel
     /// connection attempts are even desired. This is controlled by
     /// the -ORBUseParallelConnects 1|0 commandline option.
-    bool use_parallel_connect (void) const;
+    bool use_parallel_connect () const;
 
     /// Initialize the inconsistent policy list that this object has
     /// cached.
-    void init_inconsistent_policies (void);
+    void init_inconsistent_policies ();
 
-    CORBA::PolicyList *inconsistent_policies (void) const;
+    CORBA::PolicyList *inconsistent_policies () const;
 
-    CORBA::PolicyList *steal_inconsistent_policies (void);
+    CORBA::PolicyList *steal_inconsistent_policies ();
   private:
 
     /// Helper method to access get the connection timeout from the
diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp
index d8572873fe1..9fd5df93b81 100644
--- a/TAO/tao/Protocol_Factory.cpp
+++ b/TAO/tao/Protocol_Factory.cpp
@@ -7,12 +7,12 @@ TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag)
 {
 }
 
-TAO_Protocol_Factory::~TAO_Protocol_Factory (void)
+TAO_Protocol_Factory::~TAO_Protocol_Factory ()
 {
 }
 
 CORBA::ULong
-TAO_Protocol_Factory::tag (void) const
+TAO_Protocol_Factory::tag () const
 {
   return this->tag_;
 }
diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp
index cc344282e8d..ad56ce31a3f 100644
--- a/TAO/tao/Protocols_Hooks.cpp
+++ b/TAO/tao/Protocols_Hooks.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void)
+TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties ()
   : send_buffer_size_ (0),
     recv_buffer_size_ (0),
     keep_alive_ (0),
@@ -14,13 +14,13 @@ TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void)
 {
 }
 
-TAO_UIOP_Protocol_Properties::TAO_UIOP_Protocol_Properties (void)
+TAO_UIOP_Protocol_Properties::TAO_UIOP_Protocol_Properties ()
   : send_buffer_size_ (0),
     recv_buffer_size_ (0)
 {
 }
 
-TAO_SHMIOP_Protocol_Properties::TAO_SHMIOP_Protocol_Properties (void)
+TAO_SHMIOP_Protocol_Properties::TAO_SHMIOP_Protocol_Properties ()
   : send_buffer_size_ (0),
     recv_buffer_size_ (0),
     keep_alive_ (0),
@@ -32,7 +32,7 @@ TAO_SHMIOP_Protocol_Properties::TAO_SHMIOP_Protocol_Properties (void)
 {
 }
 
-TAO_DIOP_Protocol_Properties::TAO_DIOP_Protocol_Properties (void)
+TAO_DIOP_Protocol_Properties::TAO_DIOP_Protocol_Properties ()
   : send_buffer_size_ (0),
     recv_buffer_size_ (0),
     enable_network_priority_ (0),
@@ -41,7 +41,7 @@ TAO_DIOP_Protocol_Properties::TAO_DIOP_Protocol_Properties (void)
 {
 }
 
-TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void)
+TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties ()
   : send_buffer_size_ (0),
     recv_buffer_size_ (0),
     keep_alive_ (0),
@@ -52,7 +52,7 @@ TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void)
 {
 }
 
-TAO_Protocols_Hooks::~TAO_Protocols_Hooks (void)
+TAO_Protocols_Hooks::~TAO_Protocols_Hooks ()
 {
 }
 
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index e7edfa9bc9d..3a8c76a844f 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -40,7 +40,7 @@ class TAO_Export TAO_IIOP_Protocol_Properties
 {
 public:
 
-  TAO_IIOP_Protocol_Properties (void);
+  TAO_IIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
   CORBA::Long recv_buffer_size_;
@@ -55,7 +55,7 @@ class TAO_Export TAO_UIOP_Protocol_Properties
 {
 public:
 
-  TAO_UIOP_Protocol_Properties (void);
+  TAO_UIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
   CORBA::Long recv_buffer_size_;
@@ -65,7 +65,7 @@ class TAO_Export TAO_SHMIOP_Protocol_Properties
 {
 public:
 
-  TAO_SHMIOP_Protocol_Properties (void);
+  TAO_SHMIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
   CORBA::Long recv_buffer_size_;
@@ -81,7 +81,7 @@ class TAO_Export TAO_DIOP_Protocol_Properties
 {
 public:
 
-  TAO_DIOP_Protocol_Properties (void);
+  TAO_DIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
   CORBA::Long recv_buffer_size_;
@@ -94,7 +94,7 @@ class TAO_Export TAO_SCIOP_Protocol_Properties
 {
 public:
 
-  TAO_SCIOP_Protocol_Properties (void);
+  TAO_SCIOP_Protocol_Properties ();
 
   CORBA::Long send_buffer_size_;
   CORBA::Long recv_buffer_size_;
@@ -109,7 +109,7 @@ class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object
 {
 public:
   /// Destructor
-  virtual ~TAO_Protocols_Hooks (void);
+  virtual ~TAO_Protocols_Hooks ();
 
   /// Initialize the protocols hooks instance.
   virtual void init_hooks (TAO_ORB_Core *orb_core) = 0;
@@ -152,7 +152,7 @@ public:
   virtual void client_protocol_properties_at_orb_level (
     TAO_SCIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual CORBA::Long get_dscp_codepoint (void) = 0;
+  virtual CORBA::Long get_dscp_codepoint () = 0;
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean &is_client_propagated,
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index 138cb64df7e..92d2bc07ca1 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -53,16 +53,16 @@ template <typename T>
 class TAO_Pseudo_Var_T : private TAO_Base_var
 {
 public:
-  TAO_Pseudo_Var_T (void);
+  TAO_Pseudo_Var_T ();
   TAO_Pseudo_Var_T (typename T::_ptr_type);
   TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> &);
 
-  ~TAO_Pseudo_Var_T (void);
+  ~TAO_Pseudo_Var_T ();
 
   TAO_Pseudo_Var_T<T> & operator= (typename T::_ptr_type);
   TAO_Pseudo_Var_T<T> & operator= (const TAO_Pseudo_Var_T<T> &);
 
-  typename T::_ptr_type operator-> (void) const;
+  typename T::_ptr_type operator-> () const;
 
   operator typename T::_ptr_type  const & () const;
   operator typename T::_ptr_type & ();
@@ -72,13 +72,13 @@ public:
   typedef typename T::_ptr_type &  _out_type;
   typedef typename T::_ptr_type    _retn_type;
 
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _out_type     out (void);
-  _retn_type    _retn (void);
+  _in_type      in () const;
+  _inout_type   inout ();
+  _out_type     out ();
+  _retn_type    _retn ();
 
   // TAO extension.
-  _retn_type    ptr (void) const;
+  _retn_type    ptr () const;
 private:
 
   // Unimplemented - prevents widening assignment.
@@ -109,8 +109,8 @@ public:
   TAO_Pseudo_Out_T<T> & operator= (typename T::_ptr_type);
 
   operator typename T::_ptr_type & ();
-  typename T::_ptr_type & ptr (void);
-  typename T::_ptr_type operator-> (void);
+  typename T::_ptr_type & ptr ();
+  typename T::_ptr_type operator-> ();
 
 private:
   typename T::_ptr_type & ptr_;
diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp
index 88806f10973..438f9d8a5c4 100644
--- a/TAO/tao/Queued_Data.cpp
+++ b/TAO/tao/Queued_Data.cpp
@@ -34,15 +34,15 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
   size_t const aligned_size = ACE_CDR::first_size (span_size + ACE_CDR::MAX_ALIGNMENT);
 
   // Get the allocators
-  ACE_Allocator *data_allocator = 0;
-  ACE_Allocator *data_block_allocator = 0;
-  ACE_Allocator *message_block_allocator = 0;
+  ACE_Allocator *data_allocator = nullptr;
+  ACE_Allocator *data_block_allocator = nullptr;
+  ACE_Allocator *message_block_allocator = nullptr;
   mb->access_allocators (data_allocator,
                          data_block_allocator,
                          message_block_allocator);
 
   // Create a new Message Block
-  ACE_Message_Block *nb = 0;
+  ACE_Message_Block *nb = nullptr;
   ACE_NEW_MALLOC_RETURN (nb,
                          static_cast<ACE_Message_Block*> (
                                          message_block_allocator->malloc (
@@ -50,7 +50,7 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
                          ACE_Message_Block(aligned_size,
                                            mb->msg_type(),
                                            mb->cont(),
-                                           0, //we want the data block created
+                                           nullptr, //we want the data block created
                                            data_allocator,
                                            mb->locking_strategy(),
                                            mb->msg_priority(),
@@ -58,7 +58,7 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
                                            mb->msg_deadline_time (),
                                            data_block_allocator,
                                            message_block_allocator),
-                         0);
+                         nullptr);
 
   ACE_CDR::mb_align (nb);
 
@@ -77,7 +77,7 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc,
                                    ACE_Data_Block *db)
 {
   // Get a node for the queue..
-  TAO_Queued_Data *qd = 0;
+  TAO_Queued_Data *qd = nullptr;
 
   if (message_buffer_alloc)
     {
@@ -85,7 +85,7 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc,
                              static_cast<TAO_Queued_Data *> (
                                message_buffer_alloc->malloc (sizeof (TAO_Queued_Data))),
                              TAO_Queued_Data (message_buffer_alloc),
-                             0);
+                             nullptr);
 
     }
   else
@@ -93,20 +93,20 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc,
       // No allocator, so use the global pool!
       ACE_NEW_RETURN (qd,
                       TAO_Queued_Data,
-                      0);
+                      nullptr);
     }
 
   // Providing an ACE_Data_Block indicates that the caller wants
   // an aligned ACE_Message_Block added to the TAO_Queued_Data.
-  if (db != 0)
+  if (db != nullptr)
     {
       // If this allocation fails, the TAO_Queued_Data will be leaked.
-      if (input_cdr_alloc == 0)
+      if (input_cdr_alloc == nullptr)
         ACE_NEW_RETURN (qd->msg_block_,
                         ACE_Message_Block (db,
                                            0,
                                            input_cdr_alloc),
-                        0);
+                        nullptr);
       else
         ACE_NEW_MALLOC_RETURN (qd->msg_block_,
                                static_cast<ACE_Message_Block*> (
@@ -114,7 +114,7 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc,
                                ACE_Message_Block (db,
                                                   0,
                                                   input_cdr_alloc),
-                               0);
+                               nullptr);
 
       ACE_CDR::mb_align (qd->msg_block_);
     }
@@ -168,7 +168,7 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd)
     (void) TAO_Queued_Data::replace_data_block (*sqd.msg_block_);
 
 
-  TAO_Queued_Data *qd = 0;
+  TAO_Queued_Data *qd = nullptr;
 
   if (sqd.allocator_)
     {
@@ -176,7 +176,7 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd)
                              static_cast<TAO_Queued_Data *> (
                                sqd.allocator_->malloc (sizeof (TAO_Queued_Data))),
                              TAO_Queued_Data (sqd),
-                             0);
+                             nullptr);
 
       return qd;
     }
@@ -193,23 +193,23 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd)
 
   ACE_NEW_RETURN (qd,
                   TAO_Queued_Data (sqd),
-                  0);
+                  nullptr);
 
   return qd;
 }
 
 int
-TAO_Queued_Data::consolidate (void)
+TAO_Queued_Data::consolidate ()
 {
   // Is this a chain of fragments?
-  if (this->state_.more_fragments () && this->msg_block_->cont () != 0)
+  if (this->state_.more_fragments () && this->msg_block_->cont () != nullptr)
     {
       // Create a message block big enough to hold the entire chain
       ACE_Message_Block *dest = clone_mb_nocopy_size (
                                       this->msg_block_,
                                       this->msg_block_->total_length ());
 
-      if (0 == dest)
+      if (nullptr == dest)
         {
           // out of memory
           return -1;
@@ -220,7 +220,7 @@ TAO_Queued_Data::consolidate (void)
 
       // Reset the cont() parameter.  We have cloned the message
       // block but not the chain as we will no longer have chain.
-      dest->cont (0);
+      dest->cont (nullptr);
 
       // Use ACE_CDR to consolidate the chain for us
       ACE_CDR::consolidate (dest, this->msg_block_);
diff --git a/TAO/tao/Queued_Data.h b/TAO/tao/Queued_Data.h
index e7654cd1f75..ee3b6969cc2 100644
--- a/TAO/tao/Queued_Data.h
+++ b/TAO/tao/Queued_Data.h
@@ -69,34 +69,34 @@ public:
 
   /// Consolidate this fragments chained message blocks into one.
   /// @return -1 if consolidation failed, eg out or memory, otherwise 0
-  int consolidate (void);
+  int consolidate ();
 
   /// Get missing data
-  size_t missing_data (void) const;
+  size_t missing_data () const;
 
   /// Set missing data
   void missing_data (size_t data);
 
   /// Get the GIOP version
-  TAO_GIOP_Message_Version const &giop_version (void) const;
+  TAO_GIOP_Message_Version const &giop_version () const;
 
   /// Get byte_order
-  CORBA::Octet byte_order (void) const;
+  CORBA::Octet byte_order () const;
 
   /// Get more fragments
-  CORBA::Boolean more_fragments (void) const;
+  CORBA::Boolean more_fragments () const;
 
   /// Get message type
-  GIOP::MsgType msg_type (void) const;
+  GIOP::MsgType msg_type () const;
 
   /// Get next
-  TAO_Queued_Data *next (void) const;
+  TAO_Queued_Data *next () const;
 
   /// Set next
   void next (TAO_Queued_Data* qd);
 
   /// Get message block
-  ACE_Message_Block *msg_block (void) const;
+  ACE_Message_Block *msg_block () const;
 
   /// Set message block
   void msg_block (ACE_Message_Block *mb);
@@ -105,7 +105,7 @@ public:
   void state (const TAO_GIOP_Message_State& state);
 
   /// Get the state
-  const TAO_GIOP_Message_State& state (void) const;
+  const TAO_GIOP_Message_State& state () const;
 
 private:
 
diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp
index f279c7b4b57..74e2dd273d0 100644
--- a/TAO/tao/Queued_Message.cpp
+++ b/TAO/tao/Queued_Message.cpp
@@ -12,12 +12,12 @@ TAO_Queued_Message::TAO_Queued_Message (TAO_ORB_Core *oc,
   : allocator_ (alloc)
   , is_heap_created_ (is_heap_allocated)
   , orb_core_ (oc)
-  , next_ (0)
-  , prev_ (0)
+  , next_ (nullptr)
+  , prev_ (nullptr)
 {
 }
 
-TAO_Queued_Message::~TAO_Queued_Message (void)
+TAO_Queued_Message::~TAO_Queued_Message ()
 {
 }
 
@@ -25,7 +25,7 @@ void
 TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head,
                                       TAO_Queued_Message *&tail)
 {
-  if (this->prev_ != 0)
+  if (this->prev_ != nullptr)
     {
       this->prev_->next_ = this->next_;
     }
@@ -34,7 +34,7 @@ TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head,
       head = this->next_;
     }
 
-  if (this->next_ != 0)
+  if (this->next_ != nullptr)
     {
       this->next_->prev_ = this->prev_;
     }
@@ -43,26 +43,26 @@ TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head,
       tail = this->prev_;
     }
 
-  this->next_ = 0;
-  this->prev_ = 0;
+  this->next_ = nullptr;
+  this->prev_ = nullptr;
 }
 
 void
 TAO_Queued_Message::push_back (TAO_Queued_Message *&head,
                                TAO_Queued_Message *&tail)
 {
-  if (tail == 0)
+  if (tail == nullptr)
     {
       tail = this;
       head = this;
-      this->next_ = 0;
-      this->prev_ = 0;
+      this->next_ = nullptr;
+      this->prev_ = nullptr;
     }
   else
     {
       tail->next_ = this;
       this->prev_ = tail;
-      this->next_ = 0;
+      this->next_ = nullptr;
       tail = this;
     }
 }
@@ -71,18 +71,18 @@ void
 TAO_Queued_Message::push_front (TAO_Queued_Message *&head,
                                 TAO_Queued_Message *&tail)
 {
-  if (head == 0)
+  if (head == nullptr)
     {
       tail = this;
       head = this;
-      this->next_ = 0;
-      this->prev_ = 0;
+      this->next_ = nullptr;
+      this->prev_ = nullptr;
     }
   else
     {
       head->prev_ = this;
       this->next_ = head;
-      this->prev_ = 0;
+      this->prev_ = nullptr;
       head = this;
     }
 }
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
index ec5685a7e1c..ebea5fae814 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
@@ -49,7 +49,6 @@ class TAO_RTCORBA_Export TAO_Continuous_Priority_Mapping
   : public TAO_Priority_Mapping
 {
 public:
-
   /// Constructor.
   TAO_Continuous_Priority_Mapping (int policy = ACE_SCHED_OTHER);
 
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
index b0101210399..3d6137a8583 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
@@ -37,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping
 {
 public:
-
   TAO_Direct_Priority_Mapping (long);
 
   /// The destructor
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
index 8dbd1dcb636..69b1946e9c3 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
@@ -40,7 +40,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTCORBA_Export TAO_Linear_Network_Priority_Mapping : public TAO_Network_Priority_Mapping
 {
 public:
-
   TAO_Linear_Network_Priority_Mapping (long);
 
   CORBA::Boolean to_network (RTCORBA::Priority corba_priority,
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 4ba033315b0..5e2f2cc3ff2 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -147,7 +147,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
                                    (ACE_TEXT("-RTORBDynamicThreadIdleTimeout"))))
         {
           const ACE_TCHAR *name = current_arg;
-          int timeout = ACE_OS::atoi (name);
+          int const timeout = ACE_OS::atoi (name);
           dynamic_thread_time = ACE_Time_Value (0, timeout);
           lifespan = TAO_RT_ORBInitializer::TAO_RTCORBA_DT_IDLE;
           arg_shifter.consume_arg ();
@@ -156,7 +156,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
                                    (ACE_TEXT("-RTORBDynamicThreadRunTime"))))
         {
           const ACE_TCHAR *name = current_arg;
-          int timeout = ACE_OS::atoi (name);
+          int const timeout = ACE_OS::atoi (name);
           dynamic_thread_time = ACE_Time_Value (0, timeout);
           lifespan = TAO_RT_ORBInitializer::TAO_RTCORBA_DT_FIXED;
           arg_shifter.consume_arg ();
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 622de35c11e..4648487aab2 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -890,11 +890,7 @@ RTCORBA::ThreadpoolId
 TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool)
 {
   // Make sure of safe deletion in case of errors.
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
-#else
-  auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
-#endif /* ACE_HAS_CPP11 */
 
   // Open the pool.
   thread_pool->open ();
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index fff8a5119b9..7bb648c4e7f 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -285,8 +285,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                                                       type_id,
                                                       client_exposed_policies._retn (),
                                                       &filter,
-                                                      lanes[i]->resources ().acceptor_registry ()
-                                                     );
+                                                      lanes[i]->resources ().acceptor_registry ());
         }
 
       ACE_ASSERT (0);
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 0635fcc691b..c8735b4bb16 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -11,7 +11,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter;
+std::atomic<long> TAO_RTScheduler_Current::guid_counter;
 
 u_long
 TAO_DTId_Hash::operator () (const IdType &id) const
@@ -88,16 +88,14 @@ TAO_RTScheduler_Current::begin_scheduling_segment (
 
   impl->begin_scheduling_segment (name,
                                   sched_param,
-                                  implicit_sched_param
-                                 );
+                                  implicit_sched_param);
 }
 
 
 void
 TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
                                                     CORBA::Policy_ptr sched_param,
-                                                    CORBA::Policy_ptr implicit_sched_param
-                                                    )
+                                                    CORBA::Policy_ptr implicit_sched_param)
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -106,8 +104,7 @@ TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
 
   impl->update_scheduling_segment (name,
                                    sched_param,
-                                   implicit_sched_param
-                                  );
+                                   implicit_sched_param);
 }
 
 void
@@ -123,8 +120,7 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name)
       return;
     }
 
-  impl->end_scheduling_segment (name
-                               );
+  impl->end_scheduling_segment (name);
 }
 
 RTScheduling::DistributableThread_ptr
@@ -162,8 +158,7 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
                       sched_param,
                       implicit_sched_param,
                       stack_size,
-                      base_priority
-                     );
+                      base_priority);
 }
 
 RTScheduling::Current::IdType *
@@ -301,8 +296,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
     orb->object_ref_table ().resolve_initial_reference (
       "RTScheduler");
 
-  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()
-                                                      );
+  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ());
 }
 
 TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void)
@@ -335,8 +329,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
       this->scheduler_->begin_new_scheduling_segment (this->guid_,
                                                       name,
                                                       sched_param,
-                                                      implicit_sched_param
-                                                     );
+                                                      implicit_sched_param);
 
       if (CORBA::is_nil (this->dt_.in ()))
         //Create new DT.
@@ -371,8 +364,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
         (this->guid_,
          name,
          sched_param,
-         implicit_sched_param
-        );
+         implicit_sched_param);
 
       TAO_TSS_Resources *tss =
         TAO_TSS_Resources::instance ();
@@ -413,8 +405,7 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name,
   this->scheduler_->update_scheduling_segment (this->guid_,
                                                name,
                                                sched_param,
-                                               implicit_sched_param
-                                              );
+                                               implicit_sched_param);
 
   // Remember the new values.
   this->name_ = CORBA::string_dup (name);
@@ -435,9 +426,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name)
     {
       // Let the scheduler know that the DT is
       // terminating.
-      this->scheduler_->end_scheduling_segment(this->guid_,
-                                               name
-                                              );
+      this->scheduler_->end_scheduling_segment(this->guid_, name);
 
       // Cleanup DT.
       this->cleanup_DT ();
@@ -452,8 +441,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name)
       // scheduling segment.
       this->scheduler_->end_nested_scheduling_segment (this->guid_,
                                                        name,
-                                                       this->previous_current_->sched_param_.in ()
-                                                      );
+                                                       this->previous_current_->sched_param_.in ());
 
       // Cleanup current.
       this->cleanup_current ();
@@ -540,8 +528,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority,
     TAO_OBJID_PRIORITYMAPPINGMANAGER);
 
   RTCORBA::PriorityMappingManager_var mapping_manager =
-    RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                             );
+    RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
   RTCORBA::PriorityMapping *pm =
     mapping_manager->mapping ();
@@ -608,15 +595,12 @@ DTTask::svc (void)
 
       this->current_->begin_scheduling_segment (this->name_.in (),
                                                 this->sched_param_.in (),
-                                                this->implicit_sched_param_.in ()
-                                               );
+                                                this->implicit_sched_param_.in ());
 
       // Invoke entry point into new DT.
-      this->start_->_cxx_do (this->data_
-                            );
+      this->start_->_cxx_do (this->data_);
 
-      this->current_->end_scheduling_segment (this->name_.in ()
-                                            );
+      this->current_->end_scheduling_segment (this->name_.in ());
     }
   catch (const ::CORBA::Exception& ex)
     {
@@ -692,8 +676,7 @@ TAO_RTScheduler_Current_i::cancel_thread (void)
 
   // Let the scheduler know that the thread has
   // been cancelled.
-  this->scheduler_->cancel (this->guid_
-                           );
+  this->scheduler_->cancel (this->guid_);
 
   this->cleanup_DT ();
 
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index f941512b9de..4edf9c5ceb9 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -78,7 +78,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
     public ::CORBA::LocalObject
 {
  public:
-  static ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter;
+  static std::atomic<long> guid_counter;
 
   TAO_RTScheduler_Current (void);
   virtual ~TAO_RTScheduler_Current (void);
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index e2203898718..a431e8c4be4 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -119,8 +119,7 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr
   //    counting.
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
-  //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-  //                                                          );
+  //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info);
 
   if (TAO_debug_level > 0)
     TAOLIB_DEBUG ((LM_DEBUG,
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
index 06c377c6a36..8247beea3a8 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
@@ -217,8 +217,7 @@ TAO_RTScheduler_Manager::rtscheduler (void)
 }
 
 ACE_INLINE void
-TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler
-                                      )
+TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler)
 {
   this->rtscheduler_ = RTScheduling::Scheduler::_duplicate (rtscheduler);
   this->orb_->orb ()->register_initial_reference (
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 37c187c7ad9..e27c5b49172 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -53,7 +53,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
             TAOLIB_DEBUG ((LM_DEBUG,
                         "The Guid is %d %d\n",
                         id,
-                        TAO_RTScheduler_Current::guid_counter.value_i ()));
+                        TAO_RTScheduler_Current::guid_counter.load ()));
 
           // Create new DT.
           RTScheduling::DistributableThread_var dt =
@@ -253,8 +253,7 @@ Server_Interceptor::receive_request_service_contexts (
 }
 
 void
-Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                     )
+Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   if (TAO_debug_level > 0)
     TAOLIB_DEBUG ((LM_DEBUG,
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index 5eaffea8a89..879d73a7876 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -13,14 +13,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
+extern std::atomic<long> server_guid_counter;
 
 class TAO_RTScheduler_Export Client_Interceptor:
   public PortableInterceptor::ClientRequestInterceptor,
   public ::CORBA::LocalObject
 {
 public:
-
   //  Client_Interceptor (RTScheduling::Current_ptr current);
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
@@ -37,14 +36,12 @@ public:
   virtual void destroy (void);
 
   static const IOP::ServiceId SchedulingInfo;
-
 };
 
 class TAO_RTScheduler_Export Server_Interceptor :
   public PortableInterceptor::ServerRequestInterceptor,
   public ::CORBA::LocalObject
 {
-
 public:
   Server_Interceptor (TAO_RTScheduler_Current_ptr current);
 
@@ -66,7 +63,6 @@ public:
 
  private:
   TAO_RTScheduler_Current_var current_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index db4e03fc623..8593179a35a 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -16,7 +16,7 @@ TAO_Reactive_Connect_Strategy::TAO_Reactive_Connect_Strategy (
 {
 }
 
-TAO_Reactive_Connect_Strategy::~TAO_Reactive_Connect_Strategy (void)
+TAO_Reactive_Connect_Strategy::~TAO_Reactive_Connect_Strategy ()
 {
 }
 
@@ -24,7 +24,7 @@ void
 TAO_Reactive_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
                                              ACE_Synch_Options &options)
 {
-  if (timeout != 0)
+  if (timeout != nullptr)
     {
       options.set (ACE_Synch_Options::USE_REACTOR,
                    *timeout);
@@ -43,7 +43,7 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
                                        ACE_Time_Value * max_wait_time)
 {
   int result = 0;
-  if (ev == 0)
+  if (ev == nullptr)
     return -1;
 
   if (TAO_debug_level > 2)
@@ -66,7 +66,7 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
 
           // Did we timeout? If so, stop running the loop.
           if (result == 0 &&
-              max_wait_time != 0 &&
+              max_wait_time != nullptr &&
               *max_wait_time == ACE_Time_Value::zero)
             {
               errno = ETIME;
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index 9cd855e8bf0..f7bff78c6c2 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -34,7 +34,7 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport,
         {
           result = orb_core->run (max_wait_time, 1);
 
-          if (max_wait_time != 0) {
+          if (max_wait_time != nullptr) {
             if (*max_wait_time <= ACE_Time_Value::zero) {
               errno = ETIME;
               result = -1;
@@ -63,7 +63,7 @@ TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport
           if (orb_core->run (max_wait_time, 1) == -1)
             return -1;
 
-          if (max_wait_time != 0) {
+          if (max_wait_time != nullptr) {
             if (*max_wait_time <= ACE_Time_Value::zero) {
               errno = ETIME;
               return -1;
diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp
index 4290884211a..64f765258d5 100644
--- a/TAO/tao/Refcounted_ObjectKey.cpp
+++ b/TAO/tao/Refcounted_ObjectKey.cpp
@@ -14,7 +14,7 @@ TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key)
 {
 }
 
-TAO::Refcounted_ObjectKey::~Refcounted_ObjectKey (void)
+TAO::Refcounted_ObjectKey::~Refcounted_ObjectKey ()
 {
 }
 
diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h
index 96142a512d6..29eb3ab6030 100644
--- a/TAO/tao/Refcounted_ObjectKey.h
+++ b/TAO/tao/Refcounted_ObjectKey.h
@@ -42,20 +42,20 @@ namespace TAO
     Refcounted_ObjectKey (const ObjectKey &ref);
 
     /// Accessor for the underlying ObjectKey.
-    const ObjectKey &object_key (void) const;
+    const ObjectKey &object_key () const;
 
   protected:
     friend class ObjectKey_Table;
 
     /// Protected destructor
-    ~Refcounted_ObjectKey (void);
+    ~Refcounted_ObjectKey ();
 
     /// Methods for incrementing refcount.
-    void incr_refcount (void);
+    void incr_refcount ();
 
     /// Methods for decrementing refcount. Return the refcount, used by the
     /// ObjectKey table.
-    CORBA::ULong decr_refcount (void);
+    CORBA::ULong decr_refcount ();
 
   private:
     /// The object key
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index cb8ed85c6a5..8245c697236 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -70,7 +70,7 @@ namespace TAO
       // IOP::IOR info, the call would create the info and return the
       // index that we need.
       CORBA::ULong index = 0;
-      IOP::IOR *ior_info = 0;
+      IOP::IOR *ior_info = nullptr;
 
       if (this->resolver_.stub ()->create_ior_info (ior_info, index) == -1)
         {
@@ -94,7 +94,7 @@ namespace TAO
   void
   Remote_Invocation::write_header (TAO_OutputCDR &out_stream)
   {
-    this->resolver_.transport ()->clear_translators (0, &out_stream);
+    this->resolver_.transport ()->clear_translators (nullptr, &out_stream);
 
     TAO_Target_Specification spec;
     this->init_target_spec (spec, out_stream);
@@ -107,7 +107,7 @@ namespace TAO
         throw ::CORBA::MARSHAL ();
       }
 
-    this->resolver_.transport ()->assign_translators (0, &out_stream);
+    this->resolver_.transport ()->assign_translators (nullptr, &out_stream);
   }
 
   Invocation_Status
@@ -125,7 +125,7 @@ namespace TAO
     TAO_Connection_Handler *connection_handler =
       this->resolver_.transport ()->connection_handler ();
 
-    if (nph != 0)
+    if (nph != nullptr)
       {
         // nph = 0, means DiffServ library is not used
         // nph = 0, means DiffServ library is used, and
@@ -138,7 +138,7 @@ namespace TAO
           this->resolver_.object ());
         connection_handler->set_dscp_codepoint (dscp);
       }
-    else if (tph != 0)
+    else if (tph != nullptr)
       {
         // If we execute this code, DiffServ library is not used,
         // but RTCORBA could be used.
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index 390d2d7c1b4..38a1cc996d5 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -34,7 +34,7 @@ namespace TAO
                                       5,
                                       TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY);
 
-    tao_call.invoke (0, 0);
+    tao_call.invoke (nullptr, 0);
 
     return _tao_retval.retn ();
   }
@@ -58,7 +58,7 @@ namespace TAO
                                        13,
                                        TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY);
 
-    _tao_call.invoke (0, 0);
+    _tao_call.invoke (nullptr, 0);
 
     return _tao_retval.retn ();
   }
@@ -80,7 +80,7 @@ namespace TAO
                                        10,
                                        TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY);
 
-    _tao_call.invoke (0, 0);
+    _tao_call.invoke (nullptr, 0);
 
     return _tao_retval.retn ();
   }
@@ -93,7 +93,7 @@ namespace TAO
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
 
-  if (adapter == 0)
+  if (adapter == nullptr)
     {
       throw ::CORBA::INTF_REPOS ();
     }
@@ -118,7 +118,7 @@ namespace TAO
                                        14,
                                        TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY);
 
-    _tao_call.invoke (0, 0);
+    _tao_call.invoke (nullptr, 0);
 
     return _tao_retval.retn ();
   }
@@ -128,7 +128,7 @@ namespace TAO
 // -----------------------------------------------------
 
 TAO::Remote_Object_Proxy_Broker *
-the_tao_remote_object_proxy_broker (void)
+the_tao_remote_object_proxy_broker ()
 {
   static TAO::Remote_Object_Proxy_Broker the_broker;
   return &the_broker;
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index 620f87f65e2..93c08198894 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -17,7 +17,7 @@ TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (ACE_Allocator *allocator)
 }
 
 // Destructor.
-TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void)
+TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher ()
 {
 }
 
@@ -25,7 +25,7 @@ TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void)
 void
 TAO_Reply_Dispatcher::intrusive_add_ref (TAO_Reply_Dispatcher* rd)
 {
-  if (rd != 0)
+  if (rd != nullptr)
     {
       ++rd->refcount_;
     }
@@ -34,10 +34,10 @@ TAO_Reply_Dispatcher::intrusive_add_ref (TAO_Reply_Dispatcher* rd)
 void
 TAO_Reply_Dispatcher::intrusive_remove_ref (TAO_Reply_Dispatcher* rd)
 {
-  if (rd != 0)
+  if (rd != nullptr)
     {
-      long const tmp = --rd->refcount_;
-      if (tmp <= 0)
+      uint32_t const tmp = --rd->refcount_;
+      if (tmp == 0)
         {
           if (rd->allocator_)
             {
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 949bf0dfccd..0b6c39a311d 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -60,7 +60,7 @@ public:
   TAO_Reply_Dispatcher (ACE_Allocator *allocator = 0);
 
   /// Destructor.
-  virtual ~TAO_Reply_Dispatcher (void);
+  virtual ~TAO_Reply_Dispatcher ();
 
   /**
    * Dispatch the reply. Return 1 on sucess, -1 on error.
@@ -74,7 +74,7 @@ public:
   virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params) = 0;
 
   /// Inform that the reply timed out
-  virtual void reply_timed_out (void) = 0;
+  virtual void reply_timed_out () = 0;
 
   /**
    * The used for the pending reply has been closed.
@@ -84,12 +84,12 @@ public:
    *    the exception, it would a matter of simply adding a boolean
    *    argument to this function.
    */
-  virtual void connection_closed (void) = 0;
+  virtual void connection_closed () = 0;
 
   /// Get the locate reply status.
-  GIOP::LocateStatusType locate_reply_status (void) const;
+  GIOP::LocateStatusType locate_reply_status () const;
 
-  GIOP::ReplyStatusType reply_status (void) const;
+  GIOP::ReplyStatusType reply_status () const;
 
   static void intrusive_add_ref (TAO_Reply_Dispatcher*);
   static void intrusive_remove_ref (TAO_Reply_Dispatcher*);
@@ -103,7 +103,7 @@ protected:
 
 private:
   /// Support for intrusive reference counting
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> refcount_;
+  std::atomic<uint32_t> refcount_;
 
   /// Allocator that was used to allocate this reply dispatcher. In case of
   /// zero we come from the heap.
diff --git a/TAO/tao/Reply_Dispatcher.inl b/TAO/tao/Reply_Dispatcher.inl
index 14e89c247a8..c00cb49c567 100644
--- a/TAO/tao/Reply_Dispatcher.inl
+++ b/TAO/tao/Reply_Dispatcher.inl
@@ -3,13 +3,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE GIOP::LocateStatusType
-TAO_Reply_Dispatcher::locate_reply_status (void) const
+TAO_Reply_Dispatcher::locate_reply_status () const
 {
   return this->locate_reply_status_;
 }
 
 ACE_INLINE GIOP::ReplyStatusType
-TAO_Reply_Dispatcher::reply_status (void) const
+TAO_Reply_Dispatcher::reply_status () const
 {
   return this->reply_status_;
 }
diff --git a/TAO/tao/RequestInterceptor_Adapter.cpp b/TAO/tao/RequestInterceptor_Adapter.cpp
index c19df8e51df..171df98cd94 100644
--- a/TAO/tao/RequestInterceptor_Adapter.cpp
+++ b/TAO/tao/RequestInterceptor_Adapter.cpp
@@ -13,7 +13,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::RequestInterceptor_Adapter::~RequestInterceptor_Adapter (void)
+TAO::RequestInterceptor_Adapter::~RequestInterceptor_Adapter ()
 {
 }
 
diff --git a/TAO/tao/RequestInterceptor_Adapter.h b/TAO/tao/RequestInterceptor_Adapter.h
index 8ea064cf865..3a85af71c63 100644
--- a/TAO/tao/RequestInterceptor_Adapter.h
+++ b/TAO/tao/RequestInterceptor_Adapter.h
@@ -35,9 +35,9 @@ namespace TAO
   class TAO_Export RequestInterceptor_Adapter
   {
   public:
-    virtual ~RequestInterceptor_Adapter (void);
+    virtual ~RequestInterceptor_Adapter ();
 
-    virtual void destroy_interceptors (void) = 0;
+    virtual void destroy_interceptors () = 0;
 
     virtual void popTSC (TAO_ORB_Core *orb_core_) = 0;
     virtual void pushTSC (TAO_ORB_Core *orb_core_) = 0;
diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp
index 16a77d9459c..b7c031f1eee 100644
--- a/TAO/tao/Request_Dispatcher.cpp
+++ b/TAO/tao/Request_Dispatcher.cpp
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void)
+TAO_Request_Dispatcher::~TAO_Request_Dispatcher ()
 {
 }
 
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
index 46dc712b08a..9a7299be1a6 100644
--- a/TAO/tao/Resource_Factory.cpp
+++ b/TAO/tao/Resource_Factory.cpp
@@ -7,25 +7,25 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name)
   : name_ (name),
-    factory_ (0),
+    factory_ (nullptr),
     factory_owner_ (0)
 {
 }
 
-TAO_Protocol_Item::~TAO_Protocol_Item (void)
+TAO_Protocol_Item::~TAO_Protocol_Item ()
 {
   if (this->factory_owner_ == 1)
     delete this->factory_;
 }
 
 const ACE_CString &
-TAO_Protocol_Item::protocol_name (void)
+TAO_Protocol_Item::protocol_name ()
 {
   return this->name_;
 }
 
 TAO_Protocol_Factory *
-TAO_Protocol_Item::factory (void)
+TAO_Protocol_Item::factory ()
 {
   return this->factory_;
 }
@@ -42,24 +42,24 @@ TAO_Protocol_Item::factory (TAO_Protocol_Factory *factory,
 
 // ********************************************************************
 
-TAO_Resource_Factory::TAO_Resource_Factory (void)
+TAO_Resource_Factory::TAO_Resource_Factory ()
 {
 }
 
-TAO_Resource_Factory::~TAO_Resource_Factory (void)
+TAO_Resource_Factory::~TAO_Resource_Factory ()
 {
 }
 
 int
-TAO_Resource_Factory::use_locked_data_blocks (void) const
+TAO_Resource_Factory::use_locked_data_blocks () const
 {
   return 0;
 }
 
 ACE_Reactor *
-TAO_Resource_Factory::get_reactor (void)
+TAO_Resource_Factory::get_reactor ()
 {
-  return 0;
+  return nullptr;
 }
 
 void
@@ -69,15 +69,15 @@ TAO_Resource_Factory::reclaim_reactor (ACE_Reactor *)
 }
 
 TAO_Connector_Registry *
-TAO_Resource_Factory::get_connector_registry (void)
+TAO_Resource_Factory::get_connector_registry ()
 {
-  return 0;
+  return nullptr;
 }
 
 TAO_Acceptor_Registry *
-TAO_Resource_Factory::get_acceptor_registry (void)
+TAO_Resource_Factory::get_acceptor_registry ()
 {
-  return 0;
+  return nullptr;
 }
 
 void
@@ -86,91 +86,91 @@ TAO_Resource_Factory::use_local_memory_pool (bool)
 }
 
 ACE_Allocator *
-TAO_Resource_Factory::input_cdr_dblock_allocator (void)
+TAO_Resource_Factory::input_cdr_dblock_allocator ()
 {
-  return 0;
+  return nullptr;
 }
 
 ACE_Allocator *
-TAO_Resource_Factory::input_cdr_buffer_allocator (void)
+TAO_Resource_Factory::input_cdr_buffer_allocator ()
 {
-  return 0;
+  return nullptr;
 }
 
 ACE_Allocator *
-TAO_Resource_Factory::input_cdr_msgblock_allocator (void)
+TAO_Resource_Factory::input_cdr_msgblock_allocator ()
 {
-  return 0;
+  return nullptr;
 }
 
 int
-TAO_Resource_Factory::input_cdr_allocator_type_locked (void)
+TAO_Resource_Factory::input_cdr_allocator_type_locked ()
 {
   return -1;
 }
 
 ACE_Allocator *
-TAO_Resource_Factory::output_cdr_dblock_allocator (void)
+TAO_Resource_Factory::output_cdr_dblock_allocator ()
 {
-  return 0;
+  return nullptr;
 }
 
 ACE_Allocator *
-TAO_Resource_Factory::output_cdr_buffer_allocator (void)
+TAO_Resource_Factory::output_cdr_buffer_allocator ()
 {
-  return 0;
+  return nullptr;
 }
 
 ACE_Allocator *
-TAO_Resource_Factory::output_cdr_msgblock_allocator (void)
+TAO_Resource_Factory::output_cdr_msgblock_allocator ()
 {
-  return 0;
+  return nullptr;
 }
 
 ACE_Allocator *
-TAO_Resource_Factory::amh_response_handler_allocator (void)
+TAO_Resource_Factory::amh_response_handler_allocator ()
 {
-  return 0;
+  return nullptr;
 }
 
 ACE_Allocator *
-TAO_Resource_Factory::ami_response_handler_allocator (void)
+TAO_Resource_Factory::ami_response_handler_allocator ()
 {
-  return 0;
+  return nullptr;
 }
 
 TAO_ProtocolFactorySet *
-TAO_Resource_Factory::get_protocol_factories (void)
+TAO_Resource_Factory::get_protocol_factories ()
 {
-  return 0;
+  return nullptr;
 }
 
 int
-TAO_Resource_Factory::init_protocol_factories (void)
+TAO_Resource_Factory::init_protocol_factories ()
 {
   return -1;
 }
 
 TAO_Codeset_Manager *
-TAO_Resource_Factory::codeset_manager (void)
+TAO_Resource_Factory::codeset_manager ()
 {
-  return 0;
+  return nullptr;
 }
 
 int
-TAO_Resource_Factory::cache_maximum (void) const
+TAO_Resource_Factory::cache_maximum () const
 {
   return TAO_CONNECTION_CACHE_MAXIMUM;
 }
 
 int
-TAO_Resource_Factory::purge_percentage (void) const
+TAO_Resource_Factory::purge_percentage () const
 {
   return 0;
 }
 
 int
-TAO_Resource_Factory::max_muxed_connections (void) const
+TAO_Resource_Factory::max_muxed_connections () const
 {
   return 0;
 }
@@ -183,19 +183,19 @@ TAO_Resource_Factory::get_parser_names (char **&, int &)
 }
 
 ACE_Lock *
-TAO_Resource_Factory::create_cached_connection_lock (void)
+TAO_Resource_Factory::create_cached_connection_lock ()
 {
-  return 0;
+  return nullptr;
 }
 
 int
-TAO_Resource_Factory::locked_transport_cache (void)
+TAO_Resource_Factory::locked_transport_cache ()
 {
   return 0;
 }
 
 int
-TAO_Resource_Factory::load_default_protocols (void)
+TAO_Resource_Factory::load_default_protocols ()
 {
   return 0;
 }
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 40c96ebbdd8..ab672ad3aec 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -58,23 +58,23 @@ public:
 
   /// Destructor that deallocates the factory object if the
   /// Protocol_Item retains ownership.
-  ~TAO_Protocol_Item (void);
+  ~TAO_Protocol_Item ();
 
   /// Return a reference to the character representation of the protocol
   /// factories name.
-  const ACE_CString &protocol_name (void);
+  const ACE_CString &protocol_name ();
 
   /// Return a pointer to the protocol factory.
-  TAO_Protocol_Factory *factory (void);
+  TAO_Protocol_Factory *factory ();
 
   /// Set the factory pointer's value.
   void factory (TAO_Protocol_Factory *factory, int owner = 0);
 
 private:
-
-  // Disallow copying and assignment.
-  TAO_Protocol_Item (const TAO_Protocol_Item&);
-  void operator= (const TAO_Protocol_Item&);
+  TAO_Protocol_Item (const TAO_Protocol_Item&) = delete;
+  void operator= (const TAO_Protocol_Item&) = delete;
+  TAO_Protocol_Item (TAO_Protocol_Item&&) = delete;
+  void operator= (TAO_Protocol_Item&&) = delete;
 
 private:
   /// Protocol factory name.
@@ -133,52 +133,52 @@ public:
       TAO_LAZY
     };
 
-  TAO_Resource_Factory (void);
-  virtual ~TAO_Resource_Factory (void);
+  TAO_Resource_Factory ();
+  virtual ~TAO_Resource_Factory ();
 
   // = Resource Retrieval
 
   /// @@ Backwards compatibility, return 1 if the ORB core should use
   ///    Locked_Data_Blocks
-  virtual int use_locked_data_blocks (void) const;
+  virtual int use_locked_data_blocks () const;
 
   /// Return an ACE_Reactor to be utilized.
-  virtual ACE_Reactor *get_reactor (void);
+  virtual ACE_Reactor *get_reactor ();
 
   /// Reclaim reactor resources (e.g. deallocate, etc).
   virtual void reclaim_reactor (ACE_Reactor *reactor);
 
   /// Return a reference to the acceptor registry.
-  virtual TAO_Acceptor_Registry *get_acceptor_registry (void);
+  virtual TAO_Acceptor_Registry *get_acceptor_registry ();
 
   /// Return a connector to be utilized.
-  virtual TAO_Connector_Registry *get_connector_registry (void);
+  virtual TAO_Connector_Registry *get_connector_registry ();
 
   /// Return the Allocator's memory pool type
   virtual void use_local_memory_pool (bool);
 
   /// @name Access the input CDR allocators.
   //@{
-  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* input_cdr_dblock_allocator ();
+  virtual ACE_Allocator* input_cdr_buffer_allocator ();
+  virtual ACE_Allocator* input_cdr_msgblock_allocator ();
   //@}
 
   // Return 1 when the input CDR allocator uses a lock else 0.
-  virtual int input_cdr_allocator_type_locked (void);
+  virtual int input_cdr_allocator_type_locked ();
 
   /// @name Access the output CDR allocators.
   //@{
-  virtual ACE_Allocator* output_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* output_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* output_cdr_msgblock_allocator (void);
+  virtual ACE_Allocator* output_cdr_dblock_allocator ();
+  virtual ACE_Allocator* output_cdr_buffer_allocator ();
+  virtual ACE_Allocator* output_cdr_msgblock_allocator ();
   //@}
 
   /// Access the AMH response handler allocator
-  virtual ACE_Allocator* amh_response_handler_allocator (void);
+  virtual ACE_Allocator* amh_response_handler_allocator ();
 
   /// Access the AMI response handler allocator
-  virtual ACE_Allocator* ami_response_handler_allocator (void);
+  virtual ACE_Allocator* ami_response_handler_allocator ();
 
   /**
    * The protocol factory list is implemented in this class since
@@ -186,7 +186,7 @@ public:
    * b) it is initialized at start up and then not altered.
    * Returns a container holding the list of loaded protocols.
    */
-  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
+  virtual TAO_ProtocolFactorySet *get_protocol_factories ();
 
   /**
    * This method will loop through the protocol list and
@@ -196,43 +196,43 @@ public:
    * that only one thread will call this method at ORB initialization.
    * NON-THREAD-SAFE
    */
-  virtual int init_protocol_factories (void);
+  virtual int init_protocol_factories ();
 
   /// Gets the codeset manager.
-  virtual TAO_Codeset_Manager* codeset_manager (void);
+  virtual TAO_Codeset_Manager* codeset_manager ();
 
   /// This denotes the maximum number of connections that can be cached.
-  virtual int cache_maximum (void) const;
+  virtual int cache_maximum () const;
 
   /// This denotes the amount of entries to remove from the connection
   /// cache.
-  virtual int purge_percentage (void) const;
+  virtual int purge_percentage () const;
 
   /// Return the number of muxed connections that are allowed for a
   /// remote endpoint
-  virtual int max_muxed_connections (void) const;
+  virtual int max_muxed_connections () const;
 
   virtual int get_parser_names (char **&names,
                                 int &number_of_names);
 
   /// Creates the lock for the lock needed in the Cache Map
   /// @deprecated
-  virtual ACE_Lock *create_cached_connection_lock (void);
+  virtual ACE_Lock *create_cached_connection_lock ();
 
   /// Should the transport cache have a lock or not? Return 1 if the
   /// transport cache needs to be locked  else return 0
-  virtual int locked_transport_cache (void);
+  virtual int locked_transport_cache ();
 
   /// Creates the flushing strategy.  The new instance is owned by the
   /// caller.
-  virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0;
+  virtual TAO_Flushing_Strategy *create_flushing_strategy () = 0;
 
   /// Creates the connection purging strategy.
-  virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void) = 0;
+  virtual TAO_Connection_Purging_Strategy *create_purging_strategy () = 0;
 
   /// Creates the leader followers strategy.  The new instance is owned by the
   /// caller.
-  virtual TAO_LF_Strategy *create_lf_strategy (void) = 0;
+  virtual TAO_LF_Strategy *create_lf_strategy () = 0;
 
   /// Outgoing fragment creation strategy.
   virtual TAO_GIOP_Fragmentation_Strategy*
@@ -243,12 +243,12 @@ public:
   /// this function should be called on the previously used (default)
   /// factory.  This should result in proper error reporting if the
   /// user attempts to set options on an unused factory.
-  virtual void disable_factory (void) = 0;
+  virtual void disable_factory () = 0;
 
   /// Return the resource usage strategy.
   virtual
   TAO_Resource_Factory::Resource_Usage
-  resource_usage_strategy (void) const = 0;
+  resource_usage_strategy () const = 0;
 
   /// Return the value of the strategy that indicates whether
   /// the ORB should wait for the replies during shutdown or drop
@@ -261,7 +261,7 @@ protected:
    * advanced_resource.cpp can call the one in default_resource.cpp
    * without calling unnecessary functions.
    */
-  virtual int load_default_protocols (void);
+  virtual int load_default_protocols ();
 
 };
 
diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp
index 48318ca247c..9340184e28b 100644
--- a/TAO/tao/Resume_Handle.cpp
+++ b/TAO/tao/Resume_Handle.cpp
@@ -12,7 +12,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO_Resume_Handle::resume_handle (void)
+TAO_Resume_Handle::resume_handle ()
 {
   // If we have a complete message, just resume the handler
   // Resume the handler.
diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h
index 693b5508b24..e677d4e505e 100644
--- a/TAO/tao/Seq_Out_T.h
+++ b/TAO/tao/Seq_Out_T.h
@@ -42,10 +42,10 @@ public:
   TAO_Seq_Out_T &operator= (T *);
 
   operator T *& ();
-  T * operator-> (void);
+  T * operator-> ();
 
   T_elem operator[] (CORBA::ULong index);
-  T *& ptr (void);
+  T *& ptr ();
 
 private:
   T *& ptr_;
diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h
index 45cb0491254..7596db9730a 100644
--- a/TAO/tao/Seq_Var_T.h
+++ b/TAO/tao/Seq_Var_T.h
@@ -34,14 +34,14 @@ class TAO_Seq_Var_Base_T
 public:
   typedef typename T::subscript_type T_elem;
 
-  TAO_Seq_Var_Base_T (void);
+  TAO_Seq_Var_Base_T ();
   TAO_Seq_Var_Base_T (T *);
   TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T> &);
 
-  ~TAO_Seq_Var_Base_T (void);
+  ~TAO_Seq_Var_Base_T ();
 
-  T *operator-> (void);
-  const T *operator-> (void) const;
+  T *operator-> ();
+  const T *operator-> () const;
 
   operator const T & () const;
   operator T & ();
@@ -53,13 +53,13 @@ public:
   typedef       T *   _retn_type;
 
   // in, inout, out, _retn
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _out_type     out (void);
-  _retn_type    _retn (void);
+  _in_type      in () const;
+  _inout_type   inout ();
+  _out_type     out ();
+  _retn_type    _retn ();
 
   /// TAO extension.
-  _retn_type    ptr (void) const;
+  _retn_type    ptr () const;
 
 protected:
   T * ptr_;
@@ -78,7 +78,7 @@ public:
   typedef typename T::subscript_type T_elem;
   typedef typename T::const_subscript_type T_const_elem;
 
-  TAO_FixedSeq_Var_T (void);
+  TAO_FixedSeq_Var_T ();
   TAO_FixedSeq_Var_T (T *);
   TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T> &);
 
@@ -108,7 +108,7 @@ public:
   typedef typename T::subscript_type T_elem;
   typedef typename T::const_subscript_type T_const_elem;
 
-  TAO_VarSeq_Var_T (void);
+  TAO_VarSeq_Var_T ();
   TAO_VarSeq_Var_T (T *);
   TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T> &);
 
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.cpp b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
index ff032bbdb59..32a4eb26a2d 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void)
+TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter ()
 {
 }
 
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 8377f130a47..d4d36949cad 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -66,7 +66,7 @@ namespace TAO
     : public RequestInterceptor_Adapter
   {
   public:
-    virtual ~ServerRequestInterceptor_Adapter (void);
+    virtual ~ServerRequestInterceptor_Adapter ();
 
     /**
      * @name PortableInterceptor Server Side Interception Points
@@ -91,7 +91,7 @@ namespace TAO
 
     /// This method implements the "intermediate" server side
     /// interception point if the above #ifdef is set to 1 and a
-    /// starting intercetion point if it is not set to 1.
+    /// starting interception point if it is not set to 1.
     ///
     /// @note This method should have been the "starting" interception
     ///       point according to the interceptor spec. This will be
@@ -153,7 +153,7 @@ namespace TAO
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies) = 0;
 
-    virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0;
+    virtual TAO::PICurrent_Impl *allocate_pi_current () = 0;
 
     virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent) = 0;
 
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
index be5ff8d08c5..148cc664a82 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ServerRequestInterceptor_Adapter_Factory::~TAO_ServerRequestInterceptor_Adapter_Factory (void)
+TAO_ServerRequestInterceptor_Adapter_Factory::~TAO_ServerRequestInterceptor_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
index 9f0337c6e67..945ef4c9163 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
@@ -38,9 +38,9 @@ class TAO_Export TAO_ServerRequestInterceptor_Adapter_Factory
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_ServerRequestInterceptor_Adapter_Factory (void);
+  virtual ~TAO_ServerRequestInterceptor_Adapter_Factory ();
 
-  virtual TAO::ServerRequestInterceptor_Adapter * create (void) = 0;
+  virtual TAO::ServerRequestInterceptor_Adapter * create () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
index 94b91cbaf42..a0cdd404f4a 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -3,22 +3,22 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
+TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory ()
   : active_object_map_creation_parameters_ ()
 {
 }
 
-TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory(void)
+TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory()
 {
 }
 
 const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &
-TAO_Server_Strategy_Factory::active_object_map_creation_parameters (void) const
+TAO_Server_Strategy_Factory::active_object_map_creation_parameters () const
 {
   return this->active_object_map_creation_parameters_;
 }
 
-TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Object_Map_Creation_Parameters (void)
+TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Object_Map_Creation_Parameters ()
   : active_object_map_size_ (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE),
     object_lookup_strategy_for_user_id_policy_ (TAO_DYNAMIC_HASH),
     object_lookup_strategy_for_system_id_policy_ (TAO_ACTIVE_DEMUX),
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index c168c92acea..88a4491ffa6 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -49,7 +49,7 @@ public:
   struct Active_Object_Map_Creation_Parameters
   {
     /// Constructor.
-    Active_Object_Map_Creation_Parameters (void);
+    Active_Object_Map_Creation_Parameters ();
 
     /// Default size of object lookup table.
     CORBA::ULong active_object_map_size_;
@@ -85,10 +85,10 @@ public:
   };
 
   /// Constructor.
-  TAO_Server_Strategy_Factory (void);
+  TAO_Server_Strategy_Factory ();
 
   /// Destructor.
-  virtual ~TAO_Server_Strategy_Factory(void);
+  virtual ~TAO_Server_Strategy_Factory();
 
   /**
    * Call <open> on various strategies.  This is not performed in
@@ -99,7 +99,7 @@ public:
   virtual int open (TAO_ORB_Core* orb_core) = 0;
 
   /// Are server connections active (i.e. run in their own thread)
-  virtual int activate_server_connections (void) = 0;
+  virtual int activate_server_connections () = 0;
 
   /**
    * Obtain the timeout value used by the thread-per-connection server
@@ -111,13 +111,13 @@ public:
   virtual int thread_per_connection_timeout (ACE_Time_Value &timeout) = 0;
 
   /// The thread activation parameters
-  virtual int server_connection_thread_flags (void) = 0;
-  virtual int server_connection_thread_count (void) = 0;
+  virtual int server_connection_thread_flags () = 0;
+  virtual int server_connection_thread_count () = 0;
 
   /// Return the active object map creation parameters.
   virtual
   const Active_Object_Map_Creation_Parameters &
-  active_object_map_creation_parameters (void) const;
+  active_object_map_creation_parameters () const;
 
 protected:
   /// Active object map creation parameters.
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index b830c4d863c..bf71128e2ae 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -5,7 +5,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Service_Callbacks::~TAO_Service_Callbacks (void)
+TAO_Service_Callbacks::~TAO_Service_Callbacks ()
 {
 }
 
@@ -16,7 +16,6 @@ TAO_Service_Callbacks::select_profile (const TAO_MProfile & /*mprofile*/,
   return false;
 }
 
-
 CORBA::Boolean
 TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
 {
@@ -25,7 +24,6 @@ TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
   return true;
 }
 
-
 TAO_Service_Callbacks::Profile_Equivalence
 TAO_Service_Callbacks::is_profile_equivalent (const TAO_Profile *,
                                               const TAO_Profile *)
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 9940ab56ac0..5eddb99847f 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -51,13 +51,12 @@ namespace IOP
  * @brief An Abstract Base class for the hooks in the ORB.
  *
  * This class (would) define all the hooks that may be needed by
- * the ORB to override some of its default behaviour. The methods
+ * the ORB to override some of its default behavior. The methods
  * can be potentially used to call service level specific
  * processing that may be required.
  */
 class TAO_Export TAO_Service_Callbacks
 {
-
 public:
 
   enum Profile_Equivalence
@@ -67,9 +66,8 @@ public:
     DONT_KNOW
   };
 
-
   /// Dtor
-  virtual ~TAO_Service_Callbacks (void);
+  virtual ~TAO_Service_Callbacks ();
 
   /// Select the profile from MProfile as the needs of the services
   /// may be. Return the profile in @a pfile
@@ -79,7 +77,6 @@ public:
   /// Check whether @a obj is nil or not.
   virtual CORBA::Boolean object_is_nil (CORBA::Object_ptr obj);
 
-
   /// Check for equivalency of the two profiles
   virtual Profile_Equivalence is_profile_equivalent (const TAO_Profile *,
                                                      const TAO_Profile *);
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index f39f2ce2a88..7f29afdd6bc 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -22,7 +22,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceId id, TAO_OutputCDR &cdr)
   CORBA::Octet *buf = context.context_data.get_buffer ();
 
   for (const ACE_Message_Block *i = cdr.begin ();
-       i != 0;
+       i != nullptr;
        i = i->cont ())
     {
       ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
@@ -42,7 +42,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceContext &context,
   CORBA::Octet *buf = context.context_data.get_buffer ();
 
   for (const ACE_Message_Block *i = cdr.begin ();
-       i != 0;
+       i != nullptr;
        i = i->cont ())
     {
       ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h
index 6232de26ba3..fc1668c4125 100644
--- a/TAO/tao/Service_Context.h
+++ b/TAO/tao/Service_Context.h
@@ -64,7 +64,7 @@ public:
   friend class TAO::CSD::FW_Server_Request_Wrapper;
 
   /// Constructor
-  TAO_Service_Context (void);
+  TAO_Service_Context ();
 
   /// = Generic components
 
@@ -118,12 +118,12 @@ public:
   int decode (TAO_InputCDR& cdr);
 
   /// Return the underlying service context list
-  IOP::ServiceContextList &service_info (void);
+  IOP::ServiceContextList &service_info ();
 
   /// @note This method is only for backward comptiblity. We
   /// need to get this removed once RT folks have their service
   /// addition info done through this interface
-  const IOP::ServiceContextList &service_info (void) const;
+  const IOP::ServiceContextList &service_info () const;
 
 private:
   /// Helper methods to implement set_context()
diff --git a/TAO/tao/Service_Context_Handler.cpp b/TAO/tao/Service_Context_Handler.cpp
index b6d2800fd34..1f80a63dcf2 100644
--- a/TAO/tao/Service_Context_Handler.cpp
+++ b/TAO/tao/Service_Context_Handler.cpp
@@ -3,11 +3,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Service_Context_Handler::TAO_Service_Context_Handler (void)
+TAO_Service_Context_Handler::TAO_Service_Context_Handler ()
 {
 }
 
-TAO_Service_Context_Handler::~TAO_Service_Context_Handler (void)
+TAO_Service_Context_Handler::~TAO_Service_Context_Handler ()
 {
 }
 
diff --git a/TAO/tao/Service_Context_Handler_Registry.cpp b/TAO/tao/Service_Context_Handler_Registry.cpp
index 7cf3a049332..550056efe2e 100644
--- a/TAO/tao/Service_Context_Handler_Registry.cpp
+++ b/TAO/tao/Service_Context_Handler_Registry.cpp
@@ -49,7 +49,7 @@ TAO_Service_Context_Registry::generate_service_context (
   return result;
 }
 
-TAO_Service_Context_Registry::~TAO_Service_Context_Registry (void)
+TAO_Service_Context_Registry::~TAO_Service_Context_Registry ()
 {
   for (Table::iterator x = this->registry_.begin ();
        x != this->registry_.end ();
diff --git a/TAO/tao/Service_Context_Handler_Registry.h b/TAO/tao/Service_Context_Handler_Registry.h
index 90295c80123..86277a13fd6 100644
--- a/TAO/tao/Service_Context_Handler_Registry.h
+++ b/TAO/tao/Service_Context_Handler_Registry.h
@@ -35,7 +35,7 @@ class TAO_Export TAO_Service_Context_Registry
   public:
     /// Destructor
 
-    ~TAO_Service_Context_Registry (void);
+    ~TAO_Service_Context_Registry ();
 
     /**
      * Bind a new entry in the registry
diff --git a/TAO/tao/Services_Activate.cpp b/TAO/tao/Services_Activate.cpp
index 6fffafa3c84..97f5307725c 100644
--- a/TAO/tao/Services_Activate.cpp
+++ b/TAO/tao/Services_Activate.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Services_Activate::~TAO_Services_Activate (void)
+TAO_Services_Activate::~TAO_Services_Activate ()
 {
 }
 
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index 03f6ac34ec2..47b72cabd25 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -43,7 +43,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
+    S const & arg () const;
 
   protected:
     S const & x_;
@@ -63,9 +63,9 @@ namespace TAO
   {
   public:
     In_Special_Basic_Clonable_Argument_T (S const &);
-    virtual ~In_Special_Basic_Clonable_Argument_T (void);
+    virtual ~In_Special_Basic_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -90,7 +90,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_;
@@ -114,7 +114,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_;
@@ -132,16 +132,16 @@ namespace TAO
   class Ret_Special_Basic_Argument_T : public RetArgument
   {
   public:
-    Ret_Special_Basic_Argument_T (void);
+    Ret_Special_Basic_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 */
-    S & arg (void);
+    S & arg ();
 
-    S excp (void);
-    S retn (void);
+    S excp ();
+    S retn ();
 
   private:
     S x_;
diff --git a/TAO/tao/Storable_Base.cpp b/TAO/tao/Storable_Base.cpp
index 083199b8bf7..a04f09d1564 100644
--- a/TAO/tao/Storable_Base.cpp
+++ b/TAO/tao/Storable_Base.cpp
@@ -20,7 +20,7 @@ bool TAO::Storable_Base::use_backup_default = false;
 bool TAO::Storable_Base::retry_on_ebadf_default = false;
 
 void
-TAO::Storable_Base::remove (void)
+TAO::Storable_Base::remove ()
 {
   if (this->use_backup_)
     {
diff --git a/TAO/tao/Storable_Factory.cpp b/TAO/tao/Storable_Factory.cpp
index 624f7200e00..41b99d0dbc1 100644
--- a/TAO/tao/Storable_Factory.cpp
+++ b/TAO/tao/Storable_Factory.cpp
@@ -12,11 +12,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Storable_Factory::Storable_Factory (void)
+TAO::Storable_Factory::Storable_Factory ()
 {
 }
 
-TAO::Storable_Factory::~Storable_Factory (void)
+TAO::Storable_Factory::~Storable_Factory ()
 {
 }
 
diff --git a/TAO/tao/Storable_File_Guard.cpp b/TAO/tao/Storable_File_Guard.cpp
index 09a4b60f57e..b428fe67121 100644
--- a/TAO/tao/Storable_File_Guard.cpp
+++ b/TAO/tao/Storable_File_Guard.cpp
@@ -15,7 +15,7 @@
 
 TAO::Storable_File_Guard::
 Storable_File_Guard (bool redundant, bool use_backup)
-  : fl_(0)
+  : fl_(nullptr)
   , redundant_(redundant)
   , closed_(1)
   , rwflags_(0)
@@ -69,7 +69,7 @@ TAO::Storable_File_Guard::init_no_load(Method_Type method_type)
 }
 
 void
-TAO::Storable_File_Guard::reload (void)
+TAO::Storable_File_Guard::reload ()
 {
   if (redundant_)
     {
@@ -145,21 +145,21 @@ TAO::Storable_File_Guard::init(Method_Type method_type)
 }
 
 bool
-TAO::Storable_File_Guard::object_obsolete (void)
+TAO::Storable_File_Guard::object_obsolete ()
 { // Default implementation uses time to determine
   // if obsolete.
   return (fl_->last_changed () > this->get_object_last_changed ());
 }
 
 void
-TAO::Storable_File_Guard::mark_object_current (void)
+TAO::Storable_File_Guard::mark_object_current ()
 { // Default implementation is to set the last changed
   // time to that of the file lock.
   this->set_object_last_changed (fl_->last_changed ());
 }
 
 void
-TAO::Storable_File_Guard::release (void)
+TAO::Storable_File_Guard::release ()
 {
   if ( ! closed_ )
     {
diff --git a/TAO/tao/Storable_FlatFileStream.cpp b/TAO/tao/Storable_FlatFileStream.cpp
index a95c5063fc0..2cb1951cc3a 100644
--- a/TAO/tao/Storable_FlatFileStream.cpp
+++ b/TAO/tao/Storable_FlatFileStream.cpp
@@ -41,7 +41,7 @@ namespace
     char buf[BUFSIZ];
     char * result = fgets (buf, BUFSIZ, fl);
 
-    if (result == 0)
+    if (result == nullptr)
       {
         if (feof (fl))
           {
@@ -59,7 +59,7 @@ namespace
         result = fgets (buf, BUFSIZ, fl);
       }
 
-    if (result == 0)
+    if (result == nullptr)
       {
         if (feof (fl))
           {
@@ -131,18 +131,18 @@ TAO::Storable_FlatFileStream::Storable_FlatFileStream (const ACE_CString & file,
                                                        bool retry_on_ebadf)
   : Storable_Base(use_backup, retry_on_ebadf)
   , filelock_ ()
-  , fl_ (0)
+  , fl_ (nullptr)
   , file_(file)
   , mode_(mode)
 {
   // filelock_ will be completely initialized in call to init ().
   filelock_.handle_ = ACE_INVALID_HANDLE;
-  filelock_.lockname_ = 0;
+  filelock_.lockname_ = nullptr;
 }
 
 TAO::Storable_FlatFileStream::~Storable_FlatFileStream ()
 {
-  if ( fl_ != 0 )
+  if ( fl_ != nullptr )
     this->close();
 }
 
@@ -178,7 +178,7 @@ TAO::Storable_FlatFileStream::open()
 {
   // For now, three flags exist "r", "w",  and "c"
   int flags = 0;
-  const char *fdmode = 0;
+  const char *fdmode = nullptr;
   if( ACE_OS::strchr(mode_.c_str(), 'r') )
     if( ACE_OS::strchr(mode_.c_str(), 'w') )
       flags = O_RDWR, fdmode = "w+";
@@ -206,14 +206,14 @@ TAO::Storable_FlatFileStream::open()
                          -1);
 #endif
 
-  this->fl_ = 0;
+  this->fl_ = nullptr;
   for (int attempts = this->retry_on_ebadf_ ? 2 : 1;
-       attempts > 0 && this->fl_ == 0;
+       attempts > 0 && this->fl_ == nullptr;
        attempts--)
     {
       this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_CHAR_TO_TCHAR (fdmode));
 
-      if (this->fl_ == 0)
+      if (this->fl_ == nullptr)
         {
           if (TAO_debug_level > 0)
             {
@@ -228,7 +228,7 @@ TAO::Storable_FlatFileStream::open()
             }
         }
     }
-  return this->fl_ == 0 ? -1 : 0;
+  return this->fl_ == nullptr ? -1 : 0;
 }
 
 int
@@ -241,7 +241,7 @@ TAO::Storable_FlatFileStream::close()
   ACE_OS::fclose (fl_);  // even though flock_destroy closes the handle
                          // we still need to destroy the FILE*
 
-  fl_ = 0;
+  fl_ = nullptr;
   return 0;
 }
 
@@ -331,7 +331,7 @@ TAO::Storable_FlatFileStream::funlock (int whence, int start, int len)
 }
 
 time_t
-TAO::Storable_FlatFileStream::last_changed(void)
+TAO::Storable_FlatFileStream::last_changed()
 {
   ACE_stat st;
   int result = 0;
@@ -384,19 +384,19 @@ TAO::Storable_FlatFileStream::last_changed(void)
 }
 
 void
-TAO::Storable_FlatFileStream::rewind (void)
+TAO::Storable_FlatFileStream::rewind ()
 {
   ACE_OS::rewind(this->fl_);
 }
 
 bool
-TAO::Storable_FlatFileStream::flush (void)
+TAO::Storable_FlatFileStream::flush ()
 {
   return ACE_OS::fflush(this->fl_);
 }
 
 int
-TAO::Storable_FlatFileStream::sync (void)
+TAO::Storable_FlatFileStream::sync ()
 {
   return ACE_OS::fsync (this->filelock_.handle_);
 }
@@ -441,12 +441,12 @@ TAO::Storable_FlatFileStream::operator >> (ACE_CString& str)
     str_array[0] = '\0';
     if (ACE_OS::fgets (str_array.get (),
                        strSize,
-                       this->fl_) == 0
+                       this->fl_) == nullptr
         && bufSize != 0)
       {
         this->throw_on_read_error (badbit);
       }
-    str = ACE_CString (str_array.get (), 0, false);
+    str = ACE_CString (str_array.get (), nullptr, false);
   }
 
   return *this;
@@ -539,7 +539,7 @@ TAO::Storable_FlatFileStream::operator << (const TAO_OutputCDR & cdr)
   unsigned int const length =
     ACE_Utils::truncate_cast<unsigned int> (cdr.total_length ());
   *this << length;
-  for (const ACE_Message_Block *i = cdr.begin (); i != 0; i = i->cont ())
+  for (const ACE_Message_Block *i = cdr.begin (); i != nullptr; i = i->cont ())
     {
       const char *bytes = i->rd_ptr ();
       size_t const len = i->length ();
@@ -569,7 +569,7 @@ TAO::Storable_FlatFileStream::backup_file_name ()
 int
 TAO::Storable_FlatFileStream::create_backup ()
 {
-  if (this->fl_ == 0)
+  if (this->fl_ == nullptr)
     {
       return 0;
     }
@@ -634,7 +634,7 @@ TAO::Storable_FlatFileStream::restore_backup ()
   if (ACE_OS::access (backup_name.c_str (), F_OK))
     return -1;
 
-  if (ACE_OS::strchr (this->mode_.c_str(),'w') == 0)
+  if (ACE_OS::strchr (this->mode_.c_str(),'w') == nullptr)
     {
       this->mode_ += 'w';
     }
@@ -704,7 +704,7 @@ TAO::Storable_FlatFileFactory::is_nfs (const ACE_CString& directory)
   if (*dir != '/')
     {
       rpath[0] = 0;
-      if (ACE_OS::getcwd (rpath, PATH_MAX) == 0)
+      if (ACE_OS::getcwd (rpath, PATH_MAX) == nullptr)
         {
           if (TAO_debug_level > 0)
             {
@@ -734,10 +734,10 @@ TAO::Storable_FlatFileFactory::is_nfs (const ACE_CString& directory)
     }
   size_t match = 0;
   size_t dirlen = ACE_OS::strlen(dir);
-  struct mntent *ent = 0;
+  struct mntent *ent = nullptr;
   const char *fname = "/etc/mtab";
   FILE *mt = ::setmntent(fname,"r");
-  if (mt == 0)
+  if (mt == nullptr)
     {
       if (TAO_debug_level > 0)
         {
@@ -748,7 +748,7 @@ TAO::Storable_FlatFileFactory::is_nfs (const ACE_CString& directory)
         }
       return ret;
     }
-  while ((ent = ::getmntent(mt)) != 0)
+  while ((ent = ::getmntent(mt)) != nullptr)
     {
       size_t len = ACE_OS::strlen(ent->mnt_dir);
 
@@ -788,14 +788,14 @@ TAO::Storable_FlatFileFactory::create_stream (const ACE_CString & file,
                                               const char * mode,
                                               bool )
 {
-  TAO::Storable_Base *stream = 0;
+  TAO::Storable_Base *stream = nullptr;
   ACE_CString path = this->directory_ + "/" + file;
   ACE_NEW_RETURN (stream,
                   TAO::Storable_FlatFileStream(path,
                                                mode,
                                                this->use_backup_,
                                                this->retry_on_ebadf_),
-                  0);
+                  nullptr);
   return stream;
 }
 
diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h
index 3a32e5e2c00..3ee737d614b 100644
--- a/TAO/tao/Strategies/COIOP_Profile.h
+++ b/TAO/tao/Strategies/COIOP_Profile.h
@@ -79,8 +79,7 @@ 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 parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual int decode_endpoints (void);
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 166d0222916..0053c012e61 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -219,7 +219,7 @@ TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
       // this code by comparing the IP address instead.  That would
       // trigger the following bug:
       //
-      // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
+      // http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220
       //
       if (endp->port () == this->addrs_[i].get_port_number ()
           && ACE_OS::strcmp (endp->host (), this->hosts_[i]) == 0)
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 65e10a506ff..028312365f0 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -190,7 +190,7 @@ TAO_SCIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
       // this code by comparing the IP address instead.  That would
       // trigger the following bug:
       //
-      // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
+      // http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220
       //
       if (endp->port() == this->addrs_[i].get_port_number()
           && ACE_OS::strcmp(endp->host(), this->hosts_[i]) == 0)
@@ -525,7 +525,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
     {
       ACE_Multihomed_INET_Addr a(addr);
 
-      int found_a_port = 0;
+      bool found_a_port = false;
       ACE_UINT32 last_port = requested_port + this->port_span_ - 1;
       if (last_port > ACE_MAX_DEFAULT_PORT)
         {
@@ -547,13 +547,13 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
                                          this->accept_strategy_,
                                          this->concurrency_strategy_) != -1)
             {
-              found_a_port = 1;
+              found_a_port = true;
               break;
             }
         }
 
       // Now, if we couldn't locate a port, we punt
-      if (! found_a_port)
+      if (!found_a_port)
         {
           if (TAO_debug_level > 0)
             TAOLIB_DEBUG ((LM_DEBUG,
@@ -1000,7 +1000,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
             }
           else if (name == "portspan")
             {
-              int range = static_cast<int> (ACE_OS::atoi (value.c_str ()));
+              int const range = ACE_OS::atoi (value.c_str ());
               // @@ What's the lower bound on the range?  zero, or one?
               if (range < 1 || range > ACE_MAX_DEFAULT_PORT)
                 TAOLIB_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index d386e78f29e..ed76fe47c55 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -11,7 +11,6 @@
  */
 // ===================================================================
 
-
 #ifndef TAO_SCIOP_ACCEPTOR_H
 #define TAO_SCIOP_ACCEPTOR_H
 #include /**/ "ace/pre.h"
@@ -109,7 +108,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
@@ -204,7 +202,6 @@ protected:
   TAO_ORB_Core *orb_core_;
 
 private:
-
   /// the concrete acceptor, as a pointer to it's base class.
   TAO_SCIOP_BASE_ACCEPTOR base_acceptor_;
 
@@ -212,7 +209,6 @@ private:
   TAO_SCIOP_CREATION_STRATEGY *creation_strategy_;
   TAO_SCIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
   TAO_SCIOP_ACCEPT_STRATEGY *accept_strategy_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index dc81b03e23d..a5088c77aa5 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -132,8 +132,7 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 }
 
 void
-TAO_SCIOP_Profile::parse_string_i (const char *ior
-                                   )
+TAO_SCIOP_Profile::parse_string_i (const char *ior)
 {
   // Pull off the "hostname:port/" part of the objref
   // Copy the string because we are going to modify it...
@@ -257,8 +256,7 @@ TAO_SCIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_SCIOP_Profile::hash (CORBA::ULong max
-                        )
+TAO_SCIOP_Profile::hash (CORBA::ULong max)
 {
   // Get the hash value for all endpoints.
   CORBA::ULong hashval = 0;
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index 5b39d19758a..0b043b1784d 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -75,8 +75,7 @@ public:
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                            );
+  virtual CORBA::ULong hash (CORBA::ULong max);
   /**
    * Add <endp> to this profile's list of endpoints (it is inserted
    * next to the head of the list).  This profiles takes ownership of
@@ -89,8 +88,7 @@ protected:
   /// Template methods. Please see Profile.h for the documentation.
   virtual int decode_profile (TAO_InputCDR &cdr);
   virtual int decode_endpoints (void);
-  virtual void parse_string_i (const char *string
-                              );
+  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/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 17a3b19add8..7b43eb77f60 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -123,8 +123,7 @@ TAO_SHMIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 }
 
 void
-TAO_SHMIOP_Profile::parse_string_i (const char *string
-                                    )
+TAO_SHMIOP_Profile::parse_string_i (const char *string)
 {
   // Pull off the "hostname:port/" part of the objref
   // Copy the string because we are going to modify it...
@@ -284,8 +283,7 @@ TAO_SHMIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_SHMIOP_Profile::hash (CORBA::ULong max
-                          )
+TAO_SHMIOP_Profile::hash (CORBA::ULong max)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 3dce4c81f9c..666b5b633ba 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -78,8 +78,7 @@ public:
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                            );
+  virtual CORBA::ULong hash (CORBA::ULong max);
   /**
    * Add <endp> to this profile's list of endpoints (it is inserted
    * next to the head of the list).  This profiles takes ownership of
@@ -91,8 +90,7 @@ 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 parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual int decode_endpoints (void);
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index b3cafb31e62..76a974e3498 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -69,8 +69,7 @@ public:
 
   virtual int check_prefix (const char *endpoint);
 
-  virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len
-                                     );
+  virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len);
 
   virtual char object_key_delimiter (void) const;
 
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index d2243029e0d..b4fdb54c24b 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -424,7 +424,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
   // get a timer queue (or not) from a possibly configured
   // time policy
   TAO_RSF_Timer_Queue_Ptr tmq (*this, this->create_timer_queue ());
-//@@ TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_START
   switch (this->reactor_type_)
     {
     case TAO_REACTOR_SELECT_MT:
@@ -496,8 +495,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
       break;
     }
 
-//@@ TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END
-
   // safe to release timer queue
   tmq.release ();
   return impl;
diff --git a/TAO/tao/String_Alloc.cpp b/TAO/tao/String_Alloc.cpp
index 7b6edfaac05..91935ce80a1 100644
--- a/TAO/tao/String_Alloc.cpp
+++ b/TAO/tao/String_Alloc.cpp
@@ -22,7 +22,7 @@ CORBA::string_dup (const char *str)
   if (!str)
     {
       errno = EINVAL;
-      return 0;
+      return nullptr;
     }
 
 #ifndef TAO_NO_SHARED_NULL_CORBA_STRING
@@ -47,10 +47,10 @@ char *
 CORBA::string_alloc (CORBA::ULong len)
 {
   // Allocate 1 + strlen to accomodate the null terminating character.
-  char *s = 0;
+  char *s = nullptr;
   ACE_NEW_RETURN (s,
                   char[size_t (len + 1)],
-                  0);
+                  nullptr);
   s[0]= '\0';
 
   return s;
@@ -73,7 +73,7 @@ CORBA::wstring_dup (const WChar *const str)
   if (!str)
     {
       errno = EINVAL;
-      return 0;
+      return nullptr;
     }
 
 #ifndef TAO_NO_SHARED_NULL_CORBA_STRING
@@ -83,10 +83,10 @@ CORBA::wstring_dup (const WChar *const str)
 
   CORBA::WChar* retval =
     CORBA::wstring_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (str)));
-  if (retval == 0)
+  if (retval == nullptr)
     {
       // The wscpy() below assumes that the destination is a valid buffer.
-      return 0;
+      return nullptr;
     }
 
   return ACE_OS::wscpy (retval, str);
@@ -95,10 +95,10 @@ CORBA::wstring_dup (const WChar *const str)
 CORBA::WChar*
 CORBA::wstring_alloc (CORBA::ULong len)
 {
-  CORBA::WChar *s = 0;
+  CORBA::WChar *s = nullptr;
   ACE_NEW_RETURN (s,
                   CORBA::WChar [(size_t) (len + 1)],
-                  0);
+                  nullptr);
   return s;
 }
 
diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h
index d9837cfdee1..d0a2d3c9f1d 100644
--- a/TAO/tao/String_Const_Sequence_Element_T.h
+++ b/TAO/tao/String_Const_Sequence_Element_T.h
@@ -51,7 +51,7 @@ public:
     return *this->element_;
   }
 
-  inline const character_type *in (void) const
+  inline const character_type *in () const
   {
     return *this->element_;
   }
diff --git a/TAO/tao/String_Manager_T.h b/TAO/tao/String_Manager_T.h
index 2a596187c52..9a0905bff57 100644
--- a/TAO/tao/String_Manager_T.h
+++ b/TAO/tao/String_Manager_T.h
@@ -39,7 +39,7 @@ public:
   typedef TAO::details::string_traits_base <charT> s_traits;
 
   /// Default CTOR will initialize the underlying ptr_ to empty string.
-  inline String_Manager_T (void) : ptr_ (s_traits::default_initializer())
+  inline String_Manager_T () : ptr_ (s_traits::default_initializer())
   {
   }
 
@@ -56,7 +56,7 @@ public:
   }
 
   /// Destructor
-  inline ~String_Manager_T (void) {
+  inline ~String_Manager_T () {
     s_traits::release (this->ptr_);
   }
 
@@ -101,24 +101,24 @@ public:
   }
 
   /// For in parameter.
-  inline const character_type *in (void) const {
+  inline const character_type *in () const {
     return this->ptr_;
   }
 
   /// For inout parameter.
-  inline character_type *&inout (void) {
+  inline character_type *&inout () {
     return this->ptr_;
   }
 
   /// for out parameter.
-  inline character_type *&out (void) {
+  inline character_type *&out () {
     s_traits::release (this->ptr_);
     this->ptr_ = 0;
     return this->ptr_;
   }
 
   /// For string of return type.
-  inline character_type *_retn (void) {
+  inline character_type *_retn () {
     character_type *temp = this->ptr_;
     this->ptr_ = 0;
     return temp;
diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h
index b408e1c1685..1905bba57ad 100644
--- a/TAO/tao/String_Sequence_Element_T.h
+++ b/TAO/tao/String_Sequence_Element_T.h
@@ -96,15 +96,15 @@ public:
     return *this->element_;
   }
 
-  inline const character_type *in (void) const {
+  inline const character_type *in () const {
     return *this->element_;
   }
 
-  inline character_type *&inout (void) const {
+  inline character_type *&inout () const {
     return *this->element_;
   }
 
-  inline string_out out (void) const {
+  inline string_out out () const {
 
     if (release())
       {
@@ -114,7 +114,7 @@ public:
     return *this->element_;
   }
 
-  inline character_type *_retn (void) {
+  inline character_type *_retn () {
     character_type * copy = *this->element_;
     *this->element_ = traits::default_initializer();
     return copy;
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 5f5a645e70e..c132daaeef9 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -35,23 +35,23 @@ TAO_Stub::TAO_Stub (const char *repository_id,
   , orb_ ()
   , is_collocated_ (false)
   , servant_orb_ ()
-  , collocated_servant_ (0)
+  , collocated_servant_ (nullptr)
   , object_proxy_broker_ (the_tao_remote_object_proxy_broker ())
   , base_profiles_ ((CORBA::ULong) 0)
-  , forward_profiles_ (0)
-  , forward_profiles_perm_ (0)
-  , profile_in_use_ (0)
+  , forward_profiles_ (nullptr)
+  , forward_profiles_perm_ (nullptr)
+  , profile_in_use_ (nullptr)
   , profile_success_ (false)
   , refcount_ (1)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
-  , policies_ (0)
+  , policies_ (nullptr)
 #endif
-  , ior_info_ (0)
-  , forwarded_ior_info_ (0)
+  , ior_info_ (nullptr)
+  , forwarded_ior_info_ (nullptr)
   , collocation_opt_ (orb_core->optimize_collocation_objects ())
   , forwarded_on_exception_ (false)
 {
-  if (this->orb_core_.get() == 0)
+  if (this->orb_core_.get() == nullptr)
     {
       if (TAO_debug_level > 0)
         {
@@ -79,7 +79,7 @@ TAO_Stub::TAO_Stub (const char *repository_id,
   this->base_profiles (profiles);
 }
 
-TAO_Stub::~TAO_Stub (void)
+TAO_Stub::~TAO_Stub ()
 {
   ACE_ASSERT (this->refcount_ == 0);
 
@@ -89,11 +89,11 @@ TAO_Stub::~TAO_Stub (void)
   // reset_profiles doesn't delete forward_profiles_perm_.
   delete this->forward_profiles_perm_;
 
-  if (this->profile_in_use_ != 0)
+  if (this->profile_in_use_ != nullptr)
     {
       // decrease reference count on profile
       this->profile_in_use_->_decr_refcnt ();
-      this->profile_in_use_ = 0;
+      this->profile_in_use_ = nullptr;
     }
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -125,13 +125,13 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles,
   if (permanent_forward)
     {
       // paranoid, reset the bookmark, then clear the forward-stack
-      this->forward_profiles_perm_ = 0;
+      this->forward_profiles_perm_ = nullptr;
 
       this->reset_forward ();
     }
 
   TAO_MProfile *now_pfiles = this->forward_profiles_;
-  if (now_pfiles == 0)
+  if (now_pfiles == nullptr)
     now_pfiles = &this->base_profiles_;
 
   ACE_NEW (this->forward_profiles_,
@@ -175,11 +175,11 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index)
     }
 
 
-  IOP::IOR *tmp_info = 0;
+  IOP::IOR *tmp_info = nullptr;
 
-  if (this->forward_profiles_ != 0)
+  if (this->forward_profiles_ != nullptr)
     {
-      if (this->forwarded_ior_info_ == 0)
+      if (this->forwarded_ior_info_ == nullptr)
         {
           this->get_profile_ior_info (*this->forward_profiles_, tmp_info);
 
@@ -203,7 +203,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index)
     }
 
   // Else we look at the base profiles
-  if (this->ior_info_ == 0)
+  if (this->ior_info_ == nullptr)
     {
       this->get_profile_ior_info (this->base_profiles_, tmp_info);
 
@@ -228,7 +228,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index)
 }
 
 const TAO::ObjectKey &
-TAO_Stub::object_key (void) const
+TAO_Stub::object_key () const
 {
   // Return the profile in use's object key if you see one.
   if (this->profile_in_use_)
@@ -242,7 +242,7 @@ TAO_Stub::object_key (void) const
         const_cast <TAO_SYNCH_MUTEX&>(this->profile_lock_));
       // FUZZ: enable check_for_ACE_Guard
 
-      if (obj.locked () != 0 &&  this->forward_profiles_ != 0)
+      if (obj.locked () != 0 &&  this->forward_profiles_ != nullptr)
         return this->forward_profiles_->get_profile (0)->object_key ();
     }
 
@@ -271,7 +271,7 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info)
 
       IOP::TaggedProfile *tp = prof->create_tagged_profile ();
 
-      if (tp == 0)
+      if (tp == nullptr)
         throw ::CORBA::NO_MEMORY ();
       ior_info->profiles[index] = *tp;
     }
@@ -285,7 +285,7 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated)
   if (this->is_collocated_ != collocated)
     {
       if (collocated &&
-          _TAO_Object_Proxy_Broker_Factory_function_pointer != 0)
+          _TAO_Object_Proxy_Broker_Factory_function_pointer != nullptr)
         {
           this->object_proxy_broker_ =
             _TAO_Object_Proxy_Broker_Factory_function_pointer ();
@@ -327,7 +327,7 @@ TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj)
   TAO_Profile * const other_profile = other_obj->_stubobj ()->profile_in_use_;
   TAO_Profile * const this_profile = this->profile_in_use_;
 
-  if (other_profile == 0 || this_profile == 0)
+  if (other_profile == nullptr || this_profile == nullptr)
     return false;
 
   // Compare the profiles
@@ -359,7 +359,7 @@ TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile)
 }
 
 void
-TAO_Stub::forward_back_one (void)
+TAO_Stub::forward_back_one ()
 {
   TAO_MProfile *from = forward_profiles_->forward_from ();
 
@@ -371,12 +371,12 @@ TAO_Stub::forward_back_one (void)
   // longer being forwarded, so set the reference to zero.
   if (from == &this->base_profiles_)
     {
-      this->base_profiles_.get_current_profile ()->forward_to (0);
-      this->forward_profiles_ = 0;
+      this->base_profiles_.get_current_profile ()->forward_to (nullptr);
+      this->forward_profiles_ = nullptr;
     }
   else
     {
-      from->get_current_profile ()->forward_to (0);
+      from->get_current_profile ()->forward_to (nullptr);
       this->forward_profiles_ = from;
     }
 }
@@ -418,7 +418,7 @@ TAO_Stub::get_policy (CORBA::PolicyType type)
   // construction time...
 
   CORBA::Policy_var result;
-  if (this->policies_ != 0)
+  if (this->policies_ != nullptr)
     {
       result = this->policies_->get_policy (type);
     }
@@ -438,7 +438,7 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type)
   // construction time...
 
   CORBA::Policy_var result;
-  if (this->policies_ != 0)
+  if (this->policies_ != nullptr)
     {
       result = this->policies_->get_cached_policy (type);
     }
@@ -456,17 +456,13 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
                                 CORBA::SetOverrideType set_add)
 {
   // Notice the use of an explicit constructor....
-#if defined (ACE_HAS_CPP11)
   std::unique_ptr<TAO_Policy_Set> policy_manager (new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE));
-#else
-  auto_ptr<TAO_Policy_Set> policy_manager (new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE));
-#endif /* ACE_HAS_CPP11 */
 
   if (set_add == CORBA::SET_OVERRIDE)
     {
       policy_manager->set_policy_overrides (policies, set_add);
     }
-  else if (this->policies_ == 0)
+  else if (this->policies_ == nullptr)
     {
       policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE);
     }
@@ -491,9 +487,9 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 CORBA::PolicyList *
 TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types)
 {
-  if (this->policies_ == 0)
+  if (this->policies_ == nullptr)
     {
-      CORBA::PolicyList *policy_list_ptr = 0;
+      CORBA::PolicyList *policy_list_ptr = nullptr;
       ACE_NEW_THROW_EX (policy_list_ptr,
                         CORBA::PolicyList (),
                         CORBA::NO_MEMORY ());
@@ -548,7 +544,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr)
     }
 
 
-      ACE_ASSERT(this->forward_profiles_ !=0);
+      ACE_ASSERT(this->forward_profiles_ !=nullptr);
 
       // paranoid - in case of FT the basic_profiles_ would do, too,
       // but might be dated
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index a2b56708493..de3020ed58c 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -22,11 +22,7 @@
 
 #include "tao/MProfile.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 #if defined (HPUX) && defined (IOR)
    /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
@@ -89,7 +85,7 @@ public:
 
   /// Return the queueing strategy to be used in by the transport.
   /// Selection will be based on the SyncScope policies.
-  TAO::Transport_Queueing_Strategy *transport_queueing_strategy (void);
+  TAO::Transport_Queueing_Strategy *transport_queueing_strategy ();
 
   /// All objref representations carry around a type ID.
   CORBA::String_var type_id;
@@ -114,39 +110,39 @@ public:
             TAO_ORB_Core *orb_core);
 
   // = Memory management.
-  void _incr_refcnt (void);
-  void _decr_refcnt (void);
+  void _incr_refcnt ();
+  void _decr_refcnt ();
 
   /// Return the Profile lock. This lock can be used at places where
   /// profiles need to be edited.
-  const TAO_SYNCH_MUTEX& profile_lock (void) const;
+  const TAO_SYNCH_MUTEX& profile_lock () const;
 
   /// Manage the base (non-forwarded) profiles.
   /// Returns a pointer to the profile_in_use object.  This object
   /// retains ownership of this profile.
-  TAO_Profile *profile_in_use (void);
+  TAO_Profile *profile_in_use ();
 
   /// Return the ObjectKey
-  const TAO::ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key () const;
 
   /**
    * Copy of the profile list, user must free memory when done.
    * although the user can call make_profiles() then reorder
    * the list and give it back to TAO_Stub.
    */
-  TAO_MProfile *make_profiles (void);
+  TAO_MProfile *make_profiles ();
 
   /// Obtain a reference to the basic profile set.
-  const TAO_MProfile& base_profiles (void) const;
+  const TAO_MProfile& base_profiles () const;
 
   /// Obtain a reference to the basic profile set.
-  TAO_MProfile& base_profiles (void);
+  TAO_MProfile& base_profiles ();
 
   /// Obtain a pointer to the forwarded profile set
-  const TAO_MProfile *forward_profiles (void) const;
+  const TAO_MProfile *forward_profiles () const;
 
   /// Obtain a pointer to the forwarded profile set
-  TAO_MProfile *forward_profiles (void);
+  TAO_MProfile *forward_profiles ();
 
   /// True if permanent location forward occurred, in this case the lock must be set and the
 
@@ -159,7 +155,7 @@ public:
    * profile_in_use_ is set to the first profile in the base_profiles
    * list.
    */
-  TAO_Profile *next_profile (void);
+  TAO_Profile *next_profile ();
 
   /**
    * THREAD SAFE
@@ -167,23 +163,23 @@ public:
    * profile and if there are anmy existing forward profiles they are
    * reset.
    */
-  void reset_profiles (void);
+  void reset_profiles ();
 
   /// Returns true if the profile in use is
   /// the same as the profile in use after
   /// reset_profiles() is called.
-  CORBA::Boolean at_starting_profile (void) const;
+  CORBA::Boolean at_starting_profile () const;
 
   /// Returns true if a forward profile has successfully been used.
   /// profile_success_ && forward_profiles_
-  CORBA::Boolean valid_forward_profile (void);
+  CORBA::Boolean valid_forward_profile ();
 
   /// NON-THREAD-SAFE.  Will set profile_success_ to true.
-  void set_valid_profile (void);
+  void set_valid_profile ();
 
   /// Returns true if a connection was successful with at least
   /// one profile.
-  CORBA::Boolean valid_profile (void) const;
+  CORBA::Boolean valid_profile () const;
 
   /// Initialize the base_profiles_ and set profile_in_use_ to
   /// reference the first profile.
@@ -207,22 +203,22 @@ public:
    * Used to get the next profile after the one being used has
    * failed during the initial connect or send of the message!
    */
-  CORBA::Boolean next_profile_retry (void);
+  CORBA::Boolean next_profile_retry ();
 
   /// Accessor.
-  TAO_ORB_Core* orb_core (void) const;
+  TAO_ORB_Core* orb_core () const;
 
   /// Is this stub collocated with the servant?
-  CORBA::Boolean is_collocated (void) const;
+  CORBA::Boolean is_collocated () const;
 
   /// Mutator to mark this stub as being collocated with the servant.
   void is_collocated (CORBA::Boolean);
 
   /// This returns a duplicated ORB pointer.
-  CORBA::ORB_ptr servant_orb_ptr (void);
+  CORBA::ORB_ptr servant_orb_ptr ();
 
   /// This returns the ORB var itself (generally for temporary use).
-  CORBA::ORB_var &servant_orb_var (void);
+  CORBA::ORB_var &servant_orb_var ();
 
   /**
    * Accesor and mutator for the servant ORB.  Notice that the mutator
@@ -236,7 +232,7 @@ public:
   void collocated_servant (TAO_Abstract_ServantBase* servant);
 
   /// Accessor for the servant reference in collocated cases.
-  TAO_Abstract_ServantBase* collocated_servant (void) const;
+  TAO_Abstract_ServantBase* collocated_servant () const;
 
   /// Mutator for setting the object proxy broker pointer.
   /// CORBA::Objects using this stub will use this for standard calls
@@ -246,7 +242,7 @@ public:
   /// Accessor for getting the object proxy broker pointer.
   /// CORBA::Objects using this stub use this for standard calls
   /// like is_a; get_interface; etc...
-  TAO::Object_Proxy_Broker *object_proxy_broker (void) const;
+  TAO::Object_Proxy_Broker *object_proxy_broker () const;
 
   /**
    * Create the IOP::IOR info. We will create the info at most once.
@@ -259,14 +255,14 @@ public:
    * This method is intended to be used only by the CORBA::Object
    * class.
    */
-  void destroy (void);
+  void destroy ();
 
   /// Return the cached value from the ORB_Core.
   /**
    * This flag indicates whether the stub code should make use of the
    * collocation opportunities that are available to the ORB.
    */
-  CORBA::Boolean optimize_collocation_objects (void) const;
+  CORBA::Boolean optimize_collocation_objects () const;
 
   /// Needed to avoid copying forward_profiles for thread safety
   CORBA::Boolean marshal (TAO_OutputCDR&);
@@ -278,13 +274,13 @@ protected:
 
   /// Destructor is to be called only through _decr_refcnt() to
   /// enforce proper reference counting.
-  virtual ~TAO_Stub (void);
+  virtual ~TAO_Stub ();
 
   /// NON-THREAD SAFE version of reset_profiles (void);
-  void reset_profiles_i (void);
+  void reset_profiles_i ();
 
   /// NON-THREAD SAFE version of next_profile (void)
-  TAO_Profile *next_profile_i (void);
+  TAO_Profile *next_profile_i ();
 
 private:
   /// Makes a copy of the profile and frees the existing profile_in_use.
@@ -297,14 +293,14 @@ private:
 
   /// NON-THREAD-SAFE.  Utility method which unrolls (removes or pops)
   /// the top most forwarding profile list.
-  void forward_back_one (void);
+  void forward_back_one ();
 
    /// NOT THREAD-SAFE.  Utility method which pops all forward profile
    /// lists and resets the forward_profiles_ pointer.
   void reset_forward ();
 
   /// NON-THREAD-SAFE.  utility method for next_profile.
-  TAO_Profile *next_forward_profile (void);
+  TAO_Profile *next_forward_profile ();
 
   /// THREAD-SAFE Create the IOR info
   int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info);
@@ -384,11 +380,7 @@ protected:
   CORBA::Boolean profile_success_;
 
   /// Reference counter.
-#if defined (ACE_HAS_CPP11)
   std::atomic<uint32_t> refcount_;
-#else
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
   /// The policy overrides in this object, if nil then use the default
   /// policies.
@@ -418,7 +410,7 @@ protected:
 
   /// True if forwarding request upon some specific exceptions
   /// (e.g. OBJECT_NOT_EXIST) already happened.
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, bool> forwarded_on_exception_;
+  std::atomic<bool> forwarded_on_exception_;
 };
 
 // Define a TAO_Stub auto_ptr class.
@@ -434,12 +426,12 @@ public:
   explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = 0);
   TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap);
   TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs);
-  ~TAO_Stub_Auto_Ptr (void);
+  ~TAO_Stub_Auto_Ptr ();
 
   // = Accessor methods.
   TAO_Stub &operator *() const;
-  TAO_Stub *get (void) const;
-  TAO_Stub *release (void);
+  TAO_Stub *get () const;
+  TAO_Stub *release ();
   void reset (TAO_Stub *p = 0);
   TAO_Stub *operator-> () const;
 
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
index 7c638ccf206..146414ac160 100644
--- a/TAO/tao/Stub.inl
+++ b/TAO/tao/Stub.inl
@@ -393,7 +393,7 @@ void TAO_Stub::forwarded_on_exception (bool forwarded)
 ACE_INLINE
 bool TAO_Stub::forwarded_on_exception () const
 {
-  return forwarded_on_exception_.value ();
+  return forwarded_on_exception_;
 }
 
 ACE_INLINE
diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp
index 7a29fd40e4d..e6ac07d53a6 100644
--- a/TAO/tao/Stub_Factory.cpp
+++ b/TAO/tao/Stub_Factory.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Stub_Factory::~TAO_Stub_Factory (void)
+TAO_Stub_Factory::~TAO_Stub_Factory ()
 {
 }
 
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 6e1c38b22e9..ee073e085d3 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -75,7 +75,7 @@ namespace TAO
                          resolver,
                          detail,
                          response_expected)
-    , retry_state_ (0)
+    , retry_state_ (nullptr)
   {
   }
 
@@ -90,7 +90,7 @@ namespace TAO
   {
     TAO::ORB_Countdown_Time countdown (max_wait_time);
 
-    TAO_Synch_Reply_Dispatcher *rd_p = 0;
+    TAO_Synch_Reply_Dispatcher *rd_p = nullptr;
     ACE_NEW_NORETURN (rd_p, TAO_Synch_Reply_Dispatcher (this->resolver_.stub ()->orb_core (),
                                           this->details_.reply_service_info ()));
     if (!rd_p)
@@ -398,7 +398,7 @@ namespace TAO
               }
             catch (const ::CORBA::Exception&)
               {
-                if (this->retry_state_ == 0 ||
+                if (this->retry_state_ == nullptr ||
                     !this->retry_state_->forward_on_exception_limit_used ())
                   {
                     this->resolver_.stub ()->reset_profiles ();
@@ -426,7 +426,7 @@ namespace TAO
     TAO_InputCDR &cdr = rd.reply_cdr ();
 
     // Set the translators
-    this->resolver_.transport ()->assign_translators (&cdr, 0);
+    this->resolver_.transport ()->assign_translators (&cdr, nullptr);
 
     // At this point it can be assumed that the GIOP/whatever protocol
     // header and the reply header are already handled.  Further it
@@ -580,11 +580,7 @@ namespace TAO
 
     // We must manage the memory allocated
     // by the call above to alloc().
-#if defined (ACE_HAS_CPP11)
     std::unique_ptr<CORBA::Exception> safety (exception);
-#else
-    auto_ptr<CORBA::Exception> safety (exception);
-#endif /* ACE_HAS_CPP11 */
 
     exception->_raise ();
 
@@ -718,7 +714,7 @@ namespace TAO
 
     CORBA::SystemException *ex = TAO::create_system_exception (type_id.in ());
 
-    if (ex == 0)
+    if (ex == nullptr)
       {
         // @@ We should raise a CORBA::NO_MEMORY, but we ran out
         //    of memory already. We need a pre-allocated, TSS,
@@ -731,11 +727,7 @@ namespace TAO
     // Without this, the call to create_system_exception() above
     // causes a memory leak. On platforms without native exceptions,
     // the CORBA::Environment class manages the memory.
-#if defined (ACE_HAS_CPP11)
     std::unique_ptr<CORBA::SystemException> safety (ex);
-#else
-    auto_ptr<CORBA::SystemException> safety (ex);
-#endif /* ACE_HAS_CPP11 */
 
     ex->minor (minor);
     ex->completed (CORBA::CompletionStatus (completion));
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index 391955d8752..0637182898c 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -178,7 +178,7 @@ namespace TAO
 
     /// The destructor calls Invocation_Base::invoke_status with the
     /// right invoke status, which is useful for PI's.
-    ~Reply_Guard (void);
+    ~Reply_Guard ();
 
     /// Mutator to set the invocation status.
     void set_status (Invocation_Status s);
diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl
index 607b714ce43..c595d17a7c0 100644
--- a/TAO/tao/Synch_Invocation.inl
+++ b/TAO/tao/Synch_Invocation.inl
@@ -12,7 +12,7 @@ namespace TAO
   }
 
   ACE_INLINE
-  Reply_Guard::~Reply_Guard (void)
+  Reply_Guard::~Reply_Guard ()
   {
 #if TAO_HAS_INTERCEPTORS == 1
     this->invocation_->invoke_status (this->status_);
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index f4ed2276cec..fb5122c0aea 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -20,24 +20,24 @@ TAO_Synch_Queued_Message::TAO_Synch_Queued_Message (
 {
 }
 
-TAO_Synch_Queued_Message::~TAO_Synch_Queued_Message (void)
+TAO_Synch_Queued_Message::~TAO_Synch_Queued_Message ()
 {
-  if (this->own_contents_ && this->contents_ != 0)
+  if (this->own_contents_ && this->contents_ != nullptr)
     {
       ACE_Message_Block::release (this->contents_);
     }
 }
 
 const ACE_Message_Block *
-TAO_Synch_Queued_Message::current_block (void) const
+TAO_Synch_Queued_Message::current_block () const
 {
   return this->current_block_;
 }
 
 size_t
-TAO_Synch_Queued_Message::message_length (void) const
+TAO_Synch_Queued_Message::message_length () const
 {
-  if (this->current_block_ == 0)
+  if (this->current_block_ == nullptr)
     {
       return 0;
     }
@@ -46,9 +46,9 @@ TAO_Synch_Queued_Message::message_length (void) const
 }
 
 int
-TAO_Synch_Queued_Message::all_data_sent (void) const
+TAO_Synch_Queued_Message::all_data_sent () const
 {
-  return this->current_block_ == 0;
+  return this->current_block_ == nullptr;
 }
 
 void
@@ -59,7 +59,7 @@ TAO_Synch_Queued_Message::fill_iov (int iovcnt_max,
   ACE_ASSERT (iovcnt_max > iovcnt);
 
   for (const ACE_Message_Block *message_block = this->current_block_;
-       message_block != 0 && iovcnt < iovcnt_max;
+       message_block != nullptr && iovcnt < iovcnt_max;
        message_block = message_block->cont ())
     {
       size_t const message_block_length = message_block->length ();
@@ -82,7 +82,7 @@ TAO_Synch_Queued_Message::bytes_transferred (size_t &byte_count)
 {
   this->state_changed_i (TAO_LF_Event::LFS_ACTIVE);
 
-  while (this->current_block_ != 0 && byte_count > 0)
+  while (this->current_block_ != nullptr && byte_count > 0)
     {
       size_t const l = this->current_block_->length ();
 
@@ -97,14 +97,14 @@ TAO_Synch_Queued_Message::bytes_transferred (size_t &byte_count)
       this->current_block_->rd_ptr (l);
       this->current_block_ = this->current_block_->cont ();
 
-      while (this->current_block_ != 0
+      while (this->current_block_ != nullptr
              && this->current_block_->length () == 0)
         {
           this->current_block_ = this->current_block_->cont ();
         }
     }
 
-  if (this->current_block_ == 0)
+  if (this->current_block_ == nullptr)
     this->state_changed (TAO_LF_Event::LFS_SUCCESS,
                          this->orb_core_->leader_follower ());
 }
@@ -112,7 +112,7 @@ TAO_Synch_Queued_Message::bytes_transferred (size_t &byte_count)
 TAO_Queued_Message *
 TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc)
 {
-  TAO_Synch_Queued_Message *qm = 0;
+  TAO_Synch_Queued_Message *qm = nullptr;
 
   // Clone the message block.
   // NOTE: We wantedly do the cloning from <current_block_> instead of
@@ -130,26 +130,26 @@ TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc)
                                                        this->orb_core_,
                                                        alloc,
                                                        true),
-                             0);
+                             nullptr);
     }
   else
     {
       ACE_NEW_RETURN (qm,
-                      TAO_Synch_Queued_Message (mb, this->orb_core_, 0, true),
-                      0);
+                      TAO_Synch_Queued_Message (mb, this->orb_core_, nullptr, true),
+                      nullptr);
     }
 
   return qm;
 }
 
 void
-TAO_Synch_Queued_Message::destroy (void)
+TAO_Synch_Queued_Message::destroy ()
 {
   if (this->own_contents_)
     {
       ACE_Message_Block::release (this->contents_);
-      this->current_block_ = 0;
-      this->contents_ = 0;
+      this->current_block_ = nullptr;
+      this->contents_ = nullptr;
     }
 
   if (this->is_heap_created_)
@@ -176,7 +176,7 @@ TAO_Synch_Queued_Message::copy_if_necessary (const ACE_Message_Block* chain)
     {
       // Go through the message block chain looking for the message block
       // that matches our "current" message block.
-      for (const ACE_Message_Block* mb = chain; mb != 0; mb = mb->cont ())
+      for (const ACE_Message_Block* mb = chain; mb != nullptr; mb = mb->cont ())
         {
           if (mb == this->current_block_)
             {
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
index 3043fd45ce0..a63bcad601c 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -31,18 +31,18 @@ TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (
 }
 
 // Destructor.
-TAO_Synch_Reply_Dispatcher::~TAO_Synch_Reply_Dispatcher (void)
+TAO_Synch_Reply_Dispatcher::~TAO_Synch_Reply_Dispatcher ()
 {
 }
 
 TAO_InputCDR &
-TAO_Synch_Reply_Dispatcher::reply_cdr (void)
+TAO_Synch_Reply_Dispatcher::reply_cdr ()
 {
   return this->reply_cdr_;
 }
 
 void
-TAO_Synch_Reply_Dispatcher::reply_timed_out (void)
+TAO_Synch_Reply_Dispatcher::reply_timed_out ()
 {
   // noop
 }
@@ -51,7 +51,7 @@ int
 TAO_Synch_Reply_Dispatcher::dispatch_reply (
     TAO_Pluggable_Reply_Params &params)
 {
-  if (params.input_cdr_ == 0)
+  if (params.input_cdr_ == nullptr)
     return -1;
 
   this->reply_status_ = params.reply_status ();
@@ -67,7 +67,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (
   if (this->reply_service_info_.length() > 0)
     {
       orb_core_->service_context_registry ().
-        process_service_contexts (this->reply_service_info_, *(params.transport_), 0);
+        process_service_contexts (this->reply_service_info_, *(params.transport_), nullptr);
     }
 
   // Must reset the message state, it is possible that the same reply
@@ -86,7 +86,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (
   {
     ACE_Data_Block *db = this->reply_cdr_.clone_from (*params.input_cdr_);
 
-    if (db == 0)
+    if (db == nullptr)
       {
         if (TAO_debug_level > 2)
           {
@@ -116,7 +116,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (
 }
 
 void
-TAO_Synch_Reply_Dispatcher::connection_closed (void)
+TAO_Synch_Reply_Dispatcher::connection_closed ()
 {
   this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
                        this->orb_core_->leader_follower ());
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index d966dbd8b0b..7dc23aa3e40 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -55,7 +55,7 @@ const CORBA::ULong TAO_ENOTSUP_MINOR_CODE            = 0x14U;
 
 // ****************************************************************
 
-CORBA::SystemException::SystemException (void)
+CORBA::SystemException::SystemException ()
   : minor_ (0),
     completed_ (CORBA::COMPLETED_NO)
 {
@@ -86,7 +86,7 @@ CORBA::SystemException::SystemException (const CORBA::SystemException &src)
 {
 }
 
-CORBA::SystemException::~SystemException (void)
+CORBA::SystemException::~SystemException ()
 {
 }
 
@@ -197,9 +197,9 @@ CORBA::SystemException::_tao_errno (int errno_value)
 }
 
 CORBA::Exception *
-CORBA::SystemException::_tao_duplicate (void) const
+CORBA::SystemException::_tao_duplicate () const
 {
-  return 0;
+  return nullptr;
 }
 
 CORBA::ULong
@@ -220,7 +220,7 @@ CORBA::SystemException::_tao_print_system_exception (FILE *) const
 }
 
 ACE_CString
-CORBA::SystemException::_info (void) const
+CORBA::SystemException::_info () const
 {
   // @@ there are a few other "user exceptions" in the CORBA scope,
   // they're not all standard/system exceptions ... really need to
@@ -241,7 +241,7 @@ CORBA::SystemException::_info (void) const
   if (VMCID == TAO::VMCID)
     {
       // @@ Move the following code to a subroutine, it is too long already!
-      const char *location = 0;
+      const char *location = nullptr;
       switch (this->minor () & 0x00000F80u)
         {
         case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE:
@@ -308,7 +308,7 @@ CORBA::SystemException::_info (void) const
           location = "unknown location";
         }
 
-      const char *errno_indication = 0;
+      const char *errno_indication = nullptr;
       char unknown_errno [255];
       CORBA::ULong minor_code = this->minor () & 0x7FU;
       switch (minor_code)
@@ -410,7 +410,7 @@ CORBA::SystemException::_info (void) const
     {
       CORBA::ULong const minor_code = this->minor () & 0xFFFU;
 
-      const char *minor_description = 0;
+      const char *minor_description = nullptr;
 
       if (minor_code > 0)
           minor_description =
@@ -697,133 +697,133 @@ CORBA::SystemException::_tao_get_omg_exception_description (
 
   CORBA::UNKNOWN const * unknown_exception =
     dynamic_cast <const CORBA::UNKNOWN *> (&exc);
-  if (unknown_exception != 0
+  if (unknown_exception != nullptr
       && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *))
     return UNKNOWN_TABLE[minor_code];
 
   CORBA::BAD_PARAM const * bad_param__exception =
     dynamic_cast <const CORBA::BAD_PARAM *> (&exc);
-  if (bad_param__exception != 0
+  if (bad_param__exception != nullptr
       && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *))
     return BAD_PARAM_TABLE[minor_code];
 
   CORBA::IMP_LIMIT const * imp_limit_exception =
     dynamic_cast <const CORBA::IMP_LIMIT *> (&exc);
-  if (imp_limit_exception != 0
+  if (imp_limit_exception != nullptr
       && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *))
     return IMP_LIMIT_TABLE[minor_code];
 
   CORBA::INITIALIZE const * initialize_exception =
     dynamic_cast <const CORBA::INITIALIZE *> (&exc);
-  if (initialize_exception != 0
+  if (initialize_exception != nullptr
       && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *))
     return INITIALIZE_TABLE[minor_code];
 
   CORBA::INV_OBJREF const * inv_objref_exception =
     dynamic_cast <const CORBA::INV_OBJREF *> (&exc);
-  if (inv_objref_exception != 0
+  if (inv_objref_exception != nullptr
       && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *))
     return INV_OBJREF_TABLE[minor_code];
 
   CORBA::MARSHAL const * marshal_exception =
     dynamic_cast <const CORBA::MARSHAL *> (&exc);
-  if (marshal_exception != 0
+  if (marshal_exception != nullptr
       && minor_code < sizeof MARSHAL_TABLE / sizeof (char *))
     return MARSHAL_TABLE[minor_code];
 
   CORBA::BAD_TYPECODE const * bad_typecode_exception =
     dynamic_cast <const CORBA::BAD_TYPECODE *> (&exc);
-  if (bad_typecode_exception != 0
+  if (bad_typecode_exception != nullptr
       && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *))
     return BAD_TYPECODE_TABLE[minor_code];
 
   CORBA::NO_IMPLEMENT const * no_implement_exception =
     dynamic_cast <const CORBA::NO_IMPLEMENT *> (&exc);
-  if (no_implement_exception != 0
+  if (no_implement_exception != nullptr
       && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *))
     return NO_IMPLEMENT_TABLE[minor_code];
 
   CORBA::NO_RESOURCES const * no_resource_exception =
     dynamic_cast <const CORBA::NO_RESOURCES *> (&exc);
-  if (no_resource_exception != 0
+  if (no_resource_exception != nullptr
       && minor_code < sizeof NO_RESOURCES_TABLE / sizeof (char *))
     return NO_RESOURCES_TABLE[minor_code];
 
   CORBA::BAD_INV_ORDER const * bad_inv_order_exception =
     dynamic_cast <const CORBA::BAD_INV_ORDER *> (&exc);
-  if (bad_inv_order_exception != 0
+  if (bad_inv_order_exception != nullptr
       && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *))
     return BAD_INV_ORDER_TABLE[minor_code];
 
   CORBA::TRANSIENT const * transient_exception =
     dynamic_cast <const CORBA::TRANSIENT *> (&exc);
-  if (transient_exception != 0
+  if (transient_exception != nullptr
       && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *))
     return TRANSIENT_TABLE[minor_code];
 
   CORBA::OBJ_ADAPTER const * obj_adapter_exception =
     dynamic_cast <const CORBA::OBJ_ADAPTER *> (&exc);
-  if (obj_adapter_exception != 0
+  if (obj_adapter_exception != nullptr
       && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *))
     return OBJ_ADAPTER_TABLE[minor_code];
 
   CORBA::DATA_CONVERSION const * data_conversion_exception =
     dynamic_cast <const CORBA::DATA_CONVERSION *> (&exc);
-  if (data_conversion_exception != 0
+  if (data_conversion_exception != nullptr
       && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *))
     return DATA_CONVERSION_TABLE[minor_code];
 
   CORBA::OBJECT_NOT_EXIST const * object_not_exist_exception =
     dynamic_cast <const CORBA::OBJECT_NOT_EXIST *> (&exc);
-  if (object_not_exist_exception != 0
+  if (object_not_exist_exception != nullptr
       && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *))
     return OBJECT_NOT_EXIST_TABLE[minor_code];
 
   CORBA::INV_POLICY const * inv_policy_exception =
     dynamic_cast <const CORBA::INV_POLICY *> (&exc);
-  if (inv_policy_exception != 0
+  if (inv_policy_exception != nullptr
       && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *))
     return INV_POLICY_TABLE[minor_code];
 
   CORBA::ACTIVITY_COMPLETED const * activity_completed_exception =
     dynamic_cast <const CORBA::ACTIVITY_COMPLETED *> (&exc);
-  if (activity_completed_exception != 0
+  if (activity_completed_exception != nullptr
       && minor_code < sizeof ACTIVITY_COMPLETED_TABLE / sizeof (char *))
     return ACTIVITY_COMPLETED_TABLE[minor_code];
 
   CORBA::ACTIVITY_REQUIRED const * activity_required_exception =
     dynamic_cast <const CORBA::ACTIVITY_REQUIRED *> (&exc);
-  if (activity_required_exception != 0
+  if (activity_required_exception != nullptr
       && minor_code < sizeof ACTIVITY_REQUIRED_TABLE / sizeof (char *))
     return ACTIVITY_REQUIRED_TABLE[minor_code];
 
   CORBA::BAD_OPERATION const * bad_operation_exception =
     dynamic_cast <const CORBA::BAD_OPERATION *> (&exc);
-  if (bad_operation_exception != 0
+  if (bad_operation_exception != nullptr
       && minor_code < sizeof BAD_OPERATION_TABLE / sizeof (char *))
     return BAD_OPERATION_TABLE[minor_code];
 
   CORBA::BAD_CONTEXT const * bad_context_exception =
     dynamic_cast <const CORBA::BAD_CONTEXT *> (&exc);
-  if (bad_context_exception != 0
+  if (bad_context_exception != nullptr
       && minor_code < sizeof BAD_CONTEXT_TABLE / sizeof (char *))
     return BAD_CONTEXT_TABLE[minor_code];
 
   CORBA::CODESET_INCOMPATIBLE const * codeset_incompatible_exception =
     dynamic_cast <const CORBA::CODESET_INCOMPATIBLE *> (&exc);
-  if (codeset_incompatible_exception != 0
+  if (codeset_incompatible_exception != nullptr
       && minor_code < sizeof CODESET_INCOMPATIBLE_TABLE / sizeof (char *))
     return CODESET_INCOMPATIBLE_TABLE[minor_code];
 
   CORBA::INTF_REPOS const * intf_repos_exception =
     dynamic_cast <const CORBA::INTF_REPOS *> (&exc);
-  if (intf_repos_exception != 0
+  if (intf_repos_exception != nullptr
       && minor_code < sizeof INTF_REPOS_TABLE / sizeof (char *))
     return INTF_REPOS_TABLE[minor_code];
 
   CORBA::TIMEOUT const * timeout_exception =
     dynamic_cast <const CORBA::TIMEOUT *> (&exc);
-  if (timeout_exception != 0
+  if (timeout_exception != nullptr
       && minor_code < sizeof TIMEOUT_TABLE / sizeof (char *))
     return TIMEOUT_TABLE[minor_code];
 
@@ -893,7 +893,7 @@ static const char *repo_id_array[] = {
                   (char *) "IDL:omg.org/CORBA/" #name ":1.0",
       STANDARD_EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
-      0
+      nullptr
   };
 
 // Since we add an extra element subtract 1
@@ -907,7 +907,7 @@ TAO::excp_factory excp_array [] = {
       &CORBA::name::_tao_create,
       STANDARD_EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
-      0
+      nullptr
 };
 
 // Concrete SystemException constructors
@@ -963,7 +963,7 @@ TAO::create_system_exception (const char *id)
         return (*(excp_array[i])) ();
     }
 
-  return 0;
+  return nullptr;
 }
 
 #define TAO_SYSTEM_EXCEPTION(name) \
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 9a1da6ec170..f52e0414820 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -27,13 +27,9 @@
 #include "tao/Exception.h"
 
 #ifndef TAO_Exception_Export
-# if (__GNUC__ > 3)
-// Exceptions found in DLL A but potentially thrown in DLL B must
-// always be exported.
 #  define TAO_Exception_Export ACE_Proper_Export_Flag
 # else
 #  define TAO_Exception_Export TAO_Export
-# endif  /* __GNUC__ > 3*/
 #endif  /* !TAO_Exception_Export */
 
 #ifdef THREAD_CANCELLED
@@ -59,7 +55,7 @@ namespace CORBA
 
 namespace TAO
 {
-  typedef CORBA::SystemException* (*excp_factory)(void);
+  typedef CORBA::SystemException* (*excp_factory)();
 }
 
 namespace CORBA
@@ -103,16 +99,16 @@ namespace CORBA
     SystemException (const SystemException & src);
 
     /// Destructor.
-    virtual ~SystemException (void);
+    virtual ~SystemException ();
 
     /// Get the minor status.
-    ULong minor (void) const;
+    ULong minor () const;
 
     /// Set the minor status.
     void minor (ULong m);
 
     /// Get the completion status.
-    CORBA::CompletionStatus completed (void) const;
+    CORBA::CompletionStatus completed () const;
 
     /// Set the operation completion status.
     void completed (CORBA::CompletionStatus c);
@@ -123,7 +119,7 @@ namespace CORBA
     /// The const version of narrow operation to a SystemException
     static const SystemException *_downcast(const CORBA::Exception *exception);
 
-    virtual void _raise (void) const = 0;
+    virtual void _raise () const = 0;
 
     // = TAO-specific extension.
 
@@ -133,7 +129,7 @@ namespace CORBA
 
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
-    virtual ACE_CString _info (void) const;
+    virtual ACE_CString _info () const;
 
     virtual void _tao_encode (TAO_OutputCDR &cdr) const;
 
@@ -147,12 +143,12 @@ namespace CORBA
     static CORBA::ULong _tao_errno (int errno_value);
 
     /// Deep copy
-    virtual CORBA::Exception *_tao_duplicate (void) const;
+    virtual CORBA::Exception *_tao_duplicate () const;
 
   protected:
 
     /// Default constructor.
-    SystemException (void);
+    SystemException ();
 
     /// Assignment operator.
     SystemException & operator= (const SystemException &src);
diff --git a/TAO/tao/System_Time_Policy_Strategy.cpp b/TAO/tao/System_Time_Policy_Strategy.cpp
index 30255432059..7f72324b906 100644
--- a/TAO/tao/System_Time_Policy_Strategy.cpp
+++ b/TAO/tao/System_Time_Policy_Strategy.cpp
@@ -13,15 +13,15 @@ TAO_System_Time_Policy_Strategy::~TAO_System_Time_Policy_Strategy ()
 {
 }
 
-ACE_Timer_Queue * TAO_System_Time_Policy_Strategy::create_timer_queue (void)
+ACE_Timer_Queue * TAO_System_Time_Policy_Strategy::create_timer_queue ()
 {
-  ACE_Timer_Queue * tmq = 0;
+  ACE_Timer_Queue * tmq = nullptr;
 
   typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
                            ACE_Event_Handler_Handle_Timeout_Upcall,
                            ACE_SYNCH_RECURSIVE_MUTEX,
                            ACE_System_Time_Policy> timer_queue_type;
-  ACE_NEW_RETURN (tmq, timer_queue_type (), 0);
+  ACE_NEW_RETURN (tmq, timer_queue_type (), nullptr);
 
   return tmq;
 }
@@ -32,7 +32,7 @@ TAO_System_Time_Policy_Strategy::destroy_timer_queue (ACE_Timer_Queue *tmq)
   delete tmq;
 }
 
-ACE_Dynamic_Time_Policy_Base * TAO_System_Time_Policy_Strategy::get_time_policy (void)
+ACE_Dynamic_Time_Policy_Base * TAO_System_Time_Policy_Strategy::get_time_policy ()
 {
   return &time_policy_;
 }
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 9e324aec423..2bdb10bdcbe 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -191,13 +191,13 @@ class TAO_Ubergestalt_Ready_Condition
   : public ACE_SYNCH_RECURSIVE_CONDITION
 {
 public:
-  static TAO_Ubergestalt_Ready_Condition* instance (void)
+  static TAO_Ubergestalt_Ready_Condition* instance ()
   {
     return TAO_Singleton <TAO_Ubergestalt_Ready_Condition,
       TAO_SYNCH_RECURSIVE_MUTEX>::instance ();
   }
 
-  TAO_Ubergestalt_Ready_Condition (void)
+  TAO_Ubergestalt_Ready_Condition ()
     : ACE_SYNCH_RECURSIVE_CONDITION (mutex_)
   {
   }
@@ -260,7 +260,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv)
   // has something to skip!
   ACE_ARGV global_svc_config_argv (true); // only this ctor allows
   // subsequent use of add()!
-  global_svc_config_argv.add ((argc <= 0 || argv == 0) ?
+  global_svc_config_argv.add ((argc <= 0 || argv == nullptr) ?
             ACE_TEXT ("") : argv[0], true);
 
   // Will expand the environment variables, if any were used.
@@ -428,7 +428,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
   // has something to skip!
   ACE_ARGV svc_config_argv (true);  // only this ctor allows subsequent
                                     // use of add()!
-  svc_config_argv.add ((argc <= 0 || argv == 0) ? ACE_TEXT ("") : argv[0],
+  svc_config_argv.add ((argc <= 0 || argv == nullptr) ? ACE_TEXT ("") : argv[0],
                        true);
 
   // Should we skip the ACE_Service_Config::open() method?,
@@ -587,7 +587,7 @@ namespace
 
     return pcfg->open (command_line.get_argc (),
                        command_line.get_TCHAR_argv (),
-                       0,
+                       nullptr,
                        false, // Don't ignore static services.
                        ignore_default_svc_conf_file);
   }
@@ -606,7 +606,7 @@ namespace
           ACE_Dynamic_Service<TAO_Codeset_Manager_Factory_Base>::instance (
             "TAO_Codeset");
 
-        if (factory == 0 || factory->is_default ())
+        if (factory == nullptr || factory->is_default ())
           {
 #if !defined (TAO_AS_STATIC_LIBS) && !(defined (ACE_VXWORKS) && !defined (__RTP__))
             // only for dynamic libs, check to see if default factory
@@ -629,7 +629,7 @@ namespace
 #endif /* !TAO_AS_STATIC_LIBS && !(ACE_VXWORKS && !__RTP__) */
           }
 
-        if (factory == 0)
+        if (factory == nullptr)
           {
             if (TAO_debug_level > 0)
               {
@@ -703,19 +703,19 @@ namespace
     // @@ They are needed for platforms that have no file system,
     //    like VxWorks.
 
-    if (resource_factory_args != 0)
+    if (resource_factory_args != nullptr)
       {
         pcfg->process_directive(
           ACE_TEXT_CHAR_TO_TCHAR (resource_factory_args));
       }
 
-    if (client_strategy_factory_args != 0)
+    if (client_strategy_factory_args != nullptr)
       {
         pcfg->process_directive
           (ACE_TEXT_CHAR_TO_TCHAR (client_strategy_factory_args));
       }
 
-    if (server_strategy_factory_args != 0)
+    if (server_strategy_factory_args != nullptr)
       {
         pcfg->process_directive
           (ACE_TEXT_CHAR_TO_TCHAR (server_strategy_factory_args));
@@ -726,9 +726,9 @@ namespace
         pcfg,
         "PI_Server_Loader");
 
-    if (pi_server_loader != 0)
+    if (pi_server_loader != nullptr)
       {
-        pi_server_loader->init (0, 0);
+        pi_server_loader->init (0, nullptr);
       }
 
     ACE_Service_Object * const bidir_loader =
@@ -736,9 +736,9 @@ namespace
         pcfg,
         "BiDirGIOP_Loader");
 
-    if (bidir_loader != 0)
+    if (bidir_loader != nullptr)
       {
-        bidir_loader->init (0, 0);
+        bidir_loader->init (0, nullptr);
       }
 
 #if defined (TAO_HAS_ZIOP) && TAO_HAS_ZIOP == 1
@@ -747,9 +747,9 @@ namespace
         pcfg,
         "ZIOP_Loader");
 
-    if (ziop_loader != 0)
+    if (ziop_loader != nullptr)
       {
-        ziop_loader->init (0, 0);
+        ziop_loader->init (0, nullptr);
       }
 #endif
 
@@ -758,9 +758,9 @@ namespace
         pcfg,
         "Messaging_Loader");
 
-    if (messaging_loader != 0)
+    if (messaging_loader != nullptr)
       {
-        messaging_loader->init (0, 0);
+        messaging_loader->init (0, nullptr);
       }
 
     // Handle RTCORBA library special case.  Since RTCORBA needs
@@ -771,9 +771,9 @@ namespace
         pcfg,
         "RT_ORB_Loader");
 
-    if (rt_loader != 0)
+    if (rt_loader != nullptr)
       {
-        rt_loader->init (0, 0);
+        rt_loader->init (0, nullptr);
       }
 
     ACE_Service_Object * const rtscheduler_loader =
@@ -781,9 +781,9 @@ namespace
         pcfg,
         "RTScheduler_Loader");
 
-    if (rtscheduler_loader != 0)
+    if (rtscheduler_loader != nullptr)
       {
-        rtscheduler_loader->init (0, 0);
+        rtscheduler_loader->init (0, nullptr);
       }
 
     ACE_Service_Object * const csd_framework_loader =
@@ -791,9 +791,9 @@ namespace
         pcfg,
         "CSD_Framework_Loader");
 
-    if (csd_framework_loader != 0)
+    if (csd_framework_loader != nullptr)
       {
-        csd_framework_loader->init (0, 0);
+        csd_framework_loader->init (0, nullptr);
       }
 
     ACE_Service_Object * const endpoint_policy_loader =
@@ -801,9 +801,9 @@ namespace
         pcfg,
         "EndpointPolicy_Initializer");
 
-    if (endpoint_policy_loader != 0)
+    if (endpoint_policy_loader != nullptr)
       {
-        endpoint_policy_loader->init (0, 0);
+        endpoint_policy_loader->init (0, nullptr);
       }
 
     ACE_Service_Object * const diffserv_policy_loader =
@@ -811,9 +811,9 @@ namespace
         pcfg,
         "DiffservPolicy_Initializer");
 
-    if (diffserv_policy_loader != 0)
+    if (diffserv_policy_loader != nullptr)
       {
-        diffserv_policy_loader->init (0, 0);
+        diffserv_policy_loader->init (0, nullptr);
       }
   } /* register_additional_services_i */
 
@@ -838,7 +838,7 @@ namespace
             // Proceeds only if the configuration file exists.
             FILE * const conf_file =
               ACE_OS::fopen (current_arg, ACE_TEXT ("r"));
-            if (0 == conf_file)
+            if (nullptr == conf_file)
               {
                 // Assigning EINVAL to errno to make an exception
                 // thrown.  calling code does not throw an exception if
@@ -898,7 +898,7 @@ namespace
 
     while (arg_shifter.is_anything_left ())
       {
-        const ACE_TCHAR *current_arg = 0;
+        const ACE_TCHAR *current_arg = nullptr;
         if (0 == arg_shifter.cur_arg_strncasecmp
             (ACE_TEXT ("-ORBSkipServiceConfigOpen")))
           {
@@ -913,7 +913,7 @@ namespace
 
             arg_shifter.consume_arg ();
           }
-        else if (0 != (current_arg = arg_shifter.get_the_parameter
+        else if (nullptr != (current_arg = arg_shifter.get_the_parameter
                        (ACE_TEXT ("-ORBServiceConfigLoggerKey"))))
           {
             svc_config_argv.add (ACE_TEXT ("-k"));
@@ -930,12 +930,12 @@ namespace
             // Don't consume, the ORB_Core::init will use it again.
             arg_shifter.ignore_arg();
 
-            if (0 != (current_arg = arg_shifter.get_current()))
+            if (nullptr != (current_arg = arg_shifter.get_current()))
               negotiate_codesets = (ACE_OS::atoi (current_arg));
 
             arg_shifter.ignore_arg();
           }
-        else if (0 != (current_arg =
+        else if (nullptr != (current_arg =
                        arg_shifter.get_the_parameter
                        (ACE_TEXT ("-ORBDebugLevel"))))
           {
@@ -1044,7 +1044,7 @@ namespace
             // This should set current_arg to the value of ORBGestalt option.
             const ACE_TCHAR *current_arg = arg_shifter.get_current ();
 
-            if (0 != current_arg &&
+            if (nullptr != current_arg &&
                 ACE_OS::strcasecmp (current_arg, ACE_TEXT("GLOBAL")) != 0)
               {
                 with_global_gestalt = false;
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 81c8828191f..52578239720 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -49,7 +49,7 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
                                       TAO_Transport *transport,
                                       TAO_ORB_Core *orb_core)
   : mesg_base_ (mesg_base),
-    operation_ (0),
+    operation_ (nullptr),
     operation_len_ (0),
     release_operation_ (false),
     is_forwarded_ (false),
@@ -65,14 +65,14 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
     orb_core_ (orb_core),
     request_id_ (0),
     profile_ (orb_core),
-    requesting_principal_ (0),
+    requesting_principal_ (nullptr),
     dsi_nvlist_align_ (0),
-    operation_details_ (0),
+    operation_details_ (nullptr),
     argument_flag_ (true)
 #if TAO_HAS_INTERCEPTORS == 1
     , interceptor_count_ (0)
-    , rs_pi_current_ (0)
-    , caught_exception_ (0)
+    , rs_pi_current_ (nullptr)
+    , caught_exception_ (nullptr)
     , pi_reply_status_ (-1)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
     , transport_(transport) //already duplicated in TAO_Transport::process_parsed_messages ()
@@ -94,10 +94,10 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
                                       int &parse_error)
   : mesg_base_ (mesg_base),
     operation_ (CORBA::string_dup (operation)),
-    operation_len_ (operation == 0 ? 0 : ACE_OS::strlen (operation)),
+    operation_len_ (operation == nullptr ? 0 : ACE_OS::strlen (operation)),
     release_operation_ (true),
     is_forwarded_ (false),
-    incoming_ (0),
+    incoming_ (nullptr),
     outgoing_ (&output),
     response_expected_ (response_expected),
     deferred_reply_ (deferred_reply),
@@ -108,14 +108,14 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
     orb_core_ (orb_core),
     request_id_ (request_id),
     profile_ (orb_core),
-    requesting_principal_ (0),
+    requesting_principal_ (nullptr),
     dsi_nvlist_align_ (0),
-    operation_details_ (0),
+    operation_details_ (nullptr),
     argument_flag_ (true)
 #if TAO_HAS_INTERCEPTORS == 1
   , interceptor_count_ (0)
-  , rs_pi_current_ (0)
-  , caught_exception_ (0)
+  , rs_pi_current_ (nullptr)
+  , caught_exception_ (nullptr)
   , pi_reply_status_ (-1)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
   , transport_(transport) //already duplicated in TAO_Transport::process_parsed_messages ()
@@ -128,13 +128,13 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
 TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
                                       TAO_Operation_Details const & details,
                                       CORBA::Object_ptr target)
-  : mesg_base_ (0),
+  : mesg_base_ (nullptr),
     operation_ (details.opname ()),
     operation_len_ (details.opname_len ()),
     release_operation_ (false),
     is_forwarded_ (false),
-    incoming_ (0),
-    outgoing_ (0),
+    incoming_ (nullptr),
+    outgoing_ (nullptr),
     response_expected_ (details.response_flags () == TAO_TWOWAY_RESPONSE_FLAG
                         || details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_SERVER)
                         || details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_TARGET)),
@@ -146,17 +146,17 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
     orb_core_ (orb_core),
     request_id_ (0),
     profile_ (orb_core),
-    requesting_principal_ (0),
+    requesting_principal_ (nullptr),
     dsi_nvlist_align_ (0),
     operation_details_ (&details),
     argument_flag_ (false)
 #if TAO_HAS_INTERCEPTORS == 1
   , interceptor_count_ (0)
-  , rs_pi_current_ (0)
-  , caught_exception_ (0)
+  , rs_pi_current_ (nullptr)
+  , caught_exception_ (nullptr)
   , pi_reply_status_ (-1)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  , transport_ (0)
+  , transport_ (nullptr)
 {
   // Have to use a const_cast<>.  *sigh*
   this->profile_.object_key (
@@ -180,7 +180,7 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
   // then the operation details don't get the reply service context
 }
 
-TAO_ServerRequest::~TAO_ServerRequest (void)
+TAO_ServerRequest::~TAO_ServerRequest ()
 {
 #if TAO_HAS_INTERCEPTORS == 1
   if (this->rs_pi_current_)
@@ -200,13 +200,13 @@ TAO_ServerRequest::~TAO_ServerRequest (void)
 }
 
 CORBA::ORB_ptr
-TAO_ServerRequest::orb (void)
+TAO_ServerRequest::orb ()
 {
   return this->orb_core_->orb ();
 }
 
 TAO_Service_Context &
-TAO_ServerRequest::reply_service_context (void)
+TAO_ServerRequest::reply_service_context ()
 {
   if (!operation_details_)
     {
@@ -221,7 +221,7 @@ TAO_ServerRequest::reply_service_context (void)
 
 
 void
-TAO_ServerRequest::init_reply (void)
+TAO_ServerRequest::init_reply ()
 {
   if (!this->outgoing_)
     return;  // Collocated
@@ -266,9 +266,9 @@ TAO_ServerRequest::init_reply (void)
     }
 
   this->outgoing_->message_attributes (this->request_id_,
-                                       0,
+                                       nullptr,
                                        TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY),
-                                       0);
+                                       nullptr);
 
   // Construct a REPLY header.
   this->mesg_base_->generate_reply_header (*this->outgoing_, reply_params);
@@ -288,11 +288,11 @@ TAO_ServerRequest::init_reply (void)
                       ACE_TEXT ("marshal encoding forwarded objref failed\n")));
         }
     }
-  this->transport_->assign_translators (0, this->outgoing_);
+  this->transport_->assign_translators (nullptr, this->outgoing_);
 }
 
 void
-TAO_ServerRequest::send_no_exception_reply (void)
+TAO_ServerRequest::send_no_exception_reply ()
 {
   // Construct our reply generator.
   TAO_Pluggable_Reply_Params_Base reply_params;
@@ -313,9 +313,9 @@ TAO_ServerRequest::send_no_exception_reply (void)
   reply_params.argument_flag_ = false;
 
   this->outgoing_->message_attributes (this->request_id_,
-                                       0,
+                                       nullptr,
                                        TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY),
-                                       0);
+                                       nullptr);
 
   // Construct a REPLY header.
   this->mesg_base_->generate_reply_header (*this->outgoing_, reply_params);
@@ -324,7 +324,7 @@ TAO_ServerRequest::send_no_exception_reply (void)
 
   // Send the message.
   int const result = this->transport_->send_message (*this->outgoing_,
-                                                     0,
+                                                     nullptr,
                                                      this,
                                                      TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
 
@@ -344,7 +344,7 @@ TAO_ServerRequest::send_no_exception_reply (void)
 }
 
 void
-TAO_ServerRequest::tao_send_reply (void)
+TAO_ServerRequest::tao_send_reply ()
 {
   if (this->collocated ())
     return;  // No transport in the collocated case.
@@ -352,7 +352,7 @@ TAO_ServerRequest::tao_send_reply (void)
   this->outgoing_->more_fragments (false);
 
   int const result = this->transport_->send_message (*this->outgoing_,
-                                                     0,
+                                                     nullptr,
                                                      this,
                                                      TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
   if (result == -1)
@@ -388,7 +388,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex)
       // Make a default reply status
 
       // Check whether we are able to downcast the exception
-      if (CORBA::SystemException::_downcast (&ex) != 0)
+      if (CORBA::SystemException::_downcast (&ex) != nullptr)
         {
           reply_params.reply_status (GIOP::SYSTEM_EXCEPTION);
         }
@@ -422,7 +422,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex)
                             gv.major,
                             gv.minor);
 
-      this->transport_->assign_translators (0, &output);
+      this->transport_->assign_translators (nullptr, &output);
 
       try
         {
@@ -441,7 +441,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex)
 
           // Send the message
           if (this->transport_->send_message (*this->outgoing_,
-                                              0,
+                                              nullptr,
                                               this,
                                               TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1)
             {
@@ -503,7 +503,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
                         gv.major,
                         gv.minor);
 
-  this->transport_->assign_translators (0, &output);
+  this->transport_->assign_translators (nullptr, &output);
 
   // A copy of the reply parameters
   TAO_Pluggable_Reply_Params_Base reply_params;
@@ -522,9 +522,9 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
   reply_params.reply_status (GIOP::NO_EXCEPTION);
 
   this->outgoing_->message_attributes (this->request_id_,
-                                       0,
+                                       nullptr,
                                        TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY),
-                                       0);
+                                       nullptr);
 
   // Make the reply message
   if (this->mesg_base_->generate_reply_header (*this->outgoing_,
@@ -552,7 +552,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
 
   // Send the message
   if (this->transport_->send_message (*this->outgoing_,
-                                      0,
+                                      nullptr,
                                       this,
                                       TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1)
     {
@@ -565,16 +565,16 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
 void
 TAO_ServerRequest::caught_exception (CORBA::Exception *exception)
 {
-  if (CORBA::SystemException::_downcast (exception) != 0)
+  if (CORBA::SystemException::_downcast (exception) != nullptr)
     this->pi_reply_status_ = PortableInterceptor::SYSTEM_EXCEPTION;
-  else if (CORBA::UserException::_downcast (exception) != 0)
+  else if (CORBA::UserException::_downcast (exception) != nullptr)
     this->pi_reply_status_ = PortableInterceptor::USER_EXCEPTION;
 
   this->caught_exception_ = exception;
 }
 
 TAO::PICurrent_Impl *
-TAO_ServerRequest::rs_pi_current (void)
+TAO_ServerRequest::rs_pi_current ()
 {
   if (!this->rs_pi_current_)
     {
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 0c0b15fd96a..db1720972d3 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -125,79 +125,79 @@ public:
                      CORBA::Object_ptr target);
 
   /// Destructor.
-  ~TAO_ServerRequest (void);
+  ~TAO_ServerRequest ();
 
   /**
    * @name Request attributes.
    */
   //@{
   /// Return the operation name.
-  const char *operation (void) const;
+  const char *operation () const;
 
   /// Set the operation name.
   void operation (const char *operation, size_t length, int release);
 
   /// Return the length of the operation.
-  size_t operation_length (void) const;
+  size_t operation_length () const;
   //@}
 
   /// Return the underlying ORB.
-  CORBA::ORB_ptr orb (void);
+  CORBA::ORB_ptr orb ();
 
   /// Return the ORB core pointer member.
-  TAO_ORB_Core *orb_core (void) const;
+  TAO_ORB_Core *orb_core () const;
 
   /// Start a Reply message.
-  void init_reply (void);
+  void init_reply ();
 
   /// Retrieve the incoming stream.
-  TAO_InputCDR * incoming (void) const;
+  TAO_InputCDR * incoming () const;
 
   /// Retrieve the outgoing stream.
-  TAO_OutputCDR * outgoing (void) const;
+  TAO_OutputCDR * outgoing () const;
 
   /// Is the response expected?
-  CORBA::Boolean response_expected (void) const;
+  CORBA::Boolean response_expected () const;
 
   /// Should the reply be deferred?
-  CORBA::Boolean deferred_reply (void) const;
+  CORBA::Boolean deferred_reply () const;
 
   /// Set the response expected flag.
   void response_expected (CORBA::Boolean response);
 
   /// Should we return before dispatching the servant?
-  CORBA::Boolean sync_with_server (void) const;
+  CORBA::Boolean sync_with_server () const;
 
   /// Set the sync_with_server flag.
   void sync_with_server (CORBA::Boolean sync_flag);
 
   /// Is the request at risk of being queued?
-  CORBA::Boolean is_queued (void) const;
+  CORBA::Boolean is_queued () const;
 
   /// Set the queued flag.
   void is_queued (CORBA::Boolean qeueued_flag);
 
   /// Send a sync reply if needed after _dispatch is called
-  void sync_after_dispatch (void);
+  void sync_after_dispatch ();
 
   /// Send a sync reply if needed before _dispatch is called to avoid
   /// possible queuing first.
-  void sync_before_dispatch (void);
+  void sync_before_dispatch ();
 
   /// Used with reliable oneway requests.
-  void send_no_exception_reply (void);
+  void send_no_exception_reply ();
 
-  TAO::ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key ();
 
   /// Return the request TAO_Service_Context
-  TAO_Service_Context &request_service_context (void);
+  TAO_Service_Context &request_service_context ();
 
   /// Return the reply TAO_Service_Context
-  TAO_Service_Context &reply_service_context (void);
+  TAO_Service_Context &reply_service_context ();
 
-  IOP::ServiceContextList &reply_service_info (void);
+  IOP::ServiceContextList &reply_service_info ();
 
-  IOP::ServiceContextList &request_service_info (void);
+  IOP::ServiceContextList &request_service_info ();
 
   /// Return the underlying transport
   TAO_Transport *transport ();
@@ -205,7 +205,7 @@ public:
   /// To handle System Exceptions at the lowest level, a method
   /// returning the request_id_ is needed.
   //@{
-  CORBA::ULong request_id (void);
+  CORBA::ULong request_id ();
   void request_id (CORBA::ULong req);
   //@}
 
@@ -217,16 +217,16 @@ public:
   void forward_location (CORBA::Object_ptr forward_reference);
 
   /// Get the forward_location.
-  CORBA::Object_ptr forward_location (void);
+  CORBA::Object_ptr forward_location ();
 
   /**
    * Since forward location is allowed to be nil then this is a proper
    * method to check if the request is being forwarded.
    */
-  bool is_forwarded (void) const;
+  bool is_forwarded () const;
 
   /// Get the reply status
-  GIOP::ReplyStatusType reply_status (void);
+  GIOP::ReplyStatusType reply_status ();
 
   /// Set the reply status
   void reply_status (GIOP::ReplyStatusType except_type);
@@ -235,29 +235,29 @@ public:
   void requesting_principal (const CORBA::OctetSeq & principal);
 
   /// Return the reference to the tagged profile
-  TAO_Tagged_Profile &profile (void);
+  TAO_Tagged_Profile &profile ();
 
-  void tao_send_reply (void);
+  void tao_send_reply ();
 
   void tao_send_reply_exception (const CORBA::Exception& ex);
 
   /// Set the boolean member to true.
-  void is_dsi (void);
+  void is_dsi ();
 
   /// Set the member.
   void dsi_nvlist_align (ptrdiff_t alignment);
 
   /// Get the operation details for the current request.
-  TAO_Operation_Details const * operation_details (void) const;
+  TAO_Operation_Details const * operation_details () const;
 
   /// Set the argument_flag
   void argument_flag (CORBA::Boolean flag);
 
   /// Get the argument_flag
-  CORBA::Boolean argument_flag (void);
+  CORBA::Boolean argument_flag ();
 
   /// Returns @c true if the current request is collocated.
-  bool collocated (void) const;
+  bool collocated () const;
 
 #if TAO_HAS_INTERCEPTORS == 1
   /// Send cached reply. Used in scenarios where the FTORB thinks that
@@ -271,12 +271,12 @@ public:
    *       code must be able to modify this value and use that value
    *       at a later time without being forced to use TSS.
    */
-  size_t & interceptor_count (void);
+  size_t & interceptor_count ();
 
   /// Return a reference to the "request scope" PICurrent object.
-  TAO::PICurrent_Impl *rs_pi_current (void);
+  TAO::PICurrent_Impl *rs_pi_current ();
 
-  CORBA::Exception *caught_exception (void);
+  CORBA::Exception *caught_exception ();
 
   void caught_exception (CORBA::Exception *exception);
 
@@ -284,7 +284,7 @@ public:
   void pi_reply_status (PortableInterceptor::ReplyStatus s);
 
   /// Get the status of the received reply.
-  PortableInterceptor::ReplyStatus pi_reply_status (void);
+  PortableInterceptor::ReplyStatus pi_reply_status ();
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if TAO_HAS_ZIOP == 1
@@ -297,7 +297,7 @@ public:
 private:
   /// Default ctor only used to create a TAO_ServerRequest that is about
   /// to be the target of a clone operation.
-  TAO_ServerRequest (void);
+  TAO_ServerRequest ();
 
   TAO_GIOP_Message_Base *mesg_base_;
 
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index c928a30d204..60ca39a7d95 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -13,7 +13,7 @@
 namespace
 {
   // Singleton instance pointer.
-  TAO_Singleton_Manager * the_instance = 0;
+  TAO_Singleton_Manager * the_instance = nullptr;
 }
 
 #if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
@@ -38,9 +38,9 @@ TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *)
 }
 
 #if (ACE_HAS_GCC_DESTRUCTOR_ATTRIBUTE == 1)
-static void TAO_SINGLETON_MANAGER_FINI_NAME (void) ACE_GCC_DESTRUCTOR_ATTRIBUTE;
+static void TAO_SINGLETON_MANAGER_FINI_NAME () ACE_GCC_DESTRUCTOR_ATTRIBUTE;
 
-void TAO_SINGLETON_MANAGER_FINI_NAME (void)
+void TAO_SINGLETON_MANAGER_FINI_NAME ()
 {
 #if defined (TAO_HAS_VERSIONED_NAMESPACE) \
     && TAO_HAS_VERSIONED_NAMESPACE == 1
@@ -55,13 +55,13 @@ void TAO_SINGLETON_MANAGER_FINI_NAME (void)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Singleton_Manager::TAO_Singleton_Manager (void)
-  : default_mask_ (0),
-    thread_hook_ (0),
+TAO_Singleton_Manager::TAO_Singleton_Manager ()
+  : default_mask_ (nullptr),
+    thread_hook_ (nullptr),
     exit_info_ (),
     registered_with_object_manager_ (-1)
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    , internal_lock_ (0)
+    , internal_lock_ (nullptr)
 # endif /* ACE_MT_SAFE */
 {
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
@@ -69,7 +69,7 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void)
            TAO_SYNCH_RECURSIVE_MUTEX);
 # endif /* ACE_MT_SAFE */
   // Be sure that no further instances are created via instance ().
-  if (the_instance == 0)
+  if (the_instance == nullptr)
     {
       the_instance = this;
     }
@@ -82,25 +82,25 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void)
   (void) this->init (register_with_object_manager);
 }
 
-TAO_Singleton_Manager::~TAO_Singleton_Manager (void)
+TAO_Singleton_Manager::~TAO_Singleton_Manager ()
 {
   this->dynamically_allocated_ = false;   // Don't delete this again in fini()
   (void) this->fini ();
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   delete this->internal_lock_;
-  this->internal_lock_ = 0;
+  this->internal_lock_ = nullptr;
 #endif /* ACE_MT_SAFE */
 }
 
 sigset_t *
-TAO_Singleton_Manager::default_mask (void)
+TAO_Singleton_Manager::default_mask ()
 {
   return TAO_Singleton_Manager::instance ()->default_mask_;
 }
 
 ACE_Thread_Hook *
-TAO_Singleton_Manager::thread_hook (void)
+TAO_Singleton_Manager::thread_hook ()
 {
   return TAO_Singleton_Manager::instance ()->thread_hook_;
 }
@@ -115,18 +115,18 @@ TAO_Singleton_Manager::thread_hook (ACE_Thread_Hook *new_thread_hook)
 }
 
 TAO_Singleton_Manager *
-TAO_Singleton_Manager::instance (void)
+TAO_Singleton_Manager::instance ()
 {
   // This function should be called during construction of static
   // instances, or before any other threads have been created in the
   // process.  So, it's not thread safe.
-  if (the_instance == 0)
+  if (the_instance == nullptr)
     {
-      TAO_Singleton_Manager *instance_pointer = 0;
+      TAO_Singleton_Manager *instance_pointer = nullptr;
 
       ACE_NEW_RETURN (instance_pointer,
                       TAO_Singleton_Manager,
-                      0);
+                      nullptr);
       ACE_ASSERT (instance_pointer == the_instance);
 
       instance_pointer->dynamically_allocated_ = true;
@@ -140,7 +140,7 @@ TAO_Singleton_Manager::instance (void)
 }
 
 int
-TAO_Singleton_Manager::init (void)
+TAO_Singleton_Manager::init ()
 {
   if (this->registered_with_object_manager_ == -1)
     {
@@ -203,7 +203,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager)
           && ACE_Object_Manager::at_exit (
                this,
                (ACE_CLEANUP_FUNC) TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME,
-               0,
+               nullptr,
                typeid (*this).name ()) != 0)
         return -1;
 
@@ -219,9 +219,9 @@ TAO_Singleton_Manager::init (int register_with_object_manager)
 // reason.  All objects clean up their per-object information and managed
 // objects, but only The Instance cleans up the static preallocated objects.
 int
-TAO_Singleton_Manager::fini (void)
+TAO_Singleton_Manager::fini ()
 {
-  if (the_instance == 0  ||  this->shutting_down_i ())
+  if (the_instance == nullptr  ||  this->shutting_down_i ())
     {
       // Too late.  Or, maybe too early.  Either fini () has already
       // been called, or init () was never called.
@@ -240,7 +240,7 @@ TAO_Singleton_Manager::fini (void)
   if (this->next_)
     {
       this->next_->fini ();
-      this->next_ = 0;  // Protect against recursive calls.
+      this->next_ = nullptr;  // Protect against recursive calls.
     }
 
   // Call all registered cleanup hooks, in reverse order of
@@ -254,13 +254,13 @@ TAO_Singleton_Manager::fini (void)
     }
 
   delete this->default_mask_;
-  this->default_mask_ = 0;
+  this->default_mask_ = nullptr;
 
   // Indicate that this TAO_Singleton_Manager instance has been shut down.
   this->object_manager_state_ = OBJ_MAN_SHUT_DOWN;
 
   if (this == the_instance)
-    the_instance = 0;
+    the_instance = nullptr;
 
   if (this->dynamically_allocated_)
     {
@@ -271,7 +271,7 @@ TAO_Singleton_Manager::fini (void)
 }
 
 int
-TAO_Singleton_Manager::starting_up (void)
+TAO_Singleton_Manager::starting_up ()
 {
   return
     the_instance
@@ -280,7 +280,7 @@ TAO_Singleton_Manager::starting_up (void)
 }
 
 int
-TAO_Singleton_Manager::shutting_down (void)
+TAO_Singleton_Manager::shutting_down ()
 {
   return
     the_instance
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index 54a4460b858..5f1cc3274fc 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -125,12 +125,10 @@ protected:
   //@}
 
 private:
-
-  /// Disallow copying by not implementing the following ...
-  //@{
-  TAO_Singleton_Manager (const TAO_Singleton_Manager &);
-  TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &);
-  //@}
+  TAO_Singleton_Manager (const TAO_Singleton_Manager &) = delete;
+  TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &) = delete;
+  TAO_Singleton_Manager (TAO_Singleton_Manager &&) = delete;
+  TAO_Singleton_Manager &operator= (TAO_Singleton_Manager &&) = delete;
 
   /// Register an object or array for deletion at program termination.
   /// See description of static version above for return values.
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index 9f1d44141a6..2e13d8d2271 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -4,10 +4,10 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_TSS_Resources::TAO_TSS_Resources (void)
-  : poa_current_impl_ (0)
-  , rtscheduler_current_impl_ (0)
-  , rtscheduler_previous_current_impl_ (0)
+TAO_TSS_Resources::TAO_TSS_Resources ()
+  : poa_current_impl_ (nullptr)
+  , rtscheduler_current_impl_ (nullptr)
+  , rtscheduler_previous_current_impl_ (nullptr)
   , rtcorba_current_priority_ (-1) // RTCORBA::minPriority - 1
   , default_environment_ (&tss_environment_)
 
@@ -16,20 +16,20 @@ TAO_TSS_Resources::TAO_TSS_Resources (void)
   , policy_current_ (&initial_policy_current_)
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-  , gui_resource_factory_ (0)
+  , gui_resource_factory_ (nullptr)
 #if (TAO_HAS_TRANSPORT_CURRENT == 1)
-  , tsg_ (0)
+  , tsg_ (nullptr)
 #endif /* TAO_HAS_TRANSPORT_CURRENT */
 {
 }
 
-TAO_TSS_Resources::~TAO_TSS_Resources (void)
+TAO_TSS_Resources::~TAO_TSS_Resources ()
 {
   delete this->gui_resource_factory_;
 }
 
 TAO_TSS_Resources *
-TAO_TSS_Resources::instance (void)
+TAO_TSS_Resources::instance ()
 {
   // Hide the template instantiation to prevent multiple instances
   // from being created.
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index 3339d41b47a..645a612fe9c 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -47,13 +47,13 @@ class TAO_Export TAO_TSS_Resources
 public:
 
   /// Constructor
-  TAO_TSS_Resources (void);
+  TAO_TSS_Resources ();
 
   /// Destructor
-  ~TAO_TSS_Resources (void);
+  ~TAO_TSS_Resources ();
 
   /// Return a singleton instance of this class.
-  static TAO_TSS_Resources * instance (void);
+  static TAO_TSS_Resources * instance ();
 
 private:
 
diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
index b95b4a0cae9..a93161ce9fe 100644
--- a/TAO/tao/Tagged_Components.cpp
+++ b/TAO/tao/Tagged_Components.cpp
@@ -77,7 +77,7 @@ TAO_Tagged_Components::set_component_i (IOP::ComponentId tag,
   CORBA::Octet *buf = component.component_data.get_buffer ();
 
   for (const ACE_Message_Block *i = cdr.begin ();
-       i != 0;
+       i != nullptr;
        i = i->cont ())
     {
       ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
index aab03fea27d..89c4e2ac87d 100644
--- a/TAO/tao/Tagged_Components.h
+++ b/TAO/tao/Tagged_Components.h
@@ -56,7 +56,7 @@ class TAO_Export TAO_Tagged_Components
 {
 public:
   /// Constructor
-  TAO_Tagged_Components (void);
+  TAO_Tagged_Components ();
 
   // = Standard OMG that require fast access.
   /// The the IOP::TAG_ORB_TYPE component value
@@ -113,7 +113,7 @@ public:
    * MutipleComponentProfile. Added by request from Chris Hafey
    * <chris@stentorsoft.com>
    */
-  IOP::MultipleComponentProfile &components (void);
+  IOP::MultipleComponentProfile &components ();
 
 private:
   /// Helper method to implement set_code_sets()
diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
index d205ead432e..0b41fc1ec9c 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -58,27 +58,27 @@ public:
   CORBA::Boolean unmarshall_object_key (TAO_InputCDR &cdr);
 
   /// Return the object key
-  TAO::ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key ();
 
   /// Save the object key
   void object_key (TAO::ObjectKey &object_key);
 
   /// Return a const object key
-  const TAO::ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key () const;
 
   /// Get the tagged_profile
-  const IOP::TaggedProfile &tagged_profile (void) const;
+  const IOP::TaggedProfile &tagged_profile () const;
 
   /// Get the profile index, that needs to be used in the
   /// sequnce of TaggedProfiles contained  IOP::IOR that is
   /// received from the client.
-  CORBA::ULong profile_index (void) const;
+  CORBA::ULong profile_index () const;
 
   /// Accessor to the type_id contained in the IOP::IOR received from
   /// the client.
-  const char* type_id (void) const;
+  const char* type_id () const;
 
-  CORBA::Short discriminator (void) const;
+  CORBA::Short discriminator () const;
 
 private:
   /// Extract the object key from the TaggedProfile and store it in
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index edd83b85c5f..32bc8c072df 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -18,20 +18,20 @@ TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (
     TAO_ORB_Core &orb_core,
     TAO_New_Leader_Generator *new_leader_generator)
   : orb_core_ (orb_core),
-    acceptor_registry_ (0),
-    connector_registry_ (0),
-    transport_cache_ (0),
-    leader_follower_ (0),
+    acceptor_registry_ (nullptr),
+    connector_registry_ (nullptr),
+    transport_cache_ (nullptr),
+    leader_follower_ (nullptr),
     new_leader_generator_ (new_leader_generator),
-    input_cdr_dblock_allocator_ (0),
-    input_cdr_buffer_allocator_ (0),
-    input_cdr_msgblock_allocator_ (0),
-    transport_message_buffer_allocator_ (0),
-    output_cdr_dblock_allocator_ (0),
-    output_cdr_buffer_allocator_ (0),
-    output_cdr_msgblock_allocator_ (0),
-    amh_response_handler_allocator_ (0),
-    ami_response_handler_allocator_ (0)
+    input_cdr_dblock_allocator_ (nullptr),
+    input_cdr_buffer_allocator_ (nullptr),
+    input_cdr_msgblock_allocator_ (nullptr),
+    transport_message_buffer_allocator_ (nullptr),
+    output_cdr_dblock_allocator_ (nullptr),
+    output_cdr_buffer_allocator_ (nullptr),
+    output_cdr_msgblock_allocator_ (nullptr),
+    amh_response_handler_allocator_ (nullptr),
+    ami_response_handler_allocator_ (nullptr)
 {
   // Create the transport cache.
   ACE_NEW (this->transport_cache_,
@@ -43,20 +43,20 @@ TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (
             orb_core.orbid ()));
 }
 
-TAO_Thread_Lane_Resources::~TAO_Thread_Lane_Resources (void)
+TAO_Thread_Lane_Resources::~TAO_Thread_Lane_Resources ()
 {
 }
 
 TAO::Transport_Cache_Manager &
-TAO_Thread_Lane_Resources::transport_cache (void)
+TAO_Thread_Lane_Resources::transport_cache ()
 {
   return *this->transport_cache_;
 }
 
 int
-TAO_Thread_Lane_Resources::has_acceptor_registry_been_created (void) const
+TAO_Thread_Lane_Resources::has_acceptor_registry_been_created () const
 {
-  return this->acceptor_registry_ != 0;
+  return this->acceptor_registry_ != nullptr;
 }
 
 int
@@ -71,10 +71,10 @@ TAO_Thread_Lane_Resources::is_collocated (const TAO_MProfile& mprofile)
 }
 
 TAO_Acceptor_Registry &
-TAO_Thread_Lane_Resources::acceptor_registry (void)
+TAO_Thread_Lane_Resources::acceptor_registry ()
 {
   // Double check.
-  if (this->acceptor_registry_ == 0)
+  if (this->acceptor_registry_ == nullptr)
     {
       // @todo: Wouldnt this crash big time if you happen to
       // dereference a null-pointer? Needs fixing.
@@ -83,7 +83,7 @@ TAO_Thread_Lane_Resources::acceptor_registry (void)
                         this->lock_,
                         *this->acceptor_registry_);
 
-      if (this->acceptor_registry_ == 0)
+      if (this->acceptor_registry_ == nullptr)
         {
           // @@ Not exception safe code
           // Get the resource factory.
@@ -100,23 +100,23 @@ TAO_Thread_Lane_Resources::acceptor_registry (void)
 }
 
 TAO_Connector_Registry *
-TAO_Thread_Lane_Resources::connector_registry (void)
+TAO_Thread_Lane_Resources::connector_registry ()
 {
   // Double check.
-  if (this->connector_registry_ == 0)
+  if (this->connector_registry_ == nullptr)
     {
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         ace_mon,
                         this->lock_,
-                        0);
+                        nullptr);
 
-      if (this->connector_registry_ == 0)
+      if (this->connector_registry_ == nullptr)
         {
           // Ask it to create a new acceptor registry.
           TAO_Connector_Registry *connector_registry =
             this->orb_core_.resource_factory ()->get_connector_registry ();
 
-          if (connector_registry == 0)
+          if (connector_registry == nullptr)
             {
               throw ::CORBA::INITIALIZE (
                 CORBA::SystemException::_tao_minor_code (
@@ -146,17 +146,17 @@ TAO_Thread_Lane_Resources::connector_registry (void)
 
 
 TAO_Leader_Follower &
-TAO_Thread_Lane_Resources::leader_follower (void)
+TAO_Thread_Lane_Resources::leader_follower ()
 {
   // Double check.
-  if (this->leader_follower_ == 0)
+  if (this->leader_follower_ == nullptr)
     {
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         ace_mon,
                         this->lock_,
                         *this->leader_follower_);
 
-      if (this->leader_follower_ == 0)
+      if (this->leader_follower_ == nullptr)
         {
           // Create a new Leader Follower object.
           ACE_NEW_RETURN (this->leader_follower_,
@@ -171,14 +171,14 @@ TAO_Thread_Lane_Resources::leader_follower (void)
 
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::input_cdr_dblock_allocator (void)
+TAO_Thread_Lane_Resources::input_cdr_dblock_allocator ()
 {
-  if (this->input_cdr_dblock_allocator_ == 0)
+  if (this->input_cdr_dblock_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->input_cdr_dblock_allocator_ == 0)
+      if (this->input_cdr_dblock_allocator_ == nullptr)
         {
           this->input_cdr_dblock_allocator_ =
             this->resource_factory ()->input_cdr_dblock_allocator ();
@@ -190,14 +190,14 @@ TAO_Thread_Lane_Resources::input_cdr_dblock_allocator (void)
 
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::input_cdr_buffer_allocator (void)
+TAO_Thread_Lane_Resources::input_cdr_buffer_allocator ()
 {
-  if (this->input_cdr_buffer_allocator_ == 0)
+  if (this->input_cdr_buffer_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->input_cdr_buffer_allocator_ == 0)
+      if (this->input_cdr_buffer_allocator_ == nullptr)
         {
           this->input_cdr_buffer_allocator_ =
             this->resource_factory ()->input_cdr_buffer_allocator ();
@@ -209,14 +209,14 @@ TAO_Thread_Lane_Resources::input_cdr_buffer_allocator (void)
 
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::input_cdr_msgblock_allocator (void)
+TAO_Thread_Lane_Resources::input_cdr_msgblock_allocator ()
 {
-  if (this->input_cdr_msgblock_allocator_ == 0)
+  if (this->input_cdr_msgblock_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->input_cdr_msgblock_allocator_ == 0)
+      if (this->input_cdr_msgblock_allocator_ == nullptr)
         {
           this->input_cdr_msgblock_allocator_ =
             this->resource_factory ()->input_cdr_msgblock_allocator ();
@@ -227,14 +227,14 @@ TAO_Thread_Lane_Resources::input_cdr_msgblock_allocator (void)
 }
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::transport_message_buffer_allocator (void)
+TAO_Thread_Lane_Resources::transport_message_buffer_allocator ()
 {
-  if (this->transport_message_buffer_allocator_ == 0)
+  if (this->transport_message_buffer_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->transport_message_buffer_allocator_ == 0)
+      if (this->transport_message_buffer_allocator_ == nullptr)
         {
           this->transport_message_buffer_allocator_ =
             this->resource_factory ()->input_cdr_dblock_allocator ();
@@ -246,14 +246,14 @@ TAO_Thread_Lane_Resources::transport_message_buffer_allocator (void)
 
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::output_cdr_dblock_allocator (void)
+TAO_Thread_Lane_Resources::output_cdr_dblock_allocator ()
 {
-  if (this->output_cdr_dblock_allocator_ == 0)
+  if (this->output_cdr_dblock_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->output_cdr_dblock_allocator_ == 0)
+      if (this->output_cdr_dblock_allocator_ == nullptr)
         {
           this->output_cdr_dblock_allocator_ =
             this->resource_factory ()->output_cdr_dblock_allocator ();
@@ -265,14 +265,14 @@ TAO_Thread_Lane_Resources::output_cdr_dblock_allocator (void)
 
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::output_cdr_buffer_allocator (void)
+TAO_Thread_Lane_Resources::output_cdr_buffer_allocator ()
 {
-  if (this->output_cdr_buffer_allocator_ == 0)
+  if (this->output_cdr_buffer_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->output_cdr_buffer_allocator_ == 0)
+      if (this->output_cdr_buffer_allocator_ == nullptr)
         {
           this->output_cdr_buffer_allocator_ =
             this->resource_factory ()->output_cdr_buffer_allocator ();
@@ -284,14 +284,14 @@ TAO_Thread_Lane_Resources::output_cdr_buffer_allocator (void)
 
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::output_cdr_msgblock_allocator (void)
+TAO_Thread_Lane_Resources::output_cdr_msgblock_allocator ()
 {
-  if (this->output_cdr_msgblock_allocator_ == 0)
+  if (this->output_cdr_msgblock_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->output_cdr_msgblock_allocator_ == 0)
+      if (this->output_cdr_msgblock_allocator_ == nullptr)
         {
           this->output_cdr_msgblock_allocator_ =
             this->resource_factory ()->output_cdr_msgblock_allocator ();
@@ -302,14 +302,14 @@ TAO_Thread_Lane_Resources::output_cdr_msgblock_allocator (void)
 }
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::amh_response_handler_allocator (void)
+TAO_Thread_Lane_Resources::amh_response_handler_allocator ()
 {
-  if (this->amh_response_handler_allocator_ == 0)
+  if (this->amh_response_handler_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->amh_response_handler_allocator_ == 0)
+      if (this->amh_response_handler_allocator_ == nullptr)
         {
           this->amh_response_handler_allocator_ =
             this->resource_factory ()->amh_response_handler_allocator ();
@@ -320,14 +320,14 @@ TAO_Thread_Lane_Resources::amh_response_handler_allocator (void)
 }
 
 ACE_Allocator*
-TAO_Thread_Lane_Resources::ami_response_handler_allocator (void)
+TAO_Thread_Lane_Resources::ami_response_handler_allocator ()
 {
-  if (this->ami_response_handler_allocator_ == 0)
+  if (this->ami_response_handler_allocator_ == nullptr)
     {
       // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
 
-      if (this->ami_response_handler_allocator_ == 0)
+      if (this->ami_response_handler_allocator_ == nullptr)
         {
           this->ami_response_handler_allocator_ =
             this->resource_factory ()->ami_response_handler_allocator ();
@@ -352,29 +352,29 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoi
 }
 
 TAO_Resource_Factory *
-TAO_Thread_Lane_Resources::resource_factory (void)
+TAO_Thread_Lane_Resources::resource_factory ()
 {
   return this->orb_core_.resource_factory ();
 }
 
 void
-TAO_Thread_Lane_Resources::finalize (void)
+TAO_Thread_Lane_Resources::finalize ()
 {
   // Close connectors before acceptors!
   // Ask the registry to close all registered connectors.
-  if (this->connector_registry_ != 0)
+  if (this->connector_registry_ != nullptr)
     {
       this->connector_registry_->close_all ();
       delete this->connector_registry_;
-      this->connector_registry_ = 0;
+      this->connector_registry_ = nullptr;
     }
 
   // Ask the registry to close all registered acceptors.
-  if (this->acceptor_registry_ != 0)
+  if (this->acceptor_registry_ != nullptr)
     {
       this->acceptor_registry_->close_all ();
       delete this->acceptor_registry_;
-      this->acceptor_registry_ = 0;
+      this->acceptor_registry_ = nullptr;
     }
 
   // Set of handlers still in the connection cache.
@@ -389,7 +389,7 @@ TAO_Thread_Lane_Resources::finalize (void)
 
   // Go through the handler set, closing the connections and removing
   // the references.
-  TAO_Connection_Handler **handler = 0;
+  TAO_Connection_Handler **handler = nullptr;
 
   for (TAO::Connection_Handler_Set::iterator iter (handlers);
        iter.next (handler);
@@ -403,80 +403,80 @@ TAO_Thread_Lane_Resources::finalize (void)
     }
 
   delete this->transport_cache_;
-  this->transport_cache_ = 0;
+  this->transport_cache_ = nullptr;
 
   delete this->leader_follower_;
-  this->leader_follower_ = 0;
+  this->leader_follower_ = nullptr;
 
   // Delete all the allocators here.. They shouldnt be done earlier,
   // lest some of the contents in the above, say reactor or acceptor
   // may use memory from the pool..
-  if (this->input_cdr_dblock_allocator_ != 0)
+  if (this->input_cdr_dblock_allocator_ != nullptr)
     {
       this->input_cdr_dblock_allocator_->remove ();
       delete this->input_cdr_dblock_allocator_;
-      this->input_cdr_dblock_allocator_ = 0;
+      this->input_cdr_dblock_allocator_ = nullptr;
     }
 
-  if (this->input_cdr_buffer_allocator_ != 0)
+  if (this->input_cdr_buffer_allocator_ != nullptr)
     {
       this->input_cdr_buffer_allocator_->remove ();
       delete this->input_cdr_buffer_allocator_;
-      this->input_cdr_buffer_allocator_ = 0;
+      this->input_cdr_buffer_allocator_ = nullptr;
     }
 
-  if (this->input_cdr_msgblock_allocator_ != 0)
+  if (this->input_cdr_msgblock_allocator_ != nullptr)
     {
       this->input_cdr_msgblock_allocator_->remove ();
       delete this->input_cdr_msgblock_allocator_;
-      this->input_cdr_msgblock_allocator_ = 0;
+      this->input_cdr_msgblock_allocator_ = nullptr;
     }
 
-  if (this->transport_message_buffer_allocator_ != 0)
+  if (this->transport_message_buffer_allocator_ != nullptr)
     {
       this->transport_message_buffer_allocator_->remove ();
       delete this->transport_message_buffer_allocator_;
-      this->transport_message_buffer_allocator_ = 0;
+      this->transport_message_buffer_allocator_ = nullptr;
     }
 
-  if (this->output_cdr_dblock_allocator_ != 0)
+  if (this->output_cdr_dblock_allocator_ != nullptr)
     {
       this->output_cdr_dblock_allocator_->remove ();
       delete this->output_cdr_dblock_allocator_;
-      this->output_cdr_dblock_allocator_ = 0;
+      this->output_cdr_dblock_allocator_ = nullptr;
     }
 
-  if (this->output_cdr_buffer_allocator_ != 0)
+  if (this->output_cdr_buffer_allocator_ != nullptr)
     {
       this->output_cdr_buffer_allocator_->remove ();
       delete this->output_cdr_buffer_allocator_;
-      this->output_cdr_buffer_allocator_ = 0;
+      this->output_cdr_buffer_allocator_ = nullptr;
     }
 
-  if (this->output_cdr_msgblock_allocator_ != 0)
+  if (this->output_cdr_msgblock_allocator_ != nullptr)
     {
       this->output_cdr_msgblock_allocator_->remove ();
       delete this->output_cdr_msgblock_allocator_;
-      this->output_cdr_msgblock_allocator_ = 0;
+      this->output_cdr_msgblock_allocator_ = nullptr;
     }
 
-  if (this->amh_response_handler_allocator_ != 0)
+  if (this->amh_response_handler_allocator_ != nullptr)
     {
       this->amh_response_handler_allocator_->remove ();
       delete this->amh_response_handler_allocator_;
-      this->amh_response_handler_allocator_ = 0;
+      this->amh_response_handler_allocator_ = nullptr;
     }
 
-  if (this->ami_response_handler_allocator_ != 0)
+  if (this->ami_response_handler_allocator_ != nullptr)
     {
       this->ami_response_handler_allocator_->remove ();
       delete this->ami_response_handler_allocator_;
-      this->ami_response_handler_allocator_ = 0;
+      this->ami_response_handler_allocator_ = nullptr;
     }
 }
 
 void
-TAO_Thread_Lane_Resources::shutdown_reactor (void)
+TAO_Thread_Lane_Resources::shutdown_reactor ()
 {
   TAO_Leader_Follower &leader_follower = this->leader_follower ();
 
@@ -508,11 +508,11 @@ TAO_Thread_Lane_Resources::shutdown_reactor (void)
 }
 
 void
-TAO_Thread_Lane_Resources::close_all_transports (void)
+TAO_Thread_Lane_Resources::close_all_transports ()
 {
   // If we have no-drop-reply strategy or already fininalized simply return.
   if (!this->orb_core_.resource_factory ()->drop_replies_during_shutdown () ||
-       this->transport_cache_ == 0)
+       this->transport_cache_ == nullptr)
     return;
 
   // Set of handlers still in the connection cache.
@@ -527,7 +527,7 @@ TAO_Thread_Lane_Resources::close_all_transports (void)
 
   // Go through the handler set, closing the connections and removing
   // the references.
-  TAO_Connection_Handler **handler = 0;
+  TAO_Connection_Handler **handler = nullptr;
 
   for (TAO::Connection_Handler_Set::iterator iter (handlers);
        iter.next (handler);
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index 1ae4954e843..eed52ccf519 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -55,7 +55,7 @@ public:
       TAO_New_Leader_Generator *new_leader_generator = 0);
 
   /// Destructor.
-  ~TAO_Thread_Lane_Resources (void);
+  ~TAO_Thread_Lane_Resources ();
 
   /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
@@ -65,94 +65,94 @@ public:
                               bool ignore_address);
 
   /// Finalize resources.
-  void finalize (void);
+  void finalize ();
 
   /// Shutdown the 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 ();
 
   /// @name Accessors
   //@{
 
-  TAO_Acceptor_Registry &acceptor_registry (void);
+  TAO_Acceptor_Registry &acceptor_registry ();
 
   /**
    * @note Returning a pointer helps to return 0 in case of
    * exceptions.
    */
-  TAO_Connector_Registry *connector_registry (void);
+  TAO_Connector_Registry *connector_registry ();
 
   /// Get the transport cache
-  TAO::Transport_Cache_Manager &transport_cache (void);
+  TAO::Transport_Cache_Manager &transport_cache ();
 
-  TAO_Leader_Follower &leader_follower (void);
+  TAO_Leader_Follower &leader_follower ();
 
   /**
    * Allocator is intended for allocating the ACE_Data_Blocks used in
    * incoming CDR streams.  This allocator has locks.
    */
-  ACE_Allocator *input_cdr_dblock_allocator (void);
+  ACE_Allocator *input_cdr_dblock_allocator ();
 
   /**
    * Allocator is intended for allocating the buffers in the incoming
    * CDR streams.  This allocator has locks.
    */
-  ACE_Allocator *input_cdr_buffer_allocator (void);
+  ACE_Allocator *input_cdr_buffer_allocator ();
 
   /**
    * Allocator is intended for allocating the ACE_Message_Blocks used
    * in incoming CDR streams.  This allocator is global, and has locks.
    */
-  ACE_Allocator *input_cdr_msgblock_allocator (void);
+  ACE_Allocator *input_cdr_msgblock_allocator ();
 
   /**
    * Allocator is intended for allocating the buffers used in the
    * Transport object. This allocator has locks.
    */
-  ACE_Allocator *transport_message_buffer_allocator (void);
+  ACE_Allocator *transport_message_buffer_allocator ();
 
   /**
    * Allocator is intended for allocating the ACE_Data_Blocks used in
    * outgoing CDR streams.  This allocator has locks.
    */
-  ACE_Allocator *output_cdr_dblock_allocator (void);
+  ACE_Allocator *output_cdr_dblock_allocator ();
 
   /**
    * Allocator is intended for allocating the buffers in the outgoing
    * CDR streams.  This allocator has locks.
    */
-  ACE_Allocator *output_cdr_buffer_allocator (void);
+  ACE_Allocator *output_cdr_buffer_allocator ();
 
   /**
    * Allocator is intended for allocating the ACE_Message_Blocks used
    * in the outgoing CDR streams.  This allocator is global, and has
    * locks.
    */
-  ACE_Allocator *output_cdr_msgblock_allocator (void);
+  ACE_Allocator *output_cdr_msgblock_allocator ();
 
   /**
    * Allocator is intended for allocating the AMH response handlers
    * This allocator is global.
    */
-  ACE_Allocator *amh_response_handler_allocator (void);
+  ACE_Allocator *amh_response_handler_allocator ();
 
   /**
    * Allocator is intended for allocating the AMI response handlers
    * This allocator is global.
    */
-  ACE_Allocator *ami_response_handler_allocator (void);
+  ACE_Allocator *ami_response_handler_allocator ();
   //@}
 
 private:
 
   /// Checks if the acceptor registry has been created.
-  int has_acceptor_registry_been_created (void) const;
+  int has_acceptor_registry_been_created () const;
 
   /// Helper to get the resource factory in the ORB_Core
-  TAO_Resource_Factory *resource_factory (void);
+  TAO_Resource_Factory *resource_factory ();
 
 private:
   /// ORB_Core related to this thread lane.
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp
index feac67c8c5f..9a8cc6b6f19 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp
@@ -9,24 +9,24 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
   : orb_core_ (&orb_core),
-    lf_strategy_ (0)
+    lf_strategy_ (nullptr)
 {
   this->lf_strategy_ =
     this->orb_core_->resource_factory ()->create_lf_strategy ();
 }
 
-TAO_Thread_Lane_Resources_Manager::~TAO_Thread_Lane_Resources_Manager (void)
+TAO_Thread_Lane_Resources_Manager::~TAO_Thread_Lane_Resources_Manager ()
 {
   delete this->lf_strategy_;
 }
 
 TAO_LF_Strategy &
-TAO_Thread_Lane_Resources_Manager::lf_strategy (void)
+TAO_Thread_Lane_Resources_Manager::lf_strategy ()
 {
   return *this->lf_strategy_;
 }
 
-TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Factory (void)
+TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Factory ()
 {
 }
 
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index a67e1f104e3..eb9f72a05f6 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -43,30 +43,30 @@ public:
   TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
 
   /// Destructor.
-  virtual ~TAO_Thread_Lane_Resources_Manager (void);
+  virtual ~TAO_Thread_Lane_Resources_Manager ();
 
   /// Finalize resources.
-  virtual void finalize (void) = 0;
+  virtual void finalize () = 0;
 
   /// Open default resources.
-  virtual int open_default_resources (void) = 0;
+  virtual int open_default_resources () = 0;
 
   /// Shutdown reactor.
-  virtual void shutdown_reactor (void) = 0;
+  virtual void shutdown_reactor () = 0;
 
   /// Cleanup transports to wake threads up waiting on those sockets.
-  virtual void close_all_transports (void) = 0;
+  virtual void close_all_transports () = 0;
 
   /// Does @a mprofile belong to us?
   virtual int is_collocated (const TAO_MProfile& mprofile) = 0;
 
   /// @name Accessors
   // @{
-  virtual TAO_Thread_Lane_Resources &lane_resources (void) = 0;
+  virtual TAO_Thread_Lane_Resources &lane_resources () = 0;
 
-  virtual TAO_Thread_Lane_Resources &default_lane_resources (void) = 0;
+  virtual TAO_Thread_Lane_Resources &default_lane_resources () = 0;
 
-  TAO_LF_Strategy &lf_strategy (void);
+  TAO_LF_Strategy &lf_strategy ();
   // @}
 
 private:
@@ -94,7 +94,7 @@ class TAO_Export TAO_Thread_Lane_Resources_Manager_Factory
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void);
+  virtual ~TAO_Thread_Lane_Resources_Manager_Factory ();
 
   /// Factory method.
   virtual TAO_Thread_Lane_Resources_Manager *
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
index c665403fc14..0b81e5e3a52 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ b/TAO/tao/Thread_Per_Connection_Handler.cpp
@@ -16,14 +16,14 @@ TAO_Thread_Per_Connection_Handler::TAO_Thread_Per_Connection_Handler (
   this->ch_->transport ()->add_reference ();
 }
 
-TAO_Thread_Per_Connection_Handler::~TAO_Thread_Per_Connection_Handler (void)
+TAO_Thread_Per_Connection_Handler::~TAO_Thread_Per_Connection_Handler ()
 {
   this->ch_->close_connection ();
   this->ch_->transport ()->remove_reference ();
 }
 
 int
-TAO_Thread_Per_Connection_Handler::svc (void)
+TAO_Thread_Per_Connection_Handler::svc ()
 {
   ACE::clr_flags (this->ch_->transport ()->event_handler_i ()->get_handle (),
                   ACE_NONBLOCK);
diff --git a/TAO/tao/Time_Policy_Manager.cpp b/TAO/tao/Time_Policy_Manager.cpp
index 8d03150147d..2a4e674dfdb 100644
--- a/TAO/tao/Time_Policy_Manager.cpp
+++ b/TAO/tao/Time_Policy_Manager.cpp
@@ -11,7 +11,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Time_Policy_Manager::TAO_Time_Policy_Manager ()
-  : time_policy_strategy_ (0)
+  : time_policy_strategy_ (nullptr)
 #if defined(TAO_USE_HR_TIME_POLICY_STRATEGY)
   , time_policy_setting_ (TAO_HR_TIME_POLICY)
 #else
@@ -68,17 +68,17 @@ TAO_Time_Policy_Manager::parse_args (int argc, ACE_TCHAR* argv[])
   return 0;
 }
 
-ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue (void)
+ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue ()
 {
   // locking scope
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                       monitor,
                       this->lock_,
-                      0);
+                      nullptr);
 
     // check if time policy strategy has already been initialized
-    if (this->time_policy_strategy_ == 0)
+    if (this->time_policy_strategy_ == nullptr)
       {
         // load strategy
         if (this->time_policy_setting_ == TAO_OS_TIME_POLICY)
@@ -92,13 +92,13 @@ ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue (void)
         this->time_policy_strategy_ =
             ACE_Dynamic_Service<TAO_Time_Policy_Strategy>::instance (
                 this->time_policy_name_.c_str ());
-        if (this->time_policy_strategy_ == 0)
+        if (this->time_policy_strategy_ == nullptr)
           {
             TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("TAO (%P|%t) - TAO_Time_Policy_Manager: ")
                         ACE_TEXT ("FAILED to load time policy strategy '%C'\n"),
                         this->time_policy_name_.c_str ()));
-            return 0;
+            return nullptr;
           }
 
         if (TAO_debug_level > 1)
@@ -128,7 +128,7 @@ TAO_Time_Policy_Manager::destroy_timer_queue (ACE_Timer_Queue *tmq)
                 this->lock_);
 
     // check if time policy strategy has been initialized
-    if (this->time_policy_strategy_ == 0)
+    if (this->time_policy_strategy_ == nullptr)
       {
         return;
       }
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 37b2c37a234..13bfa7174f7 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -33,12 +33,6 @@
 #include "ace/CORBA_macros.h"
 #include "ace/Truncate.h"
 
-/*
- * Specialization hook to add include files from
- * concrete transport implementation.
- */
-//@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Transport.inl"
 #endif /* __ACE_INLINE__ */
@@ -124,13 +118,13 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
                               size_t input_cdr_size)
   : tag_ (tag)
   , orb_core_ (orb_core)
-  , cache_map_entry_ (0)
-  , tms_ (0)
-  , ws_ (0)
+  , cache_map_entry_ (nullptr)
+  , tms_ (nullptr)
+  , ws_ (nullptr)
   , bidirectional_flag_ (-1)
   , opening_connection_role_ (TAO::TAO_UNSPECIFIED_ROLE)
-  , head_ (0)
-  , tail_ (0)
+  , head_ (nullptr)
+  , tail_ (nullptr)
   , incoming_message_queue_ (orb_core)
   , current_deadline_ (ACE_Time_Value::zero)
   , flush_timer_id_ (-1)
@@ -142,12 +136,12 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   , sent_byte_count_ (0)
   , is_connected_ (false)
   , connection_closed_on_read_ (false)
-  , messaging_object_ (0)
-  , char_translator_ (0)
-  , wchar_translator_ (0)
+  , messaging_object_ (nullptr)
+  , char_translator_ (nullptr)
+  , wchar_translator_ (nullptr)
   , tcs_set_ (0)
   , first_request_ (true)
-  , partial_message_ (0)
+  , partial_message_ (nullptr)
 #if TAO_HAS_SENDFILE == 1
     // The ORB has been configured to use the MMAP allocator, meaning
     // we could/should use sendfile() to send data.  Cast once rather
@@ -159,7 +153,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
         orb_core->output_cdr_buffer_allocator ()))
 #endif  /* TAO_HAS_SENDFILE==1 */
 #if TAO_HAS_TRANSPORT_CURRENT == 1
-  , stats_ (0)
+  , stats_ (nullptr)
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
   , flush_in_post_open_ (false)
 {
@@ -183,17 +177,9 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
                     TAO::Transport::Stats,
                     CORBA::NO_MEMORY ());
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-
-  /*
-   * Hook to add code that initializes components that
-   * belong to the concrete protocol implementation.
-   * Further additions to this Transport class will
-   * need to add code *before* this hook.
-   */
-  //@@ TAO_TRANSPORT_SPL_CONSTRUCTOR_ADD_HOOK
 }
 
-TAO_Transport::~TAO_Transport (void)
+TAO_Transport::~TAO_Transport ()
 {
   if (TAO_debug_level > 9)
     {
@@ -227,19 +213,11 @@ TAO_Transport::~TAO_Transport (void)
   // The following assert is needed for the test "Bug_2494_Regression".
   // See the bugzilla bug #2494 for details.
   ACE_ASSERT (this->queue_is_empty_i ());
-  ACE_ASSERT (this->cache_map_entry_ == 0);
+  ACE_ASSERT (this->cache_map_entry_ == nullptr);
 
 #if TAO_HAS_TRANSPORT_CURRENT == 1
   delete this->stats_;
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-
-  /*
-   * Hook to add code that cleans up components
-   * belong to the concrete protocol implementation.
-   * Further additions to this Transport class will
-   * need to add code *before* this hook.
-   */
-  //@@ TAO_TRANSPORT_SPL_DESTRUCTOR_ADD_HOOK
 }
 
 void
@@ -265,27 +243,17 @@ TAO_Transport::provide_blockable_handler (TAO::Connection_Handler_Set &h)
 }
 
 bool
-TAO_Transport::idle_after_send (void)
+TAO_Transport::idle_after_send ()
 {
   return this->tms ()->idle_after_send ();
 }
 
 bool
-TAO_Transport::idle_after_reply (void)
+TAO_Transport::idle_after_reply ()
 {
   return this->tms ()->idle_after_reply ();
 }
 
-/*
- * A concrete transport class specializes this
- * method. This hook allows commenting this function
- * when TAO's transport is specialized. Note: All
- * functions that have an implementation that does
- * nothing should be added within this hook to
- * enable specialization.
- */
-//@@ TAO_TRANSPORT_SPL_COMMENT_HOOK_START
-
 int
 TAO_Transport::tear_listen_point_list (TAO_InputCDR &)
 {
@@ -320,16 +288,14 @@ TAO_Transport::send_message_shared (TAO_Stub *stub,
   return result;
 }
 
-//@@ TAO_TRANSPORT_SPL_COMMENT_HOOK_END
-
 bool
-TAO_Transport::post_connect_hook (void)
+TAO_Transport::post_connect_hook ()
 {
   return true;
 }
 
 bool
-TAO_Transport::register_if_necessary (void)
+TAO_Transport::register_if_necessary ()
 {
   if (this->is_connected_ &&
       this->wait_strategy ()->register_handler () == -1)
@@ -357,13 +323,13 @@ TAO_Transport::register_if_necessary (void)
 }
 
 void
-TAO_Transport::close_connection (void)
+TAO_Transport::close_connection ()
 {
   this->connection_handler_i ()->close_connection ();
 }
 
 int
-TAO_Transport::register_handler (void)
+TAO_Transport::register_handler ()
 {
   if (TAO_debug_level > 4)
     {
@@ -415,7 +381,7 @@ TAO_Transport::register_handler (void)
 }
 
 int
-TAO_Transport::remove_handler (void)
+TAO_Transport::remove_handler ()
 {
   if (TAO_debug_level > 4)
     {
@@ -434,7 +400,7 @@ TAO_Transport::remove_handler (void)
                     false);
 
 
-  if (this->event_handler_i ()->reactor () == 0)
+  if (this->event_handler_i ()->reactor () == nullptr)
     {
       return 0;
     }
@@ -467,7 +433,7 @@ TAO_Transport::remove_handler (void)
       // reset the reactor property of the event handler or
       // Transport::register_handler() will not re-register
       // when called after us again.
-      this->event_handler_i ()->reactor (0);
+      this->event_handler_i ()->reactor (nullptr);
       return 0;
     }
 }
@@ -553,7 +519,7 @@ TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc)
 }
 
 int
-TAO_Transport::purge_entry (void)
+TAO_Transport::purge_entry ()
 {
   if (TAO_debug_level > 3)
     {
@@ -567,13 +533,13 @@ TAO_Transport::purge_entry (void)
 }
 
 bool
-TAO_Transport::can_be_purged (void)
+TAO_Transport::can_be_purged ()
 {
   return !this->tms_->has_request ();
 }
 
 int
-TAO_Transport::make_idle (void)
+TAO_Transport::make_idle ()
 {
   if (TAO_debug_level > 3)
     {
@@ -586,7 +552,7 @@ TAO_Transport::make_idle (void)
 }
 
 int
-TAO_Transport::update_transport (void)
+TAO_Transport::update_transport ()
 {
   return this->transport_cache_manager ().update_entry (this->cache_map_entry_);
 }
@@ -631,7 +597,7 @@ TAO_Transport::format_queue_message (TAO_OutputCDR &stream,
                                      ACE_Time_Value *max_wait_time,
                                      TAO_Stub* stub)
 {
-  if (this->messaging_object ()->format_message (stream, stub, 0) != 0)
+  if (this->messaging_object ()->format_message (stream, stub, nullptr) != 0)
     return -1;
 
   if (this->queue_message_i (stream.begin (), max_wait_time) != 0)
@@ -848,7 +814,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
       typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK;
       TAO_REVERSE_LOCK reverse (*this->handler_lock_);
       ACE_GUARD_RETURN (TAO_REVERSE_LOCK, ace_mon, reverse, -1);
-      (void) flushing_strategy->flush_transport (this, 0);
+      (void) flushing_strategy->flush_transport (this, nullptr);
     }
 
   return 1;
@@ -882,12 +848,12 @@ TAO_Transport::send_synch_message_helper_i (TAO_Synch_Queued_Message &synch_mess
 }
 
 int
-TAO_Transport::schedule_output_i (void)
+TAO_Transport::schedule_output_i ()
 {
   ACE_Event_Handler * const eh = this->event_handler_i ();
   ACE_Reactor * const reactor = eh->reactor ();
 
-  if (reactor == 0)
+  if (reactor == nullptr)
     {
       if (TAO_debug_level > 1)
         {
@@ -936,7 +902,7 @@ TAO_Transport::schedule_output_i (void)
 }
 
 int
-TAO_Transport::cancel_output_i (void)
+TAO_Transport::cancel_output_i ()
 {
   ACE_Event_Handler * const eh = this->event_handler_i ();
   ACE_Reactor *const reactor = eh->reactor ();
@@ -983,7 +949,7 @@ TAO_Transport::handle_timeout (const ACE_Time_Value & /* current_time */,
           typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK;
           TAO_REVERSE_LOCK reverse (*this->handler_lock_);
           ACE_GUARD_RETURN (TAO_REVERSE_LOCK, ace_mon, reverse, -1);
-          if (flushing_strategy->flush_transport (this, 0) == -1) {
+          if (flushing_strategy->flush_transport (this, nullptr) == -1) {
             return -1;
           }
         }
@@ -1106,7 +1072,7 @@ TAO_Transport::drain_queue_i (TAO::Transport::Drain_Constraints const & dc)
   // sent
   int iovcnt = 0;
 #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  iovec iov[ACE_IOV_MAX] = { { 0 , 0 } };
+  iovec iov[ACE_IOV_MAX] = { { nullptr , 0 } };
 #else
   iovec iov[ACE_IOV_MAX];
 #endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
@@ -1123,7 +1089,7 @@ TAO_Transport::drain_queue_i (TAO::Transport::Drain_Constraints const & dc)
   // If we are forced to send in the loop then we'll recompute the time.
   ACE_Time_Value now = ACE_High_Res_Timer::gettimeofday_hr ();
 
-  while (i != 0)
+  while (i != nullptr)
     {
       if (i->is_expired (now))
         {
@@ -1307,7 +1273,7 @@ TAO_Transport::check_buffering_constraints_i (TAO_Stub *stub, bool &must_flush)
   size_t msg_count = 0;
   size_t total_bytes = 0;
 
-  for (TAO_Queued_Message *i = this->head_; i != 0; i = i->next ())
+  for (TAO_Queued_Message *i = this->head_; i != nullptr; i = i->next ())
     {
       ++msg_count;
       total_bytes += i->message_length ();
@@ -1375,7 +1341,7 @@ TAO_Transport::report_invalid_event_handler (const char *caller)
 }
 
 void
-TAO_Transport::send_connection_closed_notifications (void)
+TAO_Transport::send_connection_closed_notifications ()
 {
   {
     ACE_MT (ACE_GUARD (ACE_Lock, guard, *this->handler_lock_));
@@ -1387,7 +1353,7 @@ TAO_Transport::send_connection_closed_notifications (void)
 }
 
 void
-TAO_Transport::send_connection_closed_notifications_i (void)
+TAO_Transport::send_connection_closed_notifications_i ()
 {
   this->cleanup_queue_i ();
 }
@@ -1423,7 +1389,7 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
 
 #if TAO_HAS_TRANSPORT_CURRENT == 1
   // "Count" the message, only if no error was encountered.
-  if (ret != -1 && this->stats_ != 0)
+  if (ret != -1 && this->stats_ != nullptr)
     this->stats_->messages_sent (message_length);
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
@@ -1557,7 +1523,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
 
       // ... part of the data was sent, need to figure out what piece
       // of the message block chain must be queued ...
-      while (message_block != 0 && message_block->length () == 0)
+      while (message_block != nullptr && message_block->length () == 0)
         {
           message_block = message_block->cont ();
         }
@@ -1569,7 +1535,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
   // ... either the message must be queued or we need to queue it
   // because it was not completely sent out ...
 
-  ACE_Time_Value *wait_time = (partially_sent ? 0: max_wait_time);
+  ACE_Time_Value *wait_time = (partially_sent ? nullptr: max_wait_time);
   if (this->queue_message_i (message_block, wait_time, !partially_sent)
       == -1)
     {
@@ -1685,12 +1651,12 @@ int
 TAO_Transport::queue_message_i (const ACE_Message_Block *message_block,
                                 ACE_Time_Value *max_wait_time, bool back)
 {
-  TAO_Queued_Message *queued_message = 0;
+  TAO_Queued_Message *queued_message = nullptr;
   ACE_NEW_RETURN (queued_message,
                   TAO_Asynch_Queued_Message (message_block,
                                              this->orb_core_,
                                              max_wait_time,
-                                             0,
+                                             nullptr,
                                              true),
                   -1);
   if (back) {
@@ -1745,7 +1711,7 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh,
         }
     }
 
-  TAO_Queued_Data *q_data = 0;
+  TAO_Queued_Data *q_data = nullptr;
 
   if (this->incoming_message_stack_.top (q_data) != -1
       && q_data->missing_data () != TAO_MISSING_DATA_UNDEFINED)
@@ -1802,7 +1768,7 @@ TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data,
       q_data->msg_type () == GIOP::Fragment)
     {
       // consolidate message on top of stack, only for fragmented messages
-      TAO_Queued_Data *new_q_data = 0;
+      TAO_Queued_Data *new_q_data = nullptr;
 
       switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data))
         {
@@ -1882,7 +1848,7 @@ TAO_Transport::consolidate_enqueue_message (TAO_Queued_Data *q_data)
   if (q_data->more_fragments () ||
       q_data->msg_type () == GIOP::Fragment)
     {
-      TAO_Queued_Data *new_q_data = 0;
+      TAO_Queued_Data *new_q_data = nullptr;
 
       switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data))
         {
@@ -1931,7 +1897,7 @@ TAO_Transport::handle_input_missing_data (TAO_Resume_Handle &rh,
                                           TAO_Queued_Data *q_data)
 {
   // paranoid check
-  if (q_data == 0)
+  if (q_data == nullptr)
     {
       return -1;
     }
@@ -2012,7 +1978,7 @@ TAO_Transport::handle_input_parse_extra_messages (
   // parsed
   int buf_status = 0;
 
-  TAO_Queued_Data *q_data = 0;     // init
+  TAO_Queued_Data *q_data = nullptr;     // init
 
   // parse buffer until all messages have been extracted, consolidate
   // and enqueue complete messages, if the last message being parsed
@@ -2020,7 +1986,7 @@ TAO_Transport::handle_input_parse_extra_messages (
   while (message_block.length () > 0 &&
          (buf_status = this->messaging_object ()->extract_next_message
           (message_block, q_data)) != -1 &&
-         q_data != 0) // paranoid check
+         q_data != nullptr) // paranoid check
     {
       if (q_data->missing_data () == 0)
         {
@@ -2035,7 +2001,7 @@ TAO_Transport::handle_input_parse_extra_messages (
           this->incoming_message_stack_.push (q_data);
         }
 
-      q_data = 0; // reset
+      q_data = nullptr; // reset
     } // while
 
   if (buf_status == -1)
@@ -2090,7 +2056,7 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
   size_t recv_size = 0; // Note: unsigned integer
 
   // Pointer to newly parsed message
-  TAO_Queued_Data *q_data = 0;
+  TAO_Queued_Data *q_data = nullptr;
 
   // Optimizing access of constants
   size_t const header_length = this->messaging_object ()->header_length ();
@@ -2133,7 +2099,7 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
 
   // If we have a partial message, copy it into our message block and
   // clear out the partial message.
-  if (this->partial_message_ != 0 && this->partial_message_->length () > 0)
+  if (this->partial_message_ != nullptr && this->partial_message_->length () > 0)
     {
       // (*) Copy back the partial message into current read-buffer,
       // verify that the read-strategy of "recv_size" bytes is not
@@ -2170,7 +2136,7 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
              ACE_TEXT ("Error - endless loop detection, closing connection"),
              this->id ()));
         }
-      if (this->partial_message_ != 0 && this->partial_message_->length () > 0)
+      if (this->partial_message_ != nullptr && this->partial_message_->length () > 0)
         {
           this->partial_message_->reset ();
         }
@@ -2196,7 +2162,7 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
   if (n <= 0)
     {
       if ((n < 0) &&
-          (this->partial_message_ != 0 && this->partial_message_->length () > 0))
+          (this->partial_message_ != nullptr && this->partial_message_->length () > 0))
         {
           this->partial_message_->reset ();
         }
@@ -2204,7 +2170,7 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
       return ACE_Utils::truncate_cast<int> (n);
     }
 
-  if (this->partial_message_ != 0 && this->partial_message_->length () > 0)
+  if (this->partial_message_ != nullptr && this->partial_message_->length () > 0)
     {
       this->partial_message_->reset ();
     }
@@ -2313,7 +2279,7 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
               // Dealing with a fragment
               TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (qd);
 
-              if (nqd == 0)
+              if (nqd == nullptr)
                 {
                   return -1;
                 }
@@ -2362,7 +2328,7 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
 
               TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (qd);
 
-              if (nqd == 0)
+              if (nqd == nullptr)
                 {
                   return -1;
                 }
@@ -2462,12 +2428,12 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
   // in buffer that needs to be safed for next "handle_input" invocations.
    if (message_block.length () > 0)
      {
-       if (this->partial_message_ == 0)
+       if (this->partial_message_ == nullptr)
          {
            this->allocate_partial_message_block ();
          }
 
-       if (this->partial_message_ != 0 &&
+       if (this->partial_message_ != nullptr &&
            this->partial_message_->copy (message_block.rd_ptr (),
                                          message_block.length ()) == 0)
          {
@@ -2497,7 +2463,7 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
 
 #if TAO_HAS_TRANSPORT_CURRENT == 1
   // Update stats, if any
-  if (this->stats_ != 0)
+  if (this->stats_ != nullptr)
     this->stats_->messages_received (qd->msg_block ()->length ());
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
@@ -2670,7 +2636,7 @@ TAO_Transport::process_queue_head (TAO_Resume_Handle &rh)
 }
 
 int
-TAO_Transport::notify_reactor_now (void)
+TAO_Transport::notify_reactor_now ()
 {
   ACE_Event_Handler *eh = this->event_handler_i ();
 
@@ -2702,7 +2668,7 @@ TAO_Transport::notify_reactor_now (void)
 }
 
 TAO::Transport_Cache_Manager &
-TAO_Transport::transport_cache_manager (void)
+TAO_Transport::transport_cache_manager ()
 {
   return this->orb_core_->lane_resources ().transport_cache ();
 }
@@ -2727,36 +2693,36 @@ TAO_Transport::clear_translators (TAO_InputCDR *inp, TAO_OutputCDR *outp)
 {
   if (inp)
     {
-      inp->char_translator (0);
-      inp->wchar_translator (0);
+      inp->char_translator (nullptr);
+      inp->wchar_translator (nullptr);
     }
   if (outp)
     {
-      outp->char_translator (0);
-      outp->wchar_translator (0);
+      outp->char_translator (nullptr);
+      outp->wchar_translator (nullptr);
     }
 }
 
 ACE_Event_Handler::Reference_Count
-TAO_Transport::add_reference (void)
+TAO_Transport::add_reference ()
 {
   return this->event_handler_i ()->add_reference ();
 }
 
 ACE_Event_Handler::Reference_Count
-TAO_Transport::remove_reference (void)
+TAO_Transport::remove_reference ()
 {
   return this->event_handler_i ()->remove_reference ();
 }
 
 TAO_OutputCDR &
-TAO_Transport::out_stream (void)
+TAO_Transport::out_stream ()
 {
   return this->messaging_object ()->out_stream ();
 }
 
 TAO_SYNCH_MUTEX &
-TAO_Transport::output_cdr_lock (void)
+TAO_Transport::output_cdr_lock ()
 {
   return this->output_cdr_mutex_;
 }
@@ -2768,7 +2734,7 @@ TAO_Transport::messaging_init (TAO_GIOP_Message_Version const &version)
 }
 
 void
-TAO_Transport::pre_close (void)
+TAO_Transport::pre_close ()
 {
   if (TAO_debug_level > 9)
     {
@@ -2814,7 +2780,7 @@ TAO_Transport::post_open (size_t id)
               TAO_Flushing_Strategy *flushing_strategy =
                 this->orb_core ()->flushing_strategy ();
 
-              if (flushing_strategy == 0)
+              if (flushing_strategy == nullptr)
                 throw CORBA::INTERNAL ();
 
               this->flush_in_post_open_ = false;
@@ -2868,9 +2834,9 @@ TAO_Transport::post_open (size_t id)
 }
 
 void
-TAO_Transport::allocate_partial_message_block (void)
+TAO_Transport::allocate_partial_message_block ()
 {
-  if (this->partial_message_ == 0)
+  if (this->partial_message_ == nullptr)
     {
       // This value must be at least large enough to hold a GIOP message
       // header plus a GIOP fragment header
@@ -2899,13 +2865,13 @@ TAO_Transport::io_timeout(
   }
   if (this->wait_strategy()->can_process_upcalls())
   {
-    return 0;
+    return nullptr;
   }
   return dc.timeout();
 }
 
 bool
-TAO_Transport::using_blocking_io_for_synch_messages (void) const
+TAO_Transport::using_blocking_io_for_synch_messages () const
 {
   if (this->wait_strategy()->can_process_upcalls())
   {
@@ -2915,22 +2881,15 @@ TAO_Transport::using_blocking_io_for_synch_messages (void) const
 }
 
 bool
-TAO_Transport::using_blocking_io_for_asynch_messages (void) const
+TAO_Transport::using_blocking_io_for_asynch_messages () const
 {
   return false;
 }
 
 bool
-TAO_Transport::connection_closed_on_read (void) const
+TAO_Transport::connection_closed_on_read () const
 {
   return connection_closed_on_read_;
 }
 
-/*
- * Hook to add concrete implementations from the derived class onto
- * TAO's transport.
- */
-
-//@@ TAO_TRANSPORT_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index ea7f68d4c96..4b3c84d069d 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -147,11 +147,6 @@ namespace TAO
   }
 }
 
-/*
- * Specialization hook for the TAO's transport implementation.
- */
-//@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class TAO_Transport
  *
@@ -326,7 +321,7 @@ public:
                  size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE);
 
   /// Destructor
-  virtual ~TAO_Transport (void);
+  virtual ~TAO_Transport ();
 
   /// Return the protocol tag.
   /**
@@ -334,10 +329,10 @@ public:
    * protocol. New protocol tags can be obtained free of charge from
    * the OMG, check the documents in corbafwd.h for more details.
    */
-  CORBA::ULong tag (void) const;
+  CORBA::ULong tag () const;
 
   /// Access the ORB that owns this connection.
-  TAO_ORB_Core *orb_core (void) const;
+  TAO_ORB_Core *orb_core () const;
 
   /// Get the TAO_Tranport_Mux_Strategy used by this object.
   /**
@@ -350,7 +345,7 @@ public:
    * connection is more efficient and reduces the possibilities of
    * priority inversions.
    */
-  TAO_Transport_Mux_Strategy *tms (void) const;
+  TAO_Transport_Mux_Strategy *tms () const;
 
   /// Return the TAO_Wait_Strategy used by this object.
   /**
@@ -360,7 +355,7 @@ public:
    * multiple events concurrently or using the Leader/Followers
    * protocol.
    */
-  TAO_Wait_Strategy *wait_strategy (void) const;
+  TAO_Wait_Strategy *wait_strategy () const;
 
   enum Drain_Result_Enum
     {
@@ -393,7 +388,7 @@ public:
   Drain_Result handle_output (TAO::Transport::Drain_Constraints const & c);
 
   /// Get the bidirectional flag
-  int bidirectional_flag (void) const;
+  int bidirectional_flag () const;
 
   /// Set the bidirectional flag
   void bidirectional_flag (int flag);
@@ -402,7 +397,7 @@ public:
   void cache_map_entry (TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *entry);
 
   /// Get the Cache Map entry
-  TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (void);
+  TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry ();
 
   /// Set and Get the identifier for this transport instance.
   /**
@@ -410,29 +405,29 @@ public:
    * the <code>this</code> pointer for the instance on which
    * it's called.
    */
-  size_t id (void) const;
+  size_t id () const;
   void id (size_t id);
 
   /**
    * Methods dealing with the role of the connection, e.g., CLIENT or SERVER.
    * See CORBA 2.6 Specification, Section 15.5.1 for origin of definitions.
    */
-  TAO::Connection_Role opened_as (void) const;
+  TAO::Connection_Role opened_as () const;
   void opened_as (TAO::Connection_Role);
 
   /// Get and Set the purging order. The purging strategy uses the set
   /// version to set the purging order.
-  unsigned long purging_order (void) const;
+  unsigned long purging_order () const;
   void purging_order(unsigned long value);
 
   /// Check if there are messages pending in the queue
   /**
    * @return true if the queue is empty
    */
-  bool queue_is_empty (void);
+  bool queue_is_empty ();
 
   /// Register with the reactor via the wait strategy
-  bool register_if_necessary (void);
+  bool register_if_necessary ();
 
 
   /// Added event handler to the handlers set.
@@ -470,10 +465,10 @@ public:
    * thread-per-connection mode.  In that case putting the connection
    * in the Reactor would produce unpredictable results anyway.
    */
-  virtual int register_handler (void);
+  virtual int register_handler ();
 
   /// Remove the handler from the reactor.
-  virtual int remove_handler (void);
+  virtual int remove_handler ();
 
   /// Write the complete Message_Block chain to the connection.
   /**
@@ -558,14 +553,14 @@ public:
 
   /// Request has been just sent, but the reply is not received. Idle
   /// the transport now.
-  bool idle_after_send (void);
+  bool idle_after_send ();
 
   /// Request is sent and the reply is received. Idle the transport
   /// now.
-  bool idle_after_reply (void);
+  bool idle_after_reply ();
 
   /// Call the implementation method after obtaining the lock.
-  virtual void close_connection (void);
+  virtual void close_connection ();
   //@}
 
   /** @name Template methods
@@ -599,18 +594,18 @@ public:
    *
    * @note The methods are not made const with a reason.
    */
-  virtual bool post_connect_hook (void);
+  virtual bool post_connect_hook ();
 
   /// Memory management routines.
   /**
    * Forwards to event handler.
    */
-  ACE_Event_Handler::Reference_Count add_reference (void);
-  ACE_Event_Handler::Reference_Count remove_reference (void);
+  ACE_Event_Handler::Reference_Count add_reference ();
+  ACE_Event_Handler::Reference_Count remove_reference ();
 
   /// Return the messaging object that is used to format the data that
   /// needs to be sent.
-  TAO_GIOP_Message_Base * messaging_object (void);
+  TAO_GIOP_Message_Base * messaging_object ();
 
   /** @name Template methods
    *
@@ -638,43 +633,36 @@ public:
    *
    * @todo This method has to be renamed to event_handler()
    */
-  virtual ACE_Event_Handler * event_handler_i (void) = 0;
+  virtual ACE_Event_Handler * event_handler_i () = 0;
 
   /// Is this transport really connected
-  bool is_connected (void) const;
+  bool is_connected () const;
 
   /// Was a connection seen as closed during a read
-  bool connection_closed_on_read (void) const;
+  bool connection_closed_on_read () const;
 
   /// Perform all the actions when this transport get opened
   bool post_open (size_t id);
 
   /// do what needs to be done when closing the transport
-  void pre_close (void);
+  void pre_close ();
 
   /// Get the connection handler for this transport
-  TAO_Connection_Handler * connection_handler (void);
+  TAO_Connection_Handler * connection_handler ();
 
   /// Accessor for the output CDR stream
-  TAO_OutputCDR &out_stream (void);
+  TAO_OutputCDR &out_stream ();
 
   /// Accessor for synchronizing Transport OutputCDR access
-  TAO_SYNCH_MUTEX &output_cdr_lock (void);
+  TAO_SYNCH_MUTEX &output_cdr_lock ();
 
   /// Can the transport be purged?
-  bool can_be_purged (void);
+  bool can_be_purged ();
 
   virtual void set_bidir_context_info (TAO_Operation_Details &opdetails);
 
-  /*
-   * Specialization hook to add public methods from
-   * concrete transport implementations to TAO's transport
-   * class
-   */
-  //@@ TAO_TRANSPORT_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
-  virtual TAO_Connection_Handler * connection_handler_i (void) = 0;
+  virtual TAO_Connection_Handler * connection_handler_i () = 0;
 
 public:
   /// This is a request for the transport object to write a
@@ -840,13 +828,13 @@ public:
                                   TAO::Transport::Drain_Constraints const & dc);
 
   /// Cache management
-  int purge_entry (void);
+  int purge_entry ();
 
   /// Cache management
-  int make_idle (void);
+  int make_idle ();
 
   /// Cache management
-  int update_transport (void);
+  int update_transport ();
 
   /// The timeout callback, invoked when any of the timers related to
   /// this transport expire.
@@ -868,16 +856,16 @@ public:
   int handle_timeout (const ACE_Time_Value &current_time, const void* act);
 
   /// Accessor to recv_buffer_size_
-  size_t recv_buffer_size (void) const;
+  size_t recv_buffer_size () const;
 
   /// Accessor to sent_byte_count_
-  size_t sent_byte_count (void) const;
+  size_t sent_byte_count () const;
 
   /// CodeSet Negotiation - Get the char codeset translator factory
-  TAO_Codeset_Translator_Base *char_translator (void) const;
+  TAO_Codeset_Translator_Base *char_translator () const;
 
   /// CodeSet Negotiation - Get the wchar codeset translator factory
-  TAO_Codeset_Translator_Base *wchar_translator (void) const;
+  TAO_Codeset_Translator_Base *wchar_translator () const;
 
   /// CodeSet negotiation - Set the char codeset translator factory
   void char_translator (TAO_Codeset_Translator_Base *);
@@ -905,14 +893,14 @@ public:
 
   /// Notify all the components inside a Transport when the underlying
   /// connection is closed.
-  void send_connection_closed_notifications (void);
+  void send_connection_closed_notifications ();
 
   /// Transport statistics
-  TAO::Transport::Stats* stats (void) const;
+  TAO::Transport::Stats* stats () const;
 
 private:
   /// Helper method that returns the Transport Cache Manager.
-  TAO::Transport_Cache_Manager &transport_cache_manager (void);
+  TAO::Transport_Cache_Manager &transport_cache_manager ();
 
   /// Send some of the data in the queue.
   /**
@@ -931,7 +919,7 @@ private:
    *
    * @return true if the queue is empty
    */
-  bool queue_is_empty_i (void) const;
+  bool queue_is_empty_i () const;
 
   /// A helper routine used in drain_queue_i()
   Drain_Result drain_queue_helper (int &iovcnt, iovec iov[],
@@ -948,10 +936,10 @@ private:
   friend class TAO_Thread_Per_Connection_Handler;
 
   /// Schedule handle_output() callbacks
-  int schedule_output_i (void);
+  int schedule_output_i ();
 
   /// Cancel handle_output() callbacks
-  int cancel_output_i (void);
+  int cancel_output_i ();
 
   /// Cleanup the queue.
   /**
@@ -991,11 +979,11 @@ private:
                                    ACE_Time_Value *max_wait_time);
 
   /// Check if the flush timer is still pending
-  int flush_timer_pending (void) const;
+  int flush_timer_pending () const;
 
   /// The flush timer expired or was explicitly cancelled, mark it as
   /// not pending
-  void reset_flush_timer (void);
+  void reset_flush_timer ();
 
   /// Print out error messages if the event handler is not valid
   void report_invalid_event_handler (const char *caller);
@@ -1038,25 +1026,25 @@ private:
    * This call prepares a new handler for the notify call and sends a
    * notify () call to the reactor.
    */
-  int notify_reactor (void);
+  int notify_reactor ();
 
 protected:
   /*
    * Same as notify_reactor above but does NOT first check for a
    * registered TAO_Wait_Strategy.
    */
-  int notify_reactor_now (void);
+  int notify_reactor_now ();
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Transport &operator= (const TAO_Transport &))
 
   /// Assume the lock is held
-  void send_connection_closed_notifications_i (void);
+  void send_connection_closed_notifications_i ();
 
   /// Allocate a partial message block and store it in our
   /// partial_message_ data member.
-  void allocate_partial_message_block (void);
+  void allocate_partial_message_block ();
 
   /**
    * Return true if blocking I/O should be used for sending synchronous
@@ -1077,8 +1065,6 @@ private:
    * TAO's protocol implementation onto the base Transport class
    */
 
-  //@@ TAO_TRANSPORT_SPL_PRIVATE_METHODS_ADD_HOOK
-
 protected:
   /// IOP protocol tag.
   CORBA::ULong const tag_;
@@ -1235,22 +1221,8 @@ private:
 
   /// lock for synchronizing Transport OutputCDR access
   mutable TAO_SYNCH_MUTEX output_cdr_mutex_;
-
-  /*
-   * specialization hook to add class members from concrete
-   * transport class onto the base transport class. Please
-   * add any private members to this class *before* this hook.
-   */
-  //@@ TAO_TRANSPORT_SPL_DATA_MEMBERS_ADD_HOOK
 };
 
-/*
- * Hook to add external typedefs and specializations to
- * TAO's transport implementation.
- */
-
-//@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 namespace TAO
 {
@@ -1279,15 +1251,15 @@ namespace TAO
       virtual ~Stats ();
 
       void messages_sent (size_t message_length);
-      CORBA::LongLong messages_sent (void) const;
-      CORBA::LongLong bytes_sent (void) const;
+      CORBA::LongLong messages_sent () const;
+      CORBA::LongLong bytes_sent () const;
 
       void messages_received (size_t message_length);
-      CORBA::LongLong messages_received (void) const;
-      CORBA::LongLong bytes_received (void) const;
+      CORBA::LongLong messages_received () const;
+      CORBA::LongLong bytes_received () const;
 
       void opened_since (const ACE_Time_Value& tv);
-      const ACE_Time_Value& opened_since (void) const;
+      const ACE_Time_Value& opened_since () const;
 
     private:
       /// Mutex guarding the internal state of the statistics
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index a47d4dea15b..bfc363cf8c4 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -45,8 +45,7 @@ namespace TAO
        virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
     protected:
         virtual TAO::Transport::Current_ptr
-        make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id)
-          = 0;
+        make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id) = 0;
     protected:
       const ACE_TString id_;
 #if defined (ACE_WIN32_VC14)
diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp
index 3ef9deb8982..bdf634c708b 100644
--- a/TAO/tao/Transport_Acceptor.cpp
+++ b/TAO/tao/Transport_Acceptor.cpp
@@ -15,10 +15,8 @@ TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag)
 {
 }
 
-TAO_Acceptor::~TAO_Acceptor (void)
+TAO_Acceptor::~TAO_Acceptor ()
 {
-
-  //@@ TAO_ACCEPTOR_DESTRUCTOR_ADD_HOOK
 }
 
 int
@@ -39,7 +37,7 @@ TAO_Acceptor::handle_accept_error (ACE_Event_Handler* base_acceptor)
       // Get the reactor.  If there isn't one, which isn't very likely,
       // then just return -1.
       ACE_Reactor* reactor = base_acceptor->reactor ();
-      if (reactor == 0)
+      if (reactor == nullptr)
         return -1;
 
       // So that the reactor doesn't completely remove this handler from
@@ -57,7 +55,7 @@ TAO_Acceptor::handle_accept_error (ACE_Event_Handler* base_acceptor)
       // Schedule a timer so that we can resume the handler in hopes
       // that some file handles have freed up.
       ACE_Time_Value timeout (this->error_retry_delay_);
-      reactor->schedule_timer (base_acceptor, 0, timeout);
+      reactor->schedule_timer (base_acceptor, nullptr, timeout);
     }
 
   // We want to keep accepting in all other situations.
@@ -70,7 +68,7 @@ TAO_Acceptor::handle_expiration (ACE_Event_Handler* base_acceptor)
   // Get the reactor.  If there isn't one, which isn't very likely, then
   // just return -1;
   ACE_Reactor* reactor = base_acceptor->reactor ();
-  if (reactor == 0)
+  if (reactor == nullptr)
     return -1;
 
   if (TAO_debug_level > 0)
@@ -89,6 +87,4 @@ TAO_Acceptor::handle_expiration (ACE_Event_Handler* base_acceptor)
   return 0;
 }
 
-//@@ TAO_ACCEPTOR_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index 984ad333825..87d660aa4c9 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -48,8 +48,6 @@ namespace TAO
   class ObjectKey;
 }
 
-//@@ TAO_ACCEPTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 // ****************************************************************
 
 /// The TAO-specific OMG assigned value for the TAG_ORB_TYPE tagged
@@ -78,10 +76,10 @@ public:
   TAO_Acceptor (CORBA::ULong tag);
 
   /// Destructor
-  virtual ~TAO_Acceptor (void);
+  virtual ~TAO_Acceptor ();
 
   /// The tag, each concrete class will have a specific tag value.
-  CORBA::ULong tag (void) const;
+  CORBA::ULong tag () const;
 
   /// Set the amount of time to delay accepting new connections in the
   /// event that we encounter an error that may be transient.
@@ -106,7 +104,7 @@ public:
                             const char *options = 0) = 0;
 
   /// Closes the acceptor
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /**
    * Create the corresponding profile for this endpoint.
@@ -127,7 +125,7 @@ public:
    * is used for determining how many profiles will be generated
    * for this acceptor.
    */
-  virtual CORBA::ULong endpoint_count (void) = 0;
+  virtual CORBA::ULong endpoint_count () = 0;
 
   /**
    * This method fetches the @a key from the @a profile. Protocols that
@@ -148,23 +146,11 @@ public:
   /// into the reactor to try accepting again.
   int handle_expiration (ACE_Event_Handler* base_acceptor);
 
-  /*
-   * Hook to add public methods from derived acceptor classes onto
-   * this class.
-   */
-  //@@ TAO_ACCEPTOR_SPL_PUBLIC_METHODS_ADD_HOOK
-
 private:
   /// IOP protocol tag.
   CORBA::ULong const tag_;
 
   time_t error_retry_delay_;
-
-  /*
-   * Hook to add data members from concrete acceptor implementations onto
-   * the base class.
-   */
-  //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_ADD_HOOK
 };
 
 /// This is a drop-in replacement class for the ACE_Strategy_Acceptor.
@@ -187,7 +173,7 @@ public:
   {
   }
 
-  virtual int handle_accept_error (void)
+  virtual int handle_accept_error ()
   {
     return this->acceptor_->handle_accept_error (this);
   }
@@ -201,8 +187,6 @@ private:
   TAO_Acceptor* acceptor_;
 };
 
-//@@ TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp
index 868bd41cd97..ab7a56adf36 100644
--- a/TAO/tao/Transport_Cache_Manager_T.cpp
+++ b/TAO/tao/Transport_Cache_Manager_T.cpp
@@ -73,7 +73,7 @@ namespace TAO
   }
 
   template <typename TT, typename TRDT, typename PSTRAT>
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::~Transport_Cache_Manager_T (void)
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::~Transport_Cache_Manager_T ()
   {
     delete this->cache_lock_;
     this->cache_lock_ = 0;
@@ -561,7 +561,7 @@ namespace TAO
 
   template <typename TT, typename TRDT, typename PSTRAT>
   int
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge (void)
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge ()
   {
     typedef ACE_Unbounded_Set<transport_type*> transport_set_type;
     transport_set_type transports_to_be_closed;
diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h
index a61759c9398..7cc7c188264 100644
--- a/TAO/tao/Transport_Cache_Manager_T.h
+++ b/TAO/tao/Transport_Cache_Manager_T.h
@@ -101,7 +101,7 @@ namespace TAO
       const char *orbid);
 
     /// Destructor
-    ~Transport_Cache_Manager_T (void);
+    ~Transport_Cache_Manager_T ();
 
     /// Add the transport to the cache.
     /**
@@ -122,7 +122,7 @@ namespace TAO
       size_t & busy_count);
 
     /// Remove entries from the cache depending upon the strategy.
-    int purge (void);
+    int purge ();
 
     /// Purge the entry from the Cache Map
     int purge_entry (HASH_MAP_ENTRY *& entry);
@@ -158,13 +158,13 @@ namespace TAO
     bool blockable_client_transports (Connection_Handler_Set &handlers);
 
     /// Return the current size of the cache.
-    size_t current_size (void) const;
+    size_t current_size () const;
 
     /// Return the total size of the cache.
-    size_t total_size (void) const;
+    size_t total_size () const;
 
     /// Return the underlying cache map
-    HASH_MAP &map (void);
+    HASH_MAP &map ();
 
   private:
     /// Lookup entry<key,value> in the cache. Grabs the lock and calls the
diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl
index 9c4e8c8ef0c..65ceaddfd57 100644
--- a/TAO/tao/Transport_Cache_Manager_T.inl
+++ b/TAO/tao/Transport_Cache_Manager_T.inl
@@ -137,21 +137,21 @@ namespace TAO
 
   template <typename TT, typename TRDT, typename PSTRAT>
   ACE_INLINE size_t
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::current_size (void) const
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::current_size () const
   {
     return this->cache_map_.current_size ();
   }
 
   template <typename TT, typename TRDT, typename PSTRAT>
   ACE_INLINE size_t
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::total_size (void) const
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::total_size () const
   {
     return this->cache_map_.total_size ();
   }
 
   template <typename TT, typename TRDT, typename PSTRAT>
   ACE_INLINE typename Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::HASH_MAP &
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::map (void)
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::map ()
   {
     return this->cache_map_;
   }
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 6a47a484bf3..4e4961b1f90 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -18,8 +18,6 @@
 
 #include "ace/OS_NS_string.h"
 
-//@@ TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Transport_Connector.inl"
 #endif /* __ACE_INLINE__ */
@@ -67,13 +65,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Connector
 TAO_Connector::TAO_Connector (CORBA::ULong tag)
-  : active_connect_strategy_ (0),
+  : active_connect_strategy_ (nullptr),
     tag_ (tag),
-    orb_core_ (0)
+    orb_core_ (nullptr)
 {
 }
 
-TAO_Connector::~TAO_Connector (void)
+TAO_Connector::~TAO_Connector ()
 {
   delete this->active_connect_strategy_;
 }
@@ -82,14 +80,14 @@ TAO_Profile *
 TAO_Connector::corbaloc_scan (const char *str, size_t &len)
 {
   if (this->check_prefix (str) != 0)
-    return 0;
+    return nullptr;
   const char *comma_pos = ACE_OS::strchr (str,',');
   const char *slash_pos = ACE_OS::strchr (str,'/');
-  if (comma_pos == 0 && slash_pos == 0)
+  if (comma_pos == nullptr && slash_pos == nullptr)
     {
       len = ACE_OS::strlen (str);
     }
-  else if (comma_pos == 0 || comma_pos > slash_pos)
+  else if (comma_pos == nullptr || comma_pos > slash_pos)
     len = (slash_pos - str);
   else len = comma_pos - str;
   return this->make_profile();
@@ -238,8 +236,7 @@ TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile)
           // Initialize a Profile using the individual endpoint
           // string.
           // @@ Not exception safe!  We need a TAO_Profile_var!
-          profile->parse_string (endpoint.c_str ()
-                                );
+          profile->parse_string (endpoint.c_str ());
 
           // Give up ownership of the profile.
           if (mprofile.give_profile (profile) == -1)
@@ -266,7 +263,7 @@ TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile)
 }
 
 int
-TAO_Connector::supports_parallel_connects(void) const
+TAO_Connector::supports_parallel_connects() const
 {
   return 0; // by default, we don't support parallel connection attempts;
 }
@@ -276,7 +273,7 @@ TAO_Connector::make_parallel_connection (TAO::Profile_Transport_Resolver *,
                                          TAO_Transport_Descriptor_Interface &,
                                          ACE_Time_Value *)
 {
-  return 0;
+  return nullptr;
 }
 
 
@@ -288,14 +285,14 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r,
   if (this->supports_parallel_connects() == 0)
     {
       errno = ENOTSUP;
-      return 0;
+      return nullptr;
     }
 
   errno = 0; // need to clear errno to ensure a stale enotsup is not set
-  if (desc == 0)
-    return 0;
+  if (desc == nullptr)
+    return nullptr;
   TAO_Endpoint *root_ep = desc->endpoint();
-  TAO_Transport *base_transport = 0;
+  TAO_Transport *base_transport = nullptr;
 
   TAO::Transport_Cache_Manager &tcm =
     this->orb_core ()->lane_resources ().transport_cache ();
@@ -303,8 +300,8 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r,
   // Iterate through the endpoints. Since find_transport takes a
   // Transport Descriptor rather than an endpoint, we must create a
   // local TDI for each endpoint. The first one found will be used.
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0);
-       ep != 0;
+  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),nullptr);
+       ep != nullptr;
        ep = ep->next_filtered(this->orb_core(),root_ep))
     {
       TAO_Base_Transport_Property desc2(ep,0);
@@ -332,13 +329,13 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r,
   // when one succeeds the rest are cancelled or closed.
 
   unsigned int endpoint_count = 0;
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0);
-       ep != 0;
+  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),nullptr);
+       ep != nullptr;
        ep = ep->next_filtered(this->orb_core(),root_ep))
     if (this->set_validate_endpoint (ep) == 0)
       ++endpoint_count;
   if (endpoint_count == 0)
-    return 0;
+    return nullptr;
   return this->make_parallel_connection (r,*desc,timeout);
 }
 
@@ -407,7 +404,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r,
       // connection, the wait() call will block forever (or until the ORB
       // thread leaves the reactor, which may not happen).
       int result = 0;
-      if (timeout == 0 && !r->blocked_connect ())
+      if (timeout == nullptr && !r->blocked_connect ())
         {
           ACE_Time_Value tv (0, 500);
           result = this->active_connect_strategy_->wait (transport, &tv);
@@ -491,7 +488,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
     {
       // Find a connection in the cache
       // If transport found, reference count is incremented on assignment
-      TAO_Transport *base_transport = 0;
+      TAO_Transport *base_transport = nullptr;
       size_t busy_count = 0;
       TAO::Transport_Cache_Manager::Find_Result found =
           tcm.find_transport (desc,
@@ -570,7 +567,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
                                   "TAO (%P|%t) - Transport_Connector::connect,"
                                   " wait for completion failed\n"));
                     }
-                  return 0;
+                  return nullptr;
                 }
 
               if (base_transport->is_connected () &&
@@ -585,7 +582,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
                                   "in the reactor.\n",
                                   base_transport->id ()));
                     }
-                  return 0;
+                  return nullptr;
                 }
 
               tg.clear ();
@@ -614,7 +611,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
                   if (!base_transport->register_if_necessary ())
                     {
                         base_transport->remove_reference ();
-                        return 0;
+                        return nullptr;
                     }
                 }
 
@@ -641,9 +638,9 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
         }
       else
         {
-          if (desc == 0 ||
+          if (desc == nullptr ||
               (this->set_validate_endpoint (desc->endpoint ()) == -1))
-            return 0;
+            return nullptr;
 
           // @todo: This is not the right place for this! (bugzilla 3023)
           // Purge connections (if necessary)
@@ -657,13 +654,13 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
             {
               // we aren't going to use the transport returned from the cache
               // (if any)
-              if (base_transport != 0)
+              if (base_transport != nullptr)
                 {
                   base_transport->remove_reference ();
                 }
 
               base_transport = this->make_connection (r, *desc, timeout);
-              if (base_transport == 0)
+              if (base_transport == nullptr)
                 {
                   if (TAO_debug_level > 4)
                     {
@@ -671,7 +668,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
                         ACE_TEXT ("TAO (%P|%t) - Transport_Connector::")
                         ACE_TEXT ("connect, make_connection failed\n")));
                     }
-                  return 0;
+                  return nullptr;
                 }
 
               if (TAO_debug_level > 4)
@@ -817,7 +814,7 @@ TAO_Connector::wait_for_connection_completion (
                 {
                   if (errno == ETIME)
                     {
-                      if (timeout == 0)
+                      if (timeout == nullptr)
                         {
                           // There was an error during connecting and the errno was
                           // ETIME.  We didn't pass in a timeout, so there's
@@ -876,7 +873,7 @@ TAO_Connector::wait_for_connection_completion (
       // Set transport to zero, it is not usable, and the reference
       // count we added above was decremented by the base connector
       // handling the connection failure.
-      transport = 0;
+      transport = nullptr;
       return false;
     }
   // Connection not ready yet but we can use this transport, if
@@ -929,7 +926,7 @@ TAO_Connector::wait_for_connection_completion (
   if (r->blocked_connect ())
     {
       result = this->active_connect_strategy_->wait (mev, timeout);
-      the_winner = 0;
+      the_winner = nullptr;
     }
   else
     {
@@ -966,7 +963,7 @@ TAO_Connector::wait_for_connection_completion (
   this->cleanup_pending (the_winner, transport, count);
 
   // In case of errors.
-  if (the_winner == 0)
+  if (the_winner == nullptr)
     {
       // Report that making the connection failed, don't print errno
       // because we touched the reactor and errno could be changed
@@ -998,7 +995,7 @@ TAO_Connector::wait_for_connection_completion (
       // Forget the return value. We are busted anyway. Try our best
       // here.
       (void) this->cancel_svc_handler (the_winner->connection_handler ());
-      the_winner = 0;
+      the_winner = nullptr;
       return false;
     }
 
@@ -1009,16 +1006,16 @@ TAO_Connector::wait_for_connection_completion (
 }
 
 int
-TAO_Connector::create_connect_strategy (void)
+TAO_Connector::create_connect_strategy ()
 {
-  if (this->active_connect_strategy_ == 0)
+  if (this->active_connect_strategy_ == nullptr)
     {
       this->active_connect_strategy_ =
         this->orb_core_->client_factory ()->create_connect_strategy (
           this->orb_core_);
     }
 
-  if (this->active_connect_strategy_ == 0)
+  if (this->active_connect_strategy_ == nullptr)
     {
       return -1;
     }
@@ -1029,7 +1026,7 @@ TAO_Connector::create_connect_strategy (void)
 bool
 TAO_Connector::new_connection_is_ok (size_t busy_count)
 {
-  if (this->orb_core_ == 0)
+  if (this->orb_core_ == nullptr)
     return true;
 
   unsigned int mux_limit = this->orb_core_->resource_factory ()
@@ -1091,6 +1088,4 @@ TAO_Connector::check_connection_closure (
   return result;
 }
 
-//@@ TAO_CONNECTOR_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 292f451b3b7..b8aa3702d0e 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -45,12 +45,6 @@ namespace TAO
   class Profile_Transport_Resolver;
 }
 
-/*
- * Hook to add includes and forward declaration
- * to the Connector class.
- */
-//@@ TAO_CONNECTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class TAO_Connector
  *
@@ -123,8 +117,6 @@ public:
   /// Return the object key delimiter to use or expect.
   virtual char object_key_delimiter (void) const = 0;
 
-  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// A flag indicating the actual connector supports parallel connection
   /// attempts. The base implementation always returns 0. Override to return
@@ -216,23 +208,17 @@ protected:
   TAO_ORB_Core *orb_core (void);
 
 protected:
-
   /// The (a)synch connect strategy
   TAO_Connect_Strategy *active_connect_strategy_;
 
 private:
-
   /// IOP protocol tag.
   CORBA::ULong const tag_;
 
   /// Pointer to our ORB core
   TAO_ORB_Core *orb_core_;
-
-  //@@ TAO_CONNECTOR_SPL_PRIVATE_DATA_ADD_HOOK
 };
 
-//@@ TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp
index fe038e33c63..7cfe705188f 100644
--- a/TAO/tao/Transport_Descriptor_Interface.cpp
+++ b/TAO/tao/Transport_Descriptor_Interface.cpp
@@ -8,7 +8,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void)
+TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface ()
 {
   if (this->release_)
     {
@@ -23,7 +23,7 @@ TAO_Transport_Descriptor_Interface::reset_endpoint (TAO_Endpoint *ep)
   if (this->release_)
     return false;
 
-  for (TAO_Endpoint *ptr = this->endpoint_; ptr != 0; ptr = ptr->next())
+  for (TAO_Endpoint *ptr = this->endpoint_; ptr != nullptr; ptr = ptr->next())
 
     if (ptr == ep)
       {
diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index f2c3d15618a..47c6156fede 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -8,7 +8,7 @@ TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (
 {
 }
 
-TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void)
+TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy ()
 {
 }
 
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
index 45f76ce4c43..301f9bc496c 100644
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -36,17 +36,16 @@ class TAO_Pluggable_Reply_Params;
  */
 class TAO_Export TAO_Transport_Mux_Strategy
 {
-
 public:
   /// Base class constructor.
   TAO_Transport_Mux_Strategy (TAO_Transport *transport);
 
   /// Base class destructor.
-  virtual ~TAO_Transport_Mux_Strategy (void);
+  virtual ~TAO_Transport_Mux_Strategy ();
 
   /// Generate and return an unique request id for the current
   /// invocation.
-  virtual CORBA::ULong request_id (void) = 0;
+  virtual CORBA::ULong request_id () = 0;
 
   /// Bind the dispatcher with the request id. Commonalities in the
   /// derived class implementations is kept here.
@@ -74,19 +73,19 @@ public:
   /// Request has been just sent, but the reply is not received. Idle
   /// the transport now. The return value indicates whether idling was
   /// successful or not.
-  virtual bool idle_after_send (void) = 0;
+  virtual bool idle_after_send () = 0;
 
   /// Request is sent and the reply is received. Idle the transport
   /// now. The return value indicates whether idling was successful or
   /// not.
-  virtual bool idle_after_reply (void) = 0;
+  virtual bool idle_after_reply () = 0;
 
   /// The transport object has closed the connection, inform all Reply
   /// dispatchers and waiting strategies.
-  virtual void connection_closed (void) = 0;
+  virtual void connection_closed () = 0;
 
   /// Do we have a request pending
-  virtual bool has_request (void) = 0;
+  virtual bool has_request () = 0;
 
 protected:
   /// Cache the transport reference.
diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp
index 6343041843d..c6a41562673 100644
--- a/TAO/tao/Transport_Queueing_Strategies.cpp
+++ b/TAO/tao/Transport_Queueing_Strategies.cpp
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  Transport_Queueing_Strategy::~Transport_Queueing_Strategy (void)
+  Transport_Queueing_Strategy::~Transport_Queueing_Strategy ()
   {
   }
 
diff --git a/TAO/tao/Transport_Queueing_Strategies.h b/TAO/tao/Transport_Queueing_Strategies.h
index b145ba57988..45a8dda4a6c 100644
--- a/TAO/tao/Transport_Queueing_Strategies.h
+++ b/TAO/tao/Transport_Queueing_Strategies.h
@@ -48,7 +48,7 @@ namespace TAO
   {
   public:
     /// Destructor
-    virtual ~Transport_Queueing_Strategy (void);
+    virtual ~Transport_Queueing_Strategy ();
 
     /// Return true if a message must be queued
     virtual bool must_queue (bool queue_empty) const = 0;
diff --git a/TAO/tao/Transport_Selection_Guard.cpp b/TAO/tao/Transport_Selection_Guard.cpp
index a3d12a0544a..cd79ab92d66 100644
--- a/TAO/tao/Transport_Selection_Guard.cpp
+++ b/TAO/tao/Transport_Selection_Guard.cpp
@@ -44,13 +44,13 @@ namespace TAO
   }
 
   /// Dtor
-  Transport_Selection_Guard::~Transport_Selection_Guard (void)
+  Transport_Selection_Guard::~Transport_Selection_Guard ()
   {
 #if TAO_HAS_TRANSPORT_CURRENT == 1
     TAO_TSS_Resources::instance ()->tsg_ = prev_;
-    this->prev_ = 0;
+    this->prev_ = nullptr;
 #endif  /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-    this->curr_ = 0;
+    this->curr_ = nullptr;
   }
 
   bool
diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h
index fbc520aea4e..fa70136f350 100644
--- a/TAO/tao/Transport_Selection_Guard.h
+++ b/TAO/tao/Transport_Selection_Guard.h
@@ -64,22 +64,22 @@ namespace TAO
     Transport_Selection_Guard (TAO_Transport* t);
 
     /// Dtor
-    ~Transport_Selection_Guard (void);
+    ~Transport_Selection_Guard ();
 
     /// getter
-    TAO_Transport* operator-> (void) const
+    TAO_Transport* operator-> () const
     {
       return this->get ();
     };
 
     /// getter
-    TAO_Transport& operator* (void) const
+    TAO_Transport& operator* () const
     {
       return *this->get ();
     };
 
     /// Getter
-    TAO_Transport* get (void) const
+    TAO_Transport* get () const
     {
       return this->curr_;
     };
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index c1e11a1484c..ee4e1641e7e 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -251,8 +251,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
           CORBA::TypeCode_var const tmp = member.label.type ();
 
           CORBA::Boolean const equiv =
-            discriminator_type->equivalent (tmp.in ()
-                                           );
+            discriminator_type->equivalent (tmp.in ());
 
           if (!equiv)
             {
@@ -266,8 +265,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
   CORBA::Boolean const unique_labels =
     this->unique_label_values (members,
                                discriminator_type,
-                               raw_default_index
-                              );
+                               raw_default_index);
 
   if (!unique_labels)
     {
@@ -746,8 +744,7 @@ TAO_TypeCodeFactory_i::create_value_tc (
                                       type_modifier,
                                       concrete_base,
                                       members,
-                                      CORBA::tk_value
-                                     );
+                                      CORBA::tk_value);
 }
 
 CORBA::TypeCode_ptr
@@ -799,27 +796,23 @@ TAO_TypeCodeFactory_i::create_abstract_interface_tc (
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_abstract_interface
-                                );
+                                 CORBA::tk_abstract_interface);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_local_interface_tc (
     const char *id,
-    const char *name
-  )
+    const char *name)
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_local_interface
-                                );
+                                 CORBA::tk_local_interface);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_component_tc (
     const char *id,
-    const char *name
-  )
+    const char *name)
 {
   return this->create_tc_common (id,
                                  name,
@@ -1216,8 +1209,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
       CORBA::TypeCode_ptr const member_tc = members[index].type.in ();
 
       CORBA::Boolean const valid_member =
-        this->valid_content_type (member_tc
-                                 );
+        this->valid_content_type (member_tc);
 
       if (!valid_member)
         {
@@ -1534,12 +1526,10 @@ CORBA::Boolean
 TAO_TypeCodeFactory_i::unique_label_values (
   const CORBA::UnionMemberSeq &members,
   CORBA::TypeCode_ptr disc_tc,
-  CORBA::ULong default_index_slot
-  )
+  CORBA::ULong default_index_slot)
 {
-  CORBA::TCKind disc_kind = disc_tc->kind ();
-
-  CORBA::ULong length = members.length ();
+  CORBA::TCKind const disc_kind = disc_tc->kind ();
+  CORBA::ULong const length = members.length ();
 
   // We have already checked for valid discriminator type
   // and valid label types, so we won't check for any of that here.
@@ -1689,8 +1679,7 @@ TAO_TypeCodeFactory_i::unique_label_values (
 }
 
 CORBA::Boolean
-TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
-                                        )
+TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc)
 {
   CORBA::TCKind const kind = tc->kind ();
 
diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp
index ed855ffc906..cb97ddae79e 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.cpp
+++ b/TAO/tao/TypeCodeFactory_Adapter.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Dynamic_Service.h"
 
-TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter (void)
+TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter ()
 {
 }
 
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 6091692a48b..2f065c382d6 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -64,7 +64,7 @@ namespace TAO
 class TAO_Export TAO_TypeCodeFactory_Adapter : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_TypeCodeFactory_Adapter (void);
+  virtual ~TAO_TypeCodeFactory_Adapter ();
 
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index fb5f23cb076..5221d90c31f 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -42,7 +42,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    const typename S_var::s_traits::char_type * arg (void) const;
+    const typename S_var::s_traits::char_type * arg () const;
 
   protected:
     typename S_var::s_traits::char_type const * x_;
@@ -61,9 +61,9 @@ namespace TAO
   {
   public:
     In_UB_String_Clonable_Argument_T (const typename S_var::s_traits::char_type * x);
-    virtual ~In_UB_String_Clonable_Argument_T (void);
+    virtual ~In_UB_String_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -87,7 +87,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_;
@@ -110,7 +110,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_;
@@ -127,15 +127,15 @@ namespace TAO
   class Ret_UB_String_Argument_T : public RetArgument
   {
   public:
-    Ret_UB_String_Argument_T (void);
+    Ret_UB_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 * excp (void);
-    typename S_var::s_traits::char_type * retn (void);
+    typename S_var::s_traits::char_type *& arg ();
+    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/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
index 3dcac56a8b8..c6839076d9d 100644
--- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
@@ -12,7 +12,6 @@
 #include "tao/Generic_Sequence_T.h"
 #include "tao/String_Sequence_Element_T.h"
 #include "tao/String_Const_Sequence_Element_T.h"
-#include "tao/MM_Sequence_Iterator_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -112,117 +111,9 @@ public:
     implementation_type::freebuf(buffer);
   }
 
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  ///
-  /// Additions to support iterator semantics for TAO unbounded basic
-  /// string sequences.
-  ///
-
-  // = Traits and factory methods that create iterators.
-  typedef MM_Sequence_Iterator<unbounded_basic_string_sequence<charT> > iterator;
-  typedef Const_MM_Sequence_Iterator<unbounded_basic_string_sequence<charT> > const_iterator;
-  typedef MM_Sequence_Reverse_Iterator<unbounded_basic_string_sequence<charT> > reverse_iterator;
-  typedef Const_MM_Sequence_Reverse_Iterator<unbounded_basic_string_sequence<charT> > const_reverse_iterator;
-
-  /// Get an iterator that points to the beginning of the sequence.
-  inline iterator begin (void)
-  {
-    return iterator (&this->impl_);
-  }
-
-  /// Get a const iterator that points to the beginning of the sequence.
-  inline const_iterator begin (void) const
-  {
-    return const_iterator (&this->impl_);
-  }
-
-  /// Get an iterator that points to the end of the sequence.
-  inline iterator end (void)
-  {
-    return iterator (&this->impl_,
-                     this->impl_.length ());
-  }
-
-  /// Get a const iterator that points to the end of the sequence.
-  inline const_iterator end (void) const
-  {
-    return const_iterator (&this->impl_,
-                           this->impl_.length ());
-  }
-
-  /// Get a reverse iterator that points to the end of the sequence.
-  inline reverse_iterator rbegin (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             this->impl_.length () - 1);
-  }
-
-  /// Get a const reverse iterator that points to the end of the sequence.
-  inline const_reverse_iterator rbegin (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   this->impl_.length () - 1);
-  }
-
-  /// Get a reverse iterator that points to one before the beginning
-  /// of the sequence.
-  inline reverse_iterator rend (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             -1);
-  }
-
-  /// Get a const reverse iterator that points to one before the
-  /// beginning of the sequence.
-  inline const_reverse_iterator rend (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   -1);
-  }
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 private:
   implementation_type impl_;
 };
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-/*
-// Below is an attempt at template specialization that would
-// not compile. It might be useful later.
-// Generic_Sequence_Iterator template specializations for
-// Unbounded_Basic_String_Sequence. These are needed since
-// Unbounded_Basic_String_Sequence does some memory management with
-// the strings. Without these specialization we leak memory.
-
-/// Dereference operator returns a reference to the item contained
-/// at the current position. This dereference implies string
-/// memory management.
-// template<typename charT>
-   unbounded_basic_string_sequence<char>::element_type&
-     details::Generic_Sequence_Iterator<unbounded_basic_string_sequence<char>, unbounded_basic_string_sequence::allocation_traits, unbounded_basic_string_sequence::element_traits >::operator* (void)
-     {
-       // Access the underlying element in the sequence.
-       //return element_type (impl_[i], release());
-       return element_type ((*(this->sequence_))[this->pos_],
-                            this->sequence_->release());
-     }
-
- /// Returns a const reference to the item contained at the current position
-   // template<typename charT>
-   unbounded_basic_string_sequence<char>::const_element_type&
-   details::Generic_Sequence_Iterator<unbounded_basic_string_sequence<char> >::operator* (void) const
- {
-   // Access the underlying element in the sequence.
-   //return const_element_type (impl_[i], release());
-   return const_element_type ((*(this->sequence_))[this->pos_],
-                              this->sequence_->release ());
- }
-*/
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
index 1f63609def6..cbbb8a59336 100644
--- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
+++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
@@ -12,7 +12,6 @@
 #include "Generic_Sequence_T.h"
 #include "Object_Reference_Sequence_Element_T.h"
 #include "Object_Reference_Const_Sequence_Element_T.h"
-#include "tao/MM_Sequence_Iterator_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -107,73 +106,6 @@ public:
     implementation_type::freebuf(buffer);
   }
 
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-  /// Additions to support iterator semantics for TAO unbounded object reference
-  /// sequences.
-
-  // = Traits and factory methods that create iterators.
-  typedef MM_Sequence_Iterator<unbounded_object_reference_sequence<object_t, object_t_var> > iterator;
-  typedef Const_MM_Sequence_Iterator<unbounded_object_reference_sequence<object_t, object_t_var> > const_iterator;
-  typedef MM_Sequence_Reverse_Iterator<unbounded_object_reference_sequence<object_t, object_t_var> > reverse_iterator;
-  typedef Const_MM_Sequence_Reverse_Iterator<unbounded_object_reference_sequence<object_t, object_t_var> > const_reverse_iterator;
-
-  /// Get an iterator that points to the beginning of the sequence.
-  iterator begin (void)
-  {
-    return iterator (&this->impl_);
-  }
-
-  /// Get a const iterator that points to the beginning of the sequence.
-  const_iterator begin (void) const
-  {
-    return const_iterator (&this->impl_);
-  }
-
-  /// Get an iterator that points to the end of the sequence.
-  iterator end (void)
-  {
-    return iterator (&this->impl_,
-                     this->impl_.length ());
-  }
-
-  /// Get a const iterator that points to the end of the sequence.
-  const_iterator end (void) const
-  {
-    return const_iterator (&this->impl_,
-                           this->impl_.length ());
-  }
-
-  /// Get a reverse iterator that points to the end of the sequence.
-  reverse_iterator rbegin (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             this->impl_.length () - 1);
-  }
-
-  /// Get a const reverse iterator that points to the end of the sequence.
-  const_reverse_iterator rbegin (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   this->impl_.length () - 1);
-  }
-
-  /// Get a reverse iterator that points to one before the beginning
-  /// of the sequence.
-  reverse_iterator rend (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             -1);
-  }
-
-  /// Get a const reverse iterator that points to one before the
-  /// beginning of the sequence.
-  const_reverse_iterator rend (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   -1);
-  }
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 private:
   implementation_type impl_;
 };
diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h
index c3ec3ec5bbd..d50b8b8be03 100644
--- a/TAO/tao/Unbounded_Octet_Sequence_T.h
+++ b/TAO/tao/Unbounded_Octet_Sequence_T.h
@@ -239,7 +239,7 @@ public:
 
   /// Returns the underlying message block, the caller must *not*
   /// release the copy.
-  inline ACE_Message_Block* mb (void) const {
+  inline ACE_Message_Block* mb () const {
     return mb_;
   }
 
diff --git a/TAO/tao/Unbounded_Value_Sequence_T.h b/TAO/tao/Unbounded_Value_Sequence_T.h
index c3b5a53e60c..a82aa26e6c4 100644
--- a/TAO/tao/Unbounded_Value_Sequence_T.h
+++ b/TAO/tao/Unbounded_Value_Sequence_T.h
@@ -88,71 +88,6 @@ public:
     implementation_type::freebuf(buffer);
   }
 
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  ///
-  /// Additions to support iterator semantics for TAO unbounded value
-  /// sequences.
-  ///
-
-  // = Traits and factory methods that create iterators.
-  typedef details::Generic_Sequence_Iterator<details::generic_sequence<value_type, allocation_traits, element_traits> > iterator;
-  typedef details::Const_Generic_Sequence_Iterator<details::generic_sequence<value_type, allocation_traits, element_traits> > const_iterator;
-  typedef details::Generic_Sequence_Reverse_Iterator<details::generic_sequence<value_type, allocation_traits, element_traits> > reverse_iterator;
-  typedef details::Const_Generic_Sequence_Reverse_Iterator<details::generic_sequence<value_type, allocation_traits, element_traits> > const_reverse_iterator;
-
-  // Get an iterator that points to the beginning of the sequence.
-  iterator begin (void)
-  {
-    return impl_.begin ();
-  }
-
-  // Get a const iterator that points to the beginning of the sequence.
-  const_iterator begin (void) const
-  {
-    return impl_.begin ();
-  }
-
-  // Get an iterator that points to the end of the sequence.
-  iterator end (void)
-  {
-    return impl_.end ();
-  }
-
-  // Get a const iterator that points to the end of the sequence.
-  const_iterator end (void) const
-  {
-    return impl_.end ();
-  }
-
-  // Get a reverse iterator that points to the end of the sequence.
-  reverse_iterator rbegin (void)
-  {
-    return impl_.rbegin ();
-  }
-
-  // Get a const reverse iterator that points to the end of the sequence.
-  const_reverse_iterator rbegin (void) const
-  {
-    return impl_.rbegin ();
-  }
-
-  // Get a reverse iterator that points to one before the beginning
-  // of the sequence.
-  reverse_iterator rend (void)
-  {
-    return impl_.rend ();
-  }
-
-  // Get a const reverse iterator that points to one before the
-  // beginning of the sequence.
-  const_reverse_iterator rend (void) const
-  {
-    return impl_.rend ();
-  }
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
 private:
   implementation_type impl_;
 };
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 34bf89289d5..590916c2753 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Virtual.  Do not inline.
-CORBA::UserException::~UserException (void)
+CORBA::UserException::~UserException ()
 {
 }
 
@@ -23,13 +23,13 @@ CORBA::UserException::operator= (CORBA::UserException const & rhs)
 
 // Virtual.  Do not inline.
 CORBA::TypeCode_ptr
-CORBA::UserException::_tao_type (void) const
+CORBA::UserException::_tao_type () const
 {
-  return 0;
+  return nullptr;
 }
 
 ACE_CString
-CORBA::UserException::_info (void) const
+CORBA::UserException::_info () const
 {
   // @@ we can use the exception's typecode to dump all the data held
   // within it ...
diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h
index f2461dd1142..6869abd5a47 100644
--- a/TAO/tao/UserException.h
+++ b/TAO/tao/UserException.h
@@ -44,7 +44,7 @@ namespace CORBA
     UserException (UserException const &rhs);
 
     /// Destructor.
-    virtual ~UserException (void);
+    virtual ~UserException ();
 
     /// Assignment operator.
     UserException &operator= (UserException const &rhs);
@@ -55,9 +55,9 @@ namespace CORBA
     /// The const version of narrow operation
     static const UserException *_downcast (CORBA::Exception const *exception);
 
-    virtual void _raise (void) const = 0;
+    virtual void _raise () const = 0;
 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type () const;
 
     // = TAO specific extension.
 
@@ -66,11 +66,11 @@ namespace CORBA
 
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
-    virtual ACE_CString _info (void) const;
+    virtual ACE_CString _info () const;
 
   protected:
     /// Default constructor.
-    UserException (void);
+    UserException ();
   };
 
 }
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index d23b249e062..f9825071858 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -25,11 +25,7 @@
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Object.h"  /* For CORBA::Object_var */
 #include "tao/Pseudo_VarOut_T.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -55,7 +51,6 @@ namespace CORBA
   class TAO_Valuetype_Export AbstractBase
   {
   public:
-
     /// Constructor.
     /**
      * This constructor is only meant to be called by the
@@ -72,21 +67,21 @@ namespace CORBA
 
     static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj);
     static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj);
-    static CORBA::AbstractBase_ptr _nil (void);
+    static CORBA::AbstractBase_ptr _nil ();
 
     /// Used in the implementation of CORBA::Any
     static void _tao_any_destructor (void*);
 
     /// Spec required conversion operations
-    CORBA::Object_ptr _to_object (void);
-    CORBA::ValueBase *_to_value (void);
+    CORBA::Object_ptr _to_object ();
+    CORBA::ValueBase *_to_value ();
 
     virtual CORBA::Boolean _is_a (const char *type_id);
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _interface_repository_id () const;
 
     /// TAO specific operations
 
-    virtual const char* _tao_obv_repository_id (void) const;
+    virtual const char* _tao_obv_repository_id () const;
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
     virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t) const;
@@ -102,17 +97,17 @@ namespace CORBA
 #endif /* GEN_OSTREAM_OPS */
 
     /// Memory management operations
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
+    virtual void _add_ref ();
+    virtual void _remove_ref ();
 
-    CORBA::Boolean _is_objref (void) const;
+    CORBA::Boolean _is_objref () const;
 
     /// Return the stub object
-    TAO_Stub *_stubobj (void) const;
+    TAO_Stub *_stubobj () const;
 
     /// Acessors
-    CORBA::Boolean _is_collocated (void) const;
-    TAO_Abstract_ServantBase *_servant (void) const;
+    CORBA::Boolean _is_collocated () const;
+    TAO_Abstract_ServantBase *_servant () const;
 
     /// Return the equivalent object reference.
     /**
@@ -120,39 +115,32 @@ namespace CORBA
      * a var or some such thing. The memory is owned by @c this
      * object.
      */
-    CORBA::Object_ptr equivalent_objref (void);
+    CORBA::Object_ptr equivalent_objref ();
 
     /// Wrapper for _remove_ref(), naming convention for
     /// templatizing.
-    void _decr_refcount (void);
+    void _decr_refcount ();
 
   protected:
-
-    AbstractBase (void);
+    AbstractBase ();
     AbstractBase (const AbstractBase &);
 
-    virtual ~AbstractBase (void);
+    virtual ~AbstractBase ();
 
   protected:
 
     CORBA::Boolean is_objref_;
 
   private:
-
     AbstractBase & operator= (const AbstractBase &);
 
-    virtual CORBA::ValueBase *_tao_to_value (void);
+    virtual CORBA::ValueBase *_tao_to_value ();
 
     CORBA::Object_ptr create_object (TAO_Stub *stub);
 
   private:
-
     /// Number of outstanding references to this object.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
 
     CORBA::Boolean is_collocated_;
     TAO_Abstract_ServantBase *servant_;
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
index 1b348223320..4522590249d 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
@@ -58,11 +58,10 @@ namespace TAO
     // Don't allow default initializations
     AbstractBase_Invocation_Adapter (void);
 
-    // Disallow copying and assignment.
-    AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &);
-    AbstractBase_Invocation_Adapter & operator= (
-        const AbstractBase_Invocation_Adapter &);
-
+    AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &) = delete;
+    AbstractBase_Invocation_Adapter & operator= (const AbstractBase_Invocation_Adapter &) = delete;
+    AbstractBase_Invocation_Adapter (AbstractBase_Invocation_Adapter &&) = delete;
+    AbstractBase_Invocation_Adapter & operator= (AbstractBase_Invocation_Adapter &&) = delete;
   };
 } // End namespace TAO
 
diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
index 4f8556a5630..4ec02bb7989 100644
--- a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
+++ b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
@@ -11,7 +11,6 @@
 #include "Valuetype_Traits_T.h"
 #include "tao/Generic_Sequence_T.h"
 #include "Valuetype_Sequence_Element_T.h"
-#include "tao/MM_Sequence_Iterator_T.h"
 #include "tao/Bounded_Reference_Allocation_Traits_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -98,78 +97,6 @@ public:
     implementation_type::freebuf(buffer);
   }
 
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  ///
-  /// Additions to support iterator semantics for TAO bounded value type
-  /// sequences.
-  ///
-
-  // = Traits and factory methods that create iterators.
-  typedef MM_Sequence_Iterator<bounded_valuetype_sequence<object_t, object_t_var, MAX> > iterator;
-  typedef Const_MM_Sequence_Iterator<bounded_valuetype_sequence<object_t, object_t_var, MAX> > const_iterator;
-  typedef MM_Sequence_Reverse_Iterator<bounded_valuetype_sequence<object_t, object_t_var, MAX> > reverse_iterator;
-  typedef Const_MM_Sequence_Reverse_Iterator<bounded_valuetype_sequence<object_t, object_t_var, MAX> > const_reverse_iterator;
-
-  // Get an iterator that points to the beginning of the sequence.
-  inline iterator begin (void)
-  {
-    return iterator (&this->impl_);
-  }
-
-  // Get a const iterator that points to the beginning of the sequence.
-  inline const_iterator begin (void) const
-  {
-    return const_iterator (&this->impl_);
-  }
-
-  // Get an iterator that points to the end of the sequence.
-  inline iterator end (void)
-  {
-    return iterator (&this->impl_,
-                     this->impl_.length ());
-  }
-
-  // Get a const iterator that points to the end of the sequence.
-  inline const_iterator end (void) const
-  {
-    return const_iterator (&this->impl_,
-                           this->impl_.length ());
-  }
-
-  // Get a reverse iterator that points to the end of the sequence.
-  inline reverse_iterator rbegin (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             this->impl_.length () - 1);
-  }
-
-  // Get a const reverse iterator that points to the end of the sequence.
-  inline const_reverse_iterator rbegin (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   this->impl_.length () - 1);
-  }
-
-  // Get a reverse iterator that points to one before the beginning
-  // of the sequence.
-  inline reverse_iterator rend (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             -1);
-  }
-
-  // Get a const reverse iterator that points to one before the
-  // beginning of the sequence.
-  inline const_reverse_iterator rend (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   -1);
-  }
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
-
 private:
   implementation_type impl_;
 };
diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
index 2055ec0b1d7..72a64f3a308 100644
--- a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
+++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
@@ -11,7 +11,6 @@
 #include "Valuetype_Traits_T.h"
 #include "tao/Generic_Sequence_T.h"
 #include "Valuetype_Sequence_Element_T.h"
-#include "tao/MM_Sequence_Iterator_T.h"
 #include "tao/Unbounded_Reference_Allocation_Traits_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -97,78 +96,6 @@ public:
     implementation_type::freebuf(buffer);
   }
 
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  ///
-  /// Additions to support iterator semantics for TAO unbounded value type
-  /// sequences.
-  ///
-
-  // = Traits and factory methods that create iterators.
-  typedef MM_Sequence_Iterator<unbounded_valuetype_sequence<object_t, object_t_var> > iterator;
-  typedef Const_MM_Sequence_Iterator<unbounded_valuetype_sequence<object_t, object_t_var> > const_iterator;
-  typedef MM_Sequence_Reverse_Iterator<unbounded_valuetype_sequence<object_t, object_t_var> > reverse_iterator;
-  typedef Const_MM_Sequence_Reverse_Iterator<unbounded_valuetype_sequence<object_t, object_t_var> > const_reverse_iterator;
-
-  // Get an iterator that points to the beginning of the sequence.
-  inline iterator begin (void)
-  {
-    return iterator (&this->impl_);
-  }
-
-  // Get a const iterator that points to the beginning of the sequence.
-  inline const_iterator begin (void) const
-  {
-    return const_iterator (&this->impl_);
-  }
-
-  // Get an iterator that points to the end of the sequence.
-  inline iterator end (void)
-  {
-    return iterator (&this->impl_,
-                     this->impl_.length ());
-  }
-
-  // Get a const iterator that points to the end of the sequence.
-  inline const_iterator end (void) const
-  {
-    return const_iterator (&this->impl_,
-                           this->impl_.length ());
-  }
-
-  // Get a reverse iterator that points to the end of the sequence.
-  inline reverse_iterator rbegin (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             this->impl_.length () - 1);
-  }
-
-  // Get a const reverse iterator that points to the end of the sequence.
-  inline const_reverse_iterator rbegin (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   this->impl_.length () - 1);
-  }
-
-  // Get a reverse iterator that points to one before the beginning
-  // of the sequence.
-  inline reverse_iterator rend (void)
-  {
-    return reverse_iterator (&this->impl_,
-                             -1);
-  }
-
-  // Get a const reverse iterator that points to one before the
-  // beginning of the sequence.
-  inline const_reverse_iterator rend (void) const
-  {
-    return const_reverse_iterator (&this->impl_,
-                                   -1);
-  }
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */
-
-
 private:
   implementation_type impl_;
 };
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index dd0a46c847e..0f4f33161b6 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -1428,11 +1428,7 @@ CORBA::DefaultValueRefCountBase::_tao_remove_ref (void)
 CORBA::ULong
 CORBA::DefaultValueRefCountBase::_tao_refcount_value (void) const
 {
-#if defined (ACE_HAS_CPP11)
   return this->refcount_;
-#else
-  return this->refcount_.value ();
-#endif /* ACE_HAS_CPP11 */
 }
 
 // ===========================================================
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index 25a68b6e00a..add847fabef 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -30,11 +30,7 @@
 #include "ace/Basic_Types.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 #include "ace/Null_Mutex.h"
 #include "ace/Vector_T.h"
 
@@ -147,12 +143,12 @@ namespace CORBA
 
     typedef ACE_Vector < ACE_CString > Repository_Id_List;
 
-    virtual CORBA::ValueBase* _copy_value (void) TAO_local_COPY_VALUE_IS_PURE;
+    virtual CORBA::ValueBase* _copy_value () TAO_local_COPY_VALUE_IS_PURE;
 
     // Reference counting.
-    virtual void _add_ref (void) = 0;
-    virtual void _remove_ref (void) = 0;
-    virtual CORBA::ULong _refcount_value (void) = 0;
+    virtual void _add_ref () = 0;
+    virtual void _remove_ref () = 0;
+    virtual CORBA::ULong _refcount_value () = 0;
 
     // dynamic casting
     static CORBA::ValueBase* _downcast (CORBA::ValueBase *);
@@ -161,10 +157,10 @@ namespace CORBA
 
     /// Used in the implementation of CORBA::Any
     static void _tao_any_destructor (void *);
-    virtual CORBA::TypeCode_ptr _tao_type (void) const = 0;
+    virtual CORBA::TypeCode_ptr _tao_type () const = 0;
 
     /// Return the repository id of this valuetype.
-    virtual const char * _tao_obv_repository_id (void) const = 0;
+    virtual const char * _tao_obv_repository_id () const = 0;
 
     /// Give the list of the RepositoryIds in the valuetype "truncatable"
     /// inheritance hierarchy. List the id of this valuetype as first
@@ -238,9 +234,9 @@ namespace CORBA
     virtual void truncation_hook ();
 
   protected:
-    ValueBase (void);
+    ValueBase ();
     ValueBase (const ValueBase&);
-    virtual ~ValueBase (void);
+    virtual ~ValueBase ();
 
     /// This flag is set to be true when the valuetype defined
     /// in the idl has the truncatable parent.
@@ -327,18 +323,18 @@ namespace CORBA
     : public virtual ValueBase
   {
   public:
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
-    virtual CORBA::ULong _refcount_value (void);
+    virtual void _add_ref ();
+    virtual void _remove_ref ();
+    virtual CORBA::ULong _refcount_value ();
 
     /// The _tao variants are inline for fast access from T_var
     /// (if valuetype T is compiled with optimization for that.) %! (todo)
-    void _tao_add_ref (void);
-    void _tao_remove_ref (void);
-    CORBA::ULong _tao_refcount_value (void) const;
+    void _tao_add_ref ();
+    void _tao_remove_ref ();
+    CORBA::ULong _tao_refcount_value () const;
 
   protected:
-    DefaultValueRefCountBase (void);
+    DefaultValueRefCountBase ();
     DefaultValueRefCountBase (const DefaultValueRefCountBase&);
     virtual ~DefaultValueRefCountBase ();
 
@@ -347,11 +343,7 @@ namespace CORBA
 
   private: // data
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
   }; // DefaultValueRefCountBase
 
   //  which lock has the lowest memory overhead ?
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 6003f803086..ddfafde6f4c 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -26,11 +26,7 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Null_Mutex.h"
-#if defined (ACE_HAS_CPP11)
-# include <atomic>
-#else
-# include "ace/Atomic_Op.h"
-#endif /* ACE_HAS_CPP11 */
+#include <atomic>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -54,29 +50,25 @@ namespace CORBA
   class TAO_Valuetype_Export ValueFactoryBase
   {
   public:
-    ValueFactoryBase (void);
-    virtual ~ValueFactoryBase (void);
+    ValueFactoryBase ();
+    virtual ~ValueFactoryBase ();
 
     // non-virtual is non-standard
-    void _add_ref (void);
-    void _remove_ref (void);
+    void _add_ref ();
+    void _remove_ref ();
 
     // private: %!
     /// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T)
     /// (see at definition below)
-    virtual CORBA::ValueBase * create_for_unmarshal (void) = 0;
+    virtual CORBA::ValueBase * create_for_unmarshal () = 0;
 
     /// Not pure virtual because this will be overridden only by valuetypes
     /// that support an abstract interface.
-    virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (void);
+    virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract ();
 
   private:
     /// Reference counter.
-#if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
-#else
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-#endif /* ACE_HAS_CPP11 */
   };
 
 }  // End CORBA namespace
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index 07e3818c5f9..0a5e67ec072 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -42,19 +42,19 @@ template <typename T>
 class TAO_Value_Var_T : private TAO_Base_var
 {
 public:
-  TAO_Value_Var_T (void);
+  TAO_Value_Var_T ();
   TAO_Value_Var_T (T *);
   TAO_Value_Var_T (const TAO_Value_Var_T<T> &);
 
   // (TAO extension)
   TAO_Value_Var_T (const T *);
 
-  ~TAO_Value_Var_T (void);
+  ~TAO_Value_Var_T ();
 
   TAO_Value_Var_T &operator= (T *);
   TAO_Value_Var_T &operator= (const TAO_Value_Var_T<T> &);
 
-  T * operator-> (void) const;
+  T * operator-> () const;
 
   operator const T * () const;
   operator T *& ();
@@ -65,13 +65,13 @@ public:
   typedef T *  _retn_type;
 
   // in, inout, out, _retn
-  _in_type in (void) const;
-  _inout_type inout (void);
-  _out_type out (void);
-  _retn_type _retn (void);
+  _in_type in () const;
+  _inout_type inout ();
+  _out_type out ();
+  _retn_type _retn ();
 
   // (TAO extension)
-  T * ptr (void) const;
+  T * ptr () const;
 
 private:
 
@@ -100,9 +100,9 @@ public:
   TAO_Value_Out_T &operator= (T *);
 
   operator T *& ();
-  T *& ptr (void);
+  T *& ptr ();
 
-  T * operator-> (void);
+  T * operator-> ();
 
 private:
   T *& ptr_;
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
index d2c013cf17d..0b8ab48fe36 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
@@ -39,12 +39,12 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Factory_Impl
   : public TAO_Valuetype_Adapter_Factory
 {
 public:
-  virtual ~TAO_Valuetype_Adapter_Factory_Impl (void);
+  virtual ~TAO_Valuetype_Adapter_Factory_Impl ();
 
-  virtual TAO_Valuetype_Adapter * create (void);
+  virtual TAO_Valuetype_Adapter * create ();
 
   // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static const int TAO_Requires_ValueType_Initializer =
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
index 9dec3450404..944d6ad3668 100644
--- a/TAO/tao/Valuetype_Adapter.cpp
+++ b/TAO/tao/Valuetype_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void)
+TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter ()
 {
 }
 
diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h
index db2f8c8539a..0b2dceb7b4f 100644
--- a/TAO/tao/Valuetype_Adapter.h
+++ b/TAO/tao/Valuetype_Adapter.h
@@ -51,7 +51,7 @@ class TAO_InputCDR;
 class TAO_Export TAO_Valuetype_Adapter : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_Valuetype_Adapter (void);
+  virtual ~TAO_Valuetype_Adapter ();
 
   virtual CORBA::Object_ptr abstractbase_to_object (
       CORBA::AbstractBase_ptr p) = 0;
@@ -63,7 +63,7 @@ public:
       TAO_InputCDR &,
       CORBA::AbstractBase_ptr &) = 0;
 
-  virtual CORBA::Long type_info_single (void) const = 0;
+  virtual CORBA::Long type_info_single () const = 0;
 
   virtual CORBA::Boolean is_type_info_implied (CORBA::Long) const = 0;
   virtual CORBA::Boolean is_type_info_single (CORBA::Long) const = 0;
diff --git a/TAO/tao/Valuetype_Adapter_Factory.cpp b/TAO/tao/Valuetype_Adapter_Factory.cpp
index e6f12a7d34c..eea713b06ad 100644
--- a/TAO/tao/Valuetype_Adapter_Factory.cpp
+++ b/TAO/tao/Valuetype_Adapter_Factory.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Valuetype_Adapter_Factory::~TAO_Valuetype_Adapter_Factory (void)
+TAO_Valuetype_Adapter_Factory::~TAO_Valuetype_Adapter_Factory ()
 {
 }
 
diff --git a/TAO/tao/Valuetype_Adapter_Factory.h b/TAO/tao/Valuetype_Adapter_Factory.h
index aa3cd1e5b91..3d90b5b5804 100644
--- a/TAO/tao/Valuetype_Adapter_Factory.h
+++ b/TAO/tao/Valuetype_Adapter_Factory.h
@@ -39,9 +39,9 @@ class TAO_Export TAO_Valuetype_Adapter_Factory
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_Valuetype_Adapter_Factory (void);
+  virtual ~TAO_Valuetype_Adapter_Factory ();
 
-  virtual TAO_Valuetype_Adapter * create (void) = 0;
+  virtual TAO_Valuetype_Adapter * create () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h
index a10d9bbe404..857399b3332 100644
--- a/TAO/tao/VarOut_T.h
+++ b/TAO/tao/VarOut_T.h
@@ -33,24 +33,24 @@ template<typename T>
 class TAO_Var_Base_T
 {
 public:
-  TAO_Var_Base_T (void);
+  TAO_Var_Base_T ();
   TAO_Var_Base_T (T *);
   TAO_Var_Base_T (const TAO_Var_Base_T<T> &);
 
-  ~TAO_Var_Base_T (void);
+  ~TAO_Var_Base_T ();
 
-  T * operator-> (void);
-  const T * operator-> (void) const;
+  T * operator-> ();
+  const T * operator-> () const;
 
   typedef const T &   _in_type;
   typedef       T &   _inout_type;
 
   // Common mapping for fixed and variable size types.
-  _in_type      in (void) const;
-  _inout_type   inout (void);
+  _in_type      in () const;
+  _inout_type   inout ();
 
   // TAO extension.
-  T * ptr (void) const;
+  T * ptr () const;
   operator T *& ();
 
 protected:
@@ -67,7 +67,7 @@ template<typename T>
 class TAO_Fixed_Var_T : public TAO_Var_Base_T<T>
 {
 public:
-  TAO_Fixed_Var_T (void);
+  TAO_Fixed_Var_T ();
   TAO_Fixed_Var_T (T *);
   TAO_Fixed_Var_T (const TAO_Fixed_Var_T<T> &);
 
@@ -88,8 +88,8 @@ public:
   typedef T     _retn_type;
 
   // Mapping for fixed size types.
-  _out_type     out (void);
-  _retn_type    _retn (void);
+  _out_type     out ();
+  _retn_type    _retn ();
 };
 
 /**
@@ -102,7 +102,7 @@ template<typename T>
 class TAO_Var_Var_T : public TAO_Var_Base_T<T>
 {
 public:
-  TAO_Var_Var_T (void);
+  TAO_Var_Var_T ();
   TAO_Var_Var_T (T *);
   TAO_Var_Var_T (const TAO_Var_Var_T<T> &);
 
@@ -117,8 +117,8 @@ public:
   typedef T *   _retn_type;
 
   // Mapping for variable size types.
-  _out_type     out (void);
-  _retn_type    _retn (void);
+  _out_type     out ();
+  _retn_type    _retn ();
 };
 
 /**
@@ -141,8 +141,8 @@ public:
   TAO_Out_T &operator= (T *);
 
   operator T *& ();
-  T *& ptr (void);
-  T * operator-> (void);
+  T *& ptr ();
+  T * operator-> ();
 
 private:
   T *& ptr_;
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 3a633f2d815..f83e7d86abb 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -40,7 +40,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type const * arg (void) const;
+    typename S_forany::_slice_type const * arg () const;
 
   protected:
     S_forany x_;
@@ -59,9 +59,9 @@ namespace TAO
   {
   public:
     In_Var_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x);
-    virtual ~In_Var_Array_Clonable_Argument_T (void);
+    virtual ~In_Var_Array_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -85,7 +85,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     S_forany x_;
@@ -109,7 +109,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     typename S_forany::_slice_type *& x_;
@@ -127,16 +127,16 @@ namespace TAO
   class Ret_Var_Array_Argument_T : public RetArgument
   {
   public:
-    Ret_Var_Array_Argument_T (void);
+    Ret_Var_Array_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_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
-    typename S_forany::_slice_type * excp (void);
-    typename S_forany::_slice_type * retn (void);
+    typename S_forany::_slice_type * excp ();
+    typename S_forany::_slice_type * retn ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index d5425df51d5..404a03165a5 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -40,7 +40,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
+    S const & arg () const;
 
   protected:
     const S * x_;
@@ -62,9 +62,9 @@ namespace TAO
   {
   public:
     In_Var_Size_Clonable_Argument_T (S const & x);
-    virtual ~In_Var_Size_Clonable_Argument_T (void);
+    virtual ~In_Var_Size_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -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_;
@@ -111,7 +111,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_;
@@ -128,16 +128,16 @@ namespace TAO
   class Ret_Var_Size_Argument_T : public RetArgument
   {
   public:
-    Ret_Var_Size_Argument_T (void);
+    Ret_Var_Size_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 */
-    S *& arg (void);
+    S *& arg ();
 
-    S * excp (void);
-    S * retn (void);
+    S * excp ();
+    S * retn ();
 
   protected:
     typename S::_var_type x_;
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index e3aa3a5cd76..10655235dc0 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,8 +4,8 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 11
-#define TAO_BETA_VERSION 11
-#define TAO_VERSION "2.5.11"
-#define TAO_VERSION_CODE 132363
+#define TAO_MICRO_VERSION 12
+#define TAO_BETA_VERSION 12
+#define TAO_VERSION "2.5.12"
+#define TAO_VERSION_CODE 132364
 #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 16405fa3774..c6d79a32ff4 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -11,7 +11,7 @@ namespace TAO
   {
   }
 
-  Wait_On_LF_No_Upcall::~Wait_On_LF_No_Upcall (void)
+  Wait_On_LF_No_Upcall::~Wait_On_LF_No_Upcall ()
   {
   }
 
@@ -25,7 +25,7 @@ namespace TAO
   }
 
   bool
-  Wait_On_LF_No_Upcall::can_process_upcalls (void) const
+  Wait_On_LF_No_Upcall::can_process_upcalls () const
   {
     if ((this->transport_->opened_as () == TAO::TAO_SERVER_ROLE) &&
         (this->transport_->bidirectional_flag () == -1))
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index de6873224f4..4491baac65e 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -13,20 +13,12 @@ TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower
 {
 }
 
-TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void)
+TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower ()
 {
 }
 
-/*
- * Hook to specialize the wait strategy when the concrete strategy is
- * a simple "lf" strategy. Add all public/protected/private methods
- * within the *COPY* hooks.
- */
-
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
-
 int
-TAO_Wait_On_Leader_Follower::register_handler (void)
+TAO_Wait_On_Leader_Follower::register_handler ()
 {
   if (!this->is_registered_)
     {
@@ -37,7 +29,7 @@ TAO_Wait_On_Leader_Follower::register_handler (void)
 }
 
 bool
-TAO_Wait_On_Leader_Follower::non_blocking (void) const
+TAO_Wait_On_Leader_Follower::non_blocking () const
 {
   return true;
 }
@@ -52,8 +44,6 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
       this->transport_->register_handler ();
     }
 
-  // Send the request.
-//@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
   return this->TAO_Wait_Strategy::sending_request (orb_core, msg_semantics);
 }
 
@@ -67,14 +57,9 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time,
 }
 
 bool
-TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const
+TAO_Wait_On_Leader_Follower::can_process_upcalls () const
 {
   return true;
 }
 
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_END
-/*
- * End copy hook.
- */
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 7232bf64838..4e73e0109f9 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -13,7 +13,7 @@ TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
 {
 }
 
-TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor (void)
+TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor ()
 {
 }
 
@@ -49,7 +49,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
 
       // Did we timeout? If so, stop running the loop.
       if (result == 0
-          && max_wait_time != 0
+          && max_wait_time != nullptr
           && *max_wait_time == ACE_Time_Value::zero)
         {
           break;
@@ -70,7 +70,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
     }
 
   // Return an error if there was a problem receiving the reply.
-  if (max_wait_time != 0)
+  if (max_wait_time != nullptr)
     {
       if (rd.successful (leader_follower) && *max_wait_time == ACE_Time_Value::zero)
         {
@@ -93,7 +93,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
 
 // Register the handler with the Reactor.
 int
-TAO_Wait_On_Reactor::register_handler (void)
+TAO_Wait_On_Reactor::register_handler ()
 {
   if (!this->is_registered_)
     {
@@ -104,13 +104,13 @@ TAO_Wait_On_Reactor::register_handler (void)
 }
 
 bool
-TAO_Wait_On_Reactor::non_blocking (void) const
+TAO_Wait_On_Reactor::non_blocking () const
 {
   return true;
 }
 
 bool
-TAO_Wait_On_Reactor::can_process_upcalls (void) const
+TAO_Wait_On_Reactor::can_process_upcalls () const
 {
   return true;
 }
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index f2cc92134e3..0105e9ed5f4 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -16,18 +16,10 @@ TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport)
 }
 
 // Destructor.
-TAO_Wait_On_Read::~TAO_Wait_On_Read (void)
+TAO_Wait_On_Read::~TAO_Wait_On_Read ()
 {
 }
 
-/*
- * Hook to specialize the wait strategy when the concrete strategy is
- * a simple "rw" strategy. Add all public/protected/private methods
- * within the *COPY* hooks.
- */
-
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
-
 int
 TAO_Wait_On_Read::sending_request (TAO_ORB_Core *orb_core,
                                    TAO_Message_Semantics msg_semantics)
@@ -49,7 +41,6 @@ TAO_Wait_On_Read::sending_request (TAO_ORB_Core *orb_core,
     }
 
   // Send the request.
-//@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
   return this->TAO_Wait_Strategy::sending_request (orb_core, msg_semantics);
 }
 
@@ -68,7 +59,6 @@ TAO_Wait_On_Read::finished_request ()
       }
     }
 
-  //@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
     this->TAO_Wait_Strategy::finished_request ();
 }
 
@@ -157,26 +147,21 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
 
 // No-op.
 int
-TAO_Wait_On_Read::register_handler (void)
+TAO_Wait_On_Read::register_handler ()
 {
   return 0;
 }
 
 bool
-TAO_Wait_On_Read::non_blocking (void) const
+TAO_Wait_On_Read::non_blocking () const
 {
   return false;
 }
 
 bool
-TAO_Wait_On_Read::can_process_upcalls (void) const
+TAO_Wait_On_Read::can_process_upcalls () const
 {
   return true;
 }
 
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_END
-/*
- * End copy hook.
- */
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index efb90ca1103..fc13c417789 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -1,7 +1,5 @@
 #include "tao/Wait_Strategy.h"
 
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Wait_Strategy.inl"
 #endif /* __ACE_INLINE__ */
@@ -16,7 +14,7 @@ TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport)
 }
 
 // Destructor.
-TAO_Wait_Strategy::~TAO_Wait_Strategy (void)
+TAO_Wait_Strategy::~TAO_Wait_Strategy ()
 {
 }
 
@@ -26,25 +24,15 @@ TAO_Wait_Strategy::defer_upcall (ACE_Event_Handler*)
   return -1;
 }
 
-/*
- * Hook to comment out this method in the lf wait strategy
- */
-//@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START
 int
 TAO_Wait_Strategy::sending_request (TAO_ORB_Core *, TAO_Message_Semantics)
 {
   return 0;
 }
-//@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_END
 
 void
 TAO_Wait_Strategy::finished_request ()
 {
 }
 
-/*
- * Hook to specialize the Wait Strategy
- */
-//@@ TAO_WAIT_STRATEGY_SPL_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 3c495b7da3d..34fdab5d184 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -46,7 +46,7 @@ public:
   explicit TAO_Wait_Strategy (TAO_Transport *transport);
 
   /// Destructor.
-  virtual ~TAO_Wait_Strategy (void);
+  virtual ~TAO_Wait_Strategy ();
 
   /**
    * The user is going to send a request, prepare any internal
@@ -66,11 +66,11 @@ public:
 
   /// Register the handler needs with the reactor provided that it makes
   /// sense for the strategy.
-  virtual int register_handler (void) = 0;
+  virtual int register_handler () = 0;
 
   /// Returns a value to indicate whether the transport needs to set
   /// the socket on which it is waiting to non-blocking mode or not.
-  virtual bool non_blocking (void) const = 0;
+  virtual bool non_blocking () const = 0;
 
   /// Flag that indicates whether we can process requests while
   /// waiting for the reply.
@@ -80,7 +80,7 @@ public:
    * Wait_On_LF_No_Upcall does not allow the client threads to process
    * requests while waiting for the reply.
    */
-  virtual bool can_process_upcalls (void) const = 0;
+  virtual bool can_process_upcalls () const = 0;
 
   /// Method to support deffering an upcall event till later in
   /// cases where can_process_upcalls() returns false.
@@ -91,7 +91,7 @@ public:
   virtual int defer_upcall (ACE_Event_Handler*);
 
   /// Get method for the flag
-  bool is_registered (void) const;
+  bool is_registered () const;
 
   /// Set method for the flag
   void is_registered (bool flag);
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index e9055d36cda..a2f1be23a7b 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -48,7 +48,7 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
-CORBA::WrongTransaction::WrongTransaction (void)
+CORBA::WrongTransaction::WrongTransaction ()
   : CORBA::UserException (
         "IDL:omg.org/CORBA/WrongTransaction:1.0",
         "WrongTransaction"
@@ -56,7 +56,7 @@ CORBA::WrongTransaction::WrongTransaction (void)
 {
 }
 
-CORBA::WrongTransaction::~WrongTransaction (void)
+CORBA::WrongTransaction::~WrongTransaction ()
 {
 }
 
@@ -94,26 +94,26 @@ CORBA::WrongTransaction::_downcast (CORBA::Exception const *_tao_excp)
   return dynamic_cast<const WrongTransaction *> (_tao_excp);
 }
 
-CORBA::Exception *CORBA::WrongTransaction::_alloc (void)
+CORBA::Exception *CORBA::WrongTransaction::_alloc ()
 {
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::WrongTransaction, 0);
+  CORBA::Exception *retval = nullptr;
+  ACE_NEW_RETURN (retval, ::CORBA::WrongTransaction, nullptr);
   return retval;
 }
 
 CORBA::Exception *
-CORBA::WrongTransaction::_tao_duplicate (void) const
+CORBA::WrongTransaction::_tao_duplicate () const
 {
-  CORBA::Exception *result = 0;
+  CORBA::Exception *result = nullptr;
   ACE_NEW_RETURN (
       result,
       ::CORBA::WrongTransaction (*this),
-      0
+      nullptr
     );
   return result;
 }
 
-void CORBA::WrongTransaction::_raise (void) const
+void CORBA::WrongTransaction::_raise () const
 {
   throw *this;
 }
@@ -143,13 +143,13 @@ void CORBA::WrongTransaction::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const
+CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type () const
 {
   TAO_AnyTypeCode_Adapter *adapter =
     ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
         "AnyTypeCode_Adapter"
       );
-  if (adapter != 0)
+  if (adapter != nullptr)
     return adapter->_tao_type_WrongTransaction ();
   else
     {
@@ -157,7 +157,7 @@ CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const
                   ACE_TEXT ("(%P|%t) %p\n"),
                   ACE_TEXT ("Unable to find the ")
                   ACE_TEXT ("AnyTypeCode Adapter instance")));
-      return 0;
+      return nullptr;
     }
 }
 
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index d0094a94f67..11ce0f2f73a 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -63,9 +63,9 @@ namespace CORBA
   {
   public:
 
-    WrongTransaction (void);
+    WrongTransaction ();
     WrongTransaction (const WrongTransaction &);
-    ~WrongTransaction (void);
+    ~WrongTransaction ();
 
     WrongTransaction &operator= (const WrongTransaction &);
 
@@ -74,11 +74,11 @@ namespace CORBA
     static WrongTransaction *_downcast (CORBA::Exception *);
     static const WrongTransaction *_downcast (CORBA::Exception const *);
 
-    static CORBA::Exception *_alloc (void);
+    static CORBA::Exception *_alloc ();
 
-    virtual CORBA::Exception *_tao_duplicate (void) const;
+    virtual CORBA::Exception *_tao_duplicate () const;
 
-    virtual void _raise (void) const;
+    virtual void _raise () const;
 
     virtual void _tao_encode (
         TAO_OutputCDR &
@@ -91,7 +91,7 @@ namespace CORBA
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type () const;
   };
 
 #endif /* end #if !defined */
diff --git a/TAO/tao/ZIOP_Adapter.cpp b/TAO/tao/ZIOP_Adapter.cpp
index 39a38991533..8f9c4a5cba2 100644
--- a/TAO/tao/ZIOP_Adapter.cpp
+++ b/TAO/tao/ZIOP_Adapter.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ZIOP_Adapter::~TAO_ZIOP_Adapter (void)
+TAO_ZIOP_Adapter::~TAO_ZIOP_Adapter ()
 {
 }
 
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 8edce81619d..221e680cb50 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -21,7 +21,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
+TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory ()
   : transport_mux_strategy_ (TAO_MUXED_TMS)
   , wait_strategy_ (TAO_WAIT_ON_LEADER_FOLLOWER)
   , connect_strategy_ (TAO_LEADER_FOLLOWER_CONNECT)
@@ -57,7 +57,7 @@ TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
 #endif
 }
 
-TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory (void)
+TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory ()
 {
 }
 
@@ -242,7 +242,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
              {
                ACE_TCHAR* name = argv[curarg];
 
-               ACE_TCHAR *err = 0;
+               ACE_TCHAR *err = nullptr;
                long limit = ACE_OS::strtol (name, &err, 10);
                if (err && *err != 0)
                  {
@@ -264,7 +264,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
              {
                ACE_TCHAR* name = argv[curarg];
 
-               ACE_TCHAR *err = 0;
+               ACE_TCHAR *err = nullptr;
                long limit = ACE_OS::strtol (name, &err, 10);
                if (err && *err != 0)
                  {
@@ -287,7 +287,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
              {
                ACE_TCHAR* name = argv[curarg];
 
-               ACE_TCHAR *err = 0;
+               ACE_TCHAR *err = nullptr;
                long limit = ACE_OS::strtol (name, &err, 10);
                if (err && *err != 0)
                  {
@@ -309,7 +309,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
              {
                ACE_TCHAR* name = argv[curarg];
 
-               ACE_TCHAR *err = 0;
+               ACE_TCHAR *err = nullptr;
                long limit = ACE_OS::strtol (name, &err, 10);
                if (err && *err != 0)
                  {
@@ -331,7 +331,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
              {
                ACE_TCHAR* name = argv[curarg];
 
-               ACE_TCHAR *err = 0;
+               ACE_TCHAR *err = nullptr;
                long limit = ACE_OS::strtol (name, &err, 10);
                if (err && *err != 0)
                  {
@@ -368,7 +368,7 @@ TAO_Transport_Mux_Strategy *
 TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (
    TAO_Transport *transport)
 {
-  TAO_Transport_Mux_Strategy *tms = 0;
+  TAO_Transport_Mux_Strategy *tms = nullptr;
 
   switch (this->transport_mux_strategy_)
     {
@@ -376,14 +376,14 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (
       {
         ACE_NEW_RETURN (tms,
                         TAO_Muxed_TMS (transport),
-                        0);
+                        nullptr);
         break;
       }
       case TAO_EXCLUSIVE_TMS:
       {
         ACE_NEW_RETURN (tms,
                         TAO_Exclusive_TMS (transport),
-                        0);
+                        nullptr);
         break;
       }
     }
@@ -392,9 +392,9 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (
 }
 
 ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock (void)
+TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock ()
 {
-  ACE_Lock *the_lock = 0;
+  ACE_Lock *the_lock = nullptr;
 
   switch (this->muxed_strategy_lock_type_)
     {
@@ -402,14 +402,14 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock (void)
         {
           ACE_NEW_RETURN (the_lock,
                           ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
-                          0);
+                          nullptr);
           break;
         }
       case TAO_THREAD_LOCK:
         {
           ACE_NEW_RETURN (the_lock,
                           ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (),
-                          0);
+                          nullptr);
           break;
         }
     }
@@ -418,7 +418,7 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock (void)
 }
 
 int
-TAO_Default_Client_Strategy_Factory::reply_dispatcher_table_size (void) const
+TAO_Default_Client_Strategy_Factory::reply_dispatcher_table_size () const
 {
   return this->rd_table_size_;
 }
@@ -427,51 +427,45 @@ TAO_Wait_Strategy *
 TAO_Default_Client_Strategy_Factory::create_wait_strategy (
   TAO_Transport *transport)
 {
-  TAO_Wait_Strategy *ws = 0;
+  TAO_Wait_Strategy *ws = nullptr;
 
-/*
- * Hook to customize the wait strategy object when the concrete
- * wait strategy object is known a priori.
- */
-//@@ WAIT_STRATEGY_SPL_COMMENT_HOOK_START
   switch (this->wait_strategy_)
     {
       case TAO_WAIT_ON_LEADER_FOLLOWER :
         {
           ACE_NEW_RETURN (ws,
                           TAO_Wait_On_Leader_Follower (transport),
-                          0);
+                          nullptr);
           break;
         }
       case TAO_WAIT_ON_REACTOR:
         {
           ACE_NEW_RETURN (ws,
                           TAO_Wait_On_Reactor (transport),
-                          0);
+                          nullptr);
           break;
         }
       case TAO_WAIT_ON_READ:
         {
           ACE_NEW_RETURN (ws,
                           TAO_Wait_On_Read (transport),
-                          0);
+                          nullptr);
           break;
         }
       case TAO_WAIT_ON_LF_NO_UPCALL:
         {
           ACE_NEW_RETURN (ws,
                           TAO::Wait_On_LF_No_Upcall (transport),
-                          0);
+                          nullptr);
           break;
         }
     }
-//@@ WAIT_STRATEGY_SPL_COMMENT_HOOK_END
 
   return ws;
 }
 
 TAO_Client_Strategy_Factory::Connect_Strategy
-TAO_Default_Client_Strategy_Factory::connect_strategy (void) const
+TAO_Default_Client_Strategy_Factory::connect_strategy () const
 {
   return this->connect_strategy_;
 }
@@ -480,7 +474,7 @@ TAO_Connect_Strategy *
 TAO_Default_Client_Strategy_Factory::create_connect_strategy (
   TAO_ORB_Core *orb_core)
 {
-  TAO_Connect_Strategy *cs = 0;
+  TAO_Connect_Strategy *cs = nullptr;
 
   switch (this->connect_strategy_)
     {
@@ -488,21 +482,21 @@ TAO_Default_Client_Strategy_Factory::create_connect_strategy (
         {
           ACE_NEW_RETURN (cs,
                           TAO_Blocked_Connect_Strategy (orb_core),
-                          0);
+                          nullptr);
           break;
         }
       case TAO_REACTIVE_CONNECT:
         {
           ACE_NEW_RETURN (cs,
                           TAO_Reactive_Connect_Strategy (orb_core),
-                          0);
+                          nullptr);
           break;
         }
       case TAO_LEADER_FOLLOWER_CONNECT :
         {
           ACE_NEW_RETURN (cs,
                           TAO_LF_Connect_Strategy (orb_core, this->wait_strategy_ == TAO_WAIT_ON_LF_NO_UPCALL),
-                          0);
+                          nullptr);
           break;
         }
     }
@@ -511,13 +505,13 @@ TAO_Default_Client_Strategy_Factory::create_connect_strategy (
 }
 
 Messaging::SyncScope
-TAO_Default_Client_Strategy_Factory::sync_scope (void) const
+TAO_Default_Client_Strategy_Factory::sync_scope () const
 {
   return this->sync_scope_;
 }
 
 int
-TAO_Default_Client_Strategy_Factory::allow_callback (void)
+TAO_Default_Client_Strategy_Factory::allow_callback ()
 {
   return (this->wait_strategy_ != TAO_WAIT_ON_READ);
 }
@@ -534,13 +528,13 @@ TAO_Default_Client_Strategy_Factory::report_option_value_error (
 }
 
 bool
-TAO_Default_Client_Strategy_Factory::use_cleanup_options (void) const
+TAO_Default_Client_Strategy_Factory::use_cleanup_options () const
 {
   return this->use_cleanup_options_;
 }
 
 const TAO::Invocation_Retry_Params &
-TAO_Default_Client_Strategy_Factory::invocation_retry_params (void) const
+TAO_Default_Client_Strategy_Factory::invocation_retry_params () const
 {
   return this->invocation_retry_params_;
 }
diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h
index 956f8559556..cedbe7c22c7 100644
--- a/TAO/tao/default_environment.h
+++ b/TAO/tao/default_environment.h
@@ -33,7 +33,7 @@ namespace CORBA
 /**
  * @note We tried with CORBA::default_environment() and others.
  */
-TAO_Export CORBA::Environment& TAO_default_environment (void);
+TAO_Export CORBA::Environment& TAO_default_environment ();
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 8ea0122bbb4..cee00e985c0 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -34,20 +34,20 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-TAO_Codeset_Parameters::TAO_Codeset_Parameters (void)
+TAO_Codeset_Parameters::TAO_Codeset_Parameters ()
   : translators_ ()
-  , native_ (0)
+  , native_ (nullptr)
 {
 }
 
-TAO_Codeset_Parameters::~TAO_Codeset_Parameters (void)
+TAO_Codeset_Parameters::~TAO_Codeset_Parameters ()
 {
   for (TAO_Codeset_Parameters::iterator i =
          this->translators ();
        !i.done ();
        i.advance ())
     {
-      ACE_TCHAR** element = 0;
+      ACE_TCHAR** element = nullptr;
       if (i.next (element))
         ACE_OS::free (*element);
     }
@@ -56,7 +56,7 @@ TAO_Codeset_Parameters::~TAO_Codeset_Parameters (void)
 }
 
 const ACE_TCHAR*
-TAO_Codeset_Parameters::native (void)
+TAO_Codeset_Parameters::native ()
 {
   return (this->native_);
 }
@@ -64,13 +64,13 @@ TAO_Codeset_Parameters::native (void)
 void
 TAO_Codeset_Parameters::apply_to (TAO_Codeset_Descriptor_Base *csd)
 {
-  if (csd == 0)
+  if (csd == nullptr)
     return;
 
-  if (this->native () != 0)
+  if (this->native () != nullptr)
       csd->ncs (this->native ());
 
-  ACE_TCHAR** element = 0;
+  ACE_TCHAR** element = nullptr;
   for (TAO_Codeset_Parameters::iterator i = this->translators ();
        !i.done ();
        i.advance ())
@@ -94,15 +94,15 @@ TAO_Codeset_Parameters::add_translator (const ACE_TCHAR*name)
 }
 
 TAO_Codeset_Parameters::iterator
-TAO_Codeset_Parameters::translators (void)
+TAO_Codeset_Parameters::translators ()
 {
   return this->translators_.begin ();
 }
 
-TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
+TAO_Default_Resource_Factory::TAO_Default_Resource_Factory ()
   : use_locked_data_blocks_ (1)
   , parser_names_count_ (0)
-  , parser_names_ (0)
+  , parser_names_ (nullptr)
   , protocol_factories_ ()
   , connection_purging_type_ (TAO_CONNECTION_PURGING_STRATEGY)
   , cache_maximum_ (TAO_CONNECTION_CACHE_MAXIMUM)
@@ -143,7 +143,7 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
 
 }
 
-TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
+TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory ()
 {
   const TAO_ProtocolFactorySetItor end = this->protocol_factories_.end ();
 
@@ -205,7 +205,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
         for (int i = 0;
              i < this->parser_names_count_;
              ++i)
-          this->parser_names_[i] = 0;
+          this->parser_names_[i] = nullptr;
 
         this->index_ = 0;
       }
@@ -237,7 +237,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
         ++curarg;
         if (curarg < argc)
           {
-            TAO_Protocol_Item *item = 0;
+            TAO_Protocol_Item *item = nullptr;
             ACE_NEW_RETURN (item,
                             TAO_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])),
                             -1);
@@ -390,10 +390,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
                                  ACE_TEXT("-ORBFlushingStrategy")) == 0)
       {
         ++curarg;
-        /*
-         * Hook to specialize TAO's Flushing strategy implementations
-         */
-//@@ FLUSHING_STRATEGY_SPL_COMMENT_HOOK_START
         if (curarg < argc)
           {
             ACE_TCHAR* name = argv[curarg];
@@ -410,7 +406,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
             else
               this->report_option_value_error (ACE_TEXT("-ORBFlushingStrategy"), name);
           }
-//@@ FLUSHING_STRATEGY_SPL_COMMENT_HOOK_END
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
                                  ACE_TEXT ("-ORBMuxedConnectionMax")) == 0)
@@ -429,7 +424,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
         ++curarg;
         if (curarg < argc)
           {
-            int tmp = ACE_OS::atoi (argv[curarg]);
+            int const tmp = ACE_OS::atoi (argv[curarg]);
 
             if (tmp == 0)
               this->drop_replies_ = false;
@@ -598,7 +593,7 @@ TAO_Default_Resource_Factory::add_to_ior_parser_names (const char *curarg)
 
 // This is virtual and protected...
 int
-TAO_Default_Resource_Factory::load_default_protocols (void)
+TAO_Default_Resource_Factory::load_default_protocols ()
 {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       // If the user did not list any protocols in her svc.conf file
@@ -637,7 +632,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void)
 }
 
 int
-TAO_Default_Resource_Factory::init_protocol_factories (void)
+TAO_Default_Resource_Factory::init_protocol_factories ()
 {
   const TAO_ProtocolFactorySetItor end = protocol_factories_.end ();
   TAO_ProtocolFactorySetItor factory = protocol_factories_.begin ();
@@ -652,7 +647,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
       const ACE_CString &name = (*factory)->protocol_name ();
       (*factory)->factory (
         ACE_Dynamic_Service<TAO_Protocol_Factory>::instance (name.c_str ()));
-      if ((*factory)->factory () == 0)
+      if ((*factory)->factory () == nullptr)
         {
           TAOLIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("TAO (%P|%t) - Unable to load ")
@@ -674,50 +669,50 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
 }
 
 int
-TAO_Default_Resource_Factory::use_locked_data_blocks (void) const
+TAO_Default_Resource_Factory::use_locked_data_blocks () const
 {
   return this->use_locked_data_blocks_;
 }
 
 TAO_ProtocolFactorySet *
-TAO_Default_Resource_Factory::get_protocol_factories (void)
+TAO_Default_Resource_Factory::get_protocol_factories ()
 {
   return &protocol_factories_;
 }
 
 TAO_Acceptor_Registry *
-TAO_Default_Resource_Factory::get_acceptor_registry (void)
+TAO_Default_Resource_Factory::get_acceptor_registry ()
 {
-  TAO_Acceptor_Registry *ar = 0;
+  TAO_Acceptor_Registry *ar = nullptr;
 
   ACE_NEW_RETURN(ar,
                  TAO_Acceptor_Registry,
-                 0);
+                 nullptr);
 
   return ar;
 }
 
 TAO_Connector_Registry *
-TAO_Default_Resource_Factory::get_connector_registry (void)
+TAO_Default_Resource_Factory::get_connector_registry ()
 {
-  TAO_Connector_Registry *cr = 0;
+  TAO_Connector_Registry *cr = nullptr;
 
   ACE_NEW_RETURN(cr,
                  TAO_Connector_Registry,
-                 0);
+                 nullptr);
 
   return cr;
 }
 
 #if (TAO_HAS_TIME_POLICY == 1)
 TAO_Time_Policy_Manager*
-TAO_Default_Resource_Factory::time_policy_manager (void) const
+TAO_Default_Resource_Factory::time_policy_manager () const
 {
   // get time policy manager service
   TAO_Time_Policy_Manager * tpm =
     ACE_Dynamic_Service<TAO_Time_Policy_Manager>::instance (ACE_TEXT ("Time_Policy_Manager"));
 
-  if (tpm == 0)
+  if (tpm == nullptr)
     {
       TAOLIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("TAO (%P|%t) - TAO_Default_Resource_Factory::time_policy_manager: ")
@@ -729,7 +724,7 @@ TAO_Default_Resource_Factory::time_policy_manager (void) const
 #endif /* TAO_HAS_TIME_POLICY */
 
 ACE_Timer_Queue *
-TAO_Default_Resource_Factory::create_timer_queue (void) const
+TAO_Default_Resource_Factory::create_timer_queue () const
 {
 #if (TAO_HAS_TIME_POLICY == 1)
   TAO_Time_Policy_Manager * tpm = this->time_policy_manager ();
@@ -738,7 +733,7 @@ TAO_Default_Resource_Factory::create_timer_queue (void) const
       return tpm->create_timer_queue ();
     }
 #endif /* TAO_HAS_TIME_POLICY */
-  return 0;
+  return nullptr;
 }
 
 void
@@ -754,37 +749,32 @@ TAO_Default_Resource_Factory::destroy_timer_queue (ACE_Timer_Queue *tmq) const
 }
 
 ACE_Reactor_Impl*
-TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
+TAO_Default_Resource_Factory::allocate_reactor_impl () const
 {
-  ACE_Reactor_Impl *impl = 0;
-  /*
-   * Hook to specialize TAO's reactor implementation.
-   */
+  ACE_Reactor_Impl *impl = nullptr;
   // get a timer queue (or not) from a possibly configured
   // time policy
   TAO_RSF_Timer_Queue_Ptr tmq (*this, this->create_timer_queue ());
-//@@ TAO_REACTOR_SPL_COMMENT_HOOK_START
   ACE_NEW_RETURN (impl,
                   ACE_TP_Reactor (ACE::max_handles (),
                                   1,
-                                  (ACE_Sig_Handler*)0,
+                                  (ACE_Sig_Handler*)nullptr,
                                   tmq.get (),
                                   this->reactor_mask_signals_,
                                   ACE_Select_Reactor_Token::LIFO),
-                  0);
-//@@ TAO_REACTOR_SPL_COMMENT_HOOK_END
+                  nullptr);
   // safe to release timer queue
   tmq.release ();
   return impl;
 }
 
 ACE_Reactor *
-TAO_Default_Resource_Factory::get_reactor (void)
+TAO_Default_Resource_Factory::get_reactor ()
 {
-  ACE_Reactor *reactor = 0;
+  ACE_Reactor *reactor = nullptr;
   ACE_NEW_RETURN (reactor,
                   ACE_Reactor (this->allocate_reactor_impl (), 1),
-                  0);
+                  nullptr);
 
   if (reactor->initialized () == 0)
     {
@@ -792,7 +782,7 @@ TAO_Default_Resource_Factory::get_reactor (void)
       ACE_Timer_Queue *tmq = reactor->timer_queue ();
       // clean up reactor
       delete reactor;
-      reactor = 0;
+      reactor = nullptr;
       // clean up timer queue in case it was created by time policy
       this->destroy_timer_queue (tmq);
     }
@@ -831,102 +821,102 @@ TAO_Default_Resource_Factory::use_local_memory_pool (bool flag)
 }
 
 ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void)
+TAO_Default_Resource_Factory::input_cdr_dblock_allocator ()
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator = nullptr;
   if (use_local_memory_pool_)
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_POOL,
-                    0);
+                    nullptr);
   }
   else
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_NO_POOL,
-                    0);
+                    nullptr);
   }
 
   return allocator;
 }
 
 ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void)
+TAO_Default_Resource_Factory::input_cdr_buffer_allocator ()
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator = nullptr;
   if (use_local_memory_pool_)
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_POOL,
-                    0);
+                    nullptr);
   }
   else
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_NO_POOL,
-                    0);
+                    nullptr);
   }
 
   return allocator;
 }
 
 ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_msgblock_allocator (void)
+TAO_Default_Resource_Factory::input_cdr_msgblock_allocator ()
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator = nullptr;
   if (use_local_memory_pool_)
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_POOL,
-                    0);
+                    nullptr);
   }
   else
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_NO_POOL,
-                    0);
+                    nullptr);
   }
 
   return allocator;
 }
 
 int
-TAO_Default_Resource_Factory::input_cdr_allocator_type_locked (void)
+TAO_Default_Resource_Factory::input_cdr_allocator_type_locked ()
 {
   return 1;
 }
 
 ACE_Allocator*
-TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
+TAO_Default_Resource_Factory::output_cdr_dblock_allocator ()
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator = nullptr;
   if (use_local_memory_pool_)
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_POOL,
-                    0);
+                    nullptr);
   }
   else
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_NO_POOL,
-                    0);
+                    nullptr);
   }
 
   return allocator;
 }
 
 ACE_Allocator *
-TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
+TAO_Default_Resource_Factory::output_cdr_buffer_allocator ()
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator = nullptr;
 
   switch (this->output_cdr_allocator_type_)
     {
     case LOCAL_MEMORY_POOL:
       ACE_NEW_RETURN (allocator,
                       LOCKED_ALLOCATOR_POOL,
-                      0);
+                      nullptr);
 
       break;
 
@@ -934,7 +924,7 @@ TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
     case MMAP_ALLOCATOR:
       ACE_NEW_RETURN (allocator,
                       TAO_MMAP_Allocator,
-                      0);
+                      nullptr);
 
       break;
 #endif  /* TAO_HAS_SENDFILE==1 */
@@ -943,7 +933,7 @@ TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
     default:
       ACE_NEW_RETURN (allocator,
                       LOCKED_ALLOCATOR_NO_POOL,
-                      0);
+                      nullptr);
 
       break;
     }
@@ -952,103 +942,103 @@ TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
 }
 
 ACE_Allocator*
-TAO_Default_Resource_Factory::output_cdr_msgblock_allocator (void)
+TAO_Default_Resource_Factory::output_cdr_msgblock_allocator ()
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator = nullptr;
   if (use_local_memory_pool_)
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_POOL,
-                    0);
+                    nullptr);
   }
   else
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_NO_POOL,
-                    0);
+                    nullptr);
   }
 
   return allocator;
 }
 
 ACE_Allocator*
-TAO_Default_Resource_Factory::amh_response_handler_allocator (void)
+TAO_Default_Resource_Factory::amh_response_handler_allocator ()
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator = nullptr;
   if (use_local_memory_pool_)
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_POOL,
-                    0);
+                    nullptr);
   }
   else
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_NO_POOL,
-                    0);
+                    nullptr);
   }
 
   return allocator;
 }
 
 ACE_Allocator*
-TAO_Default_Resource_Factory::ami_response_handler_allocator (void)
+TAO_Default_Resource_Factory::ami_response_handler_allocator ()
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator = nullptr;
   if (use_local_memory_pool_)
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_POOL,
-                    0);
+                    nullptr);
   }
   else
   {
     ACE_NEW_RETURN (allocator,
                     LOCKED_ALLOCATOR_NO_POOL,
-                    0);
+                    nullptr);
   }
 
   return allocator;
 }
 
 int
-TAO_Default_Resource_Factory::cache_maximum (void) const
+TAO_Default_Resource_Factory::cache_maximum () const
 {
   return this->cache_maximum_;
 }
 
 int
-TAO_Default_Resource_Factory::purge_percentage (void) const
+TAO_Default_Resource_Factory::purge_percentage () const
 {
   return this->purge_percentage_;
 }
 
 int
-TAO_Default_Resource_Factory::max_muxed_connections (void) const
+TAO_Default_Resource_Factory::max_muxed_connections () const
 {
   return this->max_muxed_connections_;
 }
 
 
 ACE_Lock *
-TAO_Default_Resource_Factory::create_cached_connection_lock (void)
+TAO_Default_Resource_Factory::create_cached_connection_lock ()
 {
-  ACE_Lock *the_lock = 0;
+  ACE_Lock *the_lock = nullptr;
 
   if (this->cached_connection_lock_type_ == TAO_NULL_LOCK)
     ACE_NEW_RETURN (the_lock,
                     ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
+                    nullptr);
   else
     ACE_NEW_RETURN (the_lock,
                     ACE_Lock_Adapter<TAO_SYNCH_MUTEX>,
-                    0);
+                    nullptr);
 
   return the_lock;
 }
 
 int
-TAO_Default_Resource_Factory::locked_transport_cache (void)
+TAO_Default_Resource_Factory::locked_transport_cache ()
 {
   if (this->cached_connection_lock_type_ == TAO_NULL_LOCK)
     return 0;
@@ -1057,35 +1047,35 @@ TAO_Default_Resource_Factory::locked_transport_cache (void)
 }
 
 TAO_Flushing_Strategy *
-TAO_Default_Resource_Factory::create_flushing_strategy (void)
+TAO_Default_Resource_Factory::create_flushing_strategy ()
 {
-  TAO_Flushing_Strategy *strategy = 0;
+  TAO_Flushing_Strategy *strategy = nullptr;
   if (this->flushing_strategy_type_ == TAO_LEADER_FOLLOWER_FLUSHING)
     ACE_NEW_RETURN (strategy,
                     TAO_Leader_Follower_Flushing_Strategy,
-                    0);
+                    nullptr);
   else if (this->flushing_strategy_type_ == TAO_REACTIVE_FLUSHING)
     ACE_NEW_RETURN (strategy,
                     TAO_Reactive_Flushing_Strategy,
-                    0);
+                    nullptr);
   else
     ACE_NEW_RETURN (strategy,
                     TAO_Block_Flushing_Strategy,
-                    0);
+                    nullptr);
   return strategy;
 }
 
 TAO_Connection_Purging_Strategy *
-TAO_Default_Resource_Factory::create_purging_strategy (void)
+TAO_Default_Resource_Factory::create_purging_strategy ()
 {
-  TAO_Connection_Purging_Strategy *strategy = 0;
+  TAO_Connection_Purging_Strategy *strategy = nullptr;
 
   if (this->connection_purging_type_ == TAO_Resource_Factory::LRU)
     {
       ACE_NEW_RETURN (strategy,
                       TAO_LRU_Connection_Purging_Strategy (
                           this->cache_maximum ()),
-                      0);
+                      nullptr);
     }
   else
     {
@@ -1099,13 +1089,13 @@ TAO_Default_Resource_Factory::create_purging_strategy (void)
 }
 
 TAO_LF_Strategy *
-TAO_Default_Resource_Factory::create_lf_strategy (void)
+TAO_Default_Resource_Factory::create_lf_strategy ()
 {
-  TAO_LF_Strategy *strategy = 0;
+  TAO_LF_Strategy *strategy = nullptr;
 
   ACE_NEW_RETURN (strategy,
                   TAO_LF_Strategy_Complete,
-                  0);
+                  nullptr);
 
   return strategy;
 }
@@ -1115,7 +1105,7 @@ TAO_Default_Resource_Factory::create_fragmentation_strategy (
   TAO_Transport * transport,
   CORBA::ULong max_message_size) const
 {
-  TAO_GIOP_Fragmentation_Strategy* strategy = 0;
+  TAO_GIOP_Fragmentation_Strategy* strategy = nullptr;
 
   // Minimum GIOP message size is 24 (a multiple of 8):
   //   12   GIOP Message Header
@@ -1164,7 +1154,7 @@ TAO_Default_Resource_Factory::report_option_value_error (
 }
 
 void
-TAO_Default_Resource_Factory::disable_factory (void)
+TAO_Default_Resource_Factory::disable_factory ()
 {
   this->factory_disabled_ = 1;
   if (this->options_processed_)
@@ -1176,29 +1166,29 @@ TAO_Default_Resource_Factory::disable_factory (void)
 }
 
 TAO_Codeset_Manager *
-TAO_Default_Resource_Factory::codeset_manager(void)
+TAO_Default_Resource_Factory::codeset_manager()
 {
   TAO_Codeset_Manager_Factory_Base *factory =
     ACE_Dynamic_Service<TAO_Codeset_Manager_Factory_Base>::instance ("TAO_Codeset");
 
-  if (factory == 0)
+  if (factory == nullptr)
     {
       if (TAO_debug_level >= 2)
         TAOLIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory")
                     ACE_TEXT (" - unable to find codeset manager factory.\n")));
-      return 0;
+      return nullptr;
     }
 
   TAO_Codeset_Manager* mgr = factory->create ();
 
-  if (mgr == 0)
+  if (mgr == nullptr)
     {
       if (TAO_debug_level >= 2)
         TAOLIB_DEBUG ((LM_INFO,
                     ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory")
                     ACE_TEXT (" - unable to create codeset manager.\n")));
-      return 0;
+      return nullptr;
     }
 
 
@@ -1217,13 +1207,13 @@ TAO_Default_Resource_Factory::codeset_manager(void)
 }
 
 TAO_Resource_Factory::Resource_Usage
-TAO_Default_Resource_Factory::resource_usage_strategy (void) const
+TAO_Default_Resource_Factory::resource_usage_strategy () const
 {
   return this->resource_usage_strategy_;
 }
 
 bool
-TAO_Default_Resource_Factory::drop_replies_during_shutdown (void) const
+TAO_Default_Resource_Factory::drop_replies_during_shutdown () const
 {
   return this->drop_replies_;
 }
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index f37c5d498c3..6e59dd8bb09 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -5,20 +5,20 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
+TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory ()
   : activate_server_connections_ (0),
     thread_flags_ (THR_BOUND | THR_DETACHED),
     thread_per_connection_use_timeout_ (-1)
 {
 }
 
-TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory (void)
+TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory ()
 {
   // Perform appropriate cleanup.
 }
 
 int
-TAO_Default_Server_Strategy_Factory::activate_server_connections (void)
+TAO_Default_Server_Strategy_Factory::activate_server_connections ()
 {
   return this->activate_server_connections_;
 }
@@ -31,13 +31,13 @@ TAO_Default_Server_Strategy_Factory::thread_per_connection_timeout (ACE_Time_Val
 }
 
 int
-TAO_Default_Server_Strategy_Factory::server_connection_thread_flags (void)
+TAO_Default_Server_Strategy_Factory::server_connection_thread_flags ()
 {
   return this->thread_flags_;
 }
 
 int
-TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void)
+TAO_Default_Server_Strategy_Factory::server_connection_thread_count ()
 {
   return 1;
 }
@@ -52,13 +52,13 @@ TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void)
 void
 TAO_Default_Server_Strategy_Factory::tokenize (ACE_TCHAR* flag_string)
 {
-  ACE_TCHAR* lasts = 0;
+  ACE_TCHAR* lasts = nullptr;
 
   for (ACE_TCHAR* flag = ACE_OS::strtok_r (flag_string,
                                       ACE_TEXT("|"),
                                       &lasts);
-       flag != 0;
-       flag = ACE_OS::strtok_r (0,
+       flag != nullptr;
+       flag = ACE_OS::strtok_r (nullptr,
                                 ACE_TEXT("|"),
                                 &lasts))
     {
@@ -129,7 +129,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
             else
               {
                 this->thread_per_connection_use_timeout_ = 1;
-                int milliseconds = ACE_OS::atoi (name);
+                int const milliseconds = ACE_OS::atoi (name);
                 this->thread_per_connection_timeout_.set (0,
                                                           1000 * milliseconds);
               }
@@ -145,7 +145,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
         if (curarg < argc)
           this->active_object_map_creation_parameters_.active_object_map_size_ =
             ACE_OS::strtoul (argv[curarg],
-                             0,
+                             nullptr,
                              10);
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
@@ -155,7 +155,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
         if (curarg < argc)
           this->active_object_map_creation_parameters_.poa_map_size_ =
             ACE_OS::strtoul (argv[curarg],
-                             0,
+                             nullptr,
                              10);
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index 2c0bd86b0c1..873d7fff501 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -28,7 +28,7 @@ TAO_Operation_Details::corba_exception (const char *id) const
       // Create an exception object
       CORBA::Exception *exception = this->ex_data_[i].alloc ();
 
-      if (exception == 0)
+      if (exception == nullptr)
         {
           throw ::CORBA::NO_MEMORY (0, CORBA::COMPLETED_YES);
         }
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index bdace9457dd..9d85feb2355 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -63,7 +63,6 @@ class TAO_Reply_Dispatcher;
 class TAO_Export TAO_Operation_Details
 {
 public:
-
   /// Declare FW_Server_Request_Wrapper a friend
   /// This friendship makes the FW_Server_Request_Wrapper be able to
   /// clone the TAO_Operation_Details data member in TAO_ServerRequest.
@@ -79,46 +78,46 @@ public:
                          const CORBA::ULong ex_count = 0);
 
   /// Operation name
-  const char* opname (void) const;
+  const char* opname () const;
 
   /// Length of the operation name
-  CORBA::ULong opname_len (void) const;
+  CORBA::ULong opname_len () const;
 
   /// Return the flag that indicates whether the operation has any
   /// arguments
-  CORBA::Boolean argument_flag (void) const;
-  CORBA::Boolean in_argument_flag (void) const;
+  CORBA::Boolean argument_flag () const;
+  CORBA::Boolean in_argument_flag () const;
 
   /// Set the response flags
   void response_flags (CORBA::Octet flags);
 
   /// Get the response flags
-  CORBA::Octet response_flags (void) const;
+  CORBA::Octet response_flags () const;
 
   /// Accessors for the service context list
-  IOP::ServiceContextList &request_service_info (void);
-  const IOP::ServiceContextList &request_service_info (void) const;
-  IOP::ServiceContextList &reply_service_info (void);
-  const IOP::ServiceContextList &reply_service_info (void) const;
+  IOP::ServiceContextList &request_service_info ();
+  const IOP::ServiceContextList &request_service_info () const;
+  IOP::ServiceContextList &reply_service_info ();
+  const IOP::ServiceContextList &reply_service_info () const;
 
   /// Access the TAO_Service_Context
-  TAO_Service_Context &request_service_context (void);
-  const TAO_Service_Context &request_service_context (void) const;
-  TAO_Service_Context &reply_service_context (void);
-  const TAO_Service_Context &reply_service_context (void) const;
+  TAO_Service_Context &request_service_context ();
+  const TAO_Service_Context &request_service_context () const;
+  TAO_Service_Context &reply_service_context ();
+  const TAO_Service_Context &reply_service_context () const;
 
   /// Reset the contents of the service context lists that we hold.
-  void reset_request_service_info (void);
-  void reset_reply_service_info (void);
+  void reset_request_service_info ();
+  void reset_reply_service_info ();
 
   /// Cache the request id.
   void request_id (CORBA::ULong id);
 
   /// Return the request ID associated with the operation
-  CORBA::ULong request_id (void) const;
+  CORBA::ULong request_id () const;
 
   /// Accessor method for the addressing mode
-  TAO_Target_Specification::TAO_Target_Address addressing_mode (void) const;
+  TAO_Target_Specification::TAO_Target_Address addressing_mode () const;
 
   /// Set method for the addressing mode
   void addressing_mode (CORBA::Short addr);
@@ -149,34 +148,33 @@ public:
   bool demarshal_args (TAO_InputCDR &cdr);
 
   /// Accessors for the argument list
-  TAO::Argument ** args (void) const;
-  CORBA::ULong args_num (void) const ;
+  TAO::Argument ** args () const;
+  CORBA::ULong args_num () const ;
 
   /// Exception count
-  CORBA::ULong ex_count (void) const;
+  CORBA::ULong ex_count () const;
 
-  TAO::Exception_Data const * ex_data (void) const;
+  TAO::Exception_Data const * ex_data () const;
 
-  CORBA::Boolean use_stub_args (void) const;
+  CORBA::Boolean use_stub_args () const;
   void use_stub_args (CORBA::Boolean use_stub_arguments);
 
 #if TAO_HAS_INTERCEPTORS == 1
   void ft_expiration_time (TimeBase::TimeT time);
-  TimeBase::TimeT ft_expiration_time (void) const;
+  TimeBase::TimeT ft_expiration_time () const;
 
   void ft_retention_id (CORBA::Long request_id);
-  CORBA::Long ft_retention_id (void) const;
+  CORBA::Long ft_retention_id () const;
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
   /// Accessor for cac_ pointer.
-  TAO::Collocated_Arguments_Converter *cac (void) const;
+  TAO::Collocated_Arguments_Converter *cac () const;
   void cac (TAO::Collocated_Arguments_Converter *cac);
 
-  TAO_Reply_Dispatcher *reply_dispatcher (void) const;
+  TAO_Reply_Dispatcher *reply_dispatcher () const;
   void reply_dispatcher (TAO_Reply_Dispatcher *rd);
 
 private:
-
   /// Name of the operation being invoked.
   const char *opname_;
 
@@ -235,7 +233,6 @@ private:
 
   /// The optional reply dispatcher
   TAO_Reply_Dispatcher *reply_dispatcher_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 86530c3e4e7..de5905aea50 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -853,10 +853,6 @@ enum TAO_Policy_Scope
 # endif
 #endif
 
-#if !defined (TAO_HAS_SEQUENCE_ITERATORS)
-#  define TAO_HAS_SEQUENCE_ITERATORS 0
-#endif
-
 #if !defined (TAO_DEFAULT_COLLOCATION_STRATEGY)
 # define TAO_DEFAULT_COLLOCATION_STRATEGY TAO_COLLOCATION_THRU_POA
 #endif
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 286ea3f81c7..885cb7eaab6 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -16,7 +16,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ORB_Parameters::TAO_ORB_Parameters (void)
+TAO_ORB_Parameters::TAO_ORB_Parameters ()
   : endpoints_map_ (10)
   , mcast_discovery_endpoint_ ()
   , default_init_ref_ (TAO_DEFAULT_INIT_REFERENCE_INITIALIZER)
@@ -291,7 +291,7 @@ TAO_ORB_Parameters::preferred_interfaces (const char *s)
 }
 
 const char *
-TAO_ORB_Parameters::preferred_interfaces (void) const
+TAO_ORB_Parameters::preferred_interfaces () const
 {
   return this->pref_network_.c_str ();
 }
@@ -303,7 +303,7 @@ TAO_ORB_Parameters::enforce_pref_interfaces (bool p)
 }
 
 bool
-TAO_ORB_Parameters::enforce_pref_interfaces (void) const
+TAO_ORB_Parameters::enforce_pref_interfaces () const
 {
   return this->enforce_preferred_interfaces_;
 }
@@ -353,7 +353,7 @@ TAO_ORB_Parameters::protocols_hooks_name (const char *s)
 }
 
 const char *
-TAO_ORB_Parameters::protocols_hooks_name (void) const
+TAO_ORB_Parameters::protocols_hooks_name () const
 {
   return this->protocols_hooks_name_.c_str ();
 }
@@ -365,7 +365,7 @@ TAO_ORB_Parameters::thread_lane_resources_manager_factory_name (const char *s)
 }
 
 const char *
-TAO_ORB_Parameters::thread_lane_resources_manager_factory_name (void) const
+TAO_ORB_Parameters::thread_lane_resources_manager_factory_name () const
 {
   return this->thread_lane_resources_manager_factory_name_.c_str ();
 }
@@ -377,7 +377,7 @@ TAO_ORB_Parameters::dynamic_thread_pool_config_name (const char *s)
 }
 
 const char *
-TAO_ORB_Parameters::dynamic_thread_pool_config_name (void) const
+TAO_ORB_Parameters::dynamic_thread_pool_config_name () const
 {
   return this->dynamic_thread_pool_config_name_.c_str ();
 }
@@ -389,7 +389,7 @@ TAO_ORB_Parameters::stub_factory_name (const char *s)
 }
 
 const char *
-TAO_ORB_Parameters::stub_factory_name (void) const
+TAO_ORB_Parameters::stub_factory_name () const
 {
   return this->stub_factory_name_.c_str ();
 }
@@ -401,7 +401,7 @@ TAO_ORB_Parameters::poa_factory_name (const char *s)
 }
 
 const char *
-TAO_ORB_Parameters::poa_factory_name (void) const
+TAO_ORB_Parameters::poa_factory_name () const
 {
   return this->poa_factory_name_.c_str ();
 }
@@ -413,7 +413,7 @@ TAO_ORB_Parameters::poa_factory_directive (const ACE_TCHAR *s)
 }
 
 const ACE_TCHAR *
-TAO_ORB_Parameters::poa_factory_directive (void) const
+TAO_ORB_Parameters::poa_factory_directive () const
 {
   return this->poa_factory_directive_.c_str ();
 }
@@ -425,19 +425,19 @@ TAO_ORB_Parameters::endpoint_selector_factory_name (const char *s)
 }
 
 const char *
-TAO_ORB_Parameters::endpoint_selector_factory_name (void) const
+TAO_ORB_Parameters::endpoint_selector_factory_name () const
 {
   return this->endpoint_selector_factory_name_.c_str ();
 }
 
 const TAO::Invocation_Retry_Params &
-TAO_ORB_Parameters::invocation_retry_params (void) const
+TAO_ORB_Parameters::invocation_retry_params () const
 {
   return this->invocation_retry_params_;
 }
 
 TAO::Invocation_Retry_Params &
-TAO_ORB_Parameters::invocation_retry_params (void)
+TAO_ORB_Parameters::invocation_retry_params ()
 {
   return this->invocation_retry_params_;
 }
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index 891e828d415..fe06a81b545 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -55,7 +55,7 @@ public:
   typedef ACE_Array_Map<ACE_CString, ACE_CString> endpoints_map_type;
 
   /// Constructor.
-  TAO_ORB_Parameters (void);
+  TAO_ORB_Parameters ();
 
   /// Specifies the endpoints on which this server is willing to
   /// listen for requests.
@@ -70,41 +70,41 @@ public:
 
   /// Get/Set address:port for Multicast Discovery Protocol for
   /// the Naming Service.
-  const char *mcast_discovery_endpoint (void) const;
+  const char *mcast_discovery_endpoint () const;
   void mcast_discovery_endpoint (const char *mde);
 
   /// Set/Get the size to be used for a socket's receive buffer.
-  int sock_rcvbuf_size (void) const;
+  int sock_rcvbuf_size () const;
   void sock_rcvbuf_size (int);
 
   /// Set/Get the size to be used for a socket's send buffer.
-  int sock_sndbuf_size (void) const;
+  int sock_sndbuf_size () const;
   void sock_sndbuf_size (int);
 
   /// Set/Get the status of whether to use TCP_NODELAY or not.
-  int nodelay (void) const;
+  int nodelay () const;
   void nodelay (int);
 
   /// Set/Get whether we should set SO_KEEPALIVE on the socket or not.
-  int sock_keepalive (void);
+  int sock_keepalive ();
   void sock_keepalive (int);
 
   /// Set/Get whether we should set SO_DONTROUTE on the socket or not.
-  int sock_dontroute (void);
+  int sock_dontroute ();
   void sock_dontroute (int);
 
   /// Set/Get the number of hops to be used for datagrams sent through socket.
-  int ip_hoplimit (void);
+  int ip_hoplimit ();
   void ip_hoplimit (int);
 
   /// Set/Get whether we should set IP_MULTICAST_LOOP on the socket or not.
-  bool ip_multicastloop (void);
+  bool ip_multicastloop ();
   void ip_multicastloop (bool);
 
   /// Set/Get client side port span values
-  u_short iiop_client_port_base (void);
+  u_short iiop_client_port_base ();
   void iiop_client_port_base (u_short);
-  u_short iiop_client_port_span (void);
+  u_short iiop_client_port_span ();
   void iiop_client_port_span (u_short);
 
   /**
@@ -113,7 +113,7 @@ public:
    * octet sequence is small enough and there is room in the current
    * message block it is more efficient just to copy the buffer.
    */
-  int cdr_memcpy_tradeoff (void) const;
+  int cdr_memcpy_tradeoff () const;
   void cdr_memcpy_tradeoff (int);
 
   /**
@@ -121,36 +121,36 @@ public:
    * kicks in.
    */
   //@{
-  ACE_CDR::ULong max_message_size (void) const;
+  ACE_CDR::ULong max_message_size () const;
   void max_message_size (ACE_CDR::ULong size);
   //@}
 
   /// The ORB will use the dotted decimal notation for addresses. By
   /// default we use the full ascii names.
-  int use_dotted_decimal_addresses (void) const;
+  int use_dotted_decimal_addresses () const;
   void use_dotted_decimal_addresses (int);
 
   /// The ORB will cache incoming connections against the dotted
   /// decimal form of the peer's address
-  int cache_incoming_by_dotted_decimal_address (void) const;
+  int cache_incoming_by_dotted_decimal_address () const;
   void cache_incoming_by_dotted_decimal_address (int);
 
   /// The ORB will turn off SO_LINGER if this is zero.
-  int linger (void) const;
+  int linger () const;
   void linger (int);
 
   /// The amount of time desired by the user to wait to accept
   /// connections after a particular type of accept() error.
-  time_t accept_error_delay (void) const;
+  time_t accept_error_delay () const;
   void accept_error_delay (time_t);
 
   /// Set/Get the Init Reference of an arbitrary ObjectID.
-  char *default_init_ref (void) const;
+  char *default_init_ref () const;
   void default_init_ref (const char *default_init_ref);
 
   /// Disable the OMG standard profile components, useful for
   /// homogenous environments.
-  bool std_profile_components (void) const;
+  bool std_profile_components () const;
   void std_profile_components (bool x);
 
   /// Scheduling policy.
@@ -161,7 +161,7 @@ public:
    * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR,
    * ACE_SCHED_FIFO, and ACE_SCHED_OTHER.
    */
-  int ace_sched_policy (void) const;
+  int ace_sched_policy () const;
   void ace_sched_policy (int x);
 
   /// Scheduling policy flag.
@@ -171,7 +171,7 @@ public:
    * thread creation functions. Legal values are THR_SCHED_RR,
    * THR_SCHED_FIFO, and THR_SCHED_DEFAULT.
    */
-  long sched_policy (void) const;
+  long sched_policy () const;
   void sched_policy (long x);
 
   /// Scheduling scope flag.
@@ -181,47 +181,47 @@ public:
    * thread creation functions. Legal values are THR_SCOPE_SYSTEM and
    * THR_SCOPE_PROCESS.
    */
-  long scope_policy (void) const;
+  long scope_policy () const;
   void scope_policy (long x);
 
   /// Thread creation flags.
   /**
    * Shorthand for OR'ing together the scope_policy and sched_policy.
    */
-  long thread_creation_flags (void) const;
+  long thread_creation_flags () const;
 
   /// Single read optimization.
-  int single_read_optimization (void) const;
+  int single_read_optimization () const;
   void single_read_optimization (int x);
 
   /// Create shared profiles without priority
-  int shared_profile (void) const;
+  int shared_profile () const;
   void shared_profile (int x);
 
   /// Want to use parallel connection attempts when profiles have multiple
   /// endpoints.
-  bool use_parallel_connects(void) const;
+  bool use_parallel_connects() const;
   void use_parallel_connects (bool x);
 
   /// The milliseconds delay used to stagger individual connection starts
   /// when using parallel connects.
-  unsigned long parallel_connect_delay (void) const;
+  unsigned long parallel_connect_delay () const;
   void parallel_connect_delay (unsigned long x);
 
   /// Mutators and accessors for rt_collocation_resolver
-  bool disable_rt_collocation_resolver (void) const;
+  bool disable_rt_collocation_resolver () const;
   void disable_rt_collocation_resolver (bool);
 
   /// Accepts the list of preferred interfaces and does a simple
   /// semantic check on the string before setting. Also the getter.
   bool preferred_interfaces (const char *s);
-  const char *preferred_interfaces (void) const;
+  const char *preferred_interfaces () const;
 
   /// Utility function called by the preferred interfaces setter
   static bool check_preferred_interfaces_string (const char *);
 
   void enforce_pref_interfaces (bool p);
-  bool enforce_pref_interfaces (void) const;
+  bool enforce_pref_interfaces () const;
 
 #if defined (ACE_HAS_IPV6)
   void prefer_ipv6_interfaces (bool p);
@@ -235,49 +235,49 @@ public:
 #endif /* ACE_HAS_IPV6 */
 
   void negotiate_codesets (bool c);
-  bool negotiate_codesets (void) const;
+  bool negotiate_codesets () const;
 
   void ami_collication (bool opt);
-  bool ami_collication (void) const;
+  bool ami_collication () const;
 
   void protocols_hooks_name (const char *s);
-  const char *protocols_hooks_name (void) const;
+  const char *protocols_hooks_name () const;
 
   void thread_lane_resources_manager_factory_name (const char *s);
-  const char *thread_lane_resources_manager_factory_name (void) const;
+  const char *thread_lane_resources_manager_factory_name () const;
 
   void dynamic_thread_pool_config_name (const char *s);
-  const char *dynamic_thread_pool_config_name (void) const;
+  const char *dynamic_thread_pool_config_name () const;
 
   void stub_factory_name (const char *s);
-  const char *stub_factory_name (void) const;
+  const char *stub_factory_name () const;
 
   void poa_factory_name (const char *s);
-  const char *poa_factory_name (void) const;
+  const char *poa_factory_name () const;
 
   void poa_factory_directive (const ACE_TCHAR *s);
-  const ACE_TCHAR *poa_factory_directive (void) const;
+  const ACE_TCHAR *poa_factory_directive () const;
 
   void endpoint_selector_factory_name (const char *s);
-  const char *endpoint_selector_factory_name (void) const;
+  const char *endpoint_selector_factory_name () const;
 
   void collocation_resolver_name (const char *s);
-  const char *collocation_resolver_name (void) const;
+  const char *collocation_resolver_name () const;
 
   void forward_invocation_on_object_not_exist (bool opt);
-  bool forward_invocation_on_object_not_exist (void) const;
+  bool forward_invocation_on_object_not_exist () const;
 
   void forward_on_exception_limit (const int ef, const int limit);
   void forward_on_exception_delay (const ACE_Time_Value &delay);
 
-  TAO::Invocation_Retry_Params &invocation_retry_params (void);
-  const TAO::Invocation_Retry_Params &invocation_retry_params (void) const;
+  TAO::Invocation_Retry_Params &invocation_retry_params ();
+  const TAO::Invocation_Retry_Params &invocation_retry_params () const;
 
   void forward_once_exception (const int ef);
   int forward_once_exception () const;
 
   void allow_ziop_no_server_policies (bool opt);
-  bool allow_ziop_no_server_policies (void) const;
+  bool allow_ziop_no_server_policies () const;
 
 private:
   /// Each "endpoint" is of the form:
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 57036a486f1..a816e0ce154 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -492,7 +492,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid
     Messaging_PolicyValueS.h
     Messaging_SyncScopeC.h
     Messaging_SyncScopeS.h
-    MM_Sequence_Iterator_T.h
     MMAP_Allocator.h
     MProfile.h
     Muxed_TMS.h
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index f8f816ec7fd..b4dc72e825b 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -56,7 +56,7 @@ class TAO_Export TAO_Target_Specification
 public:
 
   /// Ctor
-  TAO_Target_Specification (void);
+  TAO_Target_Specification ();
   enum TAO_Target_Address
   {
     // Note that this could be extended for other protocols
@@ -86,14 +86,14 @@ public:
    * the stored specifier is not of the right type then this would
    * return a NULL
    */
-  const TAO::ObjectKey* object_key (void);
+  const TAO::ObjectKey* object_key ();
 
   /**
    * Returns the IOP::TaggedProfile after a check of the stored specifier. If
    * the stored specifier is not of the right type then this would
    * return a NULL
    */
-  const IOP::TaggedProfile *profile (void);
+  const IOP::TaggedProfile *profile ();
 
   /**
    * Returns a  pointer to IOP::IOR through the parameters and the
@@ -104,7 +104,7 @@ public:
   CORBA::ULong iop_ior (IOP::IOR *&ior);
 
   /// Access the TArget_Address specifier
-  TAO_Target_Address specifier (void);
+  TAO_Target_Address specifier ();
 
 private:
   /// The union of all the possibilities
diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h
index b07f0c1f906..6cb0b769609 100644
--- a/TAO/tao/varbase.h
+++ b/TAO/tao/varbase.h
@@ -31,7 +31,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Base_var
 {
 public:
-  TAO_Base_var (void) {}
+  TAO_Base_var () {}
 
 private:
 
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 83afa65ba63..14dce3d4eb6 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -39,10 +39,9 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                              Test::Timestamp)
 {
   // Throw an overload exception
-
   Test::ServerOverload *ts = new Test::ServerOverload;
 
-  // Calee owns the memory now.  Need not delete 'ts'
+  // Caller owns the memory now.  Need not delete 'ts'
   Test::AMH_RoundtripExceptionHolder holder (ts);
 
   try
@@ -72,7 +71,7 @@ public:
   ST_AMH_Server (int argc, ACE_TCHAR **argv);
   virtual ~ST_AMH_Server ();
 
-  /// ORB inititalisation stuff
+  /// ORB initialisation stuff
   int start_orb_and_poa (void);
 
   /// register the servant with the poa
@@ -97,8 +96,6 @@ private:
   int write_ior_to_file (CORBA::String_var ior);
 };
 
-
-
 /*** Server Declaration ***/
 
 ST_AMH_Server::ST_AMH_Server (int argc, ACE_TCHAR **argv)
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index 88512b95d35..086b43367e0 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -1,4 +1,3 @@
-
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Get_Opt.h"
@@ -113,8 +112,6 @@ private:
   int write_ior_to_file (CORBA::String_var ior);
 };
 
-
-
 /*** Server Declaration ***/
 
 ST_AMH_Server::ST_AMH_Server (int* argc, ACE_TCHAR **argv)
diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl
index 13f9a99095c..884119168eb 100755
--- a/TAO/tests/AMI/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -63,7 +63,7 @@ if ($client->PutFile ($iorbase) == -1) {
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
 }
-# copy the configruation file.
+# copy the configuration file.
 if ($client->PutFile ($conf_file) == -1) {
     print STDERR "ERROR: cannot set file <$client_conf>\n";
     $SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/tests/AlternateIIOP/README b/TAO/tests/AlternateIIOP/README
index 18fcfb795c6..ea0923cc06c 100644
--- a/TAO/tests/AlternateIIOP/README
+++ b/TAO/tests/AlternateIIOP/README
@@ -1,10 +1,8 @@
 /**
 
-
-
 @page AlternateIIOP Test README File
 
-	This test uses the binaries from the Hello test, but builds an
+This test uses the binaries from the Hello test, but builds an
 IOR that contains multiple endpoints. The "hostname_in_ior" option is
 used to add two unreachable endpoints along with a third that is
 successful.
@@ -13,8 +11,8 @@ successful.
 the test to allow for manual inspection using
 $TAO_ROOT/utils/catior/catior.
 
-	To run the test use the run_test.pl script:
+To run the test use the run_test.pl script:
 
 $ ./run_test.pl
 
-	the script returns 0 if the test was successful.
+the script returns 0 if the test was successful.
diff --git a/TAO/tests/BiDirectional_NestedUpcall/README b/TAO/tests/BiDirectional_NestedUpcall/README
index 3aa2e88e6e2..d6c6e88c475 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/README
+++ b/TAO/tests/BiDirectional_NestedUpcall/README
@@ -1,5 +1,3 @@
-
-
 This test is similar to the $TAO_ROOT/tests/BiDirectional test. The
 only difference being that the server as a part of the upcall sends a
 bunch of remote calls, to show some nested upcall behaviour.
diff --git a/TAO/tests/Big_Oneways/README b/TAO/tests/Big_Oneways/README
index 3de1a42ef28..7787ce966e0 100644
--- a/TAO/tests/Big_Oneways/README
+++ b/TAO/tests/Big_Oneways/README
@@ -1,23 +1,21 @@
 /**
 
-
-
 @page Big_Oneways Test README File
 
-	This is a stress test for the non-blocking I/O features in the
+This is a stress test for the non-blocking I/O features in the
 ORB.  The test connects multiple peer processes together.  Each
 process sends messages to all its peers, using multiple threads to
 generate the messages.  Without non-blocking I/O the system soon
 deadlocks.
 
-	This is part of the regression testsuite for:
+This is part of the regression testsuite for:
 
 http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=132
 
-	To run the test use the run_test.pl script:
+To run the test use the run_test.pl script:
 
 $ ./run_test.pl
 
-	the script returns 0 if the test was successful.
+the script returns 0 if the test was successful.
 
 */
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index e085eaf5c3c..7dad8676bc4 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -85,7 +85,7 @@ private:
   /// Helper class to run svc() in a separate thread
   Session_Task task_;
 
-  /// Barrier to start all threads simultaenously
+  /// Barrier to start all threads simultaneously
 #if defined(ACE_HAS_THREADS)
   typedef ACE_Thread_Barrier Barrier;
 #else
diff --git a/TAO/tests/Bug_1361_Regression/Echo.h b/TAO/tests/Bug_1361_Regression/Echo.h
index e10e02a1773..2f7d8119694 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.h
+++ b/TAO/tests/Bug_1361_Regression/Echo.h
@@ -13,14 +13,11 @@
 class Echo : public POA_Test::Echo
 {
 public:
-  Echo(CORBA::ORB_ptr orb,
-       int abort_counter);
+  Echo(CORBA::ORB_ptr orb, int abort_counter);
 
   virtual void echo_payload (Test::Payload const & data);
 
-  virtual void echo_payload_out (
-        Test::Payload_out data
-      );
+  virtual void echo_payload_out (Test::Payload_out data);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Bug_2702_Regression/fakeserver2.pl b/TAO/tests/Bug_2702_Regression/fakeserver2.pl
index 038c9deb64d..13d0a9a04ef 100755
--- a/TAO/tests/Bug_2702_Regression/fakeserver2.pl
+++ b/TAO/tests/Bug_2702_Regression/fakeserver2.pl
@@ -1,5 +1,4 @@
-#!/usr/bin/perl
-
+#!/usr/bin/env perl
 
 use Socket;
 use IO::Socket;
diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 93fdf3555f6..8863849edb7 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -203,10 +203,6 @@ public:
   virtual ACE_Reactor_Impl* allocate_reactor_impl (void) const
   {
     ACE_Reactor_Impl *impl = 0;
-    /*
-     * Hook to specialize TAO's reactor implementation.
-     */
-  //@@ TAO_REACTOR_SPL_COMMENT_HOOK_START
     ACE_NEW_RETURN (impl,
                     Test_Reactor (ACE::max_handles (),
                                     1,
@@ -215,14 +211,13 @@ public:
                                     this->reactor_mask_signals_,
                                     ACE_Select_Reactor_Token::LIFO),
                     0);
-  //@@ TAO_REACTOR_SPL_COMMENT_HOOK_END
     return impl;
   }
 
 private:
 };
 
-// force export flag otherwise Windoze will complain
+// force export flag otherwise Windows will complain
 #define TAO_Test_Export ACE_Proper_Export_Flag
 
 ACE_FACTORY_DEFINE (TAO_Test, Test_Resource_Factory)
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index 8ef9a6b2d1e..7ce1884e8bc 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -30,7 +30,7 @@ project(*IDL): taoserver, messaging, gen_ostream {
     gperf.idl
     interface.idl
     nested_scope.idl
-
+    keywords.idl
     old_constants.idl
     simple.idl
     simple2.idl
@@ -39,7 +39,6 @@ project(*IDL): taoserver, messaging, gen_ostream {
     old_struct.idl
     old_union.idl
     old_union2.idl
-
     params.idl
     reopened_modules.idl
     struct.idl
@@ -73,7 +72,6 @@ project(*IDL): taoserver, messaging, gen_ostream {
     array_only.idl
     constants.idl
     generic_object.idl
-    keywords.idl
 
     inherit.idl
     module.idl
@@ -162,7 +160,6 @@ project(*DLL): taoidldefaults, taolib, messaging {
     inheritS.cpp
     interfaceC.cpp
     interfaceS.cpp
-    keywordsA.cpp
     keywordsC.cpp
     keywordsS.cpp
     loader_constC.cpp
diff --git a/TAO/tests/IDL_Test/README b/TAO/tests/IDL_Test/README
index 4533b382ce1..386728b4915 100644
--- a/TAO/tests/IDL_Test/README
+++ b/TAO/tests/IDL_Test/README
@@ -1,5 +1,3 @@
-
-
 This test is a collection of IDL files that once caused IDL compiler
 or C++ compiler errors, plus a dummy main.cpp for the build. There is
 no execution check in this test, the only outcome of interest being
diff --git a/TAO/tests/IDL_Test/enum_in_struct.idl b/TAO/tests/IDL_Test/enum_in_struct.idl
index 9b71f864eb3..cd0d4ee97f5 100644
--- a/TAO/tests/IDL_Test/enum_in_struct.idl
+++ b/TAO/tests/IDL_Test/enum_in_struct.idl
@@ -61,7 +61,7 @@ struct decl_heavy_struct
 };
 
 // Similar case for exception included here - no sense
-// in making a separte file for exceptions, which are
+// in making a separate file for exceptions, which are
 // almost the same as structs.
 
 exception ErrorException
diff --git a/TAO/tests/IDL_Test/keywords.idl b/TAO/tests/IDL_Test/keywords.idl
index 561e511b996..08f7233ea91 100644
--- a/TAO/tests/IDL_Test/keywords.idl
+++ b/TAO/tests/IDL_Test/keywords.idl
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    keywords.idl
@@ -8,31 +7,36 @@
  *  compiler. This test is to make sure the problems
  *  stay fixed.
  *
- *
  *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
  */
 //=============================================================================
 
-
 // All these identifiers should be accepted, but
 // prepended with _cxx_.
 
-// 'private' and 'public' have been commented out because they are now, in
-// addition to being C++ keywords, IDL keywords, and thus are illegal
-// except when used as such.
+// IDL identifiers are escaped using _
 
 struct Keywords
 {
   unsigned short or;
   char or_eq;
-//  octet private;
+  octet _private;
   boolean protected;
-//  float public;
+  float _public;
   double int;
 };
 
+struct _Object {
+  long long id;
+};
+typedef sequence<_Object> ObjectSeq;
+struct Objects {
+  ObjectSeq objs;
+};
+
 interface Testing
 {
   void foo (in string namespace);
+  void bar (in Objects foo);
 };
 
diff --git a/TAO/tests/IDL_Test/typecode.idl b/TAO/tests/IDL_Test/typecode.idl
index d4c1f051da1..4ec95f616a3 100644
--- a/TAO/tests/IDL_Test/typecode.idl
+++ b/TAO/tests/IDL_Test/typecode.idl
@@ -1,16 +1,13 @@
-
 //=============================================================================
 /**
  *  @file    typecode.idl
  *
  *  Test a sequence of typecodes
  *
- *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
 //=============================================================================
 
-
 #include "orb.idl"
 
 module MyModule
diff --git a/TAO/tests/OBV/Collocated/Forward/TreeBase.idl b/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
index 666b02e83fe..57d4280b016 100644
--- a/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
+++ b/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
@@ -1,7 +1,7 @@
 // Forward declaration to make recursive construct.
 valuetype BaseNode;
 
-//@@ Dosn't work for now
+//@@ Doesn't work for now
 //typedef sequence<BaseNode> BaseNodeSeq;
 
 // Performance test: One may try to pass
diff --git a/TAO/tests/OBV/Forward/TreeBase.idl b/TAO/tests/OBV/Forward/TreeBase.idl
index 666b02e83fe..57d4280b016 100644
--- a/TAO/tests/OBV/Forward/TreeBase.idl
+++ b/TAO/tests/OBV/Forward/TreeBase.idl
@@ -1,7 +1,7 @@
 // Forward declaration to make recursive construct.
 valuetype BaseNode;
 
-//@@ Dosn't work for now
+//@@ Doesn't work for now
 //typedef sequence<BaseNode> BaseNodeSeq;
 
 // Performance test: One may try to pass
diff --git a/TAO/tests/ORB_shutdown/README b/TAO/tests/ORB_shutdown/README
index 89eecda60dc..9e57fb2934e 100644
--- a/TAO/tests/ORB_shutdown/README
+++ b/TAO/tests/ORB_shutdown/README
@@ -7,7 +7,7 @@
 	The simplest possible test for TAO's shutdown procedure. This
 test is basically a regression for BUG 1265. Please see BUG 1265 in
 
-    http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1265
+    http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1265
 
 for details.
 
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 3753fc5ccdc..c9090eae741 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/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 *forward_str);
@@ -63,7 +62,6 @@ public:
   //@}
 
 private:
-
   ///The ID of the ORB this interceptor is registered with.
   CORBA::String_var orb_id_;
 
@@ -75,7 +73,6 @@ private:
   CORBA::ULong request_count_;
 
   CORBA::String_var forward_str_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index 2af09d07db9..a51d948d3a1 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -5,6 +5,10 @@
 
 #include "client_interceptor.h"
 
+Echo_Client_ORBInitializer::Echo_Client_ORBInitializer (int& result) : result_ (result)
+{
+}
+
 void
 Echo_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
@@ -21,14 +25,13 @@ Echo_Client_ORBInitializer::post_init (
 
   // Install the Echo client request interceptor
   ACE_NEW_THROW_EX (interceptor,
-                    Echo_Client_Request_Interceptor,
+                    Echo_Client_Request_Interceptor (this->result_),
                     CORBA::NO_MEMORY ());
 
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index 84cdaa3c472..4a6ed849fed 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -27,10 +27,14 @@ class Echo_Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
+  Echo_Client_ORBInitializer (int& result);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
+
+private:
+  int& result_;
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index 095a32b08e0..f50e351c6f2 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -5,6 +5,10 @@
 
 #include "server_interceptor.h"
 
+Echo_Server_ORBInitializer::Echo_Server_ORBInitializer (int& result) : result_ (result)
+{
+}
+
 void
 Echo_Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
@@ -21,7 +25,7 @@ Echo_Server_ORBInitializer::post_init (
 
   // Install the Echo server request interceptor
   ACE_NEW_THROW_EX (interceptor,
-                    Echo_Server_Request_Interceptor,
+                    Echo_Server_Request_Interceptor (this->result_),
                     CORBA::NO_MEMORY ());
 
   PortableInterceptor::ServerRequestInterceptor_var
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index d2c2e6de155..c611cdf28eb 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -27,10 +27,14 @@ class Echo_Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
+  Echo_Server_ORBInitializer (int& result);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
+
+private:
+  int& result_;
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/README b/TAO/tests/Portable_Interceptors/Dynamic/README
index 6f494bcdf76..a2e686c1941 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/README
+++ b/TAO/tests/Portable_Interceptors/Dynamic/README
@@ -1,5 +1,3 @@
-
-
 This test allows you to visually check the correct invocation of
 TAO's pseudo-portable interceptors, especially the Dynamic interface.
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index c0153f9e365..0917bb12eaf 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -38,12 +38,10 @@ run_test (Test_Interceptors::Visual_ptr server)
 {
   CORBA::String_var msg;
 
-  server->normal (10,
-                  msg.out ());
+  server->normal (10, msg.out ());
 
   CORBA::Long one = 1, two = 1, result = 0;
-  result = server->calculate (one,
-                              two);
+  result = server->calculate (one, two);
 
   ACE_DEBUG ((LM_DEBUG,
               "calculate() result = %d\n",
@@ -81,6 +79,8 @@ run_test (Test_Interceptors::Visual_ptr server)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
+  int result = 0;
+
   try
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         PortableInterceptor::ORBInitializer::_nil ();
 
       ACE_NEW_RETURN (temp_initializer,
-                      Echo_Client_ORBInitializer,
+                      Echo_Client_ORBInitializer (result),
                       -1);  // No exceptions yet!
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
@@ -128,5 +128,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  return 0;
+  return result;
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index af4dab6e0b9..5249375a979 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -6,38 +6,32 @@
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
 
 #include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
+#include <cstring>
 
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
-  : myname_ ("Echo_Client_Interceptor")
-{
-}
-
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
+Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (int& result)
+  : result_ (result)
 {
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
-  return CORBA::string_dup (this->myname_);
+  return CORBA::string_dup ("Echo_Client_Interceptor");
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
 void
-Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr)
+Echo_Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
 {
   // Do nothing
 }
 
 void
-Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri)
+Echo_Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
 {
   bool catched_exception = false;
   try
@@ -45,13 +39,15 @@ Echo_Client_Request_Interceptor::send_request (
       PortableInterceptor::ReplyStatus rstatus = ri->reply_status ();
       ACE_UNUSED_ARG (rstatus);
     }
-  catch (const ::CORBA::BAD_INV_ORDER&)
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
     {
-      catched_exception = true;
+      // BAD_INV_ORDER should be thrown with minor code 14
+      catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14));
     }
 
   if (!catched_exception)
     {
+      ++this->result_;
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ERROR, no exception when getting reply status\n"));
     }
@@ -64,17 +60,15 @@ Echo_Client_Request_Interceptor::send_request (
               op.in ()));
 
   // For the "normal" operation, get the argument list.
-  if (ACE_OS::strcmp (op.in (),
-                      "normal") == 0)
+  if (std::strcmp (op.in (), "normal") == 0)
     {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments ();
+      Dynamic::ParameterList_var paramlist = ri->arguments ();
 
       if (paramlist->length () != 2)
         {
+          ++this->result_;
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) All parameters not available\n"));
-
         }
 
       CORBA::ULong first = 0, second = 1; // If you dont understand
@@ -92,6 +86,7 @@ Echo_Client_Request_Interceptor::send_request (
 
       if (param != 10)
         {
+          ++this->result_;
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in send_request while checking "
                       "the value of the extracted "
@@ -101,6 +96,7 @@ Echo_Client_Request_Interceptor::send_request (
       CORBA::TypeCode_var second_typecode = paramlist[second].argument.type ();
       if (second_typecode->kind () != CORBA::tk_null)
         {
+          ++this->result_;
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in send_request while checking "
                       "the type of the extracted out"
@@ -110,10 +106,8 @@ Echo_Client_Request_Interceptor::send_request (
 }
 
 void
-Echo_Client_Request_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr ri)
+Echo_Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -123,8 +117,7 @@ Echo_Client_Request_Interceptor::receive_other (
 }
 
 void
-Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri)
+Echo_Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
 {
   CORBA::String_var op = ri->operation ();
 
@@ -134,11 +127,9 @@ Echo_Client_Request_Interceptor::receive_reply (
               op.in ()));
 
     // For the "normal" operation, get the argument list.
-  if (ACE_OS::strcmp (op.in (),
-                      "normal") == 0)
+  if (std::strcmp (op.in (), "normal") == 0)
     {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments ();
+      Dynamic::ParameterList_var paramlist = ri->arguments ();
 
       if (paramlist->length () != 2)
         {
@@ -153,6 +144,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       if (paramlist[first].mode != CORBA::PARAM_IN ||
           paramlist[second].mode != CORBA::PARAM_OUT)
         {
+          ++this->result_;
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in the extracted argument list\n"));
         }
@@ -162,6 +154,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
       if (param != 10)
         {
+          ++this->result_;
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in send_request while checking "
                       "the value of the extracted "
@@ -174,9 +167,9 @@ Echo_Client_Request_Interceptor::receive_reply (
 
       CORBA::String_var transfer (str);
 
-      if (ACE_OS::strcmp (str,
-                          "DO_NOT_INSULT_MY_INTELLIGENCE") != 0)
+      if (std::strcmp (str, "DO_NOT_INSULT_MY_INTELLIGENCE") != 0)
         {
+          ++this->result_;
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in send_request while checking "
                       "the value of the extracted "
@@ -184,10 +177,9 @@ Echo_Client_Request_Interceptor::receive_reply (
         }
     }
 
-  if (ACE_OS::strcmp (op.in (), "calculate") == 0)
+  if (std::strcmp (op.in (), "calculate") == 0)
     {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments ();
+      Dynamic::ParameterList_var paramlist = ri->arguments ();
 
       CORBA::Long param1, param2, result;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -206,11 +198,11 @@ Echo_Client_Request_Interceptor::receive_reply (
                   result));
     }
 
-  if (ACE_OS::strcmp (op.in (), "_get_the_structure") == 0)
+  if (std::strcmp (op.in (), "_get_the_structure") == 0)
     {
       CORBA::Any_var a = ri->result ();
 
-      const Test_Interceptors::Visual::VarLenStruct * v = 0;
+      const Test_Interceptors::Visual::VarLenStruct * v = nullptr;
 
       (a.in ()) >>= v;
 
@@ -227,7 +219,6 @@ void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -235,9 +226,7 @@ Echo_Client_Request_Interceptor::receive_exception (
               "from \"%C\"\n",
               op.in ()));
 
-
-  CORBA::String_var exception_id =
-    ri->received_exception_id ();
+  CORBA::String_var exception_id = ri->received_exception_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %C\n",
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
index 5e340799c91..939e199f681 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
@@ -15,40 +15,34 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+/// Client-side echo interceptor.  For checking interceptor visually only.
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
     public virtual ::CORBA::LocalObject
 {
-  // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
+  Echo_Client_Request_Interceptor (int& result);
 
-  Echo_Client_Request_Interceptor (void);
-  // ctor.
-
-  virtual char * name (void);
   // Canonical name of the interceptor.
+  char * name () override;
 
-  virtual void destroy (void);
+  void destroy () override;
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
+  void send_poll (PortableInterceptor::ClientRequestInfo_ptr) override;
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
+  void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) override;
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
+  void receive_other (PortableInterceptor::ClientRequestInfo_ptr) override;
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
+  void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) override;
 
-  virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri);
+  void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) override;
 
 protected:
-
-  virtual ~Echo_Client_Request_Interceptor (void);
-  // dtor.
+  ~Echo_Client_Request_Interceptor () override = default;
 
 private:
-  const char *myname_;
-
+  int& result_;
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
index 1113978c01a..3d1fb801bc5 100755
--- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
@@ -52,7 +52,7 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 45);
+$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index 6ca15eecd4b..809cd868d40 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -2,7 +2,6 @@
 #include "test_i.h"
 #include "Echo_Server_ORBInitializer.h"
 #include "ace/OS_NS_stdio.h"
-
 #include "tao/ORBInitializer_Registry.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
@@ -35,6 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
+  int result = 0;
   try
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         PortableInterceptor::ORBInitializer::_nil ();
 
       ACE_NEW_RETURN (temp_initializer,
-                      Echo_Server_ORBInitializer,
+                      Echo_Server_ORBInitializer (result),
                       -1);  // No exceptions yet!
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
@@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       CORBA::String_var ior =
         orb->object_to_string (server.in ());
 
-      ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
+      ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%C>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -115,5 +115,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  return 0;
+  return result;
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 4f12e95e2d5..20671f6c34b 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -6,32 +6,99 @@
 #include "testC.h"
 
 #include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
+#include <cstring>
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
-  : myname_ ("Echo_Server_Interceptor")
-{
-}
-
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (int& result)
+  : result_ (result)
 {
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
-  return CORBA::string_dup (this->myname_);
+  return CORBA::string_dup ("Echo_Server_Interceptor");
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
 {
+  bool catched_exception = false;
+  try
+    {
+      CORBA::String_var tmdi = ri->target_most_derived_interface ();
+    }
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
+    {
+      // BAD_INV_ORDER should be thrown with minor code 14
+      catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14));
+    }
+
+  if (!catched_exception)
+    {
+      ++this->result_;
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR, no exception when calling target_most_derived_interface from receive_request_service_contexts\n"));
+    }
+
+  catched_exception = false;
+  try
+    {
+      CORBA::Boolean tmdi = ri->target_is_a ("FOO");
+    }
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
+    {
+      // BAD_INV_ORDER should be thrown with minor code 14
+      catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14));
+    }
+
+  if (!catched_exception)
+    {
+      ++this->result_;
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR, no exception when calling target_is_a from receive_request_service_contexts\n"));
+    }
+
+  catched_exception = false;
+  try
+    {
+      PortableInterceptor::ReplyStatus tmdi = ri->reply_status ();
+    }
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
+    {
+      // BAD_INV_ORDER should be thrown with minor code 14
+      catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14));
+    }
+
+  if (!catched_exception)
+    {
+      ++this->result_;
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR, no exception when calling reply_status from receive_request_service_contexts\n"));
+    }
+
+  catched_exception = false;
+  try
+    {
+      Dynamic::ParameterList_var paramlist = ri->arguments ();
+    }
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
+    {
+      // BAD_INV_ORDER should be thrown with minor code 14
+      catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14));
+    }
+
+  if (!catched_exception)
+    {
+      ++this->result_;
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR, no exception when calling arguments from receive_request_service_contexts\n"));
+    }
 }
 
 void
@@ -44,13 +111,15 @@ Echo_Server_Request_Interceptor::receive_request (
       PortableInterceptor::ReplyStatus rstatus = ri->reply_status ();
       ACE_UNUSED_ARG (rstatus);
     }
-  catch (const ::CORBA::BAD_INV_ORDER&)
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
     {
-      catched_exception = true;
+      // BAD_INV_ORDER should be thrown with minor code 14
+      catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14));
     }
 
   if (!catched_exception)
     {
+      ++this->result_;
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ERROR, no exception when getting reply status\n"));
     }
@@ -61,10 +130,26 @@ Echo_Server_Request_Interceptor::receive_request (
               "Echo_Server_Request_Interceptor::receive_request from \"%C\"\n",
               op.in ()));
 
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
+  CORBA::Boolean targetisa = ri->target_is_a ("FOO");
+  if (targetisa)
     {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments ();
+      ++this->result_;
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR in receive_request while checking "
+                  "target_is_a, it is not a FOO\n"));
+    }
+  targetisa = ri->target_is_a ("IDL:Test_Interceptors/Visual:1.0");
+  if (!targetisa)
+    {
+      ++this->result_;
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR in receive_request while checking "
+                  "target_is_a, it should be IDL:Test_Interceptors/Visual:1.0\n"));
+    }
+
+  if (std::strcmp (op.in (), "normal") == 0)
+    {
+      Dynamic::ParameterList_var paramlist = ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -79,6 +164,7 @@ Echo_Server_Request_Interceptor::receive_request (
       CORBA::TypeCode_var second_typecode = paramlist[i].argument.type ();
       if (second_typecode->kind () != CORBA::tk_null)
         {
+          ++this->result_;
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in receive_request while checking "
                       "the type of the extracted out"
@@ -86,29 +172,51 @@ Echo_Server_Request_Interceptor::receive_request (
         }
      }
 
-  CORBA::String_var tmdi =
-    ri->target_most_derived_interface ();
+  CORBA::String_var tmdi = ri->target_most_derived_interface ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Target most derived interface: %C\n",
               tmdi.in ()));
+
+  if (std::strcmp (tmdi.in (), "IDL:Test_Interceptors/Visual:1.0") != 0)
+    {
+      ++this->result_;
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR in receive_request while checking "
+                  "target_most_derived_interface\n"));
+    }
+
+  catched_exception = false;
+  try
+    {
+      PortableInterceptor::ReplyStatus tmdi = ri->reply_status ();
+    }
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
+    {
+      // BAD_INV_ORDER should be thrown with minor code 14
+      catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14));
+    }
+
+  if (!catched_exception)
+    {
+      ++this->result_;
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR, no exception when calling reply_status from receive_request\n"));
+    }
 }
 
 void
-Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri)
+Echo_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_reply from \"%C\"\n",
               op.in ()));
 
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
+  if (std::strcmp (op.in (), "normal") == 0)
     {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments ();
+      Dynamic::ParameterList_var paramlist = ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -119,10 +227,9 @@ Echo_Server_Request_Interceptor::send_reply (
                   param));
     }
 
-  if (ACE_OS::strcmp (op.in (), "calculate") == 0)
+  if (std::strcmp (op.in (), "calculate") == 0)
     {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments ();
+      Dynamic::ParameterList_var paramlist = ri->arguments ();
 
       CORBA::Long param1, param2, result = 0;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -146,7 +253,6 @@ void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -154,17 +260,15 @@ Echo_Server_Request_Interceptor::send_exception (
               "from \"%C\"\n",
               op.in ()));
 
-
-  CORBA::Any_var any =
-    ri->sending_exception ();
+  CORBA::Any_var any = ri->sending_exception ();
 
   CORBA::TypeCode_var type = any->type ();
 
-  const char *exception_id = type->id ();
+  CORBA::String_var exception_id = type->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %C\n",
-              exception_id));
+              exception_id.in ()));
 }
 
 void
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
index da47f879f3a..b0a99af2ab6 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
@@ -15,38 +15,34 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+/// Server-side echo interceptor.  For checking interceptor visually only.
 class Echo_Server_Request_Interceptor
   : public PortableInterceptor::ServerRequestInterceptor,
     public virtual ::CORBA::LocalObject
 {
-  // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
-  // cotr.
+  Echo_Server_Request_Interceptor (int& result);
 
-  virtual char * name (void);
   // Canonical name of the interceptor.
+  char * name () override;
 
-  virtual void destroy (void);
+  void destroy () override;
 
-  virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr);
+  void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) override;
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
+  void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) override;
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
+  void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) override;
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
+  void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) override;
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
+  void send_other (PortableInterceptor::ServerRequestInfo_ptr) override;
 
 protected:
-
-  virtual ~Echo_Server_Request_Interceptor (void);
-  // dotr.
+  ~Echo_Server_Request_Interceptor () override = default;
 
 private:
-  const char *myname_;
-
+  int& result_;
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
index 540b0e2ebd3..600905ee3ce 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
@@ -4,7 +4,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
-  // ctor
 
 void
 Visual_i::normal (CORBA::Long arg,
@@ -23,9 +22,9 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 Test_Interceptors::Visual::VarLenStruct *
-Visual_i::the_structure (void)
+Visual_i::the_structure ()
 {
-  Test_Interceptors::Visual::VarLenStruct * s;
+  Test_Interceptors::Visual::VarLenStruct * s = nullptr;
 
   ACE_NEW_THROW_EX (s,
                     Test_Interceptors::Visual::VarLenStruct,
@@ -40,21 +39,21 @@ Visual_i::the_structure (void)
 }
 
 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 ();
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
index 2e8230b8576..03d5177ae04 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
@@ -19,24 +19,20 @@ class Visual_i : public POA_Test_Interceptors::Visual
 public:
   Visual_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Long calculate (CORBA::Long one,
-                                 CORBA::Long two);
+  CORBA::Long calculate (CORBA::Long one, CORBA::Long two) override;
 
-  void normal (CORBA::Long arg,
-               CORBA::String_out msg);
+  void normal (CORBA::Long arg, CORBA::String_out msg)  override;
 
-  virtual Test_Interceptors::Visual::VarLenStruct * the_structure ();
+  Test_Interceptors::Visual::VarLenStruct * the_structure () override;
 
-  virtual void user (void);
+  void user () override;
 
-  virtual void system (void);
+  void system () override;
 
-  virtual void shutdown (void);
+  void shutdown () override;
 
 private:
-
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index 37728cbd5b4..df858f6df1f 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -48,7 +48,6 @@ class Client_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Client_Request_Interceptor (const char *orb_id,
                               const char *forward_str);
@@ -84,7 +83,6 @@ public:
   //@}
 
 private:
-
   ///The ID of the ORB this interceptor is registered with.
   CORBA::String_var orb_id_;
 
@@ -98,7 +96,6 @@ private:
   /// Stringified reference to the object the initial request will be
   /// forwarded to by this interceptor.
   CORBA::String_var forward_str_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
index d915986215d..d4a5cbd430e 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
@@ -25,7 +25,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
 // Test's SlotId made global for ease of implementation.
 // It is initialized to a large number to make it obvious when the
 // SlotId is invalid.
@@ -34,7 +33,6 @@
 // if thread-safety is an issue!!!
 extern PortableInterceptor::SlotId slot_id;
 
-
 /**
  * @class ClientORBInitializer
  *
@@ -48,7 +46,6 @@ class ClientORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name Methods Required by the ORBInitializer Interface
    *
@@ -65,7 +62,6 @@ public:
   virtual void post_init (
       PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
index 7b7f18aac6b..0bca4b49de4 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
@@ -43,7 +43,6 @@ class ClientRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   ClientRequestInterceptor (PortableInterceptor::SlotId slot_id,
                             PortableInterceptor::Current_ptr pi_current);
@@ -79,14 +78,12 @@ public:
   //@}
 
 private:
-
   /// The PICurrent slot ID allocated to this application during ORB
   /// initialization.
   PortableInterceptor::SlotId slot_id_;
 
   /// Reference to the PICurrent object.
   PortableInterceptor::Current_var pi_current_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
index 4d3bafe639d..bb69b5c1e82 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
@@ -40,7 +40,6 @@ class ClientRequestInterceptor2
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   ClientRequestInterceptor2 (PortableInterceptor::SlotId slot_id);
 
@@ -75,11 +74,9 @@ public:
   //@}
 
 private:
-
   /// The PICurrent slot ID allocated to this application during ORB
   /// initialization.
   PortableInterceptor::SlotId slot_id_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/README b/TAO/tests/Portable_Interceptors/PICurrent/README
index 605ac2c1260..98e491468d7 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/README
+++ b/TAO/tests/Portable_Interceptors/PICurrent/README
@@ -1,5 +1,3 @@
-
-
 This test verifies that the "PICurrent" object semantics are correct
 on both the client side and the server side.  In particular, it
 attempts to make sure the request scope current (RSC) and thread scope
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
index fe70c86f8eb..4985cf7d4de 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
@@ -49,7 +49,6 @@ class ServerORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name Methods Required by the ORBInitializer Interface
    *
@@ -66,7 +65,6 @@ public:
   virtual void post_init (
       PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index 8be04ba5395..d9990d5b102 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -42,7 +42,6 @@ class ServerRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   ServerRequestInterceptor (PortableInterceptor::SlotId id,
                             PortableInterceptor::Current_ptr pi_current);
@@ -78,14 +77,12 @@ public:
   //@}
 
 private:
-
   /// The PICurrent slot ID allocated to this application during ORB
   /// initialization.
   PortableInterceptor::SlotId slot_id_;
 
   /// Reference to the PICurrent object.
   PortableInterceptor::Current_var pi_current_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
index cda81e4f4ed..9e370707c0e 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
@@ -29,7 +29,6 @@
 class test_i : public virtual POA_PICurrentTest::test
 {
 public:
-
   /// Constructor.
   test_i (PortableInterceptor::Current_ptr current,
           PortableInterceptor::SlotId id,
@@ -53,7 +52,6 @@ public:
   virtual void shutdown (void);
 
 private:
-
   /// Reference to the PICurrent object.
   PortableInterceptor::Current_var current_;
 
@@ -62,7 +60,6 @@ private:
 
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
index 3753fc5ccdc..c9090eae741 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/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 *forward_str);
@@ -63,7 +62,6 @@ public:
   //@}
 
 private:
-
   ///The ID of the ORB this interceptor is registered with.
   CORBA::String_var orb_id_;
 
@@ -75,7 +73,6 @@ private:
   CORBA::ULong request_count_;
 
   CORBA::String_var forward_str_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 1f2abcbc24b..5907543ac8b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -26,7 +26,6 @@ class Server_Request_Interceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   Server_Request_Interceptor (void);
 
@@ -61,15 +60,12 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
   ~Server_Request_Interceptor (void);
 
 private:
-
   /// The number of requests intercepted by this interceptor.
   CORBA::ULong request_count_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
index a6adcaee7d7..66aef9277e6 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_CLIENT_ORB_INITIALIZER_H
 #define TAO_CLIENT_ORB_INITIALIZER_H
 
@@ -42,11 +41,9 @@ class Client_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   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/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
index 514796e720e..0b6a17e2bb0 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
@@ -43,7 +43,6 @@ class Client_Request_Interceptor
     public virtual Request_Interceptor
 {
 public:
-
   /// Constructor.
   Client_Request_Interceptor (const char *name);
 
@@ -73,12 +72,10 @@ public:
   //@}
 
 private:
-
   // Returns 1 if the client-side test is currently being run, and 0
   // otherwise.
   CORBA::Boolean client_side_test (
     PortableInterceptor::ClientRequestInfo_ptr info);
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/README b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/README
index a002c1bbc16..86f889bfa0c 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/README
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/README
@@ -1,12 +1,9 @@
-
-
 NOTE: The code in this test is highly specialized and very brittle.
       Do not use it as a model for "real world" interceptor code.
 
-
 This test verifies that proper request interceptor flow semantics
 occur during a given request/invocation.  It does so by executing a
-canned (hard-coded) set of scenarios.  Each scenario excercises a
+canned (hard-coded) set of scenarios.  Each scenario exercises a
 specific flow behavior.  All scenarios correspond to the ones detailed
 in the Portable Interceptor specification (00-04-05).  They are listed
 below:
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 ded8412f970..662b8e79d85 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
@@ -42,7 +42,6 @@ class Request_Interceptor
   : public virtual PortableInterceptor::Interceptor
 {
 public:
-
   /// Constructor.
   Request_Interceptor (const char *name);
 
@@ -62,7 +61,6 @@ public:
   //@}
 
 protected:
-
   /// The name of this interceptor.
   CORBA::String_var name_;
 
@@ -75,7 +73,6 @@ protected:
   /// called.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong>
     ending_interception_point_count_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
index bf6e9a79b15..4f9f1a17d5f 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
@@ -42,11 +42,9 @@ class Server_ORBInitializer :
   public virtual ::CORBA::LocalObject
 {
 public:
-
   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/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index 435eb4e6a3d..0caaf005906 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
@@ -15,7 +15,6 @@ void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::Boolean server_side =
     this->server_side_test (ri);
 
@@ -58,7 +57,6 @@ void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::Boolean server_side =
     this->server_side_test (ri);
 
@@ -129,7 +127,6 @@ void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::Boolean server_side =
     this->server_side_test (ri);
 
@@ -206,7 +203,6 @@ void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::Boolean server_side =
     this->server_side_test (ri);
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
index 524842dd5a3..79f396b40fc 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
@@ -44,7 +44,6 @@ class Server_Request_Interceptor
     public virtual Request_Interceptor
 {
 public:
-
   /// Constructor.  Accepts the name of the interceptor.
   Server_Request_Interceptor (const char *name);
 
@@ -74,14 +73,12 @@ public:
   //@}
 
 private:
-
   /// Returns 1 if the server-side test is currently being run, and 0
   /// otherwise.
   CORBA::Boolean server_side_test (
     PortableInterceptor::ServerRequestInfo_ptr info);
 
 private:
-
   /// Variable used to keep track of the scenario count.  Used to get
   /// around the inability to call RequestInfo::arguments() in the
   /// receive_service_contexts() interception point.
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 654eb1a4a1b..91260b771db 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
@@ -26,7 +26,6 @@
 class test_i : public virtual POA_Test
 {
 public:
-
   /// Constructor.
   test_i (CORBA::ORB_ptr orb);
 
@@ -41,10 +40,8 @@ public:
   virtual void shutdown (void);
 
 private:
-
   /// Pseudo-reference to the ORB.
   CORBA::ORB_var orb_;
-
 };
 
 #endif  /* TEST_I_H */
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README
index 94074ab8aeb..3286dcbe9ad 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README
@@ -1,5 +1,3 @@
-
-
 Description:
 This is a simple test for a RT thread-pool server.  It creates a
 server process with multiple thread pools, POAs, and servants.  The
@@ -7,4 +5,4 @@ test also spawns multiple clients for each servant.  The servants with
 multiple threads in their thread-pool respond faster than the servants
 with a single thread thread-pool.
 
-See run_test.pl to see how to run this test.
\ No newline at end of file
+See run_test.pl to see how to run this test.
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 7bdf6bff90d..3de5fa0d2bb 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -150,7 +150,6 @@ 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);
 
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
index 3dafef71563..17dc7cbdea7 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
@@ -8,8 +8,7 @@
 
 #include "testS.h"
 
-class test_i :
-  public POA_test
+class test_i : public POA_test
 {
 public:
   /// Constructor.
diff --git a/TAO/tests/Sequence_Iterators/.gitignore b/TAO/tests/Sequence_Iterators/.gitignore
deleted file mode 100644
index c24a6328561..00000000000
--- a/TAO/tests/Sequence_Iterators/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Bounded_String
-/StringSeq
-/Unbounded_Objectref
-/Unbounded_Value
diff --git a/TAO/tests/Sequence_Iterators/Bounded_String.cpp b/TAO/tests/Sequence_Iterators/Bounded_String.cpp
deleted file mode 100644
index 4e10ab58bf0..00000000000
--- a/TAO/tests/Sequence_Iterators/Bounded_String.cpp
+++ /dev/null
@@ -1,673 +0,0 @@
-/**
- * @file Bounded_String.cpp
- *
- * @brief test for STL iterator behaviour of CORBA bounded string sequence
- *
- * @author Friedhelm Wolf (fwolf@dre.vanderbilt.edu)
- */
-
-#include "tao/Bounded_Basic_String_Sequence_T.h"
-#include "tao/CORBA_String.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-#include <iostream>
-#include <iterator>
-#include <sstream>
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-typedef TAO::bounded_basic_string_sequence<char, 4> s_sequence;
-
-#define FAIL_RETURN_IF(CONDITION) \
-          if (CONDITION) \
-      { \
-              ACE_DEBUG ((LM_ERROR, ACE_TEXT ("\tFailed at %N:%l\n"))); \
-        return 1; \
-      }
-
-template <typename ITERATOR_T>
-int test_sequence ()
-{
-  s_sequence a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-  a.length (4);
-
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  a[0] = CORBA::string_dup (elem0_cstr);
-  a[1] = CORBA::string_dup (elem1_cstr);
-  a[2] = CORBA::string_dup (elem2_cstr);
-  a[3] = CORBA::string_dup (elem3_cstr);
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test assignment operator
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  // JWH2 - I don't think this test makes sense. I believe the compiler
-  // will always return a const value since the dereference is on
-  // the right hand side of the assignment (i.e., r value).
-  //char* value0 = *a_it;
-  //FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem0_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem0_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem1_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[0]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[2]) != 0);
-
-  // test operator[] write
-  // NOTE: This now changes the sequence a.
-  // NOTE: This does not work for const_iterators which are
-  // sometimes used in this function.
-  // a_it[0] = CORBA::string_dup (elem0_cstr);
-  // FAIL_RETURN_IF (ACE_OS::strcmp (a[2],elem0_cstr) != 0);
-
-  // reset content of sequence a
-  //a[2] = CORBA::string_dup (elem2_cstr);
-
-  // test for loop behaviour
-  s_sequence b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  s_sequence test;
-  test.length (4);
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             // JWH2 - I changed value_type to const_value_type. Is that
-             // the correct approach?
-             std::ostream_iterator<s_sequence::const_value_type> (ostream,
-                                                                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem0\nelem1\nelem2\nelem3\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename ITERATOR_T>
-int test_const_sequence ()
-{
-  // setup of an example sequence
-  s_sequence setup;
-  setup.length (4);
-
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  setup[0] = CORBA::string_dup (elem0_cstr);
-  setup[1] = CORBA::string_dup (elem1_cstr);
-  setup[2] = CORBA::string_dup (elem2_cstr);
-  setup[3] = CORBA::string_dup (elem3_cstr);
-
-  const s_sequence a = setup;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test assignment operator
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  // JWH2 - I don't think this test makes sense. I believe the compiler
-  // will always return a const value since the dereference is on
-  // the right hand side of the assignment (i.e., r value).
-  //char* value0 = *a_it;
-  //FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem0_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem0_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem1_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[0]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[2]) != 0);
-
-  // test for loop behaviour
-  s_sequence b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  s_sequence test;
-  test.length (4);
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             // JWH2 - I changed value_type to const_value_type. Is that
-             // the correct approach?
-             std::ostream_iterator<s_sequence::const_value_type> (ostream,
-                                                                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem0\nelem1\nelem2\nelem3\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_sequence_reverse ()
-{
-  s_sequence a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-  a.length (4);
-
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  a.length (4);
-  a[0] = CORBA::string_dup (elem0_cstr);
-  a[1] = CORBA::string_dup (elem1_cstr);
-  a[2] = CORBA::string_dup (elem2_cstr);
-  a[3] = CORBA::string_dup (elem3_cstr);
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test assignment operator
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  // JWH2 - I don't think this test makes sense. I believe the compiler
-  // will always return a const value since the dereference is on
-  // the right hand side of the assignment (i.e., r value).
-  //char* value0 = *a_it;
-  //FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem3_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem3_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem2_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[3]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[1]) != 0);
-
-  // test operator[] write
-  // NOTE: This now changes the sequence a.
-  // this is not possible for const iterators which are
-  // sometimes used by this function.
-  // a_it[0] = CORBA::string_dup (elem0_cstr);
-  // FAIL_RETURN_IF (ACE_OS::strcmp (a[1],elem0_cstr) != 0);
-
-  // reset content of sequence a
-  //a[1] = CORBA::string_dup (elem1_cstr);
-
-  // test for loop behaviour
-  s_sequence b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  s_sequence test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             // JWH2 - I changed value_type to const_value_type. Is that
-             // the correct approach?
-             std::ostream_iterator<s_sequence::const_value_type> (ostream,
-                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem3\nelem2\nelem1\nelem0\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_const_sequence_reverse ()
-{
-  // setup of an example sequence
-  s_sequence setup;
-  setup.length (4);
-
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  setup[0] = CORBA::string_dup (elem0_cstr);
-  setup[1] = CORBA::string_dup (elem1_cstr);
-  setup[2] = CORBA::string_dup (elem2_cstr);
-  setup[3] = CORBA::string_dup (elem3_cstr);
-
-  const s_sequence a = setup;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test assignment operator
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  // JWH2 - I don't think this test makes sense. I believe the compiler
-  // will always return a const value since the dereference is on
-  // the right hand side of the assignment (i.e., r value).
-  //char* value0 = *a_it;
-  //FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem3_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem3_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem2_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[3]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[1]) != 0);
-
-  // test for loop behaviour
-  s_sequence b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  s_sequence test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             // JWH2 - I changed value_type to const_value_type. Is that
-             // the correct approach?
-             std::ostream_iterator<s_sequence::const_value_type> (ostream,
-                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem3\nelem2\nelem1\nelem0\n") != 0);
-
-  return 0;
-}
-
-#endif
-
-//-----------------------------------------------------------------------------
-
-int ACE_TMAIN(int,ACE_TCHAR*[])
-{
-  int status = 0;
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  // Test Generic_Sequence_Iterator.
-  status += test_sequence<s_sequence::iterator> ();
-
-  // Test Const_Generic_Sequence_Iterator with non-const sequence.
-  status += test_sequence<s_sequence::const_iterator> ();
-
-  // Test Const_Generic_Sequence_Iterator with const sequence.
-  status += test_const_sequence<s_sequence::const_iterator> ();
-
-  // Test Generic_Sequence_Reverse_Iterator.
-  status += test_sequence_reverse<s_sequence::reverse_iterator> ();
-
-  // Test Const_Generic_Sequence_Reverse_Iterator with non-const sequence.
-  status += test_sequence_reverse<s_sequence::const_reverse_iterator> ();
-
-  // Test Const_Generic_Sequence_Reverse_Iterator with const sequence.
-  status += test_const_sequence_reverse<s_sequence::const_reverse_iterator> ();
-
-#endif
-
-  return status;
-}
-
diff --git a/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc b/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc
deleted file mode 100644
index 320b84b882c..00000000000
--- a/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- MPC -*-
-project(StringSeq) : taoexe {
-  exename = StringSeq
-  Source_Files {
-    StringSeq.cpp
-  }
-}
-
-project(Bounded_String) : taoexe {
-  exename = Bounded_String
-  Source_Files {
-    Bounded_String.cpp
-  }
-}
-
-project(Unbounded_Value) : taoexe {
-  exename = Unbounded_Value
-  Source_Files {
-    Unbounded_Value.cpp
-  }
-}
-
-project(Unbounded_Objectref) : taoexe {
-  exename = Unbounded_Objectref
-  Source_Files {
-    mock_reference.cpp
-    Unbounded_Objectref.cpp
-  }
-}
diff --git a/TAO/tests/Sequence_Iterators/StringSeq.cpp b/TAO/tests/Sequence_Iterators/StringSeq.cpp
deleted file mode 100644
index 937c583c7aa..00000000000
--- a/TAO/tests/Sequence_Iterators/StringSeq.cpp
+++ /dev/null
@@ -1,959 +0,0 @@
-/**
- * @file StringSeq.cpp
- *
- * @brief test for STL iterator behaviour of CORBA unbounded string sequence
- *
- * @author Friedhelm Wolf (fwolf@dre.vanderbilt.edu)
- */
-
-#include "tao/StringSeqC.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-#include <iostream>
-#include <iterator>
-#include <sstream>
-
-#define FAIL_RETURN_IF(CONDITION) \
-          if (CONDITION) \
-      { \
-              ACE_DEBUG ((LM_ERROR, ACE_TEXT ("\tFailed at %N:%l\n"))); \
-        return 1; \
-      }
-
-//-----------------------------------------------------------------------------
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-template <typename ITERATOR_T>
-int test_sequence ()
-{
-  ::CORBA::StringSeq a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  a.length (4);
-  // Create a case to test for memory leaks
-  // in the sequence.
-  a[0] = CORBA::string_dup (elem0_cstr);
-  a[0] = CORBA::string_dup (elem0_cstr);
-  a[1] = CORBA::string_dup (elem1_cstr);
-  a[2] = CORBA::string_dup (elem2_cstr);
-  a[3] = CORBA::string_dup (elem3_cstr);
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test assignment operator
-  a_it = a.begin ();
-
-  // Create a case to test for memory leaks
-  // in the iterator.
-  *a_it = CORBA::string_dup (elem0_cstr);
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  // I'm not sure this test makes sense since what's returned from
-  // dereferencing the iterator is an r value.
-  const char* value_seq = a[0];
-  FAIL_RETURN_IF (ACE_OS::strcmp (value_seq, elem0_cstr) != 0);
-  const char* value0 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem0_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem0_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem1_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[0]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[2]) != 0);
-
-  // test operator[] write
-  // NOTE: This assignment actually modifies the third element
-  // in the sequence since the iterator was previously positioned
-  // at the third element. I believe these are the proper semantics
-  // for using the bracket operator with an iterator. The number
-  // in the brackets is additive - not absolute.
-  a_it[0] = CORBA::string_dup (elem2_cstr);
-  FAIL_RETURN_IF (ACE_OS::strcmp (a[2], elem2_cstr) != 0);
-
-  // reset content of sequence a
-  a[1] = CORBA::string_dup (elem1_cstr);
-
-  // test for loop behaviour
-  ::CORBA::StringSeq b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  ::CORBA::StringSeq test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             std::ostream_iterator<CORBA::StringSeq::const_value_type> (ostream,
-                                                                        "\n"));
-
-  // The third sequence element has been modified. Either we need to restore
-  // the original sequence values or modify the test here. I modified the
-  // test since it's easier.
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem0\nelem1\nelem2\nelem3\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename ITERATOR_T>
-int test_sequence_const_iterator ()
-{
-  ::CORBA::StringSeq a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  a.length (4);
-  a[0] = CORBA::string_dup (elem0_cstr);
-  a[0] = CORBA::string_dup (elem0_cstr);
-  a[1] = CORBA::string_dup (elem1_cstr);
-  a[2] = CORBA::string_dup (elem2_cstr);
-  a[3] = CORBA::string_dup (elem3_cstr);
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test assignment operator
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  // I'm not sure non-const deferencing makes sense since
-  // we are getting an r value.
-  const char * value0 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem0_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem0_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem1_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[0]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[2]) != 0);
-
-  // test for loop behaviour
-  ::CORBA::StringSeq b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  ::CORBA::StringSeq test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             std::ostream_iterator<CORBA::StringSeq::const_value_type>(ostream,
-                       "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem0\nelem1\nelem2\nelem3\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename ITERATOR_T>
-int test_const_sequence ()
-{
-  // setup of an example sequence
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  ::CORBA::StringSeq setup;
-  setup.length (4);
-  setup[0] = CORBA::string_dup (elem0_cstr);
-  setup[1] = CORBA::string_dup (elem1_cstr);
-  setup[2] = CORBA::string_dup (elem2_cstr);
-  setup[3] = CORBA::string_dup (elem3_cstr);
-
-  const ::CORBA::StringSeq a = setup;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-  ITERATOR_T c_iter1 (a.begin ());
-  ITERATOR_T c_iter2 = a.begin ();
-  FAIL_RETURN_IF (!(c_iter1 == c_iter2));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  // JWH2 - This test shouldn't be done when dealing with
-  // a const iterator (which we sometimes do with the current
-  // testing setup).
-  //typename ITERATOR_T::element_type value0 = *a_it;
-  //FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem0_cstr) != 0);
-
-  // test const dereferencing
-  typename ITERATOR_T::const_element_type value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem0_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem1_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem3_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[0]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[2]) != 0);
-
-  // test for loop behaviour
-  const ::CORBA::StringSeq b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  ::CORBA::StringSeq test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             std::ostream_iterator<CORBA::StringSeq::const_value_type> (ostream,
-                                                                        "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem0\nelem1\nelem2\nelem3\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_sequence_reverse ()
-{
- ::CORBA::StringSeq a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  a.length (4);
-  a[0] = CORBA::string_dup (elem0_cstr);
-  a[1] = CORBA::string_dup (elem1_cstr);
-  a[2] = CORBA::string_dup (elem2_cstr);
-  a[3] = CORBA::string_dup (elem3_cstr);
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test assignment operator
-  a_it = a.rbegin ();
-
-  // Create a case to test for memory leaks
-  // in the iterator.
-  *a_it = CORBA::string_dup (elem3_cstr);
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  typename REVERSE_ITERATOR_T::element_type value0 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem3_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem3_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem2_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[3]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[1]) != 0);
-
-  // test operator[] write
-  a_it[0] = CORBA::string_dup (elem0_cstr);
-  FAIL_RETURN_IF (ACE_OS::strcmp (a[1],elem0_cstr) != 0);
-
-  // reset content of sequence a
-  a[1] = CORBA::string_dup (elem1_cstr);
-
-  // test for loop behaviour
-  ::CORBA::StringSeq b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  ::CORBA::StringSeq test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             std::ostream_iterator<CORBA::StringSeq::element_type> (ostream,
-                                                                    "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem3\nelem2\nelem1\nelem0\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_sequence_reverse_const_iterator ()
-{
- ::CORBA::StringSeq a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  a.length (4);
-  a[0] = CORBA::string_dup (elem0_cstr);
-  a[1] = CORBA::string_dup (elem1_cstr);
-  a[2] = CORBA::string_dup (elem2_cstr);
-  a[3] = CORBA::string_dup (elem3_cstr);
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test assignment operator
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  typename REVERSE_ITERATOR_T::const_element_type value0 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem3_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem3_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem2_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[3]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[1]) != 0);
-
-  // test for loop behaviour
-  ::CORBA::StringSeq b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  ::CORBA::StringSeq test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             std::ostream_iterator<CORBA::StringSeq::element_type> (ostream,
-                                                                    "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem3\nelem2\nelem1\nelem0\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_const_sequence_reverse ()
-{
-  // setup of an example sequence
-  const char * elem0_cstr = "elem0";
-  const char * elem1_cstr = "elem1";
-  const char * elem2_cstr = "elem2";
-  const char * elem3_cstr = "elem3";
-
-  ::CORBA::StringSeq setup;;
-  setup.length (4);
-  setup[0] = CORBA::string_dup (elem0_cstr);
-  setup[1] = CORBA::string_dup (elem1_cstr);
-  setup[2] = CORBA::string_dup (elem2_cstr);
-  setup[3] = CORBA::string_dup (elem3_cstr);
-
-  const ::CORBA::StringSeq a = setup;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  typename REVERSE_ITERATOR_T::const_element_type value0 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value0, elem3_cstr) != 0);
-
-  // test const dereferencing
-  const char* const value1 = *a_it;
-  FAIL_RETURN_IF (ACE_OS::strcmp (value1, elem3_cstr) != 0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem2_cstr) != 0);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, elem0_cstr) != 0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[3]) != 0);
-  a_it += 2;
-  FAIL_RETURN_IF (ACE_OS::strcmp (a_it[0],a[1]) != 0);
-
-  // test for loop behaviour
-  ::CORBA::StringSeq b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*a_it, *b_it) != 0);
-    }
-
-  ::CORBA::StringSeq test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (ACE_OS::strcmp (*copya_iter, *copytest_iter) != 0);
-    }
-
-  /// Testing - using ostream_iterator
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             std::ostream_iterator<CORBA::StringSeq::const_element_type> (ostream,
-                                                                          "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem3\nelem2\nelem1\nelem0\n") != 0);
-
-  return 0;
-}
-
-#endif
-
-//-----------------------------------------------------------------------------
-
-int ACE_TMAIN(int,ACE_TCHAR*[])
-{
-  int status = 0;
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  // Test Generic_Sequence_Iterator.
-  status += test_sequence< ::CORBA::StringSeq::iterator> ();
-
-  // g++ seems to make the conversion from iterator to const_iterator
-  // and Windows doesn't. Not sure why.
-  // Test Const_Generic_Sequence_Iterator with non-const sequence.
-  status += test_sequence_const_iterator <
-               ::CORBA::StringSeq::const_iterator> ();
-
-  // Test Const_Generic_Sequence_Iterator with const sequence.
-  status += test_const_sequence< ::CORBA::StringSeq::const_iterator> ();
-
-  // Test Generic_Sequence_Reverse_Iterator.
-  status += test_sequence_reverse< ::CORBA::StringSeq::reverse_iterator> ();
-
-  // Test Const_Generic_Sequence_Reverse_Iterator with non-const sequence.
-  status += test_sequence_reverse_const_iterator<
-                ::CORBA::StringSeq::const_reverse_iterator> ();
-
-  // Test Const_Generic_Sequence_Reverse_Iterator with const sequence.
-  status += test_const_sequence_reverse<
-                ::CORBA::StringSeq::const_reverse_iterator> ();
-#endif
-
-  return status;
-}
diff --git a/TAO/tests/Sequence_Iterators/Unbounded_Objectref.cpp b/TAO/tests/Sequence_Iterators/Unbounded_Objectref.cpp
deleted file mode 100644
index c951b6e90a1..00000000000
--- a/TAO/tests/Sequence_Iterators/Unbounded_Objectref.cpp
+++ /dev/null
@@ -1,667 +0,0 @@
-/**
- * @file Unbounded_Objectref.cpp
- *
- * @brief test for STL iterator behaviour of CORBA unbounded object reference
- *        sequence
- *
- * @author Friedhelm Wolf (fwolf@dre.vanderbilt.edu)
- */
-
-#include "ace/Log_Msg.h"
-
-#include <iostream>
-#include <iterator>
-#include <sstream>
-
-#include "tao/Object_Reference_Traits_T.h"
-#include "mock_reference.hpp"
-#include "tao/Unbounded_Object_Reference_Sequence_T.h"
-
-#define FAIL_RETURN_IF(CONDITION) \
-          if (CONDITION) \
-      { \
-              ACE_DEBUG ((LM_ERROR, ACE_TEXT ("\tFailed at %N:%l\n"))); \
-        return 1; \
-      }
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-typedef TAO::unbounded_object_reference_sequence<mock_reference, mock_reference_var> tested_sequence;
-
-template <typename ITERATOR_T>
-int test_sequence ()
-{
-  tested_sequence a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  mock_reference* elem0 = mock_reference::allocate (0);
-  mock_reference* elem1 = mock_reference::allocate (1);
-  mock_reference* elem2 = mock_reference::allocate (2);
-  mock_reference* elem3 = mock_reference::allocate (3);
-
-  // setup of an example sequence
-  a.length (4);
-
-  a[0] = elem0;
-  a[1] = elem1;
-  a[2] = elem2;
-  a[3] = elem3;
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test assignment operator
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  mock_reference* value0 = *a_it;
-  FAIL_RETURN_IF (value0->id () != elem0->id ());
-
-  // test const dereferencing
-  const mock_reference* const value1 = *a_it;
-  FAIL_RETURN_IF (value1->id () != elem0->id ());
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF ((*a_it)->id () != elem1->id ());
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF ((*a_it)->id () != elem3->id ());
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF ((*a_it)->id () != elem3->id ());
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it[0]->id () != a[0]->id ());
-  a_it += 2;
-  FAIL_RETURN_IF (a_it[0]->id () != a[2]->id ());
-
-  // test for loop behaviour
-  tested_sequence b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF ((*a_it)->id () != (*b_it)->id ());
-    }
-
-  tested_sequence test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF ((*copya_iter)->id () != (*copytest_iter)->id ());
-    }
-
-  /// Testing - using ostream_iterator
-  /// JWH2 - I don't think the ostream test makes sense for object references.
-  /*
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             std::ostream_iterator<tested_sequence::value_type> (ostream,
-                                                                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem0\nelem1\nelem2\nelem3\n") != 0);
-  */
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename ITERATOR_T>
-int test_const_sequence ()
-{
-  // setup of an example sequence
-  tested_sequence setup;
-  setup.length (4);
-
-  mock_reference* elem0 = mock_reference::allocate (0);
-  mock_reference* elem1 = mock_reference::allocate (1);
-  mock_reference* elem2 = mock_reference::allocate (2);
-  mock_reference* elem3 = mock_reference::allocate (3);
-
-  // setup of an example sequence
-  setup[0] = elem0;
-  setup[1] = elem1;
-  setup[2] = elem2;
-  setup[3] = elem3;
-
-  const tested_sequence a = setup;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test assignment operator
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  mock_reference* value0 = *a_it;
-  FAIL_RETURN_IF (value0->id () != elem0->id ());
-
-  // test const dereferencing
-  const mock_reference* const value1 = *a_it;
-  FAIL_RETURN_IF (value1->id () != elem0->id ());
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF ((*a_it)->id () != elem1->id ());
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF ((*a_it)->id () != elem3->id ());
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF ((*a_it)->id () != elem3->id ());
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF ((a_it[0])->id () != a[0]->id ());
-  a_it += 2;
-  FAIL_RETURN_IF ((a_it[0])->id () != a[2]->id ());
-
-  // test for loop behaviour
-  tested_sequence b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF ((*a_it)->id () != (*b_it)->id ());
-    }
-
-  tested_sequence test;
-  test.length (4);
-
-  /*
-   * The copy call below causes double deletes and seg faults.
-   */
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF ((*copya_iter)->id () != (*copytest_iter)->id ());
-    }
-
-  /// Testing - using ostream_iterator
-  /// JWH2 - I don't think the ostream test makes sense for object references.
-  /*
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             std::ostream_iterator<tested_sequence::value_type> (ostream,
-                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem0\nelem1\nelem2\nelem3\n") != 0);
-  */
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_sequence_reverse ()
-{
-  tested_sequence a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-  a.length (4);
-
-  mock_reference* elem0 = mock_reference::allocate (0);
-  mock_reference* elem1 = mock_reference::allocate (1);
-  mock_reference* elem2 = mock_reference::allocate (2);
-  mock_reference* elem3 = mock_reference::allocate (3);
-
-  // setup of an example sequence
-  a.length (4);
-  a[0] = elem0;
-  a[1] = elem1;
-  a[2] = elem2;
-  a[3] = elem3;
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test assignment operator
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  mock_reference* value0 = *a_it;
-  FAIL_RETURN_IF (value0->id () != elem3->id ());
-
-  // test const dereferencing
-  const mock_reference* const value1 = *a_it;
-  FAIL_RETURN_IF (value1->id () != elem3->id ());
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF ((*a_it)->id () != elem2->id ());
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF ((*a_it)->id () != elem0->id ());
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF ((*a_it)->id () != elem0->id ());
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF ((a_it[0])->id () != a[3]->id ());
-  a_it += 2;
-  FAIL_RETURN_IF ((a_it[0])->id () != a[1]->id ());
-
-  // test for loop behaviour
-  tested_sequence b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF ((*a_it)->id () != (*b_it)->id ());
-    }
-
-  tested_sequence test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF ((*copya_iter)->id () != (*copytest_iter)->id ());
-    }
-
-  /// Testing - using ostream_iterator
-  /// JWH2 - I don't think the ostream test makes sense for object references.
-  /*
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             std::ostream_iterator<tested_sequence::value_type> (ostream,
-                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem3\nelem2\nelem1\nelem0\n") != 0);
-  */
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_const_sequence_reverse ()
-{
-  // setup of an example sequence
-  tested_sequence setup;
-  setup.length (4);
-
-  mock_reference* elem0 = mock_reference::allocate (0);
-  mock_reference* elem1 = mock_reference::allocate (1);
-  mock_reference* elem2 = mock_reference::allocate (2);
-  mock_reference* elem3 = mock_reference::allocate (3);
-
-  // setup of an example sequence
-  setup[0] = elem0;
-  setup[1] = elem1;
-  setup[2] = elem2;
-  setup[3] = elem3;
-
-  const tested_sequence a = setup;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test assignment operator
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  mock_reference* value0 = *a_it;
-  FAIL_RETURN_IF (value0->id () != elem3->id ());
-
-  // test const dereferencing
-  const mock_reference* const value1 = *a_it;
-  FAIL_RETURN_IF (value1->id () != elem3->id ());
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF ((*a_it)->id () != elem2->id ());
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF ((*a_it)->id () != elem0->id ());
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF ((*a_it)->id () != elem0->id ());
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF ((a_it[0])->id () != a[3]->id ());
-  a_it += 2;
-  FAIL_RETURN_IF ((a_it[0])->id () != a[1]->id ());
-
-  // test operator[] write
-  // NOTE: This now changes the sequence a.
-  // this is not possible for const iterators
-  // a_it[0] = CORBA::string_dup (elem0_cstr);
-  // FAIL_RETURN_IF (ACE_OS::strcmp (a[1],elem0_cstr) != 0);
-
-  // reset content of sequence a
-  //a[1] = CORBA::string_dup (elem1_cstr);
-
-  // test for loop behaviour
-  tested_sequence b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF ((*a_it)->id () != (*b_it)->id ());
-    }
-
-  tested_sequence test;
-  test.length (a.length ());
-
-  /*
-   * The copy call below causes double deletes and seg faults.
-   */
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF ((*copya_iter)->id () != (*copytest_iter)->id ());
-    }
-
-  /// Testing - using ostream_iterator
-  /// JWH2 - I don't think the ostream test makes sense for object references.
-  /*
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             std::ostream_iterator<tested_sequence::value_type> (ostream,
-                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("elem3\nelem2\nelem1\nelem0\n") != 0);
-  */
-
-  return 0;
-}
-
-#endif
-
-//-----------------------------------------------------------------------------
-
-int ACE_TMAIN(int,ACE_TCHAR*[])
-{
-  int status = 0;
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  // Test Generic_Sequence_Iterator.
-  status += test_sequence< tested_sequence::iterator> ();
-
-  // g++ seems to make the conversion from iterator to const_iterator
-  // and Windows doesn't. Not sure why.
-  // Test Const_Generic_Sequence_Iterator with non-const sequence.
-  status += test_sequence< tested_sequence::const_iterator> ();
-
-  // Test Const_Generic_Sequence_Iterator with const sequence.
-  status += test_const_sequence< tested_sequence::const_iterator> ();
-
-  // Test Generic_Sequence_Reverse_Iterator.
-  status += test_sequence_reverse< tested_sequence::reverse_iterator> ();
-
-  // Test Const_Generic_Sequence_Reverse_Iterator with non-const sequence.
-  status += test_sequence_reverse< tested_sequence::const_reverse_iterator> ();
-
-  // Test Const_Generic_Sequence_Reverse_Iterator with const sequence.
-  status += test_const_sequence_reverse< tested_sequence::const_reverse_iterator> ();
-
-#endif /* TAO_HAS_SEQUENCE_ITERATORS == 1 */
-
-  return status;
-}
diff --git a/TAO/tests/Sequence_Iterators/Unbounded_Value.cpp b/TAO/tests/Sequence_Iterators/Unbounded_Value.cpp
deleted file mode 100644
index 682c27bd025..00000000000
--- a/TAO/tests/Sequence_Iterators/Unbounded_Value.cpp
+++ /dev/null
@@ -1,690 +0,0 @@
-/**
- * @file Unbounded_Value.cpp
- *
- * @brief test for STL iterator behaviour of CORBA bounded string sequence
- *
- * @author Friedhelm Wolf (fwolf@dre.vanderbilt.edu)
- */
-
-#include "tao/Unbounded_Value_Sequence_T.h"
-#include "ace/Log_Msg.h"
-
-#include <iostream>
-#include <iterator>
-#include <sstream>
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-typedef TAO::unbounded_value_sequence<int> v_sequence;
-
-#define FAIL_RETURN_IF(CONDITION) \
-          if (CONDITION) \
-      { \
-              ACE_DEBUG ((LM_ERROR, ACE_TEXT ("\tFailed at %N:%l\n"))); \
-        return 1; \
-      }
-
-template <typename ITERATOR_T>
-int test_sequence ()
-{
-  v_sequence a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-  a.length (4);
-
-  int elem0 = 0;
-  int elem1 = 1;
-  int elem2 = 2;
-  int elem3 = 3;
-
-  a[0] = elem0;
-  a[1] = elem1;
-  a[2] = elem2;
-  a[3] = elem3;
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test assignment operator
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  // JWH2 - I don't think this test makes sense. I believe the compiler
-  // will always return a const value since the dereference is on
-  // the right hand side of the assignment (i.e., r value).
-  //int value0 = *a_it;
-  //FAIL_RETURN_IF (value0 != elem0);
-
-  // test const dereferencing
-  int value1 = *a_it;
-  FAIL_RETURN_IF (value1 != elem0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF (*a_it != elem1);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (*a_it != elem3);
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (*a_it != elem3);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it[0] != a[0]);
-  a_it += 2;
-  FAIL_RETURN_IF (a_it[0] != a[2]);
-
-  // test operator[] write
-  // NOTE: This now changes the sequence a.
-  // NOTE: This does not work for const_iterators
-  // a_it[0] = elem0;
-  // FAIL_RETURN_IF (a[2] != elem0);
-
-  // reset content of sequence a
-  //a[2] = elem2;
-
-  // test for loop behaviour
-  v_sequence b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (*a_it != *b_it);
-    }
-
-  v_sequence test;
-  test.length (4);
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (*copya_iter != *copytest_iter);
-    }
-
-  /// Testing - using ostream_iterator
-
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             // JWH2 - I changed value_type to const_value_type. Is that
-             // the correct approach?
-             std::ostream_iterator<v_sequence::const_value_type> (ostream,
-                                                                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("0\n1\n2\n3\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename ITERATOR_T>
-int test_const_sequence ()
-{
-  // setup of an example sequence
-  v_sequence setup;
-  setup.length (4);
-
-  int elem0 = 0;
-  int elem1 = 1;
-  int elem2 = 2;
-  int elem3 = 3;
-
-  setup[0] = elem0;
-  setup[1] = elem1;
-  setup[2] = elem2;
-  setup[3] = elem3;
-
-  const v_sequence a = setup;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test iterator copy constructor
-  ITERATOR_T a_it (a.begin ());
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test assignment operator
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it != a.begin ());
-
-  // test non const dereferencing
-  // JWH2 - I don't think this test makes sense. I believe the compiler
-  // will always return a const value since the dereference is on
-  // the right hand side of the assignment (i.e., r value).
-  //char* value0 = *a_it;
-  //FAIL_RETURN_IF (value0 != elem0);
-
-  // test const dereferencing
-  int value1 = *a_it;
-  FAIL_RETURN_IF (value1 != elem0);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.begin());
-  FAIL_RETURN_IF (*a_it != elem1);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.begin () < a_it));
-  FAIL_RETURN_IF (a_it < a.begin ());
-
-  // test difference type
-  int a_diff = a_it - a.begin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.end ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (*a_it != elem3);
-
-  // test pre-decrement operator
-  a_it = a.end ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.end ());
-  FAIL_RETURN_IF ((a.end () - a_it) != 1);
-  FAIL_RETURN_IF (*a_it != elem3);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.begin ();
-  FAIL_RETURN_IF (a_it[0] != a[0]);
-  a_it += 2;
-  FAIL_RETURN_IF (a_it[0] != a[2]);
-
-  // test operator[] write
-  // NOTE: This now changes the sequence a.
-  // NOTE: This does not work for const_iterators
-  // a_it[0] = elem0;
-  // FAIL_RETURN_IF (a[2] != elem0);
-
-  // reset content of sequence a
-  //a[2] = elem2;
-
-  // test for loop behaviour
-  v_sequence b = a;
-  ITERATOR_T b_it = b.begin ();
-
-  for (a_it = a.begin ();
-       a_it != a.end ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (*a_it != *b_it);
-    }
-
-  v_sequence test;
-  test.length (4);
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  ITERATOR_T copytest_iter = test.begin ();
-  for (ITERATOR_T copya_iter = a.begin ();
-       copya_iter != a.end ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (*copya_iter != *copytest_iter);
-    }
-
-  /// Testing - using ostream_iterator
-
-  std::ostringstream ostream;
-  std::copy (a.begin (),
-             a.end (),
-             // JWH2 - I changed value_type to const_value_type. Is that
-             // the correct approach?
-             std::ostream_iterator<v_sequence::const_value_type> (ostream,
-                                                                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("0\n1\n2\n3\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_sequence_reverse ()
-{
-  v_sequence a;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test for correct behaviour for empty sequence
-
-  FAIL_RETURN_IF (a.begin() != a.end ());
-
-  // setup of an example sequence
-  a.length (4);
-
-  int elem0 = 0;
-  int elem1 = 1;
-  int elem2 = 2;
-  int elem3 = 3;
-
-  a[0] = elem0;
-  a[1] = elem1;
-  a[2] = elem2;
-  a[3] = elem3;
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test assignment operator
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  // JWH2 - I don't think this test makes sense. I believe the compiler
-  // will always return a const value since the dereference is on
-  // the right hand side of the assignment (i.e., r value).
-  //int value0 = *a_it;
-  //FAIL_RETURN_IF (value0 != elem3);
-
-  // test const dereferencing
-  int value1 = *a_it;
-  FAIL_RETURN_IF (value1 != elem3);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF (*a_it != elem2);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (*a_it != elem0);
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (*a_it != elem0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it[0] != a[3]);
-  a_it += 2;
-  FAIL_RETURN_IF (a_it[0] != a[1]);
-
-  // test operator[] write
-  // NOTE: This now changes the sequence a.
-  // this is not possible for const iterators
-  // a_it[0] = elem0;
-  // FAIL_RETURN_IF (a[1] != elem0);
-
-  // reset content of sequence a
-  //a[1] = elem1;
-
-  // test for loop behaviour
-  v_sequence b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (*a_it != *b_it);
-    }
-
-  v_sequence test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (*copya_iter != *copytest_iter);
-    }
-
-  /// Testing - using ostream_iterator
-
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             // JWH2 - I changed value_type to const_value_type. Is that
-             // the correct approach?
-             std::ostream_iterator<v_sequence::const_value_type> (ostream,
-                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("3\n2\n1\n0\n") != 0);
-
-  return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-template <typename REVERSE_ITERATOR_T>
-int test_const_sequence_reverse ()
-{
-  // setup of an example sequence
-  v_sequence setup;
-  setup.length (4);
-
-  int elem0 = 0;
-  int elem1 = 1;
-  int elem2 = 2;
-  int elem3 = 3;
-
-  setup[0] = elem0;
-  setup[1] = elem1;
-  setup[2] = elem2;
-  setup[3] = elem3;
-
-  const v_sequence a = setup;
-
-  // test equality operator
-  FAIL_RETURN_IF (!(a.begin () == a.begin ()));
-
-  // test non-equality operator
-  FAIL_RETURN_IF (a.end () != a.end ());
-
-  // test iterator copy constructor
-  REVERSE_ITERATOR_T a_it (a.rbegin ());
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test assignment operator
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it != a.rbegin ());
-
-  // test non const dereferencing
-  // JWH2 - I don't think this test makes sense. I believe the compiler
-  // will always return a const value since the dereference is on
-  // the right hand side of the assignment (i.e., r value).
-  //int value0 = *a_it;
-  //FAIL_RETURN_IF (value0 != elem3);
-
-  // test const dereferencing
-  int value1 = *a_it;
-  FAIL_RETURN_IF (value1 != elem3);
-
-  // test increment operation
-  a_it++;
-  FAIL_RETURN_IF (a_it == a.rbegin());
-  FAIL_RETURN_IF (*a_it != elem2);
-
-  // test < operator
-  FAIL_RETURN_IF (!(a.rbegin () < a_it));
-  FAIL_RETURN_IF (a_it < a.rbegin ());
-
-  // test difference type
-  int a_diff = a_it - a.rbegin ();
-  FAIL_RETURN_IF (a_diff != 1);
-
-  // test copy constructor
-  REVERSE_ITERATOR_T a_it1 (a_it);
-  FAIL_RETURN_IF (a_it1 != a_it);
-
-  // test preincrement operator
-  ++a_it1;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 1);
-
-  // test = and += operator
-  REVERSE_ITERATOR_T a_it2 = a_it += 3;
-  FAIL_RETURN_IF (a_it2 != a_it);
-  FAIL_RETURN_IF ((a_it - a_it1) != 2);
-
-  // test + operator
-  a_it2 = a_it1 + 3;
-  FAIL_RETURN_IF ((a_it2 - a_it1) != 3);
-
-  // test post-decrement operation
-  a_it = a.rend ();
-  a_it--;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (*a_it != elem0);
-
-  // test pre-decrement operator
-  a_it = a.rend ();
-  --a_it;
-  FAIL_RETURN_IF (a_it == a.rend ());
-  FAIL_RETURN_IF ((a.rend () - a_it) != 1);
-  FAIL_RETURN_IF (*a_it != elem0);
-
-  // test -= operator
-  a_it -= 3;
-  FAIL_RETURN_IF ((a_it1 - a_it) != 2);
-
-  // test - operator
-  a_it2 = a_it1 - 2;
-  FAIL_RETURN_IF ((a_it1 - a_it2) != 2);
-
-  // test operator[] read
-  a_it = a.rbegin ();
-  FAIL_RETURN_IF (a_it[0] != a[3]);
-  a_it += 2;
-  FAIL_RETURN_IF (a_it[0] != a[1]);
-
-  // test operator[] write
-  // NOTE: This now changes the sequence a.
-  // this is not possible for const iterators
-  // a_it[0] = elem0;
-  // FAIL_RETURN_IF (a[1] != elem0);
-
-  // reset content of sequence a
-  //a[1] = elem1;
-
-  // test for loop behaviour
-  v_sequence b = a;
-  REVERSE_ITERATOR_T b_it = b.rbegin ();
-
-  for (a_it = a.rbegin ();
-       a_it != a.rend ();
-       a_it++, b_it++)
-    {
-      FAIL_RETURN_IF (*a_it != *b_it);
-    }
-
-  v_sequence test;
-  test.length (a.length ());
-
-  std::copy (a.begin (),
-             a.end (),
-             test.begin ());
-
-  FAIL_RETURN_IF (test.length () != a.length ());
-
-  REVERSE_ITERATOR_T copytest_iter = test.rbegin ();
-  for (REVERSE_ITERATOR_T copya_iter = a.rbegin ();
-       copya_iter != a.rend ();
-       ++copya_iter, ++copytest_iter)
-    {
-      FAIL_RETURN_IF (*copya_iter != *copytest_iter);
-    }
-
-  /// Testing - using ostream_iterator
-
-  std::ostringstream ostream;
-  std::copy (a.rbegin (),
-             a.rend (),
-             // JWH2 - I changed value_type to const_value_type. Is that
-             // the correct approach?
-             std::ostream_iterator<v_sequence::const_value_type> (ostream,
-                  "\n"));
-
-  FAIL_RETURN_IF (
-    ostream.str ().compare ("3\n2\n1\n0\n") != 0);
-
-  return 0;
-}
-
-#endif
-
-//-----------------------------------------------------------------------------
-
-int ACE_TMAIN(int,ACE_TCHAR*[])
-{
-  int status = 0;
-
-#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1
-
-  // Test Generic_Sequence_Iterator.
-  status += test_sequence<v_sequence::iterator> ();
-
-  // g++ seems to make the conversion from iterator to const_iterator
-  // and Windows doesn't. Not sure why.
-  // Test Const_Generic_Sequence_Iterator with non-const sequence.
-  status += test_sequence<v_sequence::const_iterator> ();
-
-  // Test Const_Generic_Sequence_Iterator with const sequence.
-  status += test_const_sequence<v_sequence::const_iterator> ();
-
-  // Test Generic_Sequence_Reverse_Iterator.
-  status += test_sequence_reverse<v_sequence::reverse_iterator> ();
-
-  // Test Const_Generic_Sequence_Reverse_Iterator with non-const sequence.
-  status += test_sequence_reverse<v_sequence::const_reverse_iterator> ();
-
-  // Test Const_Generic_Sequence_Reverse_Iterator with const sequence.
-  status += test_const_sequence_reverse<v_sequence::const_reverse_iterator> ();
-#endif
-
-  return status;
-}
diff --git a/TAO/tests/Sequence_Iterators/mock_reference.cpp b/TAO/tests/Sequence_Iterators/mock_reference.cpp
deleted file mode 100644
index 02f2e999f85..00000000000
--- a/TAO/tests/Sequence_Iterators/mock_reference.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * @file
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-#include "mock_reference.hpp"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-mock_reference::
-~mock_reference()
-{
-}
-
-mock_reference * mock_reference::
-allocate(int id)
-{
-  return new mock_reference(id);
-}
-
-mock_reference * mock_reference::
-_nil()
-{
-  return 0;
-}
-
-mock_reference * mock_reference::
-_duplicate(mock_reference * rhs)
-{
-  if (rhs == 0)
-  {
-    return 0;
-  }
-  return new mock_reference(*rhs);
-}
-
-void mock_reference::
-_tao_release(mock_reference * rhs)
-{
-  delete rhs;
-}
-
-void CORBA::release(mock_reference * r)
-{
-  mock_reference::_tao_release(r);
-}
-
-mock_reference *
-TAO::Objref_Traits<mock_reference>::duplicate (
-    mock_reference_ptr p
-  )
-{
-  return mock_reference::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<mock_reference>::release (
-    mock_reference_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-mock_reference_ptr
-TAO::Objref_Traits<mock_reference>::nil (void)
-{
-  return mock_reference::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<mock_reference>::marshal (
-    const mock_reference_ptr,
-    TAO_OutputCDR &
-  )
-{
-  return true;
-}
-
-CORBA::Boolean operator<< (TAO_OutputCDR &, const mock_reference *)
-{
-  return true;
-}
-CORBA::Boolean operator>> (TAO_InputCDR &, mock_reference *&)
-{
-  return true;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Sequence_Iterators/mock_reference.hpp b/TAO/tests/Sequence_Iterators/mock_reference.hpp
deleted file mode 100644
index 31ed319199c..00000000000
--- a/TAO/tests/Sequence_Iterators/mock_reference.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef guard_mock_reference_hpp
-#define guard_mock_reference_hpp
-/**
- * @file
- *
- * @brief Mock an object reference so we can test the sequences in
- *        isolation.
- *
- * @author Carlos O'Ryan
- */
-#include "ace/config-all.h"
-
-#include "tao/Basic_Types.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-// Forward declare the class a CORBA::release function for it.  That
-// avoids having to introduce CORBA::Object into the tests.
-// Ideally the T_var and T_out types should accept mock objects
-// too, but that is too much to bite in the current iteration.
-class mock_reference;
-namespace CORBA
-{
-void release(mock_reference*);
-}
-
-class mock_stream;
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "tao/Objref_VarOut_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-typedef mock_reference *mock_reference_ptr;
-typedef TAO_Objref_Var_T<mock_reference> mock_reference_var;
-typedef TAO_Objref_Out_T<mock_reference> mock_reference_out;
-
-/**
- * @class mock_reference
- *
- * @brief Implement a concrete class with the right interface for an
- *        object reference.
- */
-class mock_reference
-{
-public:
-  virtual ~mock_reference();
-
-  typedef mock_reference_var _var_type;
-  typedef mock_reference_out _out_type;
-
-  static mock_reference * allocate(int id);
-  static mock_reference * _nil();
-
-  static mock_reference * _duplicate(mock_reference * rhs);
-  static void _tao_release(mock_reference * rhs);
-
-  inline bool operator==(mock_reference const & rhs) const
-  {
-    return id_ == rhs.id_;
-  }
-
-  inline bool operator!=(mock_reference const & rhs) const
-  {
-    return !(*this == rhs);
-  }
-
-  inline int id() const
-  {
-    return id_;
-  }
-
-private:
-  mock_reference ();
-
-  inline mock_reference(int id)
-    : id_(id)
-  {}
-
-private:
-  int id_;
-};
-
-CORBA::Boolean operator<< (TAO_OutputCDR &, const mock_reference *);
-CORBA::Boolean operator>> (TAO_InputCDR &, mock_reference *&);
-
-namespace TAO
-{
-  template<>
-  struct Objref_Traits< mock_reference>
-  {
-    static mock_reference_ptr duplicate (mock_reference_ptr);
-    static void release (mock_reference_ptr);
-    static mock_reference_ptr nil (void);
-    static CORBA::Boolean marshal (const mock_reference_ptr p, TAO_OutputCDR & cdr);
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-#endif // guard_mock_reference_hpp
diff --git a/TAO/tests/Sequence_Iterators/run_test.pl b/TAO/tests/Sequence_Iterators/run_test.pl
deleted file mode 100755
index e9cb5343e72..00000000000
--- a/TAO/tests/Sequence_Iterators/run_test.pl
+++ /dev/null
@@ -1,45 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-use strict;
-
-my $final_result = 0;
-
-my @testsToRun = qw(
-                 StringSeq
-                 Bounded_String
-                 Unbounded_Value
-                 Unbounded_Objectref
-              );
-
-foreach my $process (@testsToRun) {
-
-    my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-    my $P = $server->CreateProcess ($process);
-    print "Running $process ...\n";
-    my $result = $P->Spawn;
-    if ($result != 0) {
-        print "FAILED $process\n";
-        $final_result = 1;
-        next;
-    }
-    $result = $P->WaitKill($server->ProcessStartWaitInterval());
-    if ($result != 0) {
-        print "FAILED $process\n";
-        $final_result = 1;
-        next;
-    }
-    print "SUCCESS\n";
-}
-
-exit $final_result;
-
-
-
-
-
diff --git a/TAO/tests/Sequence_Iterators/testing_counters.hpp b/TAO/tests/Sequence_Iterators/testing_counters.hpp
deleted file mode 100644
index fd190f2ec47..00000000000
--- a/TAO/tests/Sequence_Iterators/testing_counters.hpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef guard_testing_counters_hpp
-#define guard_testing_counters_hpp
-/**
- * @file
- *
- * @brief Some unit tests need to count how many times a function is
- * called.   Here we implement some simple helper classes for that
- * purpose.
- *
- * @author Carlos O'Ryan
- */
-
-#include "testing_exception.hpp"
-
-#include <boost/utility.hpp>
-
-#include <iostream>
-
-/**
- * @brief Used to count how many times a function gets called.  The
- *        unit test should create one instance per function.
- */
-class call_counter
-{
-public:
-  inline call_counter()
-    : count_(0)
-    , failure_countdown_(0)
-  {}
-
-  inline long current_count() const
-  {
-    return count_;
-  }
-
-  inline void failure_countdown(long countdown)
-  {
-    failure_countdown_ = countdown;
-  }
-
-  inline void operator()()
-  {
-    ++count_;
-    if (--failure_countdown_ == 0)
-    {
-      throw testing_exception();
-    }
-  }
-
-private:
-  long count_;
-  long failure_countdown_;
-};
-
-/**
- * @brief Used to detect if a testing_counter is "called" the right
- *        number of times.
- */
-class expected_calls
-  : private boost::noncopyable
-{
-public:
-  inline expected_calls(call_counter const & counter)
-    : current_count_(counter.current_count())
-    , previous_count_(counter.current_count())
-    , counter_(counter)
-  { }
-
-  inline bool expect(long n)
-  {
-    reset();
-    return (previous_count_ + n == current_count_);
-  }
-
-  inline void reset()
-  {
-    previous_count_ = current_count_;
-    current_count_ = counter_.current_count();
-  }
-
-  inline long current_count() const
-  {
-    return current_count_;
-  }
-
-  inline long previous_count() const
-  {
-    return previous_count_;
-  }
-
-private:
-  long current_count_;
-  long previous_count_;
-  call_counter const & counter_;
-};
-
-inline std::ostream & operator<<(std::ostream & os, expected_calls const & x)
-{
-  return os << "current=" << x.current_count()
-            << ",previous=" << x.previous_count();
-
-}
-
-#endif // guard_testing_counters_hpp
diff --git a/TAO/tests/Sequence_Iterators/testing_exception.hpp b/TAO/tests/Sequence_Iterators/testing_exception.hpp
deleted file mode 100644
index 8423204bfbb..00000000000
--- a/TAO/tests/Sequence_Iterators/testing_exception.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef guard_testing_exception_hpp
-#define guard_testing_exception_hpp
-/**
- * @file
- *
- * @brief Simple exception to raise in the tests.
- *
- * @author Carlos O'Ryan
- */
-
-struct testing_exception {};
-
-#endif // guard_testing_exception_hpp
diff --git a/TAO/tests/Stack_Recursion/README b/TAO/tests/Stack_Recursion/README
index e0434613745..6f0eb8495dd 100644
--- a/TAO/tests/Stack_Recursion/README
+++ b/TAO/tests/Stack_Recursion/README
@@ -44,7 +44,7 @@ End Comment added August 14, 2007 <wilsond@ociweb.com>
       A stress test for the stack recursion outlined in the bugzilla
 under id 1125. Here is the link for the bug
 
-http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1125
+http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1125
 
 This test is designed to show the bug. The test has a server running 4
 threads and clients running 16 threads requesting around 30 MB of
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
index bbcd2f7d8e1..3830c787546 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
@@ -84,16 +84,13 @@ namespace Test
     //@}
 
   protected:
-
     /// The number of requests intercepted by this interceptor.
     CORBA::ULong request_count_;
 
     CORBA::String_var orb_id_;
 
     TEST test_;
-
   };
-
 }
 
 #endif  /* SERVER_REQUEST_INTERCEPTOR_H */
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index f1a0b89e513..00000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,173 +0,0 @@
-variables:
-   ACE_ROOT: $(Build.SourcesDirectory)/ACE
-   TAO_ROOT: $(Build.SourcesDirectory)/TAO
-   MPC_ROOT: $(Build.SourcesDirectory)/ACE/MPC
-   system.prefergit: true
-
-schedules:
-- cron: "0 7 * * SUN"
-  displayName: Weekly Sunday
-  branches:
-    include:
-    - master
-  always: true
-
-resources:
-- repo: self
-  fetchDepth: 1
-
-jobs:
-- job: VisualStudio2019
-  timeoutInMinutes: 120
-  pool:
-    vmImage: windows-2019
-  strategy:
-    matrix:
-      WChar:
-        BuildPlatform: x64
-        BuildConfiguration: Debug
-        vcpkgarch: x64-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: 'openssl xerces-c[xmlch-wchar]'
-        OptionalFeatures: uses_wchar=1
-      Debug64:
-        BuildPlatform: x64
-        BuildConfiguration: Debug
-        vcpkgarch: x64-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: openssl xerces-c
-      Release64:
-        BuildPlatform: x64
-        BuildConfiguration: Release
-        vcpkgarch: x64-windows
-        vcpkglibdir: lib
-        vcpkgpackages: openssl xerces-c
-      Debug32:
-        BuildPlatform: Win32
-        BuildConfiguration: Debug
-        vcpkgarch: x86-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: openssl xerces-c
-      Release32:
-        BuildPlatform: Win32
-        BuildConfiguration: Release
-        vcpkgarch: x86-windows
-        vcpkglibdir: lib
-        vcpkgpackages: openssl xerces-c
-  variables:
-    VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg
-    XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
-    XERCESC_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
-    SSL_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
-    SSL_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
-  steps:
-  - powershell: |
-      git clone -q --depth 1 git://github.com/Microsoft/vcpkg.git $(VCPKG_ROOT)
-      $(VCPKG_ROOT)\bootstrap-vcpkg.bat
-      $(VCPKG_ROOT)\vcpkg install --recurse --triplet $(vcpkgarch) $(vcpkgpackages)
-    displayName: Install additional packages using vcpkg
-  - powershell: |
-      '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h
-    displayName: Create config.h file
-  - powershell: |
-      echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "versioned_namespace=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-    displayName: Create default.features file
-  - powershell: |
-      echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-    displayName: Add optional features ($(OptionalFeatures))
-    condition: and(succeeded(), ne(variables['OptionalFeatures'], ''))
-  - powershell: git clone -q --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT)
-    displayName: git clone MPC
-  - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2019 $(TAO_ROOT)/TAO_ACE.mwc -workers 4
-    displayName: Run script mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
-  - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2019 $(ACE_ROOT)/tests/tests.mwc -workers 4
-    displayName: Run script mwc.pl on $(ACE_ROOT)/tests/tests.mwc
-  - task: VSBuild@1
-    displayName: Build solution TAO/TAO_ACE.sln
-    inputs:
-      solution: TAO/TAO_ACE.sln
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-  - task: VSBuild@1
-    displayName: Build solution ACE/tests/tests.sln
-    inputs:
-      solution: ACE/tests/tests.sln
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-
-- job: VisualStudio2017
-  timeoutInMinutes: 120
-  pool:
-    vmImage: vs2017-win2016
-  strategy:
-    matrix:
-      WChar:
-        BuildPlatform: x64
-        BuildConfiguration: Debug
-        vcpkgarch: x64-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: 'openssl xerces-c[xmlch-wchar]'
-        OptionalFeatures: uses_wchar=1
-      Debug64:
-        BuildPlatform: x64
-        BuildConfiguration: Debug
-        vcpkgarch: x64-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: openssl xerces-c
-      Release64:
-        BuildPlatform: x64
-        BuildConfiguration: Release
-        vcpkgarch: x64-windows
-        vcpkglibdir: lib
-        vcpkgpackages: openssl xerces-c
-  variables:
-    VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg
-    XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
-    XERCESC_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
-    SSL_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
-    SSL_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
-  steps:
-  - powershell: |
-      git clone --depth 1 git://github.com/Microsoft/vcpkg.git $(VCPKG_ROOT)
-      $(VCPKG_ROOT)\bootstrap-vcpkg.bat
-      $(VCPKG_ROOT)\vcpkg install --recurse --triplet $(vcpkgarch) $(vcpkgpackages)
-    displayName: Install additional packages using vcpkg
-  - powershell: |
-      '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h
-    displayName: Create config.h file
-  - powershell: |
-      echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "versioned_namespace=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "ipv6=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-    displayName: Create default.features file
-  - powershell: |
-      echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-    displayName: Add optional features ($(OptionalFeatures))
-    condition: and(succeeded(), ne(variables['OptionalFeatures'], ''))
-  - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT)
-    displayName: git clone MPC
-  - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2017 $(TAO_ROOT)/TAO_ACE.mwc -workers 4
-    displayName: Run script mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
-  - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2017 $(ACE_ROOT)/tests/tests.mwc -workers 4
-    displayName: Run script mwc.pl on $(ACE_ROOT)/tests/tests.mwc
-  - task: VSBuild@1
-    displayName: Build solution TAO/TAO_ACE.sln
-    inputs:
-      solution: TAO/TAO_ACE.sln
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-  - task: VSBuild@1
-    displayName: Build solution ACE/tests/tests.sln
-    inputs:
-      solution: ACE/tests/tests.sln
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true